Support the SparkFun ProMini 5V

ani · web-flow · commit 190f2c3cb8d2 · 2023-10-25T00:17:47.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,6 +33,9 @@ jobs:
           - type: board
             name: sparkfun-promicro
             examples: true
+          - type: board
+            name: sparkfun-promini-5v
+            examples: true
           - type: board
             name: trinket-pro
             examples: true
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,6 +31,7 @@ members = [
     "examples/arduino-uno",
     "examples/nano168",
     "examples/sparkfun-promicro",
+    "examples/sparkfun-promini-5v",
     "examples/trinket-pro",
     "examples/trinket",
 ]
diff --git a/arduino-hal/Cargo.toml b/arduino-hal/Cargo.toml
@@ -21,6 +21,7 @@ arduino-nano = ["mcu-atmega", "atmega-hal/atmega328p", "atmega-hal/enable-extra-
 arduino-uno = ["mcu-atmega", "atmega-hal/atmega328p", "board-selected"]
 trinket-pro = ["mcu-atmega", "atmega-hal/atmega328p", "board-selected"]
 sparkfun-promicro = ["mcu-atmega", "atmega-hal/atmega32u4", "board-selected"]
+sparkfun-promini-5v = ["mcu-atmega", "atmega-hal/atmega328p", "atmega-hal/enable-extra-adc", "board-selected"]
 trinket = ["mcu-attiny", "attiny-hal/attiny85", "board-selected"]
 nano168 = ["mcu-atmega", "atmega-hal/atmega168", "atmega-hal/enable-extra-adc", "board-selected"]
 
diff --git a/arduino-hal/src/clock.rs b/arduino-hal/src/clock.rs
@@ -22,6 +22,7 @@ pub(crate) mod default {
         feature = "arduino-nano",
         feature = "arduino-uno",
         feature = "sparkfun-promicro",
+        feature = "sparkfun-promini-5v",
         feature = "trinket-pro",
         feature = "nano168",
     ))]
diff --git a/arduino-hal/src/lib.rs b/arduino-hal/src/lib.rs
@@ -13,6 +13,7 @@
 #![cfg_attr(feature = "arduino-nano", doc = "**Arduino Nano**.")]
 #![cfg_attr(feature = "arduino-uno", doc = "**Arduino Uno**.")]
 #![cfg_attr(feature = "sparkfun-promicro", doc = "**SparkFun ProMicro**.")]
+#![cfg_attr(feature = "sparkfun-promini-5v", doc = "**SparkFun ProMini 5V (16MHz)**.")]
 #![cfg_attr(feature = "trinket-pro", doc = "**Trinket Pro**.")]
 #![cfg_attr(feature = "trinket", doc = "**Trinket**.")]
 #![cfg_attr(feature = "nano168", doc = "**Nano clone (ATmega168)**.")]
@@ -59,6 +60,7 @@ compile_error!(
     * arduino-nano
     * arduino-uno
     * sparkfun-promicro
+    * sparkfun-promini-5v
     * trinket-pro
     * trinket
     * nano168
@@ -257,7 +259,7 @@ macro_rules! default_serial {
         )
     };
 }
