Bump version and add support

odejesush · Jan 3, 2018 · 5575dad · 5575dad
1 parent 98ec349
commit 5575dad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/firmware/Makefile b/firmware/Makefile
@@ -12,7 +12,7 @@ F_CPU   = 16500000	# in Hz
 
 LED_COUNT ?= 2
 # used in usbconfig.h
-DEVICE_VERSION_MAJOR = 1
+DEVICE_VERSION_MAJOR = 2
 DEVICE_VERSION_MINOR = 0
 
 USE_CANDLE = 0

diff --git a/software/src/weblight-card.html b/software/src/weblight-card.html
@@ -50,13 +50,25 @@
 
       async setDeviceColor(r, g, b) {
         if (this.device.opened) {
+          let payload;
+
+          if (this.device.usbVersionMajor === 2) {
+            payload = new Uint8Array([0xFF, r, g, b])
+          } else if (this.device.usbVersionMajor === 1) {
+            payload = new Uint8Array([r, g, b]);
+          }
+
+          if (payload == null) {
+            throw new Error(`Unknown USB version ${this.device.usbVersionMajor}`);
+          }
+
           await this.device.controlTransferOut({
             requestType: 'vendor',
             recipient: 'device',
             request: 1,
             value: 0,
             index: 0,
-          }, new Uint8Array([r, g, b]));
+          }, payload);
           this.$.lightPicker.value = rgbToHex(r, g, b);
         }
       }