Add ch32v307 into 'devices.h' and some other changes

.gitignore

@@ -0,0 +1,8 @@
+gitignore.txt
+.gitignore
+*.o
+*.1
+*~
+wch-isp
+test.sh
+mingw32

50-wchisp.rules

@@ -1,2 +1,2 @@
 # WCH ISP bootloader
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="4348", ATTRS{idProduct}=="55e0", GROUP="uucp", MODE="0666"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="4348", ATTRS{idProduct}=="55e0", GROUP="uucp", MODE="0660"

Makefile

@@ -1,58 +1,70 @@
 # SPDX-License-Identifier: GPL-2.0-only
-VERSION = 0.3.0
+VERSION = 0.1.1
+NAME := wch-isp
 
 # Install paths
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
-UDEVPREFIX = /etc/udev
+UDEVPREFIX = $(PREFIX)/lib/udev
 
+#make CROSS_COMPILE=i686-w64-mingw32- INCS="-Imingw32/include -Imingw32/include/libusb-1.0" LIBS="-Lmingw32/lib mingw32/bin/libusb-1.0.dll -lyaml"
 ifneq ($(CROSS_COMPILE),)
-CC = $(CROSS_COMPILE)cc
+CC = $(CROSS_COMPILE)gcc
 LD = $(CROSS_COMPILE)ld
 endif
 
+#CFLAGS += -DPREFIX=\"$(PREFIX)\" -DNAME=\"$(NAME)\" -g
 PKG_CONFIG = pkg-config
 
+ifneq ($(OPTIONS),small)
 # include and libs
-INCS = `$(PKG_CONFIG) --cflags libusb-1.0`
-LIBS = `$(PKG_CONFIG) --libs libusb-1.0`
+INCS += `$(PKG_CONFIG) --cflags libusb-1.0`  `$(PKG_CONFIG) --cflags yaml-0.1`
+LIBS += `$(PKG_CONFIG) --libs libusb-1.0`  `$(PKG_CONFIG) --libs yaml-0.1`
+else
+# include and libs
+INCS += -DBUILD_SMALL
+LIBS += 
+endif
 
 # Flags
 WCHISP_CPPFLAGS = -DVERSION=\"$(VERSION)\" $(CPPFLAGS)
 WCHISP_CFLAGS = -Wall -O2 $(INCS) $(CFLAGS)
 WCHISP_LDFLAGS = $(LIBS) $(LDFLAGS)
 
-SRC = wch-isp.c
+SRC = main.c wch_if_usb.c wch_if_uart.c wch_yaml_parse.c
+#SRC = $(NAME).c
 HDR = arg.h devices.h
 OBJ = $(SRC:.c=.o)
-BIN = wch-isp
-MAN = wch-isp.1
-DISTFILES = $(SRC) $(HDR) $(MAN) 50-wchisp.rules Makefile
+BIN = $(NAME)
+MAN = $(NAME).1
+DISTFILES = $(SRC) $(HDR) *.man 50-wchisp.rules Makefile
+
 
-all: $(BIN)
+all: $(BIN) $(MAN)
 
-$(OBJ): arg.h devices.h
+%.1:	%.man
+	sed "s/VERSION/$(VERSION)/g" < $< > $@
+
+small:
+	make OPTIONS="small" all
 
 $(BIN): $(OBJ)
 	$(CC) -o $@ $^ $(WCHISP_LDFLAGS)
 .c.o:
 	$(CC) $(WCHISP_CFLAGS) $(WCHISP_CPPFLAGS) -c $<
 
-install:
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/$(BIN)
-	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-	sed "s/VERSION/$(VERSION)/g" < $(MAN) > $(DESTDIR)$(MANPREFIX)/man1/$(MAN)
-	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/$(MAN)
-
-install-rules:
-	mkdir -p $(DESTDIR)$(UDEVPREFIX)/rules.d
-	cp -f 50-wchisp.rules $(DESTDIR)$(UDEVPREFIX)/rules.d
+install: all
+	install -D $(BIN) $(DESTDIR)$(PREFIX)/bin/${BIN}
+	install -m644 -D $(MAN) $(DESTDIR)$(MANPREFIX)/man1/$(MAN)
+	mkdir -p $(DESTDIR)$(PREFIX)/share/$(NAME)
+	cp -a devices $(DESTDIR)$(PREFIX)/share/$(NAME)/
+	install -D 50-wchisp.rules $(DESTDIR)$(UDEVPREFIX)/rules.d/50-wchisp.rules
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(BIN)
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/$(MAN)
+	rm -rf $(DESTDIR)$(PREFIX)/share/$(NAME)
+	rm -f $(DESTDIR)$(UDEVPREFIX)/rules.d/50-wchisp.rules
 
 dist:
 	mkdir -p $(BIN)-$(VERSION)
