Changeset 88642a4 in thomson

Timestamp:

Jan 16, 2012, 9:54:55 PM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

197a1cc

Parents:

d46151a

Message:

Add motor on detection.

git-svn-id: ​svn://localhost/thomson@8 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

File:

• elec/CrO2/software/powerSwitch.c (modified) (5 diffs)

elec/CrO2/software/powerSwitch.c

@@ -21 +21 @@
 #include <string.h>
 #include <stdint.h>
+#include <unistd.h>
+
 #include <lusb0_usb.h>    /* this is libusb, see http://libusb.sourceforge.net/ */
 
@@ -32 +34 @@
 #define PRODUCTSTRING "CrO2"
 
+/* These are the vendor specific SETUP commands implemented by our USB device */
 #define PSCMD_CONFIG  0
 #define PSCMD_GET   1
 #define PSCMD_PUT   2
-/* These are the vendor specific SETUP commands implemented by our USB device */
+#define PSCMD_STATUS   3
 
 static void usage(char *name)
@@ -178 +181 @@
     }else if(strcmp(argv[1], "put") == 0){
 
+                do
+                {
+                        // Wait for motor on
+                        nBytes = usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, PSCMD_STATUS, 0,0, (char*)buffer, 1, 5000);
+                        usleep(1000000);
+                } while (buffer[0] & 8);
+
+
                 FILE* fptr = fopen(argv[2], "rb");
                 int blockid;
@@ -185 +196 @@
                 do
                 {
-                        fread(buffer, 1, 18, fptr); // skip sync header
+                        do
+                        {
+                                fread(&blktype, 1, 1, fptr);
+                                if (feof(fptr))
+                                {
+                                        fprintf(stderr, "end of file.\n");
+                                        fclose(fptr);
+                                        usb_close(handle);
+                                        exit(0);
+                                }
+                        }
+                        while(blktype != 0x5A); // skip sync header
+
                         fread(&blktype, 1, 1, fptr);
                         fread(&blksize, 1, 1, fptr);
                         blksize -= 2;
                         fread(buffer, 1, blksize + 1, fptr);
+                        if (blktype == 0)
+                        {
+                                // new file
+                                printf("%.11s\n",buffer);
+                        }
                 }
                 while (blockid --);
@@ -206 +234 @@
 
         if (nBytes < 0) fprintf(stderr, "USB error %s\n", usb_strerror());
-
     usb_close(handle);
     return 0;