https://github.com/neu-rah/ArduinoMenu/issues/186

neu-rah · neu-rah · commit 7ee18f6b68c6 · 2018-07-27T03:28:27.000Z
diff --git a/examples/LCDs/LiquidCrystal/LiquidCrystal/LiquidCrystal.ino b/examples/LCDs/LiquidCrystal/LiquidCrystal/LiquidCrystal.ino
@@ -108,7 +108,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);;
+    return out.printRaw(F("special prompt!"),len);;
   }
 };
 
diff --git a/examples/LCDs/Malpartida/I2C/I2C/I2C.ino b/examples/LCDs/Malpartida/I2C/I2C/I2C.ino
@@ -112,7 +112,7 @@ http://playground.arduino.cc/Code/LCD3wires
   public:
     altPrompt(constMEM promptShadow& p):prompt(p) {}
     Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-      return out.printRaw("special prompt!",len);;
+      return out.printRaw(F("special prompt!"),len);;
     }
   };
 
diff --git a/examples/LCDs/PCF8574/PCF8574/PCF8574.ino b/examples/LCDs/PCF8574/PCF8574/PCF8574.ino
@@ -109,7 +109,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);
+    return out.printRaw(F("special prompt!"),len);
   }
 };
 
diff --git a/examples/OzOledAscii/OzOledAscii.ino b/examples/OzOledAscii/OzOledAscii.ino
@@ -71,7 +71,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);
+    return out.printRaw(F("special prompt!"),len);
   }
 };
 
diff --git a/examples/SSD1306Ascii/SSD1306Ascii/SSD1306Ascii.ino b/examples/SSD1306Ascii/SSD1306Ascii/SSD1306Ascii.ino
@@ -73,7 +73,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);
+    return out.printRaw(F("special prompt!"),len);
   }
 };
 
diff --git a/examples/Serial/ansiSerial/ansiSerial/ansiSerial.ino b/examples/Serial/ansiSerial/ansiSerial/ansiSerial.ino
@@ -198,7 +198,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);
+    return out.printRaw(F("special prompt!"),len);
   }
 };
 
diff --git a/examples/Serial/serialio/serialio/serialio.ino b/examples/Serial/serialio/serialio/serialio.ino
@@ -73,9 +73,10 @@ CHOOSE(chooseTest,chooseMenu,"Choose",doNothing,noEvent,noStyle
 //by extending the prompt class
 class altPrompt:public prompt {
 public:
-  altPrompt(constMEM promptShadow& p):prompt(p) {}
+  // altPrompt(constMEM promptShadow& p):prompt(p) {}
+  using prompt::prompt;
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);
+    return out.printRaw(F("special prompt!"),len);
   }
 };
 
@@ -168,6 +169,7 @@ void setup() {
   //nav.idleTask=idle;//point a function to be used when menu is suspended
   //nav.idleOn();//this menu will start on idle state, press select to enter menu
   //nav.doInput("323");
+  // nav.useAccel=false;
 }
 
 void loop() {
diff --git a/examples/TFT_HX8257/TFT_HX8257/TFT_HX8257.ino b/examples/TFT_HX8257/TFT_HX8257/TFT_HX8257.ino
@@ -87,7 +87,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);;
+    return out.printRaw(F("special prompt!"),len);;
   }
 };
 
diff --git a/examples/U8G2/U8G2/U8G2.ino b/examples/U8G2/U8G2/U8G2.ino
@@ -128,7 +128,7 @@ CHOOSE(chooseTest,chooseMenu,"Choose",doNothing,noEvent,noStyle
 // public:
 //   altPrompt(constMEM promptShadow& p):prompt(p) {}
 //   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr) override {
-//     return out.printRaw("special prompt!",len);;
+//     return out.printRaw(F("special prompt!"),len);;
 //   }
 // };
 
diff --git a/examples/U8GLib/U8GLib/U8GLib.ino b/examples/U8GLib/U8GLib/U8GLib.ino
@@ -104,7 +104,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr) override {
-    return out.printRaw("special prompt!",len);;
+    return out.printRaw(F("special prompt!"),len);;
   }
 };
 
