cleanup status screen & fix warnning

bigtreetech · Nov 19, 2019 · aa2c9f1 · aa2c9f1
1 parent 23adf82
commit aa2c9f1
Show file tree

Hide file tree

Showing 5 changed files with 264 additions and 277 deletions.
diff --git a/TFT/src/User/API/UI/GUI.c b/TFT/src/User/API/UI/GUI.c
@@ -791,7 +791,7 @@ void RADIO_Select(RADIO *raido, uint8_t select)
 }
 
 //
-void Scroll_CreatePara(SCROLL * para, uint8_t *pstr ,GUI_RECT *rect)
+void Scroll_CreatePara(SCROLL * para, uint8_t *pstr, const GUI_RECT *rect)
 {
   memset(para,0,sizeof(SCROLL));	
   para->text = pstr;

diff --git a/TFT/src/User/API/UI/GUI.h b/TFT/src/User/API/UI/GUI.h
@@ -99,7 +99,7 @@ void RADIO_Select(RADIO *raido, uint8_t select);
 
 typedef struct
 {
-  GUI_RECT *rect;
+  const GUI_RECT *rect;
   uint8_t  *text;
   uint32_t time;
   int16_t	 off_head;
@@ -111,7 +111,7 @@ typedef struct
   uint16_t maxPixelWidth;
   uint8_t  has_disp; 
 }SCROLL;
-void Scroll_CreatePara(SCROLL * para, uint8_t *pstr, GUI_RECT *rect);
+void Scroll_CreatePara(SCROLL * para, uint8_t *pstr, const GUI_RECT *rect);
 void Scroll_DispString(SCROLL * para, uint8_t align);
 
 typedef struct

diff --git a/TFT/src/User/Menu/Print.c b/TFT/src/User/Menu/Print.c
@@ -59,7 +59,7 @@ void scrollFileNameCreate(u8 i)
   }
 }
 
-void normalNameDisp(GUI_RECT *rect, u8 *name)
+void normalNameDisp(const GUI_RECT *rect, u8 *name)
 {
   if(name == NULL) return;
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ void scrollFileNameCreate(u8 i) @@
       }
     }
-    void normalNameDisp(GUI_RECT *rect, u8 *name)
+    void normalNameDisp(const GUI_RECT *rect, u8 *name)
     {
       if(name == NULL) return;
@@ Expand Down @@