Merge pull request #154 from card-io-ecg/v6

V6 hardware support

.cargo/config.toml

@@ -10,19 +10,13 @@ rustflags = [
   "-C", "link-arg=-nostartfiles",
   "-C", "link-arg=-Wl,-Tlinkall.x",
   "-C", "link-arg=-Trom_functions.x",
+]
 
-  # tell the core library have atomics even though it's not specified in the target definition
-  "--cfg", "target_has_atomic_load_store",
-  "--cfg", 'target_has_atomic_load_store="8"',
-  "--cfg", 'target_has_atomic_load_store="16"',
-  "--cfg", 'target_has_atomic_load_store="32"',
-  "--cfg", 'target_has_atomic_load_store="ptr"',
-  # enable cas
-  "--cfg", "target_has_atomic",
-  "--cfg", 'target_has_atomic="8"',
-  "--cfg", 'target_has_atomic="16"',
-  "--cfg", 'target_has_atomic="32"',
-  "--cfg", 'target_has_atomic="ptr"',
+[target.riscv32imac-unknown-none-elf]
+rustflags = [
+  "-C", "force-frame-pointers",
+  "-C", "link-arg=-Tlinkall.x",
+  "-C", "link-arg=-Trom_functions.x",
 ]
 
 [alias]

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
   build-fw:
     strategy:
       matrix:
-        version: ["v4"]
+        version: ["v4", "v6c6", "v6s3"]
 
     runs-on: ubuntu-latest
 

.github/workflows/check.yml

@@ -15,7 +15,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
 
 jobs:
-  test:
+  check:
+    strategy:
+      matrix:
+        version: ["v4", "v6c6", "v6s3"]
+
     runs-on: ubuntu-latest
 
     steps:
@@ -31,7 +35,18 @@ jobs:
         run: cargo fmt --check
 
       - name: check
-        run: cargo xcheck
+        run: cargo xcheck ${{ matrix.version }}
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: esp-rs/[email protected]
+        with:
+          default: true
+          buildtargets: esp32s3
+          ldproxy: false
+      - uses: Swatinem/rust-cache@v2
 
       - name: test
         run: cargo xtask test

.github/workflows/merge.yml

@@ -8,7 +8,11 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  test:
+  build:
+    strategy:
+      matrix:
+        version: ["v4", "v6c6", "v6s3"]
+
     runs-on: ubuntu-latest
 
     steps:
@@ -24,11 +28,20 @@ jobs:
       - name: setup espflash
         run: cargo binstall --no-confirm --force cargo-espflash
 
-      - name: check
-        run: cargo xcheck
+      - name: build
+        run: cargo xbuild ${{ matrix.version }}
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: esp-rs/[email protected]
+        with:
+          default: true
+          buildtargets: esp32s3
+          ldproxy: false
+      - uses: Swatinem/rust-cache@v2
 
       - name: test
         run: cargo xtask test
-
-      - name: build
-        run: cargo xbuild
+

.gitignore

@@ -4,3 +4,4 @@ Cargo.lock
 .vscode/esp32s3.base.svd
 .vscode/launch.json
 .vscode/.cortex-debug.peripherals.state.json
+cfg.toml