Load Nokia display info messages from flash

config.h change: Convert msg_XXX variables to new format:

     const char msg_XXXXXXX[] PROGMEM = "foobar";

Author: thomasjfox

Arduino_Pedelec_Controller/Arduino_Pedelec_Controller.ino

@@ -440,7 +440,7 @@ void loop()
             km=variable.kilometers;
             mah=variable.mah;
         } else
-            display_show_important_info(msg_battery_charged, 5);
+            display_show_important_info(FROM_FLASH(msg_battery_charged), 5);
 #endif
         if (voltage<6.0)                                   //do not write new data to eeprom when on USB Power
         {variables_saved=true;}
@@ -650,7 +650,7 @@ void loop()
                 ++idle_shutdown_count;
                 if (idle_shutdown_count > idle_shutdown_secs)
                 {
-                    display_show_important_info("Idle shutdown. Good night.", 60);
+                    display_show_important_info(MY_F("Idle shutdown. Good night."), 60);
                     save_eeprom();
                     digitalWrite(fet_out,HIGH);
                 }
@@ -662,7 +662,7 @@ void loop()
             if (voltage < vemergency_shutdown && voltage_display < vemergency_shutdown
                     && voltage > 6.0)
             {
-                display_show_important_info("Battery undervoltage detected. Emergency shutdown.", 60);
+                display_show_important_info(MY_F("Battery undervoltage detected. Emergency shutdown."), 60);
                 delay(1000);
                 save_eeprom();
                 digitalWrite(fet_out,HIGH);

Arduino_Pedelec_Controller/config.h

@@ -148,8 +148,8 @@ const float current_offset = 0.0;             // for Rev 1.3 ONLY! set this valu
 const float current_amplitude_R11 = 0.0296;   // for Rev 1.1 - 1.2 set this value according to your own current-calibration. Default: 0.0296
 const float current_amplitude_R13 = 0.0741;   // for Rev 1.3 set this value according to your own current-calibration. Default: 0.0741
 
-const char* const msg_welcome = "Welcome";
-const char* const msg_shutdown = "Live long and prosper.";
-const char* const msg_battery_charged = "Batt. charged! Resetting counters";
+const char msg_welcome[] PROGMEM = "Welcome";
+const char msg_shutdown[] PROGMEM = "Live long and prosper.";
+const char msg_battery_charged[] PROGMEM = "Batt. charged! Resetting counters";
 
 #endif

Arduino_Pedelec_Controller/display.cpp

@@ -65,9 +65,9 @@ static const PROGMEM byte glyph2[] = {0xc8, 0x2f, 0x6a, 0x2e, 0xc8}; //symbol fo
 static const PROGMEM byte glyph3[] = {0x44, 0x28, 0xfe, 0x6c, 0x28}; //bluetooth-symbol       check this out: http://www.carlos-rodrigues.com/projects/pcd8544/
 
 unsigned long show_important_info_until = 0;
-void display_show_important_info(const char *str, int duration_secs)
-{
 #if (DISPLAY_TYPE & DISPLAY_TYPE_NOKIA)
+static void prepare_important_info(int duration_secs)
+{
     unsigned long seconds = 2;
     if (duration_secs)
         seconds = duration_secs;
@@ -81,10 +81,26 @@ void display_show_important_info(const char *str, int duration_secs)
     // TODO: Implement and test 4bit display mode
     lcd.clear();
     lcd.setCursor(0, 2);
+}
+#endif
+
+void display_show_important_info(const char *str, int duration_secs)
+{
+#if (DISPLAY_TYPE & DISPLAY_TYPE_NOKIA)
+    prepare_important_info(duration_secs);
+    lcd.print(str);
+#endif
+}
+
+void display_show_important_info(const __FlashStringHelper *str, int duration_secs)
+{
+#if (DISPLAY_TYPE & DISPLAY_TYPE_NOKIA)
+    prepare_important_info(duration_secs);
     lcd.print(str);
 #endif
 }
 
+
 // Calculate length of number.
 // Don't use sprintf() here is it sucks up 1.5kb of code space.
 static byte calc_number_length(const unsigned long x)
@@ -106,7 +122,7 @@ static byte calc_number_length(const unsigned long x)
 
 void display_show_welcome_msg()
 {
-    display_show_important_info(msg_welcome, 5);
+    display_show_important_info(FROM_FLASH(msg_welcome), 5);
 
 #if (DISPLAY_TYPE & DISPLAY_TYPE_NOKIA)
     lcd.setCursor(0, 5);
@@ -266,7 +282,7 @@ static void display_nokia_menu()
         else
             lcd.print(MY_F("  "));
 
-        lcd.print(reinterpret_cast<const __FlashStringHelper *>(item->get_name()));
+        lcd.print(FROM_FLASH((item->get_name())));
 
         ++current_lcd_row;
         if (current_lcd_row == nokia_screen_rows)

Arduino_Pedelec_Controller/display.h

@@ -24,6 +24,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 void display_init();
 void display_update();
 void display_show_important_info(const char *str, int duration_secs);
+void display_show_important_info(const __FlashStringHelper *str, int duration_secs);
 
 void display_show_welcome_msg();
 void display_show_welcome_msg_temp();

Arduino_Pedelec_Controller/globals.h

@@ -73,4 +73,6 @@ extern void activate_new_profile();
 // This is the version as in Arduino 1.5 and newer.
 #define MY_F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
 
+#define FROM_FLASH(str) (reinterpret_cast<const __FlashStringHelper *>(str))
+
 #endif

Arduino_Pedelec_Controller/menu.cpp

@@ -188,9 +188,9 @@ static void handle_profile(MenuItem* p_menu_item)
 static void show_new_state(const boolean is_on)
 {
     if (is_on)
-        display_show_important_info("Aktiviert", 1);
+        display_show_important_info(MY_F("Aktiviert"), 1);
     else
-        display_show_important_info("Deaktiviert", 1);
+        display_show_important_info(MY_F("Deaktiviert"), 1);
 
     menu_active = false;
 }

Arduino_Pedelec_Controller/switches.cpp

@@ -79,7 +79,7 @@ static void action_set_soft_poti(int new_throttle_stat)
 #endif
         poti_stat = new_throttle_stat;
         if (poti_stat == 0)
-            display_show_important_info("Tempomat reset", 0);
+            display_show_important_info(MY_F("Tempomat reset"), 0);
         else
 
         {
@@ -136,7 +136,7 @@ static void action_shutdown_system()
 {
     // Shut down system
 #if HARDWARE_REV >=2
-    display_show_important_info(msg_shutdown, 60);
+    display_show_important_info(FROM_FLASH(msg_shutdown), 60);
     save_eeprom();
     digitalWrite(fet_out,HIGH);
 #endif
@@ -234,7 +234,7 @@ static void execute_action(const sw_action action)
             break;
 #endif
         default:
-            display_show_important_info("Unknown action!", 2);
+            display_show_important_info(MY_F("Unknown action!"), 2);
             break;
     }
 }