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

Some IPS updates

master
XGudron 2021-03-24 11:27:07 +03:00
rodzic 6ebaacc384
commit fb8315bf5f
9 zmienionych plików z 85 dodań i 160 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

76
STM32/Core/Src/front_unit.c
Wyświetl plik

@ -61,54 +61,58 @@ static uint32_t ENCODER2_AValDeb = 0;
static bool enc2_func_mode = false; //false - fast-step, true - func mode (WPM, etc...)
static PERIPH_FrontPanel_Button PERIPH_FrontPanel_Static_Buttons[] = {
{.port = 1, .channel = 7, .name = "", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = NULL, .holdHandler = NULL}, //not used
{.port = 1, .channel = 6, .name = "", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = NULL, .holdHandler = NULL}, //not used
{.port = 1, .channel = 5, .name = "MODE", .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_MODE_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_MODE_P}, //SB6
{.port = 1, .channel = 0, .name = "BAND", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BAND_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_BAND_N}, //SB1
{.port = 1, .channel = 7, .name = "", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = NULL, .holdHandler = NULL}, //not used
{.port = 1, .channel = 6, .name = "", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = NULL, .holdHandler = NULL}, //not used
{.port = 1, .channel = 5, .name = "", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = NULL, .holdHandler = NULL}, //not used
{.port = 1, .channel = 4, .name = "", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = NULL, .holdHandler = NULL}, //not used
{.port = 1, .channel = 3, .name = "", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = NULL, .holdHandler = NULL}, //not used
{.port = 1, .channel = 2, .name = "MODE", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_MODE_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_MODE_P}, //SB6
{.port = 1, .channel = 2, .name = "BAND", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BAND_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_BAND_N}, //SB1
{.port = 1, .channel = 0, .name = "MENU", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_MENU, .holdHandler = FRONTPANEL_BUTTONHANDLER_MENU}, //SB1
};
static PERIPH_FrontPanel_Button PERIPH_FrontPanel_BottomScroll_Buttons[BOTTOM_SCROLLBUTTONS_GROUPS_COUNT][4] = {
static PERIPH_FrontPanel_Button PERIPH_FrontPanel_BottomScroll_Buttons[BOTTOM_SCROLLBUTTONS_GROUPS_COUNT][5] = {
{
{.port = 1, .channel = 1, .name = "PRE", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_PRE, .holdHandler = FRONTPANEL_BUTTONHANDLER_PRE}, //SB2
{.port = 1, .channel = 2, .name = "ATT", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_ATT, .holdHandler = FRONTPANEL_BUTTONHANDLER_ATTHOLD}, //SB3
{.port = 1, .channel = 3, .name = "BW", .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_BW, .holdHandler = FRONTPANEL_BUTTONHANDLER_HPF}, //SB4
{.port = 1, .channel = 4, .name = "A/B", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_AsB, .holdHandler = FRONTPANEL_BUTTONHANDLER_ArB}, //SB5
{.port = 1, .channel = 2, .name = "PRE", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_PRE, .holdHandler = FRONTPANEL_BUTTONHANDLER_PRE}, //SB2
{.port = 1, .channel = 1, .name = "ATT", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_ATT, .holdHandler = FRONTPANEL_BUTTONHANDLER_ATTHOLD}, //SB3
{.port = 1, .channel = 1, .name = "BW", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_BW, .holdHandler = FRONTPANEL_BUTTONHANDLER_HPF}, //SB4
{.port = 1, .channel = 1, .name = "A/B", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_AsB, .holdHandler = FRONTPANEL_BUTTONHANDLER_ArB}, //SB5
{.port = 1, .channel = 0, .name = "POWER", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_RF_POWER, .holdHandler = FRONTPANEL_BUTTONHANDLER_RF_POWER}, //SB2
},
{
{.port = 1, .channel = 1, .name = "POWER", .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_RF_POWER, .holdHandler = FRONTPANEL_BUTTONHANDLER_RF_POWER}, //SB2
{.port = 1, .channel = 2, .name = "TUNE", .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_TUNE, .holdHandler = FRONTPANEL_BUTTONHANDLER_TUNE}, //SB3
{.port = 1, .channel = 3, .name = "NOTCH", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_NOTCH, .holdHandler = FRONTPANEL_BUTTONHANDLER_NOTCH}, //SB4
{.port = 1, .channel = 4, .name = "FAST", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_FAST, .holdHandler = FRONTPANEL_BUTTONHANDLER_FAST}, //SB5
{.port = 1, .channel = 2, .name = "AGC", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_AGC, .holdHandler = FRONTPANEL_BUTTONHANDLER_AGC_SPEED}, //SB2
{.port = 1, .channel = 1, .name = "TUNE", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_TUNE, .holdHandler = FRONTPANEL_BUTTONHANDLER_TUNE}, //SB3
{.port = 1, .channel = 1, .name = "NOTCH", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_NOTCH, .holdHandler = FRONTPANEL_BUTTONHANDLER_NOTCH}, //SB4
{.port = 1, .channel = 1, .name = "FAST", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_FAST, .holdHandler = FRONTPANEL_BUTTONHANDLER_FAST}, //SB5
{.port = 1, .channel = 0, .name = "CLAR", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_CLAR, .holdHandler = FRONTPANEL_BUTTONHANDLER_CLAR}, //SB3
},
{
{.port = 1, .channel = 1, .name = "AGC", .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_AGC, .holdHandler = FRONTPANEL_BUTTONHANDLER_AGC_SPEED}, //SB2
{.port = 1, .channel = 2, .name = "CLAR", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_CLAR, .holdHandler = FRONTPANEL_BUTTONHANDLER_CLAR}, //SB3
{.port = 1, .channel = 3, .name = "MUTE", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_MUTE, .holdHandler = FRONTPANEL_BUTTONHANDLER_MUTE}, //SB4
{.port = 1, .channel = 4, .name = "LOCK", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_LOCK, .holdHandler = FRONTPANEL_BUTTONHANDLER_LOCK}, //SB5
{.port = 1, .channel = 2, .name = "VOLUME", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_VOLUME, .holdHandler = FRONTPANEL_BUTTONHANDLER_VOLUME}, //SB2
{.port = 1, .channel = 1, .name = "BANDMAP", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BANDMAP, .holdHandler = FRONTPANEL_BUTTONHANDLER_BANDMAP}, //SB3
{.port = 1, .channel = 1, .name = "MUTE", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_MUTE, .holdHandler = FRONTPANEL_BUTTONHANDLER_MUTE}, //SB4
{.port = 1, .channel = 1, .name = "LOCK", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_LOCK, .holdHandler = FRONTPANEL_BUTTONHANDLER_LOCK}, //SB5
{.port = 1, .channel = 0, .name = "WPM", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_WPM, .holdHandler = FRONTPANEL_BUTTONHANDLER_WPM}, //SB4
},
{
{.port = 1, .channel = 1, .name = "VOLUME", .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_VOLUME, .holdHandler = FRONTPANEL_BUTTONHANDLER_VOLUME}, //SB2
{.port = 1, .channel = 2, .name = "BANDMAP", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BANDMAP, .holdHandler = FRONTPANEL_BUTTONHANDLER_BANDMAP}, //SB3
{.port = 1, .channel = 3, .name = "WPM", .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_WPM, .holdHandler = FRONTPANEL_BUTTONHANDLER_WPM}, //SB4
{.port = 1, .channel = 4, .name = "KEYER", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_KEYER, .holdHandler = FRONTPANEL_BUTTONHANDLER_KEYER}, //SB5
{.port = 1, .channel = 2, .name = "BAND-", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BAND_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_BAND_N}, //SB2
{.port = 1, .channel = 1, .name = "BAND+", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BAND_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_BAND_P}, //SB3
{.port = 1, .channel = 1, .name = "MODE-", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_MODE_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_MODE_N}, //SB4
{.port = 1, .channel = 1, .name = "MODE+", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_MODE_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_MODE_P}, //SB5
{.port = 1, .channel = 0, .name = "KEYER", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_KEYER, .holdHandler = FRONTPANEL_BUTTONHANDLER_KEYER}, //SB5
},
{
{.port = 1, .channel = 1, .name = "BAND-", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BAND_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_BAND_N}, //SB2
{.port = 1, .channel = 2, .name = "BAND+", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BAND_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_BAND_P}, //SB3
{.port = 1, .channel = 3, .name = "MODE-", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_MODE_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_MODE_N}, //SB4
{.port = 1, .channel = 4, .name = "MODE+", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_MODE_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_MODE_P}, //SB5
{.port = 1, .channel = 2, .name = "BW-", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BW_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_BW_N}, //SB2
{.port = 1, .channel = 1, .name = "BW+", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BW_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_BW_P}, //SB3
{.port = 1, .channel = 1, .name = "PWR-", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_PWR_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_PWR_N}, //SB4
{.port = 1, .channel = 1, .name = "PWR+", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_PWR_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_PWR_P}, //SB5
{.port = 1, .channel = 0, .name = "ZOOM", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_ZOOM_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_ZOOM_P}, //SB2
},
{
{.port = 1, .channel = 1, .name = "BW-", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BW_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_BW_N}, //SB2
{.port = 1, .channel = 2, .name = "BW+", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BW_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_BW_P}, //SB3
{.port = 1, .channel = 3, .name = "PWR-", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_PWR_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_PWR_N}, //SB4
{.port = 1, .channel = 4, .name = "PWR+", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_PWR_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_PWR_P}, //SB5
},
{
{.port = 1, .channel = 1, .name = "ZOOM", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_ZOOM_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_ZOOM_P}, //SB2
{.port = 1, .channel = 2, .name = "MODE", .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_MODE_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_MODE_P}, //SB6
{.port = 1, .channel = 3, .name = "BAND", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BAND_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_BAND_N}, //SB1
{.port = 1, .channel = 4, .name = "PRE", .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_PRE, .holdHandler = FRONTPANEL_BUTTONHANDLER_PRE}, //SB2
{.port = 1, .channel = 2, .name = "MODE", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_MODE_N, .holdHandler = FRONTPANEL_BUTTONHANDLER_MODE_P}, //SB6
{.port = 1, .channel = 1, .name = "BAND", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_BAND_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_BAND_N}, //SB1
{.port = 1, .channel = 1, .name = "PRE", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_PRE, .holdHandler = FRONTPANEL_BUTTONHANDLER_PRE}, //SB2
{.port = 1, .channel = 1, .name = "A/B", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_AsB, .holdHandler = FRONTPANEL_BUTTONHANDLER_ArB}, //SB5
{.port = 1, .channel = 0, .name = "POWER", .tres_min = 0, .tres_max = 1023, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_RF_POWER, .holdHandler = FRONTPANEL_BUTTONHANDLER_RF_POWER}, //SB2
},
};
@ -396,7 +400,7 @@ void FRONTPANEL_Process(void)
sendToDebug_uint16(mcp3008_value, false);*/
//set state
if (mcp3008_value < MCP3008_THRESHOLD)
if (mcp3008_value >= PERIPH_FrontPanel_Buttons[b].tres_min && mcp3008_value < PERIPH_FrontPanel_Buttons[b].tres_max)
PERIPH_FrontPanel_Buttons[b].state = true;
else
PERIPH_FrontPanel_Buttons[b].state = false;

2
STM32/Core/Src/front_unit.h
Wyświetl plik

@ -11,6 +11,8 @@ typedef struct
{
uint8_t port;
uint8_t channel;
uint16_t tres_min;
uint16_t tres_max;
bool state;
bool prev_state;
uint32_t start_hold_time;

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

@ -92,6 +92,7 @@ static void LCD_displayTopButtons(bool redraw)
printInfo(LAY_BOTTOMBUTTONS_X2, LAY_BOTTOMBUTTONS_Y, LAY_BOTTOMBUTTONS_WIDTH, LAY_BOTTOMBUTTONS_HEIGHT, PERIPH_FrontPanel_BottomScroll_Buttons_Active[1].name, COLOR->BUTTON_BACKGROUND, COLOR->BOTTOM_BUTTONS_COLOR, COLOR->BUTTON_INACTIVE_TEXT, true);
printInfo(LAY_BOTTOMBUTTONS_X3, LAY_BOTTOMBUTTONS_Y, LAY_BOTTOMBUTTONS_WIDTH, LAY_BOTTOMBUTTONS_HEIGHT, PERIPH_FrontPanel_BottomScroll_Buttons_Active[2].name, COLOR->BUTTON_BACKGROUND, COLOR->BOTTOM_BUTTONS_COLOR, COLOR->BUTTON_INACTIVE_TEXT, true);
printInfo(LAY_BOTTOMBUTTONS_X4, LAY_BOTTOMBUTTONS_Y, LAY_BOTTOMBUTTONS_WIDTH, LAY_BOTTOMBUTTONS_HEIGHT, PERIPH_FrontPanel_BottomScroll_Buttons_Active[3].name, COLOR->BUTTON_BACKGROUND, COLOR->BOTTOM_BUTTONS_COLOR, COLOR->BUTTON_INACTIVE_TEXT, true);
printInfo(LAY_BOTTOMBUTTONS_X5, LAY_BOTTOMBUTTONS_Y, LAY_BOTTOMBUTTONS_WIDTH, LAY_BOTTOMBUTTONS_HEIGHT, PERIPH_FrontPanel_BottomScroll_Buttons_Active[4].name, COLOR->BUTTON_BACKGROUND, COLOR->BOTTOM_BUTTONS_COLOR, COLOR->BUTTON_INACTIVE_TEXT, true);
LCD_UpdateQuery.TopButtons = false;
if(redraw)

2
STM32/Core/Src/lcd_driver.h
Wyświetl plik

@ -13,7 +13,7 @@
#define LCD_FSMC_DATA_ADDR 0x60080000
//LCD dimensions defines
#if (defined(LCD_ILI9481) || defined(LCD_HX8357B) || defined(LCD_HX8357C) || defined(LCD_ILI9486) || defined (LCD_SSD1963) || defined(LCD_R61581))
#if (defined(LCD_ILI9481) || defined(LCD_HX8357B) || defined(LCD_HX8357C) || defined(LCD_ILI9486) || defined (LCD_ILI9481_IPS))
#include "lcd_driver_ILI9481.h"
#endif

154
STM32/Core/Src/lcd_driver_ILI9481.c
Wyświetl plik

@ -1,5 +1,5 @@
#include "settings.h"
#if (defined(LCD_ILI9481) || defined(LCD_HX8357B) || defined(LCD_HX8357C) || defined(LCD_ILI9486) || defined(LCD_R61581))
#if (defined(LCD_ILI9481) || defined(LCD_HX8357B) || defined(LCD_HX8357C) || defined(LCD_ILI9486) || defined(LCD_ILI9481_IPS))
//Header files
#include "lcd_driver.h"
@ -52,7 +52,7 @@ inline uint16_t LCDDriver_readReg(uint16_t reg)
//Initialise function
void LCDDriver_Init(void)
{
#if (defined(LCD_ILI9481) || defined(LCD_HX8357B))
#if (defined(LCD_ILI9481) || defined(LCD_HX8357B) || defined(LCD_ILI9481_IPS))
#define ILI9481_COMM_DELAY 20
LCDDriver_SendCommand(LCD_COMMAND_SOFT_RESET); //0x01
@ -62,23 +62,24 @@ void LCDDriver_Init(void)
HAL_Delay(ILI9481_COMM_DELAY);
LCDDriver_SendCommand(LCD_COMMAND_NORMAL_MODE_ON); //0x13
#if (defined(LCD_ILI9481) || defined(LCD_HX8357B))
LCDDriver_SendCommand(LCD_COMMAND_POWER_SETTING); //(0xD0);
LCDDriver_SendData(0x07);
LCDDriver_SendData(0x42);
LCDDriver_SendData(0x18);
LCDDriver_SendCommand(LCD_COMMAND_VCOM); //(0xD1);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x07);
LCDDriver_SendData(0x10);
LCDDriver_SendCommand(LCD_COMMAND_NORMAL_PWR_WR); //(0xD2);
LCDDriver_SendData(0x01);
LCDDriver_SendData(0x02);
HAL_Delay(ILI9481_COMM_DELAY);
#if defined(LCD_HX8357B)
#if defined(LCD_HX8357B)
LCDDriver_SendCommand(LCD_COMMAND_PANEL_DRV_CTL); //(0xC0);
LCDDriver_SendData(0x10);
LCDDriver_SendData(0x3B);
@ -87,7 +88,33 @@ void LCDDriver_Init(void)
LCDDriver_SendData(0x11);
HAL_Delay(ILI9481_COMM_DELAY);
#endif
#endif
#if (defined(LCD_ILI9481_IPS))
LCDDriver_SendCommand(LCD_COMMAND_POWER_SETTING); //(0xD0);
LCDDriver_SendData(0x07);
LCDDriver_SendData(0x41);
LCDDriver_SendData(0x1D);
LCDDriver_SendCommand(LCD_COMMAND_VCOM); //(0xD1);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x1C);
LCDDriver_SendData(0x1F);
LCDDriver_SendCommand(LCD_COMMAND_NORMAL_PWR_WR); //(0xD2);
LCDDriver_SendData(0x01);
LCDDriver_SendData(0x11);
HAL_Delay(ILI9481_COMM_DELAY);
LCDDriver_SendCommand(LCD_COMMAND_PANEL_DRV_CTL); //(0xC0);
LCDDriver_SendData(0x10);
LCDDriver_SendData(0x3B);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x02);
LCDDriver_SendData(0x11);
HAL_Delay(ILI9481_COMM_DELAY);
#endif
LCDDriver_SendCommand(LCD_COMMAND_FR_SET); //(0xC5);
LCDDriver_SendData(0x03);
HAL_Delay(ILI9481_COMM_DELAY);
@ -129,7 +156,7 @@ void LCDDriver_Init(void)
LCDDriver_SendData(0xDF);
HAL_Delay(ILI9481_COMM_DELAY);
#if defined(LCD_HX8357B)
#if defined(LCD_HX8357B) || defined(LCD_ILI9481_IPS)
LCDDriver_SendCommand(LCD_COMMAND_COLOR_INVERSION_ON); //(0x21);
HAL_Delay(ILI9481_COMM_DELAY);
#endif
@ -299,123 +326,12 @@ void LCDDriver_Init(void)
LCDDriver_SendCommand(0x29);
#endif
#if defined(LCD_R61581)
LCDDriver_SendCommand(0xB0);
LCDDriver_SendData(0x1E);
LCDDriver_SendCommand(0xB0);
LCDDriver_SendData(0x00);
LCDDriver_SendCommand(0xB3);
LCDDriver_SendData(0x02);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x10);
LCDDriver_SendCommand(0xB4);
LCDDriver_SendData(0x00);//0X10
// LCDDriver_SendCommand(0xB9); //PWM Settings for Brightness Control
// LCDDriver_SendData(0x01);// Disabled by default.
// LCDDriver_SendData(0xFF); //0xFF = Max brightness
// LCDDriver_SendData(0xFF);
// LCDDriver_SendData(0x18);
LCDDriver_SendCommand(0xC0);
LCDDriver_SendData(0x03);
LCDDriver_SendData(0x3B);//
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x01);
LCDDriver_SendData(0x00);//NW
LCDDriver_SendData(0x43);
LCDDriver_SendCommand(0xC1);
LCDDriver_SendData(0x08);
LCDDriver_SendData(0x15);//CLOCK
LCDDriver_SendData(0x08);
LCDDriver_SendData(0x08);
LCDDriver_SendCommand(0xC4);
LCDDriver_SendData(0x15);
LCDDriver_SendData(0x03);
LCDDriver_SendData(0x03);
LCDDriver_SendData(0x01);
LCDDriver_SendCommand(0xC6);
LCDDriver_SendData(0x02);
LCDDriver_SendCommand(0xC8);
LCDDriver_SendData(0x0c);
LCDDriver_SendData(0x05);
LCDDriver_SendData(0x0A);//0X12
LCDDriver_SendData(0x6B);//0x7D
LCDDriver_SendData(0x04);
LCDDriver_SendData(0x06);//0x08
LCDDriver_SendData(0x15);//0x0A
LCDDriver_SendData(0x10);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x60);//0x23
LCDDriver_SendCommand(0x36);
LCDDriver_SendData(0x0A);
LCDDriver_SendCommand(0x0C);
LCDDriver_SendData(0x55);
LCDDriver_SendCommand(0x3A);
LCDDriver_SendData(0x55);
LCDDriver_SendCommand(0x38);
LCDDriver_SendCommand(0xD0);
LCDDriver_SendData(0x07);
LCDDriver_SendData(0x07);//VCI1
LCDDriver_SendData(0x14);//VRH 0x1D
LCDDriver_SendData(0xA2);//BT 0x06
LCDDriver_SendCommand(0xD1);
LCDDriver_SendData(0x03);
LCDDriver_SendData(0x5A);//VCM 0x5A
LCDDriver_SendData(0x10);//VDV
LCDDriver_SendCommand(0xD2);
LCDDriver_SendData(0x03);
LCDDriver_SendData(0x04);//0x24
LCDDriver_SendData(0x04);
LCDDriver_SendCommand(0x11);
HAL_Delay(150);
LCDDriver_SendCommand(0x2A);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x01);
LCDDriver_SendData(0xDF);//320
LCDDriver_SendCommand(0x2B);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x00);
LCDDriver_SendData(0x01);
LCDDriver_SendData(0x3F);//480
HAL_Delay(100);
LCDDriver_SendCommand(0x29);
HAL_Delay(30);
LCDDriver_SendCommand(0x2C);
HAL_Delay(30);
#endif
}
//Set screen rotation
void LCDDriver_setRotation(uint8_t rotate)
{
#if defined(LCD_ILI9481) || defined(LCD_HX8357B) || defined(LCD_ILI9486)
#if defined(LCD_ILI9481) || defined(LCD_HX8357B) || defined(LCD_ILI9486) || defined(LCD_ILI9481_IPS)
LCDDriver_SendCommand(LCD_COMMAND_MADCTL);
switch (rotate)
{

2
STM32/Core/Src/lcd_driver_ILI9481.h
Wyświetl plik

@ -1,6 +1,6 @@
#ifndef _LCDDRIVER_ILI9481_H_
#include "settings.h"
#if (defined(LCD_ILI9481) || defined(LCD_HX8357B) || defined(LCD_HX8357C) || defined(LCD_ILI9486) || defined(LCD_R61581))
#if (defined(LCD_ILI9481) || defined(LCD_HX8357B) || defined(LCD_HX8357C) || defined(LCD_ILI9486) || defined(LCD_ILI9481_IPS))
#define _LCDDRIVER_ILI9481_H_
//LCD dimensions defines

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

@ -142,12 +142,13 @@
#define LAY_BOTTOMBUTTONS_X 0
#define LAY_BOTTOMBUTTONS_Y (LAY_FFT_FFTWTF_HEIGHT + 1)
#define LAY_BOTTOMBUTTONS_MARGIN 1
#define LAY_BOTTOMBUTTONS_WIDTH (LCD_WIDTH / 4 - LAY_BOTTOMBUTTONS_MARGIN * 2)
#define LAY_BOTTOMBUTTONS_WIDTH (LCD_WIDTH / 5 - LAY_BOTTOMBUTTONS_MARGIN * 2)
#define LAY_BOTTOMBUTTONS_HEIGHT LAY_TEXTBAR_TEXT_T_BOTTOM_OFFESET
#define LAY_BOTTOMBUTTONS_X1 LAY_BOTTOMBUTTONS_X
#define LAY_BOTTOMBUTTONS_X2 (LAY_BOTTOMBUTTONS_X1 + LAY_BOTTOMBUTTONS_WIDTH + LAY_BOTTOMBUTTONS_MARGIN * 2)
#define LAY_BOTTOMBUTTONS_X3 (LAY_BOTTOMBUTTONS_X2 + LAY_BOTTOMBUTTONS_WIDTH + LAY_BOTTOMBUTTONS_MARGIN * 2)
#define LAY_BOTTOMBUTTONS_X4 (LAY_BOTTOMBUTTONS_X3 + LAY_BOTTOMBUTTONS_WIDTH + LAY_BOTTOMBUTTONS_MARGIN * 2)
#define LAY_BOTTOMBUTTONS_X5 (LAY_BOTTOMBUTTONS_X4 + LAY_BOTTOMBUTTONS_WIDTH + LAY_BOTTOMBUTTONS_MARGIN * 2)
//BW Trapezoid
#define LAY_BW_TRAPEZ_POS_X 385
#define LAY_BW_TRAPEZ_POS_Y 25

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

@ -219,7 +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.LCD_position = 2; //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

@ -36,7 +36,8 @@
//#define LCD_ILI9481 true
//#define LCD_HX8357B true
//#define LCD_HX8357C true
#define LCD_ILI9486 true
//#define LCD_ILI9486 true
#define LCD_ILI9481_IPS true
//#define SCREEN_ROTATE 4 // povorot displey 2,4