From 89e83c277ee6f22ae6b37d708620579cc020108f Mon Sep 17 00:00:00 2001
From: KemoNine <kemonine@kemonine.info>
Date: Sat, 12 Sep 2020 20:05:58 -0400
Subject: [PATCH] Start implementation of SD Card info screen

---
 hardware/_controller/_controller.ino    |  50 ++++++++++----
 hardware/_controller/_controller.prj    | Bin 6687 -> 8469 bytes
 hardware/_controller/_controller_GSLC.h |  83 +++++++++++++++++-------
 3 files changed, 100 insertions(+), 33 deletions(-)

diff --git a/hardware/_controller/_controller.ino b/hardware/_controller/_controller.ino
index 652e00c..a7104bc 100644
--- a/hardware/_controller/_controller.ino
+++ b/hardware/_controller/_controller.ino
@@ -41,7 +41,6 @@ int batteryPercent;
 #define TFT_CS 9
 #define TFT_DC 10
 Adafruit_ILI9341 tft(TFT_CS, TFT_DC);
-#include <Fonts/FreeMono9pt7b.h>
 #define CHARS_HORIZONTAL 29
 #define CHARS_ROWS 11
 #define CHARS_TOTAL CHARS_HORIZONTAL * CHARS_ROWS
@@ -89,6 +88,7 @@ gslc_tsElemRef* m_pElemRd1152     = NULL;
 gslc_tsElemRef* m_pElemRd96       = NULL;
 gslc_tsElemRef* m_pElemRdUART0    = NULL;
 gslc_tsElemRef* m_pElemRdUART5    = NULL;
+gslc_tsElemRef* m_pElemSDInfo     = NULL;
 gslc_tsElemRef* m_pElemStatusText = NULL;
 gslc_tsElemRef* m_pElemText       = NULL;
 //<Save_References !End!>