@@ -62,6 +74,25 @@ dist:
 	rm -rf $(BIN)-$(VERSION)
 
 clean:
-	rm -f $(OBJ) $(BIN)
+	rm -f $(OBJ) $(BIN) $(MAN)
+
+test:
+	@if [ $(PORT)"" = "" ] ; then \
+	  echo "examples: " ;\
+	  echo "make PORT=/dev/ttyUSB0 test"  ;\
+	  echo "./"$(BIN)" --port=USB info" ;\
+	  echo "./"$(BIN)" --port='//./COM3' --reset=RTS --boot0=DTR info" ;\
+	else \
+	  stty -F $(PORT) 300 ;\
+	  stty -F $(PORT) 50 ;\
+	  bash -c "echo 'RBU' > $(PORT)" ;\
+	  bash -c "echo 'rBU' > $(PORT)" ;\
+	  sleep 1 ;\
+	  ./$(BIN) --port=$(PORT) info ;\
+	  stty -F $(PORT) 50 ;\
+	  bash -c "echo 'RbU' > $(PORT)" ;\
+	  sleep 1 ;\
+	  bash -c "echo 'rbuz' > $(PORT)" ;\
+	fi
 
-.PHONY: all install install-rules uninstall dist clean
+.PHONY: all install uninstall dist clean test

README.md

@@ -1,57 +1,92 @@
 wch-isp
 =======
 