-#[cfg(any(feature = "arduino-nano", feature = "nano168"))]
+#[cfg(any(feature = "arduino-nano", feature = "nano168", feature = "sparkfun-promini-5v"))]
 #[macro_export]
 macro_rules! default_serial {
     ($p:expr, $pins:expr, $baud:expr) => {
diff --git a/arduino-hal/src/port/mod.rs b/arduino-hal/src/port/mod.rs
@@ -27,9 +27,9 @@ pub use leonardo::*;
 mod mega;
 #[cfg(any(feature = "arduino-mega2560", feature = "arduino-mega1280"))]
 pub use mega::*;
-#[cfg(any(feature = "arduino-nano", feature = "arduino-uno", feature = "nano168"))]
+#[cfg(any(feature = "arduino-nano", feature = "arduino-uno", feature = "nano168", feature = "sparkfun-promini-5v"))]
 mod uno;
-#[cfg(any(feature = "arduino-nano", feature = "arduino-uno", feature = "nano168"))]
+#[cfg(any(feature = "arduino-nano", feature = "arduino-uno", feature = "nano168", feature = "sparkfun-promini-5v"))]
 pub use uno::*;
 #[cfg(feature = "sparkfun-promicro")]
 mod promicro;
diff --git a/arduino-hal/src/port/uno.rs b/arduino-hal/src/port/uno.rs
@@ -3,7 +3,7 @@ pub use atmega_hal::port::{mode, Pin, PinOps, PinMode};
 avr_hal_generic::renamed_pins! {
     type Pin = Pin;
 
-    /// Pins of the **Arduino Uno**.
+    /// Pins of the **Arduino Uno**, **Arduino Nano**, and **SparkFun ProMini 5V (16MHz)**.
     ///
     /// This struct is best initialized via the [`arduino_hal::pins!()`][crate::pins] macro.
     pub struct Pins from atmega_hal::Pins {
diff --git a/examples/sparkfun-promini-5v/.cargo/config.toml b/examples/sparkfun-promini-5v/.cargo/config.toml
@@ -0,0 +1,8 @@
+[build]
+target = "../../avr-specs/avr-atmega328p.json"
+
+[target.'cfg(target_arch = "avr")']
+runner = "ravedude promini-5v"
+
+[unstable]
+build-std = ["core"]
diff --git a/examples/sparkfun-promini-5v/Cargo.toml b/examples/sparkfun-promini-5v/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "sparkfun-promini-5v-examples"
+version = "0.0.0"
+authors = ["Rahix <rahix@rahix.de>"]
+edition = "2018"
+publish = false
+
+[dependencies]
+panic-halt = "0.2.0"
+ufmt = "0.1.0"
+nb = "0.1.2"
+embedded-hal = "0.2.3"
+
+[dependencies.arduino-hal]
+path = "../../arduino-hal/"
+features = ["sparkfun-promini-5v"]
diff --git a/examples/sparkfun-promini-5v/src/bin/promini-5v-blink.rs b/examples/sparkfun-promini-5v/src/bin/promini-5v-blink.rs
@@ -0,0 +1,25 @@
+#![no_std]
+#![no_main]
+
+use panic_halt as _;
+
+#[arduino_hal::entry]
+fn main() -> ! {
+    let dp = arduino_hal::Peripherals::take().unwrap();
+    let pins = arduino_hal::pins!(dp);
+
+    // Digital pin 13 is also connected to an onboard LED marked "L"
+    let mut led = pins.d13.into_output();
+    led.set_high();
+
+    loop {
+        led.toggle();
+        arduino_hal::delay_ms(100);
+        led.toggle();
+        arduino_hal::delay_ms(100);
+        led.toggle();
+        arduino_hal::delay_ms(100);
+        led.toggle();
+        arduino_hal::delay_ms(800);
+    }
+}
diff --git a/ravedude/src/board.rs b/ravedude/src/board.rs
@@ -18,6 +18,7 @@ pub fn get_board(board: &str) -> Option<Box<dyn Board>> {
         "mega1280" => Box::new(ArduinoMega1280),
         "diecimila" => Box::new(ArduinoDiecimila),
         "promicro" => Box::new(SparkFunProMicro),
+        "promini-5v" => Box::new(SparkFunProMini5V),
         "trinket-pro" => Box::new(TrinketPro),
         "trinket" => Box::new(Trinket),
         "nano168" => Box::new(Nano168),
@@ -316,6 +317,31 @@ impl Board for SparkFunProMicro {
     }
 }
 
+struct SparkFunProMini5V;
+
+impl Board for SparkFunProMini5V {
+    fn display_name(&self) -> &str {
+        "SparkFun Pro Mini 5V (16MHz)"
+    }
+
+    fn needs_reset(&self) -> Option<&str> {
+        None
+    }
+
+    fn avrdude_options(&self) -> avrdude::AvrdudeOptions {
+        avrdude::AvrdudeOptions {
+            programmer: "arduino",
+            partno: "atmega328p",
+            baudrate: Some(57600),
+            do_chip_erase: true,
+        }
+    }
+
+    fn guess_port(&self) -> Option<anyhow::Result<std::path::PathBuf>> {
+        Some(Err(anyhow::anyhow!("Not able to guess port")))
+    }
+}
+
 struct TrinketPro;
 
 impl Board for TrinketPro {
diff --git a/ravedude/src/main.rs b/ravedude/src/main.rs
@@ -61,6 +61,7 @@ struct Args {
     /// * mega1280
     /// * diecimila
     /// * promicro
+    /// * promini-5v
     /// * trinket-pro
     /// * trinket
     /// * nano168

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ members = [`
`31`	`31`	`"examples/arduino-uno",`
`32`	`32`	`"examples/nano168",`
`33`	`33`	`"examples/sparkfun-promicro",`
	`34`	`+ "examples/sparkfun-promini-5v",`
`34`	`35`	`"examples/trinket-pro",`
`35`	`36`	`"examples/trinket",`
`36`	`37`	`]`