Add ALT UART to rpi config screen

This commit is contained in:
KemoNine 2020-09-20 23:08:09 -04:00
parent d8e9621ed9
commit c7c1dd5129
3 changed files with 21 additions and 7 deletions

View file

@ -104,6 +104,7 @@ gslc_tsElemRef* m_pElemRd1152 = NULL;
gslc_tsElemRef* m_pElemRd96 = NULL; gslc_tsElemRef* m_pElemRd96 = NULL;
gslc_tsElemRef* m_pElemRdUART0 = NULL; gslc_tsElemRef* m_pElemRdUART0 = NULL;
gslc_tsElemRef* m_pElemRdUART5 = NULL; gslc_tsElemRef* m_pElemRdUART5 = NULL;
gslc_tsElemRef* m_pElemRdUARTA = NULL;
gslc_tsElemRef* m_pElemSDInfo = NULL; gslc_tsElemRef* m_pElemSDInfo = NULL;
gslc_tsElemRef* m_pElemStatusText = NULL; gslc_tsElemRef* m_pElemStatusText = NULL;
gslc_tsElemRef* m_pElemText = NULL; gslc_tsElemRef* m_pElemText = NULL;

Binary file not shown.

View file

@ -52,10 +52,10 @@
//<Enum !Start!> //<Enum !Start!>
enum {E_PG_BASE,E_PG_MAIN,E_CONF_RPI,E_WIRING,E_SD_CARD}; enum {E_PG_BASE,E_PG_MAIN,E_CONF_RPI,E_WIRING,E_SD_CARD};
enum {E_ELEM_BATT_LEVEL,E_ELEM_LS_DIA,E_ELEM_RD96,E_ELEM_RD_1152 enum {E_ELEM_BATT_LEVEL,E_ELEM_LS_DIA,E_ELEM_RD96,E_ELEM_RD_1152
,E_ELEM_RD_UART0,E_ELEM_RD_UART5,E_ELEM_STATUS,E_ELEM_TEXT ,E_ELEM_RD_UART0,E_ELEM_RD_UART5,E_ELEM_RD_UARTA,E_ELEM_STATUS
,E_ELEM_TEXT3,E_ELEM_TEXT4,E_ELEM_TX96,E_ELEM_TX_1152 ,E_ELEM_TEXT,E_ELEM_TEXT11,E_ELEM_TEXT3,E_ELEM_TEXT4,E_ELEM_TX96
,E_ELEM_TX_SD_INFO,E_ELEM_TX_UART1,E_ELEM_TX_UART5,E_SLR_DIAGRAMS ,E_ELEM_TX_1152,E_ELEM_TX_SD_INFO,E_ELEM_TX_UART1,E_ELEM_TX_UART5
,E_STATUS_LINE}; ,E_SLR_DIAGRAMS,E_STATUS_LINE};
enum {E_GRP_SPD,E_GRP_UART}; enum {E_GRP_SPD,E_GRP_UART};
// Must use separate enum for fonts with MAX_FONT at end to use gslc_FontSet. // Must use separate enum for fonts with MAX_FONT at end to use gslc_FontSet.
enum {E_AO_NOTOMONO8PT7B,MAX_FONT}; enum {E_AO_NOTOMONO8PT7B,MAX_FONT};
@ -77,7 +77,7 @@ enum {E_AO_NOTOMONO8PT7B,MAX_FONT};
#define MAX_ELEM_PG_MAIN 1 // # Elems total on page #define MAX_ELEM_PG_MAIN 1 // # Elems total on page
#define MAX_ELEM_PG_MAIN_RAM MAX_ELEM_PG_MAIN // # Elems in RAM #define MAX_ELEM_PG_MAIN_RAM MAX_ELEM_PG_MAIN // # Elems in RAM
#define MAX_ELEM_CONF_RPI 10 // # Elems total on page #define MAX_ELEM_CONF_RPI 12 // # Elems total on page
#define MAX_ELEM_CONF_RPI_RAM MAX_ELEM_CONF_RPI // # Elems in RAM #define MAX_ELEM_CONF_RPI_RAM MAX_ELEM_CONF_RPI // # Elems in RAM
#define MAX_ELEM_WIRING 3 // # Elems total on page #define MAX_ELEM_WIRING 3 // # Elems total on page
@ -113,6 +113,7 @@ gslc_tsXCheckbox m_asXRadio1;
gslc_tsXCheckbox m_asXRadio2; gslc_tsXCheckbox m_asXRadio2;
gslc_tsXCheckbox m_asXRadio3; gslc_tsXCheckbox m_asXRadio3;
gslc_tsXCheckbox m_asXRadio4; gslc_tsXCheckbox m_asXRadio4;
gslc_tsXCheckbox m_asXRadio5;
gslc_tsXListbox m_sListbox1; gslc_tsXListbox m_sListbox1;
// - Note that XLISTBOX_BUF_OH_R is extra required per item // - Note that XLISTBOX_BUF_OH_R is extra required per item
char m_acListboxBuf1[512 + XLISTBOX_BUF_OH_R]; char m_acListboxBuf1[512 + XLISTBOX_BUF_OH_R];
@ -137,6 +138,7 @@ extern gslc_tsElemRef* m_pElemRd1152;
extern gslc_tsElemRef* m_pElemRd96; extern gslc_tsElemRef* m_pElemRd96;
extern gslc_tsElemRef* m_pElemRdUART0; extern gslc_tsElemRef* m_pElemRdUART0;
extern gslc_tsElemRef* m_pElemRdUART5; extern gslc_tsElemRef* m_pElemRdUART5;
extern gslc_tsElemRef* m_pElemRdUARTA;
extern gslc_tsElemRef* m_pElemSDInfo; extern gslc_tsElemRef* m_pElemSDInfo;
extern gslc_tsElemRef* m_pElemStatusText; extern gslc_tsElemRef* m_pElemStatusText;
extern gslc_tsElemRef* m_pElemText; extern gslc_tsElemRef* m_pElemText;
@ -242,7 +244,7 @@ void InitGUIslice_gen()
// Create radio button E_ELEM_RD_UART5 // Create radio button E_ELEM_RD_UART5
pElemRef = gslc_ElemXCheckboxCreate(&m_gui,E_ELEM_RD_UART5,E_CONF_RPI,&m_asXRadio1, pElemRef = gslc_ElemXCheckboxCreate(&m_gui,E_ELEM_RD_UART5,E_CONF_RPI,&m_asXRadio1,
(gslc_tsRect){160,80,20,20},true,GSLCX_CHECKBOX_STYLE_ROUND,GSLC_COL_BLUE_LT2,false); (gslc_tsRect){110,80,20,20},true,GSLCX_CHECKBOX_STYLE_ROUND,GSLC_COL_BLUE_LT2,false);
gslc_ElemSetGroup(&m_gui,pElemRef,E_GRP_UART); gslc_ElemSetGroup(&m_gui,pElemRef,E_GRP_UART);
m_pElemRdUART5 = pElemRef; m_pElemRdUART5 = pElemRef;
@ -258,7 +260,7 @@ void InitGUIslice_gen()
gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GRAY_LT3); gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GRAY_LT3);
// Create E_ELEM_TX_UART5 text label // Create E_ELEM_TX_UART5 text label
pElemRef = gslc_ElemCreateTxt(&m_gui,E_ELEM_TX_UART5,E_CONF_RPI,(gslc_tsRect){190,80,50,21}, pElemRef = gslc_ElemCreateTxt(&m_gui,E_ELEM_TX_UART5,E_CONF_RPI,(gslc_tsRect){140,80,50,21},
(char*)"UART5",0,E_AO_NOTOMONO8PT7B); (char*)"UART5",0,E_AO_NOTOMONO8PT7B);
gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GRAY_LT3); gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GRAY_LT3);
@ -283,6 +285,17 @@ void InitGUIslice_gen()
pElemRef = gslc_ElemCreateTxt(&m_gui,E_ELEM_TX96,E_CONF_RPI,(gslc_tsRect){190,160,40,21}, pElemRef = gslc_ElemCreateTxt(&m_gui,E_ELEM_TX96,E_CONF_RPI,(gslc_tsRect){190,160,40,21},
(char*)"9600",0,E_AO_NOTOMONO8PT7B); (char*)"9600",0,E_AO_NOTOMONO8PT7B);
gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GRAY_LT3); gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GRAY_LT3);
// Create radio button E_ELEM_RD_UARTA
pElemRef = gslc_ElemXCheckboxCreate(&m_gui,E_ELEM_RD_UARTA,E_CONF_RPI,&m_asXRadio5,
(gslc_tsRect){210,80,20,20},true,GSLCX_CHECKBOX_STYLE_ROUND,GSLC_COL_BLUE_LT2,false);
gslc_ElemSetGroup(&m_gui,pElemRef,E_GRP_UART);
m_pElemRdUARTA = pElemRef;
// Create E_ELEM_TEXT11 text label
pElemRef = gslc_ElemCreateTxt(&m_gui,E_ELEM_TEXT11,E_CONF_RPI,(gslc_tsRect){240,80,30,21},
(char*)"ALT",0,E_AO_NOTOMONO8PT7B);
gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GRAY_LT3);
// ----------------------------------- // -----------------------------------
// PAGE: E_WIRING // PAGE: E_WIRING