Changeset 192e299 in thomson for elec/CrO2/software/cro2.cpp

Timestamp:

Feb 3, 2012, 7:37:06 PM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

c2a9854

Parents:

f9263dd

Message:

Cleanup.

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

File:

• elec/CrO2/software/cro2.cpp (modified) (4 diffs)

elec/CrO2/software/cro2.cpp

@@ -19 +19 @@
 int main(int argc, char **argv)
 {
-        int                 nBytes = 0;
-
     if(argc < 2){
                 Gui gui(&argc, &argv);
@@ -30 +28 @@
 
                 if(strcmp(argv[1], "get") == 0){
+                        int                 nBytes = 0;
                         unsigned char       buffer[275];
                         memset(buffer, 0, 275);
                         nBytes = dev.read(buffer, sizeof(buffer));
+                        if (nBytes < 0) fprintf(stderr, "USB error %s\n", usb_strerror());
                 }else if(strcmp(argv[1], "put") == 0){
 
@@ -38 +38 @@
                         K5 file(argv[2]);
 
-                        for (int k = 0; k < file.getBlockCount(); k++)
-                        {
-                                // wait for motor on
-                                while (dev.getStatus() & 8)
-                                        Sleep(1000);
-
-                                K5::Block block = file.getBlock(k);
-
-                                nBytes = dev.write(block.data, block.length - 1, block.type);
-
-                                // TODO wait for correct time (read status from usb OR compute from size+type)
-                                Sleep(1400);
-                        }
+                        dev.write(file);
                 }else{
                         // TODO print usage
@@ -56 +44 @@
                 }
 
-                if (nBytes < 0) fprintf(stderr, "USB error %s\n", usb_strerror());
                 return 0;
         }