Some updates

Author: wagiminator

picoISP_Programmer/software/picoasp/tools/chprog.py

@@ -0,0 +1,33 @@
+# Programming the MCU using the factory built-in USB Bootloader
+## Installing Drivers for the Bootloader
+On Linux you do not need to install a driver. However, by default Linux will not expose enough permission to upload your code with the USB bootloader. In order to fix this, open a terminal and run the following commands:
+
+```
+echo 'SUBSYSTEM=="usb", ATTR{idVendor}=="4348", ATTR{idProduct}=="55e0", MODE="666"' | sudo tee /etc/udev/rules.d/99-ch55x.rules
+sudo udevadm control --reload-rules
+```
+
+For Windows, you need the [CH372 driver](http://www.wch-ic.com/downloads/CH372DRV_EXE.html). Alternatively, you can also use the [Zadig Tool](https://zadig.akeo.ie/) to install the correct driver. Here, click "Options" -> "List All Devices" and select the USB module. Then install the libusb-win32 driver. To do this, the board must be connected and the microcontroller must be in bootloader mode.
+
+## Entering Bootloader Mode
+The bootloader must be started manually for new uploads. To do this, the board must first be disconnected from the USB port and all voltage sources. Now press the BOOT button and keep it pressed while reconnecting the board to the USB port of your PC. The chip now starts in bootloader mode, the BOOT button can be released and new firmware can be uploaded via USB. Alternatively, you can leave the board connected to the USB port, press and hold the BOOT button, press and release the RESET button and then release the BOOT button to enter the bootloader mode.
+
+## WCHISPTool
+WCH offers the free but closed-source software [WCHISPTool](https://www.wch.cn/downloads/WCHISPTool_Setup_exe.html) to upload firmware with Windows via the USB bootloader.
+
+## chprog.py
+You can also use chprog.py, a simple Python tool provided in this folder, to flash the microcontroller via the built-in USB bootloader. In order for this tool to work, Python3 must be installed on your system. To do this, follow these [instructions](https://www.pythontutorial.net/getting-started/install-python/). In addition [PyUSB](https://github.com/pyusb/pyusb) must be installed. On Linux (Debian-based), all of this can be done with the following commands:
+
+```
+sudo apt install python3 python3-pip
+python3 -m pip install pyusb
+```
+
+```
+Usage example:
+python3 chprog.py firmware.bin
+```
+
+## Alternative Software Tools
+- [isp55e0](https://github.com/frank-zago/isp55e0)
+- [wchisp](https://github.com/ch32-rs/wchisp)

picoISP_Programmer/software/picoasp/tools/readme.md

@@ -7,10 +7,11 @@
 # Type "make help" in the command line.
 # ===================================================================================
 
-# Input and Output File Names
-SKETCH     = picoisp.c
+# Files and Folders
+MAINFILE   = picoisp.c
 TARGET     = picoisp
 INCLUDE    = src
+TOOLS      = tools
 
 # Microcontroller Settings
 FREQ_SYS   = 16000000
@@ -22,13 +23,12 @@ CODE_SIZE  = 0x3800
 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
 

picoISP_Programmer/software/picoisp/makefile

@@ -1,5 +1,5 @@
 // ===================================================================================
-// Basic GPIO, PWM and ADC Functions for CH551, CH552 and CH554               * v1.4 *
+// Basic GPIO, PWM and ADC Functions for CH551, CH552 and CH554               * v1.5 *
 // ===================================================================================
 //
 // Pins must be defined as P10, P11, P12, etc. - e.g.:
@@ -107,6 +107,9 @@ SBIT(PP37, 0xB0, 7);
   ((PIN>=P30)&&(PIN<=P37) ? (P3_DIR_PU &= ~(1<<(PIN&7)), P3_MOD_OC &= ~(1<<(PIN&7))) : \
 (0)))
 
+#define PIN_input_HI    PIN_input
+#define PIN_input_FL    PIN_input
+
 // ===================================================================================
 // Set pin as INPUT with internal PULLUP resistor (also open-drain output,
 // when output changes from LOW to HIGH, it will drive HIGH for 2 clock cycles)
@@ -124,6 +127,8 @@ SBIT(PP37, 0xB0, 7);
   ((PIN>=P30)&&(PIN<=P37) ? (P3_MOD_OC &= ~(1<<(PIN&7)), P3_DIR_PU |= (1<<(PIN&7))) : \
 (0)))
 
+#define PIN_output_PP   PIN_output
+
 // ===================================================================================
 // Set pin as OPEN-DRAIN OUTPUT (also high-impedance input, no pullup)
 // ===================================================================================

picoISP_Programmer/software/picoisp/src/gpio.h

@@ -1,30 +1,37 @@
 // ===================================================================================
-// Basic System Functions for CH551, CH552 and CH554                          * v1.4 *
+// Basic System Functions for CH551, CH552 and CH554                          * v1.6 *
 // ===================================================================================
 //
-// Functions available:
-// --------------------
+// System clock (CLK)functions available:
+// --------------------------------------
 // CLK_config()             set system clock frequency according to F_CPU
 // CLK_external()           set external crystal as clock source
 // CLK_internal()           set internal oscillator as clock source
 //
+// Watchdog Timer (WDT) functions available:
+// -----------------------------------------
 // WDT_start()              start watchdog timer with full period
 // WDT_stop()               stop watchdog timer
 // WDT_reset()              reload watchdog timer with full period
 // WDT_set(time)            reload watchdog timer with specified time in ms
 // WDT_feed(value)          reload watchdog timer with specified value
 //
-// BOOT_now()               enter bootloader
-// SLEEP_now()              put device into sleep
+// Reset (RST) and bootloader functions available:
+// -----------------------------------------------
 // RST_now()                perform software reset
-//
 // RST_keep(value)          keep this value after RESET
 // RST_getKeep()            read the keeped value
 // RST_wasWDT()             check if last RESET was caused by watchdog timer
 // RST_wasPIN()             check if last RESET was caused by RST PIN
 // RST_wasPWR()             check if last RESET was caused by power-on
 // RST_wasSOFT()            check if last RESET was caused by software
 //
+// BOOT_now()               enter bootloader
+//
+// Sleep functions available:
+// --------------------------
+// SLEEP_now()              put device into sleep
+//
 // WAKE_enable(source)      enable wake-up from sleep source (sources see below)
 // WAKE_disable(source)     disable wake-up from sleep source
 // WAKE_all_disable()       disable all wake-up sources
@@ -58,14 +65,20 @@
 // WAKE_RST                 wake-up by pin RST high level
 // WAKE_INT                 wake-up by pin P3.2 edge or pin P3.3 low level
 //
+// Interrupt (INT) functions available:
+// ------------------------------------
+// INT_enable()             global interrupt enable
+// INT_disable()            global interrupt disable
+// INT_ATOMIC_BLOCK { }     execute block without being interrupted
+//
 // 2023 by Stefan Wagner:   https://github.com/wagiminator
 
 #pragma once
 #include <stdint.h>
 #include "ch554.h"
 
 // ===================================================================================
-// System Clock
+// System Clock (CLK) Functions
 // ===================================================================================
 inline void CLK_config(void) {
   SAFE_MOD = 0x55;
@@ -117,7 +130,7 @@ inline void CLK_inernal(void) {
 }
 
 // ===================================================================================
-// Watchdog Timer
+// Watchdog Timer (WDT) Functions
 // ===================================================================================
 #define WDT_reset()       WDOG_COUNT = 0
 #define WDT_feed(value)   WDOG_COUNT = value
@@ -139,7 +152,7 @@ inline void WDT_stop(void) {
 }
 
 // ===================================================================================
-// Reset
+// Reset (RST) Functions
 // ===================================================================================
 #define RST_keep(value)   RESET_KEEP = value
 #define RST_getKeep()     (RESET_KEEP)
@@ -155,16 +168,28 @@ inline void RST_now(void) {
 }
 
 // ===================================================================================
-// Bootloader
+// Bootloader (BOOT) Functions
 // ===================================================================================
 inline void BOOT_now(void) {
   __asm
-    lcall #BOOT_LOAD_ADDR
+    ljmp #BOOT_LOAD_ADDR
   __endasm;
 }
 
+inline void BOOT_prepare(void) {
+  ES = 0;
+  PS = 0;
+  TMOD       = 0;
+  P1_DIR_PU  = 0;
+  P1_MOD_OC  = 0;	
+  P1         = 0xFF;
+  USB_INT_EN = 0;
+  USB_CTRL   = 0x06;
+  EA = 0;
+}
+
 // ===================================================================================
-// Sleep
+// Sleep Functions
 // ===================================================================================
 #define SLEEP_now()   PCON |= PD
 
@@ -198,3 +223,10 @@ inline void BOOT_now(void) {
 #define WAKE_P15_disable()      WAKE_CTRL &= ~bWAK_P1_5_LO
 #define WAKE_RST_disable()      WAKE_CTRL &= ~bWAK_RST_HI
 #define WAKE_INT_disable()      WAKE_CTRL &= ~bWAK_P3_2E_3L
+
+// ===================================================================================
+// Interrupt (INT) Functions
+// ===================================================================================
+#define INT_enable()        EA = 1
+#define INT_disable()       EA = 0
+#define INT_ATOMIC_BLOCK    for(EA=0;!EA;EA=1)