Added filled circle and demo sketch.

Author: ShawnHymel

Libraries/SparkFun_LED_8x7/README.md

@@ -6,7 +6,7 @@ Arduino library for the 8x7 LED Charlieplex Array
 Version
 -------
 
-**v0.1**
+**v0.9**
 
 Known Issues
 ------------
@@ -42,6 +42,11 @@ Getting Started
 Version History
 ---------------
 
+**v0.9**
+
+* Implemented scrolling text, bitmaps, and shapes
+* Skipped a bunch of versions because I'm lazy
+
 **v0.1**
 
 * Initial commit

Libraries/SparkFun_LED_8x7/SparkFun_LED_8x7.cpp

@@ -332,9 +332,50 @@ void SparkFun_LED_8x7::circle(uint8_t x0, uint8_t y0, uint8_t radius)
  * @param[in] y Y coordinate for the center of the circle
  * @param[in] radius Distance (in pixels) from center to edge of circle
  */
-void circleFill(uint8_t x0, uint8_t y0, uint8_t radius)
+void SparkFun_LED_8x7::circleFill(uint8_t x0, uint8_t y0, uint8_t radius)
 {
-
+    int8_t y;
+    int8_t x;
+    int8_t f;
+    int8_t ddF_x;
+    int8_t ddF_y;
+    int8_t i;
+    
+    f = 1 - radius;
+    ddF_x = 1;
+    ddF_y = -2 * radius;
+    x = 0;
+    y = radius;
+    
+    for ( i = y0 - radius; i <= y0 + radius; i++ ) {
+        pixel(x0, i);
+        Serial.print("Drawing (");
+        Serial.print(x0);
+        Serial.print(",");
+        Serial.print(i);
+        Serial.println(")");
+    }
+    
+    while ( x < y ) {
+        if ( f >= 0 ) {
+            y--;
+            ddF_y += 2;
+            f += ddF_y;
+        }
+        x++;
+        ddF_x += 2;
+        f += ddF_x;
+        
+        for ( i = y0 - y; i <= y0 + y; i++ ) {
+            pixel(x0 + x, i);
+            pixel(x0 - x, i);
+        }
+        
+        for ( i = y0 - x; i <= y0 + x; i++ ) {
+            pixel(x0 + y, i);
+            pixel(x0 - y, i);
+        }
+    }
 }    
 
 /**
@@ -488,6 +529,26 @@ void SparkFun_LED_8x7::stopScrolling()
     display();
 }
 
+/**
+ * @brief Returns the width of the LED array
+ *
+ * @return width of the array (number of LEDs)
+ */
+uint8_t SparkFun_LED_8x7::getArrayWidth()
+{
+    return ROW_SIZE;
+}
+
+/**
+ * @brief Returns the width of the LED array
+ *
+ * @return width of the array (number of LEDs)
+ */
+uint8_t SparkFun_LED_8x7::getArrayHeight()
+{
+    return COL_SIZE;
+}
+
 void SparkFun_LED_8x7::isr()
 {
 

Libraries/SparkFun_LED_8x7/SparkFun_LED_8x7.h

@@ -76,7 +76,10 @@ class SparkFun_LED_8x7 {
     void scrollText(char *in_string);
     void scrollText(char *in_string, int times);
     void stopScrolling();
-
+    
+    /* Support methods */
+    uint8_t getArrayWidth();
+    uint8_t getArrayHeight();
 
 private:
 

Libraries/SparkFun_LED_8x7/examples/Demo/Demo.ino

@@ -0,0 +1,107 @@
+/****************************************************************
+Demo.ino
+LED Array 8x7 Charlieplex
+Shawn Hymel @ SparkFun Electronics
+February 10, 2015
+https://github.com/sparkfun/LED_Array_8x7_Charlieplex
+
+Gives a demo of all the functions of the LED array. Once
+uploaded, click Tools -> Serial Monitor to see debugging
+information.
+
+Hardware Connections:
+
+IMPORTANT:  The Charlieplex LED board is designed for 2.0 - 3.3V!
+            Higher voltages can damage the LEDs.
+
+ Arduino Pin | Charlieplex Board
+ ------------|------------------
+      2      |         2
+      3      |         3
+      4      |         4
+      5      |         5
+      6      |         6
+      7      |         7
+      8      |         8
+      9      |         9
+
+Resources:
+Include Chaplex.h, SparkFun_LED_8x7.h
+The Chaplex library can be found at: 
+http://playground.arduino.cc/Code/Chaplex
+
+Development environment specifics:
+Written in Arduino 1.0.6
+Tested with SparkFun BadgerStick (Interactive Badge)
+
+This code is beerware; if you see me (or any other SparkFun 
+employee) at the local, and you've found our code helpful, please
+buy us a round!
+
+Distributed as-is; no warranty is given.
+****************************************************************/
+
+#include <SparkFun_LED_8x7.h>
+#include <Chaplex.h>
+
+// Global variables
+byte led_pins[] = {2, 3, 4, 5, 6, 7, 8, 9}; // Pins for LEDs
+byte i;
+byte x;
+byte y;
+byte radius;
+byte sparkfun_logo[] = { 0,0,0,0,1,0,0,0,
+                         0,0,0,0,1,0,1,0,
+                         0,0,1,0,1,1,1,0,
+                         0,0,1,1,1,1,1,0,
+                         0,0,1,1,1,1,0,0,
+                         0,0,1,1,0,0,0,0,
+                         0,0,1,0,0,0,0,0 };
+
+// Setup code - this runs once
+void setup() {
+  
+  // Initialize the serial port
+  Serial.begin(9600);
+  Serial.println("-----------------------");
+  Serial.println("SparkFun LED 8x7 - Demo");
+  Serial.println("-----------------------");
+  
+  // Initialize and clear display
+  Plex.init(led_pins);
+  Plex.clear();
+  Plex.display();
+  
+  // Seed our random number generator with an analog voltage read
+  randomSeed(analogRead(0));
+}
+
+// Loop code - this runs for infinity
+void loop() {
+
+  // Show a bitmap
+  Serial.println("Draw a bitmap");
+  Plex.clear();
+  Plex.drawBitmap(sparkfun_logo);
+  Plex.display();
+  delay(2000);
+  
+  // Scroll some text
+  Serial.println("Scroll some text");
+  Plex.scrollText("Badges?", 1);
+  delay(6000);
+  
+  // Explosions!
+  Serial.println("Display an animation");
+  for ( i = 0; i < 15; i++ ) {
+    x = random(0, 8);
+    y = random(0, 7);
+    for ( radius = 0; radius < 12; radius++ ) {
+      Plex.clear();
+      Plex.circle(x, y, radius);
+      Plex.circle(x, y, radius + 1);
+      Plex.display();
+      delay(30);
+    }
+  }
+}

Libraries/SparkFun_LED_8x7/examples/DrawShapes/DrawShapes.ino

@@ -43,7 +43,8 @@ Distributed as-is; no warranty is given.
 #include <Chaplex.h>
 
 // Global variables
-byte led_pins[] = {9, 8, 7, 6, 5, 4, 3, 2}; // Pins for LEDs
+byte led_pins[] = {2, 3, 4, 5, 6, 7, 8, 9}; // Pins for LEDs
+byte i;
 
 void setup() {
 
@@ -55,17 +56,39 @@ void setup() {
 
 void loop() {
 
-  // Draw a line
-  //Plex.line(1, 1, 2, 5);
-  //Plex.display();
+  // Draw a dot (x, y)
+  Plex.clear();
+  Plex.pixel(1, 2);
+  Plex.display();
+  delay(1000);
+  
+  // Draw a line (x0, y0, y1, y1)
+  Plex.clear();
+  Plex.line(1, 2, 5, 5);
+  Plex.display();
+  delay(1000);
+  
+  // Draw a rectangle (x, y, width, height)
+  Plex.clear();
+  Plex.rect(1, 2, 5, 4);
+  Plex.display();
+  delay(1000);
+  
+  // Draw a filled rectangle (x, y, width, height)
+  Plex.clear();
+  Plex.rectFill(1, 2, 5, 4);
+  Plex.display();
+  delay(1000);
 
-  // Draw a rectangle
-  for ( int i = 0; i < 9; i++ ) {
-    Plex.clear();
-    Plex.rect(1, 1, i, i);
-    Plex.display();
-    delay(100);
-  }
+  // Draw a circle (x, y, radius)
+  Plex.clear();
+  Plex.circle(3, 3, 3);
+  Plex.display();
+  delay(1000);
 
+  // Draw a filled circle (x, y, radius)
+  Plex.clear();
+  Plex.circleFill(3, 3, 3);
+  Plex.display();
   delay(1000);
 }

Libraries/SparkFun_LED_8x7/examples/ScrollText/ScrollText.ino

@@ -41,20 +41,12 @@ Distributed as-is; no warranty is given.
 
 #include <SparkFun_LED_8x7.h>
 #include <Chaplex.h>
-#include <MemoryFree.h>
 
 // Global variables
-static byte led_pins[] = {9,8,7,6,5,4,3,2}; // Pins for LEDs
+static byte led_pins[] = {2, 3, 4, 5, 6, 7, 8, 9}; // Pins for LEDs
 
 void setup() {
 
-  // Initialize Serial port for debugging
-  Serial.begin(9600);
-  Serial.println();
-  Serial.println(F("------------------------------"));
-  Serial.println(F("SparkFun LED 8x7 - Scroll Text"));
-  Serial.println(F("------------------------------"));
-  
   // Initialize LED array
   Plex.init(led_pins);
 
@@ -65,14 +57,13 @@ void setup() {
 
 void loop() {
 
-  Serial.print("RAM: ");
-  Serial.println(freeMemory());
+  // Scroll text 2 times
+  Plex.scrollText("Hello. :)", 2);
+  delay(12000);
 
-  // Scroll some text then stop
-  delay(2000);
-  Plex.scrollText("Testz!", 1);
+  // Scroll text until we stop it
+  Plex.scrollText("Let's scroll!");
   delay(10000);
-  Plex.scrollText("Bum.");
-  //Plex.stopScrolling();
-  delay(2000);
+  Plex.stopScrolling();
+  delay(1000);
 }