diff --git a/Cargo.lock b/Cargo.lock index 19b504d..79ddf1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2633,7 +2633,7 @@ dependencies = [ [[package]] name = "tesla-charge-controller" -version = "1.0.24" +version = "1.0.25" dependencies = [ "chrono", "clap 4.4.11", diff --git a/Cargo.toml b/Cargo.toml index 0301f87..0f39f16 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tesla-charge-controller" -version = "1.0.24" +version = "1.0.25" edition = "2021" license = "MITNFA" description = "Controls Tesla charge rate based on solar charge data" diff --git a/src/server/mod.rs b/src/server/mod.rs index cba82bd..2704551 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -116,13 +116,13 @@ async fn control_state(state: &State) -> Result, } #[post("/flash")] -async fn flash(state: &State, remote_addr: std::net::SocketAddr) { +async fn flash(state: &State, remote_addr: std::net::IpAddr) { log::warn!("flash requested: {remote_addr:?}"); let _ = state.api_requests.send(InterfaceRequest::FlashLights); } #[post("/disable-control")] -async fn disable_control(state: &State, remote_addr: std::net::SocketAddr) { +async fn disable_control(state: &State, remote_addr: std::net::IpAddr) { log::warn!("disabling control: {remote_addr:?}"); match state .tcrc_requests @@ -134,7 +134,7 @@ async fn disable_control(state: &State, remote_addr: std::net::Sock } #[post("/enable-control")] -async fn enable_control(state: &State, remote_addr: std::net::SocketAddr) { +async fn enable_control(state: &State, remote_addr: std::net::IpAddr) { log::warn!("enabling control: {remote_addr:?}"); match state .tcrc_requests @@ -146,33 +146,33 @@ async fn enable_control(state: &State, remote_addr: std::net::Socke } #[post("/set-max/")] -async fn set_max(limit: i64, remote_addr: std::net::SocketAddr) { +async fn set_max(limit: i64, remote_addr: std::net::IpAddr) { log::warn!("setting max: {remote_addr:?}"); let limit = limit.clamp(access_config().min_rate, 15); write_to_config().max_rate = limit; } #[post("/set-min/")] -async fn set_min(limit: i64, remote_addr: std::net::SocketAddr) { +async fn set_min(limit: i64, remote_addr: std::net::IpAddr) { log::warn!("setting min: {remote_addr:?}"); let limit = limit.clamp(3, access_config().max_rate); write_to_config().min_rate = limit; } #[post("/pid-settings/proportional/")] -async fn set_proportional_gain(gain: f64, remote_addr: std::net::SocketAddr) { +async fn set_proportional_gain(gain: f64, remote_addr: std::net::IpAddr) { log::warn!("setting proportional gain: {remote_addr:?}"); write_to_config().pid_controls.proportional_gain = gain; } #[post("/pid-settings/derivative/")] -async fn set_derivative_gain(gain: f64, remote_addr: std::net::SocketAddr) { +async fn set_derivative_gain(gain: f64, remote_addr: std::net::IpAddr) { log::warn!("setting derivative gain: {remote_addr:?}"); write_to_config().pid_controls.derivative_gain = gain; } #[post("/pid-settings/loop_time_seconds/