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

LCD position

master
Антон 2021-02-04 17:20:26 +03:00
rodzic 569ed299a1
commit 7cb60d3cd8
5 zmienionych plików z 21 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
STM32/Core/Src/lcd.c
Wyświetl plik

@ -57,7 +57,7 @@ void LCD_Init(void)
COLOR = &COLOR_THEMES[TRX.ColorThemeId];
LCDDriver_Init();
LCDDriver_setRotation(SCREEN_ROTATE);
LCDDriver_setRotation(TRX.LCD_position);
LCDDriver_Fill(BG_COLOR);
LCD_inited = true;
}

4
STM32/Core/Src/screen_layout.h
Wyświetl plik

@ -84,8 +84,8 @@
#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 400
#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

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

@ -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_position
TRX.ENDBit = 100; // Bit for the end of a successful write to eeprom
sendToDebug_strln("[OK] Loaded default settings");

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

@ -38,7 +38,7 @@
//#define LCD_HX8357C true
#define LCD_ILI9486 true
#define SCREEN_ROTATE 4 // povorot displey 2,4
//#define SCREEN_ROTATE 4 // povorot displey 2,4
//SPI Speed
#define SPI_FRONT_UNIT_PRESCALER SPI_BAUDRATEPRESCALER_8
@ -133,6 +133,7 @@ extern struct TRX_SETTINGS
int8_t AGC_GAIN_TARGET;
uint8_t MIC_GAIN;
int8_t RX_EQ_LOW;
int8_t LCD_position;
int8_t RX_EQ_MID;
int8_t RX_EQ_HIG;
int8_t MIC_EQ_LOW;

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

@ -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);
@ -132,6 +133,7 @@ static const uint8_t sysmenu_item_count = sizeof(sysmenu_handlers) / sizeof(sysm
static const struct sysmenu_item_handler sysmenu_trx_handlers[] =
{
{"RF Power", SYSMENU_UINT8, (uint32_t *)&TRX.RF_Power, SYSMENU_HANDL_TRX_RFPower},
{"LCD position", SYSMENU_UINT8, (uint32_t *)&TRX.LCD_position, SYSMENU_HANDL_SCREEN_LCD_position},// LCD povorot
{"Band Map", SYSMENU_BOOLEAN, (uint32_t *)&TRX.BandMapEnabled, SYSMENU_HANDL_TRX_BandMap},
{"AutoGainer", SYSMENU_BOOLEAN, (uint32_t *)&TRX.AutoGain, SYSMENU_HANDL_TRX_AutoGain},
{"Two Signal TUNE", SYSMENU_BOOLEAN, (uint32_t *)&TRX.TWO_SIGNAL_TUNE, SYSMENU_HANDL_TRX_TWO_SIGNAL_TUNE},
@ -1357,6 +1359,19 @@ static void SYSMENU_HANDL_CW_GaussFilter(int8_t direction)
NeedReinitAudioFilters = true;
}
//-----------------------------------------------------------------------
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(); }
}
//-----------------------------------------------------------------------
//SCREEN MENU
static void SYSMENU_HANDL_LCDMENU(int8_t direction)