Merge branch 'master' into demo for deployment to the Demo stack

Author: pjewald

Learn/Examples/Robots/S3/Test libS3 for Basic Functionality.c

@@ -65,6 +65,21 @@ <h3 style="font-family:verdana;">Text Devices</h3>
 
 <h3 style="font-family:verdana;">Audio</h3>
 
+<p>
+<blockquote>
+<a href="Simple%20Libraries/Audio/libsound/Documentation%20sound%20Library.html" target="_blank">sound.h</a> - Functions for generating audio and musical notes.  
+Mix up to three waveforms, with sine, square, triangle, saw, and noise options.
+</blockquote>
+</p>
+
+
+<p>
+<blockquote>
+<a href="Simple%20Libraries/Audio/libtext2speech/Documentation%20text2speech%20Library.html" target="_blank">text2speech.h</a> - Functions for pronouncing words spelled out phonemically. 
+</blockquote>
+</p>
+
+
 <p>
 <blockquote>
 <a href="Simple%20Libraries/Audio/libwavplayer/Documentation%20wavplayer%20Library.html" target="_blank">wavplayer.h</a> - Plays 16-bit, 32 ksps, mono .wav files (Propeller Activity Board/Propeller BOE).
@@ -103,6 +118,13 @@ <h3 style="font-family:verdana;">Convert</h3>
 
 <h3 style="font-family:verdana;">Display</h3>
 
+<p>
+<blockquote>
+<a href="Simple%20Libraries/Display/liboledc/Documentation%20oledc%20Library.html" target="_blank">oledc.h</a> - Functions for controlling the 96 x 64 Color oLED Display Module.
+</blockquote>
+</p>
+
+
 <p>
 <blockquote>
 <a href="Simple%20Libraries/Display/libvgatext/Documentation%20vgatext%20Library.html" target="_blank">vgatext.h</a> - Display text with a VGA Monitor.
@@ -111,6 +133,16 @@ <h3 style="font-family:verdana;">Display</h3>
 
 
 
+<h3 style="font-family:verdana;">Light</h3>
+
+<p>
+<blockquote>
+<a href="Simple%20Libraries/Light/libws2812/Documentation%20ws2812%20Library.html" target="_blank">ws2812.h</a> - Driver for WS2812 and WS2812B RGB LEDs.
+</blockquote>
+</p>
+
+
+
 <h3 style="font-family:verdana;">Misc</h3>
 
 <p>
@@ -201,13 +233,13 @@ <h3 style="font-family:verdana;">Robotics</h3>
 
 <p>
 <blockquote>
-<a href="Simple%20Libraries/Robotics/ActivityBot/Documentation%20abdrive%20Library.html" target="_blank">abdrive.h</a> - Tools for ActivityBot navigation with encoders + servos.
+<a href="Simple%20Libraries/Robotics/ActivityBot/libabdrive/Documentation%20abdrive%20Library.html" target="_blank">abdrive.h</a> - Tools for ActivityBot navigation with encoders + servos.
 </blockquote>
 </p>
 
 <p>
 <blockquote>
-<a href="Simple%20Libraries/Robotics/ActivityBot/Documentation%20abcalibrate%20Library.html" target="_blank">abcalibrate.h</a> - Self-calibration functions for the ActivityBot.
+<a href="Simple%20Libraries/Robotics/ActivityBot/libabcalibrate/Documentation%20abcalibrate%20Library.html" target="_blank">abcalibrate.h</a> - Self-calibration functions for the ActivityBot.
 </blockquote>
 </p>
 
@@ -236,6 +268,14 @@ <h3 style="font-family:verdana;">Sensor</h3>
 </p>
 
 
+<p>
+<blockquote>
+<a href="Simple%20Libraries/Sensor/liblsm9ds1/Documentation%20lsm9ds1%20Library.html" target="_blank">lsm9ds1.h</a> - For measuring 3D accelerometer, gyroscope, and magnetometer
+with the LSM9DS1.
+</blockquote>
+</p>
+
+
 <p>
 <blockquote>
 <a href="Simple%20Libraries/Sensor/libmx2125/Documentation%20mx2125%20Library.html" target="_blank">mx2125.h</a> - For measurements with the 2-axis mx2125 accelerometer.
@@ -272,6 +312,30 @@ <h3 style="font-family:verdana;">Sensor</h3>
 
 
 
+<h3 style="font-family:verdana;">Social</h3>
+
+<p>
+<blockquote>
+<a href="Simple%20Libraries/Social/libbadgetools/Documentation%20badgetools%20Library.html" target="_blank">badgetools.h</a> - Functions for all Parallax Hackable Electronic Badge
+ components, including: 128 x 64 oLED display, 3-axis accelerometer, two-way infrared 
+ communication, tri-color LEDs, passive touch buttons, touch button LEDs, audio out, 
+ and battery.
+</blockquote>
+</p>
+
+
+
+<h3 style="font-family:verdana;">Time</h3>
+
+<p>
+<blockquote>
+<a href="Simple%20Libraries/Time/libdatetime/Documentation%20datetime%20Library.html" target="_blank">datetime.h</a> - Functions for tracking date and time.
+</blockquote>
+</p>
+
+
+
+
 <p>
 <br>
 Typos, comments, or suggestions? Email: <a href="mailto:editor@parallax.com">

Learn/Examples/Robots/S3/Test libS3 for Basic Functionality.side

@@ -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 Index.html

@@ -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/cmm/liboledc.a

@@ -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: