Merge pull request #65 from MatzElectronics/master

OLED Library repairs

Author: AndyLindsay

Learn/Simple Libraries/Display/liboledc/cmm/liboledc.a

@@ -54,18 +54,14 @@ void oledc_clear(int x0, int y0, int w, int h)
   }
 
   // Boundary check
-  if ((y0 >= TFTHEIGHT) && (y1 >= TFTHEIGHT))
+  if ((y0 >= TFTHEIGHT) || (y1 < 0) || (x0 >= TFTWIDTH) || (x1 < 0)) {
+    oledc_screenLockClr(); 
     return;
-  if ((x0 >= TFTWIDTH) && (x1 >= TFTWIDTH))
-    return;
-  if (x0 >= TFTWIDTH)
-    x0 = TFTWIDTH - 1;
-  if (y0 >= TFTHEIGHT)
-    y0 = TFTHEIGHT - 1;
-  if (x1 >= TFTWIDTH)
-    x1 = TFTWIDTH - 1;
-  if (y1 >= TFTHEIGHT)
-    y1 = TFTHEIGHT - 1;
+  }     
+  if (x0 < 0) x0 = 0;
+  if (y0 < 0) y0 = 0;
+  if (x1 >= TFTWIDTH)  x1 = TFTWIDTH - 1;
+  if (y1 >= TFTHEIGHT) y1 = TFTHEIGHT - 1;
 
   oledc_writeCommand(SSD1331_CMD_CLEAR, 0);
   oledc_writeCommand(x0, 0);

Learn/Simple Libraries/Display/liboledc/lmm/liboledc.a

@@ -17,6 +17,7 @@
 #include "oledc.h"
 
 char TFTROTATION;
+int _width, _height;
 
 void oledc_copy(int x0, int y0, int w, int h, int x2, int y2) 
 {
@@ -25,15 +26,67 @@ void oledc_copy(int x0, int y0, int w, int h, int x2, int y2)
 
   int x1 = x0 + w - 1;
   int y1 = y0 + h - 1;
+  
+  int x3 = x2 + w - 1;
+  int y3 = y2 + h - 1;
+
+  if (x0 >= _width || y0 >= _height || x1 < 0 || y1 < 0 || w <= 0 || h <= 0 || 
+      x2 >= _width || y2 >= _height || x3 < 0 || y3 < 0) 
+  {
+    oledc_screenLockClr();    
+    return;
+  }    
+
+  if (x1 >= _width) 
+  {
+    x1 = _width - 1;
+    w = x1 - x0 + 1;
+  }    
+  if (y1 >= _height) 
+  {
+    y1 = _height - 1;
+    h = y1 - y0 + 1;
+  }     
+ 
+  if (x0 < 0) 
+  {
+    x2 = x2 - x0;
+    x0 = 0;
+  }    
+  if (y0 < 0) 
+  {
+    y2 = y2 - y0;
+    y0 = 0;
+  }
+  
+  x3 = x2 + w - 1;
+  y3 = y2 + h - 1;
+ 
+  if(x3 >= _width)
+  {
+    x3 = _width - 1;
+    w = x3 - x2 + 1;
+    x1 = x0 + w - 1;
+  }    
+  if(y3 >= _height)
+  {
+    y3 = _height - 1;
+    h = y3 - y2 + 1;
+    y1 = y0 + h - 1;
+  }    
+
 
   // check rotation, move pixel around if necessary
   switch (TFTROTATION) {
     case 1:
       gfx_swap(x0, y0);
       gfx_swap(x1, y1);
+      gfx_swap(x2, y2);
+      gfx_swap(x3, y3);
       x0 = TFTWIDTH - x0 - 1;
       x1 = TFTWIDTH - x1 - 1;
       x2 = TFTWIDTH - x2 - 1;
+      x3 = TFTWIDTH - x3 - 1;
       break;
     case 2:
       x0 = TFTWIDTH - x0 - 1;
@@ -42,35 +95,26 @@ void oledc_copy(int x0, int y0, int w, int h, int x2, int y2)
       y1 = TFTHEIGHT - y1 - 1;
       x2 = TFTWIDTH - x2 - 1;
       y2 = TFTHEIGHT - y2 - 1;
+      x3 = TFTWIDTH - x3 - 1;
+      y3 = TFTHEIGHT - y3 - 1;
       gfx_swap(x0, x1);
       gfx_swap(y0, y1);
+      gfx_swap(x2, x3);
+      gfx_swap(y2, y3);
       break;
     case 3:
       gfx_swap(x0, y0);
       gfx_swap(x1, y1);
+      gfx_swap(x2, y2);
+      gfx_swap(x3, y3);
       y0 = TFTHEIGHT - y0 - 1;
       y1 = TFTHEIGHT - y1 - 1;
       y2 = TFTHEIGHT - y2 - 1;
+      y3 = TFTHEIGHT - y3 - 1;
       break;
   }
 
-  // Boundary check
-  if ((y0 >= TFTHEIGHT) && (y1 >= TFTHEIGHT))
-    return;
-  if ((x0 >= TFTWIDTH) && (x1 >= TFTWIDTH))
-    return;
-  if (x0 >= TFTWIDTH)
-    x0 = TFTWIDTH - 1;
-  if (y0 >= TFTHEIGHT)
-    y0 = TFTHEIGHT - 1;
-  if (x1 >= TFTWIDTH)
-    x1 = TFTWIDTH - 1;
-  if (y1 >= TFTHEIGHT)
-    y1 = TFTHEIGHT - 1;
-  if (x2 >= TFTWIDTH)
-    x2 = TFTWIDTH - 1;
-  if (y2 >= TFTHEIGHT)
-    y2 = TFTHEIGHT - 1;
+  
 
   oledc_writeCommand(SSD1331_CMD_COPY, 0);
   oledc_writeCommand(x0, 0);

Learn/Simple Libraries/Display/liboledc/oledc_clear.c

@@ -22,18 +22,17 @@ int _width, _height;
 
 void oledc_fillRectPrimative(int x0, int y0, int w, int h, unsigned int color)
 {
-  if (w < 0 || h < 0) return;
-  
+  int x1 = x0 + w - 1;
+  int y1 = y0 + h - 1;
+
+  if (x0 >= _width || y0 >= _height || x1 < 0 || y1 < 0 || w <= 0 || h <= 0) return;
+
+  if (x1 >= _width)  x1 = _width - 1;
+  if (y1 >= _height) y1 = _height - 1; 
+ 
   if (x0 < 0) x0 = 0;
-  if (x0 >= _width) x0 = (_width-1);
   if (y0 < 0) y0 = 0;
-  if (y0 >= _height) y0 = (_height-1);
-  
-  if (x0 + w >= _width) w = (_width - x0);
-  if (y0 + h >= _height) h = (_height - y0);
 
-  int x1 = x0 + w - 1;
-  int y1 = y0 + h - 1;
 
   switch (TFTROTATION) {
     case 1: