diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2018-06-19 16:45:30 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2018-06-19 19:46:37 +0300 |
| commit | 725b8524f2c922dcaa32b280d6553eaba81ae30f (patch) | |
| tree | 2220cf36b2f1913a6c4789e0ac8a0ca53a7fcb7e /xs | |
| parent | 635bb1e484e319b1d403faac39170cc4d0dfa6f7 (diff) | |
avrdude: Fix error handling in arduino, fix various outputs
Diffstat (limited to 'xs')
| -rw-r--r-- | xs/src/avrdude/arduino.c | 1 | ||||
| -rw-r--r-- | xs/src/avrdude/avrpart.c | 10 | ||||
| -rw-r--r-- | xs/src/avrdude/update.c | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xs/src/avrdude/arduino.c b/xs/src/avrdude/arduino.c index 5e0693e94..fc9f4571f 100644 --- a/xs/src/avrdude/arduino.c +++ b/xs/src/avrdude/arduino.c @@ -148,6 +148,7 @@ static int arduino_open(PROGRAMMER * pgm, char * port) // Initialization sequence for programming the external FLASH on the Prusa MK3 if (prusa_init_external_flash(pgm) < 0) { avrdude_message(MSG_INFO, "%s: arduino_open(): Failed to initialize MK3 external flash programming mode\n", progname); + return -1; } if (stk500_getsync(pgm) < 0) diff --git a/xs/src/avrdude/avrpart.c b/xs/src/avrdude/avrpart.c index 621a85b98..b04851ac1 100644 --- a/xs/src/avrdude/avrpart.c +++ b/xs/src/avrdude/avrpart.c @@ -378,7 +378,7 @@ void avr_mem_display(const char * prefix, FILE * f, AVRMEM * m, int type, char * optr; if (m == NULL) { - fprintf(f, + avrdude_message(MSG_INFO, "%s Block Poll Page Polled\n" "%sMemory Type Mode Delay Size Indx Paged Size Size #Pages MinW MaxW ReadBack\n" "%s----------- ---- ----- ----- ---- ------ ------ ---- ------ ----- ----- ---------\n", @@ -386,13 +386,13 @@ void avr_mem_display(const char * prefix, FILE * f, AVRMEM * m, int type, } else { if (verbose > 2) { - fprintf(f, + avrdude_message(MSG_INFO, "%s Block Poll Page Polled\n" "%sMemory Type Mode Delay Size Indx Paged Size Size #Pages MinW MaxW ReadBack\n" "%s----------- ---- ----- ----- ---- ------ ------ ---- ------ ----- ----- ---------\n", prefix, prefix, prefix); } - fprintf(f, + avrdude_message(MSG_INFO, "%s%-11s %4d %5d %5d %4d %-6s %6d %4d %6d %5d %5d 0x%02x 0x%02x\n", prefix, m->desc, m->mode, m->delay, m->blocksize, m->pollindex, m->paged ? "yes" : "no", @@ -415,7 +415,7 @@ void avr_mem_display(const char * prefix, FILE * f, AVRMEM * m, int type, optr = avr_op_str(i); else optr = " "; - fprintf(f, + avrdude_message(MSG_INFO, "%s %-11s %8d %8s %5d %5d\n", prefix, optr, j, bittype(m->op[i]->bit[j].type), @@ -620,7 +620,7 @@ void avr_display(FILE * f, AVRPART * p, const char * prefix, int verbose) LNODEID ln; AVRMEM * m; - fprintf(f, + avrdude_message(MSG_INFO, "%sAVR Part : %s\n" "%sChip Erase delay : %d us\n" "%sPAGEL : P%02X\n" diff --git a/xs/src/avrdude/update.c b/xs/src/avrdude/update.c index fa3372476..e9dd6e325 100644 --- a/xs/src/avrdude/update.c +++ b/xs/src/avrdude/update.c @@ -117,7 +117,6 @@ UPDATE * parse_op(char * s) } upd->offset = offset; - printf("parse_op: offset: %lu\n", offset); p++; /* |