diff --git a/STM32/Core/Src/settings.c b/STM32/Core/Src/settings.c
index fc5baf6..e49717b 100644
--- a/STM32/Core/Src/settings.c
+++ b/STM32/Core/Src/settings.c
@@ -294,17 +294,18 @@ void LoadCalibration(bool clear)
CALIBRATE.rf_out_power_10m = 22; //10m
CALIBRATE.VCXO_CALIBR = 0;
-// CALIBRATE.freq_correctur_160 = 0;
-// CALIBRATE.freq_correctur_80 = 0;
-// CALIBRATE.freq_correctur_40 = 0;
-// CALIBRATE.freq_correctur_30 = 0;
-// CALIBRATE.freq_correctur_20 = 0;
-// CALIBRATE.freq_correctur_17 = 0;
-// CALIBRATE.freq_correctur_15 = 0;
-// CALIBRATE.freq_correctur_12 = 0;
-// CALIBRATE.freq_correctur_10 = 0;
-// CALIBRATE.freq_correctur_sibi = 0;
-// CALIBRATE.freq_correctur_52 = 0;
+ CALIBRATE.VCXO_CALIBRT = 0;
+ CALIBRATE.freq_correctur_160 = 0;
+ CALIBRATE.freq_correctur_80 = 0;
+ CALIBRATE.freq_correctur_40 = 0;
+ CALIBRATE.freq_correctur_30 = 0;
+ CALIBRATE.freq_correctur_20 = 0;
+ CALIBRATE.freq_correctur_17 = 0;
+ CALIBRATE.freq_correctur_15 = 0;
+ CALIBRATE.freq_correctur_12 = 0;
+ CALIBRATE.freq_correctur_10 = 0;
+ CALIBRATE.freq_correctur_sibi = 0;
+ CALIBRATE.freq_correctur_52 = 0;
CALIBRATE.rf_out_power_lf = 40; // <2mhz
CALIBRATE.rf_out_power_hf_low = 45; // <5mhz
diff --git a/STM32/Core/Src/settings.h b/STM32/Core/Src/settings.h
index 052d430..c215e89 100644
--- a/STM32/Core/Src/settings.h
+++ b/STM32/Core/Src/settings.h
@@ -10,9 +10,9 @@
#define SETT_VERSION 101 // Settings config version
#define CALIB_VERSION 100 // Calibration config version
//#define ADC_CLOCK (int32_t)(64320000 + (CALIBRATE.VCXO_CALIBR * 10)) // ADC generator frequency калибровка частоты генератора
-//#define DAC_CLOCK (int32_t)(160800000 + (CALIBRATE.VCXO_CALIBR * 10)) // DAC generator frequency
-#define ADC_CLOCK (int32_t)(61440000 + (CALIBRATE.VCXO_CALIBR * 10)) // ADC generator frequency калибровка частоты генератора
-#define DAC_CLOCK (int32_t)(153600000 + (CALIBRATE.VCXO_CALIBR * 10)) // DAC generator frequency
+//#define DAC_CLOCK (int32_t)(160800000 + (CALIBRATE.VCXO_CALIBRT * 10)) // DAC generator frequency
+#define ADC_CLOCK 61440000 // ADC generator frequency калибровка частоты генератора
+#define DAC_CLOCK 153600000 // DAC generator frequency
#define MAX_RX_FREQ_HZ 750000000 // Maximum receive frequency (from the ADC datasheet)
#define MAX_TX_FREQ_HZ (DAC_CLOCK / 2) // Maximum transmission frequency
#define TRX_SAMPLERATE 48000 // audio stream sampling rate during processing
@@ -206,6 +206,7 @@ extern struct TRX_CALIBRATE
uint8_t flash_id; //eeprom check
int16_t VCXO_CALIBR;
+ int16_t VCXO_CALIBRT;
bool ENCODER_INVERT;
bool ENCODER2_INVERT;
uint8_t ENCODER_DEBOUNCE;
@@ -217,6 +218,18 @@ extern struct TRX_CALIBRATE
uint8_t DAC_GAINER_val;
uint8_t rf_out_power_lf;
+ int16_t freq_correctur_160;
+ int16_t freq_correctur_80;
+ int16_t freq_correctur_40;
+ int16_t freq_correctur_30;
+ int16_t freq_correctur_20;
+ int16_t freq_correctur_17;
+ int16_t freq_correctur_15;
+ int16_t freq_correctur_12;
+ int16_t freq_correctur_10;
+ int16_t freq_correctur_sibi;
+ int16_t freq_correctur_52;
+
uint8_t rf_out_power_hf_low;
uint8_t rf_out_power_hf;
uint8_t rf_out_power_hf_high;
diff --git a/STM32/Core/Src/system_menu.c b/STM32/Core/Src/system_menu.c
index 01f2a60..5a56a04 100644
--- a/STM32/Core/Src/system_menu.c
+++ b/STM32/Core/Src/system_menu.c
@@ -123,7 +123,19 @@ static void SYSMENU_HANDL_CALIB_RF_GAIN_17M(int8_t direction);
static void SYSMENU_HANDL_CALIB_RF_GAIN_15M(int8_t direction);
static void SYSMENU_HANDL_CALIB_RF_GAIN_12M(int8_t direction);
static void SYSMENU_HANDL_CALIB_RF_GAIN_10M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_160M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_80M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_40M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_30M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_20M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_17M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_15M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_12M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_10M(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_SIBI(int8_t direction);
+static void SYSMENU_HANDL_CALIB_FREQUENCY_52(int8_t direction);
static void SYSMENU_HANDL_VCXO_CALIBR(int8_t direction);
+static void SYSMENU_HANDL_VCXO_CALIBRT(int8_t direction);
static void SYSMENU_HANDL_TRXMENU(int8_t direction);
static void SYSMENU_HANDL_AUDIOMENU(int8_t direction);
@@ -263,7 +275,19 @@ static const struct sysmenu_item_handler sysmenu_calibration_handlers[] =
{"S METER", SYSMENU_INT16, (uint32_t *)&CALIBRATE.smeter_calibration, SYSMENU_HANDL_CALIB_S_METER},
{"SWR TRANS RATE", SYSMENU_FLOAT32, (uint32_t *)&CALIBRATE.swr_trans_rate, SYSMENU_HANDL_CALIB_SWR_TRANS_RATE},
{"VOLT CALIBR", SYSMENU_FLOAT32, (uint32_t *)&CALIBRATE.volt_cal_rate, SYSMENU_HANDL_CALIB_VOLT},
- {"VCXO Correctur", SYSMENU_INT16, (uint32_t *)&CALIBRATE.VCXO_CALIBR, SYSMENU_HANDL_VCXO_CALIBR},
+// {"VCXO Cor-RX", SYSMENU_INT16, (uint32_t *)&CALIBRATE.VCXO_CALIBR, SYSMENU_HANDL_VCXO_CALIBR},
+// {"VCXO Cor-TX", SYSMENU_INT16, (uint32_t *)&CALIBRATE.VCXO_CALIBRT, SYSMENU_HANDL_VCXO_CALIBRT},
+ {"F-correctur 160m", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_160, SYSMENU_HANDL_CALIB_FREQUENCY_160M},
+ {"F-correctur 80m", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_80, SYSMENU_HANDL_CALIB_FREQUENCY_80M},
+ {"F-correctur 40m", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_40, SYSMENU_HANDL_CALIB_FREQUENCY_40M},
+ {"F-correctur 30m", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_30, SYSMENU_HANDL_CALIB_FREQUENCY_30M},
+ {"F-correctur 20m", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_20, SYSMENU_HANDL_CALIB_FREQUENCY_20M},
+ {"F-correctur 17m", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_17, SYSMENU_HANDL_CALIB_FREQUENCY_17M},
+ {"F-correctur 15m", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_15, SYSMENU_HANDL_CALIB_FREQUENCY_15M},
+ {"F-correctur 12m", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_12, SYSMENU_HANDL_CALIB_FREQUENCY_12M},
+ {"F-correctur 27MHz", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_sibi, SYSMENU_HANDL_CALIB_FREQUENCY_SIBI},
+ {"F-correctur 10m", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_10, SYSMENU_HANDL_CALIB_FREQUENCY_10M},
+ {"F-correctur 52MHz", SYSMENU_INT16, (uint32_t *)&CALIBRATE.freq_correctur_52, SYSMENU_HANDL_CALIB_FREQUENCY_52},
{"RF GAIN 160m", SYSMENU_UINT8, (uint32_t *)&CALIBRATE.rf_out_power_160m, SYSMENU_HANDL_CALIB_RF_GAIN_160M},
{"RF GAIN 80m", SYSMENU_UINT8, (uint32_t *)&CALIBRATE.rf_out_power_80m, SYSMENU_HANDL_CALIB_RF_GAIN_80M},
{"RF GAIN 40m", SYSMENU_UINT8, (uint32_t *)&CALIBRATE.rf_out_power_40m, SYSMENU_HANDL_CALIB_RF_GAIN_40M},
@@ -2008,122 +2032,134 @@ static void SYSMENU_HANDL_CALIB_VOLT(int8_t direction)
static void SYSMENU_HANDL_VCXO_CALIBR(int8_t direction)
{
CALIBRATE.VCXO_CALIBR += direction;
- if (CALIBRATE.VCXO_CALIBR < -500)
- CALIBRATE.VCXO_CALIBR = -500;
- if (CALIBRATE.VCXO_CALIBR > 500)
- CALIBRATE.VCXO_CALIBR = 500;
+ if (CALIBRATE.VCXO_CALIBR < -1000)
+ CALIBRATE.VCXO_CALIBR = -1000;
+ if (CALIBRATE.VCXO_CALIBR > 1000)
+ CALIBRATE.VCXO_CALIBR = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+
+static void SYSMENU_HANDL_VCXO_CALIBRT(int8_t direction)
+{
+ CALIBRATE.VCXO_CALIBRT += direction;
+ if (CALIBRATE.VCXO_CALIBRT < -1000)
+ CALIBRATE.VCXO_CALIBRT = -1000;
+ if (CALIBRATE.VCXO_CALIBRT > 1000)
+ CALIBRATE.VCXO_CALIBRT = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+
+
+ //160M
+static void SYSMENU_HANDL_CALIB_FREQUENCY_160M(int8_t direction)
+{
+ CALIBRATE.freq_correctur_160 += direction;
+ if (CALIBRATE.freq_correctur_160 < -1000)
+ CALIBRATE.freq_correctur_160 = -1000;
+ if (CALIBRATE.freq_correctur_160 > 1000)
+ CALIBRATE.freq_correctur_160 = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+ //80M
+static void SYSMENU_HANDL_CALIB_FREQUENCY_80M(int8_t direction)
+{
+ CALIBRATE.freq_correctur_80 += direction;
+ if (CALIBRATE.freq_correctur_80 < -1000)
+ CALIBRATE.freq_correctur_80 = -1000;
+ if (CALIBRATE.freq_correctur_80 > 1000)
+ CALIBRATE.freq_correctur_80 = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+// 40M
+static void SYSMENU_HANDL_CALIB_FREQUENCY_40M(int8_t direction)
+{
+ CALIBRATE.freq_correctur_40 += direction;
+ if (CALIBRATE.freq_correctur_40 < -1000)
+ CALIBRATE.freq_correctur_40 = -1000;
+ if (CALIBRATE.freq_correctur_40 > 1000)
+ CALIBRATE.freq_correctur_40 = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+// 30M
+static void SYSMENU_HANDL_CALIB_FREQUENCY_30M(int8_t direction)
+{
+ CALIBRATE.freq_correctur_30 += direction;
+ if (CALIBRATE.freq_correctur_30 < -1000)
+ CALIBRATE.freq_correctur_30 = -1000;
+ if (CALIBRATE.freq_correctur_30 > 1000)
+ CALIBRATE.freq_correctur_30 = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+// 20M
+static void SYSMENU_HANDL_CALIB_FREQUENCY_20M(int8_t direction)
+{
+ CALIBRATE.freq_correctur_20 += direction;
+ if (CALIBRATE.freq_correctur_20 < -1000)
+ CALIBRATE.freq_correctur_20 = -1000;
+ if (CALIBRATE.freq_correctur_20 > 1000)
+ CALIBRATE.freq_correctur_20 = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+// 17M
+static void SYSMENU_HANDL_CALIB_FREQUENCY_17M(int8_t direction)
+{
+ CALIBRATE.freq_correctur_17 += direction;
+ if (CALIBRATE.freq_correctur_17 < -1000)
+ CALIBRATE.freq_correctur_17 = -1000;
+ if (CALIBRATE.freq_correctur_17 > 1000)
+ CALIBRATE.freq_correctur_17 = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+// 15M
+static void SYSMENU_HANDL_CALIB_FREQUENCY_15M(int8_t direction)
+{
+ CALIBRATE.freq_correctur_15 += direction;
+ if (CALIBRATE.freq_correctur_15 < -1000)
+ CALIBRATE.freq_correctur_15 = -1000;
+ if (CALIBRATE.freq_correctur_15 > 1000)
+ CALIBRATE.freq_correctur_15 = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+// 12M
+static void SYSMENU_HANDL_CALIB_FREQUENCY_12M(int8_t direction)
+{
+ CALIBRATE.freq_correctur_12 += direction;
+ if (CALIBRATE.freq_correctur_12 < -1000)
+ CALIBRATE.freq_correctur_12 = -1000;
+ if (CALIBRATE.freq_correctur_12 > 1000)
+ CALIBRATE.freq_correctur_12 = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+// 10M
+static void SYSMENU_HANDL_CALIB_FREQUENCY_10M(int8_t direction)
+{
+ CALIBRATE.freq_correctur_10 += direction;
+ if (CALIBRATE.freq_correctur_10 < -1000)
+ CALIBRATE.freq_correctur_10 = -1000;
+ if (CALIBRATE.freq_correctur_10 > 1000)
+ CALIBRATE.freq_correctur_10 = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+// SiBi
+static void SYSMENU_HANDL_CALIB_FREQUENCY_SIBI(int8_t direction)
+{
+ CALIBRATE.freq_correctur_sibi += direction;
+ if (CALIBRATE.freq_correctur_sibi < -1000)
+ CALIBRATE.freq_correctur_sibi = -1000;
+ if (CALIBRATE.freq_correctur_sibi > 1000)
+ CALIBRATE.freq_correctur_sibi = 1000;
+ TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
+}
+// 52Hz
+static void SYSMENU_HANDL_CALIB_FREQUENCY_52(int8_t direction)
+{
+ CALIBRATE.freq_correctur_52 += direction;
+ if (CALIBRATE.freq_correctur_52 < -1000)
+ CALIBRATE.freq_correctur_52 = -1000;
+ if (CALIBRATE.freq_correctur_52 > 1000)
+ CALIBRATE.freq_correctur_52 = 1000;
TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
}
-//// 160M
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_160M(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_160 += direction;
-// if (CALIBRATE.freq_correctur_160 < -1000)
-// CALIBRATE.freq_correctur_160 = -1000;
-// if (CALIBRATE.freq_correctur_160 > 1000)
-// CALIBRATE.freq_correctur_160 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// 80M
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_80M(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_80 += direction;
-// if (CALIBRATE.freq_correctur_80 < -1000)
-// CALIBRATE.freq_correctur_80 = -1000;
-// if (CALIBRATE.freq_correctur_80 > 1000)
-// CALIBRATE.freq_correctur_80 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// 40M
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_40M(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_40 += direction;
-// if (CALIBRATE.freq_correctur_40 < -1000)
-// CALIBRATE.freq_correctur_40 = -1000;
-// if (CALIBRATE.freq_correctur_40 > 1000)
-// CALIBRATE.freq_correctur_40 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// 30M
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_30M(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_30 += direction;
-// if (CALIBRATE.freq_correctur_30 < -1000)
-// CALIBRATE.freq_correctur_30 = -1000;
-// if (CALIBRATE.freq_correctur_30 > 1000)
-// CALIBRATE.freq_correctur_30 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// 20M
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_20M(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_20 += direction;
-// if (CALIBRATE.freq_correctur_20 < -1000)
-// CALIBRATE.freq_correctur_20 = -1000;
-// if (CALIBRATE.freq_correctur_20 > 1000)
-// CALIBRATE.freq_correctur_20 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// 17M
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_17M(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_17 += direction;
-// if (CALIBRATE.freq_correctur_17 < -1000)
-// CALIBRATE.freq_correctur_17 = -1000;
-// if (CALIBRATE.freq_correctur_17 > 1000)
-// CALIBRATE.freq_correctur_17 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// 15M
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_15M(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_15 += direction;
-// if (CALIBRATE.freq_correctur_15 < -1000)
-// CALIBRATE.freq_correctur_15 = -1000;
-// if (CALIBRATE.freq_correctur_15 > 1000)
-// CALIBRATE.freq_correctur_15 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// 12M
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_12M(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_12 += direction;
-// if (CALIBRATE.freq_correctur_12 < -1000)
-// CALIBRATE.freq_correctur_12 = -1000;
-// if (CALIBRATE.freq_correctur_12 > 1000)
-// CALIBRATE.freq_correctur_12 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// 10M
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_10M(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_10 += direction;
-// if (CALIBRATE.freq_correctur_10 < -1000)
-// CALIBRATE.freq_correctur_10 = -1000;
-// if (CALIBRATE.freq_correctur_10 > 1000)
-// CALIBRATE.freq_correctur_10 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// SiBi
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_SIBI(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_sibi += direction;
-// if (CALIBRATE.freq_correctur_sibi < -1000)
-// CALIBRATE.freq_correctur_sibi = -1000;
-// if (CALIBRATE.freq_correctur_sibi > 1000)
-// CALIBRATE.freq_correctur_sibi = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
-//// 52Hz
-//static void SYSMENU_HANDL_CALIB_FREQUENCY_52(int8_t direction)
-//{
-// CALIBRATE.freq_correctur_52 += direction;
-// if (CALIBRATE.freq_correctur_52 < -1000)
-// CALIBRATE.freq_correctur_52 = -1000;
-// if (CALIBRATE.freq_correctur_52 > 1000)
-// CALIBRATE.freq_correctur_52 = 1000;
-// TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
-//}
//##########################################################################################################
//SERVICES
void SYSMENU_HANDL_SERVICESMENU(int8_t direction)
diff --git a/STM32/Core/Src/trx_manager.c b/STM32/Core/Src/trx_manager.c
index 8b4ebcc..2653b33 100644
--- a/STM32/Core/Src/trx_manager.c
+++ b/STM32/Core/Src/trx_manager.c
@@ -171,8 +171,52 @@ void TRX_setFrequency(uint32_t _freq, VFO *vfo)
int8_t band = getBandFromFreq(CurrentVFO()->Freq, true);
VFO *current_vfo = CurrentVFO();
VFO *secondary_vfo = SecondaryVFO();
- TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT);
- TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq);
+// TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT);
+// TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq);
+ switch (band)
+ {
+ case 1:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_160);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_160);
+ break;
+ case 2:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_80);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_80);
+ break;
+ case 4:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_40);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_40);
+ break;
+ case 5:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_30);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_30);
+ break;
+ case 6:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_20);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_20);
+ break;
+ case 7:
+ case 8:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_15);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_15);
+ break;
+ case 9:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_12);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_12);
+ break;
+ case 10:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_sibi);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_sibi);
+ break;
+ case 11:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_10);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_10);
+ break;
+ case 12:
+ TRX_freq_phrase = getRXPhraseFromFrequency((int32_t)current_vfo->Freq + TRX_SHIFT + CALIBRATE.freq_correctur_52);
+ TRX_freq_phrase_tx = getTXPhraseFromFrequency((int32_t)current_vfo->Freq + CALIBRATE.freq_correctur_52);
+ break;
+ }
if (!TRX_on_TX())
{
diff --git a/STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h b/STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h
index 4769186..1ca03f5 100644
--- a/STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h
+++ b/STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h
@@ -1,21 +1,21 @@
-
-/*
- * Auto generated Run-Time-Environment Configuration File
- * *** Do not modify ! ***
- *
- * Project: 'WOLF-Lite'
- * Target: 'WOLF-Lite'
- */
-
-#ifndef RTE_COMPONENTS_H
-#define RTE_COMPONENTS_H
-
-
-/*
- * Define the Device Header File:
- */
-#define CMSIS_device_header "stm32f4xx.h"
-
-
-
-#endif /* RTE_COMPONENTS_H */
+
+/*
+ * Auto generated Run-Time-Environment Configuration File
+ * *** Do not modify ! ***
+ *
+ * Project: 'WOLF-Lite'
+ * Target: 'WOLF-Lite'
+ */
+
+#ifndef RTE_COMPONENTS_H
+#define RTE_COMPONENTS_H
+
+
+/*
+ * Define the Device Header File:
+ */
+#define CMSIS_device_header "stm32f4xx.h"
+
+
+
+#endif /* RTE_COMPONENTS_H */
diff --git a/STM32/MDK-ARM/WOLF-Lite.uvoptx b/STM32/MDK-ARM/WOLF-Lite.uvoptx
index a3169ad..78bb6c1 100644
--- a/STM32/MDK-ARM/WOLF-Lite.uvoptx
+++ b/STM32/MDK-ARM/WOLF-Lite.uvoptx
@@ -152,7 +152,7 @@
0
0
- 99
+ 1930
1
0
0
@@ -161,14 +161,14 @@
0
0
0
- ..\Core\Src\agc.c
+ ..\Core\Src\system_menu.c
1
0
- 165
+ 1940
1
0
0
@@ -177,14 +177,14 @@
0
0
0
- ..\Core\Src\trx_manager.c
+ ..\Core\Src\system_menu.c
2
0
- 506
+ 1941
1
0
0
@@ -200,7 +200,7 @@
3
0
- 810
+ 1950
1
0
0
@@ -209,14 +209,14 @@
0
0
0
- ..\Core\Src\lcd.c
+ ..\Core\Src\system_menu.c
4
0
- 210
+ 1952
1
0
0
@@ -225,14 +225,14 @@
0
0
0
- ..\Core\Src\trx_manager.c
+ ..\Core\Src\system_menu.c
5
0
- 1925
+ 1957
1
0
0
@@ -248,7 +248,7 @@
6
0
- 1640
+ 1960
1
0
0
@@ -264,7 +264,7 @@
7
0
- 390
+ 1963
1
0
0
@@ -273,14 +273,14 @@
0
0
0
- ..\Core\Src\front_unit.c
+ ..\Core\Src\system_menu.c
8
0
- 303
+ 1975
1
0
0
@@ -289,14 +289,14 @@
0
0
0
- ..\Core\Src\front_unit.c
+ ..\Core\Src\system_menu.c
9
0
- 165
+ 1985
1
0
0
@@ -305,14 +305,14 @@
0
0
0
- ..\Core\Src\screen_layout.h
+ ..\Core\Src\system_menu.c
10
0
- 306
+ 1986
1
0
0
@@ -321,14 +321,14 @@
0
0
0
- ..\Core\Src\lcd.c
+ ..\Core\Src\system_menu.c
11
0
- 362
+ 1995
1
0
0
@@ -337,14 +337,14 @@
0
0
0
- ..\Core\Src\front_unit.c
+ ..\Core\Src\system_menu.c
12
0
- 424
+ 1996
1
0
0
@@ -353,14 +353,14 @@
0
0
0
- ..\Core\Src\front_unit.c
+ ..\Core\Src\system_menu.c
13
0
- 1660
+ 1997
1
0
0
@@ -376,7 +376,7 @@
14
0
- 1945
+ 2002
1
0
0
@@ -392,7 +392,7 @@
15
0
- 260
+ 2005
1
0
0
@@ -401,14 +401,14 @@
0
0
0
- ..\Core\Src\trx_manager.c
+ ..\Core\Src\system_menu.c
16
0
- 168
+ 2006
1
0
0
@@ -417,14 +417,14 @@
0
0
0
- ..\Core\Src\screen_layout.h
+ ..\Core\Src\system_menu.c
17
0
- 1643
+ 2007
1
0
0
@@ -440,7 +440,7 @@
18
0
- 1663
+ 2008
1
0
0
@@ -456,7 +456,7 @@
19
0
- 1928
+ 2013
1
0
0
@@ -472,7 +472,7 @@
20
0
- 1948
+ 2015
1
0
0
@@ -488,7 +488,7 @@
21
0
- 307
+ 2016
1
0
0
@@ -497,14 +497,14 @@
0
0
0
- ..\Core\Src\lcd.c
+ ..\Core\Src\system_menu.c
22
0
- 811
+ 2017
1
0
0
@@ -513,14 +513,14 @@
0
0
0
- ..\Core\Src\lcd.c
+ ..\Core\Src\system_menu.c
23
0
- 507
+ 2018
1
0
0
@@ -536,7 +536,7 @@
24
0
- 1650
+ 2024
1
0
0
@@ -552,7 +552,7 @@
25
0
- 1653
+ 2025
1
0
0
@@ -568,7 +568,7 @@
26
0
- 1670
+ 2027
1
0
0
@@ -584,7 +584,7 @@
27
0
- 1673
+ 2028
1
0
0
@@ -600,7 +600,7 @@
28
0
- 1935
+ 2038
1
0
0
@@ -616,7 +616,7 @@
29
0
- 1938
+ 2035
1
0
0
@@ -632,7 +632,7 @@
30
0
- 1955
+ 99
1
0
0
@@ -641,14 +641,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\agc.c
31
0
- 1958
+ 165
1
0
0
@@ -657,14 +657,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\trx_manager.c
32
0
- 516
+ 506
1
0
0
@@ -680,7 +680,7 @@
33
0
- 517
+ 810
1
0
0
@@ -689,14 +689,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\lcd.c
34
0
- 1685
+ 210
1
0
0
@@ -705,14 +705,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\trx_manager.c
35
0
- 1688
+ 1925
1
0
0
@@ -728,7 +728,7 @@
36
0
- 1695
+ 1640
1
0
0
@@ -744,7 +744,7 @@
37
0
- 1698
+ 390
1
0
0
@@ -753,14 +753,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\front_unit.c
38
0
- 1705
+ 303
1
0
0
@@ -769,14 +769,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\front_unit.c
39
0
- 1708
+ 165
1
0
0
@@ -785,14 +785,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\screen_layout.h
40
0
- 1715
+ 306
1
0
0
@@ -801,14 +801,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\lcd.c
41
0
- 1718
+ 362
1
0
0
@@ -817,14 +817,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\front_unit.c
42
0
- 1970
+ 424
1
0
0
@@ -833,14 +833,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\front_unit.c
43
0
- 1973
+ 1660
1
0
0
@@ -856,7 +856,7 @@
44
0
- 1980
+ 1945
1
0
0
@@ -872,7 +872,7 @@
45
0
- 1983
+ 260
1
0
0
@@ -881,14 +881,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\trx_manager.c
46
0
- 1990
+ 168
1
0
0
@@ -897,14 +897,14 @@
0
0
0
- ..\Core\Src\system_menu.c
+ ..\Core\Src\screen_layout.h
47
0
- 1993
+ 1643
1
0
0
@@ -920,7 +920,7 @@
48
0
- 2000
+ 1663
1
0
0
@@ -936,7 +936,7 @@
49
0
- 2003
+ 1928
1
0
0
@@ -952,6 +952,326 @@
50
0
+ 307
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\lcd.c
+
+
+
+
+ 51
+ 0
+ 811
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\lcd.c
+
+
+
+
+ 52
+ 0
+ 507
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 53
+ 0
+ 1650
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 54
+ 0
+ 1653
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 55
+ 0
+ 1670
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 56
+ 0
+ 1673
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 57
+ 0
+ 1935
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 58
+ 0
+ 1955
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 59
+ 0
+ 516
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 60
+ 0
+ 517
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 61
+ 0
+ 1685
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 62
+ 0
+ 1688
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 63
+ 0
+ 1695
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 64
+ 0
+ 1698
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 65
+ 0
+ 1705
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 66
+ 0
+ 1708
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 67
+ 0
+ 1715
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 68
+ 0
+ 1718
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 69
+ 0
+ 2000
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 70
+ 0
262
1
0
@@ -966,7 +1286,7 @@
- 51
+ 71
0
425
1
@@ -982,7 +1302,7 @@
- 52
+ 72
0
812
1
@@ -998,7 +1318,7 @@
- 53
+ 73
0
813
1
@@ -1014,7 +1334,7 @@
- 54
+ 74
0
167
1
@@ -1030,7 +1350,7 @@
- 55
+ 75
0
170
1
@@ -1046,7 +1366,7 @@
- 56
+ 76
0
824
1
@@ -1062,7 +1382,7 @@
- 57
+ 77
0
825
1
@@ -1078,7 +1398,7 @@
- 58
+ 78
0
826
1
@@ -1094,7 +1414,7 @@
- 59
+ 79
0
827
1
@@ -1110,7 +1430,7 @@
- 60
+ 80
0
215
1
@@ -1126,7 +1446,7 @@
- 61
+ 81
0
265
1
@@ -1142,7 +1462,7 @@
- 62
+ 82
0
267
1
@@ -1158,7 +1478,7 @@
- 63
+ 83
0
817
1
@@ -1174,7 +1494,7 @@
- 64
+ 84
0
818
1
@@ -1190,7 +1510,7 @@
- 65
+ 85
0
819
1
@@ -1206,7 +1526,7 @@
- 66
+ 86
0
820
1
@@ -1222,7 +1542,7 @@
- 67
+ 87
0
831
1
@@ -1238,7 +1558,7 @@
- 68
+ 88
0
832
1
@@ -1254,7 +1574,7 @@
- 69
+ 89
0
833
1
@@ -1270,7 +1590,7 @@
- 70
+ 90
0
834
1
@@ -1286,7 +1606,7 @@
- 71
+ 91
0
212
1
@@ -1302,7 +1622,7 @@
- 72
+ 92
0
217
1
@@ -1318,7 +1638,7 @@
- 73
+ 93
0
264
1
@@ -1334,7 +1654,7 @@
- 74
+ 94
0
269
1
@@ -1350,7 +1670,7 @@
- 75
+ 95
0
483
1
@@ -1366,7 +1686,7 @@
- 76
+ 96
0
484
1
@@ -1382,7 +1702,7 @@
- 77
+ 97
0
493
1
@@ -1398,7 +1718,7 @@
- 78
+ 98
0
494
1
@@ -1414,7 +1734,7 @@
- 79
+ 99
0
1618
1
@@ -1430,7 +1750,7 @@
- 80
+ 100
0
1621
1
@@ -1446,7 +1766,7 @@
- 81
+ 101
0
1628
1
@@ -1462,7 +1782,7 @@
- 82
+ 102
0
1631
1
@@ -1478,7 +1798,7 @@
- 83
+ 103
0
1638
1
@@ -1494,7 +1814,7 @@
- 84
+ 104
0
1641
1
@@ -1510,7 +1830,7 @@
- 85
+ 105
0
1648
1
@@ -1526,7 +1846,7 @@
- 86
+ 106
0
1651
1
@@ -1542,7 +1862,7 @@
- 87
+ 107
0
1666
1
@@ -1558,7 +1878,7 @@
- 88
+ 108
0
1676
1
@@ -1574,7 +1894,7 @@
- 89
+ 109
0
1683
1
@@ -1590,7 +1910,7 @@
- 90
+ 110
0
1686
1
@@ -1606,7 +1926,7 @@
- 91
+ 111
0
1693
1
@@ -1622,7 +1942,7 @@
- 92
+ 112
0
1696
1
@@ -1638,7 +1958,7 @@
- 93
+ 113
0
1903
1
@@ -1654,7 +1974,7 @@
- 94
+ 114
0
1906
1
@@ -1670,7 +1990,7 @@
- 95
+ 115
0
1913
1
@@ -1686,7 +2006,7 @@
- 96
+ 116
0
1916
1
@@ -1702,7 +2022,7 @@
- 97
+ 117
0
1923
1
@@ -1718,7 +2038,7 @@
- 98
+ 118
0
1926
1
@@ -1734,7 +2054,7 @@
- 99
+ 119
0
1933
1
@@ -1750,7 +2070,7 @@
- 100
+ 120
0
1936
1
@@ -1766,71 +2086,7 @@
- 101
- 0
- 1951
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 102
- 0
- 1961
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 103
- 0
- 1968
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 104
- 0
- 1971
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 105
+ 121
0
1978
1
@@ -1846,7 +2102,7 @@
- 106
+ 122
0
1981
1
@@ -1862,7 +2118,7 @@
- 107
+ 123
0
485
1
@@ -1878,7 +2134,7 @@
- 108
+ 124
0
486
1
@@ -1894,7 +2150,7 @@
- 109
+ 125
0
495
1
@@ -1910,7 +2166,7 @@
- 110
+ 126
0
496
1
@@ -1926,7 +2182,7 @@
- 111
+ 127
0
508
1
@@ -1942,7 +2198,7 @@
- 112
+ 128
0
509
1
@@ -1958,7 +2214,7 @@
- 113
+ 129
0
518
1
@@ -1974,7 +2230,7 @@
- 114
+ 130
0
519
1
@@ -1990,7 +2246,7 @@
- 115
+ 131
0
1629
1
@@ -2006,7 +2262,7 @@
- 116
+ 132
0
1632
1
@@ -2022,7 +2278,7 @@
- 117
+ 133
0
1639
1
@@ -2038,7 +2294,7 @@
- 118
+ 134
0
1642
1
@@ -2054,7 +2310,7 @@
- 119
+ 135
0
1649
1
@@ -2070,7 +2326,7 @@
- 120
+ 136
0
1652
1
@@ -2086,7 +2342,7 @@
- 121
+ 137
0
1654
1
@@ -2102,7 +2358,7 @@
- 122
+ 138
0
1659
1
@@ -2118,7 +2374,7 @@
- 123
+ 139
0
1661
1
@@ -2134,7 +2390,7 @@
- 124
+ 140
0
1662
1
@@ -2150,7 +2406,7 @@
- 125
+ 141
0
1664
1
@@ -2166,7 +2422,7 @@
- 126
+ 142
0
1671
1
@@ -2182,7 +2438,7 @@
- 127
+ 143
0
1674
1
@@ -2198,7 +2454,7 @@
- 128
+ 144
0
1677
1
@@ -2214,7 +2470,7 @@
- 129
+ 145
0
1681
1
@@ -2230,7 +2486,7 @@
- 130
+ 146
0
1684
1
@@ -2246,7 +2502,7 @@
- 131
+ 147
0
1687
1
@@ -2262,7 +2518,7 @@
- 132
+ 148
0
1694
1
@@ -2278,7 +2534,7 @@
- 133
+ 149
0
1697
1
@@ -2294,7 +2550,7 @@
- 134
+ 150
0
1699
1
@@ -2310,7 +2566,7 @@
- 135
+ 151
0
1704
1
@@ -2326,7 +2582,7 @@
- 136
+ 152
0
1706
1
@@ -2342,7 +2598,7 @@
- 137
+ 153
0
1707
1
@@ -2358,7 +2614,7 @@
- 138
+ 154
0
1709
1
@@ -2374,7 +2630,7 @@
- 139
+ 155
0
1716
1
@@ -2390,7 +2646,7 @@
- 140
+ 156
0
1719
1
@@ -2406,7 +2662,7 @@
- 141
+ 157
0
1726
1
@@ -2422,7 +2678,7 @@
- 142
+ 158
0
1729
1
@@ -2438,7 +2694,7 @@
- 143
+ 159
0
1914
1
@@ -2454,7 +2710,7 @@
- 144
+ 160
0
1917
1
@@ -2470,7 +2726,7 @@
- 145
+ 161
0
1924
1
@@ -2486,23 +2742,7 @@
- 146
- 0
- 1927
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 147
+ 162
0
1934
1
@@ -2518,23 +2758,7 @@
- 148
- 0
- 1937
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 149
+ 163
0
1939
1
@@ -2550,7 +2774,7 @@
- 150
+ 164
0
1944
1
@@ -2566,7 +2790,7 @@
- 151
+ 165
0
1946
1
@@ -2582,39 +2806,7 @@
- 152
- 0
- 1947
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 153
- 0
- 1949
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 154
+ 166
0
1956
1
@@ -2630,39 +2822,7 @@
- 155
- 0
- 1959
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 156
- 0
- 1962
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 157
+ 167
0
1966
1
@@ -2678,71 +2838,7 @@
- 158
- 0
- 1969
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 159
- 0
- 1972
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 160
- 0
- 1979
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 161
- 0
- 1982
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 162
+ 168
0
1984
1
@@ -2758,7 +2854,7 @@
- 163
+ 169
0
1989
1
@@ -2774,7 +2870,7 @@
- 164
+ 170
0
1991
1
@@ -2790,39 +2886,7 @@
- 165
- 0
- 1992
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 166
- 0
- 1994
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 167
+ 171
0
2001
1
@@ -2838,23 +2902,7 @@
- 168
- 0
- 2004
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- ..\Core\Src\system_menu.c
-
-
-
-
- 169
+ 172
0
2011
1
@@ -2870,9 +2918,9 @@
- 170
+ 173
0
- 2014
+ 510
1
0
0
@@ -2885,6 +2933,774 @@
+
+ 174
+ 0
+ 520
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 175
+ 0
+ 530
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 176
+ 0
+ 531
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 177
+ 0
+ 532
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 178
+ 0
+ 533
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 179
+ 0
+ 540
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 180
+ 0
+ 541
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 181
+ 0
+ 542
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 182
+ 0
+ 543
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 183
+ 0
+ 1645
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 184
+ 0
+ 1655
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 185
+ 0
+ 1656
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 186
+ 0
+ 1665
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 187
+ 0
+ 1667
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 188
+ 0
+ 1672
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 189
+ 0
+ 1675
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 190
+ 0
+ 1678
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 191
+ 0
+ 1690
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 192
+ 0
+ 1700
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 193
+ 0
+ 1701
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 194
+ 0
+ 1710
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 195
+ 0
+ 1711
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 196
+ 0
+ 1712
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 197
+ 0
+ 1717
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 198
+ 0
+ 1720
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 199
+ 0
+ 1721
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 200
+ 0
+ 1722
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 201
+ 0
+ 1723
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 202
+ 0
+ 1728
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 203
+ 0
+ 1730
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 204
+ 0
+ 1731
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 205
+ 0
+ 1732
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 206
+ 0
+ 1733
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 207
+ 0
+ 1739
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 208
+ 0
+ 1740
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 209
+ 0
+ 1742
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 210
+ 0
+ 1743
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 211
+ 0
+ 1750
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 212
+ 0
+ 1753
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\system_menu.c
+
+
+
+
+ 213
+ 0
+ 254
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\trx_manager.c
+
+
+
+
+ 214
+ 0
+ 256
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\trx_manager.c
+
+
+
+
+ 215
+ 0
+ 259
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\trx_manager.c
+
+
+
+
+ 216
+ 0
+ 261
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\trx_manager.c
+
+
+
+
+ 217
+ 0
+ 304
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\trx_manager.c
+
+
+
+
+ 218
+ 0
+ 308
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\trx_manager.c
+
+
+
+
+ 219
+ 0
+ 309
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\trx_manager.c
+
+
+
+
+ 220
+ 0
+ 311
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\trx_manager.c
+
+
+
+
+ 221
+ 0
+ 313
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ ..\Core\Src\trx_manager.c
+
+
+
0
diff --git a/STM32/MDK-ARM/WOLF-Lite.uvprojx b/STM32/MDK-ARM/WOLF-Lite.uvprojx
index 94d41ca..b78e79c 100644
--- a/STM32/MDK-ARM/WOLF-Lite.uvprojx
+++ b/STM32/MDK-ARM/WOLF-Lite.uvprojx
@@ -10,7 +10,7 @@
WOLF-Lite
0x4
ARM-ADS
- 6150000::V6.15::ARMCLANG
+ 6160000::V6.16::ARMCLANG
1
diff --git a/STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp b/STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp
index f5458b0..8ec9892 100644
--- a/STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp
+++ b/STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp
@@ -65,18 +65,33 @@
"wolf-lite\usbd_desc.o"
"wolf-lite\usbd_ioreq.o"
"wolf-lite\basicmathfunctions.o"
+"wolf-lite\basicmathfunctionsf16.o"
"wolf-lite\bayesfunctions.o"
+"wolf-lite\bayesfunctionsf16.o"
"wolf-lite\commontables.o"
+"wolf-lite\commontablesf16.o"
"wolf-lite\complexmathfunctions.o"
+"wolf-lite\complexmathfunctionsf16.o"
"wolf-lite\controllerfunctions.o"
"wolf-lite\distancefunctions.o"
+"wolf-lite\distancefunctionsf16.o"
"wolf-lite\fastmathfunctions.o"
+"wolf-lite\fastmathfunctionsf16.o"
"wolf-lite\filteringfunctions.o"
+"wolf-lite\filteringfunctionsf16.o"
+"wolf-lite\interpolationfunctions.o"
+"wolf-lite\interpolationfunctionsf16.o"
"wolf-lite\matrixfunctions.o"
+"wolf-lite\matrixfunctionsf16.o"
+"wolf-lite\quaternionmathfunctions.o"
"wolf-lite\svmfunctions.o"
+"wolf-lite\svmfunctionsf16.o"
"wolf-lite\statisticsfunctions.o"
+"wolf-lite\statisticsfunctionsf16.o"
"wolf-lite\supportfunctions.o"
+"wolf-lite\supportfunctionsf16.o"
"wolf-lite\transformfunctions.o"
+"wolf-lite\transformfunctionsf16.o"
--strict --scatter ".\WOLF-Lite\WOLF-Lite-custom.sct"
--summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols
--info sizes --info totals --info unused --info veneers