mirror
/
Wolf-LITE
kopia lustrzana https://github.com/UU5JPP/Wolf-LITE
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Корректировка частоты

master
Антон 2022-01-24 20:21:42 +03:00
rodzic b3318e3a88
commit c136dee7cf
8 zmienionych plików z 1530 dodań i 605 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
STM32/Core/Src/settings.c
Wyświetl plik

@ -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

19
STM32/Core/Src/settings.h
Wyświetl plik

@ -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;

266
STM32/Core/Src/system_menu.c
Wyświetl plik

@ -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)

48
STM32/Core/Src/trx_manager.c
Wyświetl plik

@ -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())
{

42
STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h
Wyświetl plik

@ -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 */

1720
STM32/MDK-ARM/WOLF-Lite.uvoptx
Wyświetl plik

Plik diff jest za duży Load Diff

2
STM32/MDK-ARM/WOLF-Lite.uvprojx
Wyświetl plik

@ -10,7 +10,7 @@
<TargetName>WOLF-Lite</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>6150000::V6.15::ARMCLANG</pCCUsed>
<pCCUsed>6160000::V6.16::ARMCLANG</pCCUsed>
<uAC6>1</uAC6>
<TargetOption>
<TargetCommonOption>

15
STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp
Wyświetl plik

@ -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