More identifying macros for CH5xx CH6xx series, correct minichlink invocation, update ch32fun framework support and name

maxgerhardt · maxgerhardt · commit 4dfe4d53ce15 · 2026-01-17T16:23:42.000+01:00
diff --git a/boards/genericCH565M.json b/boards/genericCH565M.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH56 -DCH56X -DCH565",
+    "extra_flags": "-DCH56 -DCH56xM -DCH5xx -DCH56X -DCH56x -DCH565",
     "f_cpu": "120000000L",
     "hwids": [
       [
@@ -23,7 +23,8 @@
     "svd_path": "CH565.svd"
   },
   "frameworks": [
-    "noneos-sdk"
+    "noneos-sdk",
+    "ch32v003fun"
   ],
   "name": "Generic CH565M",
   "upload": {
diff --git a/boards/genericCH565W.json b/boards/genericCH565W.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH56 -DCH56X -DCH565",
+    "extra_flags": "-DCH56 -DCH56xW -DCH5xx -DCH56X -DCH56x -DCH565",
     "f_cpu": "120000000L",
     "hwids": [
       [
@@ -23,7 +23,8 @@
     "svd_path": "CH565.svd"
   },
   "frameworks": [
-    "noneos-sdk"
+    "noneos-sdk",
+    "ch32v003fun"
   ],
   "name": "Generic CH565W",
   "upload": {
diff --git a/boards/genericCH569W.json b/boards/genericCH569W.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH56 -DCH56X -DCH569",
+    "extra_flags": "-DCH56 -DCH56xW -DCH5xx -DCH56X -DCH56x -DCH569",
     "f_cpu": "120000000L",
     "hwids": [
       [
@@ -23,7 +23,8 @@
     "svd_path": "CH569.svd"
   },
   "frameworks": [
-    "noneos-sdk"
+    "noneos-sdk",
+    "ch32v003fun"
   ],
   "name": "Generic CH569W",
   "upload": {
diff --git a/boards/genericCH571D.json b/boards/genericCH571D.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH57 -DCH57X -DCH571",
+    "extra_flags": "-DCH57 -DCH57xD -DCH5xx -DCH57X -DCH57x -DCH571",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -23,7 +23,8 @@
     "svd_path": "CH571.svd"
   },
   "frameworks": [
-    "noneos-sdk"
+    "noneos-sdk",
+    "ch32v003fun"
   ],
   "name": "Generic CH571D",
   "upload": {
diff --git a/boards/genericCH571F.json b/boards/genericCH571F.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH57 -DCH57X -DCH571",
+    "extra_flags": "-DCH57 -DCH57xF -DCH5xx -DCH57X -DCH57x -DCH571",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -23,7 +23,8 @@
     "svd_path": "CH571.svd"
   },
   "frameworks": [
-    "noneos-sdk"
+    "noneos-sdk",
+    "ch32v003fun"
   ],
   "name": "Generic CH571F",
   "upload": {
diff --git a/boards/genericCH571K.json b/boards/genericCH571K.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH57 -DCH57X -DCH571",
+    "extra_flags": "-DCH57 -DCH57xK -DCH5xx -DCH57X -DCH57x -DCH571",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -23,7 +23,8 @@
     "svd_path": "CH571.svd"
   },
   "frameworks": [
-    "noneos-sdk"
+    "noneos-sdk",
+    "ch32v003fun"
   ],
   "name": "Generic CH571K",
   "upload": {
diff --git a/boards/genericCH573F.json b/boards/genericCH573F.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH57 -DCH57X -DCH573",
+    "extra_flags": "-DCH57 -DCH57xF -DCH5xx -DCH57X -DCH57x -DCH573",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -23,7 +23,8 @@
     "svd_path": "CH573.svd"
   },
   "frameworks": [
-    "noneos-sdk"
+    "noneos-sdk",
+    "ch32v003fun"
   ],
   "name": "Generic CH573F",
   "upload": {
diff --git a/boards/genericCH573Q.json b/boards/genericCH573Q.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH57 -DCH57X -DCH573",
+    "extra_flags": "-DCH57 -DCH57xQ -DCH5xx -DCH57X -DCH57x -DCH573",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -23,7 +23,8 @@
     "svd_path": "CH573.svd"
   },
   "frameworks": [
-    "noneos-sdk"
+    "noneos-sdk",
+    "ch32v003fun"
   ],
   "name": "Generic CH573Q",
   "upload": {
diff --git a/boards/genericCH573X.json b/boards/genericCH573X.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH57 -DCH57X -DCH573",
+    "extra_flags": "-DCH57 -DCH57xX -DCH5xx -DCH57X -DCH57x -DCH573",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -23,7 +23,8 @@
     "svd_path": "CH573.svd"
   },
   "frameworks": [
-    "noneos-sdk"
+    "noneos-sdk",
+    "ch32v003fun"
   ],
   "name": "Generic CH573X",
   "upload": {
diff --git a/boards/genericCH581F.json b/boards/genericCH581F.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH58 -DCH58X -DCH581",
+    "extra_flags": "-DCH58 -DCH58xF -DCH5xx -DCH58X -DCH58x -DCH581",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -25,7 +25,8 @@
   "frameworks": [
     "noneos-sdk",
     "freertos",
-    "rt-thread"
+    "rt-thread",
+    "ch32v003fun"
   ],
   "name": "Generic CH581F",
   "upload": {
diff --git a/boards/genericCH582F.json b/boards/genericCH582F.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH58 -DCH58X -DCH582",
+    "extra_flags": "-DCH58 -DCH58xF -DCH5xx -DCH58X -DCH58x -DCH582",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -25,7 +25,8 @@
   "frameworks": [
     "noneos-sdk",
     "freertos",
-    "rt-thread"
+    "rt-thread",
+    "ch32v003fun"
   ],
   "name": "Generic CH582F",
   "upload": {
diff --git a/boards/genericCH582M.json b/boards/genericCH582M.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH58 -DCH58X -DCH582",
+    "extra_flags": "-DCH58 -DCH58xM -DCH5xx -DCH58X -DCH58x -DCH582",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -25,7 +25,8 @@
   "frameworks": [
     "noneos-sdk",
     "freertos",
-    "rt-thread"
+    "rt-thread",
+    "ch32v003fun"
   ],
   "name": "Generic CH582M",
   "upload": {
diff --git a/boards/genericCH583M.json b/boards/genericCH583M.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH58 -DCH58X -DCH583",
+    "extra_flags": "-DCH58 -DCH58xM -DCH5xx -DCH58X -DCH58x -DCH583",
     "f_cpu": "20000000L",
     "hwids": [
       [
@@ -25,7 +25,8 @@
   "frameworks": [
     "noneos-sdk",
     "freertos",
-    "rt-thread"
+    "rt-thread",
+    "ch32v003fun"
   ],
   "name": "Generic CH583M",
   "upload": {
diff --git a/boards/genericCH591D.json b/boards/genericCH591D.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH59 -DCH59X -DCH591",
+    "extra_flags": "-DCH59 -DCH59xD -DCH5xx -DCH59X -DCH59x -DCH591",
     "f_cpu": "60000000L",
     "hwids": [
       [
@@ -25,7 +25,8 @@
   "frameworks": [
     "noneos-sdk",
     "freertos",
-    "rt-thread"
+    "rt-thread",
+    "ch32v003fun"
   ],
   "name": "Generic CH591D",
   "upload": {
diff --git a/boards/genericCH591F.json b/boards/genericCH591F.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH59 -DCH59X -DCH591",
+    "extra_flags": "-DCH59 -DCH59xF -DCH5xx -DCH59X -DCH59x -DCH591",
     "f_cpu": "60000000L",
     "hwids": [
       [
@@ -25,7 +25,8 @@
   "frameworks": [
     "noneos-sdk",
     "freertos",
-    "rt-thread"
+    "rt-thread",
+    "ch32v003fun"
   ],
   "name": "Generic CH591F",
   "upload": {
diff --git a/boards/genericCH591R.json b/boards/genericCH591R.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH59 -DCH59X -DCH591",
+    "extra_flags": "-DCH59 -DCH59xR -DCH5xx -DCH59X -DCH59x -DCH591",
     "f_cpu": "60000000L",
     "hwids": [
       [
@@ -25,7 +25,8 @@
   "frameworks": [
     "noneos-sdk",
     "freertos",
-    "rt-thread"
+    "rt-thread",
+    "ch32v003fun"
   ],
   "name": "Generic CH591R",
   "upload": {
diff --git a/boards/genericCH592F.json b/boards/genericCH592F.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH59 -DCH59X -DCH592",
+    "extra_flags": "-DCH59 -DCH59xF -DCH5xx -DCH59X -DCH59x -DCH592",
     "f_cpu": "60000000L",
     "hwids": [
       [
@@ -25,7 +25,8 @@
   "frameworks": [
     "noneos-sdk",
     "freertos",
-    "rt-thread"
+    "rt-thread",
+    "ch32v003fun"
   ],
   "name": "Generic CH592F",
   "upload": {
diff --git a/boards/genericCH592X.json b/boards/genericCH592X.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH59 -DCH59X -DCH592",
+    "extra_flags": "-DCH59 -DCH59xX -DCH5xx -DCH59X -DCH59x -DCH592",
     "f_cpu": "60000000L",
     "hwids": [
       [
@@ -25,7 +25,8 @@
   "frameworks": [
     "noneos-sdk",
     "freertos",
-    "rt-thread"
+    "rt-thread",
+    "ch32v003fun"
   ],
   "name": "Generic CH592X",
   "upload": {
diff --git a/boards/genericCH641D.json b/boards/genericCH641D.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH64 -DCH64X -DCH641",
+    "extra_flags": "-DCH64 -DCH64xD -DCH6xx -DCH64X -DCH64x -DCH641",
     "f_cpu": "48000000L",
     "hwids": [
       [
diff --git a/boards/genericCH641F.json b/boards/genericCH641F.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH64 -DCH64X -DCH641",
+    "extra_flags": "-DCH64 -DCH64xF -DCH6xx -DCH64X -DCH64x -DCH641",
     "f_cpu": "48000000L",
     "hwids": [
       [
diff --git a/boards/genericCH641P.json b/boards/genericCH641P.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH64 -DCH64X -DCH641",
+    "extra_flags": "-DCH64 -DCH64xP -DCH6xx -DCH64X -DCH64x -DCH641",
     "f_cpu": "48000000L",
     "hwids": [
       [
diff --git a/boards/genericCH641X.json b/boards/genericCH641X.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH64 -DCH64X -DCH641",
+    "extra_flags": "-DCH64 -DCH64xX -DCH6xx -DCH64X -DCH64x -DCH641",
     "f_cpu": "48000000L",
     "hwids": [
       [
diff --git a/boards/genericCH643L.json b/boards/genericCH643L.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH64 -DCH64X -DCH643",
+    "extra_flags": "-DCH64 -DCH64xL -DCH6xx -DCH64X -DCH64x -DCH643",
     "f_cpu": "48000000L",
     "hwids": [
       [
diff --git a/boards/genericCH643Q.json b/boards/genericCH643Q.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "clock_source": "hsi+pll",
-    "extra_flags": "-DCH64 -DCH64X -DCH643",
+    "extra_flags": "-DCH64 -DCH64xQ -DCH6xx -DCH64X -DCH64x -DCH643",
     "f_cpu": "48000000L",
     "hwids": [
       [
diff --git a/boards/genericCH643U.json b/boards/genericCH643U.json
diff --git a/boards/genericCH643W.json b/boards/genericCH643W.json
diff --git a/builder/frameworks/ch32v003fun.py b/builder/frameworks/ch32v003fun.py
diff --git a/builder/main.py b/builder/main.py
diff --git a/misc/scripts/gen_boarddefs.py b/misc/scripts/gen_boarddefs.py
diff --git a/platform.json b/platform.json
