rb-blink1 0.0.6 → 0.0.7

data/ext/blink1/blink1-lib.c

@@ -1,5 +1,5 @@
 /*
- * blink(1) C library -- 
+ * blink(1) C library --
  *
  *
  * 2012, Tod E. Kurt, http://todbot.com/blog/ , http://thingm.com/
@@ -26,9 +26,11 @@
 #define LOG(...) do {} while (0)
 #endif
 
-#define blink1_report_id 1
+#define blink1_report_id  1
+#define blink1_report_size 8
+#define blink1_buf_size (blink1_report_size+1)
 
-// addresses in EEPROM 
+// addresses in EEPROM
 #define blink1_eeaddr_osccal        0
 #define blink1_eeaddr_bootmode      1
 #define blink1_eeaddr_serialnum     2
@@ -37,11 +39,11 @@
 
 #define pathmax 16
 #define pathstrmax 128
-#define serialmax (8 + 1) 
+#define serialmax (8 + 1)
 
 
 // FIXME: use hid_device_info instead with custom sorter on serial or path
-static char blink1_cached_paths[pathmax][pathstrmax]; 
+static char blink1_cached_paths[pathmax][pathstrmax];
 static int blink1_cached_count = 0;
 static wchar_t blink1_cached_serials[pathmax][serialmax];
 
@@ -62,20 +64,20 @@ int blink1_enumerateByVidPid(int vid, int pid)
 
     int p = 0;
     devs = hid_enumerate(vid, pid);
-    cur_dev = devs;    
+    cur_dev = devs;
     while (cur_dev) {
-        if( (cur_dev->vendor_id != 0 && cur_dev->product_id != 0) &&  
-            (cur_dev->vendor_id == vid && cur_dev->product_id == pid) ) { 
+        if( (cur_dev->vendor_id != 0 && cur_dev->product_id != 0) &&
+            (cur_dev->vendor_id == vid && cur_dev->product_id == pid) ) {
             if( cur_dev->serial_number != NULL ) { // can happen if not root
-	        strcpy( blink1_cached_paths[p], cur_dev->path );
-	        wcscpy( blink1_cached_serials[p], cur_dev->serial_number );
-		p++;
-	    }
-	}
+                strcpy( blink1_cached_paths[p], cur_dev->path );
+            wcscpy( blink1_cached_serials[p], cur_dev->serial_number );
+            p++;
+            }
+        }
         cur_dev = cur_dev->next;
     }
     hid_free_enumeration(devs);
-    
+
     blink1_cached_count = p;
 
     blink1_sortSerials();
@@ -92,7 +94,7 @@ int blink1_getCachedCount(void)
 //
 const char* blink1_getCachedPath(int i)
 {
-    return blink1_cached_paths[i];    
+    return blink1_cached_paths[i];
 }
 //
 const wchar_t* blink1_getCachedSerial(int i)
@@ -104,7 +106,7 @@ const wchar_t* blink1_getCachedSerial(int i)
 hid_device* blink1_openByPath(const char* path)
 {
     if( path == NULL || strlen(path) == 0 ) return NULL;
-    hid_device* handle = hid_open_path( path ); 
+    hid_device* handle = hid_open_path( path );
     return handle;
 }
 
@@ -114,15 +116,15 @@ hid_device* blink1_openBySerial(const wchar_t* serial)
     if( serial == NULL || wcslen(serial) == 0 ) return NULL;
     int vid = blink1_vid();
     int pid = blink1_pid();
-    
+
     LOG("opening %ls at vid/pid %x/%x\n", serial, vid,pid);
-    hid_device* handle = hid_open(vid,pid, serial ); 
+    hid_device* handle = hid_open(vid,pid, serial );
     return handle;
 }
 
 //
-hid_device* blink1_openById( int i ) 
-{ 
+hid_device* blink1_openById( int i )
+{
     //return blink1_openByPath( blink1_getCachedPath(i) );
     return blink1_openBySerial( blink1_getCachedSerial(i) );
 }
@@ -142,7 +144,7 @@ hid_device* blink1_open(void)
 // FIXME: search through blink1s list to zot it too?
 void blink1_close( hid_device* dev )
 {
-    if( dev != NULL ) 
+    if( dev != NULL )
         hid_close(dev);
     dev = NULL;
     hid_exit(); // FIXME: this cleans up libusb in a way that hid_close doesn't
@@ -155,6 +157,10 @@ int blink1_write( hid_device* dev, void* buf, int len)
         return -1; // BLINK1_ERR_NOTOPEN;
     }
     int rc = hid_send_feature_report( dev, buf, len );
+    // FIXME: put this in an ifdef?
+    if( rc==-1 ) {
+        fprintf(stderr, "blink1_write error: %ls\n", hid_error(dev));
+    }
     return rc;
 }
 
@@ -188,7 +194,7 @@ int blink1_getSerialNumber(hid_device *dev, char* buf)
     /*
     wchar_t* wbuf = dev->serial_number;
     int i=0;
-    while( wbuf ) { 
+    while( wbuf ) {
         buf[i++] = *wbuf;
     }
     return i;
@@ -199,7 +205,7 @@ int blink1_getSerialNumber(hid_device *dev, char* buf)
 //
 int blink1_getVersion(hid_device *dev)
 {
-    char buf[9] = {blink1_report_id, 'v' };
+    char buf[blink1_buf_size] = {blink1_report_id, 'v' };
     int len = sizeof(buf);
 
     //hid_set_nonblocking(dev, 0);
@@ -208,8 +214,8 @@ int blink1_getVersion(hid_device *dev)
     if( rc != -1 ) // no error
         rc = blink1_read(dev, buf, len);
     if( rc != -1 ) // also no error
-        rc = ((buf[3]-'0') * 100) + (buf[4]-'0'); 
-    // rc is now version number or error  
+        rc = ((buf[3]-'0') * 100) + (buf[4]-'0');
+    // rc is now version number or error
     // FIXME: we don't know vals of errcodes
     return rc;
 }
@@ -217,14 +223,14 @@ int blink1_getVersion(hid_device *dev)
 //
 int blink1_eeread(hid_device *dev, uint16_t addr, uint8_t* val)
 {
-    char buf[9] = {blink1_report_id, 'e', addr };
+    char buf[blink1_buf_size] = {blink1_report_id, 'e', addr };
     int len = sizeof(buf);
 
     int rc = blink1_write(dev, buf, len );
     blink1_sleep( 50 ); // FIXME:
     if( rc != -1 ) // no error
         rc = blink1_read(dev, buf, len );
-    if( rc != -1 ) 
+    if( rc != -1 )
         *val = buf[3];
     return rc;
 }
@@ -232,10 +238,10 @@ int blink1_eeread(hid_device *dev, uint16_t addr, uint8_t* val)
 //
 int blink1_eewrite(hid_device *dev, uint16_t addr, uint8_t val)
 {
-    char buf[9] = {blink1_report_id, 'E', addr, val };
+    char buf[blink1_buf_size] = {blink1_report_id, 'E', addr, val };
 
     int rc = blink1_write(dev, buf, sizeof(buf) );
-        
+
     return rc;
 }
 
@@ -250,7 +256,7 @@ int blink1_serialnumread(hid_device *dev, uint8_t** serialnum)
 }
 
 //
-static uint8_t parseHex(char c) 
+static uint8_t parseHex(char c)
 {
     c = toupper(c);
     if (c >= '0' && c <= '9')  return (c - '0');
@@ -259,7 +265,7 @@ static uint8_t parseHex(char c)
 }
 
 // serialnum comes in as an ascii set of 8 characters representing
-// 4-bytes 
+// 4-bytes
 int blink1_serialnumwrite(hid_device *dev, uint8_t* serialnumstr)
 {
     uint8_t serialnum[4];
@@ -270,13 +276,13 @@ int blink1_serialnumwrite(hid_device *dev, uint8_t* serialnumstr)
 
     int rc = 0;
     for( int i=0; i<blink1_serialnum_len; i++ ) { // serialnum is 4 chars long
-        blink1_sleep(50); //FIXME: 
+        blink1_sleep(50); //FIXME:
         uint8_t v = serialnum[i];
         int rc = blink1_eewrite( dev, blink1_eeaddr_serialnum+i, v);
         if( rc == -1 ) { // try again
             LOG("blink1_serialwrite: oops, trying again on char %d\n",i);
             rc = blink1_eewrite(dev,blink1_eeaddr_serialnum+i, v);
-            if( rc == -1 ) { 
+            if( rc == -1 ) {
                 LOG("blink1_serialwrite: error on try again\n");
                 break;
             }
@@ -286,6 +292,27 @@ int blink1_serialnumwrite(hid_device *dev, uint8_t* serialnumstr)
     return rc;
 }
 
+int blink1_fadeToRGBN(hid_device *dev,  uint16_t fadeMillis,
+                      uint8_t r, uint8_t g, uint8_t b, uint8_t n)
+{
+    int dms = fadeMillis/10;  // millis_divided_by_10
+
+    char buf[blink1_buf_size];
+
+    buf[0] = blink1_report_id;     // report id
+    buf[1] = 'c';   // command code for 'fade to rgb'
+    buf[2] = ((blink1_enable_degamma) ? blink1_degamma(r) : r );
+    buf[3] = ((blink1_enable_degamma) ? blink1_degamma(g) : g );
+    buf[4] = ((blink1_enable_degamma) ? blink1_degamma(b) : b );
+    buf[5] = (dms >> 8);
+    buf[6] = dms % 0xff;
+    buf[7] = n;
+
+    int rc = blink1_write(dev, buf, sizeof(buf) );
+
+    return rc;
+}
+
 
 //
 int blink1_fadeToRGB(hid_device *dev,  uint16_t fadeMillis,
@@ -293,7 +320,7 @@ int blink1_fadeToRGB(hid_device *dev,  uint16_t fadeMillis,
 {
     int dms = fadeMillis/10;  // millis_divided_by_10
 
-    char buf[9];
+    uint8_t buf[9];
 
     buf[0] = blink1_report_id;     // report id
     buf[1] = 'c';   // command code for 'fade to rgb'
@@ -302,26 +329,30 @@ int blink1_fadeToRGB(hid_device *dev,  uint16_t fadeMillis,
     buf[4] = ((blink1_enable_degamma) ? blink1_degamma(b) : b );
     buf[5] = (dms >> 8);
     buf[6] = dms % 0xff;
+    buf[7] = 0;
 
     int rc = blink1_write(dev, buf, sizeof(buf) );
 
-    return rc; 
+    return rc;
 }
 
 //
 int blink1_setRGB(hid_device *dev, uint8_t r, uint8_t g, uint8_t b )
 {
-    char buf[9];
+    uint8_t buf[blink1_buf_size];
 
     buf[0] = blink1_report_id;     // report id
     buf[1] = 'n';   // command code for "set rgb now"
     buf[2] = ((blink1_enable_degamma) ? blink1_degamma(r) : r );     // red
     buf[3] = ((blink1_enable_degamma) ? blink1_degamma(g) : g );     // grn
     buf[4] = ((blink1_enable_degamma) ? blink1_degamma(b) : b );     // blu
-    
+    buf[5] = 0;
+    buf[6] = 0;
+    buf[7] = 0;
+
     int rc = blink1_write(dev, buf, sizeof(buf) );
 
-    return rc; 
+    return rc;
 }
 
 
@@ -330,7 +361,7 @@ int blink1_serverdown(hid_device *dev, uint8_t on, uint16_t millis)
 {
     int dms = millis/10;  // millis_divided_by_10
 
-    char buf[9] = {blink1_report_id, 'D', on, (dms>>8), (dms % 0xff) };
+    char buf[blink1_buf_size] = {blink1_report_id, 'D', on, (dms>>8), (dms % 0xff) };
 
     int rc = blink1_write(dev, buf, sizeof(buf) );
     return rc;
@@ -339,31 +370,32 @@ int blink1_serverdown(hid_device *dev, uint8_t on, uint16_t millis)
 //
 int blink1_play(hid_device *dev, uint8_t play, uint8_t pos)
 {
-    char buf[9] = {blink1_report_id, 'p', play, pos };
+    char buf[blink1_buf_size] = {blink1_report_id, 'p', play, pos };
     int rc = blink1_write(dev, buf, sizeof(buf) );
     return rc;
 }
-    
+
 //
-int blink1_writePatternLine(hid_device *dev, uint16_t fadeMillis, 
-                            uint8_t r, uint8_t g, uint8_t b, 
+int blink1_writePatternLine(hid_device *dev, uint16_t fadeMillis,
+                            uint8_t r, uint8_t g, uint8_t b,
                             uint8_t pos)
 {
     int dms = fadeMillis/10;  // millis_divided_by_10
     r = (blink1_enable_degamma) ? blink1_degamma(r) : r ;
     g = (blink1_enable_degamma) ? blink1_degamma(g) : g ;
     b = (blink1_enable_degamma) ? blink1_degamma(b) : b ;
-    char buf[9] = {blink1_report_id, 'P', r,g,b, (dms>>8), (dms % 0xff), pos };
+
+    char buf[blink1_buf_size] = {blink1_report_id, 'P', r,g,b, (dms>>8), (dms % 0xff), pos };
     int rc = blink1_write(dev, buf, sizeof(buf) );
     return rc;
 }
 
 //
-int blink1_readPatternLine(hid_device *dev, uint16_t* fadeMillis, 
-                           uint8_t* r, uint8_t* g, uint8_t* b, 
+int blink1_readPatternLine(hid_device *dev, uint16_t* fadeMillis,
+                           uint8_t* r, uint8_t* g, uint8_t* b,
                            uint8_t pos)
 {
-    char buf[9] = {blink1_report_id, 'R', 0,0,0, 0,0, pos };
+    char buf[blink1_buf_size] = {blink1_report_id, 'R', 0,0,0, 0,0, pos };
     int rc = blink1_write(dev, buf, sizeof(buf) );
     blink1_sleep( 50 ); // FIXME:
     if( rc != -1 ) // no error
@@ -378,7 +410,7 @@ int blink1_readPatternLine(hid_device *dev, uint16_t* fadeMillis,
 }
 
 
-// FIXME: 
+// FIXME:
 int readUUID( hid_device* dev, uint8_t** uuid )
 {
     return -1;
@@ -394,7 +426,7 @@ int setUUID( hid_device* dev, uint8_t* uuid )
 
 // FIXME: this is wrong
 // FIXME: provide function that generated this
-uint8_t degamma_lookup[256] = { 
+uint8_t degamma_lookup[256] = {
   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
   1,1,1,1,1,1,2,2,2,2,2,3,3,3,3,4,
   4,4,4,5,5,5,5,6,6,6,7,7,7,8,8,9,
@@ -424,49 +456,49 @@ void blink1_disableDegamma()
 
 // a simple logarithmic -> linear mapping as a sort of gamma correction
 // maps from 0-255 to 0-255
-static int blink1_degamma_log2lin( int n )  
+static int blink1_degamma_log2lin( int n )
 {
   //return  (int)(1.0* (n * 0.707 ));  // 1/sqrt(2)
   return (((1<<(n/32))-1) + ((1<<(n/32))*((n%32)+1)+15)/32);
 }
 
 //
-int blink1_degamma( int n ) 
-{ 
+int blink1_degamma( int n )
+{
     //return degamma_lookup[n];
     return blink1_degamma_log2lin(n);
 }
 
 
-// qsort C-string comparison function 
-int cmp_path(const void *a, const void *b) 
-{ 
+// qsort C-string comparison function
+int cmp_path(const void *a, const void *b)
+{
     return strncmp( (const char *)a, (const char *)b, pathstrmax);
-} 
-// qsort wchar_t string comparison function 
-int cmp_serial(const void *a, const void *b) 
-{ 
+}
+// qsort wchar_t string comparison function
+int cmp_serial(const void *a, const void *b)
+{
     return wcsncmp( (const wchar_t *)a, (const wchar_t *)b, serialmax);
-} 
+}
 
 //
 void blink1_sortPaths(void)
 {
-    size_t elemsize = sizeof( blink1_cached_paths[0] ); // 128 
+    size_t elemsize = sizeof( blink1_cached_paths[0] ); // 128
     //size_t count = sizeof(blink1_cached_paths) / elemsize; // 16
-    
+
     return qsort( blink1_cached_paths, blink1_cached_count,elemsize,cmp_path);
 }
 
 //
 void blink1_sortSerials(void)
 {
-    size_t elemsize = sizeof( blink1_cached_serials[0] ); //  
-    //size_t count = sizeof(blink1_cached_serials) / elemsize; // 
-    
-    qsort( blink1_cached_serials, 
-           blink1_cached_count, 
-           elemsize, 
+    size_t elemsize = sizeof( blink1_cached_serials[0] ); //
+    //size_t count = sizeof(blink1_cached_serials) / elemsize; //
+
+    qsort( blink1_cached_serials,
+           blink1_cached_count,
+           elemsize,
            cmp_serial);
 }
 
@@ -490,7 +522,7 @@ void blink1_sleep(uint16_t millis)
 {
 #ifdef WIN32
             Sleep(millis);
-#else 
+#else
             usleep( millis * 1000);
 #endif
 }
@@ -519,10 +551,10 @@ char *blink1_error_msg(int errCode)
 //
 int blink1_nightlight(hid_device *dev, uint8_t on)
 {
-    char buf[9] = { blink1_report_id, 'N', on };
+    char buf[8] = { blink1_report_id, 'N', on };
 
     int rc = blink1_write(dev, buf, sizeof(buf) );
-    
+
     return rc;
 }
 
@@ -539,8 +571,8 @@ int blink1_command(hid_device* dev, int num_send, int num_recv,
         fprintf(stderr,"error writing data: %s\n",blink1_error_msg(err));
         return err;
     }
-     
-    if( num_recv > 0 ) { 
+
+    if( num_recv > 0 ) {
         int len = num_recv;
         if((err = usbhidGetReport(dev, 0, (char*)buf_recv, &len)) != 0) {
             fprintf(stderr,"error reading data: %s\n",blink1_error_msg(err));
@@ -549,4 +581,4 @@ int blink1_command(hid_device* dev, int num_send, int num_recv,
     }
     return err;
 }
-*/
+*/

