Cargo.lock

@@ -239,7 +239,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "charge-controller-supervisor"
-version = "1.9.9-pre-30"
+version = "1.9.9-pre-29"
 dependencies = [
  "bitflags 2.7.0",
  "chrono",
@@ -2205,7 +2205,7 @@ dependencies = [
 
 [[package]]
 name = "tesla-charge-controller"
-version = "1.9.9-pre-30"
+version = "1.9.9-pre-29"
 dependencies = [
  "chrono",
  "clap",

Cargo.toml

@@ -4,7 +4,7 @@ default-members = ["charge-controller-supervisor"]
 resolver = "2"
 
 [workspace.package]
-version = "1.9.9-pre-30"
+version = "1.9.9-pre-29"
 
 [workspace.lints.clippy]
 pedantic = "warn"

charge-controller-supervisor/src/controller.rs

@@ -101,19 +101,19 @@ impl Controller {
         let data = self.inner.refresh().await?;
 
         if let Some(tx) = self.voltage_tx.as_mut() {
-            if crate::config::access_config()
+            // if crate::config::access_config()
-                .await
+            //     .await
-                .enable_secondary_control
+            //     .enable_secondary_control
-            {
+            // {
-                let target = data.common().target_voltage;
+            let target = data.common().target_voltage;
-                log::debug!(
+            log::debug!(
-                    "tristar {}: primary: sending target voltage {}",
+                "tristar {}: primary: sending target voltage {}",
-                    self.name,
+                self.name,
-                    target
+                target
-                );
+            );
 
-                tx.send(VoltageCommand::Set(target))?;
+            tx.send(VoltageCommand::Set(target))?;
-            }
+            // }
         }
 
         *self.data.write_state().await = Some(data);
@@ -137,7 +137,7 @@ impl Controller {
     }
 
     pub fn name(&self) -> &str {
-        self.name.as_str()
+        &self.name
     }
 
     pub fn set_tx_to_secondary(&mut self, tx: tokio::sync::watch::Sender<VoltageCommand>) {

charge-controller-supervisor/src/controller/tristar.rs

@@ -840,9 +840,9 @@ impl Tristar {
 
     pub async fn set_target_voltage(&mut self, target_voltage: f64) -> eyre::Result<()> {
         let scaled_voltage: u16 = self.scale_voltage(target_voltage);
-        self.modbus
+        // self.modbus
-            .write_single_register(TristarRamAddress::VbRefSlave as u16, scaled_voltage)
+        //     .write_single_register(TristarRamAddress::VbRefSlave as u16, scaled_voltage)
-            .await??;
+        //     .await??;
 
         log::debug!(
             "tristar {} being set to voltage {target_voltage} (scaled: {scaled_voltage:#X?})",

charge-controller-supervisor/src/main.rs

@@ -150,7 +150,6 @@ async fn watch(args: Args) -> eyre::Result<()> {
         follow_voltage_tx,
     ));
     let server_task = tokio::task::spawn(server.launch());
-    log::warn!("...started!");
 
     tokio::select! {
         v = controller_tasks.next() => {

rust-toolchain.toml

@@ -1,3 +1,2 @@
 [toolchain]
-channel = "nightly-2025-01-16"
+channel = "nightly"
-targets = ["aarch64-unknown-linux-musl"]

tesla-charge-controller/src/api/http.rs

@@ -95,7 +95,6 @@ impl Vehicle {
         Ok(state.charge_state)
     }
 
-    #[expect(dead_code, reason = "active charge control not yet implemented")]
     pub async fn set_charging_amps(&self, charging_amps: i64) -> eyre::Result<()> {
         self.client
             .post(format!(

tesla-charge-controller/src/api/mod.rs

@@ -42,11 +42,11 @@ impl Car {
         }
     }
 
-    pub const fn vehicle(&self) -> &http::Vehicle {
+    pub fn vehicle(&self) -> &http::Vehicle {
         &self.vehicle
     }
 
-    pub const fn state(&self) -> &tokio::sync::RwLock<CarState> {
+    pub fn state(&self) -> &tokio::sync::RwLock<CarState> {
         &self.state
     }
 }
@@ -153,7 +153,7 @@ impl ChargeState {
     }
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
 pub enum ChargingState {
     Charging,
     Stopped,

tesla-charge-controller/src/config.rs

@@ -60,7 +60,7 @@ impl ConfigWatcher {
 async fn overwrite_config(config: Config) -> eyre::Result<()> {
     *CONFIG
         .get()
-        .ok_or_else(|| eyre::eyre!("could not get config"))?
+        .ok_or(eyre::eyre!("could not get config"))?
         .write()
         .await = config;
     Ok(())

tesla-charge-controller/src/control.rs

@@ -4,7 +4,6 @@ pub struct VehicleController {
     control_state: ChargeRateControllerState,
 }
 
-#[expect(dead_code, reason = "not all states are currently in use")]
 pub enum ChargeRateControllerState {
     Inactive,
     Charging { rate_amps: i64 },
@@ -15,7 +14,7 @@ pub enum InterfaceRequest {
 }
 
 impl VehicleController {
-    pub const fn new(
+    pub fn new(
         car: std::sync::Arc<crate::api::Car>,
         requests: tokio::sync::mpsc::UnboundedReceiver<InterfaceRequest>,
     ) -> Self {
@@ -51,10 +50,7 @@ impl VehicleController {
         }
         match self.control_state {
             ChargeRateControllerState::Inactive => {
-                let car_state = self.car.state().read().await;
+                if let Some(state) = self.car.state().read().await.charge_state().await {
-                let state = car_state.charge_state().await;
-
-                if let Some(state) = state {
                     if state.is_charging() {
                         self.control_state = ChargeRateControllerState::Charging {
                             rate_amps: state.charge_amps,
@@ -62,14 +58,10 @@ impl VehicleController {
                     }
                 }
             }
-            ChargeRateControllerState::Charging { rate_amps: _ } => todo!(),
+            ChargeRateControllerState::Charging { rate_amps } => todo!(),
         }
     }
 
-    #[expect(
-        clippy::needless_pass_by_ref_mut,
-        reason = "this will eventually need to mutate self"
-    )]
     pub async fn process_requests(&mut self, req: InterfaceRequest) {
         if let Err(e) = match req {
             InterfaceRequest::FlashLights => self.car.vehicle().flash_lights().await,

tesla-charge-controller/src/main.rs

@@ -1,5 +1,3 @@
-#![allow(clippy::significant_drop_tightening)]
-
 use std::path::PathBuf;
 
 use clap::Parser;

tesla-charge-controller/src/server/mod.rs

@@ -27,7 +27,7 @@ pub struct ServerState {
 }
 
 impl ServerState {
-    pub const fn new(car: Arc<Car>, api_requests: UnboundedSender<InterfaceRequest>) -> Self {
+    pub fn new(car: Arc<Car>, api_requests: UnboundedSender<InterfaceRequest>) -> Self {
         Self { car, api_requests }
     }
 }

tesla-charge-controller/src/server/static_handler.rs

@@ -52,12 +52,10 @@ impl Handler for UiStatic {
                             data: v.contents().to_vec(),
                             name: p,
                         })
-                        .or_else(|| {
+                        .or(UI_DIR_FILES.get_file(&plus_index).map(|v| RawHtml {
-                            UI_DIR_FILES.get_file(&plus_index).map(|v| RawHtml {
+                            data: v.contents().to_vec(),
-                                data: v.contents().to_vec(),
+                            name: plus_index,
-                                name: plus_index,
+                        }));
-                            })
-                        });
                     file.respond_to(req).or_forward((data, Status::NotFound))
                 }
             }