rudimentary serverdown/servertickle sub-loop feature support for todbot/blink1#335

Author: todbot

README.md

@@ -1,13 +1,13 @@
-Command-line Tools and C library for blink(1)
-============================================
+# Command-line Tools and C library for blink(1) USB RGB LED
 
 This code lives at the repository: https://github.com/todbot/blink1-tool
 It originally lived as a directory https://github.com/todbot/blink1 but now has its own repository.
 
 For pre-built binaries, see the Releases page: https://github.com/todbot/blink1-tool/releases
+
 To build, see the Makefile.
 
-The current tools are are:
+The current tools are:
 
 - `blink1-lib` -- C library for controlling blink(1)
 - `blink1-tool` -- command-line tool for controlling blink(1)
@@ -21,6 +21,8 @@ Type `make help` for a full list.
 Also see in this directory:
 - `scripts` -- examples shell scripts using blink1-tool
 
+## Supported platforms
+
 Supported platforms for `blink1-tool` and `blink1-lib`:
 
 - Mac OS X 10.6.8, 10.7+
@@ -37,9 +39,13 @@ eliminating the need for shared library dependencies on the target.
 However, static builds can be problematic for some systems with "different" 
 libusb implementations, so doing `make EXEFLAGS=` will generally build a non-static version.
 
+## Using blink1-lib in your C/C++ project
+[tbd, but basically look at the makefile for blink1-tool]
+
+
+## Docker and blink(1)
+[this may be out of date after the repo move]
 
-Docker and blink(1)
-==========
 To build the image from the `Dockerfile`
 
 - `docker build -t robtec/blink1 .`

blink1-lib.c

@@ -349,13 +349,14 @@ int blink1_readRGB(blink1_device *dev, uint16_t* fadeMillis,
 // - on == 1 or 0, enable or disable
 // - millis == milliseconds to wait until triggering 
 // - st == 1 or 0, stay lit or set off()  (mk2 firmware only)
-// FIXME: bug in firmware?
+// FIXME: bug in firmware? yes in v204 devices, max time is 62 secs
 // - millis = 100000 => dms = 10000, dms_hi =  39, dms_lo =  16 :: real time = 34 secs
 // - millis =  50000 => dms =  5000, dms_hi =  19, dms_lo = 136 :: real time = 50 secs
 // - millis = 652800 => dms = 65280, dms_hi = 255, dms_lo =   0 :: real time = 62 secs
 // - millis =  62000 => dms =  6200, dms_hi =  24, dms_lo =  56 :: real time = 62 secs
 // 
-int blink1_serverdown(blink1_device *dev, uint8_t on, uint32_t millis, uint8_t st)
+int blink1_serverdown(blink1_device *dev, uint8_t on, uint32_t millis, uint8_t st,
+                      uint8_t startpos, uint8_t endpos)
 {
     uint16_t dms = millis / 10;  // millis_divided_by_10
 
@@ -367,8 +368,8 @@ int blink1_serverdown(blink1_device *dev, uint8_t on, uint32_t millis, uint8_t s
     buf[3] = (dms>>8);
     buf[4] = (dms % 0xff);
     buf[5] = st;  // mk2 only
-    buf[6] = 0;
-    buf[7] = 0;
+    buf[6] = startpos;
+    buf[7] = endpos;
 
     int rc = blink1_write(dev, buf, sizeof(buf) );
     return rc;
@@ -478,7 +479,7 @@ int blink1_savePattern( blink1_device *dev )
     return rc; 
 }
 
-// only for unreleased mk2a devices
+// only for mk2a devices (fw val '204')
 int blink1_setLEDN( blink1_device* dev, uint8_t ledn)
 {
     uint8_t buf[blink1_buf_size];

blink1-lib.h

@@ -233,9 +233,11 @@ int blink1_serialnumwrite(blink1_device *dev, uint8_t* serialnumstr);
  * @param on  enable or disable: enable=1, disable=0
  * @param millis milliseconds to wait until triggering (up to 65,355 millis)
  * @param stay lit (st=1) or set off() (st=0)
+ * @param startpos pattern start position (fw 205+)
+ * @param endpos pattern end pos (fw 205+)
  */
 int blink1_serverdown(blink1_device *dev, uint8_t on, uint32_t millis, 
-                      uint8_t st);
+                      uint8_t st, uint8_t startpos, uint8_t endpos);
 
 /**
  * Play color pattern stored in blink1.

blink1-tool.c

@@ -755,8 +755,10 @@ int main(int argc, char** argv)
         //int on  = arg;
         int on = cmdbuf[0];
         int st = cmdbuf[1];
+        int startpos = cmdbuf[2];
+        int endpos   = cmdbuf[3];
         msg("setting servertickle %s (@ %ld millis)\n",((on)?"ON":"OFF"),delayMillis);
-        blink1_serverdown( dev, on, delayMillis, st );
+        blink1_serverdown( dev, on, delayMillis, st, startpos,endpos );
     }
     else if( cmd == CMD_PLAYPATTERN ) {
         blink1_close(dev);