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

Revert "new ota logic"

Browse Source 
This reverts commit c61a586595.
This commit is contained in:
Empire Phoenix
2026-03-17 22:17:47 +01:00
parent ce981232f0
commit 66e1fe63e0
15 changed files with 401 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Software/MainBoard/rust/src/plant_state.rs
View File

@@ -16,6 +16,7 @@ pub enum MoistureSensorError {
#[derive(Debug, PartialEq, Serialize)]
pub enum MoistureSensorState {
Disabled,
MoistureValue { raw_hz: f32, moisture_percent: f32 },
SensorError(MoistureSensorError),
}
@@ -116,11 +117,12 @@ impl PlantState {
plant_id: usize,
board: &mut HAL<'_>,
) -> Self {
let sensor_a = {
//if board.board_hal.get_config().plants[plant_id].sensor_a {
let sensor_a = { //if board.board_hal.get_config().plants[plant_id].sensor_a {
let raw = moistures.sensor_a_hz[plant_id];
match raw {
None => MoistureSensorState::SensorError(MoistureSensorError::NoMessage),
None => {
MoistureSensorState::SensorError(MoistureSensorError::NoMessage)
}
Some(raw) => {
match map_range_moisture(
raw,
@@ -139,15 +141,17 @@ impl PlantState {
}
}
}
}; // else {
// MoistureSensorState::Disabled
//};
let sensor_b = {
//if board.board_hal.get_config().plants[plant_id].sensor_b {
}; // else {
// MoistureSensorState::Disabled
//};
let sensor_b = { //if board.board_hal.get_config().plants[plant_id].sensor_b {
let raw = moistures.sensor_b_hz[plant_id];
match raw {
None => MoistureSensorState::SensorError(MoistureSensorError::NoMessage),
None => {
MoistureSensorState::SensorError(MoistureSensorError::NoMessage)
}
Some(raw) => {
match map_range_moisture(
raw,
@@ -167,8 +171,8 @@ impl PlantState {
}
}
}; // else {
// MoistureSensorState::Disabled
//};
// MoistureSensorState::Disabled
//};
let previous_pump = board.board_hal.get_esp().last_pump_time(plant_id);
let consecutive_pump_count = board.board_hal.get_esp().consecutive_pump_count(plant_id);