Cargo.lock

@@ -327,10 +327,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "panic-halt"
-version = "0.2.0"
+name = "panic-abort"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de96540e0ebde571dc55c73d60ef407c653844e6f9a1e2fdbd40c07b9252d812"
+checksum = "4e20e6499bbbc412f280b04a42346b356c6fa0753d5fd22b7bd752ff34c778ee"
 
 [[package]]
 name = "panic-semihosting"
@@ -563,7 +563,7 @@ dependencies = [
  "nb 1.0.0",
  "nom",
  "num-traits",
- "panic-halt",
+ "panic-abort",
  "panic-semihosting",
  "serde",
  "serde-json-core",

Cargo.toml

@@ -7,14 +7,14 @@ authors = ["Astro <astro@spaceboyz.net>"]
 version = "0.0.0"
 keywords = ["thermostat", "laser", "physics"]
 repository = "https://git.m-labs.hk/M-Labs/thermostat"
-edition = "2021"
+edition = "2018"
 
 [package.metadata.docs.rs]
 features = []
 default-target = "thumbv7em-none-eabihf"
 
 [dependencies]
-panic-halt = "0.2"
+panic-abort = "0.3"
 panic-semihosting = { version = "0.5", optional = true }
 log = "0.4"
 bare-metal = "1"

README.md

@@ -29,7 +29,7 @@ Alternatively, you can install the Rust toolchain without Nix using rustup; see
 
 Connect SWDIO/SWCLK/RST/GND to a programmer such as ST-Link v2.1. Run OpenOCD:
 ```shell
-openocd -f interface/stlink.cfg -f target/stm32f4x.cfg
+openocd -f interface/stlink-v2-1.cfg -f target/stm32f4x.cfg
 ```
 
 You may need to power up the programmer before powering the device.
@@ -64,7 +64,7 @@ On a Windows machine install [st.com](https://st.com) DfuSe USB device firmware
 
 ### OpenOCD
 ```shell
-openocd -f interface/stlink.cfg -f target/stm32f4x.cfg -c "program target/thumbv7em-none-eabihf/release/thermostat verify reset;exit"
+openocd -f interface/stlink-v2-1.cfg -f target/stm32f4x.cfg -c "program target/thumbv7em-none-eabihf/release/thermostat verify reset;exit"
 ```
 
 ## Network
@@ -184,7 +184,7 @@ postfilter rate can be tuned with the `postfilter` command.
 - Connect TEC module device 1 to TEC1- and TEC1+.
 - The GND pin is for shielding not for sinking TEC module currents.
 
-When using a TEC module with the Thermostat, the Thermostat expects the thermal load (where the thermistor is located) to cool down with a positive software current set point, and heat up with a negative current set point.
+When using a TEC module with the Thermostat, the Thermostat expects the thermal load (where the thermistor is located) to heat up with a positive software current set point, and cool down with a negative current set point.
 
 Testing heat flow direction with a low set current is recommended before installation of the TEC module.
 
@@ -258,12 +258,13 @@ with the following keys.
 | Key            | Unit            | Description                                          |
 | ---            | :---:           | ---                                                  |
 | `channel`      | Integer         | Channel `0`, or `1`                                  |
-| `time`         | Seconds         | Temperature measurement time                         |
+| `time`         | Milliseconds    | Temperature measurement time                         |
 | `adc`          | Volts           | AD7172 input                                         |
 | `sens`         | Ohms            | Thermistor resistance derived from `adc`             |
 | `temperature`  | Degrees Celsius | Steinhart-Hart conversion result derived from `sens` |
 | `pid_engaged`  | Boolean         | `true` if in closed-loop mode                        |
 | `i_set`        | Amperes         | TEC output current                                   |
+| `vref`         | Volts           | MAX1968 VREF (1.5 V)                                 |
 | `dac_value`    | Volts           | AD5680 output derived from `i_set`                   |
 | `dac_feedback` | Volts           | ADC measurement of the AD5680 output                 |
 | `i_tec`        | Volts           | MAX1968 TEC current monitor                          |
@@ -271,19 +272,18 @@ with the following keys.
 | `tec_u_meas`   | Volts           | Measurement of the voltage across the TEC            |
 | `pid_output`   | Amperes         | PID control output                                   |
 
-Note: With Thermostat v2 and below, the voltage and current readouts `i_tec` and `tec_i` are disabled and null due to faulty hardware that introduces a lot of noise in the signal.
-
 ## PID Tuning
 
 The thermostat implements a PID control loop for each of the TEC channels, more details on setting up the PID control loop can be found [here](./doc/PID%20tuning.md).
 
 ## Fan control
 
-Fan control commands are available for thermostat revisions with an integrated fan system:
+Fan control is available for the thermostat revisions with integrated fan system. For this purpose four commands are available:
 1. `fan` - show fan stats: `fan_pwm`, `abs_max_tec_i`, `auto_mode`, `k_a`, `k_b`, `k_c`.
-2. `fan auto` - enable auto speed controller mode, where fan speed is controlled by the fan curve `fcurve`.
-3. `fan <value>` - set the fan power with the value from `1` to `100` and disable auto mode. There is no way to completely disable the fan.
+2. `fan auto` - enable auto speed controller mode, which correlates with fan curve `fcurve`.
+3. `fan <value>` - set the fan power with the value from `1` to `100` and disable auto mode. There is no way to disable the fan.
 Please note that power doesn't correlate with the actual speed linearly.
-4. `fcurve <a> <b> <c>` - set coefficients of the controlling curve `a*x^2 + b*x + c`, where `x` is `abs_max_tec_i/MAX_TEC_I`, a normalized value in range [0,1],
-i.e. the (linear) proportion of current output capacity used, on the channel with the largest current flow. The controlling curve is also clamped to [0,1].
-5. `fcurve default` - restore fan curve coefficients to defaults: `a = 1.0, b = 0.0, c = 0.0`.
+4. `fcurve <a> <b> <c>` - set coefficients of the controlling curve `a*x^2 + b*x + c`, where `x` is `abs_max_tec_i/MAX_TEC_I`, 
+i.e. receives values from 0 to 1 linearly tied to the maximum current. The controlling curve should produce values from 0 to 1,
+as below and beyond values would be substituted by 0 and 1 respectively.
+5. `fcurve default` - restore fan curve settings to defaults: `a = 1.0, b = 0.0, c = 0.0`.

flake.lock

@@ -3,11 +3,11 @@
     "mozilla-overlay": {
       "flake": false,
       "locked": {
-        "lastModified": 1690536331,
-        "narHash": "sha256-aRIf2FB2GTdfF7gl13WyETmiV/J7EhBGkSWXfZvlxcA=",
+        "lastModified": 1638887313,
+        "narHash": "sha256-FMYV6rVtvSIfthgC1sK1xugh3y7muoQcvduMdriz4ag=",
         "owner": "mozilla",
         "repo": "nixpkgs-mozilla",
-        "rev": "db89c8707edcffefcd8e738459d511543a339ff5",
+        "rev": "7c1e8b1dd6ed0043fb4ee0b12b815256b0b9de6f",
         "type": "github"
       },
       "original": {
@@ -18,16 +18,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1691421349,
-        "narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=",
+        "lastModified": 1641870998,
+        "narHash": "sha256-6HkxR2WZsm37VoQS7jgp6Omd71iw6t1kP8bDbaqCDuI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "011567f35433879aae5024fc6ec53f2a0568a6c4",
+        "rev": "386234e2a61e1e8acf94dfa3a3d3ca19a6776efb",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-21.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,15 +1,15 @@
 {
   description = "Firmware for the Sinara 8451 Thermostat";
 
-  inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
+  inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;
   inputs.mozilla-overlay = { url = github:mozilla/nixpkgs-mozilla; flake = false; };
 
   outputs = { self, nixpkgs, mozilla-overlay }:
     let
       pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; };
       rustManifest = pkgs.fetchurl {
-        url = "https://static.rust-lang.org/dist/2022-12-15/channel-rust-stable.toml";
-        hash = "sha256-S7epLlflwt0d1GZP44u5Xosgf6dRrmr8xxC+Ml2Pq7c=";
+        url = "https://static.rust-lang.org/dist/2021-10-26/channel-rust-nightly.toml";
+        sha256 = "sha256-1hLbypXA+nuH7o3AHCokzSBZAvQxvef4x9+XxO3aBao=";
       };
 
       targets = [
@@ -22,12 +22,12 @@
           inherit targets;
           extensions = ["rust-src"];
         };
-      rust = rustChannelOfTargets "stable" null targets;
+      rust = rustChannelOfTargets "nightly" null targets;
       rustPlatform = pkgs.recurseIntoAttrs (pkgs.makeRustPlatform {
         rustc = rust;
         cargo = rust;
       });
-      thermostat = rustPlatform.buildRustPackage {
+      thermostat = rustPlatform.buildRustPackage rec {
         name = "thermostat";
         version = "0.0.0";
 
@@ -67,7 +67,9 @@
       devShell.x86_64-linux = pkgs.mkShell {
         name = "thermostat-dev-shell";
         buildInputs = with pkgs; [
-          rust openocd dfu-util
+          rustPlatform.rust.rustc
+          rustPlatform.rust.cargo
+          openocd dfu-util
           ] ++ (with python3Packages; [
             numpy matplotlib
           ]);

src/channel_state.rs

@@ -2,13 +2,11 @@ use smoltcp::time::{Duration, Instant};
 use uom::si::{
     f64::{
         ElectricPotential,
-        ElectricCurrent,
         ElectricalResistance,
         ThermodynamicTemperature,
         Time,
     },
     electric_potential::volt,
-    electric_current::ampere,
     electrical_resistance::ohm,
     thermodynamic_temperature::degree_celsius,
     time::millisecond,
@@ -28,10 +26,11 @@ pub struct ChannelState {
     pub adc_calibration: ad7172::ChannelCalibration,
     pub adc_time: Instant,
     pub adc_interval: Duration,
+    /// VREF for the TEC (1.5V)
+    pub vref: ElectricPotential,
     /// i_set 0A center point
     pub center: CenterPoint,
     pub dac_value: ElectricPotential,
-    pub i_set: ElectricCurrent,
     pub pid_engaged: bool,
     pub pid: pid::Controller,
     pub sh: sh::Parameters,
@@ -45,9 +44,10 @@ impl ChannelState {
             adc_time: Instant::from_secs(0),
             // default: 10 Hz
             adc_interval: Duration::from_millis(100),
+            // updated later with Channels.read_vref()
+            vref: ElectricPotential::new::<volt>(1.5),
             center: CenterPoint::Vref,
             dac_value: ElectricPotential::new::<volt>(0.0),
-            i_set: ElectricCurrent::new::<ampere>(0.0),
             pid_engaged: false,
             pid: pid::Controller::new(pid::Parameters::default()),
             sh: sh::Parameters::default(),

src/channels.rs

@@ -20,7 +20,6 @@ use crate::{
     command_handler::JsonBuffer,
     pins,
     steinhart_hart,
-    hw_rev,
 };
 
 pub const CHANNELS: usize = 2;
@@ -29,18 +28,17 @@ pub const R_SENSE: f64 = 0.05;
 const DAC_OUT_V_MAX: f64 = 3.0;
 
 // TODO: -pub
-pub struct Channels<'a> {
+pub struct Channels {
     channel0: Channel<Channel0>,
     channel1: Channel<Channel1>,
     pub adc: ad7172::Adc<pins::AdcSpi, pins::AdcNss>,
     /// stm32f4 integrated adc
     pins_adc: pins::PinsAdc,
     pub pwm: pins::PwmPins,
-    hwrev: &'a hw_rev::HWRev,
 }
 
-impl<'a> Channels<'a> {
-    pub fn new(pins: pins::Pins, hwrev: &'a hw_rev::HWRev) -> Self {
+impl Channels {
+    pub fn new(pins: pins::Pins) -> Self {
         let mut adc = ad7172::Adc::new(pins.adc_spi, pins.adc_nss).unwrap();
         // Feature not used
         adc.set_sync_enable(false).unwrap();
@@ -58,8 +56,9 @@ impl<'a> Channels<'a> {
         let channel1 = Channel::new(pins.channel1, adc_calibration1);
         let pins_adc = pins.pins_adc;
         let pwm = pins.pwm;
-        let mut channels = Channels { channel0, channel1, adc, pins_adc, pwm, hwrev };
+        let mut channels = Channels { channel0, channel1, adc, pins_adc, pwm };
         for channel in 0..CHANNELS {
+            channels.channel_state(channel).vref = channels.read_vref(channel);
             channels.calibrate_dac_value(channel);
             channels.set_i(channel, ElectricCurrent::new::<ampere>(0.0));
         }
@@ -99,8 +98,11 @@ impl<'a> Channels<'a> {
     /// calculate the TEC i_set centerpoint
     pub fn get_center(&mut self, channel: usize) -> ElectricPotential {
         match self.channel_state(channel).center {
-            CenterPoint::Vref =>
-                self.read_vref(channel),
+            CenterPoint::Vref => {
+                let vref = self.read_vref(channel);
+                self.channel_state(channel).vref = vref;
+                vref
+            },
             CenterPoint::Override(center_point) =>
                 ElectricPotential::new::<volt>(center_point.into()),
         }
@@ -113,8 +115,11 @@ impl<'a> Channels<'a> {
     }
 
     pub fn get_i(&mut self, channel: usize) -> ElectricCurrent {
-        let i_set = self.channel_state(channel).i_set;
-        i_set
+        let center_point = self.get_center(channel);
+        let r_sense = ElectricalResistance::new::<ohm>(R_SENSE);
+        let voltage = self.get_dac(channel);
+        let i_tec = (voltage - center_point) / (10.0 * r_sense);
+        i_tec
     }
 
     /// i_set DAC
@@ -129,7 +134,7 @@ impl<'a> Channels<'a> {
         voltage
     }
 
-    pub fn set_i(&mut self, channel: usize, i_set: ElectricCurrent) -> ElectricCurrent {
+    pub fn set_i(&mut self, channel: usize, i_tec: ElectricCurrent) -> ElectricCurrent {
         let vref_meas = match channel.into() {
             0 => self.channel0.vref_meas,
             1 => self.channel1.vref_meas,
@@ -137,11 +142,10 @@ impl<'a> Channels<'a> {
         };
         let center_point = vref_meas;
         let r_sense = ElectricalResistance::new::<ohm>(R_SENSE);
-        let voltage = i_set * 10.0 * r_sense + center_point;
+        let voltage = i_tec * 10.0 * r_sense + center_point;
         let voltage = self.set_dac(channel, voltage);
-        let i_set = (voltage - center_point) / (10.0 * r_sense);
-        self.channel_state(channel).i_set = i_set;
-        i_set
+        let i_tec = (voltage - center_point) / (10.0 * r_sense);
+        i_tec
     }
 
     pub fn read_dac_feedback(&mut self, channel: usize) -> ElectricPotential {
@@ -428,9 +432,10 @@ impl<'a> Channels<'a> {
     }
 
     fn report(&mut self, channel: usize) -> Report {
+        let vref = self.channel_state(channel).vref;
         let i_set = self.get_i(channel);
-        let i_tec = if self.hwrev.major > 2 {Some(self.read_itec(channel))} else {None};
-        let tec_i = if self.hwrev.major > 2 {Some(self.get_tec_i(channel))} else {None};
+        let i_tec = self.read_itec(channel);
+        let tec_i = self.get_tec_i(channel);
         let dac_value = self.get_dac(channel);
         let state = self.channel_state(channel);
         let pid_output = ElectricCurrent::new::<ampere>(state.pid.y1);
@@ -444,6 +449,7 @@ impl<'a> Channels<'a> {
                 .map(|temperature| temperature.get::<degree_celsius>()),
             pid_engaged: state.pid_engaged,
             i_set,
+            vref,
             dac_value,
             dac_feedback: self.read_dac_feedback(channel),
             i_tec,
@@ -469,15 +475,6 @@ impl<'a> Channels<'a> {
         serde_json_core::to_vec(&summaries)
     }
 
-    pub fn pid_engaged(&mut self) -> bool {
-        for channel in 0..CHANNELS {
-            if self.channel_state(channel).pid_engaged {
-                return true;
-            }
-        }
-        false
-    }
-
     fn pwm_summary(&mut self, channel: usize) -> PwmSummary {
         PwmSummary {
             channel,
@@ -524,9 +521,9 @@ impl<'a> Channels<'a> {
         serde_json_core::to_vec(&summaries)
     }
 
-    pub fn current_abs_max_tec_i(&mut self) -> ElectricCurrent {
-        max_by(self.get_tec_i(0).abs(),
-               self.get_tec_i(1).abs(),
+    pub fn current_abs_max_tec_i(&mut self) -> f64 {
+        max_by(self.get_tec_i(0).abs().get::<ampere>(),
+               self.get_tec_i(1).abs().get::<ampere>(),
                |a, b| a.partial_cmp(b).unwrap_or(core::cmp::Ordering::Equal))
     }
 }
@@ -541,10 +538,11 @@ pub struct Report {
     temperature: Option<f64>,
     pid_engaged: bool,
     i_set: ElectricCurrent,
+    vref: ElectricPotential,
     dac_value: ElectricPotential,
     dac_feedback: ElectricPotential,
-    i_tec: Option<ElectricPotential>,
-    tec_i: Option<ElectricCurrent>,
+    i_tec: ElectricPotential,
+    tec_i: ElectricCurrent,
     tec_u_meas: ElectricPotential,
     pid_output: ElectricCurrent,
 }

src/command_handler.rs

@@ -13,6 +13,7 @@ use super::{
         PwmPin, 
         ShParameter
     },
+    leds::Leds,
     ad7172,
     CHANNEL_CONFIG_KEY,
     channels::{
@@ -175,16 +176,18 @@ impl Handler {
         Ok(Handler::Handled)
     }
 
-    fn engage_pid (socket: &mut TcpSocket, channels: &mut Channels, channel: usize) -> Result<Handler, Error> {
+    fn engage_pid (socket: &mut TcpSocket, channels: &mut Channels, leds: &mut Leds, channel: usize) -> Result<Handler, Error> {
         channels.channel_state(channel).pid_engaged = true;
+        leds.g3.on();
         send_line(socket, b"{}");
         Ok(Handler::Handled)
     }
 
-    fn set_pwm (socket: &mut TcpSocket, channels: &mut Channels, channel: usize, pin: PwmPin, value: f64) -> Result<Handler, Error> {
+    fn set_pwm (socket: &mut TcpSocket, channels: &mut Channels, leds: &mut Leds, channel: usize, pin: PwmPin, value: f64) -> Result<Handler, Error> {
         match pin {
             PwmPin::ISet => {
                 channels.channel_state(channel).pid_engaged = false;
+                leds.g3.off();
                 let current = ElectricCurrent::new::<ampere>(value);
                 channels.set_i(channel, current);
                 channels.power_up(channel);
@@ -207,11 +210,11 @@ impl Handler {
     }
 
     fn set_center_point(socket: &mut TcpSocket, channels: &mut Channels, channel: usize, center: CenterPoint) -> Result<Handler, Error> {
-        let i_set = channels.get_i(channel);
+        let i_tec = channels.get_i(channel);
         let state = channels.channel_state(channel);
         state.center = center;
         if !state.pid_engaged {
-            channels.set_i(channel, i_set);
+            channels.set_i(channel, i_tec);
         }
         send_line(socket, b"{}");
         Ok(Handler::Handled)
@@ -412,7 +415,7 @@ impl Handler {
         }
     }
 
-    pub fn handle_command(command: Command, socket: &mut TcpSocket, channels: &mut Channels, session: &Session, store: &mut FlashStore, ipv4_config: &mut Ipv4Config, fan_ctrl: &mut FanCtrl, hwrev: HWRev) -> Result<Self, Error> {
+    pub fn handle_command(command: Command, socket: &mut TcpSocket, channels: &mut Channels, session: &Session, leds: &mut Leds, store: &mut FlashStore, ipv4_config: &mut Ipv4Config, fan_ctrl: &mut FanCtrl, hwrev: HWRev) -> Result<Self, Error> {
         match command {
             Command::Quit => Ok(Handler::CloseSocket),
             Command::Reporting(_reporting) => Handler::reporting(socket),            
@@ -423,8 +426,8 @@ impl Handler {
             Command::Show(ShowCommand::SteinhartHart) => Handler::show_steinhart_hart(socket, channels),
             Command::Show(ShowCommand::PostFilter) => Handler::show_post_filter(socket, channels),
             Command::Show(ShowCommand::Ipv4) => Handler::show_ipv4(socket, ipv4_config),
-            Command::PwmPid { channel } => Handler::engage_pid(socket, channels, channel),
-            Command::Pwm { channel, pin, value } => Handler::set_pwm(socket, channels, channel, pin, value),
+            Command::PwmPid { channel } => Handler::engage_pid(socket, channels, leds, channel),
+            Command::Pwm { channel, pin, value } => Handler::set_pwm(socket, channels, leds, channel, pin, value),
             Command::CenterPoint { channel, center } => Handler::set_center_point(socket, channels, channel, center),
             Command::Pid { channel, parameter, value } => Handler::set_pid(socket, channels, channel, parameter, value),
             Command::SteinhartHart { channel, parameter, value } => Handler::set_steinhart_hart(socket, channels, channel, parameter, value),

src/dfu.rs

@@ -1,4 +1,3 @@
-use core::arch::asm;
 use cortex_m_rt::pre_init;
 use stm32f4xx_hal::stm32::{RCC, SYSCFG};
 

src/fan_ctrl.rs

@@ -4,10 +4,7 @@ use stm32f4xx_hal::{
     pwm::{self, PwmChannels},
     pac::TIM8,
 };
-use uom::si::{
-    f64::ElectricCurrent,
-    electric_current::ampere,
-};
+
 use crate::{
     hw_rev::HWSettings,
     command_handler::JsonBuffer,
@@ -53,8 +50,8 @@ impl FanCtrl {
         fan_ctrl
     }
 
-    pub fn cycle(&mut self, abs_max_tec_i: ElectricCurrent) {
-        self.abs_max_tec_i = abs_max_tec_i.get::<ampere>() as f32;
+    pub fn cycle(&mut self, abs_max_tec_i: f32) {
+        self.abs_max_tec_i = abs_max_tec_i;
         if self.fan_auto && self.hw_settings.fan_available {
             let scaled_current = self.abs_max_tec_i / MAX_TEC_I;
             // do not limit upper bound, as it will be limited in the set_pwm()

src/main.rs

@@ -1,10 +1,11 @@
 #![cfg_attr(not(test), no_std)]
 #![cfg_attr(not(test), no_main)]
+#![feature(maybe_uninit_extra, asm)]
 #![cfg_attr(test, allow(unused))]
 // TODO: #![deny(warnings, unused)]
 
 #[cfg(not(any(feature = "semihosting", test)))]
-use panic_halt as _;
+use panic_abort as _;
 #[cfg(all(feature = "semihosting", not(test)))]
 use panic_semihosting as _;
 
@@ -138,7 +139,7 @@ fn main() -> ! {
 
     let mut store = flash_store::store(dp.FLASH);
 
-    let mut channels = Channels::new(pins, &hwrev);
+    let mut channels = Channels::new(pins);
     for c in 0..CHANNELS {
         match store.read_value::<ChannelConfig>(CHANNEL_CONFIG_KEY[c]) {
             Ok(Some(config)) =>
@@ -185,13 +186,7 @@ fn main() -> ! {
                     server.for_each(|_, session| session.set_report_pending(channel.into()));
                 }
 
-                fan_ctrl.cycle(channels.current_abs_max_tec_i());
-
-                if channels.pid_engaged() {
-                    leds.g3.on();
-                } else {
-                    leds.g3.off();
-                }
+                fan_ctrl.cycle(channels.current_abs_max_tec_i() as f32);
 
                 let instant = Instant::from_millis(i64::from(timer::now()));
                 cortex_m::interrupt::free(net::clear_pending);
@@ -216,7 +211,7 @@ fn main() -> ! {
                                 // Do nothing and feed more data to the line reader in the next loop cycle.
                                 Ok(SessionInput::Nothing) => {}
                                 Ok(SessionInput::Command(command)) => {
-                                    match Handler::handle_command(command, &mut socket, &mut channels, session, &mut store, &mut ipv4_config, &mut fan_ctrl, hwrev) {
+                                    match Handler::handle_command(command, &mut socket, &mut channels, session, &mut leds, &mut store, &mut ipv4_config, &mut fan_ctrl, hwrev) {
                                         Ok(Handler::NewIPV4(ip)) => new_ipv4_config = Some(ip),                                
                                         Ok(Handler::Handled) => {},
                                         Ok(Handler::CloseSocket) => socket.close(),

src/server.rs

@@ -1,3 +1,4 @@
+use core::mem::MaybeUninit;
 use smoltcp::{
     iface::EthernetInterface,
     socket::{SocketSet, SocketHandle, TcpSocket, TcpSocketBuffer, SocketRef},
@@ -12,18 +13,6 @@ pub struct SocketState<S> {
     state: S,
 }
 
-impl<'a, S: Default> SocketState<S>{
-    fn new(sockets: &mut SocketSet<'a>, tcp_rx_storage: &'a mut [u8; TCP_RX_BUFFER_SIZE], tcp_tx_storage: &'a mut [u8; TCP_TX_BUFFER_SIZE]) -> SocketState<S> {
-        let tcp_rx_buffer = TcpSocketBuffer::new(&mut tcp_rx_storage[..]);
-        let tcp_tx_buffer = TcpSocketBuffer::new(&mut tcp_tx_storage[..]);
-        let tcp_socket = TcpSocket::new(tcp_rx_buffer, tcp_tx_buffer);
-        SocketState::<S> {
-            handle: sockets.add(tcp_socket),
-            state: S::default()
-        }
-    }
-}
-
 /// Number of server sockets and therefore concurrent client
 /// sessions. Many data structures in `Server::run()` correspond to
 /// this const.
@@ -46,27 +35,28 @@ impl<'a, 'b, S: Default> Server<'a, 'b, S> {
     where
         F: FnOnce(&mut Server<'a, '_, S>),
     {
-        macro_rules! create_rtx_storage {
-            ($rx_storage:ident, $tx_storage:ident) => {
-                let mut $rx_storage = [0; TCP_RX_BUFFER_SIZE];
-                let mut $tx_storage = [0; TCP_TX_BUFFER_SIZE];
-            }
-        }
-
-        create_rtx_storage!(tcp_rx_storage0, tcp_tx_storage0);
-        create_rtx_storage!(tcp_rx_storage1, tcp_tx_storage1);
-        create_rtx_storage!(tcp_rx_storage2, tcp_tx_storage2);
-        create_rtx_storage!(tcp_rx_storage3, tcp_tx_storage3);
-
         let mut sockets_storage: [_; SOCKET_COUNT] = Default::default();
         let mut sockets = SocketSet::new(&mut sockets_storage[..]);
+        let mut states: [SocketState<S>; SOCKET_COUNT] = unsafe { MaybeUninit::uninit().assume_init() };
 
-        let states: [SocketState<S>; SOCKET_COUNT] = [
-            SocketState::<S>::new(&mut sockets, &mut tcp_rx_storage0, &mut tcp_tx_storage0),
-            SocketState::<S>::new(&mut sockets, &mut tcp_rx_storage1, &mut tcp_tx_storage1),
-            SocketState::<S>::new(&mut sockets, &mut tcp_rx_storage2, &mut tcp_tx_storage2),
-            SocketState::<S>::new(&mut sockets, &mut tcp_rx_storage3, &mut tcp_tx_storage3),
-        ];
+        macro_rules! create_socket {
+            ($set:ident, $rx_storage:ident, $tx_storage:ident, $target:expr) => {
+                let mut $rx_storage = [0; TCP_RX_BUFFER_SIZE];
+                let mut $tx_storage = [0; TCP_TX_BUFFER_SIZE];
+                let tcp_rx_buffer = TcpSocketBuffer::new(&mut $rx_storage[..]);
+                let tcp_tx_buffer = TcpSocketBuffer::new(&mut $tx_storage[..]);
+                let tcp_socket = TcpSocket::new(tcp_rx_buffer, tcp_tx_buffer);
+                $target = $set.add(tcp_socket);
+            }
+        }
+        create_socket!(sockets, tcp_rx_storage0, tcp_tx_storage0, states[0].handle);
+        create_socket!(sockets, tcp_rx_storage1, tcp_tx_storage1, states[1].handle);
+        create_socket!(sockets, tcp_rx_storage2, tcp_tx_storage2, states[2].handle);
+        create_socket!(sockets, tcp_rx_storage3, tcp_tx_storage3, states[3].handle);
+
+        for state in &mut states {
+            state.state = S::default();
+        }
 
         let mut server = Server {
             states,