8000 Prevent (most) output of >= in Windows by stefanrueger · Pull Request #1992 · avrdudes/avrdude · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Prevent (most) output of >= in Windows #1992

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

Merged
merged 5 commits into from
May 21, 2025
Merged

Prevent (most) output of >= in Windows #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dba888a
Harden usbproduct/usbvendor access
stefanrueger May 19, 2025
3c746b4
Simplify help message
stefanrueger May 19, 2025
ac6be84
Shorten error message
stefanrueger May 19, 2025
e7d40ed
Verbally describe trailing = in help text
stefanrueger May 20, 2025
f2067eb
Capitalise clarifying comment in help text
stefanrueger May 20, 2025
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
6 changes: 3 additions & 3 deletions src/pickit5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,9 +1428,9 @@ static int pickit5_read_dev_id(const PROGRAMMER *pgm, const AVRPART *p) {
pickit5_send_script_cmd(pgm, scr, scr_len, NULL, 0);
pickit5_program_enable(pgm, p);
if(my.rxBuf[17] == 0x0E) { // Errors figured out during 6 hours of failing to get it to work
if(my.rxBuf[16] == 0x10 || my.rxBuf[16] == 58) { // with the serial/bootloader auto-reset circuit on Arduino board
pmsg_error("debugWIRE transmission error, aborting");
msg_error("(make sure there are no caps and a pullup >= 10kOhm on the Reset line)\n");
if(my.rxBuf[16] == 0x10 || my.rxBuf[16] == 58) { // Serial/bootloader auto-reset circuit on Arduino board
pmsg_error("debugWIRE transmission error, aborting"
" (ensure reset has a pullup >= 10 kOhm and no cap)\n");
} else {
pmsg_error("%d\n", my.rxBuf[16]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/stk500v2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2035,7 +2035,7 @@ static int stk500v2_jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extp
msg_error("%s -c %s extended options:\n", progname, pgmid);
if(pgm->extra_features & HAS_SUFFER) {
msg_error(" -x suffer Read SUFFER register value\n");
msg_error(" -x suffer=<n> Set SUFFER register value to <n>=0x.., 0... or decimal\n");
msg_error(" -x suffer=<n> Set SUFFER register value to <n>\n");
}
if(pgm->extra_features & HAS_VTARG_SWITCH) {
msg_error(" -x vtarg_switch Read on-board target voltage switch state\n");
Expand Down
2 changes: 1 addition & 1 deletion src/term.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1733,7 +1733,7 @@ static int cmd_config(const PROGRAMMER *pgm, const AVRPART *p, int argc, const c
"to show that of <property>. Wildcards or initial strings are permitted (but\n"
"not both), in which case all settings of matching properties are displayed.\n"
"\n"
"avrdude> config <property>=\n"
"avrdude> config <property>= # Note the trailing = as in config eesave=\n"
"\n"
"shows all possible values that <property> can take on with the currently\n"
"set one being the only that is not commented out. Assignments\n"
Expand Down
14 changes: 6 additions & 8 deletions src/usbasp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ static int usbasp_transmit(const PROGRAMMER *pgm, unsigned char receive,
unsigned char functionid, const unsigned char *send, unsigned char *buffer, int buffersize);

#ifdef USE_LIBUSB_1_0
static int usbOpenDevice(const PROGRAMMER *pgm, libusb_device_handle ** device, int vendor,
static int usbOpenDevice(const PROGRAMMER *pgm, libusb_device_handle **device, int vendor,
const char *vendorName, int product, const char *productName, const char *port);
#else
static int usbOpenDevice(const PROGRAMMER *pgm, usb_dev_handle ** device, int vendor,
static int usbOpenDevice(const PROGRAMMER *pgm, usb_dev_handle **device, int vendor,
const char *vendorName, int product, const char *productName, const char *port);
#endif

Expand Down Expand Up @@ -448,7 +448,7 @@ static int check_for_port_argument_match(const char *port, char *bus, char *devi
*/

#ifdef USE_LIBUSB_1_0
static int usbOpenDevice(const PROGRAMMER *pgm, libusb_device_handle ** device, int vendor,
static int usbOpenDevice(const PROGRAMMER *pgm, libusb_device_handle **device, int vendor,
const char *vendorName, int product, const char *productName, const char *port) {

libusb_device_handle *handle = NULL;
Expand Down Expand Up @@ -538,7 +538,7 @@ static int usbOpenDevice(const PROGRAMMER *pgm, libusb_device_handle ** device,
return errorCode;
}
#else
static int usbOpenDevice(const PROGRAMMER *pgm, usb_dev_handle ** device, int vendor,
static int usbOpenDevice(const PROGRAMMER *pgm, usb_dev_handle **device, int vendor,
const char *vendorName, int product, const char *productName, const char *port) {

struct usb_bus *bus;
Expand Down Expand Up @@ -656,12 +656,10 @@ static int usbasp_open(PROGRAMMER *pgm, const char *port) {
}

pmsg_error("cannot find USB device with vid=0x%x pid=0x%x", vid, pid);
if(pgm->usbvendor[0] != 0) {
if(pgm->usbvendor && *pgm->usbvendor)
msg_error(" vendor='%s'", pgm->usbvendor);
}
if(pgm->usbproduct[0] != 0) {
if(pgm->usbproduct && *pgm->usbproduct)
msg_error(" product='%s'", pgm->usbproduct);
}
msg_error("\n");
return -1;
}
Expand Down
Loading
0