Merge pull request #92 from kamilsss655/rc19.10

Rc19.10

app/app.c

@@ -1669,10 +1669,9 @@ static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			SETTINGS_SaveChannel(gTxVfo->CHANNEL_SAVE, gEeprom.TX_VFO, gTxVfo, gFlagSaveChannel);
 			gFlagSaveChannel = false;
 
-			RADIO_ConfigureChannel(gEeprom.TX_VFO, VFO_CONFIGURE);
-			RADIO_SetupRegisters(true);
-
-			GUI_SelectNextDisplay(DISPLAY_MAIN);
+			if (!SCANNER_IsScanning() && gVfoConfigureMode == VFO_CONFIGURE_NONE)
+				// gVfoConfigureMode is so as we don't wipe out previously setting this variable elsewhere
+				gVfoConfigureMode = VFO_CONFIGURE;
 		}
 	}
 	else // key pressed or held

app/generic.c

@@ -238,5 +238,5 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 	gUpdateDisplay = true;
 
 	//done tx - restore squelch here
-	gVfoConfigureMode = VFO_CONFIGURE;
+	RADIO_ConfigureSquelchAndOutputPower(gCurrentVfo);
 }

app/main.c

@@ -146,9 +146,8 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 						RADIO_ApplyTxOffset(gRxVfo);
 						RADIO_ConfigureSquelchAndOutputPower(gRxVfo);
 						RADIO_SetupRegisters(true);
-
-						//SETTINGS_SaveChannel(channel, gEeprom.RX_VFO, gRxVfo, 1);
-
+
+						gRequestSaveChannel = 1;
 						gUpdateDisplay = true;
 					}
 				}
@@ -714,7 +713,8 @@ static void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
 				}
 
 				gTxVfo->freq_config_RX.Frequency = frequency;
-
+				BK4819_SetFrequency(frequency);
+				BK4819_RX_TurnOn();
 				gRequestSaveChannel = 1;
 				return;
 			}

driver/backlight.c

@@ -28,7 +28,9 @@ bool backlightOn;
 void BACKLIGHT_InitHardware()
 {
 	// 48MHz / 94 / 1024 ~ 500Hz
-	const uint32_t PWM_FREQUENCY_HZ =  1000;
+	// kamilsss655: needs to be higher than audible frequency otherwise it will
+	// be heard on the receiving radio if the screen is dimmed during tx
+	const uint32_t PWM_FREQUENCY_HZ =  6000;
 	PWM_PLUS0_CLKSRC |= ((48000000 / 1024 / PWM_FREQUENCY_HZ) << 16);
 	PWM_PLUS0_PERIOD = 1023;