Merge 2afb5f3d6c into b5d9798144

Display.h

@@ -37,9 +37,7 @@
 class Display : public DisplayInterface {
 public:
   Display(DisplayDevice *deviceDriver);
-#if !defined (MAX_CHARACTER_ROWS)
   static const int MAX_CHARACTER_ROWS = 8;
-#endif
   static const int MAX_CHARACTER_COLS = MAX_MSG_SIZE;
   static const long DISPLAY_SCROLL_TIME = 3000;  // 3 seconds
 

config.example.h

@@ -167,14 +167,6 @@ The configuration file for DCC-EX Command Station
 //  *  #define SCROLLMODE 2 is by row (move up 1 row at a time).
 #define SCROLLMODE 1
 
-// In order to avoid wasting memory the current scroll buffer is limited
-// to 8 lines.  Some users wishing to display additional information
-// such as TrackManager power states have requested additional rows aware
-// of the warning that this will take extra RAM.  if you wish to include additional rows
-// uncomment the following #define and set the number of lines you need.
-//#define MAX_CHARACTER_ROWS 12
-
-
 /////////////////////////////////////////////////////////////////////////////////////
 // DISABLE EEPROM
 //

version.h

@@ -3,8 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.2"
+#define VERSION "5.2.1"
-// 5.2.2  - Added option to allow MAX_CHARACTER_ROWS to be defined in config.h
 // 5.2.1  - Trackmanager rework for simpler structure
 // 5.2.0  - ESP32: Autoreverse and booster mode support
 // 5.1.21 - EXRAIL invoke multiple ON handlers for same event