remove constMEM panel from examples, using const panel instead

neu-rah · Jun 3, 2020 · 46e193f · 46e193f
1 parent 68f0a2f
commit 46e193f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/examples/ESP32/ClickEncoderTFT/ClickEncoderTFT.ino b/examples/ESP32/ClickEncoderTFT/ClickEncoderTFT.ino
@@ -130,7 +130,7 @@ const colorDef<uint16_t> colors[6] MEMMODE = {
 #define fontW 6
 #define fontH 9
 
-constMEM panel panels[] MEMMODE = {{0, 0, GFX_WIDTH / fontW, GFX_HEIGHT / fontH}}; // Main menu panel
+const panel panels[] MEMMODE = {{0, 0, GFX_WIDTH / fontW, GFX_HEIGHT / fontH}}; // Main menu panel
 navNode* nodes[sizeof(panels) / sizeof(panel)]; //navNodes to store navigation status
 panelsList pList(panels, nodes, sizeof(panels) / sizeof(panel)); //a list of panels and nodes
 //idx_t tops[MAX_DEPTH]={0,0}; // store cursor positions for each level

diff --git a/examples/SSD1306Ascii/Button_Navigation/Button_Navigation.ino b/examples/SSD1306Ascii/Button_Navigation/Button_Navigation.ino
@@ -148,7 +148,7 @@ MENU(mainMenu, "Main menu", doNothing, noEvent, wrapStyle
 
 //describing a menu output device without macros
 //define at least one panel for menu output
-constMEM panel panels[] MEMMODE = {{0, 0, 128 / fontW, 64 / fontH}};
+const panel panels[] MEMMODE = {{0, 0, 128 / fontW, 64 / fontH}};
 navNode* nodes[sizeof(panels) / sizeof(panel)]; //navNodes to store navigation status
 panelsList pList(panels, nodes, 1); //a list of panels and nodes
 idx_t tops[MAX_DEPTH] = {0, 0}; //store cursor positions for each level

diff --git a/examples/SSD1306Ascii/SSD1306Ascii/SSD1306Ascii.ino b/examples/SSD1306Ascii/SSD1306Ascii/SSD1306Ascii.ino
@@ -155,7 +155,7 @@ serialOut outSerial(Serial, serialTops);
 
 //describing a menu output device without macros
 //define at least one panel for menu output
-constMEM panel panels[] MEMMODE = {{0, 0, 128 / fontW, 64 / fontH}};
+const panel panels[] MEMMODE = {{0, 0, 128 / fontW, 64 / fontH}};
 navNode* nodes[sizeof(panels) / sizeof(panel)]; //navNodes to store navigation status
 panelsList pList(panels, nodes, 1); //a list of panels and nodes
 idx_t tops[MAX_DEPTH] = {0, 0}; //store cursor positions for each level

diff --git a/examples/TFT_HX8257/TFT_HX8257/TFT_HX8257.ino b/examples/TFT_HX8257/TFT_HX8257/TFT_HX8257.ino
@@ -153,7 +153,7 @@ serialIn serial(Serial);
 idx_t serialTops[MAX_DEPTH]={0};
 serialOut outSerial(Serial,serialTops);
 
-constMEM panel panels[] MEMMODE={{0,0,480/fontW,320/fontH}};
+const panel panels[] MEMMODE={{0,0,480/fontW,320/fontH}};
 navNode* nodes[sizeof(panels)/sizeof(panel)];//navNodes to store navigation status
 panelsList pList(panels,nodes,1);//a list of panels and nodes
 idx_t gfxTops[MAX_DEPTH]={0};

diff --git a/...FT_eSPI/ArduinoMenu_LilyGo_TTGO_T-display_demo/ArduinoMenu_LilyGo_TTGO_T-display_demo.ino b/...FT_eSPI/ArduinoMenu_LilyGo_TTGO_T-display_demo/ArduinoMenu_LilyGo_TTGO_T-display_demo.ino
@@ -250,7 +250,7 @@ serialOut outSerial(Serial,serialTops);
 #define fontW 12
 #define fontH 18
 
-constMEM panel panels[] MEMMODE = {{0, 0, GFX_WIDTH / fontW, GFX_HEIGHT / fontH}};
+const panel panels[] MEMMODE = {{0, 0, GFX_WIDTH / fontW, GFX_HEIGHT / fontH}};
 navNode* nodes[sizeof(panels) / sizeof(panel)]; //navNodes to store navigation status
 panelsList pList(panels, nodes, 1); //a list of panels and nodes
 idx_t eSpiTops[MAX_DEPTH]={0};

diff --git a/examples/adafruitGfx/eTFT/TFT_eSPI/TFT_eSPI.ino b/examples/adafruitGfx/eTFT/TFT_eSPI/TFT_eSPI.ino
@@ -136,7 +136,7 @@ serialOut outSerial(Serial,serialTops);
 #define fontW 6
 #define fontH 9
 
-constMEM panel panels[] MEMMODE = {{0, 0, GFX_WIDTH / fontW, GFX_HEIGHT / fontH}};
+const panel panels[] MEMMODE = {{0, 0, GFX_WIDTH / fontW, GFX_HEIGHT / fontH}};
 navNode* nodes[sizeof(panels) / sizeof(panel)]; //navNodes to store navigation status
 panelsList pList(panels, nodes, 1); //a list of panels and nodes
 idx_t eSpiTops[MAX_DEPTH]={0};

diff --git a/examples/clickEncoder/clickEncoder/clickEncoder.ino b/examples/clickEncoder/clickEncoder/clickEncoder.ino
@@ -143,7 +143,7 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
 
 #define MAX_DEPTH 2
 
-/*constMEM panel panels[] MEMMODE={{0,0,16,2}};
+/*const panel panels[] MEMMODE={{0,0,16,2}};
 navNode* nodes[sizeof(panels)/sizeof(panel)];
 panelsList pList(panels,nodes,1);
 idx_t tops[MAX_DEPTH];

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoMenu library
-version=4.21.0
+version=4.21.1
 author=Rui Azevedo, ruihfazevedo@gmail.com
 maintainer=neu-rah, ruihfazevedo@gmail.com
 sentence=Generic menu/interactivity system