Fixes before release.

Author: davetcc

examples/avr/analogJoystick1306Ascii/analogJoystick1306Ascii.emf

@@ -172,7 +172,7 @@
       },
       {
         "name": "TITLE_FONT",
-        "latestValue": "Arial14",
+        "latestValue": "System5x7",
         "subsystem": "DISPLAY"
       },
       {

examples/avr/analogJoystick1306Ascii/analogJoystick1306Ascii_menu.cpp

@@ -15,7 +15,7 @@
 const PROGMEM  ConnectorLocalInfo applicationInfo = { "Space Junk", "5049a016-0d7e-4004-a183-cabe4e9cf6b8" };
 AvrEeprom glAvrRom;
 SSD1306AsciiAvrI2c gfx;
-SSD1306AsciiRenderer renderer(20, Arial14, System5x7);
+SSD1306AsciiRenderer renderer(20, System5x7, System5x7);
 MultiIoAbstraction joystickMultiIo(200);
 AnalogJoystickToButtons joystickIoXAxis(internalAnalogIo(), A1, 0.5);
 

examples/avr/analogJoystick1306Ascii/ssd1306asciiRenderer.cpp

@@ -148,12 +148,12 @@ void SSD1306AsciiRenderer::renderMenuItem(uint8_t row, MenuItem* item) {
 
 	int offs;
 	if (item->getMenuType() == MENUTYPE_BACK_VALUE) {
-		buffer[0] = item->isActive() ? (char)backChar : ' ';
+		buffer[0] = item == activeItem ? (char)backChar : ' ';
 		buffer[1] = (char)backChar;
 		offs = 2;
 	}
 	else {
-		buffer[0] = item->isEditing() ? editChar : (item->isActive() ? forwardChar : ' ');
+		buffer[0] = char(item == menuMgr.getCurrentEditor() ? editChar : (item == activeItem ? forwardChar : ' '));
 		offs = 1;
 	}
     uint8_t finalPos = item->copyNameToBuffer(buffer, offs, bufferSize);
@@ -177,7 +177,7 @@ void SSD1306AsciiRenderer::renderMenuItem(uint8_t row, MenuItem* item) {
         int cpy = (bufferSize - count) - 1;
 
         auto hints = menuMgr.getEditorHints();
-        if(menuMgr.getCurrentEditor() && hints.getEditorRenderingType() != CurrentEditorRenderingHints::EDITOR_REGULAR && item->isEditing()) {
+        if(menuMgr.getCurrentEditor() && hints.getEditorRenderingType() != CurrentEditorRenderingHints::EDITOR_REGULAR && item==menuMgr.getCurrentEditor()) {
             int startIndex = min(count, hints.getStartIndex());
             int endIndex = min(count, hints.getEndIndex());
             Serial.print("0");