Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add serial port discovery #1498

Merged
merged 57 commits into from
Sep 22, 2023
Merged

Add serial port discovery #1498

Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
0782756
Add libserialport to make/Cmake
MCUdude Aug 31, 2023
b744b19
Initial support for serial port discovery using libserialport
MCUdude Aug 31, 2023
4107aa3
Use compile time constants to set string lengths
MCUdude Aug 31, 2023
6e390d0
Remove comparisons that allways returns true
MCUdude Sep 1, 2023
6976e75
Apply @stefanrueger's patch
MCUdude Sep 1, 2023
37d896f
Remove unnecessary branch
MCUdude Sep 1, 2023
385f210
Remove exits
MCUdude Sep 1, 2023
d9912f1
Reduce error messages to warnings
MCUdude Sep 1, 2023
5aea6bd
Only deploy the serial port discovery when pgm->conntype == CONNTYPE_…
MCUdude Sep 2, 2023
ca245da
Make sure serialport is unique
MCUdude Sep 2, 2023
9e65675
Use dynamic memory allocation for sernum and port
MCUdude Sep 3, 2023
8258e08
Support partial serial numbers
MCUdude Sep 3, 2023
efce224
Rename serialadapter functions
MCUdude Sep 3, 2023
5be3edb
Add support for "usb" suffix when specifying USB VID and PID
MCUdude Sep 3, 2023
af6fc08
Add print_available_serialports function
MCUdude Sep 3, 2023
d519286
Add missing usb prefix
MCUdude Sep 3, 2023
58b4826
Search for matching serial adapter vid/pid in avrdude.conf
MCUdude Sep 3, 2023
e46a00a
Formatting
MCUdude Sep 3, 2023
f40366c
Require "usb:" prefix
MCUdude Sep 3, 2023
e0abcaf
Allocate space for tokens dynamically
MCUdude Sep 3, 2023
1389463
Add support for trailing serial number matching using ...[end_of_sn]
MCUdude Sep 3, 2023
e1fb8c3
Fix token memory allocation issue
MCUdude Sep 4, 2023
d234bd1
Utilize usbsn if specified in avrduderc
MCUdude Sep 4, 2023
6576825
Do not print all available serial ports unless ...
MCUdude Sep 4, 2023
53a6775
Make it possible to override serial numbers specified in avrduderc
MCUdude Sep 4, 2023
c51ec19
Harden port printing logic
MCUdude Sep 4, 2023
2268d8e
Fix another port print bug
MCUdude Sep 4, 2023
970953d
Only suggest -P usb:[vid]:[pid](:[sn]) if the serial adapter is unique
MCUdude Sep 4, 2023
bd1b86f
Allow serial adapters to override the default baudrate
MCUdude Sep 4, 2023
c6e832a
Fix segfault
MCUdude Sep 5, 2023
6e3722b
Add more serial adapters
MCUdude Sep 5, 2023
f06f18e
Add @stefanrueger's 0001-Fix-sublte-parsing-problems patch
MCUdude Sep 5, 2023
23fad1a
Apply @stefanrueger's 0001-Draft-auxiliary-port-discovery-functions p…
MCUdude Sep 5, 2023
2baf87d
Print serial numbers when two or more serial adapters has the same VI…
MCUdude Sep 6, 2023
af3d4e5
Remove unused functions and improve serial number matching
MCUdude Sep 6, 2023
d2cacf0
Only suggest serial adapters provided in avrduderc if...
MCUdude Sep 7, 2023
d89cf73
Print all serial adapter alternatives if specified serial adapter
MCUdude Sep 7, 2023
88bbea8
Fix issue where serial adapters with non-matching serial number were …
MCUdude Sep 8, 2023
0eb91e4
Add get_libserialport_data function
MCUdude Sep 9, 2023
3df2b19
Add missing rv
MCUdude Sep 10, 2023
77cbffc
Finally fix libserialport autoconf/make build issues
MCUdude Sep 10, 2023
602b575
Replace the last few remaining tabs with spaces
MCUdude Sep 10, 2023
862cc57
Mention serial port discovery in the docs
MCUdude Sep 10, 2023
e553c29
Apply @stefanrueger's parsing improvement patch
MCUdude Sep 13, 2023
c251450
Improve serial number matching logic
MCUdude Sep 13, 2023
d0f63ee
Add sa_num_matches_by_sea function
MCUdude Sep 13, 2023
2d28a7b
Divide more functionality into functions
MCUdude Sep 13, 2023
42c0655
Simplify/optimize setport_from_serialadapter() and setport_from_vid_p…
MCUdude Sep 14, 2023
471e66f
move sa_flag_unique() inside get_libserialport_data()
MCUdude Sep 14, 2023
efd1716
Rename for loop counter variables
MCUdude Sep 14, 2023
d7dc844
Formatting
MCUdude Sep 14, 2023
98f0640
Improve print_available_serialports() function
MCUdude Sep 16, 2023
7511a5d
Apply @stenfanruegers 0001-Refactor-serialadapter patch
MCUdude Sep 18, 2023
8730fc1
Apply @stefanrueger's 0001-Sort-list-of-plugged-in-SERPORTs-according…
MCUdude Sep 19, 2023
6694e98
Don't suggest usb:vid:pid for serial ports where vid is zero
MCUdude Sep 19, 2023
ba72908
Move str_endnumber() to strutil.c
MCUdude Sep 19, 2023
28e6187
Implement and document -P ?s and -P ?sa
stefanrueger Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove comparisons that allways returns true
  • Loading branch information
@MCUdude
MCUdude committed Sep 1, 2023
commit 6e390d0672c3388b0025ab785250170419ea03da
6 changes: 3 additions & 3 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,14 +1181,14 @@ int main(int argc, char * argv [])
SERIALADAPTER *ser = locate_programmer_set(programmers, port_tok[0], &seradapter);
if (is_serialadapter(ser)) {
if (find_serialport_adapter(ser, port, port_tok[1]) < 0) {
if (port_tok[1] && port_tok[1][0])
if (port_tok[1][0])
pmsg_error("serial adapter %s with serial number %s not found\n", seradapter, port_tok[1]);
else
pmsg_error("serial adapter %s not found\n", seradapter);
exit(1);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we exit here? Say, there is a serialadapter ch340 in avrdude.conf. -P ch340 checks if there is a serial adapter ch340 connected and does not find one. OK, rather then exiting, it could still allow the open() routine to open the file ch340; after all it could be a symbolic link to an existing port for all we know

}
} else if (is_programmer(ser)) {
MCUdude marked this conversation as resolved.
Show resolved Hide resolved
if (port_tok[1] && port_tok[1][0])
if (port_tok[1][0])
pmsg_error("invalid serial adapter %s with serial number %s specified\n", seradapter, port_tok[1]);
MCUdude marked this conversation as resolved.
Show resolved Hide resolved
else
pmsg_error("invalid serial adapter %s specified\n", port_tok[0]);
Expand All @@ -1198,7 +1198,7 @@ int main(int argc, char * argv [])
int vid, pid;
if (sscanf(port_tok[0], "%x", &vid) > 0 && sscanf(port_tok[1], "%x", &pid) > 0) {
if(find_serialport_vid_pid(port, vid, pid, port_tok[2]) < 0) {
if (port_tok[2] && port_tok[2][0])
if (port_tok[2][0])
pmsg_error("serial adapter with USB VID %s and PID %s and serial number %s not found\n", port_tok[0], port_tok[1], port_tok[2]);
else
pmsg_error("serial adapter with USB VID %s and PID %s not found\n", port_tok[0], port_tok[1]);
Expand Down