C3MA/PlantCtrl
6
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

adjustments for 3.0 pcb

Browse Source
This commit is contained in:
Empire
2024-06-18 20:34:35 +02:00
parent 4d92e0c2a6
commit d2fb6b8411
4 changed files with 150 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
rust/src/main.rs
View File

@@ -74,7 +74,6 @@ struct LightState {
struct PlantState {
a: Option<u8>,
b: Option<u8>,
p: Option<u8>,
consecutive_pump_count: u32,
after_p: Option<u8>,
do_water: bool,
@@ -86,7 +85,6 @@ struct PlantState {
no_water: bool,
sensor_error_a: Option<SensorError>,
sensor_error_b: Option<SensorError>,
sensor_error_p: Option<SensorError>,
out_of_work_hour: bool,
next_pump: Option<DateTime<Tz>>,
}
@@ -120,8 +118,6 @@ struct TankStateMQTT {
struct PlantStateMQTT<'a> {
a: &'a str,
b: &'a str,
p_start: &'a str,
p_end: &'a str,
mode: &'a str,
consecutive_pump_count: u32,
dry: bool,
@@ -438,18 +434,6 @@ fn safe_main() -> anyhow::Result<()> {
let plant_config = config.plants[plant];
if plant_config.sensor_p {
match map_range_moisture(
board.measure_moisture_hz(plant, plant_hal::Sensor::PUMP)? as f32,
) {
Ok(p) => state.p = Some(p),
Err(err) => {
board.fault(plant, true);
state.sensor_error_p = Some(err);
}
}
}
println!(
"Trying to pump for {}s with pump {} now",
plant_config.pump_time_s, plant
@@ -463,48 +447,11 @@ fn safe_main() -> anyhow::Result<()> {
state.active = true;
for _ in 0..plant_config.pump_time_s {
unsafe { vTaskDelay(CONFIG_FREERTOS_HZ) };
let p_live_topic = format!("/plant{} p live", plant + 1);
if plant_config.sensor_p {
let moist = map_range_moisture(
board.measure_moisture_hz(plant, plant_hal::Sensor::PUMP)? as f32,
);
if online_mode == OnlineMode::Online {
let _ = board.mqtt_publish(
&config,
&p_live_topic,
option_to_string(&moist.ok()).as_bytes(),
);
}
} else {
if online_mode == OnlineMode::Online {
let _ =
board.mqtt_publish(&config, &p_live_topic, "disabled".as_bytes());
}
}
//info message or something?
}
board.pump(plant, false)?;
}
if plant_config.sensor_p {
match map_range_moisture(
board.measure_moisture_hz(plant, plant_hal::Sensor::PUMP)? as f32,
) {
Ok(p) => state.after_p = Some(p),
Err(err) => {
board.fault(plant, true);
state.sensor_error_p = Some(err);
}
}
if state.after_p.is_none()
|| state.p.is_none()
|| state.after_p.unwrap() < state.p.unwrap() + 5
{
state.pump_error = true;
board.fault(plant, true);
//mqtt sync pump error value
}
}
}
None => {
println!("Nothing to do");
@@ -896,10 +843,7 @@ fn determine_next_plant(
}
}
if state.sensor_error_a.is_some()
|| state.sensor_error_b.is_some()
|| state.sensor_error_p.is_some()
{
if state.sensor_error_a.is_some() || state.sensor_error_b.is_some() {
board.fault(plant, true);
}
if !state.dry {
@@ -936,8 +880,6 @@ fn update_plant_state(
let mode = format!("{:?}", plant_config.mode);
let plant_dto = PlantStateMQTT {
p_start: &sensor_to_string(&state.p, &state.sensor_error_p, plant_config.sensor_p),
p_end: &sensor_to_string(&state.after_p, &state.sensor_error_p, plant_config.sensor_p),
a: &sensor_to_string(
&state.a,
&state.sensor_error_a,
@@ -1108,10 +1050,3 @@ fn in_time_range(cur: &DateTime<Tz>, start: u8, end: u8) -> bool {
return curhour > start || curhour < end;
}
}
fn option_to_string(value: &Option<u8>) -> String {
match value {
Some(v) => v.to_string(),
None => "Error".to_owned(),
}
}