update toolchain to 2025-02-22

Rahix · Feb 22, 2025 · 33357c1 · 33357c1
1 parent 95f5810
commit 33357c1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,12 +53,12 @@ jobs:
       - name: Install Nightly Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2023-08-08
+          toolchain: nightly-2025-02-22
           components: rustfmt
 
       # Actual test run
       - name: Generate chip description sources
-        run: make RUSTUP_TOOLCHAIN=nightly-2023-08-08
+        run: make RUSTUP_TOOLCHAIN=nightly-2025-02-22
       - name: Test-compile the crate
         run: cargo check --all-features
 
@@ -86,7 +86,8 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2023-12-28
+          toolchain: nightly-2025-02-22
+          rustflags: ""
           components: rust-src,rustfmt
       - name: Install AVR gcc, binutils, and libc
         run: sudo apt-get install -y avr-libc binutils-avr gcc-avr

diff --git a/examples/atmega328p/.cargo/config.toml b/examples/atmega328p/.cargo/config.toml
@@ -1,5 +1,6 @@
 [build]
-target = "avr-specs/avr-atmega328p.json"
+target = "avr-none"
+rustflags = ["-C", "target-cpu=atmega328p"]
 
 [target.'cfg(target_arch = "avr")']
 runner = "ravedude uno -cb 57600"

diff --git a/examples/atmega328p/Cargo.toml b/examples/atmega328p/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mega328-test"
 version = "0.1.0"
 authors = ["Frank Villaro-Dixon <frank@villaro-dixon.eu>"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 
 [[bin]]
@@ -18,7 +18,7 @@ embedded-hal = "0.2.3"
 
 
 [dependencies.avr-device]
-version = "0.5.3"
+version = "0.7"
 # To use the local version of avr-device instead, uncomment the following line:
 # NB: make sure to build this crate first by running `make` at the root of the project
 # path = "../.."

diff --git a/examples/atmega328p/avr-specs/avr-atmega328p.json b/examples/atmega328p/avr-specs/avr-atmega328p.json
diff --git a/examples/atmega328p/rust-toolchain.toml b/examples/atmega328p/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2023-12-28"
+channel = "nightly-2025-02-22"
 components = ["rust-src"]
 profile = "minimal"
diff --git a/examples/atmega328p/src/main.rs b/examples/atmega328p/src/main.rs
@@ -38,13 +38,16 @@ fn TIMER0_OVF() {
     // We then count 61 times to approximate 1s.
     // XXX: this is a really bad way to count time
 
-    static mut OVF_COUNTER: u16 = 0;
-    const ROLLOVER: u16 = 61;
+    use core::sync::atomic::{AtomicU8, Ordering::Relaxed};
 
-    *OVF_COUNTER = OVF_COUNTER.wrapping_add(1);
-    if *OVF_COUNTER > ROLLOVER {
-        *OVF_COUNTER = 0;
+    static OVF_COUNTER: AtomicU8 = AtomicU8::new(0);
+    const ROLLOVER: u8 = 61;
 
+    let ovf = OVF_COUNTER.load(Relaxed);
+    if ovf < ROLLOVER {
+        OVF_COUNTER.store(ovf + 1, Relaxed);
+    } else {
+        OVF_COUNTER.store(0, Relaxed);
         interrupt::free(|cs| {
             LED_STATE.borrow(cs).set(!LED_STATE.borrow(cs).get());
         });