diff --git a/rust/src/main.rs b/rust/src/main.rs index e6c074b..b77f088 100644 --- a/rust/src/main.rs +++ b/rust/src/main.rs @@ -100,16 +100,6 @@ impl WaitType { } } -#[derive(Serialize, Deserialize, Debug, PartialEq, Default)] -///mqtt struct to track pump activities -struct PumpInfo { - enabled: bool, - pump_ineffective: bool, - median_current_ma: u16, - max_current_ma: u16, - min_current_ma: u16, -} - #[derive(Serialize)] pub struct PumpResult { median_current_ma: u16, @@ -848,7 +838,7 @@ async fn pump_info( min_current_ma: u16, _error: bool, ) { - let pump_info = PumpInfo { + let pump_info = mqtt::PumpInfo { enabled: pump_active, pump_ineffective, median_current_ma, diff --git a/rust/src/mqtt.rs b/rust/src/mqtt.rs index b9db8fa..7211013 100644 --- a/rust/src/mqtt.rs +++ b/rust/src/mqtt.rs @@ -26,6 +26,15 @@ pub struct LightState { pub is_day: bool, } +#[derive(Serialize, Deserialize, Debug, PartialEq, Default)] +pub struct PumpInfo { + pub enabled: bool, + pub pump_ineffective: bool, + pub median_current_ma: u16, + pub max_current_ma: u16, + pub min_current_ma: u16, +} + static MQTT_CONNECTED_EVENT_RECEIVED: AtomicBool = AtomicBool::new(false); static MQTT_ROUND_TRIP_RECEIVED: AtomicBool = AtomicBool::new(false); pub static MQTT_STAY_ALIVE: AtomicBool = AtomicBool::new(false);