Get aux and UI working

Cargo.toml

@@ -10,6 +10,7 @@ default = ["space_saving", "logging"]
 logging = ["dep:ufmt"]
 space_saving = ["time_u32"]
 time_u32 = []
+has_fet = []
 
 [dependencies]
 avr-device = { version = "0.5.3", features = ["rt", "attiny1616", "critical-section-impl"] }
@@ -37,6 +38,12 @@ avr-progmem = "0.4.0"
 embedded-io = "0.6.1"
 paste = "1.0.14"
 
+cichlid = { git = "https://github.com/simmsb/cichlid", version = "0.2.1", default-features = false, features = [
+    "nightly",
+    "no-std",
+] }
+fixed = "1.25.1"
+
 [dependencies.avr-hal-generic]
 git = "https://github.com/rahix/avr-hal.git"
 

justfile

@@ -1,4 +1,9 @@
 flash:
+  cargo build --release --no-default-features --features "space_saving has_fet"
+  cargo objcopy -q --release --no-default-features --features "space_saving" -- -O ihex target/out.hex
+  pymcuprog -d attiny1616 -t uart -u /dev/cu.usbserial-A50285BI write -f target/out.hex --erase --verify
+
+flash_nofet:
   cargo build --release --no-default-features --features "space_saving"
   cargo objcopy -q --release --no-default-features --features "space_saving" -- -O ihex target/out.hex
   pymcuprog -d attiny1616 -t uart -u /dev/cu.usbserial-A50285BI write -f target/out.hex --erase --verify

rust-toolchain.toml

@@ -1,7 +1,7 @@
 # Before upgrading check that everything is available on all tier1 targets here:
 # https://rust-lang.github.io/rustup-components-history
 [toolchain]
-channel = "nightly-2024-02-04"
-components = [ "rust-src" ]
+channel = "nightly-2024-03-02"
+components = [ "rust-src", "llvm-tools", "rust-analyzer" ]
 profile = "minimal"
 target = "avr-specs/avr-attiny1616.json"

src/adc.rs

@@ -1,4 +1,4 @@
-use core::{marker::PhantomData, task::Poll};
+use core::{marker::PhantomData, ops::Div, task::Poll};
 
 use atxtiny_hal::vref::{ADCReferenceVoltage, ReferenceVoltage, VrefExt};
 use avr_device::attiny1616::{
@@ -114,18 +114,24 @@ impl Temperature<u16> {
 pub struct Voltage<T>(pub T);
 
 impl Voltage<u16> {
-    pub fn volts_times_40(self) -> u8 {
+    pub const fn volts_times_40(self) -> u8 {
         let r = self.0 << 4;
         const NUMERATOR: u32 = (40.0 * 1.5 * 4096.0) as u32;
 
-        (NUMERATOR / (r >> 4) as u32) as u8
+        let n = (r >> 4) as u32;
+
+        if n == 0 {
+            return 0;
+        }
+
+        (NUMERATOR / n) as u8
     }
 
     pub const fn volts_to_adc_output(volts: f32) -> Voltage<u16> {
         Voltage((6144.0 / volts) as u16)
     }
 
-    pub fn volts_times_100(self) -> u16 {
+    pub const fn volts_times_100(self) -> u16 {
         let r = self.volts_times_40() as u16;
         r * 2 + r / 2
     }