dont scroll menu pointer out of view

include/lcd.h

@@ -7,7 +7,7 @@ void lcd_loop(void);
 void lcd_clear(void);
 void lcd_set_heading(const char *heading);
 void lcd_set_text(const char *text);
-void lcd_set_menu_text(int line, const char *text);
+void lcd_set_menu_text(int line, const char *text, int scroll_off);
 
 int lcd_text_lines(void);
 

src/lcd.cpp

@@ -52,6 +52,7 @@ int heading_direction, text_direction;
 
 String menu_pre[LCD_TEXT_LINES], menu_post[LCD_TEXT_LINES];
 int menu_dir[LCD_TEXT_LINES];
+int scroll_offset = 0;
 
 boolean redraw = false;
 
@@ -62,7 +63,7 @@ enum lcd_text_mode {
 };
 enum lcd_text_mode text_mode = lcd_mode_none;
 
-#define SCROLL_DELAY 500
+#define SCROLL_DELAY 1000
 unsigned long last_scroll_time = 0;
 
 #define IS_TEXT_CHAR(x) (((x >= 'a') && (x <= 'z')) || ((x >= 'A') && (x <= 'Z')))
@@ -124,13 +125,13 @@ void lcd_scroll_multiline(String s[], int n, int w, String &pre, String &post, i
         }
 
         // take first char of first line, append to pre
-        pre = pre + s[0][0];
-        s[0] = s[0].substring(1);
+        pre = pre + s[0][scroll_offset];
+        s[0] = s[0].substring(0, scroll_offset) + s[0].substring(scroll_offset + 1);
 
         // shift now empty spot to the left through lines
         for (int i = 1; i < n; i++) {
-            s[i - 1] = s[i - 1] + s[i][0];
-            s[i] = s[i].substring(1);
+            s[i - 1] = s[i - 1] + s[i][scroll_offset];
+            s[i] = s[i].substring(0, scroll_offset) + s[i].substring(scroll_offset + 1);
         }
 
         // fill empty spot at end of last line with first char of post
@@ -149,12 +150,12 @@ void lcd_scroll_multiline(String s[], int n, int w, String &pre, String &post, i
 
         // shift now empty sport to the right through lines
         for (int i = n - 1; i >= 1; i--) {
-            s[i] = s[i - 1][s[i - 1].length() - 1] + s[i];
+            s[i] = s[i].substring(0, scroll_offset) + s[i - 1][s[i - 1].length() - 1] + s[i].substring(scroll_offset);
             s[i - 1] = s[i - 1].substring(0, s[i - 1].length() - 1);
         }
 
         // fill empty spot at beginning with last char of pre
-        s[0] = pre[pre.length() - 1] + s[0];
+        s[0] = s[0].substring(0, scroll_offset) + pre[pre.length() - 1] + s[0].substring(scroll_offset);
         pre = pre.substring(0, pre.length() - 1);
     }
 
@@ -294,6 +295,7 @@ void lcd_set_text(const char *t) {
     Serial.println(t);
 
     text_mode = lcd_mode_multiline;
+    scroll_offset = 0;
 
 #ifdef USE_20X4_TEXT_LCD
     lcd.setCursor(0, LCD_HEADING_LINES);
@@ -309,7 +311,7 @@ void lcd_set_text(const char *t) {
 #endif // USE_FULL_GRAPHIC_LCD
 }
 
-void lcd_set_menu_text(int line, const char *t) {
+void lcd_set_menu_text(int line, const char *t, int scroll_off) {
     if ((line < 0) || (line >= LCD_TEXT_LINES)) {
         Serial.print(F("Invalid lcd line no: "));
         Serial.println(line);
@@ -321,6 +323,7 @@ void lcd_set_menu_text(int line, const char *t) {
     Serial.println(t);
 
     text_mode = lcd_mode_menu;
+    scroll_offset = scroll_off;
 
 #ifdef USE_20X4_TEXT_LCD
     lcd.setCursor(0, LCD_HEADING_LINES + line);

src/sm_menu.cpp

@@ -79,7 +79,7 @@ void StateMenu::display(void) {
         } else {
             s += children.at(i)->getTitle();
         }
-        lcd_set_menu_text(i - menuOff, s.c_str());
+        lcd_set_menu_text(i - menuOff, s.c_str(), 2);
     }
 }
 
@@ -161,7 +161,7 @@ void StateDynamicMenu::display(void) {
         } else {
             s += contents.at(i);
         }
-        lcd_set_menu_text(i - menuOff, s.c_str());
+        lcd_set_menu_text(i - menuOff, s.c_str(), 2);
     }
 }
 

src/sm_value.cpp

@@ -158,7 +158,7 @@ void StateValues<T, N>::display(void) {
             }
         }
 
-        lcd_set_menu_text(i - off, s.c_str());
+        lcd_set_menu_text(i - off, s.c_str(), 2);
     }
 }