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

Fix ota, use MMU to determine running partition, use RMW wrapper for ota_data partition (littelfs handles this internally, so it was no problem prior)

Browse Source
This commit is contained in:
Empire Phoenix
2026-03-18 01:22:33 +01:00
parent 66e1fe63e0
commit 39e4e733f3
11 changed files with 220 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@ pub enum MoistureSensorError {
#[derive(Debug, PartialEq, Serialize)]
pub enum MoistureSensorState {
Disabled,
MoistureValue { raw_hz: f32, moisture_percent: f32 },
SensorError(MoistureSensorError),
}
@@ -117,12 +116,11 @@ 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,
@@ -141,17 +139,15 @@ impl PlantState {
}
}
}
}; // else {
// MoistureSensorState::Disabled
//};
// MoistureSensorState::Disabled
//};
let sensor_b = { //if board.board_hal.get_config().plants[plant_id].sensor_b {
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,
@@ -171,8 +167,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);