Add and implement new set_rgb packet type

arduino/kegboard/kegboard.h

@@ -35,6 +35,11 @@
 #define KBM_SET_OUTPUT_TAG_OUTPUT_ID 0x01
 #define KBM_SET_OUTPUT_TAG_OUTPUT_MODE 0x02
 
+#define KBM_SET_RGB 0x85
+#define KBM_SET_RGB_TAG_RED 0x01
+#define KBM_SET_RGB_TAG_GREEN 0x02
+#define KBM_SET_RGB_TAG_BLUE 0x03
+
 #define OUTPUT_DISABLED 0
 #define OUTPUT_ENABLED 1
 

arduino/kegboard/kegboard.ino

@@ -486,6 +486,12 @@ void setup()
   gLastWiegandInterruptMillis = 0;
 #endif
 
+#if KB_ENABLE_RGB_PWM
+  pinMode(KB_PIN_RGB_PWM_R, OUTPUT);
+  pinMode(KB_PIN_RGB_PWM_G, OUTPUT);
+  pinMode(KB_PIN_RGB_PWM_B, OUTPUT);
+#endif
+
   writeHelloPacket();
 }
 
@@ -883,6 +889,14 @@ void setRelayOutput(uint8_t id, uint8_t mode) {
   writeRelayPacket(id);
 }
 
+#if KB_ENABLE_RGB_PWM
+void setRGBOutput(uint8_t red, uint8_t green, uint8_t blue) {
+   analogWrite(KB_PIN_RGB_PWM_R, red);
+   analogWrite(KB_PIN_RGB_PWM_G, green);
+   analogWrite(KB_PIN_RGB_PWM_B, blue);
+}
+#endif
+
 void handleInputPacket() {
   if (!gPacketStat.have_packet) {
     return;
@@ -910,6 +924,22 @@ void handleInputPacket() {
       }
       break;
     }
+
+#if KB_ENABLE_RGB_PWM
+    case KBM_SET_RGB: {
+      uint8_t red, green, blue;
+
+      if (!gInputPacket.ReadTag(KBM_SET_RGB_TAG_RED, &red)
+          || !gInputPacket.ReadTag(KBM_SET_RGB_TAG_GREEN, &green)
+          || !gInputPacket.ReadTag(KBM_SET_RGB_TAG_BLUE, &blue)) {
+        break;
+      }
+
+      setRGBOutput(red, green, blue);
+
+      break; 
+    }
+#endif
   }
   resetInputPacket();
 }

arduino/kegboard/kegboard_config.h

@@ -31,6 +31,11 @@
 // Note: Must set KB_ENABLE_ID12_RFID to 0 if enabling this.
 #define KB_ENABLE_WIEGAND_RFID 0
 
+// Enable analog RGB LED control.  Must define 3 PWM pins separately,
+// as KB_PIN_RGB_PWM_{A,B,C}.  Generally only larger boards like Arduino
+// Mega have available pins for this.
+#define KB_ENABLE_RGB_PWM 0
+
 // Enable software debounce? EXPERIMENTAL. Enabling this feature may negatively
 // affect pour accuracy.  In particular, a delay is added to each flow meter
 // ISR, disabling all other interrupts during this time.
@@ -101,14 +106,18 @@
 #define KB_PIN_WIEGAND_RFID_DATA1 A5
 
 // Atmega1280 (aka Arduino mega) section
-#ifdef __AVR_ATmega1280__
+#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
 #define KB_ATMEGA_1280            1
 #define KB_NUM_METERS             6
 
 #define KB_PIN_METER_C            21
 #define KB_PIN_METER_D            20
 #define KB_PIN_METER_E            19
 #define KB_PIN_METER_F            18
+
+#define KB_PIN_RGB_PWM_R          44
+#define KB_PIN_RGB_PWM_G          45
+#define KB_PIN_RGB_PWM_B          46
 #else
 #define KB_NUM_METERS             2
 #endif

docs/source/serial-protocol.rst

@@ -322,6 +322,20 @@ This command is sent to the board to enable or disable a device output.
 | 0x02    | output_mode     | output_t | Mode to set the output.               |
 +---------+-----------------+----------+---------------------------------------+
 
+``set_rgb`` command (0x85)
+------------------------------------
+
+This command is sent to the board to set the color of any RGB LEDs attached.
+
++---------+-----------------+----------+---------------------------------------+
+| Tag ID  | Name            | Type     | Description                           |
++=========+=================+==========+=======================================+
+| 0x01    | red             | uint8_t  | Red value (0-255).                    |
++---------+-----------------+----------+---------------------------------------+
+| 0x02    | green           | uint8_t  | Green value (0-255).                  |
++---------+-----------------+----------+---------------------------------------+
+| 0x03    | blue            | uint8_t  | Blue value (0-255).                   |
++---------+-----------------+----------+---------------------------------------+
 
 
 Protocol Revision History

python/kegbot/kegboard/kegboard.py

@@ -291,6 +291,11 @@ class SetOutputCommand(Message):
   output_id = Uint8Field(0x01)
   output_mode = OutputField(0x02)
 
+class SetRGBCommand(Message):
+  MESSAGE_ID = 0x85
+  red = Uint8Field(0x01)
+  green = Uint8Field(0x02)
+  blue = Uint8Field(0x03)
 
 MESSAGE_ID_TO_CLASS = {}
 for cls in Message.__subclasses__():