Some updates

Author: wagiminator

README.md

@@ -20,8 +20,8 @@ The CH55x-based picoISP is a simple and cheap USB-based in-system programmer (IS
 
 ![picoISP_pic1.jpg](https://raw.githubusercontent.com/wagiminator/AVR-Programmer/master/picoISP_Programmer/documentation/picoISP_pic1.jpg)
 
-## [picoAVR ISP + UPDI Programmer - CH552G](https://github.com/wagiminator/AVR-Programmer/tree/master/picoAVR_Programmer)
-The CH55x-based picoAVR is an ISP and UPDI combo programmer for AVR microcontrollers compatible with the USBtinyISP and SerialUPDI. It works fine with the Arduino IDE (Tools -> Programmer -> USBtinyISP / Tools -> Programmer -> SerialUPDI). This combo programmer includes a target voltage selection switch that allows users to choose between 5V and 3.3V for their project needs.
+## [picoAVR ISP + TPI + UPDI Programmer - CH552G](https://github.com/wagiminator/AVR-Programmer/tree/master/picoAVR_Programmer)
+The CH55x-based picoAVR is an ISP, TPI, and UPDI combo programmer for AVR microcontrollers compatible with the USBasp and SerialUPDI. It works fine with the Arduino IDE (Tools -> Programmer -> USBasp / Tools -> Programmer -> SerialUPDI). This combo programmer includes a target voltage selection switch that allows users to choose between 5V and 3.3V for their project needs.
 
 ![picoAVR_pic1.jpg](https://raw.githubusercontent.com/wagiminator/AVR-Programmer/master/picoAVR_Programmer/documentation/picoAVR_pic1.jpg)
 

picoAVR_Programmer/README.md

@@ -1,5 +1,5 @@
-# picoAVR ISP and UPDI Combo Programmer for AVR MCU based on CH552G
-The CH55x-based picoAVR is an ISP and UPDI combo programmer for AVR microcontrollers compatible with the USBtinyISP and SerialUPDI. It works fine with the Arduino IDE (Tools -> Programmer -> USBtinyISP / Tools -> Programmer -> SerialUPDI). This combo programmer includes a target voltage selection switch that allows users to choose between 5V and 3.3V for their project needs. The USBtinyISP part of the firmware is based on Dick Streefland's and Ladyada's original implementation and DeqingSun's CH55x conversion.
+# picoAVR - ISP / TPI / UPDI Combo Programmer for AVR MCU based on CH552G
+The CH55x-based picoAVR is an ISP, TPI, and UPDI combo programmer for AVR microcontrollers compatible with the USBasp and SerialUPDI. It works fine with the Arduino IDE (Tools -> Programmer -> USBasp / Tools -> Programmer -> SerialUPDI). This combo programmer includes a target voltage selection switch that allows users to choose between 5V and 3.3V for their project needs.
 
 ![picoAVR_pic1.jpg](https://raw.githubusercontent.com/wagiminator/AVR-Programmer/master/picoAVR_Programmer/documentation/picoAVR_pic1.jpg)
 
@@ -49,32 +49,33 @@ sudo pip install pyusb
 Install the [Arduino IDE](https://www.arduino.cc/en/software) if you haven't already. Install the [CH55xduino](https://github.com/DeqingSun/ch55xduino) package by following the instructions on the website.
 
 ### Compiling and Uploading Firmware
+- Adjust the firmware parameters in src/config.h if necessary.
 - Copy the .ino and .c files as well as the /src folder together into one folder and name it picoavr. 
 - Open the .ino file in the Arduino IDE.
 - Go to **Tools -> Board -> CH55x Boards** and select **CH552 Board**.
 - Go to **Tools** and choose the following board options:
   - **Clock Source:**   16 MHz (internal)
   - **Upload Method:**  USB
-  - **USB Settings:**   USER CODE /w 266B USB RAM
+  - **USB Settings:**   USER CODE /w 0B USB RAM
 - Connect the board and make sure the CH55x is in bootloader mode. 
 - Click **Upload**.
 
 ## Installing Drivers for the picoAVR
-On Linux, you don't need to install a driver. Windows users may need to install the [usbtiny driver](https://learn.adafruit.com/usbtinyisp). For Windows 10/11, you can also use the [Zadig Tool](https://zadig.akeo.ie/) to install the correct driver. Click on "Options" -> "List all devices" and select the USBtiny. Then install the libusb-win32 driver. To do this, the picoAVR must be connected to your PC. You can also use the Zadig Tool to install the CDC driver for the CDC Serial Interface.
+On Linux, you don't need to install a driver. The implementation includes Windows Compatible ID (WCID) code for automated driver installation on Windows. If this doesn't work, Windows users may need to install a driver manually using the Zadig tool (https://zadig.akeo.ie/). Click on "Options" -> "List all devices" and select the USBasp. Then install the libusb-win32 driver. Now select the SerialUPDI and install the CDC driver. To do this, the picoAVR must be connected to your PC.
 
 # Operating Instructions
 - Select the programming voltage (3.3V or 5V) with the voltage selection switch.
-- Plug the picoAVR into a USB port on your PC, it should be identified as a USBtinyISP with an additional CDC serial interface.
+- Plug the picoAVR into a USB port on your PC, it should be identified as a USBasp with an additional CDC COM port.
 - Connect the picoAVR to the target board via the 6-pin ICSP connector or the 3-pin UPDI connector.  
-- The picoAVR should work with any IDE or programming software that supports the USBtinyISP and/or SerialUPDI programmer.
+- The picoAVR should work with any IDE or programming software that supports the USBasp and/or SerialUPDI programmer.
 
 # References, Links and Notes
 1. [EasyEDA Design Files](https://oshwlab.com/wagiminator)
 2. [WCH: CH552 Datasheet](http://www.wch-ic.com/downloads/CH552DS1_PDF.html)
 3. [SDCC Compiler](https://sdcc.sourceforge.net/)
 4. [Blinkinlabs: CH55x SDK for SDCC](https://github.com/Blinkinlabs/ch554_sdcc)
-5. [Dick Streefland: USBtiny](https://dicks.home.xs4all.nl/avr/usbtiny/)
-6. [Ladyada: USBtinyISP](https://learn.adafruit.com/usbtinyisp)
+5. [Thomas Fischl: USBasp](https://www.fischl.de/usbasp/)
+6. [Ralph Doncaster: USBasp](https://github.com/nerdralph/usbasp)
 7. [Deqing Sun: CH55xduino](https://github.com/DeqingSun/ch55xduino)
 
 ![picoAVR_pic4.jpg](https://raw.githubusercontent.com/wagiminator/AVR-Programmer/master/picoAVR_Programmer/documentation/picoAVR_pic4.jpg)

picoAVR_Programmer/software/makefile

@@ -7,28 +7,28 @@
 # Type "make help" in the command line.
 # ===================================================================================
 
-# Input and Output File Names
-SKETCH     = picoavr.c
+# Files and Folders
+MAINFILE   = picoavr.c
 TARGET     = picoavr
 INCLUDE    = src
+TOOLS      = tools
 
 # Microcontroller Settings
 FREQ_SYS   = 16000000
-XRAM_LOC   = 0x0100
-XRAM_SIZE  = 0x0300
+XRAM_LOC   = 0x0000
+XRAM_SIZE  = 0x0400
 CODE_SIZE  = 0x3800
 
 # Toolchain
 CC         = sdcc
 OBJCOPY    = objcopy
 PACK_HEX   = packihx
-WCHISP    ?= python3 tools/chprog.py
+ISPTOOL   ?= python3 $(TOOLS)/chprog.py
 
 # Compiler Flags
-CFLAGS  = -mmcs51 --model-small --no-xinit-opt
+CFLAGS  = -mmcs51 --model-small --no-xinit-opt -DF_CPU=$(FREQ_SYS) -I$(INCLUDE) -I.
 CFLAGS += --xram-size $(XRAM_SIZE) --xram-loc $(XRAM_LOC) --code-size $(CODE_SIZE)
-CFLAGS += -I$(INCLUDE) -DF_CPU=$(FREQ_SYS)
-CFILES  = $(SKETCH) $(wildcard $(INCLUDE)/*.c)
+CFILES  = $(MAINFILE) $(wildcard $(INCLUDE)/*.c)
 RFILES  = $(CFILES:.c=.rel)
 CLEAN   = rm -f *.ihx *.lk *.map *.mem *.lst *.rel *.rst *.sym *.asm *.adb
 
@@ -59,7 +59,7 @@ $(TARGET).bin: $(TARGET).ihx
 
 flash: $(TARGET).bin size removetemp
 	@echo "Uploading to CH55x ..."
-	@$(WCHISP) $(TARGET).bin
+	@$(ISPTOOL) $(TARGET).bin
 
 all: $(TARGET).bin $(TARGET).hex size
 

picoAVR_Programmer/software/picoavr.bin

@@ -1,28 +1,28 @@
 // ===================================================================================
-// Project:   picoAVR ISP + UPDI Programmer based on CH551, CH552, CH554
-// Version:   v1.3
+// Project:   picoAVR ISP + TPI + UPDI Programmer based on CH551, CH552, CH554
+// Version:   v1.4
 // Year:      2023
 // Author:    Stefan Wagner
 // Github:    https://github.com/wagiminator
 // EasyEDA:   https://easyeda.com/wagiminator
 // License:   http://creativecommons.org/licenses/by-sa/3.0/
 // ===================================================================================
 //
+// !!! THIS FIRMWARE IS STILL IN DEVELOPMENT !!!
+//
 // Description:
 // ------------
-// The CH55x-based picoAVR is an ISP and UPDI programmer for AVR microcontrollers 
-// compatible with the USBtinyISP and SerialUPDI. It works fine with the Arduino IDE 
-// (Tools -> Programmer -> USBtinyISP / Tools -> Programmer -> SerialUPDI). The
-// USBtinyISP part of the firmware is based on Dick Streefland's and Ladyada's 
-// original implementation and DeqingSun's CH55x conversion.
+// The CH55x-based picoAVR is an ISP, TPI and UPDI programmer for AVR microcontrollers 
+// compatible with the USBasp and SerialUPDI. It works fine with the Arduino IDE 
+// (Tools -> Programmer -> USBasp / Tools -> Programmer -> SerialUPDI). The USBasp part
+// of the firmware is based on Thomas Fischl's original implementation for the ATmega8 
+// and Ralph Doncaster's auto-clock extension.
 //
 // References:
 // -----------
-// - Dick Streefland: https://dicks.home.xs4all.nl/avr/usbtiny/
-// - Ladyada: https://learn.adafruit.com/usbtinyisp
-// - Deqing Sun: https://github.com/DeqingSun/ch55xduino
+// - Thomas Fischl: https://www.fischl.de/usbasp/
+// - Ralph Doncaster: https://github.com/nerdralph/usbasp
 // - Blinkinlabs: https://github.com/Blinkinlabs/ch554_sdcc
-// - Ralph Doncaster: https://github.com/nerdralph/ch554_sdcc
 // - WCH Nanjing Qinheng Microelectronics: http://wch.cn
 //
 // Compilation Instructions:
@@ -41,22 +41,21 @@
 // -----------------------
 // Select the programming voltage (3.3V or 5V) with the voltage selection switch.
 // Plug the picoAVR into a USB port on your PC, it should be identified as a 
-// USBtinyISP with an additional CDC serial interface. Connect the picoAVR to the 
-// target board via the 6-pin ICSP connector or the 3-pin UPDI connector.  
-// Windows users may need to install a driver for USBtinyISP
-// (https://learn.adafruit.com/usbtinyisp) and for CDC (https://zadig.akeo.ie/).
-// The picoAVR should work with any IDE or programming software that supports the
-// USBtinyISP and/or SerialUPDI programmer.
+// USBasp with an additional CDC serial interface. Connect the picoAVR to the 
+// target board via the 6-pin ICSP connector or the 3-pin UPDI connector. 
+//
+// The implementation includes Windows Compatible ID (WCID) code for automated driver 
+// installation on Windows. If this doesn't work, Windows users may need to install a 
+// driver manually using the Zadig tool (https://zadig.akeo.ie/). 
+// However, functionality, especially with newer Windows versions, is not guaranteed.
 
 
 // ===================================================================================
 // Libraries, Definitions and Macros
 // ===================================================================================
 
 // Libraries
-#include "src/system.h"                     // system functions
-#include "src/delay.h"                      // delay functions
-#include "src/usb_avr.h"                    // AVR ISP and UPDI functions
+#include "src/avr.h"                        // AVR ISP and UPDI functions
 
 // Prototypes for used interrupts
 void USB_interrupt(void);
@@ -74,45 +73,52 @@ void UART_ISR(void) __interrupt(INT_NO_UART0) {
 // ===================================================================================
 void main(void) {
   // Variables
-  uint8_t databyte;
+  uint8_t  databyte;
+  uint8_t  rtsstate = 0;
+  uint32_t baudrate = 115200;
 
   // Setup
   CLK_config();                             // configure system clock
-  DLY_ms(10);                               // wait for clock to settle
-  AVR_init();                               // init AVR ISP and UPDI
-  WDT_start();                              // start watchdog
+  DLY_us(10000);                            // wait for clock to settle
+  AVR_init();                               // init programming interfaces
 
   // Loop
   while(1) {
     // ISP stuff is handled via USB interrupts.
     // We only need to take care of USB-CDC to UPDI here.
+
+    // Transfer data from USB to UPDI
     if(CDC_available()) {                   // something coming in via USB-CDC?
-      PIN_low(PIN_LED);                     // turn on LED (active low)
-      if(TH1 == 0) {                        // slow speed? -> must be UPDI BREAK
-        UPDI_break();                       // send UPDI break frame
-        CDC_write(CDC_read());              // return BREAK frame
-        CDC_flush();                        // flush OUT buffer
-      }
-      else {                                // normal data bytes?
-        // Send data bytes via UPDI and write echo to USB OUT buffer
-        while(CDC_available()) {            // repeat for all incoming bytes
-          databyte = CDC_read();            // get data byte
-          UPDI_write(databyte);             // send byte via UPDI
-          CDC_write(databyte);              // send back echo
-        }
-        CDC_flush();                        // flush OUT buffer
+      while(CDC_available()) {              // repeat for all incoming bytes
+        databyte = CDC_read();              // get data byte
+        UPDI_write(databyte);               // send byte via UPDI
+        CDC_write(databyte);                // send back echo
       }
-      PIN_high(PIN_LED);                    // turn off LED (active low)
+      CDC_flush();                          // flush OUT buffer
     }
 
-    if(UPDI_available()) {                  // something coming in via UPDI?
-      PIN_low(PIN_LED);                     // turn on LED (active low)
+    // Transfer data from UPDI to USB
+    if(UPDI_available() && CDC_getDTR()) {  // something coming in via UPDI?
       while(UPDI_available())               // repeat for all incoming bytes
         CDC_write(UPDI_read());             // write received bytes to USB OUT buffer
       CDC_flush();                          // flush USB OUT buffer
-      PIN_high(PIN_LED);                    // turn off LED (active low)
     }
 
-    WDT_reset();                            // reset watchdog
+    // Handle BAUD rate
+    if(CDC_getBAUD() != baudrate) {
+      baudrate = CDC_getBAUD();
+      UPDI_setBAUD(baudrate);
+    }
+
+    // Handle status LEDs
+    #ifdef PIN_LED_USB
+    PIN_write(PIN_LED_USB, !USB_ENUM_OK);   // control USB GOOD status LED
+    #endif
+    #ifdef PIN_LED_PRG
+    if(CDC_getRTS() != rtsstate) {
+      rtsstate = CDC_getRTS();
+      PIN_write(PIN_LED_PRG, !rtsstate);    // control PROG status LED
+    }
+    #endif
   }
 }

picoAVR_Programmer/software/picoavr.c

@@ -11,7 +11,7 @@
 //   following board options:
 //   - Clock Source:  16 MHz (internal)
 //   - Upload Method: USB
-//   - USB Settings:  USER CODE /w 266B USB RAM
+//   - USB Settings:  USER CODE /w 0B USB RAM
 // - Press BOOT button on the board and keep it pressed while connecting it via USB
 //   with your PC.
 // - Click on "Upload" immediatly afterwards.

picoAVR_Programmer/software/picoavr.ino

@@ -0,0 +1,19 @@
+// ===================================================================================
+// picoAVR Functions for CH551, CH552 and CH554                               * v1.0 *
+// ===================================================================================
+
+#pragma once
+#include <stdint.h>
+#include "config.h"
+#include "system.h"
+#include "delay.h"
+#include "gpio.h"
+#include "updi.h"
+#include "usb_asp.h"
+#include "usb_cdc.h"
+
+inline void AVR_init(void) {
+  ISP_disconnect();                       // disconnect ISP/TPI bus
+  UPDI_init();                            // setup UPDI
+  USB_init();                             // setup USB
+}

picoAVR_Programmer/software/src/avr.h

@@ -1,14 +1,17 @@
-/*--------------------------------------------------------------------------
-CH554.H
-Header file for CH554 microcontrollers.
-****************************************
+// ===================================================================================
+// Header File for CH551, CH552 and CH554 Microcontrollers                    * v1.0 *
+// ===================================================================================
+// This contains a copy of CH554.H
+/***************************************
 **  Copyright  (C)  W.ch  1999-2014   **
 **  Web:              http://wch.cn   **
-****************************************
---------------------------------------------------------------------------*/
+***************************************/
 
-#ifndef __CH554_H__
-#define __CH554_H__
+#pragma once
+#include <stdint.h>
+
+typedef unsigned char volatile __xdata    UINT8XV;
+typedef unsigned char volatile __pdata    UINT8PV;
 
 #define SBIT(name, addr, bit)  __sbit  __at(addr+bit) name
 #define SFR(name, addr)        __sfr   __at(addr) name
@@ -754,5 +757,3 @@ ASM example:
        .DB  0xA5    ;MOVX @DPTR1,A & INC DPTR1
        DJNZ R7,LOOP
 */
-
-#endif  // __CH554_H__

picoAVR_Programmer/software/src/ch554.h

@@ -1,5 +1,5 @@
 // ===================================================================================
-// User Configurations for CH55x AVR ISP/UPDI Programmer
+// User Configurations for CH55x AVR ISP/TPI/UPDI Programmer
 // ===================================================================================
 
 #pragma once
@@ -11,19 +11,24 @@
 #define PIN_SCK             P17       // pin connected to ISCP SCK  (do not change)
 #define PIN_RXD             P30       // pin connected to UPDI      (do not change)
 #define PIN_TXD             P31       // pin connected to UPDI via resistor (do not change)
-#define PIN_LED             P32       // pin connected to BUSY LED  (active LOW)
+#define PIN_LED_PRG         P32       // pin connected to BUSY LED  (active LOW)
+//#define PIN_LED_USB         P33       // pin connected to USB LED (active LOW)
 
 // USB device descriptor
-#define USB_VENDOR_ID       0x1781    // VID (private use only)
-#define USB_PRODUCT_ID      0x0C9F    // PID (private use only)
-#define USB_DEVICE_VERSION  0x0107    // v1.07 (BCD-format)
+#define USB_VENDOR_ID       0x16C0    // VID (shared www.voti.nl)
+#define USB_PRODUCT_ID      0x05DC    // PID (shared vendor class with libusb)
+#define USB_DEVICE_VERSION  0x0108    // v1.08 (BCD-format)
 
 // USB configuration descriptor
 #define USB_MAX_POWER_mA    500       // max power in mA (also to power target board)
 
 // USB descriptor strings
-#define MANUFACTURER_STR    'w','a','g','i','m','i','n','a','t','o','r'
-#define PRODUCT_STR         'p','i','c','o','A','V','R',' ','I','S','P','/','U','P','D','I'
-#define SERIAL_STR          'C','H','5','5','x','I','S','P','/','U','P','D','I'
-#define INTERFACE0_STR      'T','i','n','y','S','P','I'
+#define MANUFACTURER_STR    'w','w','w','.','f', 'i', 's', 'c', 'h', 'l', '.', 'd', 'e'
+#define PRODUCT_STR         'U', 'S', 'B', 'a', 's', 'p'
+#define SERIAL_STR          'w','a','g','i','m','i','n','a','t','o','r'
+#define INTERFACE0_STR      'p','i','c','o','A','S','P'
 #define INTERFACE1_STR      'S','e','r','i','a','l','U','P','D','I'
+
+// Windows Compatible ID (WCID) code for automated driver installation.
+// Uncomment this define to enable experimental WCID feature.
+#define WCID_VENDOR_CODE    0x5D

picoAVR_Programmer/software/src/config.h

@@ -57,14 +57,3 @@ void DLY_us(uint16_t n) {           // delay in us
     --n;
   }
 }
-
-// ===================================================================================
-// Delay in Units of ms
-// ===================================================================================
-void DLY_ms(uint16_t n) {           // delay in ms
-  while(n) {
-    while(!(TKEY_CTRL & bTKC_IF));
-		while(TKEY_CTRL & bTKC_IF);
-		--n;
-  }
-}

picoAVR_Programmer/software/src/delay.c

@@ -7,4 +7,3 @@
 #include "ch554.h"
 
 void DLY_us(uint16_t n);   // delay in units of us
-void DLY_ms(uint16_t n);   // delay in units of ms