avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle data size warning better 

Now it only outputs a warning when the size of the data the user input is actually ambiguous
This commit is contained in:
MCUdude 2022-02-20 22:39:04 +01:00
parent 3532c567ac
commit fa706f0d01
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/term.c
View File

@ -427,7 +427,6 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
} else if ((suffix == 'F' || suffix == 'f') && } else if ((suffix == 'F' || suffix == 'f') &&
strncmp(argv[i], "0x", 2) != 0 && strncmp(argv[i], "-0x", 3) != 0) { strncmp(argv[i], "0x", 2) != 0 && strncmp(argv[i], "-0x", 3) != 0) {
argv[i][strlen(argv[i]) - 1] = '\0'; argv[i][strlen(argv[i]) - 1] = '\0';
avrdude_message(MSG_INFO, "snip\n");
data.size = 4; data.size = 4;
} else if ((suffix == 'H' && lsuffix == 'H') || (suffix == 'h' && lsuffix == 'h')) { } else if ((suffix == 'H' && lsuffix == 'H') || (suffix == 'h' && lsuffix == 'h')) {
argv[i][strlen(argv[i]) - 2] = '\0'; argv[i][strlen(argv[i]) - 2] = '\0';
@ -448,7 +447,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
if (*end_ptr || (end_ptr == argv[i])) { if (*end_ptr || (end_ptr == argv[i])) {
data.is_float = false; data.is_float = false;
// Try single character // Try single character
if (argv[i][0] == '\'') { if (argv[i][0] == '\'' && argv[i][2] == '\'') {
data.ll = argv[i][1]; data.ll = argv[i][1];
} else { } else {
avrdude_message(MSG_INFO, "\n%s (write): can't parse data \"%s\"\n", avrdude_message(MSG_INFO, "\n%s (write): can't parse data \"%s\"\n",
@ -459,9 +458,16 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
} }
} }
// Print warning if data size might be ambiguous // Print warning if data size might be ambiguous
if(!data.size && \ bool is_hex = (strncmp(argv[i], "0x", 2) == 0);
(((strncmp(argv[i], "0x", 2) == 0) && strlen(argv[i]) > 3) || \ bool is_neg_hex = (strncmp(argv[i], "-0x", 3) == 0);
(data.ll > 0xFF && strlen(argv[i]) > 2))) { bool leading_zero = (strncmp(argv[i], "0x0", 3) == 0);
int8_t hex_digits = (strlen(argv[i]) - 2);
if(!data.size // No pre-defined size
&& (is_neg_hex // Hex with - sign in front
|| (is_hex && leading_zero && (hex_digits & (hex_digits - 1))) // Hex with 3, 5, 6 or 7 digits
|| (!is_hex && !data.is_float && llabs(data.ll) > 0xFF && strlen(argv[i]) > 2))) // Base10 int greater than 255
{
avrdude_message(MSG_INFO, "Warning: no size suffix specified for \"%s\". " avrdude_message(MSG_INFO, "Warning: no size suffix specified for \"%s\". "
"Writing %d byte(s)\n", "Writing %d byte(s)\n",
argv[i], argv[i],