Merge pull request #66 from MatzElectronics/master

Added graphics functions for OLED display

Author: AndyLindsay

Learn/Simple Libraries/Social/libbadgetools/Documentation badgetools Library.html

@@ -875,6 +875,105 @@ void line( int x0, int y0, int x1, int y1, int c);
  */
 void box( int x0, int y0, int x1, int y1, int c);
 
+/**
+ * @brief Plot a filled box on the oLED screen.  
+ *
+ * @param x0 The x coordinate of one corner of the box.  Measured as a 
+ * number of pixels from left side of screen.  The value increases 
+ * from 0 (left) to 127 (right).  
+ *
+ * @param y0 The y coordinate of one corner of the box.  Measured as a 
+ * number of pixels from the top of the screen.  The value increases 
+ * from 0 (top) to 63 (bottom).  
+ *
+ * @param x1 The x coordinate of a corner diagonal from the first corner.  
+ *
+ * @param y1 The y coordinate of the corner diagonal from the first corner.  
+ * 
+ * @param c The pixel color 1 for white, 0 for black.
+ */
+void boxFilled( int x0, int y0, int x1, int y1, int c);
+
+/**
+ * @brief Plot a triangle on the oLED screen.  
+ *
+ * @param x0 The x coordinate of one corner of the triangle.  Measured as a 
+ * number of pixels from left side of screen.  The value increases 
+ * from 0 (left) to 127 (right).  
+ *
+ * @param y0 The y coordinate of one corner of the triangle.  Measured as a 
+ * number of pixels from the top of the screen.  The value increases 
+ * from 0 (top) to 63 (bottom).  
+ *
+ * @param x1 The x coordinate of the second corner.  
+ *
+ * @param y1 The y coordinate of the second corner.  
+ * 
+ * @param x2 The x coordinate of the third corner.  
+ *
+ * @param y2 The y coordinate of the third corner.  
+ * 
+ * @param c The pixel color 1 for white, 0 for black.
+ */
+void triangle( int x0, int y0, int x1, int y1, int x2, int y2, int c);
+
+/**
+ * @brief Plot a filled triangle on the oLED screen.  
+ *
+ * @param x0 The x coordinate of one corner of the triangle.  Measured as a 
+ * number of pixels from left side of screen.  The value increases 
+ * from 0 (left) to 127 (right).  
+ *
+ * @param y0 The y coordinate of one corner of the triangle.  Measured as a 
+ * number of pixels from the top of the screen.  The value increases 
+ * from 0 (top) to 63 (bottom).  
+ *
+ * @param x1 The x coordinate of the second corner.  
+ *
+ * @param y1 The y coordinate of the second corner.  
+ * 
+ * @param x2 The x coordinate of the third corner.  
+ *
+ * @param y2 The y coordinate of the third corner.  
+ * 
+ * @param c The pixel color 1 for white, 0 for black.
+ */
+void triangleFilled( int x0, int y0, int x1, int y1, int x2, int y2, int c);
+
+/**
+ * @brief Plot a circle on the oLED screen.  
+ *
+ * @param x0 The x coordinate of the center of the circle.  Measured as a 
+ * number of pixels from left side of screen.  The value increases 
+ * from 0 (left) to 127 (right).  
+ *
+ * @param y0 The y coordinate of the center of the circle.  Measured as a 
+ * number of pixels from the top of the screen.  The value increases 
+ * from 0 (top) to 63 (bottom).  
+ *
+ * @param r The radius of the circle.  
+ * 
+ * @param c The pixel color 1 for white, 0 for black.
+ */
+void circle( int x0, int y0, int r, int c);
+
+/**
+ * @brief Plot a filled circle on the oLED screen.  
+ *
+ * @param x0 The x coordinate of the center of the circle.  Measured as a 
+ * number of pixels from left side of screen.  The value increases 
+ * from 0 (left) to 127 (right).  
+ *
+ * @param y0 The y coordinate of the center of the circle.  Measured as a 
+ * number of pixels from the top of the screen.  The value increases 
+ * from 0 (top) to 63 (bottom).  
+ *
+ * @param r The radius of the circle.  
+ * 
+ * @param c The pixel color 1 for white, 0 for black.
+ */
+void circleFilled( int x0, int y0, int r, int c);
+
 /**
  * @brief Place a shape defined by a char array of pixels on the oLED
  * display.  See 11 Shapes to Display.side for example.

Learn/Simple Libraries/Social/libbadgetools/badgetools.h

@@ -100,6 +100,8 @@ peb_stringView.c
 peb_text.c
 sscan_ct.c
 peb_irclear.c
+oled_circle.c
+oled_triangle.c
 >compiler=C
 >memtype=cmm main ram compact
 >optimize=-Os

Learn/Simple Libraries/Social/libbadgetools/cmm/libbadgetools.a

@@ -14,6 +14,21 @@ void box(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t c)
   if (self->AutoUpdate) screen_update();
 }
 
+void boxFilled(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t c)
+{
+  // Draw a box formed by the coordinates of a diagonal line
+  if(y0 < y1) {
+    int temp = y0;
+    y0 = y1;
+    y1 = temp;
+    temp = x0;
+    x0 = x1;
+    x1 = temp;
+  }    
+  for(int idx = y0; idx <= y1; idx++) line(x0, idx, x1, idx, c);    
+  if (self->AutoUpdate) screen_update();
+}
+
 /*
   TERMS OF USE: MIT License
  

Learn/Simple Libraries/Social/libbadgetools/html/badgetools_8h.html

@@ -0,0 +1,100 @@
+#include <stdlib.h>
+#include <propeller.h>
+#include "badgetools.h"
+
+volatile screen *self;
+
+void circle(int32_t x0, int32_t y0, int32_t r, int32_t c)
+{
+  int f = 1 - r;
+  int ddF_x = 1;
+  int ddF_y = -2 * r;
+  int x = 0;
+  int y = r;
+
+  point(x0  , y0 + r, c);
+  point(x0  , y0 - r, c);
+  point(x0 + r, y0  , c);
+  point(x0 - r, y0  , c);
+
+  while (x < y)
+  {
+    if (f >= 0) {
+      y--;
+      ddF_y += 2;
+      f += ddF_y;
+    }
+    x++;
+    ddF_x += 2;
+    f += ddF_x;
+
+    point(x0 + x, y0 + y, c);
+    point(x0 - x, y0 + y, c);
+    point(x0 + x, y0 - y, c);
+    point(x0 - x, y0 - y, c);
+    point(x0 + y, y0 + x, c);
+    point(x0 - y, y0 + x, c);
+    point(x0 + y, y0 - x, c);
+    point(x0 - y, y0 - x, c);
+  }
+  if (self->AutoUpdate) screen_update();
+}
+
+void circleFilled(int32_t x0, int32_t y0, int32_t r, int32_t c)
+{
+  // Draw a box formed by the coordinates of a diagonal line
+  line(x0, y0 - r, x0, y0 + r, c);
+
+  int f     = 1 - r;
+  int ddF_x = 1;
+  int ddF_y = -2 * r;
+  int x     = 0;
+  int y     = r;
+
+  while (x < y)
+  {
+    if (f >= 0) {
+      y--;
+      ddF_y += 2;
+      f     += ddF_y;
+    }
+    x++;
+    ddF_x += 2;
+    f     += ddF_x;
+
+    int yD = 2 * y + 1;
+    int xD = 2 * x + 1;
+    
+    //if(y0 - y + yD > _height) yD = _height - y0 + y;
+    //if(y0 - y + xD > _height) xD = _height - y0 + y; 
+         
+    line(x0 + x, y0 - y, x0 + x, y0 - y + yD - 1, c);
+    line(x0 + y, y0 - x, x0 + y, y0 - x + xD - 1, c);
+    line(x0 - x, y0 - y, x0 - x, y0 - y + yD - 1, c);
+    line(x0 - y, y0 - x, x0 - y, y0 - x + xD - 1, c);
+  }
+
+  if (self->AutoUpdate) screen_update();
+}
+
+/*
+  TERMS OF USE: MIT License
+ 
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+ 
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+ 
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

Learn/Simple Libraries/Social/libbadgetools/html/badgetools_8h_source.html

@@ -0,0 +1,108 @@
+#include <stdlib.h>
+#include <propeller.h>
+#include "badgetools.h"
+
+volatile screen *self;
+
+void triangle(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t c)
+{
+  // connect the dots, laa la la laaa! :)
+  line(x0, y0, x1, y1, c);
+  line(x1, y1, x2, y2, c);
+  line(x2, y2, x0, y0, c);
+  if (self->AutoUpdate) screen_update();
+}
+
+void triangleFilled(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t c)
+{
+  // Draw a box formed by the coordinates of a diagonal line
+  int a, b, y, last;
+
+  // Sort coordinates by Y order (y2 >= y1 >= y0)
+  if (y0 > y1) {
+    screen_swap(y0, y1); screen_swap(x0, x1);
+  }
+  if (y1 > y2) {
+    screen_swap(y2, y1); screen_swap(x2, x1);
+  }
+  if (y0 > y1) {
+    screen_swap(y0, y1); screen_swap(x0, x1);
+  }
+
+  if (y0 == y2) { // Handle awkward all-on-same-line case as its own thing
+    a = b = x0;
+    if (x1 < a)      a = x1;
+    else if (x1 > b) b = x1;
+    if (x2 < a)      a = x2;
+    else if (x2 > b) b = x2;
+    line(a, y0, b, y0, c);
+    return;
+  }
+
+  int
+  dx01 = x1 - x0,
+  dy01 = y1 - y0,
+  dx02 = x2 - x0,
+  dy02 = y2 - y0,
+  dx12 = x2 - x1,
+  dy12 = y2 - y1,
+  sa   = 0,
+  sb   = 0;
+
+  // For upper part of triangle, find scanline crossings for segments
+  // 0-1 and 0-2.  If y1=y2 (flat-bottomed triangle), the scanline y1
+  // is included here (and second loop will be skipped, avoiding a /0
+  // error there), otherwise scanline y1 is skipped here and handled
+  // in the second loop...which also avoids a /0 error here if y0=y1
+  // (flat-topped triangle).
+  if (y1 == y2) last = y1;  // Include y1 scanline
+  else         last = y1 - 1; // Skip it
+
+  for (y = y0; y <= last; y++) {
+    a   = x0 + sa / dy01;
+    b   = x0 + sb / dy02;
+    sa += dx01;
+    sb += dx02;
+
+    if (a > b) screen_swap(a, b);
+    line(a, y, b, y, c);
+  }
+
+  // For lower part of triangle, find scanline crossings for segments
+  // 0-2 and 1-2.  This loop is skipped if y1=y2.
+  sa = dx12 * (y - y1);
+  sb = dx02 * (y - y0);
+  for (; y <= y2; y++) {
+    a   = x1 + sa / dy12;
+    b   = x0 + sb / dy02;
+    sa += dx12;
+    sb += dx02;
+
+    if (a > b) screen_swap(a, b);
+    line(a, y, b, y, c);
+  }
+
+  if (self->AutoUpdate) screen_update();
+}
+
+/*
+  TERMS OF USE: MIT License
+ 
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+ 
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+ 
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/