More help text

Author: MCUdude

src/avrdude.conf.in

@@ -3244,7 +3244,7 @@ programmer # pickit_basic
     desc                   = "MPLAB(R) PICkit Basic in JTAG Mode";
     type                   = "pickit5";
     prog_modes             = PM_JTAG | PM_XMEGAJTAG;
-#   extra_features         = HAS_VTARG_READ | HAS_BITCLOCK_ADJ; # At the time of testing, HAS_VTARG_READ was not working
+    extra_features         = HAS_BITCLOCK_ADJ; # HAS_VTARG_READ was not working yet
     connection_type        = usb;
     usbvid                 = 0x04d8;
     usbpid                 = 0x9055;    # PK Basic

src/jtag3.c

@@ -1071,7 +1071,7 @@ static int jtag3_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
       else
         my.set_sck = jtag3_set_sck_mega_jtag;
     }
-    if(pgm->bitclock != 0.0 && my.set_sck != NULL) {
+    if(pgm->bitclock && my.set_sck != NULL) {
       unsigned int clock = 1E-3/pgm->bitclock;  // kHz
 
       pmsg_notice2("%s(): trying to set JTAG clock to %u kHz\n", __func__, clock);

src/pickit2.c

@@ -169,6 +169,8 @@ static void pickit2_teardown(PROGRAMMER *pgm) {
 }
 
 static int pickit2_open(PROGRAMMER *pgm, const char *port) {
+  if(pgm->bitclock && !(pgm->extra_features & HAS_BITCLOCK_ADJ))
+    pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
 
 #ifdef WIN32
   my.usb_handle = open_hid(PICKIT2_VID, PICKIT2_PID);

src/serprog.c

@@ -165,6 +165,9 @@ static bool is_serprog_cmd_supported(const unsigned char *cmd_bitmap, unsigned c
 // Programmer lifecycle handlers
 
 static int serprog_open(PROGRAMMER *pgm, const char *port) {
+  if(pgm->bitclock && !(pgm->extra_features & HAS_BITCLOCK_ADJ))
+    pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
+
   union pinfo pinfo;
   pgm->port = port;
   pinfo.serialinfo.baud = pgm->baudrate? pgm->baudrate: 115200;
@@ -287,8 +290,8 @@ static int serprog_initialize(const PROGRAMMER *pgm, const AVRPART *part) {
 
   // Set SPI clock frequency
   if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-    pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  else if(is_serprog_cmd_supported(my.cmd_bitmap, S_CMD_S_SPI_FREQ)) {
+    pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
+  if(is_serprog_cmd_supported(my.cmd_bitmap, S_CMD_S_SPI_FREQ)) {
     memset(buf, 0, sizeof buf);
     uint32_t frequency = pgm->bitclock > 0? 1/pgm->bitclock: part->factory_fcpu > 0? part->factory_fcpu/4: 250000;
 

src/stk500v2.c

@@ -2213,7 +2213,9 @@ static int stk600_open(PROGRAMMER *pgm, const char *port) {
   if(stk500v2_drain(pgm, 0) < 0 || stk500v2_getsync(pgm) < 0 || stk500v2_drain(pgm, 0) < 0)
     return -1;
 
-  if(pgm->bitclock != 0.0) {
+  if(pgm->bitclock) {
+    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
+      pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
     if(pgm->set_sck_period(pgm, pgm->bitclock) != 0)
       return -1;
   }
@@ -3933,7 +3935,9 @@ static int stk500v2_jtagmkII_open(PROGRAMMER *pgm, const char *port) {
 
   my.pgmtype = PGMTYPE_JTAGICE_MKII;
 
-  if(pgm->bitclock != 0.0) {
+  if(pgm->bitclock) {
+    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
+      pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
     if(pgm->set_sck_period(pgm, pgm->bitclock) != 0)
       return -1;
   }
@@ -4028,7 +4032,9 @@ static int stk500v2_dragon_isp_open(PROGRAMMER *pgm, const char *port) {
 
   my.pgmtype = PGMTYPE_JTAGICE_MKII;
 
-  if(pgm->bitclock != 0.0) {
+  if(pgm->bitclock) {
+    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
+      pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
     if(pgm->set_sck_period(pgm, pgm->bitclock) != 0)
       return -1;
   }
@@ -4099,7 +4105,9 @@ static int stk500v2_dragon_hv_open(PROGRAMMER *pgm, const char *port) {
   pgm_free(pgmcp);
   my.pgmtype = PGMTYPE_JTAGICE_MKII;
 
-  if(pgm->bitclock != 0.0) {
+  if(pgm->bitclock) {
+    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
+      pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
     if(pgm->set_sck_period(pgm, pgm->bitclock) != 0)
       return -1;
   }
@@ -4136,7 +4144,9 @@ static int stk500v2_jtag3_open(PROGRAMMER *pgm, const char *port) {
 
   my.pgmtype = PGMTYPE_JTAGICE3;
 
-  if(pgm->bitclock != 0.0) {
+  if(pgm->bitclock) {
+    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
+      pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
     if(pgm->set_sck_period(pgm, pgm->bitclock) != 0)
       return -1;
   }

src/usbasp.c

@@ -622,6 +622,9 @@ static int usbOpenDevice(const PROGRAMMER *pgm, usb_dev_handle ** device, int ve
 static int usbasp_open(PROGRAMMER *pgm, const char *port) {
   pmsg_debug("usbasp_open(\"%s\")\n", port);
 
+  if(pgm->bitclock && !(pgm->extra_features & HAS_BITCLOCK_ADJ))
+    pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
+
   // usb_init will be done in usbOpenDevice
   LNODEID usbpid = lfirst(pgm->usbpid);
   int pid, vid;

src/usbtiny.c

@@ -286,6 +286,9 @@ static int usbtiny_open(PROGRAMMER *pgm, const char *name) {
   char *dev_name = NULL;
   int vid, pid;
 
+  if(pgm->bitclock && !(pgm->extra_features & HAS_BITCLOCK_ADJ))
+    pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
+
   // If no -P was given or '-P usb' was given
   if(str_eq(name, "usb"))
     name = NULL;