Skip to content

Commit ebc2dda

Browse files
committed
Inform which option is used instead which one is ignored
1 parent 0f19335 commit ebc2dda

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/avrftdi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ static int avrftdi_open(PROGRAMMER *pgm, const char *port) {
707707
pmsg_warning("setting bitclock despite HAS_BITCLOCK_ADJ missing in pgm->extra_features\n");
708708

709709
if(pgm->baudrate && pgm->bitclock && (int) (1.0/pgm->bitclock) != pgm->baudrate)
710-
pmsg_warning("both -b baudrate and -B bitrate set; ignoring -B\n");
710+
pmsg_warning("both -b baudrate and -B bitrate set; using -b\n");
711711

712712
set_frequency(pdata,
713713
pgm->baudrate? pgm->baudrate:

src/ft245r.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ static int ft245r_set_bitclock(const PROGRAMMER *pgm) {
363363
pmsg_warning("setting bitclock despite HAS_BITCLOCK_ADJ missing in pgm->extra_features\n");
364364

365365
if(pgm->baudrate && pgm->bitclock && (int) (1.0/pgm->bitclock) != pgm->baudrate)
366-
pmsg_warning("both -b baudrate and -B bitrate set; ignoring -b\n");
366+
pmsg_warning("both -b baudrate and -B bitrate set; using -B\n");
367367

368368
// 150000 should work for all ftdi chips and the internal clock of 1 MHz
369369
rate = pgm->bitclock? (int) (1.0/pgm->bitclock): pgm->baudrate? pgm->baudrate: 150000;

src/pickit2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ static int pickit2_open(PROGRAMMER *pgm, const char *port) {
204204
#endif
205205

206206
if(pgm->ispdelay > 0 && pgm->bitclock > 0.0)
207-
pmsg_warning("both -i delay and -B bitrate set; ignoring -B\n");
207+
pmsg_warning("both -i delay and -B bitrate set; using -i\n");
208208

209209
if(pgm->ispdelay > 0) {
210210
my.clock_period = MIN(pgm->ispdelay, 255);

0 commit comments

Comments
 (0)