kopia lustrzana https://github.com/UU5JPP/Wolf-LITE
Merge branch 'master' into main
Антон
commit
b866b91d91
|
|
@ -169,6 +169,17 @@ const BAND_MAP BANDS[BANDS_COUNT] =
|
|||
},
|
||||
.regionsCount = 7,
|
||||
},
|
||||
//FM METERS
|
||||
{
|
||||
.name = "108m",
|
||||
.selectable = true,
|
||||
.startFreq = 86000000,
|
||||
.endFreq = 108000000,
|
||||
.regions = (const REGION_MAP[]){
|
||||
{.startFreq = 86100000, .endFreq = 108000000, .mode = TRX_MODE_NFM},
|
||||
},
|
||||
.regionsCount = 7,
|
||||
},
|
||||
};
|
||||
|
||||
// band number from frequency
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#define BANDS_COUNT 12 // number of bands in the collection
|
||||
#define BANDS_COUNT 13 // number of bands in the collection
|
||||
|
||||
typedef struct // description of the region in the band
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ typedef const struct
|
|||
const uint16_t STATUS_LABEL_RIT;
|
||||
const uint16_t STATUS_LABEL_VLT;
|
||||
const uint16_t STATUS_LABEL_CPU;
|
||||
const uint16_t STATUS_LABEL_KHZ;
|
||||
const uint16_t STATUS_LABEL_THERM;
|
||||
const uint16_t STATUS_LABEL_NOTCH;
|
||||
const uint16_t STATUS_SMETER;
|
||||
|
|
@ -84,6 +85,7 @@ static const STRUCT_COLOR_THEME COLOR_THEMES[2] = {
|
|||
.STATUS_LABEL_BW = rgb888torgb565(0, 200, 255),
|
||||
.STATUS_LABEL_RIT = COLOR_WHITE,
|
||||
.STATUS_LABEL_VLT = rgb888torgb565(249, 205, 46),
|
||||
.STATUS_LABEL_KHZ = rgb888torgb565(255, 255, 255),
|
||||
.STATUS_LABEL_CPU = rgb888torgb565(255, 0, 0),
|
||||
.STATUS_LABEL_THERM = rgb888torgb565(249, 205, 46),
|
||||
.STATUS_LABEL_NOTCH = rgb888torgb565(0, 200, 255),
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ void LCD_Init(void)
|
|||
COLOR = &COLOR_THEMES[TRX.ColorThemeId];
|
||||
|
||||
LCDDriver_Init();
|
||||
LCDDriver_setRotation(SCREEN_ROTATE);
|
||||
LCDDriver_setRotation(TRX.LCD_position);// povorot LCD 2.4
|
||||
LCDDriver_Fill(BG_COLOR);
|
||||
LCD_inited = true;
|
||||
}
|
||||
|
|
@ -608,9 +608,13 @@ static void LCD_displayStatusInfoBar(bool redraw)
|
|||
LCDDriver_printText(buff, LAY_STATUS_LABEL_VLT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, COLOR->STATUS_LABEL_VLT, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
|
||||
|
||||
//CPU-DSP
|
||||
sprintf(buff, "CPU:%.1f ", CPU_LOAD.Load);
|
||||
LCDDriver_printText(buff, LAY_STATUS_LABEL_CPU_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_CPU_Y_OFFSET, COLOR->STATUS_LABEL_CPU, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
|
||||
sprintf(buff, "CPU:%.1f ", CPU_LOAD.Load);
|
||||
LCDDriver_printText(buff, LAY_STATUS_LABEL_CPU_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_CPU_Y_OFFSET, COLOR->STATUS_LABEL_CPU, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
|
||||
|
||||
// //kHz
|
||||
// sprintf(buff, "%d:kHz", TRX.RX_SSB_LPF_Filter);
|
||||
// LCDDriver_printText(buff, LAY_STATUS_LABEL_KHZ_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_KHZ_Y_OFFSET, COLOR->STATUS_LABEL_KHZ, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
|
||||
//
|
||||
//NOTCH
|
||||
if (CurrentVFO()->AutoNotchFilter)
|
||||
sprintf(buff, "NOTCH:AUTO");
|
||||
|
|
|
|||
|
|
@ -1288,13 +1288,13 @@ static void MX_FSMC_Init(void)
|
|||
//LCD timings
|
||||
#if defined(LCD_HX8357B)
|
||||
Timing.AddressSetupTime = 3;
|
||||
Timing.DataSetupTime = 2;
|
||||
Timing.DataSetupTime = 4;
|
||||
Timing.BusTurnAroundDuration = 3;
|
||||
Timing.AccessMode = FSMC_ACCESS_MODE_A;
|
||||
#endif
|
||||
#if defined(LCD_ILI9481)
|
||||
Timing.AddressSetupTime = 3;
|
||||
Timing.DataSetupTime = 3;
|
||||
Timing.DataSetupTime = 4;
|
||||
Timing.BusTurnAroundDuration = 3;
|
||||
Timing.AccessMode = FSMC_ACCESS_MODE_A;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -84,14 +84,16 @@
|
|||
#define LAY_STATUS_LABEL_S_VAL_FONT &FreeSans7pt7b
|
||||
#define LAY_STATUS_LABEL_DBM_X_OFFSET 5
|
||||
#define LAY_STATUS_LABEL_DBM_Y_OFFSET 36
|
||||
#define LAY_STATUS_LABEL_BW_X_OFFSET 60
|
||||
#define LAY_STATUS_LABEL_BW_Y_OFFSET 36
|
||||
#define LAY_STATUS_LABEL_BW_X_OFFSET 410
|
||||
#define LAY_STATUS_LABEL_BW_Y_OFFSET -70
|
||||
#define LAY_STATUS_LABEL_RIT_X_OFFSET 140
|
||||
#define LAY_STATUS_LABEL_RIT_Y_OFFSET 36
|
||||
#define LAY_STATUS_LABEL_VLT_X_OFFSET 200
|
||||
#define LAY_STATUS_LABEL_VLT_Y_OFFSET 36
|
||||
#define LAY_STATUS_LABEL_CPU_X_OFFSET 280
|
||||
#define LAY_STATUS_LABEL_CPU_X_OFFSET 255
|
||||
#define LAY_STATUS_LABEL_CPU_Y_OFFSET 36
|
||||
#define LAY_STATUS_LABEL_KHZ_X_OFFSET 410
|
||||
#define LAY_STATUS_LABEL_KHZ_Y_OFFSET -70
|
||||
#define LAY_STATUS_LABEL_NOTCH_X_OFFSET 335
|
||||
#define LAY_STATUS_LABEL_NOTCH_Y_OFFSET 36
|
||||
#define LAY_STATUS_LABEL_FFT_BW_X_OFFSET 420
|
||||
|
|
|
|||
|
|
@ -219,6 +219,7 @@ void LoadSettings(bool clear)
|
|||
TRX.Transverter_Offset_Mhz = 120; //Offset from VFO
|
||||
TRX.Volume = 50; //AF Volume
|
||||
TRX.CW_GaussFilter = true; //Gauss responce LPF filter
|
||||
TRX.LCD_position = 4; //LCD Povorot
|
||||
|
||||
TRX.ENDBit = 100; // Bit for the end of a successful write to eeprom
|
||||
sendToDebug_strln("[OK] Loaded default settings");
|
||||
|
|
@ -262,7 +263,8 @@ void LoadCalibration(bool clear)
|
|||
sendToDebug_uint8(calculateCSUM_EEPROM(), false);
|
||||
|
||||
CALIBRATE.flash_id = CALIB_VERSION; // code for checking the firmware in the eeprom, if it does not match, we use the default
|
||||
|
||||
|
||||
//CALIBRATE.DISPLAY_FLIP = false; //Povorot displey
|
||||
CALIBRATE.ENCODER_INVERT = false; // invert left-right rotation of the main encoder
|
||||
CALIBRATE.ENCODER2_INVERT = true; // invert left-right rotation of the optional encoder
|
||||
CALIBRATE.ENCODER_DEBOUNCE = 0; // time to eliminate contact bounce at the main encoder, ms
|
||||
|
|
@ -280,7 +282,7 @@ void LoadCalibration(bool clear)
|
|||
CALIBRATE.rf_out_power_hf_high = 80; // >30mhz
|
||||
CALIBRATE.smeter_calibration = -13; // S-Meter calibration, set when calibrating the transceiver to S9
|
||||
CALIBRATE.swr_trans_rate = 11.0f; //SWR Transormator rate
|
||||
CALIBRATE.volt_cal_rate = 10.0f; //VOLTAGE
|
||||
CALIBRATE.volt_cal_rate = 10.0f; //VOLTAGE
|
||||
|
||||
CALIBRATE.ENDBit = 100;
|
||||
sendToDebug_strln("[OK] Loaded default calibrate settings");
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
//#define LCD_HX8357C true
|
||||
#define LCD_ILI9486 true
|
||||
|
||||
#define SCREEN_ROTATE 4 // povorot displey 2,4
|
||||
//#define SCREEN_ROTATE 2 // povorot displey 2,4
|
||||
|
||||
//SPI Speed
|
||||
#define SPI_FRONT_UNIT_PRESCALER SPI_BAUDRATEPRESCALER_8
|
||||
|
|
@ -166,6 +166,7 @@ extern struct TRX_SETTINGS
|
|||
uint8_t ColorThemeId;
|
||||
bool FFT_Enabled;
|
||||
uint8_t FFT_Zoom;
|
||||
uint8_t LCD_position;// povorot LCD
|
||||
uint8_t FFT_Averaging;
|
||||
uint8_t FFT_Window;
|
||||
uint8_t FFT_Color;
|
||||
|
|
@ -184,6 +185,7 @@ extern struct TRX_CALIBRATE
|
|||
{
|
||||
uint8_t flash_id; //eeprom check
|
||||
|
||||
//bool DISPLAY_FLIP;
|
||||
bool ENCODER_INVERT;
|
||||
bool ENCODER2_INVERT;
|
||||
uint8_t ENCODER_DEBOUNCE;
|
||||
|
|
@ -202,6 +204,7 @@ extern struct TRX_CALIBRATE
|
|||
int16_t smeter_calibration;
|
||||
float32_t swr_trans_rate;
|
||||
float32_t volt_cal_rate;
|
||||
uint8_t LCD_position;
|
||||
|
||||
uint8_t csum; //check sum
|
||||
uint8_t ENDBit; //end bit
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ static void SYSMENU_HANDL_SCREEN_FFT_Color(int8_t direction);
|
|||
static void SYSMENU_HANDL_SCREEN_FFT_Grid(int8_t direction);
|
||||
static void SYSMENU_HANDL_SCREEN_FFT_Background(int8_t direction);
|
||||
static void SYSMENU_HANDL_SCREEN_FFT_Compressor(int8_t direction);
|
||||
static void SYSMENU_HANDL_SCREEN_LCD_position(int8_t direction);//LCD povorot
|
||||
|
||||
static void SYSMENU_HANDL_ADC_PGA(int8_t direction);
|
||||
static void SYSMENU_HANDL_ADC_RAND(int8_t direction);
|
||||
|
|
@ -144,6 +145,7 @@ static const struct sysmenu_item_handler sysmenu_trx_handlers[] =
|
|||
{"MIC IN", SYSMENU_BOOLEAN, (uint32_t *)&TRX.InputType_MIC, SYSMENU_HANDL_TRX_MICIN},
|
||||
{"LINE IN", SYSMENU_BOOLEAN, (uint32_t *)&TRX.InputType_LINE, SYSMENU_HANDL_TRX_LINEIN},
|
||||
{"USB IN", SYSMENU_BOOLEAN, (uint32_t *)&TRX.InputType_USB, SYSMENU_HANDL_TRX_USBIN},
|
||||
{"LCD position", SYSMENU_UINT8, (uint32_t *)&TRX.LCD_position, SYSMENU_HANDL_SCREEN_LCD_position},// LCD povorot
|
||||
{"Callsign", SYSMENU_RUN, 0, SYSMENU_HANDL_TRX_SetCallsign},
|
||||
{"Transverter Enable", SYSMENU_BOOLEAN, (uint32_t *)&TRX.Transverter_Enabled, SYSMENU_HANDL_TRX_TRANSV_ENABLE},
|
||||
{"Transverter Offset, mHz", SYSMENU_UINT16, (uint32_t *)&TRX.Transverter_Offset_Mhz, SYSMENU_HANDL_TRX_TRANSV_OFFSET},
|
||||
|
|
@ -970,6 +972,56 @@ static void SYSMENU_HANDL_AUDIO_SSB_RX_LPF_pass(int8_t direction)
|
|||
}
|
||||
|
||||
static void SYSMENU_HANDL_AUDIO_SSB_TX_LPF_pass(int8_t direction)
|
||||
<<<<<<< HEAD
|
||||
{
|
||||
if (direction > 0)
|
||||
{
|
||||
if (TRX.TX_SSB_LPF_Filter == 0)
|
||||
TRX.TX_SSB_LPF_Filter = 1400;
|
||||
if (TRX.TX_SSB_LPF_Filter == 1400)
|
||||
TRX.TX_SSB_LPF_Filter = 1600;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 1600)
|
||||
TRX.TX_SSB_LPF_Filter = 1800;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 1800)
|
||||
TRX.TX_SSB_LPF_Filter = 2100;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2100)
|
||||
TRX.TX_SSB_LPF_Filter = 2300;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2300)
|
||||
TRX.TX_SSB_LPF_Filter = 2500;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2500)
|
||||
TRX.TX_SSB_LPF_Filter = 2700;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2700)
|
||||
TRX.TX_SSB_LPF_Filter = 2900;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2900)
|
||||
TRX.TX_SSB_LPF_Filter = 3000;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 3000)
|
||||
TRX.TX_SSB_LPF_Filter = 3200;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 3200)
|
||||
TRX.TX_SSB_LPF_Filter = 3400;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (TRX.TX_SSB_LPF_Filter == 1600)
|
||||
TRX.TX_SSB_LPF_Filter = 1400;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 1800)
|
||||
TRX.TX_SSB_LPF_Filter = 1600;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2100)
|
||||
TRX.TX_SSB_LPF_Filter = 1800;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2300)
|
||||
TRX.TX_SSB_LPF_Filter = 2100;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2500)
|
||||
TRX.TX_SSB_LPF_Filter = 2300;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2700)
|
||||
TRX.TX_SSB_LPF_Filter = 2500;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 2900)
|
||||
TRX.TX_SSB_LPF_Filter = 2700;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 3000)
|
||||
TRX.TX_SSB_LPF_Filter = 2900;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 3200)
|
||||
TRX.TX_SSB_LPF_Filter = 3000;
|
||||
else if (TRX.TX_SSB_LPF_Filter == 3400)
|
||||
TRX.TX_SSB_LPF_Filter = 3200;
|
||||
=======
|
||||
{
|
||||
if (direction > 0)
|
||||
{
|
||||
|
|
@ -1099,12 +1151,173 @@ static void SYSMENU_HANDL_AUDIO_AM_RX_LPF_pass(int8_t direction)
|
|||
TRX.RX_AM_LPF_Filter = 8000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 10000)
|
||||
TRX.RX_AM_LPF_Filter = 9000;
|
||||
>>>>>>> b6f5f0aff2e99454b21d40c03d6d945dd8d4cf34
|
||||
}
|
||||
|
||||
TRX_setMode(SecondaryVFO()->Mode, SecondaryVFO());
|
||||
TRX_setMode(CurrentVFO()->Mode, CurrentVFO());
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
static void SYSMENU_HANDL_AUDIO_AM_RX_LPF_pass(int8_t direction)
|
||||
{
|
||||
if (direction > 0)
|
||||
{
|
||||
if (TRX.RX_AM_LPF_Filter == 2100)
|
||||
TRX.RX_AM_LPF_Filter = 2300;
|
||||
else if (TRX.RX_AM_LPF_Filter == 2300)
|
||||
TRX.RX_AM_LPF_Filter = 2500;
|
||||
else if (TRX.RX_AM_LPF_Filter == 2500)
|
||||
TRX.RX_AM_LPF_Filter = 2700;
|
||||
else if (TRX.RX_AM_LPF_Filter == 2700)
|
||||
TRX.RX_AM_LPF_Filter = 2900;
|
||||
else if (TRX.RX_AM_LPF_Filter == 2900)
|
||||
TRX.RX_AM_LPF_Filter = 3000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3000)
|
||||
TRX.RX_AM_LPF_Filter = 3200;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3200)
|
||||
TRX.RX_AM_LPF_Filter = 3400;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3400)
|
||||
TRX.RX_AM_LPF_Filter = 3600;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3600)
|
||||
TRX.RX_AM_LPF_Filter = 3800;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3800)
|
||||
TRX.RX_AM_LPF_Filter = 4000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 4000)
|
||||
TRX.RX_AM_LPF_Filter = 4500;
|
||||
else if (TRX.RX_AM_LPF_Filter == 4500)
|
||||
TRX.RX_AM_LPF_Filter = 5000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 5000)
|
||||
TRX.RX_AM_LPF_Filter = 6000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 6000)
|
||||
TRX.RX_AM_LPF_Filter = 7000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 7000)
|
||||
TRX.RX_AM_LPF_Filter = 8000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 8000)
|
||||
TRX.RX_AM_LPF_Filter = 9000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 9000)
|
||||
TRX.RX_AM_LPF_Filter = 10000;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (TRX.RX_AM_LPF_Filter == 2300)
|
||||
TRX.RX_AM_LPF_Filter = 2100;
|
||||
else if (TRX.RX_AM_LPF_Filter == 2500)
|
||||
TRX.RX_AM_LPF_Filter = 2300;
|
||||
else if (TRX.RX_AM_LPF_Filter == 2700)
|
||||
TRX.RX_AM_LPF_Filter = 2500;
|
||||
else if (TRX.RX_AM_LPF_Filter == 2900)
|
||||
TRX.RX_AM_LPF_Filter = 2700;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3000)
|
||||
TRX.RX_AM_LPF_Filter = 2900;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3200)
|
||||
TRX.RX_AM_LPF_Filter = 3000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3400)
|
||||
TRX.RX_AM_LPF_Filter = 3200;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3600)
|
||||
TRX.RX_AM_LPF_Filter = 3400;
|
||||
else if (TRX.RX_AM_LPF_Filter == 3800)
|
||||
TRX.RX_AM_LPF_Filter = 3400;
|
||||
else if (TRX.RX_AM_LPF_Filter == 4000)
|
||||
TRX.RX_AM_LPF_Filter = 3800;
|
||||
else if (TRX.RX_AM_LPF_Filter == 4500)
|
||||
TRX.RX_AM_LPF_Filter = 3800;
|
||||
else if (TRX.RX_AM_LPF_Filter == 5000)
|
||||
TRX.RX_AM_LPF_Filter = 4500;
|
||||
else if (TRX.RX_AM_LPF_Filter == 6000)
|
||||
TRX.RX_AM_LPF_Filter = 5000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 7000)
|
||||
TRX.RX_AM_LPF_Filter = 6000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 8000)
|
||||
TRX.RX_AM_LPF_Filter = 7000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 9000)
|
||||
TRX.RX_AM_LPF_Filter = 8000;
|
||||
else if (TRX.RX_AM_LPF_Filter == 10000)
|
||||
TRX.RX_AM_LPF_Filter = 9000;
|
||||
=======
|
||||
static void SYSMENU_HANDL_AUDIO_AM_TX_LPF_pass(int8_t direction)
|
||||
{
|
||||
if (direction > 0)
|
||||
{
|
||||
if (TRX.TX_AM_LPF_Filter == 2100)
|
||||
TRX.TX_AM_LPF_Filter = 2300;
|
||||
else if (TRX.TX_AM_LPF_Filter == 2300)
|
||||
TRX.TX_AM_LPF_Filter = 2500;
|
||||
else if (TRX.TX_AM_LPF_Filter == 2500)
|
||||
TRX.TX_AM_LPF_Filter = 2700;
|
||||
else if (TRX.TX_AM_LPF_Filter == 2700)
|
||||
TRX.TX_AM_LPF_Filter = 2900;
|
||||
else if (TRX.TX_AM_LPF_Filter == 2900)
|
||||
TRX.TX_AM_LPF_Filter = 3000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3000)
|
||||
TRX.TX_AM_LPF_Filter = 3200;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3200)
|
||||
TRX.TX_AM_LPF_Filter = 3400;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3400)
|
||||
TRX.TX_AM_LPF_Filter = 3600;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3600)
|
||||
TRX.TX_AM_LPF_Filter = 3800;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3800)
|
||||
TRX.TX_AM_LPF_Filter = 4000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 4000)
|
||||
TRX.TX_AM_LPF_Filter = 4500;
|
||||
else if (TRX.TX_AM_LPF_Filter == 4500)
|
||||
TRX.TX_AM_LPF_Filter = 5000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 5000)
|
||||
TRX.TX_AM_LPF_Filter = 6000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 6000)
|
||||
TRX.TX_AM_LPF_Filter = 7000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 7000)
|
||||
TRX.TX_AM_LPF_Filter = 8000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 8000)
|
||||
TRX.TX_AM_LPF_Filter = 9000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 9000)
|
||||
TRX.TX_AM_LPF_Filter = 10000;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (TRX.TX_AM_LPF_Filter == 2300)
|
||||
TRX.TX_AM_LPF_Filter = 2100;
|
||||
else if (TRX.TX_AM_LPF_Filter == 2500)
|
||||
TRX.TX_AM_LPF_Filter = 2300;
|
||||
else if (TRX.TX_AM_LPF_Filter == 2700)
|
||||
TRX.TX_AM_LPF_Filter = 2500;
|
||||
else if (TRX.TX_AM_LPF_Filter == 2900)
|
||||
TRX.TX_AM_LPF_Filter = 2700;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3000)
|
||||
TRX.TX_AM_LPF_Filter = 2900;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3200)
|
||||
TRX.TX_AM_LPF_Filter = 3000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3400)
|
||||
TRX.TX_AM_LPF_Filter = 3200;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3600)
|
||||
TRX.TX_AM_LPF_Filter = 3400;
|
||||
else if (TRX.TX_AM_LPF_Filter == 3800)
|
||||
TRX.TX_AM_LPF_Filter = 3400;
|
||||
else if (TRX.TX_AM_LPF_Filter == 4000)
|
||||
TRX.TX_AM_LPF_Filter = 3800;
|
||||
else if (TRX.TX_AM_LPF_Filter == 4500)
|
||||
TRX.TX_AM_LPF_Filter = 3800;
|
||||
else if (TRX.TX_AM_LPF_Filter == 5000)
|
||||
TRX.TX_AM_LPF_Filter = 4500;
|
||||
else if (TRX.TX_AM_LPF_Filter == 6000)
|
||||
TRX.TX_AM_LPF_Filter = 5000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 7000)
|
||||
TRX.TX_AM_LPF_Filter = 6000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 8000)
|
||||
TRX.TX_AM_LPF_Filter = 7000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 9000)
|
||||
TRX.TX_AM_LPF_Filter = 8000;
|
||||
else if (TRX.TX_AM_LPF_Filter == 10000)
|
||||
TRX.TX_AM_LPF_Filter = 9000;
|
||||
>>>>>>> b6f5f0aff2e99454b21d40c03d6d945dd8d4cf34
|
||||
}
|
||||
|
||||
TRX_setMode(SecondaryVFO()->Mode, SecondaryVFO());
|
||||
TRX_setMode(CurrentVFO()->Mode, CurrentVFO());
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
static void SYSMENU_HANDL_AUDIO_AM_TX_LPF_pass(int8_t direction)
|
||||
{
|
||||
if (direction > 0)
|
||||
|
|
@ -1207,6 +1420,29 @@ static void SYSMENU_HANDL_AUDIO_FM_RX_LPF_pass(int8_t direction)
|
|||
}
|
||||
else
|
||||
{
|
||||
=======
|
||||
static void SYSMENU_HANDL_AUDIO_FM_RX_LPF_pass(int8_t direction)
|
||||
{
|
||||
if (direction > 0)
|
||||
{
|
||||
if (TRX.RX_FM_LPF_Filter == 5000)
|
||||
TRX.RX_FM_LPF_Filter = 6000;
|
||||
else if (TRX.RX_FM_LPF_Filter == 6000)
|
||||
TRX.RX_FM_LPF_Filter = 7000;
|
||||
else if (TRX.RX_FM_LPF_Filter == 7000)
|
||||
TRX.RX_FM_LPF_Filter = 8000;
|
||||
else if (TRX.RX_FM_LPF_Filter == 8000)
|
||||
TRX.RX_FM_LPF_Filter = 9000;
|
||||
else if (TRX.RX_FM_LPF_Filter == 9000)
|
||||
TRX.RX_FM_LPF_Filter = 10000;
|
||||
else if (TRX.RX_FM_LPF_Filter == 10000)
|
||||
TRX.RX_FM_LPF_Filter = 15000;
|
||||
else if (TRX.RX_FM_LPF_Filter == 15000)
|
||||
TRX.RX_FM_LPF_Filter = 20000;
|
||||
}
|
||||
else
|
||||
{
|
||||
>>>>>>> b6f5f0aff2e99454b21d40c03d6d945dd8d4cf34
|
||||
if (TRX.RX_FM_LPF_Filter == 6000)
|
||||
TRX.RX_FM_LPF_Filter = 5000;
|
||||
else if (TRX.RX_FM_LPF_Filter == 7000)
|
||||
|
|
@ -1375,6 +1611,18 @@ static void SYSMENU_HANDL_SCREEN_FFT_Enabled(int8_t direction)
|
|||
if (direction < 0)
|
||||
TRX.FFT_Enabled = false;
|
||||
}
|
||||
//-----------------------------------------------------------------------
|
||||
static void SYSMENU_HANDL_SCREEN_LCD_position(int8_t direction)
|
||||
{
|
||||
TRX.LCD_position += direction*2;
|
||||
if (TRX.LCD_position < 2)
|
||||
{ TRX.LCD_position = 2;
|
||||
LCD_Init(); }
|
||||
if (TRX.LCD_position > 4)
|
||||
{ TRX.LCD_position = 4;
|
||||
LCD_Init(); }
|
||||
}
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
static void SYSMENU_HANDL_SCREEN_COLOR_THEME(int8_t direction)
|
||||
{
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue