LEDCube handling extracted.

client/ledcube.c

@@ -0,0 +1,48 @@
+
+#include "ledcube.h"
+
+void lc_setFrame(unsigned long frame)
+{
+
+    int low  =  frame & 0xffff;
+    int high = (frame & 0xffff0000) >> 16;
+
+    usb_control_msg(_lc_handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME,  low, 0, _lc_buffer, 0, 300);
+    usb_control_msg(_lc_handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, high, 1, _lc_buffer, 0, 300);
+}
+
+void lc_setMode(int mode)
+{
+    usb_control_msg(_lc_handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_MODE, mode, 0, _lc_buffer, 0, 300);
+}
+
+void lc_saveFrame(unsigned long frame, int index)
+{
+    lc_setFrame(frame);
+
+    usb_control_msg(_lc_handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_EEPROM_STORE_FRAME, 0, index, _lc_buffer, 0, 300);
+}
+
+void lc_init()
+{
+
+    usb_init();
+
+    /* compute lc_vid/lc_pid from usbconfig.h so that there is a central source of information */
+    _lc_vid = _lc_rawVid[1] * 256 + _lc_rawVid[0];
+    _lc_pid = _lc_rawPid[1] * 256 + _lc_rawPid[0];
+
+    /* The following function is in opendevice.c: */
+    if( usbOpenDevice( &_lc_handle, _lc_vid, _lc_vendor, _lc_pid, _lc_product, NULL, NULL, NULL) != 0)
+    {
+
+        fprintf(stderr, "Could not find USB device \"%s\" with lc_vid=0x%x lc_pid=0x%x\n", _lc_product, _lc_vid, _lc_pid);
+    }
+}
+
+void lc_close()
+{
+    usb_close(_lc_handle);
+
+}
+

client/ledcube.h

@@ -0,0 +1,29 @@
+
+#include <stdio.h>
+#include <usb.h>        /* this is libusb */
+
+#include "opendevice.h" /* common code moved to separate module */
+
+#include "../firmware/globals.h"   /* custom request numbers */
+#include "../firmware/requests.h"   /* custom request numbers */
+#include "../firmware/usbconfig.h"  /* device's VID/PID and names */
+
+usb_dev_handle      *_lc_handle = NULL;
+
+const unsigned char  _lc_rawVid[2] = {USB_CFG_VENDOR_ID},
+                     _lc_rawPid[2] = {USB_CFG_DEVICE_ID};
+
+char                 _lc_vendor[]  = {USB_CFG_VENDOR_NAME, 0},
+                     _lc_product[] = {USB_CFG_DEVICE_NAME, 0};
+
+char                 _lc_buffer[4];
+
+int                  _lc_vid,
+                     _lc_pid;
+
+void lc_setFrame(unsigned long);
+void lc_setMode(int);
+void lc_saveFrame(unsigned long, int);
+void lc_init(void);
+void lc_close(void);
+

client/test.c

@@ -1,11 +1,11 @@
-/* Name: set-led.c
+/* Name: lc_set-led.c
  * Project: hid-custom-rq example
  * Author: Christian Starkjohann
  * Creation Date: 2008-04-10
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
  * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
- * This Revision: $Id: set-led.c 692 2008-11-07 15:07:40Z cs $
+ * This Revision: $Id: lc_set-led.c 692 2008-11-07 15:07:40Z cs $
  */
 
 /*
@@ -18,23 +18,16 @@ See http://libusb.sourceforge.net/ or http://libusb-win32.sourceforge.net/
 respectively.
 */
 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <usb.h>        /* this is libusb */
+#include <usb.h>
-
-#include "opendevice.h" /* common code moved to separate module */
 
 #include "../firmware/globals.h"   /* custom request numbers */
-#include "../firmware/requests.h"   /* custom request numbers */
-#include "../firmware/usbconfig.h"  /* device's VID/PID and names */
 
-usb_dev_handle      *handle = NULL;
+#include "ledcube.c"
-const unsigned char rawVid[2] = {USB_CFG_VENDOR_ID}, rawPid[2] = {USB_CFG_DEVICE_ID};
-char                vendor[] = {USB_CFG_VENDOR_NAME, 0}, product[] = {USB_CFG_DEVICE_NAME, 0};
-char                buffer[4];
-int                 vid, pid;
 
 /**
  * 
@@ -55,21 +48,17 @@ void eeprom1()
             buf = (1 << tmp2);
         }
 
-        int low  =  buf & 0x0000ffff;
+        // lc_set animation stop
-        int high = (buf & 0xffff0000) >> 16;
+        lc_setMode(MODE_ANIMATION_STOP);
 
-        // set mode 0
+        // lc_set the frame to save
-        usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_MODE, 0, 0, buffer, 0, 300);
+        lc_setFrame(buf);
-
-        // set the frame to save
-        usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME,  low, 0, buffer, 0, 300);
-        usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, high, 1, buffer, 0, 300);
 
         // save to position tmp
-        //usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_EEPROM_STORE_FRAME, 0, tmp, buffer, 0, 300);
+        //lc_saveFrame(buf, tmp);
 
-        //usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_MODE, 1, 0, buffer, 0, 300);
+        // lc_set mode to animate endless loop
-        usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_MODE, 2, 0, buffer, 0, 300);
+        lc_setMode(MODE_ANIMATION_LOOP);
     }
 
 }
@@ -77,50 +66,36 @@ void eeprom1()
 void sinus1(int max)
 {
 
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_MODE, 0, 0, buffer, 0, 300);
+    // lc_set animation stop
+    lc_setMode(MODE_ANIMATION_STOP);
 
-    int low_last = 0;
-    int high_last = 0;
     int j = max;
     while (--j)
     {
 
-        //int j = 0;
         int i = 0;
-        for (i = 0; i < 360; i++)
+        int k = 0;
-    //    for (i = 79; i < 90; i++)
+        for (i = 0; i < 360; i+=11)
+        //for (i = 0; i < 360; i++)
         {
             // 2 = 27
             // 1 = 27 / 2
             // n = 27 * n / 2
             double d = cos((double)((6.28*i)/360)) + 1; // 6.28 = PI * 2
             unsigned long tmp = (1 << (int)((27 * d) / 2));
-            int low  =  tmp & 0x0000ffff;
-            int high = (tmp & 0xffff0000) >> 16;
 
-            printf("%d\t%f\t%d\t%d\n", i, d, high, low);
 
-            if (low > 0 && low_last != low)
+            //printf("%d\t%f\t%d\t%d\n", i, d, high, low);
-            {
-                usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, low,  0, buffer, 0, 300);
-                if (high == 0)
-                    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0, 1, buffer, 0, 300);
-            }
-            if (high > 0 && high_last != high)
-            {
-                usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, high, 1, buffer, 0, 300);
-                if (low == 0)
-                    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0, 0, buffer, 0, 300);
-            }
 
-            // save the frame to eeprom
+            // show frame
-            //usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_EEPROM_STORE_FRAME, 0, j, buffer, 0, 300);
+            lc_setFrame(tmp);
-
+            // or save the frame to eeprom
-            high_last = high;
+            //tmp = tmp + (k << 27);
-            low_last = low;
+            //if (k < 32)
+                //lc_saveFrame(tmp, k);
 
             usleep(2500);
-            //j++;
+            k++;
         }
 
     }
@@ -132,92 +107,52 @@ void sinus1(int max)
  */
 void demo()
 {
-    // delay is 100
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_DELAY, 100, 0, buffer, 0, 300);
     // stop animation
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_MODE, 0, 0, buffer, 0, 300);
+    lc_setMode(MODE_ANIMATION_STOP);
 
     //clear cube
-    //printf("clear\n");
+    lc_setFrame(0);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0x0000, 0, buffer, 0, 300);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0x0000, 1, buffer, 0, 300);
 
     sleep(1);
 
     // transfer one frame
-    //printf("test 1\n");
+    lc_setFrame(0x06127348);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0x7348, 0, buffer, 0, 300);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0x0612, 1, buffer, 0, 300);
 
     sleep(1);
 
     // another frame
-    //printf("test 2\n");
+    lc_setFrame(0x07007007);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0x7007, 0, buffer, 0, 300);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0x0700, 1, buffer, 0, 300);
 
     sleep(1);
 
     // switch all led on
-    //printf("full\n");
+    lc_setFrame(0x07ffffff);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0xffff, 0, buffer, 0, 300);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_FRAME, 0x07ff, 1, buffer, 0, 300);
 
     sleep(1);
 
     // save animation to eeprom and animate for 60 seconds
     eeprom1();
 
-    sleep(30);
+    sleep(10);
 
     // animate with a sinus wave
-    sinus1(1);
+    sinus1(25);
 
     // start animation one time
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_MODE, 1, 0, buffer, 0, 300);
+    lc_setMode(MODE_ANIMATION_SINGLE);
 }
 
 int main(int argc, char **argv)
 {
 
-    usb_init();
+    lc_init();
 
-    /* compute VID/PID from usbconfig.h so that there is a central source of information */
-    vid = rawVid[1] * 256 + rawVid[0];
-    pid = rawPid[1] * 256 + rawPid[0];
-    /* The following function is in opendevice.c: */
-    if(usbOpenDevice(&handle, vid, vendor, pid, product, NULL, NULL, NULL) != 0){
-        fprintf(stderr, "Could not find USB device \"%s\" with vid=0x%x pid=0x%x\n", product, vid, pid);
-        exit(1);
-    }
-    /* Since we use only control endpoint 0, we don't need to choose a
-     * configuration and interface. Reading device descriptor and setting a
-     * configuration and interface is done through endpoint 0 after all.
-     * However, newer versions of Linux require that we claim an interface
-     * even for endpoint 0. Enable the following code if your operating system
-     * needs it: */
-#if 0
-    int retries = 1, usbConfiguration = 1, usbInterface = 0;
-    if(usb_set_configuration(handle, usbConfiguration) && showWarnings){
-        fprintf(stderr, "Warning: could not set configuration: %s\n", usb_strerror());
-    }
-    /* now try to claim the interface and detach the kernel HID driver on
-     * Linux and other operating systems which support the call. */
-    while((len = usb_claim_interface(handle, usbInterface)) != 0 && retries-- > 0){
-#ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
-        if(usb_detach_kernel_driver_np(handle, 0) < 0 && showWarnings){
-            fprintf(stderr, "Warning: could not detach kernel driver: %s\n", usb_strerror());
-        }
-#endif
-    }
-#endif
-    //usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_MODE, 2, 0, buffer, 0, 300);
     demo();
-    //sinus1(255);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_MODE, 2, 0, buffer, 0, 300);
-    usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_OUT, CUSTOM_RQ_SET_DELAY, 10, 0, buffer, 0, 300);
 
-    usb_close(handle);
+    lc_setMode(MODE_ANIMATION_LOOP);
+
+    lc_close();
+
     return 0;
 }