diff --git a/examples/UTFT/UTFT/UTFT.ino b/examples/UTFT/UTFT/UTFT.ino
@@ -89,7 +89,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);;
+    return out.printRaw(F("special prompt!"),len);;
   }
 };
 
diff --git a/examples/adafruitGfx/tft/tft/tft.ino b/examples/adafruitGfx/tft/tft/tft.ino
@@ -90,7 +90,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);;
+    return out.printRaw(F("special prompt!"),len);;
   }
 };
 
diff --git a/examples/btnNav/btnNav/btnNav.ino b/examples/btnNav/btnNav/btnNav.ino
@@ -81,7 +81,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);;
+    return out.printRaw(F("special prompt!"),len);;
   }
 };
 
diff --git a/examples/clickEncoder/clickEncoder/clickEncoder.ino b/examples/clickEncoder/clickEncoder/clickEncoder.ino
@@ -103,7 +103,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);;
+    return out.printRaw(F("special prompt!"),len);;
   }
 };
 
diff --git a/examples/codeCtrl/codeCtrl/codeCtrl.ino b/examples/codeCtrl/codeCtrl/codeCtrl.ino
@@ -94,7 +94,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);;
+    return out.printRaw(F("special prompt!"),len);;
   }
 };
 
diff --git a/examples/lolin32/lolin32/lolin32.ino b/examples/lolin32/lolin32/lolin32.ino
@@ -94,7 +94,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr) override {
-    return out.printRaw("special prompt!",len);;
+    return out.printRaw(F("special prompt!"),len);;
   }
 };
 
diff --git a/examples/reuse/reuse/reuse.ino b/examples/reuse/reuse/reuse.ino
@@ -83,34 +83,34 @@ class AlarmPrompt:public prompt {
       if (use) {
         switch(type) {
           case alarm:
-            len-=out.printRaw("Alarm ",len);
+            len-=out.printRaw(F("Alarm "),len);
             len-=out.print(h);
-            len-=out.printRaw(":",len);
+            len-=out.printRaw(F(":"),len);
             len-=out.print(m);
-            len-=out.printRaw(":",len);
+            len-=out.printRaw(F(":"),len);
             len-=out.print(s);
             break;
           case countDown:
-            len-=out.printRaw("Countdown ",len);
+            len-=out.printRaw(F("Countdown "),len);
             long ss=msTime/1000;
             long hh=ss/(60*60);
             ss-=hh*60*60;
             long mm=ss/60;
             ss-=mm*60;
             if (hh<10) len-=out.print("0");
             len-=out.print(hh);
-            len-=out.printRaw(":",len);
+            len-=out.printRaw(F(":"),len);
             if (mm<10) len-=out.print("0");
             len-=out.print(mm);
-            len-=out.printRaw(":",len);
+            len-=out.printRaw(F(":"),len);
             if (ss<10) len-=out.print("0");
             len-=out.print(ss);
             break;
         }
       } else {
-        len-=out.printRaw("Alarm",len);
+        len-=out.printRaw(F("Alarm"),len);
         len-=out.print(idx+1);
-        len-=out.printRaw(" Off",len);
+        len-=out.printRaw(F(" Off"),len);
       }
       return len;
     }