@@ -103,8 +103,27 @@ static int16_t DebugOut(char ch) { if (ch == (char)'\n') Serial.println(""); els
 // ------------------------------------------------
 // Callback Methods
 // ------------------------------------------------
-//<Button Callback !Start!>
-//<Button Callback !End!>
+// Common Button callback
+bool CbBtnCommon(void* pvGui,void *pvElemRef,gslc_teTouch eTouch,int16_t nX,int16_t nY)
+{
+  // Typecast the parameters to match the GUI and element types
+  gslc_tsGui*     pGui     = (gslc_tsGui*)(pvGui);
+  gslc_tsElemRef* pElemRef = (gslc_tsElemRef*)(pvElemRef);
+  gslc_tsElem*    pElem    = gslc_GetElemFromRef(pGui,pElemRef);
+
+  if ( eTouch == GSLC_TOUCH_UP_IN ) {
+    // From the element's ID we can determine which button was pressed.
+    switch (pElem->nId) {
+//<Button Enums !Start!>
+      case E_ELEM_BTN_SD_FMT:
+        break;
+//<Button Enums !End!>
+      default:
+        break;
+    }
+  }
+  return true;
+}
 //<Checkbox Callback !Start!>
 //<Checkbox Callback !End!>
 //<Keypad Callback !Start!>
@@ -243,13 +262,23 @@ void handlerKeyboard() {
 
     // Process key press events
     if (key.state == BBQ10Keyboard::StatePress) {
-      // Flip to config UI if the right most button is pressed when on home screen
-      if (gslc_GetPageCur(&m_gui) == E_PG_MAIN && key.key == KBD_BTN_4) {
-        gslc_SetPageCur(&m_gui,E_CONF_RPI);
-      }
-      // Flip to main screen if the right most button is pressed when in config UI
-      else if (gslc_GetPageCur(&m_gui) == E_CONF_RPI && key.key == KBD_BTN_4) {
-        gslc_SetPageCur(&m_gui,E_PG_MAIN);
+      // Move right through screens
+      if (key.key == KBD_BTN_4) {
+        // Main Screen Flip
+        if (gslc_GetPageCur(&m_gui) == E_PG_MAIN) {
+          gslc_ElemSetTxtStr(&m_gui, m_pElemStatusText, "Raspberry Pi");
+          gslc_SetPageCur(&m_gui, E_CONF_RPI);
+        }
+        // Raspberry Pi Screen Flip
+        else if (gslc_GetPageCur(&m_gui) == E_CONF_RPI) {
+          gslc_ElemSetTxtStr(&m_gui, m_pElemStatusText, "SD Card");
+          gslc_SetPageCur(&m_gui, E_SD_CARD);
+        }
+        // SD Card Info screen Flip
+        else if (gslc_GetPageCur(&m_gui) == E_SD_CARD) {
+          gslc_ElemSetTxtStr(&m_gui, m_pElemStatusText, "Serial Console");
+          gslc_SetPageCur(&m_gui, E_PG_MAIN);
+        }
       }
       // Add keys to the key buffer that are mapped to UI functions (only for config screens)
       else if (key.key == KBD_SW_UP
@@ -323,7 +352,6 @@ void handlerBatteryLevel() {
   gslc_ElemXProgressSetVal(&m_gui, m_pElemBatteryLevel, batteryPercent);
   gslc_tsXProgress*  pGauge  = (gslc_tsXProgress*)gslc_GetXDataFromRef(&m_gui,m_pElemBatteryLevel,GSLC_TYPEX_PROGRESS,__LINE__);
   pGauge->colGauge = colorForHeaderElements;
-  gslc_ElemSetTxtCol(&m_gui, m_pElemBatteryLevel, colorForHeaderElements);
   gslc_ElemSetTxtCol(&m_gui, m_pElemStatusText, colorForHeaderElements);
 
   // Update GUI and NeoPixel with battery status information
diff --git a/hardware/_controller/_controller.prj b/hardware/_controller/_controller.prj
index 1aab61fbc0113f5dbea35de411618ac7957b93a0..d6b73e1b6493cefb945325709aced70cf1dc011a 100644
GIT binary patch
literal 8469
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

literal 6687
zcmd5=&9B>7756LC&I}0D8H8A%N-Vmo+SvK%yl7O3>#rnk?8J_Jlemj2pU!)6^3ue4
zaUK!^A;E$L8`!a60lVQ(VS~gTu|X_A?2r)BaPB?ViPL#g4Fik5Mb(_#dwkCC{Lb$j
z=aaulcN6KJQhFj6EAXH8AeuZZ?(UvRlJsFBy{onC$Fi&>();c8)#YTAJcR!XYcY{N
zFkZI3mSt%E%U0WOw44rnTQi);3cK^}U_IVmEUyyjy=J51gYkU3mcIF-c{#WqJc$R(
z=t(D8Uo4}KfA<Iam%l#ve(jDVr7L*!St3aXPsPnz`rvq_u}mh>Wc}fvfBl<({^+OY
zccin1boY7?Zzt(mx_><9Y!}1H`X`_K^1;`B@u!~&&u8B|xGim7Nk5Rj4o~|B*tAyj
zaY>QkQQzP$2D{{mb`@W(&wl&uAK(9ZX?sVyYfAT~gLpL?WDjggcSf5;`VLR109Ohl
zcBQ~Cc2<MY<l`68`_pwa<nblaofqZ{aKb;ar+<rQD}4$<tX3-sqwQIb73Jw^#_H8o
zJQ*y1|K0Tu|M;ta{T(t6vy4|qn4TumS>fQ~BSf%a*H|ssvmU^A__2EWv6y|t!hLkW
z1*#y5d48|~TZD~!d6<0!=$IP@=lEbNqU}@o+r0zde1#q1|1dX#QHgYa-I9sg8ySTE
zJ$sfBk?{@~R(olahLcF|Fm@*Q{(W-1<PuF$_rv0NANHIZcVX_wyFMW<_)=Awkg@K|
za$@Tw9TVaNb?Z7TS@EdkX#HMeZueZG%1+zw$U9rNAP&>)$<+1&W$Mn&fSOg?qoL{7
z^XHtKQAE7K!YuYXl}*1}SvKeKc3h*&u-E96UupAdxmItH1|h*5QVVCpI*ljw1~F=@
z*?3`Whc$B>?klZvSGfp#&ueQd7;6<jy4b;;`fSIehun^_c{d|heMAW4Mu-Wy)Lpsi
zG<~vjdQM8}Wuiv#4a?z}b8%EM$TT7~c1h3s^JB=>NqQyK9M)(8xXBRzeiEedctJPZ
z|J>{}ePd_Woju_4st<WI7wK%c7;W7}^&0NYh8sB=UFme$UT;Z6)NTZ^EzHfhOUomO
z9%9j4+DL4l?DMfe^zf~v1{ZQ_>wxDWH+7zWwo~WvQ<1OT^zB`X#X~A09<v0%>BC}r
zJ&J0vS+?EF8%KdyOb_x7A(l~XHtV>DxNJhK%MoBvlT-9jWIn2w+{Z-~eZ|hM-*w`a
zvLRYG+=oT0*zcxF2z()NQtR%(_Y&*MV^>qim!n)D?Q=4!tGir{_BQ6>=ku_aShpIh
z8_^3<L(AXex!R@EGwfu}H$NjVx&Yq>t<mzhK7xAlZt@XV6Y3BKVQ(f|y2-ghAb&le
zQ!hwOpH_Wp0N1JDQJzo4;^(y<ufr1kCAoU(Ptm62Y=ok%%KGWRv7qG5#&vpwF+%+n
zuTM33Z|jUFN^4m1uKjLxJG`0g#`>7$Q>W%EX!?yE>r-8!Y7o1-hISs=zM<I6&Uke2
zgYg@T=LZ|*@tdsAGn?-)?$-l3)qApOcY<-NCo7i6dOZk(T-{PzU|~cI!%Rzz9nVk2
z=hc@So738gds%HWPT;*NVx?ZOa*{$>BN6argdCaiGaBOF!2U%nSZxjKdUC9<z?sDs
z^ZG(xmh&~%<U@@EkIn+D3(eO`M_Zh?P0*IFvr$1?zRvn{v_YLoa;P)bmt(T#-)kwu
zF6f$WVqcQ7(18xg*F-;gzL%?g3i^}Nw;A&#G{wj?rE{VutiB{Md#v83qX+Y<jruM0
z#`oZRg~iJ;3ySF~1nuK>N6kwe<a>|DuZO4gdZb6?W4)##p8+ps`w@v6td=T|xq*Hz
z5C_bou>>w=+ULLK`@n_#nKAl`o;_m|6z1|*jh9->F<*M^Mm87k*Yk5xV?AJcFmt>T
z%mtOj#{1$h>++g#GBX$sJ&#sR-=I#9ou7x6r&K$E5l^WR2ViG4$mZ(Js04GZdotIo
z;nIu4BHbI?=h3P?QD--i24l-2gbE#<!Awz4W{SV0Nq<52vsZgsceg>gv4K0P(AAR|
zW#k>_LKcUTn=fknWL^u5adt-e{%$cnKhY4TMU|Wu0mtfYsn2Sb>4y&3sZOWggBbzw
zj+XN%sLdm{Slxz;c$wqw4)ptfnVnhB<a0ZXmus1Io0d79fbl%5laUI1DDS(B2R`!D
z<eU_H(B*43O}?>plkGe$vGdHvC3g$?Zic0Xy7DHv(Kx>uyA7fSeWEVdTvV_6x!uPn
zMC+HB?j|<+s4^edee`jSzAS%KGcQ9w8G@cIMhln$xJy7D*3gSL%(vhV*O!Y)op&86
z?DPWRJ<0k8^58LB*tftU_IK3T{28%(WM|ms^%*}N?>`H*m>l;@>}QT=%zDk8+jvF?
z4#3_hdPwn1&_1EBIFB^cdMn3S@*HibsanFHspqv%#k)Grn>OzOzT<v&cH(!eXFTds
z3w2+`JWRZg+NRF<b865BhCKFt!<o84YI$;H>IbpWlT%O;yjR2AM(A7N_k=H;7i!3D
zb+NO+CJTRhp-{kmh~Lu$mZ*yhw4uI<{Kbx;=5&kKS_MpNe70z==zpg3>0w`|2JKTF
z{j2D|!Tpo`YymytyXK0=D(Yop94WWGhA+1@(O-wvH7KcZ*ma}kUWIoEI_G!ah%Jx*
z8qZ-}>saeC+5~P`moD0>7$2U)XJ}Y|3(p}=8rIJOz1I|L7S`fxcS&KFuWpY##eQZy
z)#>S({H~xMcZCk@LYy~Z4w`wMUfsgoAmc7_guic?XhUpu#9IfQ(HF{eWYA66RXU-`
zcRB@dZMd@4?rQ9P;HW>EX=&6b^Y;fhGw>A0c9q%Gm1m|aCz=oc4-_winKXqtPyKnO
zdAr2EA(?LS4V$!qiaS1=^SW62+!|=&oh#FZ!))gDyp_8wk6>;EK7X%aGj;|19CreN
zCx4bskK9I#7`L5ZVa^BLsy6O<@~~K*+gN9&CGDe@SVm9m!Q2-)+2zDO7IW^jkh5sZ
z@W<zgoxK9_RStVwut2R4?<(hr3-&}CeLceX#r~S%0<fZHGF(&@@7=;_(fcmubt``S
zuEF~H7Tm}iH9_Hb3A<Z8YJxeN(!lIc@!lhJ0ryh!8csRx3he(IT`=)Eg1d;b=w;Nm
z8rni0r-uFgWi_?j(j)dBh`#<Wnu>k!x%i>>sQGupW`*-iyc>%51MG7j`SK<3!{-R?
zc)RfXqJ4YZ0h;-~ZTZ*}Cm23QzG!(|GaL4a=vC~)7TQ{%3C$s`?!0aq52-cJe7Ezw
z({V<(@lHW#`0HB8Yv^LV1m0LzG23zW82CPV`|RO;&veRyeCt81f+nj5=jIp0O#Fty
ze6;eI^=^#R@$uQ%yJ{W#JU`R52yMtcfe~^q(>*qKy1BWdAN>l<aIbkAFnhDkiT#D?
zT;)XP_-`UuYZG+=ca7V*m4Bxedk=DFgIKcJfZR0Do^ZR$cFKNg`vLpihI8kw?A148
zD71=U2)`4E-+QSURh$gJ+$^|8+sUpjb|9Rshh3fT1sQ%E8y)?)SP$$+gS~6%^Wxiz
M-|jv5t)Bn=2R1O#j{pDw

diff --git a/hardware/_controller/_controller_GSLC.h b/hardware/_controller/_controller_GSLC.h
index 80d6c5c..7fed12b 100644
--- a/hardware/_controller/_controller_GSLC.h
+++ b/hardware/_controller/_controller_GSLC.h
@@ -35,7 +35,6 @@
   #error Project tab->Target Platform should be tft_espi
 #endif
 #include <Adafruit_GFX.h>
-#include "src/guislice/NotoMono12pt7b.h"
 #include "src/guislice/NotoMono8pt7b.h"
 //<Fonts !End!>
 
@@ -49,14 +48,14 @@
 // Enumerations for pages, elements, fonts, images
 // ------------------------------------------------
 //<Enum !Start!>
-enum {E_PG_MAIN,E_CONF_RPI};
-enum {E_ELEM_BATT_LEVEL,E_ELEM_CONFIG_RPI_TITLE,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_UART1,E_ELEM_TX_UART5};
+enum {E_PG_BASE,E_PG_MAIN,E_CONF_RPI,E_SD_CARD};
+enum {E_ELEM_BATT_LEVEL,E_ELEM_BTN_SD_FMT,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_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_NOTOMONO12PT7B,E_AO_NOTOMONO8PT7B,MAX_FONT};
+enum {E_AO_NOTOMONO8PT7B,MAX_FONT};
 //<Enum !End!>
 
 // ------------------------------------------------
@@ -67,13 +66,19 @@ enum {E_AO_NOTOMONO12PT7B,E_AO_NOTOMONO8PT7B,MAX_FONT};
 // Define the maximum number of elements and pages
 // ------------------------------------------------
 //<ElementDefines !Start!>
-#define MAX_PAGE                2
+#define MAX_PAGE                4
 
-#define MAX_ELEM_PG_MAIN 3 // # Elems total on page
+#define MAX_ELEM_PG_BASE 3 // # Elems total on page
+#define MAX_ELEM_PG_BASE_RAM MAX_ELEM_PG_BASE // # Elems in RAM
+
+#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 11 // # Elems total on page
+#define MAX_ELEM_CONF_RPI 10 // # Elems total on page
 #define MAX_ELEM_CONF_RPI_RAM MAX_ELEM_CONF_RPI // # Elems in RAM
+
+#define MAX_ELEM_SD_CARD 2 // # Elems total on page
+#define MAX_ELEM_SD_CARD_RAM MAX_ELEM_SD_CARD // # Elems in RAM
 //<ElementDefines !End!>
 
 // ------------------------------------------------
@@ -85,17 +90,23 @@ gslc_tsFont                     m_asFont[MAX_FONT];
 gslc_tsPage                     m_asPage[MAX_PAGE];
 
 //<GUI_Extra_Elements !Start!>
+gslc_tsElem                     m_asBasePage1Elem[MAX_ELEM_PG_BASE_RAM];
+gslc_tsElemRef                  m_asBasePage1ElemRef[MAX_ELEM_PG_BASE];
 gslc_tsElem                     m_asPage1Elem[MAX_ELEM_PG_MAIN_RAM];
 gslc_tsElemRef                  m_asPage1ElemRef[MAX_ELEM_PG_MAIN];
 gslc_tsElem                     m_asPage2Elem[MAX_ELEM_CONF_RPI_RAM];
 gslc_tsElemRef                  m_asPage2ElemRef[MAX_ELEM_CONF_RPI];
-gslc_tsXProgress                m_sXBarGauge1;
+gslc_tsElem                     m_asPage3Elem[MAX_ELEM_SD_CARD_RAM];
+gslc_tsElemRef                  m_asPage3ElemRef[MAX_ELEM_SD_CARD];
+gslc_tsXProgress                m_sXBarGauge2;
 gslc_tsXTextbox                 m_sTextbox1;
 char                            m_acTextboxBuf1[952]; // NRows=17 NCols=56
 gslc_tsXCheckbox                m_asXRadio1;
 gslc_tsXCheckbox                m_asXRadio2;
 gslc_tsXCheckbox                m_asXRadio3;
 gslc_tsXCheckbox                m_asXRadio4;
+gslc_tsXTextbox                 m_sTextbox2;
+char                            m_acTextboxBuf2[168]; // NRows=6 NCols=28
 
 #define MAX_STR                 100
 
@@ -112,9 +123,11 @@ extern gslc_tsElemRef* m_pElemRd1152;
 extern gslc_tsElemRef* m_pElemRd96;
 extern gslc_tsElemRef* m_pElemRdUART0;
 extern gslc_tsElemRef* m_pElemRdUART5;
+extern gslc_tsElemRef* m_pElemSDInfo;
 extern gslc_tsElemRef* m_pElemStatusText;
 extern gslc_tsElemRef* m_pElemText;
 extern gslc_tsElemRef* m_pTextSlider;
+extern gslc_tsElemRef* m_pTextSliderSDInfo;
 //<Extern_References !End!>
 
 // Define debug message function
@@ -145,13 +158,19 @@ void InitGUIslice_gen()
   // Load Fonts
   // ------------------------------------------------
 //<Load_Fonts !Start!>
-    if (!gslc_FontSet(&m_gui,E_AO_NOTOMONO12PT7B,GSLC_FONTREF_PTR,&NotoMono12pt7b,1)) { return; }
     if (!gslc_FontSet(&m_gui,E_AO_NOTOMONO8PT7B,GSLC_FONTREF_PTR,&NotoMono8pt7b,1)) { return; }
 //<Load_Fonts !End!>
 
 //<InitGUI !Start!>
+  gslc_PageAdd(&m_gui,E_PG_BASE,m_asBasePage1Elem,MAX_ELEM_PG_BASE_RAM,m_asBasePage1ElemRef,MAX_ELEM_PG_BASE);
   gslc_PageAdd(&m_gui,E_PG_MAIN,m_asPage1Elem,MAX_ELEM_PG_MAIN_RAM,m_asPage1ElemRef,MAX_ELEM_PG_MAIN);
   gslc_PageAdd(&m_gui,E_CONF_RPI,m_asPage2Elem,MAX_ELEM_CONF_RPI_RAM,m_asPage2ElemRef,MAX_ELEM_CONF_RPI);
+  gslc_PageAdd(&m_gui,E_SD_CARD,m_asPage3Elem,MAX_ELEM_SD_CARD_RAM,m_asPage3ElemRef,MAX_ELEM_SD_CARD);
+
+  // Now mark E_PG_BASE as a "base" page which means that it's elements
+  // are always visible. This is useful for common page elements.
+  gslc_SetPageBase(&m_gui, E_PG_BASE);
+
 
   // NOTE: The current page defaults to the first page added. Here we explicitly
   //       ensure that the main page is the correct page no matter the add order.
@@ -161,19 +180,27 @@ void InitGUIslice_gen()
   gslc_SetBkgndColor(&m_gui,GSLC_COL_BLACK);
 
   // -----------------------------------
-  // PAGE: E_PG_MAIN
+  // PAGE: E_PG_BASE
   
 
   // Create progress bar E_ELEM_BATT_LEVEL 
-  pElemRef = gslc_ElemXProgressCreate(&m_gui,E_ELEM_BATT_LEVEL,E_PG_MAIN,&m_sXBarGauge1,
+  pElemRef = gslc_ElemXProgressCreate(&m_gui,E_ELEM_BATT_LEVEL,E_PG_BASE,&m_sXBarGauge2,
     (gslc_tsRect){263,5,50,15},0,100,0,GSLC_COL_GREEN,false);
   m_pElemBatteryLevel = pElemRef;
   
   // Create E_ELEM_STATUS text label
-  pElemRef = gslc_ElemCreateTxt(&m_gui,E_ELEM_STATUS,E_PG_MAIN,(gslc_tsRect){2,2,250,21},
-    (char*)"UART0 / 1151200",0,E_AO_NOTOMONO8PT7B);
+  pElemRef = gslc_ElemCreateTxt(&m_gui,E_ELEM_STATUS,E_PG_BASE,(gslc_tsRect){2,2,250,21},
+    (char*)"Serial Console",0,E_AO_NOTOMONO8PT7B);
   gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GREEN);
   m_pElemStatusText = pElemRef;
+
+  // Create E_STATUS_LINE line 
+  pElemRef = gslc_ElemCreateLine(&m_gui,E_STATUS_LINE,E_PG_BASE,0,25,320,25);
+  gslc_ElemSetCol(&m_gui,pElemRef,GSLC_COL_BLACK,GSLC_COL_GRAY_DK1,GSLC_COL_GRAY_DK1);
+
+  // -----------------------------------
+  // PAGE: E_PG_MAIN
+  
    
   // Create textbox
   pElemRef = gslc_ElemXTextboxCreate(&m_gui,E_ELEM_TEXT,E_PG_MAIN,&m_sTextbox1,
@@ -188,12 +215,6 @@ void InitGUIslice_gen()
   // PAGE: E_CONF_RPI
   
   
-  // Create E_ELEM_CONFIG_RPI_TITLE text label
-  pElemRef = gslc_ElemCreateTxt(&m_gui,E_ELEM_CONFIG_RPI_TITLE,E_CONF_RPI,(gslc_tsRect){2,2,316,32},
-    (char*)"Raspberry Pi Config",0,E_AO_NOTOMONO12PT7B);
-  gslc_ElemSetTxtAlign(&m_gui,pElemRef,GSLC_ALIGN_MID_MID);
-  gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GREEN);
-  
   // Create E_ELEM_TEXT3 text label
   pElemRef = gslc_ElemCreateTxt(&m_gui,E_ELEM_TEXT3,E_CONF_RPI,(gslc_tsRect){2,40,40,21},
     (char*)"UART",0,E_AO_NOTOMONO8PT7B);
@@ -245,6 +266,24 @@ 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);
+
+  // -----------------------------------
+  // PAGE: E_SD_CARD
+  
+   
+  // Create textbox
+  pElemRef = gslc_ElemXTextboxCreate(&m_gui,E_ELEM_TX_SD_INFO,E_SD_CARD,&m_sTextbox2,
+    (gslc_tsRect){3,30,313,150},E_AO_NOTOMONO8PT7B,
+    (char*)&m_acTextboxBuf2,6,28);
+  gslc_ElemXTextboxWrapSet(&m_gui,pElemRef,false);
+  gslc_ElemSetTxtCol(&m_gui,pElemRef,GSLC_COL_GREEN);
+  gslc_ElemSetCol(&m_gui,pElemRef,GSLC_COL_GRAY,GSLC_COL_BLACK,GSLC_COL_BLACK);
+  m_pElemSDInfo = pElemRef;
+  
+  // create E_ELEM_BTN_SD_FMT button with text label
+  pElemRef = gslc_ElemCreateBtnTxt(&m_gui,E_ELEM_BTN_SD_FMT,E_SD_CARD,
+    (gslc_tsRect){110,190,100,40},(char*)"FORMAT?",0,E_AO_NOTOMONO8PT7B,&CbBtnCommon);
+  gslc_ElemSetCol(&m_gui,pElemRef,GSLC_COL_RED_DK1,GSLC_COL_RED_DK4,GSLC_COL_RED_DK1);
 //<InitGUI !End!>
 
 //<Startup !Start!>