Skip to content

Commit d4d2894

Browse files
author
David Betz
committed
Fix a problem with getting serial device names under Windows.
1 parent 3304189 commit d4d2894

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/enumcom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ int SerialFind(const char* prefix, int (*check)(const char* port, void* data), v
104104
//printf("Device path: %s\n", pDetData->DevicePath);
105105
//printf("Friendly name: %s\n", fname);
106106
//printf("Description: %s\n", desc);
107-
if ((comx = strchr(fname, '(')) != NULL)
107+
if ((comx = strrchr(fname, '(')) != NULL)
108108
++comx;
109109
else
110110
comx = fname;

src/main.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ int main(int argc, char *argv[])
115115
configSettings = NewBoardConfig(NULL, "");
116116

117117
/* get the arguments */
118-
for(i = 1; i < argc; ++i) {
118+
for (i = 1; i < argc; ++i) {
119119

120120
/* handle switches */
121-
if(argv[i][0] == '-') {
122-
switch(argv[i][1]) {
121+
if (argv[i][0] == '-') {
122+
switch (argv[i][1]) {
123123
case 'b': // select a target board
124124
if (argv[i][2])
125125
board = &argv[i][2];
@@ -132,9 +132,9 @@ int main(int argc, char *argv[])
132132
showMessageCodes = true;
133133
break;
134134
case 'D':
135-
if(argv[i][2])
135+
if (argv[i][2])
136136
p = &argv[i][2];
137-
else if(++i < argc)
137+
else if (++i < argc)
138138
p = argv[i];
139139
else
140140
usage(argv[0]);
@@ -174,9 +174,9 @@ int main(int argc, char *argv[])
174174
useSerial = false;
175175
break;
176176
case 'I': // add a directory to the .cfg include path
177-
if(argv[i][2])
177+
if (argv[i][2])
178178
p = &argv[i][2];
179-
else if(++i < argc)
179+
else if (++i < argc)
180180
p = argv[i];
181181
else
182182
usage(argv[0]);

src/messages.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ enum {
7272
/* 121 */ ERROR_INSUFFICIENT_MEMORY,
7373
/* 122 */ ERROR_NO_RESET_METHOD,
7474
/* 123 */ ERROR_RESET_FAILED,
75+
/* 124 */ ERROR_WRONG_PROPELLER_VERSION,
7576
MAX_ERROR
7677
};
7778

0 commit comments

Comments
 (0)