@@ -130,13 +130,13 @@ class AlarmMenu:public menu {
       long mm=ss/60;
       ss-=mm*60;
       len-=print_P(out,getText(),len);
-      len-=out.printRaw(" ",len);
+      len-=out.printRaw(F(" "),len);
       if (hh<10) len-=out.print("0");
       len-=out.print(hh);
-      len-=out.printRaw(":",len);
+      len-=out.printRaw(F(":"),len);
       if (mm<10) len-=out.print("0");
       len-=out.print(mm);
-      len-=out.printRaw(":",len);
+      len-=out.printRaw(F(":"),len);
       if (ss<10) len-=out.print("0");
       len-=out.print(ss);
       //dirty=true;useless here because dirty flag is cleaned after all devices print
diff --git a/examples/stm32/stm32/stm32.ino b/examples/stm32/stm32/stm32.ino
@@ -74,7 +74,7 @@ class altPrompt:public prompt {
 public:
   altPrompt(constMEM promptShadow& p):prompt(p) {}
   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {
-    return out.printRaw("special prompt!",len);
+    return out.printRaw(F("special prompt!"),len);
   }
 };
 
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoMenu library
-version=4.12.0
+version=4.12.1
 author=Rui Azevedo, ruihfazevedo@gmail.com
 maintainer=neu-rah, ruihfazevedo@gmail.com
 sentence=Generic menu/interactivity system
diff --git a/src/menuIo.h b/src/menuIo.h
@@ -73,6 +73,9 @@
         idx_t maxX(idx_t i=0) const;
         idx_t maxY(idx_t i=0) const;
         idx_t& top(navNode& nav) const;
+        inline idx_t printRaw(const __FlashStringHelper* at,idx_t len) {
+          return printRaw((const char*)at,len);
+        }
         virtual idx_t printRaw(const char* at,idx_t len);
         #if defined(MENU_DEBUG) || defined(MENU_ASYNC)
           virtual menuOut& operator<<(prompt const &p);

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ class altPrompt:public prompt {`
`108`	`108`	`public:`
`109`	`109`	`altPrompt(constMEM promptShadow& p):prompt(p) {}`
`110`	`110`	`Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {`
`111`		`- return out.printRaw("special prompt!",len);;`
	`111`	`+ return out.printRaw(F("special prompt!"),len);;`
`112`	`112`	`}`
`113`	`113`	`};`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ http://playground.arduino.cc/Code/LCD3wires`
`112`	`112`	`public:`
`113`	`113`	`altPrompt(constMEM promptShadow& p):prompt(p) {}`
`114`	`114`	`Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {`
`115`		`- return out.printRaw("special prompt!",len);;`
	`115`	`+ return out.printRaw(F("special prompt!"),len);;`
`116`	`116`	`}`
`117`	`117`	`};`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ class altPrompt:public prompt {`
`109`	`109`	`public:`
`110`	`110`	`altPrompt(constMEM promptShadow& p):prompt(p) {}`
`111`	`111`	`Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {`
`112`		`- return out.printRaw("special prompt!",len);`
	`112`	`+ return out.printRaw(F("special prompt!"),len);`
`113`	`113`	`}`
`114`	`114`	`};`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class altPrompt:public prompt {`
`71`	`71`	`public:`
`72`	`72`	`altPrompt(constMEM promptShadow& p):prompt(p) {}`
`73`	`73`	`Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {`
`74`		`- return out.printRaw("special prompt!",len);`
	`74`	`+ return out.printRaw(F("special prompt!"),len);`
`75`	`75`	`}`
`76`	`76`	`};`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class altPrompt:public prompt {`
`73`	`73`	`public:`
`74`	`74`	`altPrompt(constMEM promptShadow& p):prompt(p) {}`
`75`	`75`	`Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {`
`76`		`- return out.printRaw("special prompt!",len);`
	`76`	`+ return out.printRaw(F("special prompt!"),len);`
`77`	`77`	`}`
`78`	`78`	`};`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ class altPrompt:public prompt {`
`198`	`198`	`public:`
`199`	`199`	`altPrompt(constMEM promptShadow& p):prompt(p) {}`
`200`	`200`	`Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {`
`201`		`- return out.printRaw("special prompt!",len);`
	`201`	`+ return out.printRaw(F("special prompt!"),len);`
`202`	`202`	`}`
`203`	`203`	`};`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class altPrompt:public prompt {`
`87`	`87`	`public:`
`88`	`88`	`altPrompt(constMEM promptShadow& p):prompt(p) {}`
`89`	`89`	`Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t) override {`
`90`		`- return out.printRaw("special prompt!",len);;`
	`90`	`+ return out.printRaw(F("special prompt!"),len);;`
`91`	`91`	`}`
`92`	`92`	`};`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class altPrompt:public prompt {`
`104`	`104`	`public:`
`105`	`105`	`altPrompt(constMEM promptShadow& p):prompt(p) {}`
`106`	`106`	`Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr) override {`
`107`		`- return out.printRaw("special prompt!",len);;`
	`107`	`+ return out.printRaw(F("special prompt!"),len);;`
`108`	`108`	`}`
`109`	`109`	`};`
`110`	`110`