diff --git a/ChangeLog b/ChangeLog index 6492c6e9..6a10637e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2020-09-16 Joerg Wunsch + + Submitted by Adrian Klieber: + patch #9818: correct typos in SVN rev 1429 + * buspirate.c: Fix typos. + * fileio.c: Fix typos. + * jtagmkII.c: Fix typos. + * main.c: Fix typos. + * term.c: Fix typos. + * usbasp.c: Fix typos. + * usbtiny.h: Fix typos. + 2020-09-16 Joerg Wunsch Submitted by Adrian Klieber: diff --git a/NEWS b/NEWS index bfd2a93c..b8ac39bf 100644 --- a/NEWS +++ b/NEWS @@ -71,6 +71,7 @@ Current: patch #9893: [PATCH] Reader reads ftdi handle after main thread close it patch #9819: Address several leaks in SVN rev 1429 patch #9820: Fix some out-of-bounds/uninitialized issues + patch #9818: correct typos in SVN rev 1429 * Internals: - New avrdude.conf keyword "family_id", used to verify SIB attributes diff --git a/buspirate.c b/buspirate.c index a06019b9..9b738071 100644 --- a/buspirate.c +++ b/buspirate.c @@ -801,7 +801,7 @@ static void buspirate_powerup(struct programmer_t *pgm) char buf[25]; int ok = 0; snprintf(buf, sizeof(buf), "%d\n", PDATA(pgm)->cpufreq); - if (buspirate_expect(pgm, "g\n", "Frequency in KHz", 1)) { + if (buspirate_expect(pgm, "g\n", "Frequency in kHz", 1)) { if (buspirate_expect(pgm, buf, "Duty cycle in %", 1)) { if (buspirate_expect(pgm, "50\n", "PWM active", 1)) { ok = 1; diff --git a/fileio.c b/fileio.c index 1746ef5d..e03aa7fa 100644 --- a/fileio.c +++ b/fileio.c @@ -1172,7 +1172,7 @@ static int fileio_ihex(struct fioparms * fio, break; default: - avrdude_message(MSG_INFO, "%s: invalid Intex Hex file I/O operation=%d\n", + avrdude_message(MSG_INFO, "%s: invalid Intel Hex file I/O operation=%d\n", progname, fio->op); return -1; break; diff --git a/jtagmkII.c b/jtagmkII.c index 2ccf9256..df10f9f9 100644 --- a/jtagmkII.c +++ b/jtagmkII.c @@ -1916,7 +1916,7 @@ static int jtagmkII_page_erase(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, retry: avrdude_message(MSG_NOTICE2, "%s: jtagmkII_page_erase(): " - "Sending xmega erase command: ", + "Sending Xmega erase command: ", progname); jtagmkII_send(pgm, cmd, sizeof cmd); diff --git a/main.c b/main.c index 1de907c8..61357e03 100644 --- a/main.c +++ b/main.c @@ -921,7 +921,7 @@ int main(int argc, char * argv []) */ if (port[0] == 0) { avrdude_message(MSG_INFO, "\n%s: no port has been specified on the command line " - "or the config file\n", + "or in the config file\n", progname); avrdude_message(MSG_INFO, "%sSpecify a port using the -P option and try again\n\n", progbuf); @@ -1176,7 +1176,7 @@ int main(int argc, char * argv []) //Check if the programmer just doesn't support reading if (rc == -5) { - avrdude_message(MSG_NOTICE, "%s: safemode: Fuse reading not support by programmer.\n" + avrdude_message(MSG_NOTICE, "%s: safemode: Fuse reading not supported by programmer.\n" " Safemode disabled.\n", progname); } else diff --git a/term.c b/term.c index 012f6f1a..f65610d3 100644 --- a/term.c +++ b/term.c @@ -342,7 +342,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p, if (argc < 4) { avrdude_message(MSG_INFO, "Usage: write " - " ... byteN>\n"); + " ... \n"); return -1; } @@ -624,7 +624,7 @@ static int cmd_fosc(PROGRAMMER * pgm, struct avrpart * p, return -2; } if ((rc = pgm->set_fosc(pgm, v)) != 0) { - avrdude_message(MSG_INFO, "%s (fosc): failed to set oscillator_frequency (rc = %d)\n", + avrdude_message(MSG_INFO, "%s (fosc): failed to set oscillator frequency (rc = %d)\n", progname, rc); return -3; } diff --git a/usbasp.c b/usbasp.c index 08b441e3..21fbb187 100644 --- a/usbasp.c +++ b/usbasp.c @@ -662,7 +662,7 @@ static int usbasp_spi_cmd(PROGRAMMER * pgm, const unsigned char *cmd, if (verbose == 3) putc('\n', stderr); - avrdude_message(MSG_INFO, "%s: error: wrong responds size\n", + avrdude_message(MSG_INFO, "%s: error: wrong response size\n", progname); return -1; } @@ -963,7 +963,7 @@ static int usbasp_tpi_recv_byte(PROGRAMMER * pgm) if(usbasp_transmit(pgm, 1, USBASP_FUNC_TPI_RAWREAD, temp, temp, sizeof(temp)) != 1) { - avrdude_message(MSG_INFO, "%s: error: wrong responds size\n", progname); + avrdude_message(MSG_INFO, "%s: error: wrong response size\n", progname); return -1; } diff --git a/usbtiny.h b/usbtiny.h index 3a258b9f..b663ced1 100644 --- a/usbtiny.h +++ b/usbtiny.h @@ -45,7 +45,7 @@ // The SCK speed can be set by avrdude, to allow programming of slow-clocked parts #define SCK_MIN 1 // usec delay (target clock >= 4 MHz) -#define SCK_MAX 250 // usec (target clock >= 16 KHz) +#define SCK_MAX 250 // usec (target clock >= 16 kHz) #define SCK_DEFAULT 10 // usec (target clock >= 0.4 MHz) // How much data, max, do we want to send in one USB packet?