From c7c1dd5129f690323526dfb5367adc3f99810e4f Mon Sep 17 00:00:00 2001 From: KemoNine Date: Sun, 20 Sep 2020 23:08:09 -0400 Subject: [PATCH] Add ALT UART to rpi config screen --- hardware/_controller/_controller.ino | 1 + hardware/_controller/_controller.prj | Bin 9187 -> 9991 bytes hardware/_controller/_controller_GSLC.h | 27 ++++++++++++++++++------ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/hardware/_controller/_controller.ino b/hardware/_controller/_controller.ino index a59a29c..f65627e 100644 --- a/hardware/_controller/_controller.ino +++ b/hardware/_controller/_controller.ino @@ -104,6 +104,7 @@ gslc_tsElemRef* m_pElemRd1152 = NULL; gslc_tsElemRef* m_pElemRd96 = NULL; gslc_tsElemRef* m_pElemRdUART0 = NULL; gslc_tsElemRef* m_pElemRdUART5 = NULL; +gslc_tsElemRef* m_pElemRdUARTA = NULL; gslc_tsElemRef* m_pElemSDInfo = NULL; gslc_tsElemRef* m_pElemStatusText = NULL; gslc_tsElemRef* m_pElemText = NULL; diff --git a/hardware/_controller/_controller.prj b/hardware/_controller/_controller.prj index f73a46eb98c1947117eed4ea783f184970668861..444c5305aeca495ed37c6f5495169ca6c612c68b 100644 GIT binary patch delta 2345 zcmcgtOK%fb6izCLx`+_Ao5X>FkmzF(Re0h=c#x2|cb-h*aqf8LX5tlz9UGCsRl%tT z7I=l&wz_`+@dpsfqW_?a{)$%JcG+Dwy>q{5GEveH(MJ}J^vyl5?|kQ+U!7O}cXQLr z@8-+17r&W$F*Pl;*}2Q5-=DNh zu@-E_8mCdh(k`3GqzPAn36ACg-KIoKoV6(6J@L`%<6q8H5w{Dg_;x0lx45ze@4yzk&qzJOh_j89(J7MTQ=mi zo}=%3W-hWiBSww)gDABxhFot4qI6|m+%8qbohz5bZ{_NBV_EBWE&jB#skJ-i-m8Uv&?Q7-@ayH1=w#~o8rZsc zJ%7Edjp91BcN{*79y4Vws+E_gq;{rsT5y?3r*&-5o?EFOVs0oTzJ~M?$eGCDCB^{Q z=n$Jov;i=MvS8ej0f@pWnq&cQOWbLOmezbk{(jg_DC(r3;JYK7YWe>dxfasTcv~;> z)(SgmMXlVpuz=QA#SaTNrq{%$pDa_h>i@%9|DC-e2SGbNB=<_Qj;(U@IVx2SY zMGVZ?Md8-OFV)J;D3@>Xiwz75%2^eEl&>xZR5jD&P!)|J9J3?dmcE>v=Rjp| z8^xYKT(`##+Y%Yv&sH%c=?&4c`%t;&O+t^b9$uN5b(7!m&5)!*9o^Yakwuo1>+TOk76sy5$v`Zb5JqO)}*rBXGdP z_cQY#FPk}&MQH?ru#<9v;$m}h(~f)}2AbbwnodJ2al=IS+fmS$SJ}z0`A%-f3F_-9 u-#M|ax;T=^2dX3QIf!R=NOiWRod4Aka`*0NYGz}5u=`p4;M&z6KmHR-bHj!J delta 1311 zcmc&z!H&{U6a^*YXeQ#6p`8JPBu?T29m^DqEKGc_^pzoLp`EtCY$gK;6G0TyNO2)1 zMxEs(Z|gUh7*;M#jBEcu6F)#dLHaJvG{((@h21nc@7{OMx$m5}`VaLu9+p1v+{%_4 zTB;s&A8c;Bp-alXT+zwCS>16%5g&Cge|=gJ5w5osH2dVi)Li)

O!LDOo)ZFDathtj{oYz_2D@9>Yp7q6SzVdZDhOxq)tb1F}#!({C0Gq}0TrWMPqLuOO3 z8W5xdssAX*Rtn1b#Oq#0W+K*1^ zvanltmwB%Q8#tujRt0d$9r|)(6s5i_{|2S`jd%b6 diff --git a/hardware/_controller/_controller_GSLC.h b/hardware/_controller/_controller_GSLC.h index 66a836d..20970a1 100644 --- a/hardware/_controller/_controller_GSLC.h +++ b/hardware/_controller/_controller_GSLC.h @@ -52,10 +52,10 @@ // 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 - ,E_ELEM_RD_UART0,E_ELEM_RD_UART5,E_ELEM_STATUS,E_ELEM_TEXT - ,E_ELEM_TEXT3,E_ELEM_TEXT4,E_ELEM_TX96,E_ELEM_TX_1152 - ,E_ELEM_TX_SD_INFO,E_ELEM_TX_UART1,E_ELEM_TX_UART5,E_SLR_DIAGRAMS - ,E_STATUS_LINE}; + ,E_ELEM_RD_UART0,E_ELEM_RD_UART5,E_ELEM_RD_UARTA,E_ELEM_STATUS + ,E_ELEM_TEXT,E_ELEM_TEXT11,E_ELEM_TEXT3,E_ELEM_TEXT4,E_ELEM_TX96 + ,E_ELEM_TX_1152,E_ELEM_TX_SD_INFO,E_ELEM_TX_UART1,E_ELEM_TX_UART5 + ,E_SLR_DIAGRAMS,E_STATUS_LINE}; enum {E_GRP_SPD,E_GRP_UART}; // Must use separate enum for fonts with MAX_FONT at end to use gslc_FontSet. 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_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_WIRING 3 // # Elems total on page @@ -113,6 +113,7 @@ gslc_tsXCheckbox m_asXRadio1; gslc_tsXCheckbox m_asXRadio2; gslc_tsXCheckbox m_asXRadio3; gslc_tsXCheckbox m_asXRadio4; +gslc_tsXCheckbox m_asXRadio5; gslc_tsXListbox m_sListbox1; // - Note that XLISTBOX_BUF_OH_R is extra required per item 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_pElemRdUART0; extern gslc_tsElemRef* m_pElemRdUART5; +extern gslc_tsElemRef* m_pElemRdUARTA; extern gslc_tsElemRef* m_pElemSDInfo; extern gslc_tsElemRef* m_pElemStatusText; extern gslc_tsElemRef* m_pElemText; @@ -242,7 +244,7 @@ void InitGUIslice_gen() // Create radio button E_ELEM_RD_UART5 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); m_pElemRdUART5 = pElemRef; @@ -258,7 +260,7 @@ void InitGUIslice_gen() gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GRAY_LT3); // 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); 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}, (char*)"9600",0,E_AO_NOTOMONO8PT7B); 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