fix SSD1306AsciiOut clear

and some polising
neu-rah · Aug 19, 2018 · 696c1e5 · 696c1e5
1 parent 6de33b9
commit 696c1e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/examples/SSD1306Ascii/SSD1306Ascii/SSD1306Ascii.ino b/examples/SSD1306Ascii/SSD1306Ascii/SSD1306Ascii.ino
@@ -27,6 +27,7 @@ int test=55;
 result action1(eventMask e) {
   Serial.print(e);
   Serial.println(" action1 executed, proceed menu");Serial.flush();
+  trace(if (e==enterEvent) oled.clear(0,oled.displayWidth(),2,3));
   return proceed;
 }
 
@@ -102,7 +103,7 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
 #define MAX_DEPTH 2
 
 #ifdef LOC
-  #define LARGE_FONT
+  // #define LARGE_FONT
   #define INV
 #endif
 
@@ -114,7 +115,7 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
   // #define menuFont System5x7
   #define menuFont lcd5x7
   #define fontW 5
-  #define fontH 9
+  #define fontH 8
 #endif
 
 //define output device
@@ -132,7 +133,7 @@ idx_t tops[MAX_DEPTH]={0,0};//store cursor positions for each level
 #else
   SSD1306AsciiOut outOLED(&oled,tops,pList,5,1);//oled output device menu driver
 #endif
-menuOut* constMEM outputs[] MEMMODE ={&outOLED};//,&outSerial};//list of output devices
+menuOut* constMEM outputs[] MEMMODE ={&outOLED,&outSerial};//list of output devices
 outputsList out(outputs,sizeof(outputs)/sizeof(menuOut*));//outputs list
 
 //macro to create navigation control root object (nav) using mainMenu

diff --git a/src/menuIO/SSD1306AsciiOut.h b/src/menuIO/SSD1306AsciiOut.h
@@ -41,9 +41,9 @@
           panels.reset();
         }
         void clear(idx_t panelNr) override {
-          trace(Serial<<"clear panel!! "<<panelNr<<endl;);
           const panel p=panels[panelNr];
-          device->clear(p.x,p.y,p.x+p.w-1,p.y+p.h-1);
+          trace(Serial<<"clear panel!! "<<panelNr<<"{"<<p.x<<","<<p.y<<","<<p.w<<","<<p.h<<"}"<<endl;);
+          device->clear(resX*p.x,resX*(p.x+p.w)-1,resY*p.y,resY*(p.y+p.h)-1);
           // setCursor(0,0,panelNr);
           panels.nodes[panelNr]=NULL;
         }