Fix a problem with getting serial device names under Windows.

parallaxinc · Apr 19, 2017 · d4d2894 · d4d2894
1 parent 3304189
commit d4d2894
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/enumcom.c b/src/enumcom.c
@@ -104,7 +104,7 @@ int SerialFind(const char* prefix, int (*check)(const char* port, void* data), v
 					//printf("Device path: %s\n", pDetData->DevicePath);
 					//printf("Friendly name: %s\n", fname);
 					//printf("Description: %s\n", desc);
-					if ((comx = strchr(fname, '(')) != NULL)
+					if ((comx = strrchr(fname, '(')) != NULL)
 					    ++comx;
 					else
 					    comx = fname;

diff --git a/src/main.cpp b/src/main.cpp
@@ -115,11 +115,11 @@ int main(int argc, char *argv[])
     configSettings = NewBoardConfig(NULL, "");
 
     /* get the arguments */
-    for(i = 1; i < argc; ++i) {
+    for (i = 1; i < argc; ++i) {
 
         /* handle switches */
-        if(argv[i][0] == '-') {
-            switch(argv[i][1]) {
+        if (argv[i][0] == '-') {
+            switch (argv[i][1]) {
             case 'b':   // select a target board
                 if (argv[i][2])
                     board = &argv[i][2];
@@ -132,9 +132,9 @@ int main(int argc, char *argv[])
                 showMessageCodes = true;
                 break;
             case 'D':
-                if(argv[i][2])
+                if (argv[i][2])
                     p = &argv[i][2];
-                else if(++i < argc)
+                else if (++i < argc)
                     p = argv[i];
                 else
                     usage(argv[0]);
@@ -174,9 +174,9 @@ int main(int argc, char *argv[])
                 useSerial = false;
                 break;
             case 'I':   // add a directory to the .cfg include path
-                if(argv[i][2])
+                if (argv[i][2])
                     p = &argv[i][2];
-                else if(++i < argc)
+                else if (++i < argc)
                     p = argv[i];
                 else
                     usage(argv[0]);

diff --git a/src/messages.h b/src/messages.h
@@ -72,6 +72,7 @@ enum {
     /* 121 */ ERROR_INSUFFICIENT_MEMORY,
     /* 122 */ ERROR_NO_RESET_METHOD,
     /* 123 */ ERROR_RESET_FAILED,
+    /* 124 */ ERROR_WRONG_PROPELLER_VERSION,
     MAX_ERROR
 };