From b3c7938d79ad5b42099c813d2d36e1425f770547 Mon Sep 17 00:00:00 2001
From: linoobs <antoha-k@hotmail.com>
Date: Sat, 7 May 2022 12:07:41 +0200
Subject: [PATCH] .

---
 FPGA/WOLF-LITE.qws             | Bin 669 -> 48 bytes
 FPGA/db/WOLF-LITE.db_info      |   2 +-
 STM32/Core/Src/front_unit.c    |   6 +++++-
 STM32/Core/Src/settings.h      |   4 ++--
 STM32/MDK-ARM/WOLF-Lite.uvoptx |   4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/FPGA/WOLF-LITE.qws b/FPGA/WOLF-LITE.qws
index ae8ff08efa5eae05f076525dc93270fcd1fa43a8..63563b76eda4b19c3f4f321afd3f1b7df67b8d5e 100644
GIT binary patch
delta 11
PcmbQsYA`{Yl>r0*4tD{Q

literal 669
zcmbV|!AiqG5QhIm3q5+Q;=zMR5n7snsCW^ff>02o;8Bt`)zWH8jCc^i*YFX17B60X
z7qxz~B$psLxXaA!%=|O+&mOl`o=wda>0Y_6^r%#sW_Sx?BPD=5WJ8xa*FdN0pwBc^
zUtPr-Yf>NvdeT0TK!;Qv5D&qIL}L67@c?wdD^icVWqaHZi9k=#d#+=m=lY38$a_OA
z5q+DI8tan(!eh0NCbs!iI2ifJ4(t<V<=WDT9<VtZ-{B3hDL)azBQvO$9J9q)WBG(T
zc94-~e}Nn|3fj8RRM)!s&m?QSf^0idi+ZY#U4?3k-R5iqNs9YWp1M6VqgUOlSprD<
tN0m-S!-{t4m=?cvOV66Wvk}!9UGMYb-8FJqQ;inmUQ3s;KPKk;`UMZzY{LKm

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 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -4377,7 +4377,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>