window management

Author: wryan67

example/wsePaperV2.cpp

@@ -113,7 +113,7 @@ bool demoSineWave(int frameCount, long long start, Image image) {
     sprintf(message, "%d-fps", lastFPS);
     image.drawText(maxX - (17 * strlen(message)) - 1, minY + 1, message, &Font24, BLACK, WHITE);
 
-    d1.showImage(image,DEGREE_270);
+    d1.showImage(image, DEGREE_270);
 
     return ((now - start) < 8000);
 }
@@ -178,13 +178,13 @@ void display1Demo() {
 
             chart.drawPieSlice(296*3/4,64, 48,  d, d+45, WHITE, SOLID,1);
             chart.drawRectangle(296/2-12,64, 296/2+12,64+12, BLACK, NONE, SOLID,1);
-            d1.showImagePartial(chart, DEGREE_90);
+            d1.showImage(chart, DEGREE_90);
 
             chart.drawPieSlice(296*3/4,64, 48,  d, d+45, BLACK, SOLID,1);
             chart.drawText(296/2-12,64+6, drg, &Font12, BLACK, WHITE);
             chart.drawText(296*3/4+12,64, drg, &Font12, BLACK, WHITE);
 
-            d1.showImagePartial(chart, DEGREE_90);
+            d1.showImage(chart, DEGREE_90);
         }
 
         long long start = currentTimeMillis();

src/displays/DisplayWS_ePaper_v2.cpp

@@ -160,12 +160,22 @@ namespace udd {
     }
 
 
+
     void addBit(int bit, _byte* byte, int val) {
         if (val>0) {
           (*byte) = (*byte) | (val << (7-bit));
         }
     }
 
+    void DisplayWS_ePaper_v2::showImage(Image& image) {
+        Display::showImage(image);
+    }
+
+    void DisplayWS_ePaper_v2::showImage(Image& image, Rotation rotation) {
+        Display::showImage(image, rotation);
+    }
+
+
     void DisplayWS_ePaper_v2::showImage(Image &image, Point p1, Point p2, Rotation rotation) {
 
         fprintf(stderr, "ePaper showImage(%d,%d)\n", config.width, config.height);
@@ -254,73 +264,6 @@ namespace udd {
 
 
 
-    void DisplayWS_ePaper_v2::showImagePartial(Image image, Rotation rotation) {
-        screenLock.lock();
-        openSPI();
-        digitalWrite(config.DC, 1);
-        digitalWrite(config.CS, 0);
-
-        int width = config.width + config.xOffset;
-        int height = config.height + config.yOffset;
-
-
-        setPartReg();
-        writeCommand(0x91); // set partial
-
-
-        writeCommand(0x90);		//resolution setting
-        writeData(0);           //x-start
-        writeData(config.width - 1);       //x-end
-
-        writeData(0);
-        writeData(0);     //y-start
-        writeData(config.height / 256);
-        writeData(config.height % 256 - 1);  //y-end
-        writeData(0x28);
-
-       // writeCommand(0x11); // swap images
-
-        writeCommand(0x10); 
-        
-        for (int y = 0; y < height; y++) {
-            int  bits = 0;
-            _byte out = 0;
-            for (int x = 0; x < width; ++x) {
-                ColorType* ct = image.getPixel(x - config.xOffset, y - config.yOffset, rotation);
-                int val=1;
-                if (ct != NULL) {
-                    if (WHITE.equals(ct)) {
-                        val=1;
-                    }
-                    else if (BLACK.equals(ct)) {
-                        val=0;
-                    }
-                    else if (RED.equals(ct)) {
-                        val=1;
-                    } else {
-                        fprintf(stderr, "invalid color found at (%d,%d)\n", x, y);
-                    }
-                }
-                if (++bits % 8 == 0) {
-                    writeData(out);
-                    out=0;
-                }
-                addBit(bits%8, &out, val);
-            }
-            if (width%8 != 0) {
-                writeData(out);
-            }
-        }
-
-
-
-
-        enableDisplay();
-
-        digitalWrite(config.CS, 1);
-        screenLock.unlock();
-    }
-
 
 
 

src/displays/DisplayWS_ePaper_v2.h

@@ -17,8 +17,9 @@ namespace udd {
         void reset() override;
         void readBusy() override;
         void clearScreen(Color color) override;
-        void showImage(Image& image, Point p1, Point p2, Rotation rotation);
-        void showImagePartial(Image image, Rotation rotation);
+        void showImage(Image& image) override;
+        void showImage(Image& image, Rotation rotation) override;
+        void showImage(Image& image, Point p1, Point p2, Rotation rotation) override;
         void EPD_SetFullReg();
         void setPartReg();
         void enableDisplay();