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

* buspirate.c: Added compatibility with BusPirate "NewUI" firmware 5.x 

(contributed by Kari Knuuttila)



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@946 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Michal Ludvig 2010-07-18 13:15:07 +00:00
parent c34548cdde
commit 60e15f2666
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,10 @@
2010-07-19 Michal Ludvig <mludvig@logix.net.nz>
* buspirate.c: Added compatibility with BusPirate "NewUI" firmware 5.x
(contributed by Kari Knuuttila)
2010-07-12 Nils Springob <nils@nicai-systems.de> 2010-07-12 Nils Springob <nils@nicai-systems.de>
* avrdude.conf.in (atmega88p): New device. * avrdude.conf.in (atmega88p): New device.
2010-06-03 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2010-06-03 Joerg Wunsch <j.gnu@uriah.heep.sax.de>

9
buspirate.c
View File

@ -256,8 +256,9 @@ static int buspirate_send(struct programmer_t *pgm, char *str)
static int buspirate_is_prompt(char *str) static int buspirate_is_prompt(char *str)
{ {
/* Prompt ends with '>' all other input probably ends with '\n' */ /* Prompt ends with '>' or '> '
return (str[strlen(str) - 1] == '>'); * all other input probably ends with '\n' */
return (str[strlen(str) - 1] == '>' || str[strlen(str) - 2] == '>');
} }
static int buspirate_expect(struct programmer_t *pgm, char *send, static int buspirate_expect(struct programmer_t *pgm, char *send,
@ -536,6 +537,7 @@ static int buspirate_start_spi_mode_ascii(struct programmer_t *pgm)
static void buspirate_enable(struct programmer_t *pgm) static void buspirate_enable(struct programmer_t *pgm)
{ {
unsigned char *reset_str = "#\n"; unsigned char *reset_str = "#\n";
unsigned char *accept_str = "y\n";
char *rcvd; char *rcvd;
int fw_v1 = 0, fw_v2 = 0; int fw_v1 = 0, fw_v2 = 0;
int rc, print_banner = 0; int rc, print_banner = 0;
@ -559,6 +561,9 @@ static void buspirate_enable(struct programmer_t *pgm)
buspirate_enable(pgm); buspirate_enable(pgm);
return; return;
} }
if (strncmp(rcvd, "Are you sure?", 13) == 0) {
buspirate_send_bin(pgm, accept_str, strlen(accept_str));
}
if (strncmp(rcvd, "RESET", 5) == 0) { if (strncmp(rcvd, "RESET", 5) == 0) {
print_banner = 1; print_banner = 1;
continue; continue;