diff --git a/FPGA/WOLF-LITE.qws b/FPGA/WOLF-LITE.qws index ae8ff08..63563b7 100644 Binary files a/FPGA/WOLF-LITE.qws and b/FPGA/WOLF-LITE.qws differ diff --git a/FPGA/db/WOLF-LITE.db_info b/FPGA/db/WOLF-LITE.db_info index 1e7858e..17ac3cd 100644 --- a/FPGA/db/WOLF-LITE.db_info +++ b/FPGA/db/WOLF-LITE.db_info @@ -1,3 +1,3 @@ Quartus_Version = Version 18.1.0 Build 625 09/12/2018 SJ Standard Edition Version_Index = 486699264 -Creation_Time = Fri Feb 12 17:16:23 2021 +Creation_Time = Sat May 07 10:26:54 2022 diff --git a/STM32/Core/Src/front_unit.c b/STM32/Core/Src/front_unit.c index 5df433f..3f6cd9e 100644 --- a/STM32/Core/Src/front_unit.c +++ b/STM32/Core/Src/front_unit.c @@ -143,7 +143,7 @@ static PERIPH_FrontPanel_Button PERIPH_FrontPanel_BottomScroll_Buttons[BOTTOM_SC {.port = 1, .channel = 6, .name = "CLAR", .tres_min = 300, .tres_max = 500, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_CLAR, .holdHandler = FRONTPANEL_BUTTONHANDLER_CLAR}, //SB3 }, { - {.port = 1, .channel = 5, .name = "VOLUME", .tres_min = 500, .tres_max = 700, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_VOLUME, .holdHandler = FRONTPANEL_BUTTONHANDLER_VOLUME}, //SB2 + {.port = 1, .channel = 5, .name = "GAIN", .tres_min = 500, .tres_max = 700, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_GAIN, .holdHandler = FRONTPANEL_BUTTONHANDLER_GAIN}, //SB2 {.port = 1, .channel = 5, .name = "BANDMAP", .tres_min = 300, .tres_max = 500, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BANDMAP, .holdHandler = FRONTPANEL_BUTTONHANDLER_BANDMAP}, //SB3 {.port = 1, .channel = 5, .name = "MUTE", .tres_min = 10, .tres_max = 300, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_MUTE, .holdHandler = FRONTPANEL_BUTTONHANDLER_MUTE}, //SB4 {.port = 1, .channel = 6, .name = "LOCK", .tres_min = 500, .tres_max = 700, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_LOCK, .holdHandler = FRONTPANEL_BUTTONHANDLER_LOCK}, //SB5 @@ -655,6 +655,10 @@ void FRONTPANEL_BUTTONHANDLER_ZOOM_P(void) void FRONTPANEL_BUTTONHANDLER_AsB(void) // A/B { + // TX block + if (TRX_on_TX()) + return; + TRX_TemporaryMute(); TRX.current_vfo = !TRX.current_vfo; TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO()); diff --git a/STM32/Core/Src/settings.h b/STM32/Core/Src/settings.h index 4f2d5c6..724b1d1 100644 --- a/STM32/Core/Src/settings.h +++ b/STM32/Core/Src/settings.h @@ -23,12 +23,12 @@ #ifdef FRONT_ALEX_61_440 #define ADC_CLOCK 61440000 // ADC generator frequency калибровка частоты генератора #define DAC_CLOCK 153600000 // DAC generator frequency -#define BUTTONS_R7KBI false //Author board buttons +//#define BUTTONS_R7KBI false //Author board buttons #endif #ifdef FRONT_ALEX_64_320 #define ADC_CLOCK (int32_t)(64320000 + (CALIBRATE.vcxo_calibration)) // ADC generator frequency калибровка частоты генератора #define DAC_CLOCK (int32_t)(160800000 + (CALIBRATE.vcxo_calibration)) // DAC generator frequency -#define BUTTONS_R7KBI false //Author board buttons +//#define BUTTONS_R7KBI false //Author board buttons #endif //#define ADC_CLOCK 64320000 // ADC generator frequency eaeea?iaea ?anoiou aaia?aoi?a diff --git a/STM32/MDK-ARM/WOLF-Lite.uvoptx b/STM32/MDK-ARM/WOLF-Lite.uvoptx index 6038d9d..f0369fe 100644 --- a/STM32/MDK-ARM/WOLF-Lite.uvoptx +++ b/STM32/MDK-ARM/WOLF-Lite.uvoptx @@ -2943,7 +2943,7 @@ 1 0 - 0 + 1 18 @@ -4377,7 +4377,7 @@ 1 0 - 1 + 0 18