diff --git a/app/main.c b/app/main.c index bf74cb7..57fc74b 100644 --- a/app/main.c +++ b/app/main.c @@ -913,10 +913,10 @@ void MAIN_Key_UP_DOWN(bool key_pressed, bool key_held, scan_state_dir_t Directio // // TODO: include this once we have the entire eeprom loaded // - if (!key_held && key_pressed) - g_tx_vfo->frequency_channel = BOARD_find_channel(frequency); - else - if (key_held && key_pressed) + //if (!key_held && key_pressed) + // g_tx_vfo->frequency_channel = BOARD_find_channel(frequency); + //else + //if (key_held && key_pressed) g_tx_vfo->frequency_channel = 0xff; if (new_band != old_band) diff --git a/app/menu.c b/app/menu.c index 44e161a..092ad4f 100644 --- a/app/menu.c +++ b/app/menu.c @@ -81,7 +81,7 @@ void MENU_start_css_scan(int8_t Direction) g_css_scan_mode = CSS_SCAN_MODE_SCANNING; g_update_status = true; - g_MENU_SCRAMBLERoll_direction = Direction; + g_menu_scroll_direction = Direction; RADIO_select_vfos(); @@ -895,7 +895,7 @@ void MENU_SelectNextCode(void) else return; - g_sub_menu_selection = NUMBER_AddWithWraparound(g_sub_menu_selection, g_MENU_SCRAMBLERoll_direction, 1, UpperLimit); + g_sub_menu_selection = NUMBER_AddWithWraparound(g_sub_menu_selection, g_menu_scroll_direction, 1, UpperLimit); if (g_menu_cursor == MENU_RX_CDCSS) { @@ -1934,7 +1934,7 @@ void MENU_process_key(key_code_t Key, bool key_pressed, bool key_held) { if (g_menu_cursor == MENU_VOLTAGE || #ifdef ENABLE_F_CAL_MENU - g_menu_cursor == MENU_F_CALI || + g_menu_cursor == MENU_F_CALI || #endif g_menu_cursor == MENU_BAT_CAL) { diff --git a/driver/bk4819.c b/driver/bk4819.c index a998cc5..50b2e87 100644 --- a/driver/bk4819.c +++ b/driver/bk4819.c @@ -2015,7 +2015,8 @@ void BK4819_PlayRogerMDC1200(void) BK4819_WriteRegister(BK4819_REG_70, // 0 0000000 1 1100000 ( 0u << 15) | ( 0u << 8) | - ( 1u << 7) | +// ( 1u << 7) | + ( 0u << 7) | (96u << 0)); // Set FSK data length diff --git a/firmware.bin b/firmware.bin index 4628411..3a676c4 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 32f36ec..77ca60d 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/ui/main.c b/ui/main.c index 48d78fa..bd2bfbb 100644 --- a/ui/main.c +++ b/ui/main.c @@ -400,7 +400,9 @@ void UI_update_rssi(const int16_t rssi, const int vfo) void UI_DisplayMain(void) { - const unsigned int smallest_char_spacing = ARRAY_SIZE(g_font3x5[0]) + 1; + #ifndef ENABLE_BIG_FREQ + const unsigned int smallest_char_spacing = ARRAY_SIZE(g_font3x5[0]) + 1; + #endif const unsigned int line0 = 0; // text screen line const unsigned int line1 = 4; char String[17]; diff --git a/ui/menu.c b/ui/menu.c index 70ccc9b..187f1ea 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -383,7 +383,7 @@ uint8_t g_menu_list_sorted[ARRAY_SIZE(g_menu_list)]; bool g_is_in_sub_menu; uint8_t g_menu_cursor; -int8_t g_MENU_SCRAMBLERoll_direction; +int8_t g_menu_scroll_direction; int32_t g_sub_menu_selection; // edit box diff --git a/ui/menu.h b/ui/menu.h index 8fbab06..f7a077f 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -194,7 +194,7 @@ extern const char g_sub_MENU_SCRAMBLERAMBLER[11][7]; extern bool g_is_in_sub_menu; extern uint8_t g_menu_cursor; -extern int8_t g_MENU_SCRAMBLERoll_direction; +extern int8_t g_menu_scroll_direction; extern int32_t g_sub_menu_selection; extern char g_edit_original[17];