Changed scope of enum

Author: Brent Wilkins

IDE_Board_Manager/package_sparkfun_index.json

@@ -16,8 +16,8 @@
                "category":"Contributed",
                "url":"https://github.com/sparkfun/Arduino_Boards/raw/master/IDE_Board_Manager/sparkfunboards.1.1.2.tar.bz2",
                "archiveFileName":"sparkfunboards.1.1.2.tar.bz2",
-               "checksum":"SHA-256:b7d483353abd2aa2ad666729d1647cdbee8b1637dbb6d316ef6445ae103d7017",
-               "size":"1138360",
+               "checksum":"SHA-256:ff12b10a929f551b1383cba408ddc7535a9cb8b6224b09d8162b22fc3cd82b0e",
+               "size":"1138406",
                "help":{
                   "online":"https://forums.sparkfun.com"
                },

IDE_Board_Manager/sparkfunboards.1.1.2.tar.bz2

@@ -46,7 +46,7 @@ void qduino::setRGB(uint8_t r, uint8_t g, uint8_t b){
   analogWrite(13, b);
 }
 
-void qduino::setRGB(colors color){    
+void qduino::setRGB(COLORS color){    
   switch (color) {
   case RED:
     analogWrite(10, 0);
@@ -98,39 +98,33 @@ void qduino::setRGB(colors color){
 
 void qduino::rainbow(uint8_t duration)
 {    
-  unsigned int rgbColor[3];
-  if (duration < 1)
-  {
-    duration = 1;
-  }
-  else if (duration > 5)
-  {
-    duration = 5;
-  }
+  uint8_t rgbColor[3];
 
-  unsigned int newDuration = map(duration, 1, 5, 500, 3000);
+  // Keep values for duration bounded
+  if (duration < 1) duration = 1;
+  if (duration > 5) duration = 5;
+ 
+  int newDuration = map(duration, 1, 5, 500, 3000);
 
   // Start off with red.
   rgbColor[0] = 255;
   rgbColor[1] = 0;
   rgbColor[2] = 0;  
 
   // Choose the colours to increment and decrement.
-  for (int decColor = 0; decColor < 3; decColor += 1)
+  for (uint8_t decColor = 0; decColor < 3; decColor += 1)
   {
     int incColor = decColor == 2 ? 0 : decColor + 1;
 
     // cross-fade the two colours.
-    for(int i = 0; i < 255; i += 1)
+    for(uint8_t i = 0; i < 255; i += 1)
     {
       rgbColor[decColor] -= 1;
       rgbColor[incColor] += 1;
 
       analogWrite(10, rgbColor[0]);
       analogWrite(11, rgbColor[1]);
       analogWrite(13, rgbColor[2]);
-Serial.print("newDuration: ");
-Serial.println(newDuration);
       delayMicroseconds(newDuration);
     }
   }

sparkfun/avr/libraries/Qduino/Qduino.cpp

@@ -19,8 +19,8 @@
 
 #include "Arduino.h"
 
-#ifndef _Qduino_h
-#define _Qduino_h
+#ifndef _QDUINO_H_
+#define _QDUINO_H_
 
 #define MAX1704_ADDR            0x36
 #define MAX1704_SOC             0x04
@@ -31,23 +31,21 @@
 #define MAX1704_COMMAND         0xFE
 #define MAX1704_ALERT_LEVEL     0x97
 
-enum colors
-{
-  RED = 0, GREEN, BLUE, CYAN, PINK, WHITE, PURPLE, YELLOW, ORANGE
-};
+// Predefined named colors for use in setRGB method
+enum COLORS { RED, GREEN, BLUE, CYAN, PINK, WHITE, PURPLE, YELLOW, ORANGE };
 
 class qduino
-{
+{    
 public:
   void setup();
   void setRGB(uint8_t r, uint8_t g, uint8_t b);
-  void setRGB(colors color);
-  void rainbow(uint8_t duration);
+  void setRGB(COLORS color);
+  void rainbow(uint8_t duration); // [1,5] valid
   void ledOff();
 };
 
-class fuelGauge{
-    
+class fuelGauge
+{    
 public:
   int chargePercentage();
   void setup();
@@ -59,7 +57,8 @@ class fuelGauge{
   boolean inAlert();
   void goToSleep();
   void wakeUp();
-
+  
+    
 private:
   void performCommand(byte address, int value);
   void readFrom(byte address, byte &msb, byte &lsb);