Merge the next branch (finally!)

.github/workflows/ci.yml

@@ -3,24 +3,54 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - master
+      - main
+      - next
       - wip
   pull_request:
 
 jobs:
-  board-ci:
-    name: "Board: ${{ matrix.board }}"
+  ci:
+    name: "${{ matrix.m.type }}: ${{ matrix.m.name }}"
     strategy:
       fail-fast: true
       matrix:
-        board:
-          - arduino-uno
-          - arduino-leonardo
-
-          - arduino-mega2560
-          - bigavr6
-          - trinket
-          - sparkfun-pro-micro
+        m:
+          - type: board
+            name: arduino-uno
+          - type: board
+            name: arduino-diecimila
+          - type: board
+            name: arduino-leonardo
+          - type: board
+            name: arduino-mega2560
+          - type: board
+            name: sparkfun-promicro
+          - type: board
+            name: trinket-pro
+          - type: mcu
+            name: atmega1280
+            spec: atmega1280
+            crate: atmega-hal
+          - type: mcu
+            name: atmega168
+            spec: atmega168
+            crate: atmega-hal
+          - type: mcu
+            name: atmega328pb
+            spec: atmega328p
+            crate: atmega-hal
+          - type: mcu
+            name: atmega48p
+            spec: atmega48p
+            crate: atmega-hal
+          - type: mcu
+            name: attiny85
+            spec: attiny85
+            crate: attiny-hal
+          - type: mcu
+            name: attiny88
+            spec: attiny88
+            crate: attiny-hal
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -35,4 +65,28 @@ jobs:
       - name: Install avr-gcc, binutils, and libc
         run: sudo apt-get install -y avr-libc binutils-avr gcc-avr
       - name: Compile board crate and examples
-        run: cd "boards/${{ matrix.board }}" && cargo build --examples
+        if: "${{ matrix.m.type == 'board' }}"
+        run: cd "examples/${{ matrix.m.name }}" && cargo build --bins
+      - name: Test-compile HAL crate for an MCU
+        if: "${{ matrix.m.type == 'mcu' }}"
+        run: cd "mcu/${{ matrix.m.crate }}" && cargo build --features "${{ matrix.m.name }}" -Z build-std=core --target "../../avr-specs/avr-${{ matrix.m.spec }}.json"
+
+  ravedude:
+    name: "ravedude"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - name: Install libudev
+        run: sudo apt-get update && sudo apt-get install -y libudev-dev
+      - name: Check ravedude
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --manifest-path ravedude/Cargo.toml

.github/workflows/docs.yml

@@ -3,7 +3,7 @@ name: Documentation
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   docs:
@@ -19,8 +19,12 @@ jobs:
           toolchain: nightly-2021-01-07
           override: true
           components: rust-src
-      - name: Build documentation
-        run: cargo doc --all
+      - name: Build documentation (arduino-hal)
+        run: cd arduino-hal/ && cargo doc --features arduino-uno
+      - name: Build documentation (atmega-hal)
+        run: cd mcu/atmega-hal/ && cargo doc --features atmega328p
+      - name: Build documentation (attiny-hal)
+        run: cd mcu/attiny-hal/ && cargo doc --features attiny85
       - name: Deploy to GH-Pages
         uses: peaceiris/actions-gh-pages@v3
         with:

Cargo.toml

@@ -15,24 +15,25 @@ members = [
     # The generic hal definitions
     "avr-hal-generic",
 
-    # The chip definitions
-    "chips/atmega1280-hal",
-    "chips/atmega168-hal",
-    "chips/atmega2560-hal",
-    "chips/atmega328p-hal",
-    "chips/atmega32u4-hal",
-    "chips/atmega48p-hal",
-    "chips/attiny85-hal",
-    "chips/attiny88-hal",
+    # MCU HAL crates
+    "mcu/atmega-hal",
+    "mcu/attiny-hal",
 
-    # The board crates
-    "boards/arduino-diecimila",
-    "boards/arduino-leonardo",
-    "boards/arduino-uno",
-    "boards/arduino-mega2560",
-    "boards/bigavr6",
-    "boards/sparkfun-pro-micro",
-    "boards/trinket",
+    # Higher level crates
+    "arduino-hal",
+
+    # Examples
+    "examples/arduino-diecimila",
+    "examples/arduino-leonardo",
+    "examples/arduino-mega2560",
+    "examples/arduino-nano",
+    "examples/arduino-uno",
+    "examples/sparkfun-promicro",
+    "examples/trinket-pro",
+]
+exclude = [
+    # The RAVEDUDE! Yeah!
+    "ravedude",
 ]
 
 [patch.crates-io]