-wch-isp is an utility to write firmware into the flash of WCH microcontrollers, over USB.
+wch-isp is an utility to write firmware into the flash of WCH microcontrollers, over USB or COM-port.
 This utility started as a rewrite in C of the rust tool [wchisp](https://github.com/ch32-rs/wchisp).
 
 ```
-usage: wch-isp [-VDnpr] [-d <uid>] COMMAND [ARG ...]
-       wch-isp [-VDnpr] [-d <uid>] [flash|write|verify|reset] FILE
-       wch-isp [-VDnpr] [-d <uid>] [erase|config|remove-wp]
-       wch-isp [-VDnpr] list
-
-options:
-  -d <uid> Select the usb device that matches the uid
-  -n       No verify after writing to flash, done by default
-  -p       Print a progress-bar during command operation
-  -r       Reset after command completed
-  -D       Print raw isp command (for debug)
-  -V       Print version and exit
+usage: ./wch-isp [OPTIONS] COMMAND [ARG...]
+  OPTIONS:
+        -v           Print version and exit
+        -h, --help   Show this help and exit
+        -n           No verify after writing
+        -p           Show progress bar
+        -d           Debug mode, show raw commands
+        -r           Reset after command completed
+        -b           Do not read database\n");
+        -f           Ignore if firmware size more than cached flash size (program memory)
+        -F           Ignore if firmware size more than total flash size (program memory + const data memory
+        --port=USB   Specify port as USB (default)
+        --port=/dev/ttyUSB0 9600   Specify port as COM-port '/dev/ttyUSB0' with speed 9600 baud
+        --port='//./COM3'          Specify port as COM-port '//./COM3'
+        --device=DEV Test if connected device is DEV and exit if they differ
+        --uid=AA-BB-CC-DD-EE-FF-GG-HH   Specify device UID
+        --reset=PIN  Use PIN as RESET
+        --boot0=PIN  Use PIN as Boot0
+            'PIN' may be 'RTS', 'DTR', 'nRTS' or 'nDTR'
+        --address=0x08000000     Write or verify data from specified address
+        --database-path=/home/user/wch-isp/devices      Search device info in specified path
+
+  COMMAND:
+        write FILE    write file (.hex or .bin)
+        verify FILE   verify file (.hex ot .bin)
+        erase         erase all memory
+        list          show connected devices
+        unlock        remove write protection
+        info          show device info: bootloader version, option bytes, flash size etc
+        optionbytes 'CMD' change optionbytes
+            example: ./wch-isp optionbytes 'RDPR=0xA5, DATA0 = 0x42'
+        optionshow 'CMD'  show changes after apply CMD to optionbytes; Do not write
 ```
 
 This utility has been tested on:
- - CH32V103
- - CH569W
+ - CH32V307RCT6
+ - CH32V303CBT6
+ - CH32V203G8R6
 
 
 ## Examples
 
 List detected device in bootloader mode:
+
 ```sh
-$ wch-isp list
-0: BTVER v2.7 UID 8d-ff-ba-e4-c2-84-09-69 [0x1069] CH569
-1: BTVER v2.5 UID f2-3e-88-26-3b-38-b5-9d [0x1980] CH32V208WBU6
+./wch-isp list
+found 0x19 0x3B ( CH32V203G8R6 ), bt ver.0206 uid = [ CD-AB-1D-36-51-BC-3B-9E ]
+found 0x17 0x71 ( CH32V307RCT6 ), bt ver.0209 uid = [ 87-80-CB-26-3B-38-8D-DF ]
 ```
 
-Flash the `firmware.bin` file, `-p` enable the progress bar.
-```
-$ wch-isp -p flash firmware.bin
-BTVER v2.5 UID f2-3e-88-26-3b-38-b5-9d [0x1980] CH32V208WBU6
-[####################################################] write 35392/35392
-[####################################################] verify 35392/35392
-flash done
+Flash the `firmware.bin` file via USB, `-p` enable the progress.
+
+```sh
+$ ./wch-isp --port=USB -p write firmware.bin
+Erase 1 sectors (1024 bytes)
+Write: 100.0 %   Write 792 bytes: DONE
+Verify: 100.0 %   Verify 792 bytes: DONE
 ```
 
-Erase the device's flash, select the device by it's uid (option `-d`).
+Verify the `firmware.hex` file via COM-port (reset connected to RTS, Boot0 connected to DTR):
+
+```sh
+$ ./wch-isp --port=/dev/ttyUSB0 --reset=RTS --boot0=DTR verify firmware.hex
+Verify 792 bytes: DONE
+
 ```
-$ wch-isp -d f2-3e-88-26-3b-38-b5-9d erase
-BTVER v2.5 UID f2-3e-88-26-3b-38-b5-9d [0x1980] CH32V208WBU6
-erase done
+
+Unlock read-protection and write 0x42 to DATA0 field in optionbytes:
+
+```sh
+$ ./wch-isp --device=CH32V203G8R6 optionbytes 'RDPR=0xA5 DATA0 = 0x42'
+Option bytes write:
+  0xC03F5AA5
+  0xBA45BD42
+  0xFFFFFFFF
+Done
+
 ```
 
 ## Dependency
 
-wch-isp depends on libusb 1.0 or above.
+wch-isp depends on **libusb-1.0** and **yaml-0.1** or above.
 
 ## How to build
 
@@ -72,6 +107,16 @@ Default udev rules are provided and can be installed with this command:
 make install-rules
 ```
 
+### Cross-compilling using mingw32
+
+Download and unarchive **mingw-w64-i686-libusb** and **mingw-w64-i686-libyaml** into special directory, for example, ```lib/mingw32```. Then execute makefile:
+
+```
+make CROSS_COMPILE=i686-w64-mingw32- INCS="-Imingw32/include -Imingw32/include/libusb-1.0" LIBS="-Lmingw32/lib mingw32/bin/libusb-1.0.dll -lyaml"
+```
+
+Comilled binary will reqire **libusb-1.0.dll**, **libyaml-0-2.dll** (from ```lib/mingw32/bin```) and **libgcc_s_dw2-1.dll** (in my system: ```/usr/lib/gcc/i686-w64-mingw32/10-win32/libgcc_s_dw2-1.dll```)
+
 ### Windows using MSYS2
 
 On Windows the build is done using MSYS2 and mingw64, you can install this from https://www.msys2.org
@@ -89,3 +134,7 @@ Then the `wch-isp.exe` binary can be run like so:
 ```
 PATH="$PATH:/mingw64/bin" ./wch-isp.exe
 ```
+
+## TODO:
+
+- Test compilling on Windows (Jules Maselbas probably tested it, but I (COKPOWEHEU) haven't yet)