v1.32.43 Bug fixes (#5)

* v1.32.43: Disabling actions that are rarely performed

* v1.32.43: Added annotations.

* v1.32.43: SW0 interrupt division and LOCK device related

Author: askn37

hex/updi4avr-usb/AVR64DU32_CNANO.hex

@@ -52,13 +52,20 @@
  *                      | VUSB - |6    9| - PC3 - LED0
  *  for Application USB |   DM - |7    8| - DP  - for Application USB
  *                               +------+
+ * 
+ * - If CONFIG_SYS_SW0_ALT_14P is enabled, the pin definitions go to:
+ * 
+ *                PF6 - nRST
+ *                PD7 - VBD
+ *                PD6 - SW0
+ *               (DEBUG is Disable)
  */
 
 /*
  * HAL_BAREMETAL_20P: The AVR32-16DU20 has the following limitations:
  * 
- * - The following I/O signal cannot be used: DSR, CTS, RI, DCD, nRST.
- * - When using DEBUG-COM port, the following control signals are not available: DTR, VBD.
+ * - The following I/O signal cannot be used: DSR, RI, DCD.
+ * - When using DEBUG-COM port, the following control signals are not available: RTS, VBD.
  * 
  *                                          AVR32-16DU20
  *                                            +------+
@@ -73,6 +80,14 @@
  *                               HVSL - PA5 - |9   12| - VUSB |
  *                               LED0 - PA6 - |10  11| - PA7 - HVSW
  *                                            +------+
+ * 
+ * - If CONFIG_VCP_RS232C_ENABLE is disabled, the pin definitions go to:
+ * 
+ *                PF6 - nRST
+ *                PD7 - DBG-RxD or N.C.
+ *                PD6 - DBG-TxD or N.C.
+ *                PD5 - SW0
+ *                PD4 - VBD
  */
 
 /*
@@ -212,7 +227,7 @@
  * Columns: HW_VER, FW_MAJOR, FW_MINOR, FW_RELL, FW_RELH (all 1-byte decimal)
  */
 
-#define CONFIG_SYS_FWVER { 0, 1, 32, 42, 0 }
+#define CONFIG_SYS_FWVER { 0, 1, 32, 43, 0 }
 
 /*
  * For CNANO, you can change the detection of SW0 to PIN_PF5.
@@ -225,6 +240,14 @@
 
 // #define CONFIG_SYS_SW0_ALT_CNANO
 
+/*
+ * For HAL_BAREMETAL_14P you can change SW0 to PD6.
+ *
+ * This will disable DEBUG and replace PF6 with nRST.
+ */
+
+// #define CONFIG_SYS_SW0_ALT_14P
+
 /*** CONFIG_USB ***/
 
 /*
@@ -411,6 +434,42 @@
   #endif
 #endif
 
+/*** To override the default value at the CLI level: ***/
+
+#ifdef CONFIG_USB_VDETECT_DISABLE
+  #undef CONFIG_USB_VDETECT
+#endif
+#ifdef CONFIG_VCP_DTR_RESET_DISABLE
+  #undef CONFIG_VCP_DTR_RESET
+#endif
+#ifdef CONFIG_VCP_RS232C_DISABLE
+  #undef CONFIG_VCP_RS232C_ENABLE
+#endif
+#ifdef CONFIG_VCP_CTS_DISABLE
+  #undef CONFIG_VCP_CTS_ENABLE
+#endif
+#ifdef CONFIG_VCP_INTERRUPT_SUPPRT_DISABLE
+  #undef CONFIG_VCP_INTERRUPT_SUPPRT
+#endif
+#ifdef CONFIG_VCP_TXD_ODM_DISABLE
+  #undef CONFIG_VCP_TXD_ODM
+#endif
+#ifdef CONFIG_VCP_9BIT_SUPPORT_DISABLE
+  #undef CONFIG_VCP_9BIT_SUPPORT
+#endif
+#ifdef CONFIG_HVCTRL_ENABLE_DISABLE
+  #undef CONFIG_HVCTRL_ENABLE
+#endif
+#ifdef CONFIG_HVCTRL_POWER_DISABLE
+  #undef CONFIG_HVCTRL_POWER_ENABLE
+#endif
+#ifdef CONFIG_PGM_TPI_DISABLE
+  #undef CONFIG_PGM_TPI_ENABLE
+#endif
+#ifdef CONFIG_PGM_PDI_DISABLE
+  #undef CONFIG_PGM_PDI_ENABLE
+#endif
+
 /*** Note: The pin numbers of VCP-DCD,DSR,RI are fixed as PIN_PD0,1,3. ***/
 
 #if (CONFIG_HAL_TYPE == HAL_BAREMETAL_14P)
@@ -422,14 +481,20 @@
   #define PIN_PG_TDAT         PIN_USART0_TXD_ALT3
   #define PIN_PG_TRST         PIN_USART0_RXD_ALT3
   #define PIN_SYS_LED         PIN_PC3      /* PIN_LUT1_OUT */
-  #define PIN_SYS_SW0         PIN_PF6
   #undef CONFIG_VCP_CTS_ENABLE
   #undef CONFIG_PGM_TPI_ENABLE
   #undef CONFIG_HVCTRL_ENABLE
   #undef CONFIG_HVCTRL_POWER_ENABLE
-  #if !defined(DEBUG)
+  #ifdef CONFIG_SYS_SW0_ALT_14P
+    #undef DEBUG
     #define PIN_USB_VDETECT   PIN_PD7
-    #define PIN_VCP_DTR       PIN_PD6
+    #define PIN_SYS_SW0       PIN_PD6
+  #else
+    #define PIN_SYS_SW0       PIN_PF6
+    #if !defined(DEBUG)
+      #define PIN_USB_VDETECT PIN_PD7
+      #define PIN_VCP_DTR     PIN_PD6
+    #endif
   #endif
 #else
   #define PORTMUX_USART_VCP   (PORTMUX_USART0_ALT2_gc    | PORTMUX_USART1_ALT2_gc)
@@ -444,13 +509,18 @@
   #define PIN_HV_SELECT       PIN_PA5
   #define PIN_HV_CHGPUMP      PIN_PA4      /* PIN_TCA0_WO4 */
   #if (CONFIG_HAL_TYPE == HAL_BAREMETAL_20P)
-    #define PIN_SYS_SW0       PIN_PF6
-    #if !defined(DEBUG)
-      #define PIN_USB_VDETECT PIN_PD7
-      #define PIN_VCP_RTS     PIN_PD6
+    #ifdef CONFIG_VCP_RS232C_ENABLE
+      #if !defined(DEBUG)
+        #define PIN_USB_VDETECT PIN_PD7
+        #define PIN_VCP_RTS     PIN_PD6
+      #endif
+      #define PIN_SYS_SW0     PIN_PF6
+      #define PIN_VCP_DTR     PIN_PD5
+      #define PIN_VCP_CTS     PIN_PD4
+    #else
+      #define PIN_SYS_SW0     PIN_PD5
+      #define PIN_USB_VDETECT PIN_PD4
     #endif
-    #define PIN_VCP_DTR       PIN_PD5
-    #define PIN_VCP_CTS       PIN_PD4
     #define PIN_HV_FEEDBACK   PIN_PC3     /* PIN_AC0_AINP4 */
     #define PIN_SYS_LED0      PIN_PA6 /* PIN_LUT0_OUT_ALT1 */
   #elif (CONFIG_HAL_TYPE == HAL_BAREMETAL_28P)
@@ -477,7 +547,7 @@
     #define PIN_HV_FEEDBACK   PIN_PC3     /* PIN_AC0_AINP4 */
     #define PIN_SYS_LED0      PIN_PA6 /* PIN_LUT0_OUT_ALT1 */
   #else /* CNANO */
-    #if defined(CONFIG_SYS_SW0_ALT_CNANO)
+    #ifdef CONFIG_SYS_SW0_ALT_CNANO
       #define PIN_SYS_SW0     PIN_PF5
     #else
       #define PIN_SYS_SW0     PIN_PF6

hex/updi4avr-usb/AVR64DU32_CNANO.lst

@@ -186,11 +186,13 @@ namespace JTAG {
       }
       else if (_section == 1) {     /* SET_GET_CTXT_PHYSICAL */
         if (_index == 0 || _index == 0x20) {  /* PARM3_VTARGET */
+          /* Called with `-xvtarget` HAS_VTARG_READ */
           _vtarget = SYS::get_vdd();
           D1PRINTF(" VTARGET=%d\r\n", _vtarget);
           packet.in.wValue = _vtarget;
         }
         else {                      /* PARM3_ANALOG_XXXX */
+          /* Called with PowerDebugger HAS_VTARG_ADJ */
           D1PRINTF(" PHYSICAL=%02X:%02X\r\n", _index, _length);
           memcpy_P(&packet.in.data[0], &jtag_physical[_index & 7], _length);
         }
@@ -229,7 +231,7 @@ namespace JTAG {
       D1PRINTF(" AVR_SET_PARAM=%02X:%02X:%02X:%02X\r\n", _section, _index, _length, _data);
       if (_section == 0) {          /* SET_GET_CTXT_CONFIG */
         if (_index == 0x10) {       /* EDBG_CONTROL_TARGET_POWER */
-          /* Called with `-xvtarget_switch=0,1` */
+          /* Called with `-xvtarget_switch=0,1` HAS_VTARG_SWITCH */
           D1PRINTF(" TARGET_POWER=%02X\r\n", _data);
           _jtag_vpow = _data;       /* 0,1 */
   #if defined(PIN_HV_POWER)
@@ -246,6 +248,7 @@ namespace JTAG {
       D1PRINTF(" AVR_GET_PARAM=%02X:%02X:%02X\r\n", _section, _index, _length);
       if (_section == 0) {          /* SET_GET_CTXT_CONFIG */
         if (_index == 0x10) {       /* EDBG_CONTROL_TARGET_POWER */
+          /* Called with `-xvtarget_switch` HAS_VTARG_SWITCH */
           D1PRINTF(" TARGET_POWER=%02X\r\n", _jtag_vpow);
           packet.in.data[0] = _jtag_vpow;
         }
@@ -314,6 +317,8 @@ namespace JTAG {
             D2PRINTF("    lockbits_base=%04X\r\n", Device_Descriptor.UPDI.lockbits_base);
             D2PRINTF("     address_mode=%02X\r\n", Device_Descriptor.UPDI.address_mode);
             D2PRINTF("   hvupdi_variant=%02X\r\n", Device_Descriptor.UPDI.hvupdi_variant);
+            /* Even with all this, the BOOTROW information is still undefined! */
+            /* Re-analysis of newer ICE FW is needed! */
           }
           /* STUB: And other descriptors. */
   #elif defined(DEBUG)
@@ -325,11 +330,12 @@ namespace JTAG {
       }
       else if (_section == 3) {     /* SET_GET_CTXT_OPTIONS */
         if (_index == 6) {          /* PARM3_OPT_12V_UPDI_ENABLE */
-          /* Called with `-xhvupdi` */
+          /* Called with `-xhvupdi` hvupdi_support */
           D1PRINTF(" HVCTRLEN=%02X\r\n", _data);
           _jtag_hvctrl = _data;     /* 1:ENABLE */
         }
         else if (_index == 7) {     /* PARM3_OPT_CHIP_ERASE_TO_ENTER */
+          /* This is a stub that shows no signs of being used. */
           /* force unlock chip-erase */
           /* This might be called having no `-e` or `-D`, but having `-F`. */
           D1PRINTF(" UNLOCKEN=%02X\r\n", _data);
@@ -348,10 +354,12 @@ namespace JTAG {
       }
       else if (_section == 1) {     /* SET_GET_CTXT_PHYSICAL */
         if (_index == 0) {          /* PARM3_CONNECTION */
+          /* This is a stub that is called but not used. */
           D1PRINTF(" CONNECTION=%02X\r\n", _jtag_conn);
           packet.in.data[0] = _jtag_conn;
         }
         else if (_index == 0x31) {  /* PARM3_CLK_XMEGA_PDI */
+          /* `-B <num>khz` : "khz" units are required. */
           D1PRINTF(" XCLK=%d\r\n", _xclk);
           packet.in.wValue = _xclk;
         }
@@ -360,7 +368,7 @@ namespace JTAG {
       _rspsize = _length + 1;
     }
   #ifdef _Not_yet_implemented_stub_
-    else if (_jtag_arch == 0x01) _rspsize = DWIRE:jtag_scope_tiny();    /* dWire? */
+    else if (_jtag_arch == 0x01) _rspsize = DWIRE::jtag_scope_tiny();   /* dWire? */
     else if (_jtag_arch == 0x02) _rspsize = MEGA::jtag_scope_mega();    /* MEGA */
     else if (_jtag_arch == 0x03) _rspsize = XMEGA::jtag_scope_xmega();  /* XMEGA */
   #endif
@@ -381,7 +389,7 @@ namespace JTAG {
       packet.out.index);
     if      (_scope == 0x01) _rspsize = jtag_scope_general();       /* SCOPE_GENERAL */
   #ifdef _Not_yet_implemented_stub_
-    else if (_scope == 0x00) _rspsize = jtag_scope_info();          /* SCOPE_INFO */ /* Not used with HID */
+    else if (_scope == 0x00) _rspsize = jtag_scope_info();          /* SCOPE_INFO */ /* Not used with EDBG/CMSIS-DAP type */
     else if (_scope == 0x11) _rspsize = ISP::jtag_scope_isp();      /* SCOPE_AVR_ISP */
     else if (_scope == 0x13) _rspsize = AVR32::jtag_scope_avr32();  /* SCOPE_AVR32 */
   #endif

hex/updi4avr-usb/AVR64DU32_CNANO_DEBUG1.hex

@@ -96,13 +96,15 @@ int main (void) {
   loop_until_bit_is_clear(WDT_STATUS, WDT_SYNCBUSY_bp);
   _PROTECTED_WRITE(WDT_CTRLA, WDT_PERIOD_1KCLK_gc);
 
-  VPORTA_INTFLAGS = ~0;
-  VPORTC_INTFLAGS = ~0;
-  VPORTD_INTFLAGS = ~0;
-  VPORTF_INTFLAGS = ~0;
+  #if defined(PIN_SYS_SW0)
+  /* Clear the dirty flag before enabling interrupts. */
+  vportRegister(PIN_SYS_SW0).INTFLAGS = ~0;
+  CCL_INTFLAGS = ~0;
+  #endif
   interrupts();
 
   #if !defined(PIN_USB_VDETECT)
+  /* If you do not use VBD, insert the shortest possible delay instead. */
   delay_millis(250);
   USB::setup_device(true);
   #else
@@ -118,12 +120,20 @@ int main (void) {
     USB::handling_bus_events();
     if (USB::is_ep_setup()) USB::handling_control_transactions();
 
-    if      (bit_is_set(GPCONF, GPCONF_FAL_bp)) SYS::reset_enter();
-    else if (bit_is_set(GPCONF, GPCONF_RIS_bp)) SYS::reset_leave();
+    /* If SW0 was used, work here. */
+    if (bit_is_clear(PGCONF, PGCONF_UPDI_bp)) {
+      if      (bit_is_set(GPCONF, GPCONF_FAL_bp)) SYS::reset_enter();
+      else if (bit_is_set(GPCONF, GPCONF_RIS_bp)) SYS::reset_leave();
+    }
 
+    /* If the USB port is not open, go back to the loop beginning. */
     if (bit_is_clear(GPCONF, GPCONF_USB_bp)) continue;
 
     /*** CMSIS-DAP VCP transceiver ***/
+    /* The AVR series requires at least 100 clocks to service   */
+    /* an interrupt. At the maximum speed of the VCP-RxD, one   */
+    /* character arrives every 400 clocks on a 20MHz reference. */
+    /* So we avoid using interrupts here and use polling to gain speed. */
   #if defined(CONFIG_VCP_9BIT_SUPPORT)
     if (bit_is_set(GPCONF, GPCONF_VCP_bp)) usart_transmitter();
   #else

hex/updi4avr-usb/AVR64DU32_CNANO_DEBUG1.lst

@@ -105,14 +105,23 @@ namespace SYS {
 
   #if defined(PIN_SYS_SW0)
     /* SW0 detection: Input negative logic. */
-    pinControlRegister(PIN_SYS_SW0) = PORT_PULLUPEN_bm | PORT_ISC_BOTHEDGES_gc;
+    /* Use CCL in conjunction to separate the falling edge and rising edge interrupts. */
+    /* For the falling edge, use the CCL filter function to remove chattering noise.   */
+    pinControlRegister(PIN_SYS_SW0) = PORT_PULLUPEN_bm | PORT_ISC_RISING_gc;
+    portRegister(PIN_SYS_SW0).EVGENCTRLA = pinPosition(PIN_SYS_SW0);
+    #if (PIN_SYS_SW0 & 0xF0) == 176
+    EVSYS_CHANNEL3 = EVSYS_CHANNEL_PORTF_EVGEN0_gc;
+    #elif (PIN_SYS_SW0 & 0xF0) == 112
+    EVSYS_CHANNEL3 = EVSYS_CHANNEL_PORTD_EVGEN0_gc;
+    #elif (PIN_SYS_SW0 & 0xF0) == 16
+    EVSYS_CHANNEL3 = EVSYS_CHANNEL_PORTA_EVGEN0_gc;
+    #endif
   #endif
 
     /*
      * GPIO - LED
      */
 
-  #undef LED_CCL
   #if (CONFIG_HAL_TYPE == HAL_BAREMETAL_14P)
     /* PORTMUX LUT0OUT -> PIN_PC3 */
     /* TRUTH0: 001 010 is ON */
@@ -137,6 +146,15 @@ namespace SYS {
     CCL_LUT1CTRLA = CCL_ENABLE_bm | CCL_OUTEN_bm; /* PIN_PA6 */
   #endif
 
+  #if defined(PIN_SYS_SW0)
+    /* SW0 -> CH3 -> LUT3OUT -> INTFLAGS:INT3 */
+    EVSYS_USERCCLLUT3A = EVSYS_USER_CHANNEL3_gc;
+    CCL_TRUTH3    = CCL_TRUTH_1_bm;
+    CCL_LUT3CTRLB = CCL_INSEL0_EVENTA_gc;
+    CCL_LUT3CTRLA = CCL_ENABLE_bm | CCL_FILTSEL_FILTER_gc;
+    CCL_INTCTRL0  = CCL_INTMODE3_FALLING_gc;
+  #endif
+
     /*** CCL enable ***/
     /* One of the CCL's is the LED output control. */
     CCL_CTRLA = CCL_RUNSTDBY_bm | CCL_ENABLE_bm;
@@ -234,7 +252,6 @@ namespace SYS {
    * May be called multiple times due to chattering.
    */
   void reset_enter (void) {
-    if (bit_is_set(PGCONF, PGCONF_UPDI_bp)) return;
     LED_Blink();
     if (_jtag_arch == 5) {
       /* 
@@ -256,7 +273,6 @@ namespace SYS {
    * but if the USB is stopped, it will reboot at the end.
    */
   void reset_leave (void) {
-    if (bit_is_set(PGCONF, PGCONF_UPDI_bp)) return;
     if (_jtag_arch == 5) {
       _updi_bitmap[10] = 0x00; /* SYSRUN */
       send_bitmap(_updi_bitmap, sizeof(_updi_bitmap) * 8);
@@ -268,11 +284,11 @@ namespace SYS {
   #endif
     D1PRINTF("<RST:OUT>\r\n");
     if (bit_is_set(GPCONF, GPCONF_USB_bp))
-      LED_HeartBeat();
+      LED_HeartBeat();  /* The USB is ready. */
     else if (!USB0_ADDR)
-      reboot();
+      reboot();         /* USB disconnected, System reboot. */
     else
-      LED_Flash();
+      LED_Flash();      /* USB is not yet enabled. */
     bit_clear(GPCONF, GPCONF_FAL_bp);
     bit_clear(GPCONF, GPCONF_RIS_bp);
   }
@@ -332,15 +348,17 @@ namespace SYS {
 };
 
 #if defined(PIN_SYS_SW0)
+/* If the level is not maintained for a sufficient period of time it will not function properly. */
 ISR(portIntrruptVector(PIN_SYS_SW0)) {
+  /* SW0 Raising Interrupt */
   vportRegister(PIN_SYS_SW0).INTFLAGS = ~0;
-  /* If the level is not maintained for a sufficient period of time it will not function properly. */
-  if (bit_is_clear(PGCONF, PGCONF_UPDI_bp)) {
-    if (digitalReadMacro(PIN_SYS_SW0))
-      bit_set(GPCONF, GPCONF_RIS_bp);
-    else
-      bit_set(GPCONF, GPCONF_FAL_bp);
-  }
+  bit_set(GPCONF, GPCONF_RIS_bp);
+}
+
+ISR(CCL_CCL_vect) {
+  /* SW0 Falling Intrrupt */
+  CCL_INTFLAGS = ~0;
+  bit_set(GPCONF, GPCONF_FAL_bp);
 }
 #endif