data/ext/blink1/blink1-lib.h

@@ -1,5 +1,5 @@
 /*
- * blink(1) C library -- 
+ * blink(1) C library --
  *
  * 2012, Tod E. Kurt, http://todbot.com/blog/ , http://thingm.com/
  *
@@ -12,7 +12,7 @@
 #include <stdint.h>
 
 #include "hidapi.h"
-#include "usbconfig.h" // from firmware, for VID,PID,vendor name & product name 
+#include "usbconfig.h" // from firmware, for VID,PID,vendor name & product name
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,6 +47,8 @@ int blink1_getVersion(hid_device *dev);
 
 int blink1_fadeToRGB(hid_device *dev, uint16_t fadeMillis,
                      uint8_t r, uint8_t g, uint8_t b );
+int blink1_fadeToRGBN(hid_device *dev, uint16_t fadeMillis,
+                      uint8_t r, uint8_t g, uint8_t b, uint8_t n );
 
 int blink1_setRGB(hid_device *dev, uint8_t r, uint8_t g, uint8_t b );
 
@@ -60,11 +62,11 @@ int blink1_serialnumwrite(hid_device *dev, uint8_t* serialnumstr);
 int blink1_serverdown(hid_device *dev, uint8_t on, uint16_t millis);
 
 int blink1_play(hid_device *dev, uint8_t play, uint8_t pos);
-int blink1_writePatternLine(hid_device *dev, uint16_t fadeMillis, 
-                            uint8_t r, uint8_t g, uint8_t b, 
+int blink1_writePatternLine(hid_device *dev, uint16_t fadeMillis,
+                            uint8_t r, uint8_t g, uint8_t b,
                             uint8_t pos);
-int blink1_readPatternLine(hid_device *dev, uint16_t* fadeMillis, 
-                           uint8_t* r, uint8_t* g, uint8_t* b, 
+int blink1_readPatternLine(hid_device *dev, uint16_t* fadeMillis,
+                           uint8_t* r, uint8_t* g, uint8_t* b,
                            uint8_t pos);
 //int blink1_playPattern(hid_device *dev,,);
 
@@ -80,4 +82,4 @@ void blink1_sleep(uint16_t delayMillis);
 }
 #endif
 
-#endif
+#endif