Update ch32v003fun, fix CI with latest macos14

Community-PIO-CH32V · Sep 14, 2024 · 20679b4 · 20679b4
1 parent 5206a4a
commit 20679b4
Show file tree

Hide file tree

Showing 5 changed files with 10,310 additions and 423 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,19 +6,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13]
+        os: [ubuntu-latest, windows-latest, macos-14]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout PicoRVD
         uses: actions/checkout@v3
         with:
           path: PicoRVD
 
-      - name: Checkout pico-sdk/master
+      - name: Checkout pico-sdk/1.5.1
         uses: actions/checkout@v3
         with:
           repository: raspberrypi/pico-sdk
-          ref: master
+          ref: 1.5.1
           path: pico-sdk
 
       - name: Checkout pico-sdk submodules
@@ -35,16 +35,15 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y build-essential git cmake gcc-arm-none-eabi gcc-riscv64-unknown-elf
 
       - name: Install dependencies (Mac)
-        if: ${{ matrix.os == 'macos-13' }}
+        if: ${{ matrix.os == 'macos-14' }}
         run: |
           brew install cmake make
-          brew tap ArmMbed/homebrew-formulae
-          brew install arm-none-eabi-gcc
+          brew install gcc-arm-embedded
           brew tap riscv-software-src/riscv
           brew install riscv-tools
 
       - name: Build Project (CH32V003 Blinky)
-        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'macos-13' }}
+        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'macos-14' }}
         working-directory: ${{github.workspace}}/PicoRVD
         shell: bash
         run: |
@@ -69,4 +68,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: PicoRVD.uf2
-          path: ${{github.workspace}}/PicoRVD/bin/picorvd.uf2
+          path: ${{github.workspace}}/PicoRVD/bin/picorvd.uf2
diff --git a/example/blink.cpp b/example/blink.cpp
@@ -1,4 +1,3 @@
-#define SYSTEM_CORE_CLOCK 48000000
 #include "ch32v003fun.h"
 
 __attribute__((noinline)) void busywait(int x) {
@@ -8,7 +7,7 @@ __attribute__((noinline)) void busywait(int x) {
 
 int main()
 {
-  SystemInit48HSI();
+  SystemInit();
 
   // Enable GPIOD.
   RCC->APB2PCENR |= RCC_APB2Periph_GPIOD;