diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8e280e6..55ce1f5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -20,7 +20,13 @@ - + + + + + + + diff --git a/main.c b/main.c index 666d492..33f5998 100644 --- a/main.c +++ b/main.c @@ -49,7 +49,7 @@ void _putchar(char c) void Main(void) { - BOOT_Mode_t BootMode; + //BOOT_Mode_t BootMode; // Enable clock gating of blocks we need SYSCON_DEV_CLK_GATE = 0 @@ -86,7 +86,9 @@ void Main(void) SETTINGS_InitEEPROM(); SETTINGS_LoadCalibration(); - +#ifdef ENABLE_MDC1200 + MDC1200_init(); +#endif RADIO_ConfigureChannel(0, VFO_CONFIGURE_RELOAD); RADIO_ConfigureChannel(1, VFO_CONFIGURE_RELOAD); @@ -98,27 +100,23 @@ void Main(void) BOARD_ADC_GetBatteryInfo(&gBatteryVoltages[i], &gBatteryCurrent); BATTERY_GetReadings(false); -#ifdef ENABLE_MDC1200 - MDC1200_init(); -#endif + #ifdef ENABLE_AM_FIX AM_fix_init(); #endif - BootMode = BOOT_GetMode(); + //BootMode = BOOT_GetMode(); - if (BootMode == BOOT_MODE_F_LOCK) - { - gF_LOCK = true; // flag to say include the hidden menu items - gMenuListCount = 49; - }else gMenuListCount=41; +// if (BootMode == BOOT_MODE_F_LOCK) + gMenuListCount = 48; + // wait for user to release all butts before moving on - if (/*!GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) ||*/ - KEYBOARD_Poll() != KEY_INVALID || - BootMode != BOOT_MODE_NORMAL) - { // keys are pressed - UI_DisplayReleaseKeys(BootMode); +// if (/*!GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) ||*/ +// KEYBOARD_Poll() != KEY_INVALID || +// BootMode != BOOT_MODE_NORMAL) +// { // keys are pressed +// UI_DisplayReleaseKeys(BootMode); BACKLIGHT_TurnOn(); while (KEYBOARD_Poll() != KEY_INVALID) // 500ms { @@ -126,7 +124,7 @@ void Main(void) gKeyReading0 = KEY_INVALID; gKeyReading1 = KEY_INVALID; gDebounceCounter = 0; - } +// } //close PS // if (!gChargingWithTypeC && gBatteryDisplayLevel == 0) // { diff --git a/misc.c b/misc.c index d567f97..b3a12f1 100644 --- a/misc.c +++ b/misc.c @@ -226,7 +226,6 @@ bool gIsNoaaMode; bool gUpdateDisplay; -bool gF_LOCK = false; uint8_t gShowChPrefix; diff --git a/misc.h b/misc.h index a8d4083..a875428 100644 --- a/misc.h +++ b/misc.h @@ -310,7 +310,6 @@ extern bool gIsNoaaMode; #endif extern volatile bool gNextTimeslice; extern bool gUpdateDisplay; -extern bool gF_LOCK; #ifdef ENABLE_FMRADIO extern uint8_t gFM_ChannelPosition; #endif diff --git a/radio.c b/radio.c index 4a030c8..137150f 100644 --- a/radio.c +++ b/radio.c @@ -780,6 +780,12 @@ void RADIO_SetupRegisters(bool switchToForeground) BK4819_DisableDTMF(); BK4819_EnableDTMF(); InterruptMask |= BK4819_REG_3F_DTMF_5TONE_FOUND; + +#ifdef ENABLE_MDC1200 + BK4819_enable_mdc1200_rx(true); + InterruptMask |= BK4819_REG_3F_FSK_RX_SYNC | BK4819_REG_3F_FSK_RX_FINISHED | BK4819_REG_3F_FSK_FIFO_ALMOST_FULL; +#endif + } else {