More work towards 2.02beta2

Duet Maestro 12864 display: merged in Matt's changes and did some fixes
Changed Smart Drivers interface to support accessing additional registers and parts of registers
Started implementing an object model
Change C++ compilation mode to gnu++17 to handle lambda function pointers in flash memory
Added NamedEnum class *(notuzsed yet)

1 files changed, 4 insertions, 5 deletions

diff --git a/src/Display/Menu.h b/src/Display/Menu.h
index e6658c64..925338f1 100644
--- a/src/Display/Menu.h
+++ b/src/Display/Menu.h
@@ -23,10 +23,9 @@ public:
 
 private:
 	void LoadFixedMenu();
-	bool bInFixedMenu() const;
 	void ResetCache();
 	void Reload();
-	const char *ParseMenuLine(char *s);
+	const char *ParseMenuLine(char * s);
 	void LoadError(const char *msg, unsigned int line);
 	void AddItem(MenuItem *item, bool isSelectable);
 	const char *AppendString(const char *s);
@@ -54,7 +53,7 @@ private:
 	const LcdFont * const *fonts;
 	const size_t numFonts;
 
-	bool timeoutEnabled;
+	uint32_t timeoutValue;										// how long to time out after 0 = no timeout
 	uint32_t lastActionTime;
 
 	MenuItem *selectableItems;									// selectable items at the innermost level
@@ -64,11 +63,11 @@ private:
 	int numSelectableItems;
 	int highlightedItem;
 	bool itemIsSelected;
-
-	static constexpr const char *const m_pcFixedMenu = "zzFixed";
+	bool displayingFixedMenu;
 
 	// Variables used while parsing
 	size_t commandBufferIndex;
+	unsigned int errorColumn;									// column in the current line at which ParseMenuLine hit an error
 	MenuItem::FontNumber fontNumber;
 	PixelNumber currentMargin;
 	PixelNumber row, column;