diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 55ce1f5..6911af4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -22,10 +22,7 @@ - - - - + diff --git a/app/mdc1200.c b/app/mdc1200.c index d647621..5baa272 100644 --- a/app/mdc1200.c +++ b/app/mdc1200.c @@ -468,7 +468,6 @@ uint8_t mdc1200_rx_ready_tick_500ms; void MDC1200_process_rx(const uint16_t interrupt_bits) { - uint8_t a=0xAA; const uint16_t rx_sync_flags = BK4819_ReadRegister(0x0B); const uint16_t fsk_reg59 = BK4819_ReadRegister(0x59) & ~((1u << 15) | (1u << 14) | (1u << 12) | (1u << 11)); @@ -481,7 +480,6 @@ void MDC1200_process_rx(const uint16_t interrupt_bits) if (rx_sync) { - a=0xAB; mdc1200_rx_buffer_index = 0; { @@ -500,7 +498,6 @@ void MDC1200_process_rx(const uint16_t interrupt_bits) if (rx_fifo_almost_full) { - a=0xAC; unsigned int i; const unsigned int count = BK4819_ReadRegister(0x5E) & (7u << 0); // almost full threshold @@ -524,7 +521,6 @@ void MDC1200_process_rx(const uint16_t interrupt_bits) { BK4819_WriteRegister(0x59, (1u << 15) | (1u << 14) | fsk_reg59); BK4819_WriteRegister(0x59, (1u << 12) | fsk_reg59); - a=0xAD; if (MDC1200_process_rx_data( mdc1200_rx_buffer, @@ -533,7 +529,6 @@ void MDC1200_process_rx(const uint16_t interrupt_bits) &mdc1200_arg, &mdc1200_unit_id)) { mdc1200_rx_ready_tick_500ms = 2 * 6; // 6 second MDC display time - a=0xAE; gUpdateDisplay = true; } @@ -552,7 +547,6 @@ void MDC1200_process_rx(const uint16_t interrupt_bits) } - UART_Send((uint8_t *)&a,1);; } diff --git a/functions.c b/functions.c index bef0a01..0d0ace5 100644 --- a/functions.c +++ b/functions.c @@ -217,8 +217,8 @@ void FUNCTION_Select(FUNCTION_Type_t Function) if(!DTMF_Reply()) { #ifdef ENABLE_MDC1200 - // if (g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOT || g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOTH) - if(1) + // if (g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOT || g_current_vfo->channel.mdc1200_mode == MDC1200_MODE_BOTH) + if(gEeprom.ROGER == ROGER_MODE_MDC_HEAD||gEeprom.ROGER==ROGER_MODE_MDC_BOTH||gEeprom.ROGER==ROGER_MODE_MDC_HEAD_ROGER) { SYSTEM_DelayMs(30); diff --git a/radio.c b/radio.c index 137150f..a2ae41c 100644 --- a/radio.c +++ b/radio.c @@ -1126,10 +1126,10 @@ void RADIO_PrepareCssTX(void) void RADIO_SendEndOfTransmission(void) { - if (gEeprom.ROGER == ROGER_MODE_ROGER) + if (gEeprom.ROGER == ROGER_MODE_ROGER||gEeprom.ROGER==ROGER_MODE_MDC_HEAD_ROGER) BK4819_PlayRoger(); else - if (gEeprom.ROGER == ROGER_MODE_MDC) { + if (gEeprom.ROGER == ROGER_MODE_MDC_END||gEeprom.ROGER==ROGER_MODE_MDC_BOTH) { BK4819_send_MDC1200(MDC1200_OP_CODE_POST_ID, 0x00, MDC_ID, false); #ifdef ENABLE_MDC1200_SIDE_BEEP diff --git a/settings.h b/settings.h index 27d740a..1571804 100644 --- a/settings.h +++ b/settings.h @@ -115,7 +115,11 @@ typedef enum ALARM_Mode_t ALARM_Mode_t; enum ROGER_Mode_t { ROGER_MODE_OFF = 0, ROGER_MODE_ROGER, - ROGER_MODE_MDC + ROGER_MODE_MDC_END, + ROGER_MODE_MDC_HEAD, + ROGER_MODE_MDC_BOTH, + ROGER_MODE_MDC_HEAD_ROGER + }; typedef enum ROGER_Mode_t ROGER_Mode_t;