diff --git a/app/action.c b/app/action.c index bf86868..ad8e9f8 100644 --- a/app/action.c +++ b/app/action.c @@ -81,6 +81,7 @@ void ACTION_Monitor(void) if (g_rx_vfo->channel_save >= NOAA_CHANNEL_FIRST && g_is_noaa_mode) g_noaa_channel = g_rx_vfo->channel_save - NOAA_CHANNEL_FIRST; #endif + g_monitor_enabled = true; RADIO_setup_registers(true); APP_start_listening(FUNCTION_MONITOR, false); return; diff --git a/app/app.c b/app/app.c index 7e25de0..f2c6568 100644 --- a/app/app.c +++ b/app/app.c @@ -2827,7 +2827,7 @@ Skip: g_vfo_rssi_bar_level[0] = 0; g_vfo_rssi_bar_level[1] = 0; - g_flag_reconfigure_vfos= false; + g_flag_reconfigure_vfos = false; if (g_monitor_enabled) ACTION_Monitor(); // 1of11 diff --git a/app/main.c b/app/main.c index 717e46d..c5f67f9 100644 --- a/app/main.c +++ b/app/main.c @@ -475,7 +475,11 @@ void MAIN_Key_DIGITS(key_code_t Key, bool key_pressed, bool key_held) g_tx_vfo->freq_config_rx.frequency = Frequency; - g_request_save_channel = 1; + // 1of11 .. test to prevent the monitor being turned off +// g_request_save_channel = 1; + SETTINGS_SaveChannel(g_tx_vfo->channel_save, g_eeprom.tx_vfo, g_tx_vfo, 1); + RADIO_setup_registers(true); + return; } @@ -807,7 +811,7 @@ void MAIN_Key_UP_DOWN(bool key_pressed, bool key_held, scan_state_dir_t Directio #endif // only update eeprom when the key is released - saves a LOT of wear and tear on the little eeprom - g_flag_save_channel = 1; + SETTINGS_SaveChannel(g_tx_vfo->channel_save, g_eeprom.tx_vfo, g_tx_vfo, 1); #if defined(ENABLE_UART) && defined(ENABLE_UART_DEBUG) // UART_printf("save chan\r\n"); @@ -876,7 +880,7 @@ void MAIN_Key_UP_DOWN(bool key_pressed, bool key_held, scan_state_dir_t Directio g_request_save_channel = 1; } else - { // don't need to go through all the other stuff .. lets speed things up !! + { // don't need to go through all the other stuff .. lets speed things up ! #ifdef ENABLE_SQ_OPEN_WITH_UP_DN_BUTTS if (!key_held && key_pressed) diff --git a/driver/bk4819.c b/driver/bk4819.c index 6616c43..a998cc5 100644 --- a/driver/bk4819.c +++ b/driver/bk4819.c @@ -753,7 +753,8 @@ void BK4819_set_rf_frequency(const uint32_t frequency, const bool trigger_update // trigger a PLL/VCO update // const uint16_t reg = BK4819_ReadRegister(BK4819_REG_30); - BK4819_WriteRegister(BK4819_REG_30, reg & ~(1u << 15) & (15u << 4)); +// BK4819_WriteRegister(BK4819_REG_30, reg & ~(1u << 15) & (15u << 4)); + BK4819_WriteRegister(BK4819_REG_30, 0x0200); BK4819_WriteRegister(BK4819_REG_30, reg); } } diff --git a/firmware.bin b/firmware.bin index e6d8160..dd7d0ba 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 1477185..8da5926 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