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

it's alive

Browse Source
This commit is contained in:
Empire 2025-09-13 01:39:47 +02:00
parent 79087c9353
commit 9de85b6e37
19 changed files with 1567 additions and 1488 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/modules/Sensors_simplified/Sensors/Sensors.kicad_pro
View File

@ -460,6 +460,7 @@
"single_global_label": "ignore", "single_global_label": "ignore",
"unannotated": "error", "unannotated": "error",
"unconnected_wire_endpoint": "warning", "unconnected_wire_endpoint": "warning",
"undefined_netclass": "error",
"unit_value_mismatch": "error", "unit_value_mismatch": "error",
"unresolved_variable": "error", "unresolved_variable": "error",
"wire_dangling": "error" "wire_dangling": "error"

1
rust/.cargo/config.toml
View File

@ -4,6 +4,7 @@ rustflags = [
# NOTE: May negatively impact performance of produced code # NOTE: May negatively impact performance of produced code
"-C", "force-frame-pointers", "-C", "force-frame-pointers",
"-Z", "stack-protector=all", "-Z", "stack-protector=all",
"-C", "link-arg=-Tlinkall.x",
] ]
target = "riscv32imac-unknown-none-elf" target = "riscv32imac-unknown-none-elf"

104
rust/Cargo.toml
View File

@ -1,31 +1,8 @@
[package] [package]
name = "plant-ctrl2"
version = "0.1.0"
authors = ["Empire Phoenix"]
edition = "2021" edition = "2021"
resolver = "2" name = "plant-ctrl2"
#rust-version = "1.71" rust-version = "1.86"
version = "0.1.0"
[profile.dev]
# Explicitly disable LTO which the Xtensa codegen backend has issues
lto = false
strip = false
debug = true
overflow-checks = true
panic = "abort"
incremental = true
opt-level = 2
[profile.release]
# Explicitly disable LTO which the Xtensa codegen backend has issues
lto = false
strip = true
debug = false
overflow-checks = false
panic = "abort"
incremental = true
opt-level = "z"
[package.metadata.cargo_runner] [package.metadata.cargo_runner]
# The string `$TARGET_FILE` will be replaced with the path from cargo. # The string `$TARGET_FILE` will be replaced with the path from cargo.
@ -40,6 +17,26 @@ command = [
"partitions.csv" "partitions.csv"
] ]
[profile.dev]
lto = true
strip = false
debug = false
overflow-checks = true
panic = "abort"
incremental = true
opt-level = "z"
[profile.release]
# Explicitly disable LTO which the Xtensa codegen backend has issues
lto = true
strip = true
debug = false
overflow-checks = true
panic = "abort"
incremental = true
opt-level = "z"
[package.metadata.espflash] [package.metadata.espflash]
partition_table = "partitions.csv" partition_table = "partitions.csv"
@ -78,28 +75,28 @@ embassy-executor = { version = "0.7.0", features = [
] } ] }
embassy-time = { version = "0.4.0", features = ["log"] } embassy-time = { version = "0.4.0", features = ["log"] }
esp-hal-embassy = { version = "0.9.0", features = ["esp32c6", "log-04"] } esp-hal-embassy = { version = "0.9.0", features = ["esp32c6", "log-04"] }
esp-wifi = { version = "0.15.0", features = [ #esp-wifi = { version = "0.15.0", features = [
"builtin-scheduler", # "builtin-scheduler",
"esp-alloc", # "esp-alloc",
"esp32c6", # "esp32c6",
"log-04", # "log-04",
"smoltcp", # "smoltcp",
"wifi", # "wifi",
] } #] }
smoltcp = { version = "0.12.0", default-features = false, features = [ #smoltcp = { version = "0.12.0", default-features = false, features = [
"log", # "log",
"medium-ethernet", # "medium-ethernet",
"multicast", # "multicast",
"proto-dhcpv4", # "proto-dhcpv4",
"proto-dns", # "proto-dns",
"proto-ipv4", # "proto-ipv4",
"socket-dns", # "socket-dns",
"socket-icmp", # "socket-icmp",
"socket-raw", # "socket-raw",
"socket-tcp", # "socket-tcp",
"socket-udp", # "socket-udp",
] } #] }
static_cell = "2.1.1" #static_cell = "2.1.1"
embedded-hal = "1.0.0" embedded-hal = "1.0.0"
heapless = { version = "0.8", features = ["serde"] } heapless = { version = "0.8", features = ["serde"] }
embedded-hal-bus = { version = "0.3.0" } embedded-hal-bus = { version = "0.3.0" }
@ -122,8 +119,8 @@ serde_json = { version = "1.0.143", default-features = false, features = ["alloc
#timezone #timezone
chrono = { version = "0.4.23", default-features = false, features = ["iana-time-zone", "alloc", "serde"] } chrono = { version = "0.4.42", default-features = false, features = ["iana-time-zone", "alloc", "serde"] }
chrono-tz = { version = "0.10.3", default-features = false, features = ["filter-by-regex"] } chrono-tz = { version = "0.10.4", default-features = false, features = ["filter-by-regex"] }
eeprom24x = "0.7.2" eeprom24x = "0.7.2"
#url = "2.5.3" #url = "2.5.3"
crc = "3.2.1" crc = "3.2.1"
@ -138,18 +135,13 @@ ina219 = { version = "0.2.0" }
embedded-storage = "=0.3.1" embedded-storage = "=0.3.1"
ekv = "1.0.0" ekv = "1.0.0"
embedded-can = "0.4.1" embedded-can = "0.4.1"
critical-section = "1.2.0"
portable-atomic = "1.11.1" portable-atomic = "1.11.1"
embassy-sync = { version = "0.7.2", features = ["log"] } embassy-sync = { version = "0.7.2", features = ["log"] }
async-trait = "0.1.89" async-trait = "0.1.89"
bq34z100 = { version = "0.4.0", default-features = false }
[patch.crates-io] [patch.crates-io]
#esp-idf-hal = { git = "https://github.com/esp-rs/esp-idf-hal.git" }
#esp-idf-hal = { git = "https://github.com/empirephoenix/esp-idf-hal.git" }
#esp-idf-sys = { git = "https://github.com/empirephoenix/esp-idf-sys.git" }
#esp-idf-sys = { git = "https://github.com/esp-rs/esp-idf-sys.git" }
#esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc.git" }
#bq34z100 = { path = "../../bq34z100_rust" } #bq34z100 = { path = "../../bq34z100_rust" }
[build-dependencies] [build-dependencies]

10
rust/build.rs
View File

@ -50,6 +50,12 @@ fn linker_be_nice() {
} }
fn main() { fn main() {
//webpack();
//linker_be_nice();
let _ = EmitBuilder::builder().all_git().all_build().emit();
}
fn webpack() {
println!("cargo:rerun-if-changed=./src/src_webpack"); println!("cargo:rerun-if-changed=./src/src_webpack");
Command::new("rm") Command::new("rm")
.arg("./src/webserver/bundle.js") .arg("./src/webserver/bundle.js")
@ -112,6 +118,4 @@ fn main() {
.unwrap(); .unwrap();
} }
} }
linker_be_nice(); }
let _ = EmitBuilder::builder().all_git().all_build().emit();
}

0
rust/src/hal/v3_hal.rs → rust/scratch/v3_hal.rs
View File

0
rust/src/hal/v4_hal.rs → rust/scratch/v4_hal.rs
View File

0
rust/src/hal/v4_sensor.rs → rust/scratch/v4_sensor.rs
View File

176
rust/scratch/water.rs Normal file
View File

@ -0,0 +1,176 @@
use crate::hal::TANK_MULTI_SAMPLE;
use anyhow::{anyhow, bail};
use ds18b20::Ds18b20;
use esp_idf_hal::adc::oneshot::config::AdcChannelConfig;
use esp_idf_hal::adc::oneshot::{AdcChannelDriver, AdcDriver};
use esp_idf_hal::adc::{attenuation, Resolution, ADC1};
use esp_idf_hal::delay::Delay;
use esp_idf_hal::gpio::{AnyIOPin, AnyInputPin, Gpio5, InputOutput, PinDriver, Pull};
use esp_idf_hal::pcnt::{
PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex, PCNT1,
};
use esp_idf_sys::EspError;
use one_wire_bus::OneWire;
pub struct TankSensor<'a> {
// one_wire_bus: OneWire<PinDriver<'a, AnyIOPin, InputOutput>>,
// tank_channel: AdcChannelDriver<'a, Gpio5, AdcDriver<'a, ADC1>>,
// tank_power: PinDriver<'a, AnyIOPin, InputOutput>,
// flow_counter: PcntDriver<'a>,
// delay: Delay,
}
impl<'a> TankSensor<'a> {
pub(crate) fn create(
// one_wire_pin: AnyIOPin,
// adc1: ADC1,
// gpio5: Gpio5,
// tank_power_pin: AnyIOPin,
// flow_sensor_pin: AnyIOPin,
// pcnt1: PCNT1,
) -> anyhow::Result<TankSensor<'a>> {
// let mut one_wire_pin =
// PinDriver::input_output_od(one_wire_pin).expect("Failed to configure pin");
// one_wire_pin
// .set_pull(Pull::Floating)
// .expect("Failed to set pull");
//
// let adc_config = AdcChannelConfig {
// attenuation: attenuation::DB_11,
// resolution: Resolution::Resolution12Bit,
// calibration: esp_idf_hal::adc::oneshot::config::Calibration::Curve,
// };
// let tank_driver = AdcDriver::new(adc1).expect("Failed to configure ADC");
// let tank_channel = AdcChannelDriver::new(tank_driver, gpio5, &adc_config)
// .expect("Failed to configure ADC channel");
//
// let mut tank_power =
// PinDriver::input_output(tank_power_pin).expect("Failed to configure pin");
// tank_power
// .set_pull(Pull::Floating)
// .expect("Failed to set pull");
//
// let one_wire_bus =
// OneWire::new(one_wire_pin).expect("OneWire bus did not pull up after release");
//
// let mut flow_counter = PcntDriver::new(
// pcnt1,
// Some(flow_sensor_pin),
// Option::<AnyInputPin>::None,
// Option::<AnyInputPin>::None,
// Option::<AnyInputPin>::None,
// )?;
//
// flow_counter.channel_config(
// PcntChannel::Channel1,
// PinIndex::Pin0,
// PinIndex::Pin1,
// &PcntChannelConfig {
// lctrl_mode: PcntControlMode::Keep,
// hctrl_mode: PcntControlMode::Keep,
// pos_mode: PcntCountMode::Increment,
// neg_mode: PcntCountMode::Hold,
// counter_h_lim: i16::MAX,
// counter_l_lim: 0,
// },
// )?;
//
// Ok(TankSensor {
// one_wire_bus,
// tank_channel,
// tank_power,
// flow_counter,
// delay: Default::default(),
// })
bail!("Tank sensor not implemented");
}
pub fn reset_flow_meter(&mut self) {
// self.flow_counter.counter_pause().unwrap();
// self.flow_counter.counter_clear().unwrap();
}
pub fn start_flow_meter(&mut self) {
//self.flow_counter.counter_resume().unwrap();
}
pub fn get_flow_meter_value(&mut self) -> i16 {
//self.flow_counter.get_counter_value().unwrap()
5_i16
}
pub fn stop_flow_meter(&mut self) -> i16 {
//self.flow_counter.counter_pause().unwrap();
self.get_flow_meter_value()
}
pub async fn water_temperature_c(&mut self) -> anyhow::Result<f32> {
//multisample should be moved to water_temperature_c
let mut attempt = 1;
let water_temp: Result<f32, anyhow::Error> = loop {
let temp = self.single_temperature_c().await;
match &temp {
Ok(res) => {
log::info!("Water temp is {}", res);
break temp;
}
Err(err) => {
log::info!("Could not get water temp {} attempt {}", err, attempt)
}
}
if attempt == 5 {
break temp;
}
attempt += 1;
};
water_temp
}
async fn single_temperature_c(&mut self) -> anyhow::Result<f32> {
bail!("err");
// self.one_wire_bus
// .reset(&mut self.delay)
// .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
// let first = self.one_wire_bus.devices(false, &mut self.delay).next();
// if first.is_none() {
// bail!("Not found any one wire Ds18b20");
// }
// let device_address = first
// .unwrap()
// .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
// let water_temp_sensor = Ds18b20::new::<EspError>(device_address)
// .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
//
// water_temp_sensor
// .start_temp_measurement(&mut self.one_wire_bus, &mut self.delay)
// .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
// ds18b20::Resolution::Bits12.delay_for_measurement_time(&mut self.delay);
// let sensor_data = water_temp_sensor
// .read_data(&mut self.one_wire_bus, &mut self.delay)
// .map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
// if sensor_data.temperature == 85_f32 {
// bail!("Ds18b20 dummy temperature returned");
// }
//anyhow::Ok(sensor_data.temperature / 10_f32)
Ok(13_f32)
}
pub async fn tank_sensor_voltage(&mut self) -> anyhow::Result<f32> {
// self.tank_power.set_high()?;
// //let stabilize
// self.delay.delay_ms(100);
//
// let mut store = [0_u16; TANK_MULTI_SAMPLE];
// for multisample in 0..TANK_MULTI_SAMPLE {
// let value = self.tank_channel.read()?;
// store[multisample] = value;
// }
// self.tank_power.set_low()?;
//
// store.sort();
// let median_mv = store[6] as f32 / 1000_f32;
let median_mv = 10_f32;
anyhow::Ok(median_mv)
}
}

3
rust/src/config.rs
View File

@ -1,7 +1,8 @@
use alloc::string::String;
use core::str::FromStr;
use crate::hal::PLANT_COUNT; use crate::hal::PLANT_COUNT;
use crate::plant_state::PlantWateringMode; use crate::plant_state::PlantWateringMode;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::str::FromStr;
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
#[serde(default)] #[serde(default)]

283
rust/src/hal/battery.rs
View File

@ -1,20 +1,23 @@
use alloc::string::String;
use crate::hal::Box;
use anyhow::anyhow; use anyhow::anyhow;
use async_trait::async_trait; use async_trait::async_trait;
use bq34z100::{Bq34Z100Error, Bq34z100g1Driver};
use measurements::Temperature; use measurements::Temperature;
use serde::Serialize; use serde::Serialize;
#[async_trait] #[async_trait]
pub trait BatteryInteraction { pub trait BatteryInteraction {
async fn state_charge_percent(&mut self) -> Result<f32, BatteryError>; async fn state_charge_percent(& mut self) -> Result<f32, BatteryError>;
async fn remaining_milli_ampere_hour(&mut self) -> Result<u16, BatteryError>; async fn remaining_milli_ampere_hour(& mut self) -> Result<u16, BatteryError>;
async fn max_milli_ampere_hour(&mut self) -> Result<u16, BatteryError>; async fn max_milli_ampere_hour(& mut self) -> Result<u16, BatteryError>;
async fn design_milli_ampere_hour(&mut self) -> Result<u16, BatteryError>; async fn design_milli_ampere_hour(& mut self) -> Result<u16, BatteryError>;
async fn voltage_milli_volt(&mut self) -> Result<u16, BatteryError>; async fn voltage_milli_volt(& mut self) -> Result<u16, BatteryError>;
async fn average_current_milli_ampere(&mut self) -> Result<i16, BatteryError>; async fn average_current_milli_ampere(& mut self) -> Result<i16, BatteryError>;
async fn cycle_count(&mut self) -> Result<u16, BatteryError>; async fn cycle_count(& mut self) -> Result<u16, BatteryError>;
async fn state_health_percent(&mut self) -> Result<u16, BatteryError>; async fn state_health_percent(& mut self) -> Result<u16, BatteryError>;
async fn bat_temperature(&mut self) -> Result<u16, BatteryError>; async fn bat_temperature(& mut self) -> Result<u16, BatteryError>;
async fn get_battery_state(&mut self) -> Result<BatteryState, BatteryError>; async fn get_battery_state(& mut self) -> Result<BatteryState, BatteryError>;
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
@ -35,13 +38,13 @@ pub enum BatteryError {
CommunicationError(String), CommunicationError(String),
} }
impl From<Bq34Z100Error<esp_idf_hal::i2c::I2cError>> for BatteryError { // impl From<Bq34Z100Error<esp_idf_hal::i2c::I2cError>> for BatteryError {
fn from(err: Bq34Z100Error<esp_idf_hal::i2c::I2cError>) -> Self { // fn from(err: Bq34Z100Error<esp_idf_hal::i2c::I2cError>) -> Self {
BatteryError::CommunicationError( // BatteryError::CommunicationError(
anyhow!("failed to communicate with battery monitor: {:?}", err).to_string(), // anyhow!("failed to communicate with battery monitor: {:?}", err).to_string(),
) // )
} // }
} // }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
pub enum BatteryState { pub enum BatteryState {
@ -51,45 +54,45 @@ pub enum BatteryState {
/// If no battery monitor is installed this implementation will be used /// If no battery monitor is installed this implementation will be used
pub struct NoBatteryMonitor {} pub struct NoBatteryMonitor {}
#[async_trait]
impl BatteryInteraction for NoBatteryMonitor { impl BatteryInteraction for NoBatteryMonitor {
fn state_charge_percent(&mut self) -> Result<f32, BatteryError> { async fn state_charge_percent(& mut self) -> Result<f32, BatteryError> {
Err(BatteryError::NoBatteryMonitor) Err(BatteryError::NoBatteryMonitor)
} }
fn remaining_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> { async fn remaining_milli_ampere_hour(& mut self) -> Result<u16, BatteryError> {
Err(BatteryError::NoBatteryMonitor) Err(BatteryError::NoBatteryMonitor)
} }
fn max_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> { async fn max_milli_ampere_hour(& mut self) -> Result<u16, BatteryError> {
Err(BatteryError::NoBatteryMonitor) Err(BatteryError::NoBatteryMonitor)
} }
fn design_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> { async fn design_milli_ampere_hour(& mut self) -> Result<u16, BatteryError> {
Err(BatteryError::NoBatteryMonitor) Err(BatteryError::NoBatteryMonitor)
} }
fn voltage_milli_volt(&mut self) -> Result<u16, BatteryError> { async fn voltage_milli_volt(& mut self) -> Result<u16, BatteryError> {
Err(BatteryError::NoBatteryMonitor) Err(BatteryError::NoBatteryMonitor)
} }
fn average_current_milli_ampere(&mut self) -> Result<i16, BatteryError> { async fn average_current_milli_ampere(& mut self) -> Result<i16, BatteryError> {
Err(BatteryError::NoBatteryMonitor) Err(BatteryError::NoBatteryMonitor)
} }
fn cycle_count(&mut self) -> Result<u16, BatteryError> { async fn cycle_count(& mut self) -> Result<u16, BatteryError> {
Err(BatteryError::NoBatteryMonitor) Err(BatteryError::NoBatteryMonitor)
} }
fn state_health_percent(&mut self) -> Result<u16, BatteryError> { async fn state_health_percent(&mut self) -> Result<u16, BatteryError> {
Err(BatteryError::NoBatteryMonitor) Err(BatteryError::NoBatteryMonitor)
} }
fn bat_temperature(&mut self) -> Result<u16, BatteryError> { async fn bat_temperature(&mut self) -> Result<u16, BatteryError> {
Err(BatteryError::NoBatteryMonitor) Err(BatteryError::NoBatteryMonitor)
} }
fn get_battery_state(&mut self) -> Result<BatteryState, BatteryError> { async fn get_battery_state(& mut self) -> Result<BatteryState, BatteryError> {
Ok(BatteryState::Unknown) Ok(BatteryState::Unknown)
} }
} }
@ -98,115 +101,115 @@ impl BatteryInteraction for NoBatteryMonitor {
#[allow(dead_code)] #[allow(dead_code)]
pub struct WchI2cSlave {} pub struct WchI2cSlave {}
pub struct BQ34Z100G1<'a> { // pub struct BQ34Z100G1<'a> {
pub battery_driver: Bq34z100g1Driver<MutexDevice<'a, I2cDriver<'a>>, Delay>, // pub battery_driver: Bq34z100g1Driver<MutexDevice<'a, I2cDriver<'a>>, Delay>,
} // }
//
impl BatteryInteraction for BQ34Z100G1<'_> { // impl BatteryInteraction for BQ34Z100G1<'_> {
fn state_charge_percent(&mut self) -> Result<f32, BatteryError> { // fn state_charge_percent(&mut self) -> Result<f32, BatteryError> {
Ok(self.battery_driver.state_of_charge().map(f32::from)?) // Ok(self.battery_driver.state_of_charge().map(f32::from)?)
} // }
//
fn remaining_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> { // fn remaining_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
Ok(self.battery_driver.remaining_capacity()?) // Ok(self.battery_driver.remaining_capacity()?)
} // }
//
fn max_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> { // fn max_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
Ok(self.battery_driver.full_charge_capacity()?) // Ok(self.battery_driver.full_charge_capacity()?)
} // }
//
fn design_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> { // fn design_milli_ampere_hour(&mut self) -> Result<u16, BatteryError> {
Ok(self.battery_driver.design_capacity()?) // Ok(self.battery_driver.design_capacity()?)
} // }
//
fn voltage_milli_volt(&mut self) -> Result<u16, BatteryError> { // fn voltage_milli_volt(&mut self) -> Result<u16, BatteryError> {
Ok(self.battery_driver.voltage()?) // Ok(self.battery_driver.voltage()?)
} // }
//
fn average_current_milli_ampere(&mut self) -> Result<i16, BatteryError> { // fn average_current_milli_ampere(&mut self) -> Result<i16, BatteryError> {
Ok(self.battery_driver.average_current()?) // Ok(self.battery_driver.average_current()?)
} // }
//
fn cycle_count(&mut self) -> Result<u16, BatteryError> { // fn cycle_count(&mut self) -> Result<u16, BatteryError> {
Ok(self.battery_driver.cycle_count()?) // Ok(self.battery_driver.cycle_count()?)
} // }
//
fn state_health_percent(&mut self) -> Result<u16, BatteryError> { // fn state_health_percent(&mut self) -> Result<u16, BatteryError> {
Ok(self.battery_driver.state_of_health()?) // Ok(self.battery_driver.state_of_health()?)
} // }
//
fn bat_temperature(&mut self) -> Result<u16, BatteryError> { // fn bat_temperature(&mut self) -> Result<u16, BatteryError> {
Ok(self.battery_driver.temperature()?) // Ok(self.battery_driver.temperature()?)
} // }
//
fn get_battery_state(&mut self) -> Result<BatteryState, BatteryError> { // fn get_battery_state(&mut self) -> Result<BatteryState, BatteryError> {
Ok(BatteryState::Info(BatteryInfo { // Ok(BatteryState::Info(BatteryInfo {
voltage_milli_volt: self.voltage_milli_volt()?, // voltage_milli_volt: self.voltage_milli_volt()?,
average_current_milli_ampere: self.average_current_milli_ampere()?, // average_current_milli_ampere: self.average_current_milli_ampere()?,
cycle_count: self.cycle_count()?, // cycle_count: self.cycle_count()?,
design_milli_ampere_hour: self.design_milli_ampere_hour()?, // design_milli_ampere_hour: self.design_milli_ampere_hour()?,
remaining_milli_ampere_hour: self.remaining_milli_ampere_hour()?, // remaining_milli_ampere_hour: self.remaining_milli_ampere_hour()?,
state_of_charge: self.state_charge_percent()?, // state_of_charge: self.state_charge_percent()?,
state_of_health: self.state_health_percent()?, // state_of_health: self.state_health_percent()?,
temperature: self.bat_temperature()?, // temperature: self.bat_temperature()?,
})) // }))
} // }
} // }
//
pub fn print_battery_bq34z100( // pub fn print_battery_bq34z100(
battery_driver: &mut Bq34z100g1Driver<MutexDevice<I2cDriver<'_>>, Delay>, // battery_driver: &mut Bq34z100g1Driver<MutexDevice<I2cDriver<'_>>, Delay>,
) -> anyhow::Result<(), Bq34Z100Error<I2cError>> { // ) -> anyhow::Result<(), Bq34Z100Error<I2cError>> {
log::info!("Try communicating with battery"); // log::info!("Try communicating with battery");
let fwversion = battery_driver.fw_version().unwrap_or_else(|e| { // let fwversion = battery_driver.fw_version().unwrap_or_else(|e| {
log::info!("Firmware {:?}", e); // log::info!("Firmware {:?}", e);
0 // 0
}); // });
log::info!("fw version is {}", fwversion); // log::info!("fw version is {}", fwversion);
//
let design_capacity = battery_driver.design_capacity().unwrap_or_else(|e| { // let design_capacity = battery_driver.design_capacity().unwrap_or_else(|e| {
log::info!("Design capacity {:?}", e); // log::info!("Design capacity {:?}", e);
0 // 0
}); // });
log::info!("Design Capacity {}", design_capacity); // log::info!("Design Capacity {}", design_capacity);
if design_capacity == 1000 { // if design_capacity == 1000 {
log::info!("Still stock configuring battery, readouts are likely to be wrong!"); // log::info!("Still stock configuring battery, readouts are likely to be wrong!");
} // }
//
let flags = battery_driver.get_flags_decoded()?; // let flags = battery_driver.get_flags_decoded()?;
log::info!("Flags {:?}", flags); // log::info!("Flags {:?}", flags);
//
let chem_id = battery_driver.chem_id().unwrap_or_else(|e| { // let chem_id = battery_driver.chem_id().unwrap_or_else(|e| {
log::info!("Chemid {:?}", e); // log::info!("Chemid {:?}", e);
0 // 0
}); // });
//
let bat_temp = battery_driver.internal_temperature().unwrap_or_else(|e| { // let bat_temp = battery_driver.internal_temperature().unwrap_or_else(|e| {
log::info!("Bat Temp {:?}", e); // log::info!("Bat Temp {:?}", e);
0 // 0
}); // });
let temp_c = Temperature::from_kelvin(bat_temp as f64 / 10_f64).as_celsius(); // let temp_c = Temperature::from_kelvin(bat_temp as f64 / 10_f64).as_celsius();
let voltage = battery_driver.voltage().unwrap_or_else(|e| { // let voltage = battery_driver.voltage().unwrap_or_else(|e| {
log::info!("Bat volt {:?}", e); // log::info!("Bat volt {:?}", e);
0 // 0
}); // });
let current = battery_driver.current().unwrap_or_else(|e| { // let current = battery_driver.current().unwrap_or_else(|e| {
log::info!("Bat current {:?}", e); // log::info!("Bat current {:?}", e);
0 // 0
}); // });
let state = battery_driver.state_of_charge().unwrap_or_else(|e| { // let state = battery_driver.state_of_charge().unwrap_or_else(|e| {
log::info!("Bat Soc {:?}", e); // log::info!("Bat Soc {:?}", e);
0 // 0
}); // });
let charge_voltage = battery_driver.charge_voltage().unwrap_or_else(|e| { // let charge_voltage = battery_driver.charge_voltage().unwrap_or_else(|e| {
log::info!("Bat Charge Volt {:?}", e); // log::info!("Bat Charge Volt {:?}", e);
0 // 0
}); // });
let charge_current = battery_driver.charge_current().unwrap_or_else(|e| { // let charge_current = battery_driver.charge_current().unwrap_or_else(|e| {
log::info!("Bat Charge Current {:?}", e); // log::info!("Bat Charge Current {:?}", e);
0 // 0
}); // });
log::info!("ChemId: {} Current voltage {} and current {} with charge {}% and temp {} CVolt: {} CCur {}", chem_id, voltage, current, state, temp_c, charge_voltage, charge_current); // log::info!("ChemId: {} Current voltage {} and current {} with charge {}% and temp {} CVolt: {} CCur {}", chem_id, voltage, current, state, temp_c, charge_voltage, charge_current);
let _ = battery_driver.unsealed(); // let _ = battery_driver.unsealed();
let _ = battery_driver.it_enable(); // let _ = battery_driver.it_enable();
anyhow::Result::Ok(()) // anyhow::Result::Ok(())
} // }

764
rust/src/hal/esp.rs
View File

@ -10,6 +10,10 @@ use alloc::{
string::{String, ToString}, string::{String, ToString},
vec::Vec, vec::Vec,
}; };
use core::marker::PhantomData;
use core::net::IpAddr;
use core::str::FromStr;
use embassy_time::Timer;
#[link_section = ".rtc.data"] #[link_section = ".rtc.data"]
static mut LAST_WATERING_TIMESTAMP: [i64; PLANT_COUNT] = [0; PLANT_COUNT]; static mut LAST_WATERING_TIMESTAMP: [i64; PLANT_COUNT] = [0; PLANT_COUNT];
@ -42,15 +46,23 @@ pub struct FileSystemSizeInfo {
} }
pub struct MqttClient<'a> { pub struct MqttClient<'a> {
dummy: PhantomData<&'a ()>,
//mqtt_client: EspMqttClient<'a>, //mqtt_client: EspMqttClient<'a>,
base_topic: heapless::String<64>, base_topic: heapless::String<64>,
} }
pub struct Esp<'a> { pub struct Esp<'a> {
pub(crate) mqtt_client: Option<MqttClient<'a>>, pub(crate) mqtt_client: Option<MqttClient<'a>>,
pub(crate) dummy: PhantomData<&'a ()>,
//pub(crate) wifi_driver: EspWifi<'a>, //pub(crate) wifi_driver: EspWifi<'a>,
//pub(crate) boot_button: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, esp_idf_hal::gpio::Input>, //pub(crate) boot_button: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, esp_idf_hal::gpio::Input>,
} }
pub struct IpInfo {
pub(crate) ip: IpAddr,
netmask: IpAddr,
gateway: IpAddr,
}
struct AccessPointInfo {} struct AccessPointInfo {}
impl Esp<'_> { impl Esp<'_> {
@ -76,23 +88,25 @@ impl Esp<'_> {
todo!(); todo!();
} }
pub(crate) fn time(&mut self) -> anyhow::Result<DateTime<Utc>> { pub(crate) fn time(&mut self) -> anyhow::Result<DateTime<Utc>> {
let time = EspSystemTime {}.now().as_millis(); bail!("todo");
let smaller_time = time as i64; // let time = EspSystemTime {}.now().as_millis();
let local_time = DateTime::from_timestamp_millis(smaller_time) // let smaller_time = time as i64;
.ok_or(anyhow!("could not convert timestamp"))?; // let local_time = DateTime::from_timestamp_millis(smaller_time)
anyhow::Ok(local_time) // .ok_or(anyhow!("could not convert timestamp"))?;
// anyhow::Ok(local_time)
} }
pub(crate) async fn wifi_scan(&mut self) -> anyhow::Result<Vec<AccessPointInfo>> { pub(crate) async fn wifi_scan(&mut self) -> anyhow::Result<Vec<AccessPointInfo>> {
self.wifi_driver.start_scan( bail!("todo");
&ScanConfig { // self.wifi_driver.start_scan(
scan_type: ScanType::Passive(Duration::from_secs(5)), // &ScanConfig {
show_hidden: false, // scan_type: ScanType::Passive(Duration::from_secs(5)),
..Default::default() // show_hidden: false,
}, // ..Default::default()
true, // },
)?; // true,
anyhow::Ok(self.wifi_driver.get_scan_result()?) // )?;
// anyhow::Ok(self.wifi_driver.get_scan_result()?)
} }
pub(crate) fn last_pump_time(&self, plant: usize) -> Option<DateTime<Utc>> { pub(crate) fn last_pump_time(&self, plant: usize) -> Option<DateTime<Utc>> {
@ -140,19 +154,22 @@ impl Esp<'_> {
Ok(config) => config.network.ap_ssid.clone(), Ok(config) => config.network.ap_ssid.clone(),
Err(_) => heapless::String::from_str("PlantCtrl Emergency Mode").unwrap(), Err(_) => heapless::String::from_str("PlantCtrl Emergency Mode").unwrap(),
}; };
todo!("todo");
let apconfig = AccessPointConfiguration { //
ssid, // let apconfig = AccessPointConfiguration {
auth_method: AuthMethod::None, // ssid,
ssid_hidden: false, // auth_method: AuthMethod::None,
..Default::default() // ssid_hidden: false,
}; // ..Default::default()
self.wifi_driver // };
.set_configuration(&Configuration::AccessPoint(apconfig))?; // self.wifi_driver
self.wifi_driver.start()?; // .set_configuration(&Configuration::AccessPoint(apconfig))?;
anyhow::Ok(()) // self.wifi_driver.start()?;
// anyhow::Ok(())
} }
pub(crate) async fn wifi(&mut self, network_config: &NetworkConfig) -> anyhow::Result<IpInfo> { pub(crate) async fn wifi(&mut self, network_config: &NetworkConfig) -> anyhow::Result<IpInfo> {
let ssid = network_config let ssid = network_config
.ssid .ssid
@ -160,80 +177,83 @@ impl Esp<'_> {
.ok_or(anyhow!("No ssid configured"))?; .ok_or(anyhow!("No ssid configured"))?;
let password = network_config.password.clone(); let password = network_config.password.clone();
let max_wait = network_config.max_wait; let max_wait = network_config.max_wait;
bail!("todo")
match password { // match password {
Some(pw) => { // Some(pw) => {
//TODO expect error due to invalid pw or similar! //call this during configuration and check if works, revert to config mode if not // //TODO expect error due to invalid pw or similar! //call this during configuration and check if works, revert to config mode if not
self.wifi_driver.set_configuration(&Configuration::Client( // self.wifi_driver.set_configuration(&Configuration::Client(
ClientConfiguration { // ClientConfiguration {
ssid, // ssid,
password: pw, // password: pw,
..Default::default() // ..Default::default()
}, // },
))?; // ))?;
} // }
None => { // None => {
self.wifi_driver.set_configuration(&Configuration::Client( // self.wifi_driver.set_configuration(&Configuration::Client(
ClientConfiguration { // ClientConfiguration {
ssid, // ssid,
auth_method: AuthMethod::None, // auth_method: AuthMethod::None,
..Default::default() // ..Default::default()
}, // },
))?; // ))?;
} // }
} // }
//
self.wifi_driver.start()?; // self.wifi_driver.start()?;
self.wifi_driver.connect()?; // self.wifi_driver.connect()?;
//
let delay = Delay::new_default(); // let delay = Delay::new_default();
let mut counter = 0_u32; // let mut counter = 0_u32;
while !self.wifi_driver.is_connected()? { // while !self.wifi_driver.is_connected()? {
delay.delay_ms(250); // delay.delay_ms(250);
counter += 250; // counter += 250;
if counter > max_wait { // if counter > max_wait {
//ignore these errors, Wi-Fi will not be used this // //ignore these errors, Wi-Fi will not be used this
self.wifi_driver.disconnect().unwrap_or(()); // self.wifi_driver.disconnect().unwrap_or(());
self.wifi_driver.stop().unwrap_or(()); // self.wifi_driver.stop().unwrap_or(());
bail!("Did not manage wifi connection within timeout"); // bail!("Did not manage wifi connection within timeout");
} // }
} // }
log::info!("Should be connected now, waiting for link to be up"); // log::info!("Should be connected now, waiting for link to be up");
//
while !self.wifi_driver.is_up()? { // while !self.wifi_driver.is_up()? {
delay.delay_ms(250); // delay.delay_ms(250);
counter += 250; // counter += 250;
if counter > max_wait { // if counter > max_wait {
//ignore these errors, Wi-Fi will not be used this // //ignore these errors, Wi-Fi will not be used this
self.wifi_driver.disconnect().unwrap_or(()); // self.wifi_driver.disconnect().unwrap_or(());
self.wifi_driver.stop().unwrap_or(()); // self.wifi_driver.stop().unwrap_or(());
bail!("Did not manage wifi connection within timeout"); // bail!("Did not manage wifi connection within timeout");
} // }
} // }
//update freertos registers ;) // //update freertos registers ;)
let address = self.wifi_driver.sta_netif().get_ip_info()?; // let address = self.wifi_driver.sta_netif().get_ip_info()?;
log(LogMessage::WifiInfo, 0, 0, "", &format!("{address:?}")); // log(LogMessage::WifiInfo, 0, 0, "", &format!("{address:?}"));
anyhow::Ok(address) // anyhow::Ok(address)
} }
pub(crate) async fn load_config(&mut self) -> anyhow::Result<PlantControllerConfig> { pub(crate) fn load_config(&mut self) -> anyhow::Result<PlantControllerConfig> {
let cfg = File::open(Self::CONFIG_FILE)?; bail!("todo");
let config: PlantControllerConfig = serde_json::from_reader(cfg)?; // let cfg = File::open(Self::CONFIG_FILE)?;
anyhow::Ok(config) // let config: PlantControllerConfig = serde_json::from_reader(cfg)?;
// anyhow::Ok(config)
} }
pub(crate) async fn save_config( pub(crate) async fn save_config(
&mut self, &mut self,
config: &PlantControllerConfig, config: &PlantControllerConfig,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let mut cfg = File::create(Self::CONFIG_FILE)?; bail!("todo");
serde_json::to_writer(&mut cfg, &config)?; // let mut cfg = File::create(Self::CONFIG_FILE)?;
log::info!("Wrote config config {:?}", config); // serde_json::to_writer(&mut cfg, &config)?;
anyhow::Ok(()) // log::info!("Wrote config config {:?}", config);
// anyhow::Ok(())
} }
pub(crate) async fn mount_file_system(&mut self) -> anyhow::Result<()> { pub(crate) fn mount_file_system(&mut self) -> anyhow::Result<()> {
bail!("fail");
log(LogMessage::MountingFilesystem, 0, 0, "", ""); log(LogMessage::MountingFilesystem, 0, 0, "", "");
let base_path = String::try_from("/spiffs")?; let base_path = String::try_from("/spiffs")?;
let storage = String::try_from(Self::SPIFFS_PARTITION_NAME)?; let storage = String::try_from(Self::SPIFFS_PARTITION_NAME)?;
let conf = todo!(); //let conf = todo!();
//let conf = esp_idf_sys::esp_vfs_spiffs_conf_t { //let conf = esp_idf_sys::esp_vfs_spiffs_conf_t {
//base_path: base_path.as_ptr(), //base_path: base_path.as_ptr(),
@ -247,102 +267,112 @@ impl Esp<'_> {
//esp_idf_sys::esp!(esp_idf_sys::esp_vfs_spiffs_register(&conf))?; //esp_idf_sys::esp!(esp_idf_sys::esp_vfs_spiffs_register(&conf))?;
//} //}
let free_space = self.file_system_size()?; // let free_space = self.file_system_size()?;
log( // log(
LogMessage::FilesystemMount, // LogMessage::FilesystemMount,
free_space.free_size as u32, // free_space.free_size as u32,
free_space.total_size as u32, // free_space.total_size as u32,
&free_space.used_size.to_string(), // &free_space.used_size.to_string(),
"", // "",
); // );
anyhow::Ok(()) anyhow::Ok(())
} }
async fn file_system_size(&mut self) -> anyhow::Result<FileSystemSizeInfo> { async fn file_system_size(&mut self) -> anyhow::Result<FileSystemSizeInfo> {
let storage = CString::new(Self::SPIFFS_PARTITION_NAME)?; bail!("fail");
let mut total_size = 0; // let storage = CString::new(Self::SPIFFS_PARTITION_NAME)?;
let mut used_size = 0; // let mut total_size = 0;
unsafe { // let mut used_size = 0;
esp_idf_sys::esp!(esp_spiffs_info( // unsafe {
storage.as_ptr(), // esp_idf_sys::esp!(esp_spiffs_info(
&mut total_size, // storage.as_ptr(),
&mut used_size // &mut total_size,
))?; // &mut used_size
} // ))?;
anyhow::Ok(FileSystemSizeInfo { // }
total_size, // anyhow::Ok(FileSystemSizeInfo {
used_size, // total_size,
free_size: total_size - used_size, // used_size,
}) // free_size: total_size - used_size,
// })
} }
pub(crate) async fn list_files(&self) -> FileList { pub(crate) async fn list_files(&self) -> FileList {
let storage = CString::new(Self::SPIFFS_PARTITION_NAME).unwrap(); return FileList {
total: 0,
let mut file_system_corrupt = None; used: 0,
file_system_corrupt: None,
let mut iter_error = None; files: Vec::new(),
let mut result = Vec::new(); iter_error: None,
};
let filepath = Path::new(Self::BASE_PATH); //
let read_dir = fs::read_dir(filepath); // let storage = CString::new(Self::SPIFFS_PARTITION_NAME).unwrap();
match read_dir { //
OkStd(read_dir) => { // let mut file_system_corrupt = None;
for item in read_dir { //
match item { // let mut iter_error = None;
OkStd(file) => { // let mut result = Vec::new();
let f = FileInfo { //
filename: file.file_name().into_string().unwrap(), // let filepath = Path::new(Self::BASE_PATH);
size: file.metadata().map(|it| it.len()).unwrap_or_default() // let read_dir = fs::read_dir(filepath);
as usize, // match read_dir {
}; // OkStd(read_dir) => {
result.push(f); // for item in read_dir {
} // match item {
Err(err) => { // OkStd(file) => {
iter_error = Some(format!("{err:?}")); // let f = FileInfo {
break; // filename: file.file_name().into_string().unwrap(),
} // size: file.metadata().map(|it| it.len()).unwrap_or_default()
} // as usize,
} // };
} // result.push(f);
Err(err) => { // }
file_system_corrupt = Some(format!("{err:?}")); // Err(err) => {
} // iter_error = Some(format!("{err:?}"));
} // break;
let mut total: usize = 0; // }
let mut used: usize = 0; // }
unsafe { // }
esp_spiffs_info(storage.as_ptr(), &mut total, &mut used); // }
} // Err(err) => {
// file_system_corrupt = Some(format!("{err:?}"));
FileList { // }
total, // }
used, // let mut total: usize = 0;
file_system_corrupt, // let mut used: usize = 0;
files: result, // unsafe {
iter_error, // esp_spiffs_info(storage.as_ptr(), &mut total, &mut used);
} // }
//
// FileList {
// total,
// used,
// file_system_corrupt,
// files: result,
// iter_error,
// }
} }
pub(crate) async fn delete_file(&self, filename: &str) -> anyhow::Result<()> { pub(crate) async fn delete_file(&self, filename: &str) -> anyhow::Result<()> {
let filepath = Path::new(Self::BASE_PATH).join(Path::new(filename)); bail!("todo");
match fs::remove_file(filepath) { // let filepath = Path::new(Self::BASE_PATH).join(Path::new(filename));
OkStd(_) => anyhow::Ok(()), // match fs::remove_file(filepath) {
Err(err) => { // OkStd(_) => anyhow::Ok(()),
bail!(format!("{err:?}")) // Err(err) => {
} // bail!(format!("{err:?}"))
} // }
} // }
pub(crate) async fn get_file_handle(
&self,
filename: &str,
write: bool,
) -> anyhow::Result<File> {
let filepath = Path::new(Self::BASE_PATH).join(Path::new(filename));
anyhow::Ok(if write {
File::create(filepath)?
} else {
File::open(filepath)?
})
} }
// pub(crate) async fn get_file_handle(
// &self,
// filename: &str,
// write: bool,
// ) -> anyhow::Result<File> {
// let filepath = Path::new(Self::BASE_PATH).join(Path::new(filename));
// anyhow::Ok(if write {
// File::create(filepath)?
// } else {
// File::open(filepath)?
// })
// }
pub(crate) fn init_rtc_deepsleep_memory(&self, init_rtc_store: bool, to_config_mode: bool) { pub(crate) fn init_rtc_deepsleep_memory(&self, init_rtc_store: bool, to_config_mode: bool) {
if init_rtc_store { if init_rtc_store {
@ -407,200 +437,204 @@ impl Esp<'_> {
bail!("Mqtt url was empty") bail!("Mqtt url was empty")
} }
let last_will_topic = format!("{}/state", base_topic); bail!("todo");
let mqtt_client_config = MqttClientConfiguration { //
lwt: Some(LwtConfiguration { // let last_will_topic = format!("{}/state", base_topic);
topic: &last_will_topic, // let mqtt_client_config = MqttClientConfiguration {
payload: "lost".as_bytes(), // lwt: Some(LwtConfiguration {
qos: AtLeastOnce, // topic: &last_will_topic,
retain: true, // payload: "lost".as_bytes(),
}), // qos: AtLeastOnce,
client_id: Some("plantctrl"), // retain: true,
keep_alive_interval: Some(Duration::from_secs(60 * 60 * 2)), // }),
username: network_config.mqtt_user.as_ref().map(|v| &**v), // client_id: Some("plantctrl"),
password: network_config.mqtt_password.as_ref().map(|v| &**v), // keep_alive_interval: Some(Duration::from_secs(60 * 60 * 2)),
//room for improvement // username: network_config.mqtt_user.as_ref().map(|v| &**v),
..Default::default() // password: network_config.mqtt_password.as_ref().map(|v| &**v),
}; // //room for improvement
// ..Default::default()
let mqtt_connected_event_received = Arc::new(AtomicBool::new(false)); // };
let mqtt_connected_event_ok = Arc::new(AtomicBool::new(false)); //
// let mqtt_connected_event_received = Arc::new(AtomicBool::new(false));
let round_trip_ok = Arc::new(AtomicBool::new(false)); // let mqtt_connected_event_ok = Arc::new(AtomicBool::new(false));
let round_trip_topic = format!("{}/internal/roundtrip", base_topic); //
let stay_alive_topic = format!("{}/stay_alive", base_topic); // let round_trip_ok = Arc::new(AtomicBool::new(false));
log(LogMessage::StayAlive, 0, 0, "", &stay_alive_topic); // let round_trip_topic = format!("{}/internal/roundtrip", base_topic);
// let stay_alive_topic = format!("{}/stay_alive", base_topic);
let mqtt_connected_event_received_copy = mqtt_connected_event_received.clone(); // log(LogMessage::StayAlive, 0, 0, "", &stay_alive_topic);
let mqtt_connected_event_ok_copy = mqtt_connected_event_ok.clone(); //
let stay_alive_topic_copy = stay_alive_topic.clone(); // let mqtt_connected_event_received_copy = mqtt_connected_event_received.clone();
let round_trip_topic_copy = round_trip_topic.clone(); // let mqtt_connected_event_ok_copy = mqtt_connected_event_ok.clone();
let round_trip_ok_copy = round_trip_ok.clone(); // let stay_alive_topic_copy = stay_alive_topic.clone();
let client_id = mqtt_client_config.client_id.unwrap_or("not set"); // let round_trip_topic_copy = round_trip_topic.clone();
log(LogMessage::MqttInfo, 0, 0, client_id, mqtt_url); // let round_trip_ok_copy = round_trip_ok.clone();
let mut client = EspMqttClient::new_cb(mqtt_url, &mqtt_client_config, move |event| { // let client_id = mqtt_client_config.client_id.unwrap_or("not set");
let payload = event.payload(); // log(LogMessage::MqttInfo, 0, 0, client_id, mqtt_url);
match payload { // let mut client = EspMqttClient::new_cb(mqtt_url, &mqtt_client_config, move |event| {
embedded_svc::mqtt::client::EventPayload::Received { // let payload = event.payload();
id: _, // match payload {
topic, // embedded_svc::mqtt::client::EventPayload::Received {
data, // id: _,
details: _, // topic,
} => { // data,
let data = String::from_utf8_lossy(data); // details: _,
if let Some(topic) = topic { // } => {
//todo use enums // let data = String::from_utf8_lossy(data);
if topic.eq(round_trip_topic_copy.as_str()) { // if let Some(topic) = topic {
round_trip_ok_copy.store(true, std::sync::atomic::Ordering::Relaxed); // //todo use enums
} else if topic.eq(stay_alive_topic_copy.as_str()) { // if topic.eq(round_trip_topic_copy.as_str()) {
let value = // round_trip_ok_copy.store(true, std::sync::atomic::Ordering::Relaxed);
data.eq_ignore_ascii_case("true") || data.eq_ignore_ascii_case("1"); // } else if topic.eq(stay_alive_topic_copy.as_str()) {
log(LogMessage::MqttStayAliveRec, 0, 0, &data, ""); // let value =
STAY_ALIVE.store(value, std::sync::atomic::Ordering::Relaxed); // data.eq_ignore_ascii_case("true") || data.eq_ignore_ascii_case("1");
} else { // log(LogMessage::MqttStayAliveRec, 0, 0, &data, "");
log(LogMessage::UnknownTopic, 0, 0, "", topic); // STAY_ALIVE.store(value, std::sync::atomic::Ordering::Relaxed);
} // } else {
} // log(LogMessage::UnknownTopic, 0, 0, "", topic);
} // }
esp_idf_svc::mqtt::client::EventPayload::Connected(_) => { // }
mqtt_connected_event_received_copy // }
.store(true, std::sync::atomic::Ordering::Relaxed); // esp_idf_svc::mqtt::client::EventPayload::Connected(_) => {
mqtt_connected_event_ok_copy.store(true, std::sync::atomic::Ordering::Relaxed); // mqtt_connected_event_received_copy
log::info!("Mqtt connected"); // .store(true, std::sync::atomic::Ordering::Relaxed);
} // mqtt_connected_event_ok_copy.store(true, std::sync::atomic::Ordering::Relaxed);
esp_idf_svc::mqtt::client::EventPayload::Disconnected => { // log::info!("Mqtt connected");
mqtt_connected_event_received_copy // }
.store(true, std::sync::atomic::Ordering::Relaxed); // esp_idf_svc::mqtt::client::EventPayload::Disconnected => {
mqtt_connected_event_ok_copy.store(false, std::sync::atomic::Ordering::Relaxed); // mqtt_connected_event_received_copy
log::info!("Mqtt disconnected"); // .store(true, std::sync::atomic::Ordering::Relaxed);
} // mqtt_connected_event_ok_copy.store(false, std::sync::atomic::Ordering::Relaxed);
esp_idf_svc::mqtt::client::EventPayload::Error(esp_error) => { // log::info!("Mqtt disconnected");
log::info!("EspMqttError reported {:?}", esp_error); // }
mqtt_connected_event_received_copy // esp_idf_svc::mqtt::client::EventPayload::Error(esp_error) => {
.store(true, std::sync::atomic::Ordering::Relaxed); // log::info!("EspMqttError reported {:?}", esp_error);
mqtt_connected_event_ok_copy.store(false, std::sync::atomic::Ordering::Relaxed); // mqtt_connected_event_received_copy
log::info!("Mqtt error"); // .store(true, std::sync::atomic::Ordering::Relaxed);
} // mqtt_connected_event_ok_copy.store(false, std::sync::atomic::Ordering::Relaxed);
esp_idf_svc::mqtt::client::EventPayload::BeforeConnect => { // log::info!("Mqtt error");
log::info!("Mqtt before connect") // }
} // esp_idf_svc::mqtt::client::EventPayload::BeforeConnect => {
esp_idf_svc::mqtt::client::EventPayload::Subscribed(_) => { // log::info!("Mqtt before connect")
log::info!("Mqtt subscribed") // }
} // esp_idf_svc::mqtt::client::EventPayload::Subscribed(_) => {
esp_idf_svc::mqtt::client::EventPayload::Unsubscribed(_) => { // log::info!("Mqtt subscribed")
log::info!("Mqtt unsubscribed") // }
} // esp_idf_svc::mqtt::client::EventPayload::Unsubscribed(_) => {
esp_idf_svc::mqtt::client::EventPayload::Published(_) => { // log::info!("Mqtt unsubscribed")
log::info!("Mqtt published") // }
} // esp_idf_svc::mqtt::client::EventPayload::Published(_) => {
esp_idf_svc::mqtt::client::EventPayload::Deleted(_) => { // log::info!("Mqtt published")
log::info!("Mqtt deleted") // }
} // esp_idf_svc::mqtt::client::EventPayload::Deleted(_) => {
} // log::info!("Mqtt deleted")
})?; // }
// }
let mut wait_for_connections_event = 0; // })?;
while wait_for_connections_event < 100 { //
wait_for_connections_event += 1; // let mut wait_for_connections_event = 0;
match mqtt_connected_event_received.load(std::sync::atomic::Ordering::Relaxed) { // while wait_for_connections_event < 100 {
true => { // wait_for_connections_event += 1;
log::info!("Mqtt connection callback received, progressing"); // match mqtt_connected_event_received.load(std::sync::atomic::Ordering::Relaxed) {
match mqtt_connected_event_ok.load(std::sync::atomic::Ordering::Relaxed) { // true => {
true => { // log::info!("Mqtt connection callback received, progressing");
log::info!( // match mqtt_connected_event_ok.load(std::sync::atomic::Ordering::Relaxed) {
"Mqtt did callback as connected, testing with roundtrip now" // true => {
); // log::info!(
//subscribe to roundtrip // "Mqtt did callback as connected, testing with roundtrip now"
client.subscribe(round_trip_topic.as_str(), ExactlyOnce)?; // );
client.subscribe(stay_alive_topic.as_str(), ExactlyOnce)?; // //subscribe to roundtrip
//publish to roundtrip // client.subscribe(round_trip_topic.as_str(), ExactlyOnce)?;
client.publish( // client.subscribe(stay_alive_topic.as_str(), ExactlyOnce)?;
round_trip_topic.as_str(), // //publish to roundtrip
ExactlyOnce, // client.publish(
false, // round_trip_topic.as_str(),
"online_test".as_bytes(), // ExactlyOnce,
)?; // false,
// "online_test".as_bytes(),
let mut wait_for_roundtrip = 0; // )?;
while wait_for_roundtrip < 100 { //
wait_for_roundtrip += 1; // let mut wait_for_roundtrip = 0;
match round_trip_ok.load(std::sync::atomic::Ordering::Relaxed) { // while wait_for_roundtrip < 100 {
true => { // wait_for_roundtrip += 1;
log::info!("Round trip registered, proceeding"); // match round_trip_ok.load(std::sync::atomic::Ordering::Relaxed) {
self.mqtt_client = Some(MqttClient { // true => {
mqtt_client: client, // log::info!("Round trip registered, proceeding");
base_topic: base_topic_copy, // self.mqtt_client = Some(MqttClient {
}); // mqtt_client: client,
return anyhow::Ok(()); // base_topic: base_topic_copy,
} // });
false => { // return anyhow::Ok(());
unsafe { vTaskDelay(10) }; // }
} // false => {
} // unsafe { vTaskDelay(10) };
} // }
bail!("Mqtt did not complete roundtrip in time"); // }
} // }
false => { // bail!("Mqtt did not complete roundtrip in time");
bail!("Mqtt did respond but with failure") // }
} // false => {
} // bail!("Mqtt did respond but with failure")
} // }
false => { // }
unsafe { vTaskDelay(10) }; // }
} // false => {
} // unsafe { vTaskDelay(10) };
} // }
bail!("Mqtt did not fire connection callback in time"); // }
// }
// bail!("Mqtt did not fire connection callback in time");
} }
pub(crate) async fn mqtt_publish( pub(crate) async fn mqtt_publish(
&mut self, &mut self,
subtopic: &str, subtopic: &str,
message: &[u8], message: &[u8],
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
if self.mqtt_client.is_none() { bail!("todo");
return anyhow::Ok(()); //
} // if self.mqtt_client.is_none() {
if !subtopic.starts_with("/") { // return anyhow::Ok(());
log::info!("Subtopic without / at start {}", subtopic); // }
bail!("Subtopic without / at start {}", subtopic); // if !subtopic.starts_with("/") {
} // log::info!("Subtopic without / at start {}", subtopic);
if subtopic.len() > 192 { // bail!("Subtopic without / at start {}", subtopic);
log::info!("Subtopic exceeds 192 chars {}", subtopic); // }
bail!("Subtopic exceeds 192 chars {}", subtopic); // if subtopic.len() > 192 {
} // log::info!("Subtopic exceeds 192 chars {}", subtopic);
let client = self.mqtt_client.as_mut().unwrap(); // bail!("Subtopic exceeds 192 chars {}", subtopic);
let mut full_topic: heapless::String<256> = heapless::String::new(); // }
if full_topic.push_str(client.base_topic.as_str()).is_err() { // let client = self.mqtt_client.as_mut().unwrap();
log::info!("Some error assembling full_topic 1"); // let mut full_topic: heapless::String<256> = heapless::String::new();
bail!("Some error assembling full_topic 1") // if full_topic.push_str(client.base_topic.as_str()).is_err() {
}; // log::info!("Some error assembling full_topic 1");
if full_topic.push_str(subtopic).is_err() { // bail!("Some error assembling full_topic 1")
log::info!("Some error assembling full_topic 2"); // };
bail!("Some error assembling full_topic 2") // if full_topic.push_str(subtopic).is_err() {
}; // log::info!("Some error assembling full_topic 2");
let publish = client // bail!("Some error assembling full_topic 2")
.mqtt_client // };
.publish(&full_topic, ExactlyOnce, true, message); // let publish = client
Delay::new(10).delay_ms(50); // .mqtt_client
match publish { // .publish(&full_topic, ExactlyOnce, true, message);
OkStd(message_id) => { // Timer::after_millis(10).await;
log::info!( // match publish {
"Published mqtt topic {} with message {:#?} msgid is {:?}", // OkStd(message_id) => {
full_topic, // log::info!(
String::from_utf8_lossy(message), // "Published mqtt topic {} with message {:#?} msgid is {:?}",
message_id // full_topic,
); // String::from_utf8_lossy(message),
anyhow::Ok(()) // message_id
} // );
Err(err) => { // anyhow::Ok(())
log::info!( // }
"Error during mqtt send on topic {} with message {:#?} error is {:?}", // Err(err) => {
full_topic, // log::info!(
String::from_utf8_lossy(message), // "Error during mqtt send on topic {} with message {:#?} error is {:?}",
err // full_topic,
); // String::from_utf8_lossy(message),
Err(err)? // err
} // );
} // Err(err)?
// }
// }
} }
} }

65
rust/src/hal/initial_hal.rs
View File

@ -1,19 +1,21 @@
use alloc::vec::Vec;
use crate::hal::esp::Esp; use crate::hal::esp::Esp;
use crate::hal::rtc::{BackupHeader, RTCModuleInteraction}; use crate::hal::rtc::{BackupHeader, RTCModuleInteraction};
use crate::hal::water::TankSensor; //use crate::hal::water::TankSensor;
use crate::hal::{deep_sleep, BoardInteraction, FreePeripherals, Sensor}; use crate::hal::{deep_sleep, BoardInteraction, FreePeripherals, Sensor};
use crate::{ use crate::{
config::PlantControllerConfig, config::PlantControllerConfig,
hal::battery::{BatteryInteraction, NoBatteryMonitor}, hal::battery::{BatteryInteraction, NoBatteryMonitor},
}; };
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use async_trait::async_trait;
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use embedded_hal::digital::OutputPin; use embedded_hal::digital::OutputPin;
use measurements::{Current, Voltage}; use measurements::{Current, Voltage};
use crate::alloc::boxed::Box; use crate::alloc::boxed::Box;
pub struct Initial<'a> { pub struct Initial<'a> {
pub(crate) general_fault: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, InputOutput>, //pub(crate) general_fault: PinDriver<'a, esp_idf_hal::gpio::AnyIOPin, InputOutput>,
pub(crate) esp: Esp<'a>, pub(crate) esp: Esp<'a>,
pub(crate) config: PlantControllerConfig, pub(crate) config: PlantControllerConfig,
pub(crate) battery: Box<dyn BatteryInteraction + Send>, pub(crate) battery: Box<dyn BatteryInteraction + Send>,
@ -22,44 +24,45 @@ pub struct Initial<'a> {
struct NoRTC {} struct NoRTC {}
#[async_trait]
impl RTCModuleInteraction for NoRTC { impl RTCModuleInteraction for NoRTC {
fn get_backup_info(&mut self) -> Result<BackupHeader> { async fn get_backup_info(&mut self) -> Result<BackupHeader> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn get_backup_config(&mut self) -> Result<Vec<u8>> { async fn get_backup_config(&mut self) -> Result<Vec<u8>> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn backup_config(&mut self, _bytes: &[u8]) -> Result<()> { async fn backup_config(&mut self, _bytes: &[u8]) -> Result<()> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn get_rtc_time(&mut self) -> Result<DateTime<Utc>> { async fn get_rtc_time(&mut self) -> Result<DateTime<Utc>> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn set_rtc_time(&mut self, _time: &DateTime<Utc>) -> Result<()> { async fn set_rtc_time(&mut self, _time: &DateTime<Utc>) -> Result<()> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
} }
pub(crate) fn create_initial_board( pub(crate) fn create_initial_board(
free_pins: FreePeripherals, //free_pins: FreePeripherals,
fs_mount_error: bool, fs_mount_error: bool,
config: PlantControllerConfig, config: PlantControllerConfig,
esp: Esp<'static>, esp: Esp<'static>,
) -> Result<Box<dyn BoardInteraction<'static> + Send>> { ) -> Result<Box<dyn BoardInteraction<'static> + Send>> {
log::info!("Start initial"); log::info!("Start initial");
let mut general_fault = PinDriver::input_output(free_pins.gpio6.downgrade())?; // let mut general_fault = PinDriver::input_output(free_pins.gpio6.downgrade())?;
general_fault.set_pull(Pull::Floating)?; // general_fault.set_pull(Pull::Floating)?;
general_fault.set_low()?; // general_fault.set_low()?;
//
if fs_mount_error { // if fs_mount_error {
general_fault.set_high()? // general_fault.set_high()?
} // }
let v = Initial { let v = Initial {
general_fault, //general_fault,
config, config,
esp, esp,
battery: Box::new(NoBatteryMonitor {}), battery: Box::new(NoBatteryMonitor {}),
@ -68,10 +71,11 @@ pub(crate) fn create_initial_board(
Ok(Box::new(v)) Ok(Box::new(v))
} }
#[async_trait]
impl<'a> BoardInteraction<'a> for Initial<'a> { impl<'a> BoardInteraction<'a> for Initial<'a> {
fn get_tank_sensor(&mut self) -> Option<&mut TankSensor<'a>> { // fn get_tank_sensor(&mut self) -> Option<&mut TankSensor<'a>> {
None // None
} // }
fn get_esp(&mut self) -> &mut Esp<'a> { fn get_esp(&mut self) -> &mut Esp<'a> {
&mut self.esp &mut self.esp
@ -103,41 +107,42 @@ impl<'a> BoardInteraction<'a> for Initial<'a> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn pump(&mut self, _plant: usize, _enable: bool) -> Result<()> { async fn pump(&mut self, _plant: usize, _enable: bool) -> Result<()> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn pump_current(&mut self, _plant: usize) -> Result<Current> { async fn pump_current(&mut self, _plant: usize) -> Result<Current> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn fault(&mut self, _plant: usize, _enable: bool) -> Result<()> { async fn fault(&mut self, _plant: usize, _enable: bool) -> Result<()> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn measure_moisture_hz(&mut self, _plant: usize, _sensor: Sensor) -> Result<f32> { async fn measure_moisture_hz(&mut self, _plant: usize, _sensor: Sensor) -> Result<f32> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn general_fault(&mut self, enable: bool) { async fn general_fault(&mut self, enable: bool) {
let _ = self.general_fault.set_state(enable.into()); //let _ = self.general_fault.set_state(enable.into());
} }
fn test(&mut self) -> Result<()> { async fn test(&mut self) -> Result<()> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn set_config(&mut self, config: PlantControllerConfig) -> anyhow::Result<()> { async fn set_config(&mut self, config: PlantControllerConfig) -> anyhow::Result<()> {
self.config = config; self.config = config;
self.esp.save_config(&self.config)?; //TODO
// self.esp.save_config(&self.config)?;
anyhow::Ok(()) anyhow::Ok(())
} }
fn get_mptt_voltage(&mut self) -> Result<Voltage> { async fn get_mptt_voltage(&mut self) -> Result<Voltage> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
fn get_mptt_current(&mut self) -> Result<Current> { async fn get_mptt_current(&mut self) -> Result<Current> {
bail!("Please configure board revision") bail!("Please configure board revision")
} }
} }

419
rust/src/hal/mod.rs
View File

@ -2,55 +2,33 @@ pub(crate) mod battery;
mod esp; mod esp;
mod initial_hal; mod initial_hal;
mod rtc; mod rtc;
mod v3_hal; //mod water;
mod v4_hal;
mod v4_sensor;
mod water;
use crate::alloc::string::ToString; use crate::alloc::string::ToString;
use crate::hal::rtc::{DS3231Module, RTCModuleInteraction}; use crate::hal::rtc::{RTCModuleInteraction};
use crate::hal::water::TankSensor; //use crate::hal::water::TankSensor;
use crate::{ use crate::{
config::{BatteryBoardVersion, BoardVersion, PlantControllerConfig}, config::{BatteryBoardVersion, BoardVersion, PlantControllerConfig},
hal::{ hal::{
battery::{print_battery_bq34z100, BatteryInteraction, NoBatteryMonitor}, battery::{BatteryInteraction, NoBatteryMonitor},
esp::Esp, esp::Esp,
}, },
log::{log, LogMessage}, log::{log, LogMessage},
}; };
use alloc::boxed::Box; use alloc::boxed::Box;
use alloc::format;
use core::marker::PhantomData;
use anyhow::{Ok, Result}; use anyhow::{Ok, Result};
use async_trait::async_trait; use async_trait::async_trait;
use battery::BQ34Z100G1; //use battery::BQ34Z100G1;
use bq34z100::Bq34z100g1Driver; use bq34z100::Bq34z100g1Driver;
use ds323x::{DateTimeAccess, Ds323x}; use ds323x::{DateTimeAccess, Ds323x};
use eeprom24x::{Eeprom24x, SlaveAddr, Storage}; use eeprom24x::{Eeprom24x, SlaveAddr, Storage};
use embassy_sync::blocking_mutex::raw::{CriticalSectionRawMutex, NoopRawMutex}; use embassy_sync::blocking_mutex::raw::{CriticalSectionRawMutex};
use embassy_sync::mutex::Mutex; use embassy_sync::mutex::Mutex;
use embassy_sync::{LazyLock, Mutex}; use embassy_sync::lazy_lock::LazyLock;
use embedded_hal_bus::i2c::MutexDevice; use esp_hal::clock::CpuClock;
use esp_idf_hal::can::CAN; use esp_hal::timer::systimer::SystemTimer;
use esp_idf_hal::pcnt::PCNT1;
use esp_idf_hal::{
adc::ADC1,
delay::Delay,
gpio::{
Gpio0, Gpio1, Gpio10, Gpio11, Gpio12, Gpio13, Gpio14, Gpio15, Gpio16, Gpio17, Gpio18,
Gpio2, Gpio21, Gpio22, Gpio23, Gpio24, Gpio25, Gpio26, Gpio27, Gpio28, Gpio29, Gpio3,
Gpio30, Gpio4, Gpio5, Gpio6, Gpio7, Gpio8, IOPin, PinDriver, Pull,
},
i2c::{APBTickType, I2cConfig, I2cDriver},
pcnt::PCNT0,
prelude::Peripherals,
reset::ResetReason,
units::FromValueType,
};
use esp_idf_svc::{eventloop::EspSystemEventLoop, nvs::EspDefaultNvsPartition, wifi::EspWifi};
use esp_idf_sys::{
esp_deep_sleep, esp_restart, esp_sleep_enable_ext1_wakeup,
esp_sleep_ext1_wakeup_mode_t_ESP_EXT1_WAKEUP_ANY_LOW,
};
use esp_ota::mark_app_valid;
use measurements::{Current, Voltage}; use measurements::{Current, Voltage};
//Only support for 8 right now! //Only support for 8 right now!
@ -58,24 +36,27 @@ pub const PLANT_COUNT: usize = 8;
const TANK_MULTI_SAMPLE: usize = 11; const TANK_MULTI_SAMPLE: usize = 11;
pub static I2C_DRIVER: LazyLock<Mutex<I2cDriver<'static>>> = LazyLock::new(PlantHal::create_i2c); //pub static I2C_DRIVER: LazyLock<Mutex<CriticalSectionRawMutex,I2cDriver<'static>>> = LazyLock::new(PlantHal::create_i2c);
fn deep_sleep(duration_in_ms: u64) -> ! { fn deep_sleep(duration_in_ms: u64) -> ! {
unsafe { //unsafe {
//if we don't do this here, we might just revert newly flashed firmware // //if we don't do this here, we might just revert newly flashed firmware
mark_app_valid(); // mark_app_valid();
//allow early wakeup by pressing the boot button // //allow early wakeup by pressing the boot button
if duration_in_ms == 0 { // if duration_in_ms == 0 {
esp_restart(); // esp_restart();
} else { // } else {
//configure gpio 1 to wakeup on low, reused boot button for this // //configure gpio 1 to wakeup on low, reused boot button for this
esp_sleep_enable_ext1_wakeup( // esp_sleep_enable_ext1_wakeup(
0b10u64, // 0b10u64,
esp_sleep_ext1_wakeup_mode_t_ESP_EXT1_WAKEUP_ANY_LOW, // esp_sleep_ext1_wakeup_mode_t_ESP_EXT1_WAKEUP_ANY_LOW,
); // );
esp_deep_sleep(duration_in_ms); // esp_deep_sleep(duration_in_ms);
// }
loop {
todo!()
} }
}; //};
} }
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
@ -92,7 +73,7 @@ pub struct HAL<'a> {
#[async_trait] #[async_trait]
pub trait BoardInteraction<'a> { pub trait BoardInteraction<'a> {
fn get_tank_sensor(&mut self) -> Option<&mut TankSensor>; //fn get_tank_sensor(&mut self) -> Option<&mut TankSensor>;
fn get_esp(&mut self) -> &mut Esp<'a>; fn get_esp(&mut self) -> &mut Esp<'a>;
fn get_config(&mut self) -> &PlantControllerConfig; fn get_config(&mut self) -> &PlantControllerConfig;
fn get_battery_monitor(&mut self) -> &mut Box<dyn BatteryInteraction + Send>; fn get_battery_monitor(&mut self) -> &mut Box<dyn BatteryInteraction + Send>;
@ -114,13 +95,14 @@ pub trait BoardInteraction<'a> {
async fn get_mptt_current(&mut self) -> anyhow::Result<Current>; async fn get_mptt_current(&mut self) -> anyhow::Result<Current>;
} }
impl dyn BoardInteraction<'_> { impl dyn BoardInteraction<'_> {
//the counter is just some arbitrary number that increases whenever some progress was made, try to keep the updates < 10 per second for ux reasons //the counter is just some arbitrary number that increases whenever some progress was made, try to keep the updates < 10 per second for ux reasons
async fn _progress(&mut self, counter: u32) { async fn _progress(&mut self, counter: u32) {
let even = counter % 2 == 0; let even = counter % 2 == 0;
let current = counter / (PLANT_COUNT as u32); let current = counter / (PLANT_COUNT as u32);
for led in 0..PLANT_COUNT { for led in 0..PLANT_COUNT {
self.fault(led, current == led as u32).unwrap(); self.fault(led, current == led as u32).await.unwrap();
} }
let _ = self.general_fault(even.into()); let _ = self.general_fault(even.into());
} }
@ -128,134 +110,138 @@ impl dyn BoardInteraction<'_> {
#[allow(dead_code)] #[allow(dead_code)]
pub struct FreePeripherals { pub struct FreePeripherals {
pub gpio0: Gpio0, // pub gpio0: Gpio0,
pub gpio1: Gpio1, // pub gpio1: Gpio1,
pub gpio2: Gpio2, // pub gpio2: Gpio2,
pub gpio3: Gpio3, // pub gpio3: Gpio3,
pub gpio4: Gpio4, // pub gpio4: Gpio4,
pub gpio5: Gpio5, // pub gpio5: Gpio5,
pub gpio6: Gpio6, // pub gpio6: Gpio6,
pub gpio7: Gpio7, // pub gpio7: Gpio7,
pub gpio8: Gpio8, // pub gpio8: Gpio8,
//config button here // //config button here
pub gpio10: Gpio10, // pub gpio10: Gpio10,
pub gpio11: Gpio11, // pub gpio11: Gpio11,
pub gpio12: Gpio12, // pub gpio12: Gpio12,
pub gpio13: Gpio13, // pub gpio13: Gpio13,
pub gpio14: Gpio14, // pub gpio14: Gpio14,
pub gpio15: Gpio15, // pub gpio15: Gpio15,
pub gpio16: Gpio16, // pub gpio16: Gpio16,
pub gpio17: Gpio17, // pub gpio17: Gpio17,
pub gpio18: Gpio18, // pub gpio18: Gpio18,
//i2c here // //i2c here
pub gpio21: Gpio21, // pub gpio21: Gpio21,
pub gpio22: Gpio22, // pub gpio22: Gpio22,
pub gpio23: Gpio23, // pub gpio23: Gpio23,
pub gpio24: Gpio24, // pub gpio24: Gpio24,
pub gpio25: Gpio25, // pub gpio25: Gpio25,
pub gpio26: Gpio26, // pub gpio26: Gpio26,
pub gpio27: Gpio27, // pub gpio27: Gpio27,
pub gpio28: Gpio28, // pub gpio28: Gpio28,
pub gpio29: Gpio29, // pub gpio29: Gpio29,
pub gpio30: Gpio30, // pub gpio30: Gpio30,
pub pcnt0: PCNT0, // pub pcnt0: PCNT0,
pub pcnt1: PCNT1, // pub pcnt1: PCNT1,
pub adc1: ADC1, // pub adc1: ADC1,
pub can: CAN, // pub can: CAN,
} }
impl PlantHal { impl PlantHal {
fn create_i2c() -> Mutex<I2cDriver<'static>> { // fn create_i2c() -> Mutex<CriticalSectionRawMutex, I2cDriver<'static>> {
let peripherals = unsafe { Peripherals::new() }; // let peripherals = unsafe { Peripherals::new() };
//
let config = I2cConfig::new() // let config = I2cConfig::new()
.scl_enable_pullup(true) // .scl_enable_pullup(true)
.sda_enable_pullup(true) // .sda_enable_pullup(true)
.baudrate(100_u32.kHz().into()) // .baudrate(100_u32.kHz().into())
.timeout(APBTickType::from(Duration::from_millis(100))); // .timeout(APBTickType::from(Duration::from_millis(100)));
//
let i2c = peripherals.i2c0; // let i2c = peripherals.i2c0;
let scl = peripherals.pins.gpio19.downgrade(); // let scl = peripherals.pins.gpio19.downgrade();
let sda = peripherals.pins.gpio20.downgrade(); // let sda = peripherals.pins.gpio20.downgrade();
//
Mutex::new(I2cDriver::new(i2c, sda, scl, &config).unwrap()) // Mutex::new(I2cDriver::new(i2c, sda, scl, &config).unwrap())
} // }
pub fn create() -> Result<Mutex<CriticalSectionRawMutex, HAL<'static>>> { pub fn create() -> Result<Mutex<CriticalSectionRawMutex, HAL<'static>>> {
let peripherals = Peripherals::take()?; let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
let sys_loop = EspSystemEventLoop::take()?; let peripherals = esp_hal::init(config);
let nvs = EspDefaultNvsPartition::take()?;
let wifi_driver = EspWifi::new(peripherals.modem, sys_loop, Some(nvs))?;
let mut boot_button = PinDriver::input(peripherals.pins.gpio9.downgrade())?; esp_alloc::heap_allocator!(size: 64 * 1024);
boot_button.set_pull(Pull::Floating)?; let timer0 = SystemTimer::new(peripherals.SYSTIMER);
esp_hal_embassy::init(timer0.alarm0);
let free_pins = FreePeripherals {
can: peripherals.can,
adc1: peripherals.adc1,
pcnt0: peripherals.pcnt0,
pcnt1: peripherals.pcnt1,
gpio0: peripherals.pins.gpio0,
gpio1: peripherals.pins.gpio1,
gpio2: peripherals.pins.gpio2,
gpio3: peripherals.pins.gpio3,
gpio4: peripherals.pins.gpio4,
gpio5: peripherals.pins.gpio5,
gpio6: peripherals.pins.gpio6,
gpio7: peripherals.pins.gpio7,
gpio8: peripherals.pins.gpio8,
gpio10: peripherals.pins.gpio10,
gpio11: peripherals.pins.gpio11,
gpio12: peripherals.pins.gpio12,
gpio13: peripherals.pins.gpio13,
gpio14: peripherals.pins.gpio14,
gpio15: peripherals.pins.gpio15,
gpio16: peripherals.pins.gpio16,
gpio17: peripherals.pins.gpio17,
gpio18: peripherals.pins.gpio18,
gpio21: peripherals.pins.gpio21,
gpio22: peripherals.pins.gpio22,
gpio23: peripherals.pins.gpio23,
gpio24: peripherals.pins.gpio24,
gpio25: peripherals.pins.gpio25,
gpio26: peripherals.pins.gpio26,
gpio27: peripherals.pins.gpio27,
gpio28: peripherals.pins.gpio28,
gpio29: peripherals.pins.gpio29,
gpio30: peripherals.pins.gpio30,
};
// let mut boot_button = PinDriver::input(peripherals.pins.gpio9.downgrade())?;
// boot_button.set_pull(Pull::Floating)?;
//
// let free_pins = FreePeripherals {
// can: peripherals.can,
// adc1: peripherals.adc1,
// pcnt0: peripherals.pcnt0,
// pcnt1: peripherals.pcnt1,
// gpio0: peripherals.pins.gpio0,
// gpio1: peripherals.pins.gpio1,
// gpio2: peripherals.pins.gpio2,
// gpio3: peripherals.pins.gpio3,
// gpio4: peripherals.pins.gpio4,
// gpio5: peripherals.pins.gpio5,
// gpio6: peripherals.pins.gpio6,
// gpio7: peripherals.pins.gpio7,
// gpio8: peripherals.pins.gpio8,
// gpio10: peripherals.pins.gpio10,
// gpio11: peripherals.pins.gpio11,
// gpio12: peripherals.pins.gpio12,
// gpio13: peripherals.pins.gpio13,
// gpio14: peripherals.pins.gpio14,
// gpio15: peripherals.pins.gpio15,
// gpio16: peripherals.pins.gpio16,
// gpio17: peripherals.pins.gpio17,
// gpio18: peripherals.pins.gpio18,
// gpio21: peripherals.pins.gpio21,
// gpio22: peripherals.pins.gpio22,
// gpio23: peripherals.pins.gpio23,
// gpio24: peripherals.pins.gpio24,
// gpio25: peripherals.pins.gpio25,
// gpio26: peripherals.pins.gpio26,
// gpio27: peripherals.pins.gpio27,
// gpio28: peripherals.pins.gpio28,
// gpio29: peripherals.pins.gpio29,
// gpio30: peripherals.pins.gpio30,
// };
//
let mut esp = Esp { let mut esp = Esp {
mqtt_client: None, mqtt_client: None,
wifi_driver, dummy: PhantomData::default()
boot_button, // wifi_driver,
delay: Delay::new(1000), // boot_button
}; };
//init,reset rtc memory depending on cause //init,reset rtc memory depending on cause
let mut init_rtc_store: bool = false; let mut init_rtc_store: bool = false;
let mut to_config_mode: bool = false; let mut to_config_mode: bool = false;
let reasons = ResetReason::get(); let reasons = "";
match reasons { // let reasons = ResetReason::get();
ResetReason::Software => {} // match reasons {
ResetReason::ExternalPin => {} // ResetReason::Software => {}
ResetReason::Watchdog => { // ResetReason::ExternalPin => {}
init_rtc_store = true; // ResetReason::Watchdog => {
} // init_rtc_store = true;
ResetReason::Sdio => init_rtc_store = true, // }
ResetReason::Panic => init_rtc_store = true, // ResetReason::Sdio => init_rtc_store = true,
ResetReason::InterruptWatchdog => init_rtc_store = true, // ResetReason::Panic => init_rtc_store = true,
ResetReason::PowerOn => init_rtc_store = true, // ResetReason::InterruptWatchdog => init_rtc_store = true,
ResetReason::Unknown => init_rtc_store = true, // ResetReason::PowerOn => init_rtc_store = true,
ResetReason::Brownout => init_rtc_store = true, // ResetReason::Unknown => init_rtc_store = true,
ResetReason::TaskWatchdog => init_rtc_store = true, // ResetReason::Brownout => init_rtc_store = true,
ResetReason::DeepSleep => {} // ResetReason::TaskWatchdog => init_rtc_store = true,
ResetReason::USBPeripheral => { // ResetReason::DeepSleep => {}
init_rtc_store = true; // ResetReason::USBPeripheral => {
to_config_mode = true; // init_rtc_store = true;
} // to_config_mode = true;
ResetReason::JTAG => init_rtc_store = true, // }
}; // ResetReason::JTAG => init_rtc_store = true,
// };
log( log(
LogMessage::ResetReason, LogMessage::ResetReason,
init_rtc_store as u32, init_rtc_store as u32,
@ -270,70 +256,76 @@ impl PlantHal {
let config = esp.load_config(); let config = esp.load_config();
log::info!("Init rtc driver"); log::info!("Init rtc driver");
let mut rtc = Ds323x::new_ds3231(MutexDevice::new(&I2C_DRIVER)); // let mut rtc = Ds323x::new_ds3231(MutexDevice::new(&I2C_DRIVER));
//
// log::info!("Init rtc eeprom driver");
// let eeprom = {
// Eeprom24x::new_24x32(
// MutexDevice::new(&I2C_DRIVER),
// SlaveAddr::Alternative(true, true, true),
// )
// };
// let rtc_time = rtc.datetime();
// match rtc_time {
// OkStd(tt) => {
// log::info!("Rtc Module reports time at UTC {}", tt);
// }
// Err(err) => {
// log::info!("Rtc Module could not be read {:?}", err);
// }
// }
log::info!("Init rtc eeprom driver"); // let storage = Storage::new(eeprom, Delay::new(1000));
let eeprom = { //let rtc_module: Box<dyn RTCModuleInteraction + Send> =
Eeprom24x::new_24x32( // Box::new(DS3231Module { rtc, storage }) as Box<dyn RTCModuleInteraction + Send>;
MutexDevice::new(&I2C_DRIVER),
SlaveAddr::Alternative(true, true, true),
)
};
let rtc_time = rtc.datetime();
match rtc_time {
OkStd(tt) => {
log::info!("Rtc Module reports time at UTC {}", tt);
}
Err(err) => {
log::info!("Rtc Module could not be read {:?}", err);
}
}
let storage = Storage::new(eeprom, Delay::new(1000));
let rtc_module: Box<dyn RTCModuleInteraction + Send> =
Box::new(DS3231Module { rtc, storage }) as Box<dyn RTCModuleInteraction + Send>;
let hal = match config { let hal = match config {
Result::Ok(config) => { Result::Ok(config) => {
let battery_interaction: Box<dyn BatteryInteraction + Send> = let battery_interaction: Box<dyn BatteryInteraction + Send> =
match config.hardware.battery { match config.hardware.battery {
BatteryBoardVersion::Disabled => Box::new(NoBatteryMonitor {}), BatteryBoardVersion::Disabled => Box::new(NoBatteryMonitor {}),
BatteryBoardVersion::BQ34Z100G1 => { // BatteryBoardVersion::BQ34Z100G1 => {
let mut battery_driver = Bq34z100g1Driver { // let mut battery_driver = Bq34z100g1Driver {
i2c: MutexDevice::new(&I2C_DRIVER), // i2c: MutexDevice::new(&I2C_DRIVER),
delay: Delay::new(0), // delay: Delay::new(0),
flash_block_data: [0; 32], // flash_block_data: [0; 32],
}; // };
let status = print_battery_bq34z100(&mut battery_driver); // let status = print_battery_bq34z100(&mut battery_driver);
match status { // match status {
OkStd(_) => {} // Ok(_) => {}
Err(err) => { // Err(err) => {
log( // log(
LogMessage::BatteryCommunicationError, // LogMessage::BatteryCommunicationError,
0u32, // 0u32,
0, // 0,
"", // "",
&format!("{err:?})"), // &format!("{err:?})"),
); // );
} // }
} // }
Box::new(BQ34Z100G1 { battery_driver }) // Box::new(BQ34Z100G1 { battery_driver })
} // }
BatteryBoardVersion::WchI2cSlave => { BatteryBoardVersion::WchI2cSlave => {
// TODO use correct implementation once availible // TODO use correct implementation once availible
Box::new(NoBatteryMonitor {}) Box::new(NoBatteryMonitor {})
} }
_ => {
todo!()
}
}; };
let board_hal: Box<dyn BoardInteraction + Send> = match config.hardware.board { let board_hal: Box<dyn BoardInteraction + Send> = match config.hardware.board {
BoardVersion::INITIAL => { BoardVersion::INITIAL => {
initial_hal::create_initial_board(free_pins, fs_mount_error, config, esp)? initial_hal::create_initial_board(fs_mount_error, config, esp)?
} }
BoardVersion::V3 => { // BoardVersion::V3 => {
v3_hal::create_v3(free_pins, esp, config, battery_interaction, rtc_module)? // v3_hal::create_v3(free_pins, esp, config, battery_interaction, rtc_module)?
} // }
BoardVersion::V4 => { // BoardVersion::V4 => {
v4_hal::create_v4(free_pins, esp, config, battery_interaction, rtc_module)? // v4_hal::create_v4(free_pins, esp, config, battery_interaction, rtc_module)?
// }
_ => {
todo!()
} }
}; };
@ -349,7 +341,6 @@ impl PlantHal {
); );
HAL { HAL {
board_hal: initial_hal::create_initial_board( board_hal: initial_hal::create_initial_board(
free_pins,
fs_mount_error, fs_mount_error,
PlantControllerConfig::default(), PlantControllerConfig::default(),
esp, esp,

245
rust/src/hal/rtc.rs
View File

@ -1,133 +1,138 @@
use crate::hal::Box; use crate::hal::Box;
use alloc::vec::Vec; use alloc::vec::Vec;
use anyhow::{anyhow, bail};
use async_trait::async_trait; use async_trait::async_trait;
use bincode::config::Configuration;
use bincode::{config, Decode, Encode};
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use ds323x::{DateTimeAccess, Ds323x};
use eeprom24x::addr_size::TwoBytes;
use eeprom24x::page_size::B32;
use eeprom24x::unique_serial::No;
use eeprom24x::Storage;
use embedded_storage::ReadStorage as embedded_storage_ReadStorage;
use embedded_storage::Storage as embedded_storage_Storage;
use serde::{Deserialize, Serialize};
const X25: crc::Crc<u16> = crc::Crc::<u16>::new(&crc::CRC_16_IBM_SDLC);
const CONFIG: Configuration = config::standard();
// use crate::hal::Box;
// use alloc::vec::Vec;
// use anyhow::{anyhow, bail};
// use async_trait::async_trait;
// use bincode::config::Configuration;
// use bincode::{config, Decode, Encode};
// use chrono::{DateTime, Utc};
// use ds323x::{DateTimeAccess, Ds323x};
// use eeprom24x::addr_size::TwoBytes;
// use eeprom24x::page_size::B32;
// use eeprom24x::unique_serial::No;
// use eeprom24x::Storage;
// use embedded_storage::ReadStorage as embedded_storage_ReadStorage;
// use embedded_storage::Storage as embedded_storage_Storage;
// use serde::{Deserialize, Serialize};
//
// const X25: crc::Crc<u16> = crc::Crc::<u16>::new(&crc::CRC_16_IBM_SDLC);
// const CONFIG: Configuration = config::standard();
//
#[async_trait] #[async_trait]
pub trait RTCModuleInteraction { pub trait RTCModuleInteraction {
async fn get_backup_info(&mut self) -> anyhow::Result<BackupHeader>; async fn get_backup_info(&mut self) -> anyhow::Result<BackupHeader>;
async fn get_backup_config(&mut self) -> anyhow::Result<Vec<u8>>; async fn get_backup_config(&mut self) -> anyhow::Result<Vec<u8>>;
async fn backup_config(&mut self, bytes: &[u8]) -> anyhow::Result<()>; async fn backup_config(&mut self, bytes: &[u8]) -> anyhow::Result<()>;
async fn get_rtc_time(&mut self) -> anyhow::Result<DateTime<Utc>>; async fn get_rtc_time(&mut self) -> anyhow::Result<DateTime<Utc>>;
async fn set_rtc_time(&mut self, time: &DateTime<Utc>) -> anyhow::Result<()>; async fn set_rtc_time(&mut self, time: &DateTime<Utc>) -> anyhow::Result<()>;
} }
//
const BACKUP_HEADER_MAX_SIZE: usize = 64; // const BACKUP_HEADER_MAX_SIZE: usize = 64;
#[derive(Serialize, Deserialize, PartialEq, Debug, Default, Encode, Decode)] // #[derive(Serialize, Deserialize, PartialEq, Debug, Default, Encode, Decode)]
pub struct BackupHeader { pub struct BackupHeader {
pub timestamp: i64, pub timestamp: i64,
crc16: u16, crc16: u16,
pub size: u16, pub size: u16,
} }
//
pub struct DS3231Module<'a> { // pub struct DS3231Module<'a> {
pub(crate) rtc: // pub(crate) rtc:
Ds323x<ds323x::interface::I2cInterface<MutexDevice<'a, I2cDriver<'a>>>, ds323x::ic::DS3231>, // Ds323x<ds323x::interface::I2cInterface<MutexDevice<'a, I2cDriver<'a>>>, ds323x::ic::DS3231>,
//
pub(crate) storage: Storage<MutexDevice<'a, I2cDriver<'a>>, B32, TwoBytes, No, Delay>, // pub(crate) storage: Storage<MutexDevice<'a, I2cDriver<'a>>, B32, TwoBytes, No, Delay>,
} // }
//
impl RTCModuleInteraction for DS3231Module<'_> { // impl RTCModuleInteraction for DS3231Module<'_> {
fn get_backup_info(&mut self) -> anyhow::Result<BackupHeader> { // fn get_backup_info(&mut self) -> anyhow::Result<BackupHeader> {
let mut header_page_buffer = [0_u8; BACKUP_HEADER_MAX_SIZE]; // let mut header_page_buffer = [0_u8; BACKUP_HEADER_MAX_SIZE];
//
self.storage // self.storage
.read(0, &mut header_page_buffer) // .read(0, &mut header_page_buffer)
.map_err(|err| anyhow!("Error reading eeprom header {:?}", err))?; // .map_err(|err| anyhow!("Error reading eeprom header {:?}", err))?;
//
let (header, len): (BackupHeader, usize) = // let (header, len): (BackupHeader, usize) =
bincode::decode_from_slice(&header_page_buffer[..], CONFIG)?; // bincode::decode_from_slice(&header_page_buffer[..], CONFIG)?;
//
log::info!("Raw header is {:?} with size {}", header_page_buffer, len); // log::info!("Raw header is {:?} with size {}", header_page_buffer, len);
anyhow::Ok(header) // anyhow::Ok(header)
} // }
//
fn get_backup_config(&mut self) -> anyhow::Result<Vec<u8>> { // fn get_backup_config(&mut self) -> anyhow::Result<Vec<u8>> {
let mut header_page_buffer = [0_u8; BACKUP_HEADER_MAX_SIZE]; // let mut header_page_buffer = [0_u8; BACKUP_HEADER_MAX_SIZE];
//
self.storage // self.storage
.read(0, &mut header_page_buffer) // .read(0, &mut header_page_buffer)
.map_err(|err| anyhow!("Error reading eeprom header {:?}", err))?; // .map_err(|err| anyhow!("Error reading eeprom header {:?}", err))?;
let (header, _header_size): (BackupHeader, usize) = // let (header, _header_size): (BackupHeader, usize) =
bincode::decode_from_slice(&header_page_buffer[..], CONFIG)?; // bincode::decode_from_slice(&header_page_buffer[..], CONFIG)?;
//
let mut data_buffer = vec![0_u8; header.size as usize]; // let mut data_buffer = vec![0_u8; header.size as usize];
//read the specified number of bytes after the header // //read the specified number of bytes after the header
self.storage // self.storage
.read(BACKUP_HEADER_MAX_SIZE as u32, &mut data_buffer) // .read(BACKUP_HEADER_MAX_SIZE as u32, &mut data_buffer)
.map_err(|err| anyhow!("Error reading eeprom data {:?}", err))?; // .map_err(|err| anyhow!("Error reading eeprom data {:?}", err))?;
//
let checksum = X25.checksum(&data_buffer); // let checksum = X25.checksum(&data_buffer);
if checksum != header.crc16 { // if checksum != header.crc16 {
bail!( // bail!(
"Invalid checksum, got {} but expected {}", // "Invalid checksum, got {} but expected {}",
checksum, // checksum,
header.crc16 // header.crc16
); // );
} // }
//
anyhow::Ok(data_buffer) // anyhow::Ok(data_buffer)
} // }
fn backup_config(&mut self, bytes: &[u8]) -> anyhow::Result<()> { // fn backup_config(&mut self, bytes: &[u8]) -> anyhow::Result<()> {
let mut header_page_buffer = [0_u8; BACKUP_HEADER_MAX_SIZE]; // let mut header_page_buffer = [0_u8; BACKUP_HEADER_MAX_SIZE];
//
let time = self.get_rtc_time()?.timestamp_millis(); // let time = self.get_rtc_time()?.timestamp_millis();
let checksum = X25.checksum(bytes); // let checksum = X25.checksum(bytes);
//
let header = BackupHeader { // let header = BackupHeader {
crc16: checksum, // crc16: checksum,
timestamp: time, // timestamp: time,
size: bytes.len() as u16, // size: bytes.len() as u16,
}; // };
let config = config::standard(); // let config = config::standard();
let encoded = bincode::encode_into_slice(&header, &mut header_page_buffer, config)?; // let encoded = bincode::encode_into_slice(&header, &mut header_page_buffer, config)?;
log::info!( // log::info!(
"Raw header is {:?} with size {}", // "Raw header is {:?} with size {}",
header_page_buffer, // header_page_buffer,
encoded // encoded
); // );
self.storage // self.storage
.write(0, &header_page_buffer) // .write(0, &header_page_buffer)
.map_err(|err| anyhow!("Error writing header {:?}", err))?; // .map_err(|err| anyhow!("Error writing header {:?}", err))?;
//
//write rest after the header // //write rest after the header
self.storage // self.storage
.write(BACKUP_HEADER_MAX_SIZE as u32, &bytes) // .write(BACKUP_HEADER_MAX_SIZE as u32, &bytes)
.map_err(|err| anyhow!("Error writing body {:?}", err))?; // .map_err(|err| anyhow!("Error writing body {:?}", err))?;
//
anyhow::Ok(()) // anyhow::Ok(())
} // }
//
fn get_rtc_time(&mut self) -> anyhow::Result<DateTime<Utc>> { // fn get_rtc_time(&mut self) -> anyhow::Result<DateTime<Utc>> {
match self.rtc.datetime() { // match self.rtc.datetime() {
OkStd(rtc_time) => anyhow::Ok(rtc_time.and_utc()), // OkStd(rtc_time) => anyhow::Ok(rtc_time.and_utc()),
Err(err) => { // Err(err) => {
bail!("Error getting rtc time {:?}", err) // bail!("Error getting rtc time {:?}", err)
} // }
} // }
} // }
//
fn set_rtc_time(&mut self, time: &DateTime<Utc>) -> anyhow::Result<()> { // fn set_rtc_time(&mut self, time: &DateTime<Utc>) -> anyhow::Result<()> {
let naive_time = time.naive_utc(); // let naive_time = time.naive_utc();
match self.rtc.set_datetime(&naive_time) { // match self.rtc.set_datetime(&naive_time) {
OkStd(_) => anyhow::Ok(()), // OkStd(_) => anyhow::Ok(()),
Err(err) => { // Err(err) => {
bail!("Error getting rtc time {:?}", err) // bail!("Error getting rtc time {:?}", err)
} // }
} // }
} // }
} // }

171
rust/src/hal/water.rs
View File

@ -1,171 +0,0 @@
use crate::hal::TANK_MULTI_SAMPLE;
use anyhow::{anyhow, bail};
use ds18b20::Ds18b20;
use esp_idf_hal::adc::oneshot::config::AdcChannelConfig;
use esp_idf_hal::adc::oneshot::{AdcChannelDriver, AdcDriver};
use esp_idf_hal::adc::{attenuation, Resolution, ADC1};
use esp_idf_hal::delay::Delay;
use esp_idf_hal::gpio::{AnyIOPin, AnyInputPin, Gpio5, InputOutput, PinDriver, Pull};
use esp_idf_hal::pcnt::{
PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex, PCNT1,
};
use esp_idf_sys::EspError;
use one_wire_bus::OneWire;
pub struct TankSensor<'a> {
one_wire_bus: OneWire<PinDriver<'a, AnyIOPin, InputOutput>>,
tank_channel: AdcChannelDriver<'a, Gpio5, AdcDriver<'a, ADC1>>,
tank_power: PinDriver<'a, AnyIOPin, InputOutput>,
flow_counter: PcntDriver<'a>,
delay: Delay,
}
impl<'a> TankSensor<'a> {
pub(crate) fn create(
one_wire_pin: AnyIOPin,
adc1: ADC1,
gpio5: Gpio5,
tank_power_pin: AnyIOPin,
flow_sensor_pin: AnyIOPin,
pcnt1: PCNT1,
) -> anyhow::Result<TankSensor<'a>> {
let mut one_wire_pin =
PinDriver::input_output_od(one_wire_pin).expect("Failed to configure pin");
one_wire_pin
.set_pull(Pull::Floating)
.expect("Failed to set pull");
let adc_config = AdcChannelConfig {
attenuation: attenuation::DB_11,
resolution: Resolution::Resolution12Bit,
calibration: esp_idf_hal::adc::oneshot::config::Calibration::Curve,
};
let tank_driver = AdcDriver::new(adc1).expect("Failed to configure ADC");
let tank_channel = AdcChannelDriver::new(tank_driver, gpio5, &adc_config)
.expect("Failed to configure ADC channel");
let mut tank_power =
PinDriver::input_output(tank_power_pin).expect("Failed to configure pin");
tank_power
.set_pull(Pull::Floating)
.expect("Failed to set pull");
let one_wire_bus =
OneWire::new(one_wire_pin).expect("OneWire bus did not pull up after release");
let mut flow_counter = PcntDriver::new(
pcnt1,
Some(flow_sensor_pin),
Option::<AnyInputPin>::None,
Option::<AnyInputPin>::None,
Option::<AnyInputPin>::None,
)?;
flow_counter.channel_config(
PcntChannel::Channel1,
PinIndex::Pin0,
PinIndex::Pin1,
&PcntChannelConfig {
lctrl_mode: PcntControlMode::Keep,
hctrl_mode: PcntControlMode::Keep,
pos_mode: PcntCountMode::Increment,
neg_mode: PcntCountMode::Hold,
counter_h_lim: i16::MAX,
counter_l_lim: 0,
},
)?;
Ok(TankSensor {
one_wire_bus,
tank_channel,
tank_power,
flow_counter,
delay: Default::default(),
})
}
pub fn reset_flow_meter(&mut self) {
self.flow_counter.counter_pause().unwrap();
self.flow_counter.counter_clear().unwrap();
}
pub fn start_flow_meter(&mut self) {
self.flow_counter.counter_resume().unwrap();
}
pub fn get_flow_meter_value(&mut self) -> i16 {
self.flow_counter.get_counter_value().unwrap()
}
pub fn stop_flow_meter(&mut self) -> i16 {
self.flow_counter.counter_pause().unwrap();
self.get_flow_meter_value()
}
pub async fn water_temperature_c(&mut self) -> anyhow::Result<f32> {
//multisample should be moved to water_temperature_c
let mut attempt = 1;
let water_temp: Result<f32, anyhow::Error> = loop {
let temp = self.single_temperature_c();
match &temp {
Ok(res) => {
log::info!("Water temp is {}", res);
break temp;
}
Err(err) => {
log::info!("Could not get water temp {} attempt {}", err, attempt)
}
}
if attempt == 5 {
break temp;
}
attempt += 1;
};
water_temp
}
async fn single_temperature_c(&mut self) -> anyhow::Result<f32> {
self.one_wire_bus
.reset(&mut self.delay)
.map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
let first = self.one_wire_bus.devices(false, &mut self.delay).next();
if first.is_none() {
bail!("Not found any one wire Ds18b20");
}
let device_address = first
.unwrap()
.map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
let water_temp_sensor = Ds18b20::new::<EspError>(device_address)
.map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
water_temp_sensor
.start_temp_measurement(&mut self.one_wire_bus, &mut self.delay)
.map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
ds18b20::Resolution::Bits12.delay_for_measurement_time(&mut self.delay);
let sensor_data = water_temp_sensor
.read_data(&mut self.one_wire_bus, &mut self.delay)
.map_err(|err| -> anyhow::Error { anyhow!("Missing attribute: {:?}", err) })?;
if sensor_data.temperature == 85_f32 {
bail!("Ds18b20 dummy temperature returned");
}
anyhow::Ok(sensor_data.temperature / 10_f32)
}
pub async fn tank_sensor_voltage(&mut self) -> anyhow::Result<f32> {
self.tank_power.set_high()?;
//let stabilize
self.delay.delay_ms(100);
let mut store = [0_u16; TANK_MULTI_SAMPLE];
for multisample in 0..TANK_MULTI_SAMPLE {
let value = self.tank_channel.read()?;
store[multisample] = value;
}
self.tank_power.set_low()?;
store.sort();
let median_mv = store[6] as f32 / 1000_f32;
anyhow::Ok(median_mv)
}
}

85
rust/src/log/mod.rs
View File

@ -1,14 +1,13 @@
use crate::vec;
use alloc::string::ToString; use alloc::string::ToString;
use alloc::vec::Vec; use alloc::vec::Vec;
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
use embassy_sync::lazy_lock::LazyLock;
use embassy_sync::mutex::Mutex;
use serde::Serialize; use serde::Serialize;
use std::{collections::HashMap, sync::Mutex}; use strum_macros::{EnumIter, IntoStaticStr};
use strum::EnumIter;
use strum_macros::IntoStaticStr;
use esp_idf_svc::systime::EspSystemTime;
use once_cell::sync::Lazy;
use ringbuffer::{ConstGenericRingBuffer, RingBuffer}; use ringbuffer::{ConstGenericRingBuffer, RingBuffer};
use text_template::Template;
use unit_enum::UnitEnum; use unit_enum::UnitEnum;
const TXT_SHORT_LENGTH: usize = 8; const TXT_SHORT_LENGTH: usize = 8;
@ -20,8 +19,8 @@ const BUFFER_SIZE: usize = 220;
static mut BUFFER: ConstGenericRingBuffer<LogEntry, BUFFER_SIZE> = static mut BUFFER: ConstGenericRingBuffer<LogEntry, BUFFER_SIZE> =
ConstGenericRingBuffer::<LogEntry, BUFFER_SIZE>::new(); ConstGenericRingBuffer::<LogEntry, BUFFER_SIZE>::new();
#[allow(static_mut_refs)] #[allow(static_mut_refs)]
static BUFFER_ACCESS: Lazy<Mutex<&mut ConstGenericRingBuffer<LogEntry, BUFFER_SIZE>>> = static BUFFER_ACCESS: LazyLock<Mutex<CriticalSectionRawMutex,&mut ConstGenericRingBuffer<LogEntry, BUFFER_SIZE>>> =
Lazy::new(|| unsafe { Mutex::new(&mut BUFFER) }); LazyLock::new(|| unsafe { Mutex::new(&mut BUFFER) });
#[derive(Serialize, Debug, Clone)] #[derive(Serialize, Debug, Clone)]
pub struct LogEntry { pub struct LogEntry {
@ -33,11 +32,11 @@ pub struct LogEntry {
pub txt_long: heapless::String<TXT_LONG_LENGTH>, pub txt_long: heapless::String<TXT_LONG_LENGTH>,
} }
pub fn init() { pub async fn init() {
unsafe { unsafe {
BUFFER = ConstGenericRingBuffer::<LogEntry, BUFFER_SIZE>::new(); BUFFER = ConstGenericRingBuffer::<LogEntry, BUFFER_SIZE>::new();
}; };
let mut access = BUFFER_ACCESS.lock().unwrap(); let mut access = BUFFER_ACCESS.get().lock().await;
access.drain().for_each(|_| {}); access.drain().for_each(|_| {});
} }
@ -59,8 +58,8 @@ fn limit_length<const LIMIT: usize>(input: &str, target: &mut heapless::String<L
} }
} }
pub fn get_log() -> Vec<LogEntry> { pub async fn get_log() -> Vec<LogEntry> {
let buffer = BUFFER_ACCESS.lock().unwrap(); let buffer = BUFFER_ACCESS.get().lock().await;
let mut read_copy = Vec::new(); let mut read_copy = Vec::new();
for entry in buffer.iter() { for entry in buffer.iter() {
let copy = entry.clone(); let copy = entry.clone();
@ -70,32 +69,35 @@ pub fn get_log() -> Vec<LogEntry> {
read_copy read_copy
} }
pub fn log(message_key: LogMessage, number_a: u32, number_b: u32, txt_short: &str, txt_long: &str) { pub async fn log(message_key: LogMessage, number_a: u32, number_b: u32, txt_short: &str, txt_long: &str) {
let mut txt_short_stack: heapless::String<TXT_SHORT_LENGTH> = heapless::String::new(); let mut txt_short_stack: heapless::String<TXT_SHORT_LENGTH> = heapless::String::new();
let mut txt_long_stack: heapless::String<TXT_LONG_LENGTH> = heapless::String::new(); let mut txt_long_stack: heapless::String<TXT_LONG_LENGTH> = heapless::String::new();
limit_length(txt_short, &mut txt_short_stack); limit_length(txt_short, &mut txt_short_stack);
limit_length(txt_long, &mut txt_long_stack); limit_length(txt_long, &mut txt_long_stack);
let time = EspSystemTime {}.now().as_millis() as u64; //TODO
let time = 0;
// let time = EspSystemTime {}.now().as_millis() as u64;
//
let ordinal = message_key.ordinal() as u16; let ordinal = message_key.ordinal() as u16;
let template_string: &str = message_key.into(); // let template_string: &str = message_key.into();
//
let mut values: HashMap<&str, &str> = HashMap::new(); // let mut values: HashMap<&str, &str> = HashMap::new();
let number_a_str = number_a.to_string(); // let number_a_str = number_a.to_string();
let number_b_str = number_b.to_string(); // let number_b_str = number_b.to_string();
//
values.insert("number_a", &number_a_str); // values.insert("number_a", &number_a_str);
values.insert("number_b", &number_b_str); // values.insert("number_b", &number_b_str);
values.insert("txt_short", txt_short); // values.insert("txt_short", txt_short);
values.insert("txt_long", txt_long); // values.insert("txt_long", txt_long);
//
let template = Template::from(template_string); // let template = Template::from(template_string);
let serial_entry = template.fill_in(&values); // let serial_entry = template.fill_in(&values);
//
log::info!("{serial_entry}"); // log::info!("{serial_entry}");
//TODO push to mqtt? // //TODO push to mqtt?
let entry = LogEntry { let entry = LogEntry {
timestamp: time, timestamp: time,
@ -106,29 +108,10 @@ pub fn log(message_key: LogMessage, number_a: u32, number_b: u32, txt_short: &st
txt_long: txt_long_stack, txt_long: txt_long_stack,
}; };
let mut buffer = BUFFER_ACCESS.lock().unwrap(); let mut buffer = BUFFER_ACCESS.get().lock().await;
buffer.push(entry); buffer.push(entry);
} }
#[derive(IntoStaticStr, Serialize, PartialEq, Eq, PartialOrd, Ord, Clone, UnitEnum)]
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn within_limit() {
let test = "12345678";
let mut txt_short_stack: heapless::String<TXT_SHORT_LENGTH> = heapless::String::new();
let mut txt_long_stack: heapless::String<TXT_LONG_LENGTH> = heapless::String::new();
limit_length(test, &mut txt_short_stack);
limit_length(test, &mut txt_long_stack);
assert_eq!(txt_short_stack.as_str(), test);
assert_eq!(txt_long_stack.as_str(), test);
}
}
#[derive(IntoStaticStr, EnumIter, Serialize, PartialEq, Eq, PartialOrd, Ord, Clone, UnitEnum)]
pub enum LogMessage { pub enum LogMessage {
#[strum( #[strum(
serialize = "Reset due to ${txt_long} requires rtc clear ${number_a} and force config mode ${number_b}" serialize = "Reset due to ${txt_long} requires rtc clear ${number_a} and force config mode ${number_b}"

596
rust/src/main.rs
View File

@ -5,6 +5,10 @@
reason = "mem::forget is generally not safe to do with esp_hal types, especially those \ reason = "mem::forget is generally not safe to do with esp_hal types, especially those \
holding buffers for the duration of a data transfer." holding buffers for the duration of a data transfer."
)] )]
esp_bootloader_esp_idf::esp_app_desc!();
use esp_backtrace as _;
use crate::config::PlantConfig; use crate::config::PlantConfig;
use crate::{ use crate::{
config::BoardVersion::INITIAL, config::BoardVersion::INITIAL,
@ -16,24 +20,25 @@ use alloc::borrow::ToOwned;
use alloc::string::{String, ToString}; use alloc::string::{String, ToString};
use alloc::sync::Arc; use alloc::sync::Arc;
use alloc::{format, vec}; use alloc::{format, vec};
use core::any::Any;
use anyhow::{bail, Context}; use anyhow::{bail, Context};
use chrono::{DateTime, Datelike, Timelike, Utc}; use chrono::{DateTime, Datelike, Timelike, Utc};
use chrono_tz::Tz::{self, UTC}; use chrono_tz::Tz::{self};
use core::sync::atomic::Ordering; use core::sync::atomic::Ordering;
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_sync::blocking_mutex::raw::{CriticalSectionRawMutex, NoopRawMutex}; use embassy_sync::blocking_mutex::raw::{CriticalSectionRawMutex, NoopRawMutex};
use embassy_sync::lazy_lock::LazyLock; use embassy_sync::lazy_lock::LazyLock;
use embassy_sync::mutex::Mutex; use embassy_sync::mutex::Mutex;
use embassy_sync::mutex::MutexGuard;
use embassy_time::Timer; use embassy_time::Timer;
use esp_hal::{clock::CpuClock, delay::Delay, timer::systimer::SystemTimer}; use esp_println::{logger, println};
use esp_println::logger;
use hal::battery::BatteryState; use hal::battery::BatteryState;
use log::{log, LogMessage}; use log::{log, LogMessage};
use plant_state::PlantState; use plant_state::PlantState;
use portable_atomic::AtomicBool; use portable_atomic::AtomicBool;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tank::*; use crate::tank::{TankError, WATER_FROZEN_THRESH};
//use tank::*;
mod config; mod config;
mod hal; mod hal;
mod log; mod log;
@ -44,7 +49,9 @@ extern crate alloc;
//mod webserver; //mod webserver;
pub static BOARD_ACCESS: LazyLock<Mutex<CriticalSectionRawMutex, HAL>> = pub static BOARD_ACCESS: LazyLock<Mutex<CriticalSectionRawMutex, HAL>> =
LazyLock::new(|| PlantHal::create().unwrap()); LazyLock::new(|| {
PlantHal::create().unwrap()
});
pub static STAY_ALIVE: AtomicBool = AtomicBool::new(false); pub static STAY_ALIVE: AtomicBool = AtomicBool::new(false);
#[derive(Serialize, Deserialize, Debug, PartialEq)] #[derive(Serialize, Deserialize, Debug, PartialEq)]
@ -163,10 +170,10 @@ async fn safe_main() -> anyhow::Result<()> {
//}; //};
//log(LogMessage::PartitionState, 0, 0, "", ota_state_string); //log(LogMessage::PartitionState, 0, 0, "", ota_state_string);
let ota_state_string = "unknown"; let ota_state_string = "unknown";
println!("faul led");
let mut board = BOARD_ACCESS.get().lock().await; let mut board = BOARD_ACCESS.get().lock().await;
board.board_hal.general_fault(false).await; board.board_hal.general_fault(false).await;
println!("faul led2");
let cur = board let cur = board
.board_hal .board_hal
.get_rtc_module() .get_rtc_module()
@ -204,7 +211,7 @@ async fn safe_main() -> anyhow::Result<()> {
board.board_hal.get_esp().set_restart_to_conf(false); board.board_hal.get_esp().set_restart_to_conf(false);
} else if board.board_hal.get_esp().mode_override_pressed() { } else if board.board_hal.get_esp().mode_override_pressed() {
board.board_hal.general_fault(true).await; board.board_hal.general_fault(true).await;
log(LogMessage::ConfigModeButtonOverride, 0, 0, "", ""); log(LogMessage::ConfigModeButtonOverride, 0, 0, "", "").await;
for _i in 0..5 { for _i in 0..5 {
board.board_hal.general_fault(true).await; board.board_hal.general_fault(true).await;
Timer::after_millis(100).await; Timer::after_millis(100).await;
@ -251,19 +258,21 @@ async fn safe_main() -> anyhow::Result<()> {
} }
} }
let timezone = match &board.board_hal.get_config().timezone {
Some(tz_str) => tz_str.parse::<Tz>().unwrap_or_else(|_| {
info!("Invalid timezone '{}', falling back to UTC", tz_str);
UTC
}),
None => UTC, // Fallback to UTC if no timezone is set
};
let timezone_time = cur.with_timezone(&timezone); // let timezone = match &board.board_hal.get_config().timezone {
// Some(tz_str) => tz_str.parse::<Tz>().unwrap_or_else(|_| {
// info!("Invalid timezone '{}', falling back to UTC", tz_str);
// UTC
// }),
// None => UTC, // Fallback to UTC if no timezone is set
// };
let timezone = Tz::UTC;
let timezone_time = cur;//TODO.with_timezone(&timezone);
info!( info!(
"Running logic at utc {} and {} {}", "Running logic at utc {} and {} {}",
cur, cur,
timezone.name(), "todo timezone.name()",
timezone_time timezone_time
); );
@ -273,7 +282,7 @@ async fn safe_main() -> anyhow::Result<()> {
partition_address, partition_address,
ota_state_string, ota_state_string,
ip_address, ip_address,
timezone_time, &timezone_time.to_rfc3339(),
) )
.await; .await;
publish_battery_state().await; publish_battery_state().await;
@ -294,9 +303,10 @@ async fn safe_main() -> anyhow::Result<()> {
.to_string() .to_string()
.as_str(), .as_str(),
"", "",
); ).await;
drop(board); //TODO must drop board here?
//drop(board);
if to_config { if to_config {
//check if client or ap mode and init Wi-Fi //check if client or ap mode and init Wi-Fi
@ -307,52 +317,54 @@ async fn safe_main() -> anyhow::Result<()> {
//let _webserver = httpd(reboot_now.clone()); //let _webserver = httpd(reboot_now.clone());
wait_infinity(WaitType::ConfigButton, reboot_now.clone()).await; wait_infinity(WaitType::ConfigButton, reboot_now.clone()).await;
} else { } else {
log(LogMessage::NormalRun, 0, 0, "", ""); log(LogMessage::NormalRun, 0, 0, "", "").await;
} }
let dry_run = false; let dry_run = false;
//
let tank_state = determine_tank_state(&mut board); // let tank_state = determine_tank_state(&mut board);
//
if tank_state.is_enabled() { // if tank_state.is_enabled() {
if let Some(err) = tank_state.got_error(&board.board_hal.get_config().tank) { // if let Some(err) = tank_state.got_error(&board.board_hal.get_config().tank) {
match err { // match err {
TankError::SensorDisabled => { /* unreachable */ } // TankError::SensorDisabled => { /* unreachable */ }
TankError::SensorMissing(raw_value_mv) => log( // TankError::SensorMissing(raw_value_mv) => log(
LogMessage::TankSensorMissing, // LogMessage::TankSensorMissing,
raw_value_mv as u32, // raw_value_mv as u32,
0, // 0,
"", // "",
"", // "",
), // ).await,
TankError::SensorValueError { value, min, max } => log( // TankError::SensorValueError { value, min, max } => log(
LogMessage::TankSensorValueRangeError, // LogMessage::TankSensorValueRangeError,
min as u32, // min as u32,
max as u32, // max as u32,
&format!("{}", value), // &format!("{}", value),
"", // "",
), // ).await,
TankError::BoardError(err) => { // TankError::BoardError(err) => {
log(LogMessage::TankSensorBoardError, 0, 0, "", &err.to_string()) // log(LogMessage::TankSensorBoardError, 0, 0, "", &err.to_string()).await
} // }
} // }
// disabled cannot trigger this because of wrapping if is_enabled // // disabled cannot trigger this because of wrapping if is_enabled
board.board_hal.general_fault(true); // board.board_hal.general_fault(true).await;
} else if tank_state // } else if tank_state
.warn_level(&board.board_hal.get_config().tank) // .warn_level(&board.board_hal.get_config().tank)
.is_ok_and(|warn| warn) // .is_ok_and(|warn| warn)
{ // {
log(LogMessage::TankWaterLevelLow, 0, 0, "", ""); // log(LogMessage::TankWaterLevelLow, 0, 0, "", "").await;
board.board_hal.general_fault(true); // board.board_hal.general_fault(true).await;
} // }
} // }
let mut water_frozen = false; let mut water_frozen = false;
let water_temp = board //TODO
.board_hal let water_temp = anyhow::Ok(12_f32);
.get_tank_sensor() // board
.context("no sensor") // .board_hal
.and_then(async |f| f.water_temperature_c().await); // .get_tank_sensor()
// .context("no sensor")
// .and_then(async |f| f.water_temperature_c().await);
if let Ok(res) = water_temp { if let Ok(res) = water_temp {
if res < WATER_FROZEN_THRESH { if res < WATER_FROZEN_THRESH {
@ -360,80 +372,89 @@ async fn safe_main() -> anyhow::Result<()> {
} }
} }
publish_tank_state(&tank_state, &water_temp); //publish_tank_state(&tank_state, &water_temp).await;
let plantstate: [PlantState; PLANT_COUNT] =
core::array::from_fn(|i| PlantState::read_hardware_state(i, &mut board).await);
publish_plant_states(&timezone_time, &plantstate).await;
let pump_required = plantstate let plantstate: [PlantState; PLANT_COUNT] = [
.iter() PlantState::read_hardware_state(0, &mut board).await,
.zip(&board.board_hal.get_config().plants) PlantState::read_hardware_state(1, &mut board).await,
.any(|(it, conf)| it.needs_to_be_watered(conf, &timezone_time)) PlantState::read_hardware_state(2, &mut board).await,
&& !water_frozen; PlantState::read_hardware_state(3, &mut board).await,
if pump_required { PlantState::read_hardware_state(4, &mut board).await,
log(LogMessage::EnableMain, dry_run as u32, 0, "", ""); PlantState::read_hardware_state(5, &mut board).await,
for (plant_id, (state, plant_config)) in plantstate PlantState::read_hardware_state(6, &mut board).await,
.iter() PlantState::read_hardware_state(7, &mut board).await,
.zip(&board.board_hal.get_config().plants.clone()) ];
.enumerate() //publish_plant_states(&timezone_time.clone(), &plantstate).await;
{
if state.needs_to_be_watered(plant_config, &timezone_time) {
let pump_count = board.board_hal.get_esp().consecutive_pump_count(plant_id) + 1;
board
.board_hal
.get_esp()
.store_consecutive_pump_count(plant_id, pump_count);
let pump_ineffective = pump_count > plant_config.max_consecutive_pump_count as u32; // let pump_required = plantstate
if pump_ineffective { // .iter()
log( // .zip(&board.board_hal.get_config().plants)
LogMessage::ConsecutivePumpCountLimit, // .any(|(it, conf)| it.needs_to_be_watered(conf, &timezone_time))
pump_count, // && !water_frozen;
plant_config.max_consecutive_pump_count as u32, // if pump_required {
&(plant_id + 1).to_string(), // log(LogMessage::EnableMain, dry_run as u32, 0, "", "");
"", // for (plant_id, (state, plant_config)) in plantstate
); // .iter()
board.board_hal.fault(plant_id, true).await?; // .zip(&board.board_hal.get_config().plants.clone())
} // .enumerate()
log( // {
LogMessage::PumpPlant, // if state.needs_to_be_watered(plant_config, &timezone_time) {
(plant_id + 1) as u32, // let pump_count = board.board_hal.get_esp().consecutive_pump_count(plant_id) + 1;
plant_config.pump_time_s as u32, // board
&dry_run.to_string(), // .board_hal
"", // .get_esp()
); // .store_consecutive_pump_count(plant_id, pump_count);
board //
.board_hal // let pump_ineffective = pump_count > plant_config.max_consecutive_pump_count as u32;
.get_esp() // if pump_ineffective {
.store_last_pump_time(plant_id, cur); // log(
board.board_hal.get_esp().last_pump_time(plant_id); // LogMessage::ConsecutivePumpCountLimit,
//state.active = true; // pump_count,
// plant_config.max_consecutive_pump_count as u32,
pump_info(plant_id, true, pump_ineffective, 0, 0, 0, false).await; // &(plant_id + 1).to_string(),
// "",
let result = do_secure_pump(plant_id, plant_config, dry_run).await?; // );
board.board_hal.pump(plant_id, false).await?; // board.board_hal.fault(plant_id, true).await?;
pump_info( // }
plant_id, // log(
false, // LogMessage::PumpPlant,
pump_ineffective, // (plant_id + 1) as u32,
result.median_current_ma, // plant_config.pump_time_s as u32,
result.max_current_ma, // &dry_run.to_string(),
result.min_current_ma, // "",
result.error, // );
) // board
.await; // .board_hal
} else if !state.pump_in_timeout(plant_config, &timezone_time) { // .get_esp()
// plant does not need to be watered and is not in timeout // .store_last_pump_time(plant_id, cur);
// -> reset consecutive pump count // board.board_hal.get_esp().last_pump_time(plant_id);
board // //state.active = true;
.board_hal //
.get_esp() // pump_info(plant_id, true, pump_ineffective, 0, 0, 0, false).await;
.store_consecutive_pump_count(plant_id, 0); //
} // let result = do_secure_pump(plant_id, plant_config, dry_run).await?;
} // board.board_hal.pump(plant_id, false).await?;
} // pump_info(
// plant_id,
// false,
// pump_ineffective,
// result.median_current_ma,
// result.max_current_ma,
// result.min_current_ma,
// result.error,
// )
// .await;
// } else if !state.pump_in_timeout(plant_config, &timezone_time) {
// // plant does not need to be watered and is not in timeout
// // -> reset consecutive pump count
// board
// .board_hal
// .get_esp()
// .store_consecutive_pump_count(plant_id, 0);
// }
// }
// }
let is_day = board.board_hal.is_day(); let is_day = board.board_hal.is_day();
let state_of_charge = board let state_of_charge = board
@ -455,67 +476,67 @@ async fn safe_main() -> anyhow::Result<()> {
enabled: board.board_hal.get_config().night_lamp.enabled, enabled: board.board_hal.get_config().night_lamp.enabled,
..Default::default() ..Default::default()
}; };
if light_state.enabled { // if light_state.enabled {
light_state.is_day = is_day; // light_state.is_day = is_day;
light_state.out_of_work_hour = !in_time_range( // light_state.out_of_work_hour = !in_time_range(
&timezone_time, // &timezone_time,
board // board
.board_hal // .board_hal
.get_config() // .get_config()
.night_lamp // .night_lamp
.night_lamp_hour_start, // .night_lamp_hour_start,
board.board_hal.get_config().night_lamp.night_lamp_hour_end, // board.board_hal.get_config().night_lamp.night_lamp_hour_end,
); // );
//
if state_of_charge // if state_of_charge
< board // < board
.board_hal // .board_hal
.get_config() // .get_config()
.night_lamp // .night_lamp
.low_soc_cutoff // .low_soc_cutoff
.into() // .into()
{ // {
board.board_hal.get_esp().set_low_voltage_in_cycle(); // board.board_hal.get_esp().set_low_voltage_in_cycle();
} else if state_of_charge // } else if state_of_charge
> board // > board
.board_hal // .board_hal
.get_config() // .get_config()
.night_lamp // .night_lamp
.low_soc_restore // .low_soc_restore
.into() // .into()
{ // {
board.board_hal.get_esp().clear_low_voltage_in_cycle(); // board.board_hal.get_esp().clear_low_voltage_in_cycle();
} // }
light_state.battery_low = board.board_hal.get_esp().low_voltage_in_cycle(); // light_state.battery_low = board.board_hal.get_esp().low_voltage_in_cycle();
//
if !light_state.out_of_work_hour { // if !light_state.out_of_work_hour {
if board // if board
.board_hal // .board_hal
.get_config() // .get_config()
.night_lamp // .night_lamp
.night_lamp_only_when_dark // .night_lamp_only_when_dark
{ // {
if !light_state.is_day { // if !light_state.is_day {
if light_state.battery_low { // if light_state.battery_low {
board.board_hal.light(false)?; // board.board_hal.light(false)?;
} else { // } else {
light_state.active = true; // light_state.active = true;
board.board_hal.light(true)?; // board.board_hal.light(true)?;
} // }
} // }
} else if light_state.battery_low { // } else if light_state.battery_low {
board.board_hal.light(false)?; // board.board_hal.light(false)?;
} else { // } else {
light_state.active = true; // light_state.active = true;
board.board_hal.light(true)?; // board.board_hal.light(true)?;
} // }
} else { // } else {
light_state.active = false; // light_state.active = false;
board.board_hal.light(false)?; // board.board_hal.light(false)?;
} // }
//
info!("Lightstate is {:?}", light_state); // info!("Lightstate is {:?}", light_state);
} // }
match serde_json::to_string(&light_state) { match serde_json::to_string(&light_state) {
Ok(state) => { Ok(state) => {
@ -596,24 +617,25 @@ pub async fn do_secure_pump(
let mut pump_time_s = 0; let mut pump_time_s = 0;
let board = &mut BOARD_ACCESS.get().lock().await; let board = &mut BOARD_ACCESS.get().lock().await;
if !dry_run { if !dry_run {
board // board
.board_hal // .board_hal
.get_tank_sensor() // .get_tank_sensor()
.unwrap() // .unwrap()
.reset_flow_meter(); // .reset_flow_meter();
board // board
.board_hal // .board_hal
.get_tank_sensor() // .get_tank_sensor()
.unwrap() // .unwrap()
.start_flow_meter(); // .start_flow_meter();
board.board_hal.pump(plant_id, true).await?; board.board_hal.pump(plant_id, true).await?;
Timer::after_millis(10).await; Timer::after_millis(10).await;
for step in 0..plant_config.pump_time_s as usize { for step in 0..plant_config.pump_time_s as usize {
let flow_value = board // let flow_value = board
.board_hal // .board_hal
.get_tank_sensor() // .get_tank_sensor()
.unwrap() // .unwrap()
.get_flow_meter_value(); // .get_flow_meter_value();
let flow_value = 1;
flow_collector[step] = flow_value; flow_collector[step] = flow_value;
let flow_value_ml = flow_value as f32 * board.board_hal.get_config().tank.ml_per_pulse; let flow_value_ml = flow_value as f32 * board.board_hal.get_config().tank.ml_per_pulse;
@ -691,12 +713,13 @@ pub async fn do_secure_pump(
pump_time_s += 1; pump_time_s += 1;
} }
} }
board.board_hal.get_tank_sensor().unwrap().stop_flow_meter(); // board.board_hal.get_tank_sensor().unwrap().stop_flow_meter();
let final_flow_value = board // let final_flow_value = board
.board_hal // .board_hal
.get_tank_sensor() // .get_tank_sensor()
.unwrap() // .unwrap()
.get_flow_meter_value(); // .get_flow_meter_value();
let final_flow_value = 12;
let flow_value_ml = final_flow_value as f32 * board.board_hal.get_config().tank.ml_per_pulse; let flow_value_ml = final_flow_value as f32 * board.board_hal.get_config().tank.ml_per_pulse;
info!( info!(
"Final flow value is {} with {} ml", "Final flow value is {} with {} ml",
@ -715,8 +738,42 @@ pub async fn do_secure_pump(
} }
async fn update_charge_indicator() { async fn update_charge_indicator() {
let board = BOARD_ACCESS.get().lock().await; let board = &mut BOARD_ACCESS.get().lock().await;
//we have mppt controller, ask it for charging current //we have mppt controller, ask it for charging current
// let tank_state = determine_tank_state(&mut board);
//
// if tank_state.is_enabled() {
// if let Some(err) = tank_state.got_error(&board.board_hal.get_config().tank) {
// match err {
// TankError::SensorDisabled => { /* unreachable */ }
// TankError::SensorMissing(raw_value_mv) => log(
// LogMessage::TankSensorMissing,
// raw_value_mv as u32,
// 0,
// "",
// "",
// ).await,
// TankError::SensorValueError { value, min, max } => log(
// LogMessage::TankSensorValueRangeError,
// min as u32,
// max as u32,
// &format!("{}", value),
// "",
// ).await,
// TankError::BoardError(err) => {
// log(LogMessage::TankSensorBoardError, 0, 0, "", &err.to_string()).await
// }
// }
// // disabled cannot trigger this because of wrapping if is_enabled
// board.board_hal.general_fault(true).await;
// } else if tank_state
// .warn_level(&board.board_hal.get_config().tank)
// .is_ok_and(|warn| warn)
// {
// log(LogMessage::TankWaterLevelLow, 0, 0, "", "").await;
// board.board_hal.general_fault(true).await;
// }
// }
if let Ok(current) = board.board_hal.get_mptt_current().await { if let Ok(current) = board.board_hal.get_mptt_current().await {
let _ = board let _ = board
.board_hal .board_hal
@ -726,7 +783,7 @@ async fn update_charge_indicator() {
else if let Ok(charging) = board else if let Ok(charging) = board
.board_hal .board_hal
.get_battery_monitor() .get_battery_monitor()
.average_current_milli_ampere() .average_current_milli_ampere().await
{ {
let _ = board.board_hal.set_charge_indicator(charging > 20); let _ = board.board_hal.set_charge_indicator(charging > 20);
} else { } else {
@ -734,55 +791,55 @@ async fn update_charge_indicator() {
let _ = board.board_hal.set_charge_indicator(false); let _ = board.board_hal.set_charge_indicator(false);
} }
} }
//
// async fn publish_tank_state(tank_state: &TankState, water_temp: &anyhow::Result<f32>) {
// let board = &mut BOARD_ACCESS.get().lock().await;
// match serde_json::to_string(
// &tank_state.as_mqtt_info(&board.board_hal.get_config().tank, water_temp),
// ) {
// Ok(state) => {
// let _ = board
// .board_hal
// .get_esp()
// .mqtt_publish("/water", state.as_bytes());
// }
// Err(err) => {
// info!("Error publishing tankstate {}", err);
// }
// };
// }
async fn publish_tank_state(tank_state: &TankState, water_temp: &anyhow::Result<f32>) { // async fn publish_plant_states(timezone_time: &DateTime<Tz>, plantstate: &[PlantState; 8]) {
let board = &mut BOARD_ACCESS.get().lock().await; // let board = &mut BOARD_ACCESS.get().lock().await;
match serde_json::to_string( // for (plant_id, (plant_state, plant_conf)) in plantstate
&tank_state.as_mqtt_info(&board.board_hal.get_config().tank, water_temp), // .iter()
) { // .zip(&board.board_hal.get_config().plants.clone())
Ok(state) => { // .enumerate()
let _ = board // {
.board_hal // match serde_json::to_string(&plant_state.to_mqtt_info(plant_conf, timezone_time)) {
.get_esp() // Ok(state) => {
.mqtt_publish("/water", state.as_bytes()); // let plant_topic = format!("/plant{}", plant_id + 1);
} // let _ = board
Err(err) => { // .board_hal
info!("Error publishing tankstate {}", err); // .get_esp()
} // .mqtt_publish(&plant_topic, state.as_bytes())
}; // .await;
} // //TODO? reduce speed as else messages will be dropped
// Timer::after_millis(200).await
async fn publish_plant_states(timezone_time: &DateTime<Tz>, plantstate: &[PlantState; 8]) { // }
let board = &mut BOARD_ACCESS.get().lock().await; // Err(err) => {
for (plant_id, (plant_state, plant_conf)) in plantstate // error!("Error publishing plant state {}", err);
.iter() // }
.zip(&board.board_hal.get_config().plants.clone()) // };
.enumerate() // }
{ // }
match serde_json::to_string(&plant_state.to_mqtt_info(plant_conf, timezone_time)) {
Ok(state) => {
let plant_topic = format!("/plant{}", plant_id + 1);
let _ = board
.board_hal
.get_esp()
.mqtt_publish(&plant_topic, state.as_bytes())
.await;
//TODO? reduce speed as else messages will be dropped
Timer::after_millis(200).await
}
Err(err) => {
error!("Error publishing plant state {}", err);
}
};
}
}
async fn publish_firmware_info( async fn publish_firmware_info(
version: VersionInfo, version: VersionInfo,
address: u32, address: u32,
ota_state_string: &str, ota_state_string: &str,
ip_address: &String, ip_address: &String,
timezone_time: DateTime<Tz>, timezone_time: &String,
) { ) {
let board = &mut BOARD_ACCESS.get().lock().await; let board = &mut BOARD_ACCESS.get().lock().await;
let _ = board let _ = board
@ -802,7 +859,7 @@ async fn publish_firmware_info(
.await; .await;
let _ = board.board_hal.get_esp().mqtt_publish( let _ = board.board_hal.get_esp().mqtt_publish(
"/firmware/last_online", "/firmware/last_online",
timezone_time.to_rfc3339().as_bytes(), timezone_time.as_bytes(),
); );
let _ = board let _ = board
.board_hal .board_hal
@ -821,7 +878,7 @@ async fn publish_firmware_info(
} }
async fn try_connect_wifi_sntp_mqtt() -> NetworkMode { async fn try_connect_wifi_sntp_mqtt() -> NetworkMode {
let board = BOARD_ACCESS.get().lock().await; let board = &mut BOARD_ACCESS.get().lock().await;
let nw_conf = &board.board_hal.get_config().network.clone(); let nw_conf = &board.board_hal.get_config().network.clone();
match board.board_hal.get_esp().wifi(nw_conf).await { match board.board_hal.get_esp().wifi(nw_conf).await {
Ok(ip_info) => { Ok(ip_info) => {
@ -860,7 +917,7 @@ async fn try_connect_wifi_sntp_mqtt() -> NetworkMode {
} }
Err(_) => { Err(_) => {
info!("Offline mode"); info!("Offline mode");
board.board_hal.general_fault(true); board.board_hal.general_fault(true).await;
NetworkMode::OFFLINE NetworkMode::OFFLINE
} }
} }
@ -922,8 +979,8 @@ async fn publish_mppt_state() -> anyhow::Result<()> {
} }
async fn publish_battery_state() -> () { async fn publish_battery_state() -> () {
let board = BOARD_ACCESS.get().lock().await; let board = &mut BOARD_ACCESS.get().lock().await;
let state = board.board_hal.get_battery_monitor().get_battery_state(); let state = board.board_hal.get_battery_monitor().get_battery_state().await;
if let Ok(serialized_battery_state_bytes) = if let Ok(serialized_battery_state_bytes) =
serde_json::to_string(&state).map(|s| s.into_bytes()) serde_json::to_string(&state).map(|s| s.into_bytes())
{ {
@ -995,13 +1052,10 @@ async fn wait_infinity(wait_type: WaitType, reboot_now: Arc<AtomicBool>) -> ! {
async fn main(spawner: Spawner) { async fn main(spawner: Spawner) {
// intialize embassy // intialize embassy
logger::init_logger_from_env(); logger::init_logger_from_env();
let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max()); //force init here!
let peripherals = esp_hal::init(config); let board = BOARD_ACCESS.get().lock().await;
drop(board);
esp_alloc::heap_allocator!(size: 64 * 1024); println!("test");
let timer0 = SystemTimer::new(peripherals.SYSTIMER);
esp_hal_embassy::init(timer0.alarm0);
info!("Embassy initialized!"); info!("Embassy initialized!");

102
rust/src/plant_state.rs
View File

@ -3,7 +3,7 @@ use crate::{
hal::{Sensor, HAL}, hal::{Sensor, HAL},
in_time_range, in_time_range,
}; };
use alloc::string::String; use alloc::string::{String, ToString};
use chrono::{DateTime, TimeDelta, Utc}; use chrono::{DateTime, TimeDelta, Utc};
use chrono_tz::Tz; use chrono_tz::Tz;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -118,7 +118,7 @@ fn map_range_moisture(
impl PlantState { impl PlantState {
pub async fn read_hardware_state(plant_id: usize, board: &mut HAL<'_>) -> Self { pub async fn read_hardware_state(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 {
match board.board_hal.measure_moisture_hz(plant_id, Sensor::A) { match board.board_hal.measure_moisture_hz(plant_id, Sensor::A).await {
Ok(raw) => match map_range_moisture( Ok(raw) => match map_range_moisture(
raw, raw,
board.board_hal.get_config().plants[plant_id].moisture_sensor_min_frequency, board.board_hal.get_config().plants[plant_id].moisture_sensor_min_frequency,
@ -139,7 +139,7 @@ impl PlantState {
}; };
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 {
match board.board_hal.measure_moisture_hz(plant_id, Sensor::B) { match board.board_hal.measure_moisture_hz(plant_id, Sensor::B).await {
Ok(raw) => match map_range_moisture( Ok(raw) => match map_range_moisture(
raw, raw,
board.board_hal.get_config().plants[plant_id].moisture_sensor_min_frequency, board.board_hal.get_config().plants[plant_id].moisture_sensor_min_frequency,
@ -264,50 +264,50 @@ impl PlantState {
PlantWateringMode::TimerOnly => !self.pump_in_timeout(plant_conf, current_time), PlantWateringMode::TimerOnly => !self.pump_in_timeout(plant_conf, current_time),
} }
} }
//
pub fn to_mqtt_info( // pub fn to_mqtt_info(
&self, // &self,
plant_conf: &PlantConfig, // plant_conf: &PlantConfig,
current_time: &DateTime<Tz>, // current_time: &DateTime<Tz>,
) -> PlantInfo<'_> { // ) -> PlantInfo<'_> {
PlantInfo { // PlantInfo {
sensor_a: &self.sensor_a, // sensor_a: &self.sensor_a,
sensor_b: &self.sensor_b, // sensor_b: &self.sensor_b,
mode: plant_conf.mode, // mode: plant_conf.mode,
do_water: self.needs_to_be_watered(plant_conf, current_time), // do_water: self.needs_to_be_watered(plant_conf, current_time),
dry: if let Some(moisture_percent) = self.plant_moisture().0 { // dry: if let Some(moisture_percent) = self.plant_moisture().0 {
moisture_percent < plant_conf.target_moisture // moisture_percent < plant_conf.target_moisture
} else { // } else {
false // false
}, // },
cooldown: self.pump_in_timeout(plant_conf, current_time), // cooldown: self.pump_in_timeout(plant_conf, current_time),
out_of_work_hour: in_time_range( // out_of_work_hour: in_time_range(
current_time, // current_time,
plant_conf.pump_hour_start, // plant_conf.pump_hour_start,
plant_conf.pump_hour_end, // plant_conf.pump_hour_end,
), // ),
consecutive_pump_count: self.pump.consecutive_pump_count, // consecutive_pump_count: self.pump.consecutive_pump_count,
pump_error: self.pump.is_err(plant_conf), // pump_error: self.pump.is_err(plant_conf),
last_pump: self // last_pump: self
.pump // .pump
.previous_pump // .previous_pump
.map(|t| t.with_timezone(&current_time.timezone())), // .map(|t| t.with_timezone(&current_time.timezone())),
next_pump: if matches!( // next_pump: if matches!(
plant_conf.mode, // plant_conf.mode,
PlantWateringMode::TimerOnly // PlantWateringMode::TimerOnly
| PlantWateringMode::TargetMoisture // | PlantWateringMode::TargetMoisture
| PlantWateringMode::MinMoisture // | PlantWateringMode::MinMoisture
) { // ) {
self.pump.previous_pump.and_then(|last_pump| { // self.pump.previous_pump.and_then(|last_pump| {
last_pump // last_pump
.checked_add_signed(TimeDelta::minutes(plant_conf.pump_cooldown_min.into())) // .checked_add_signed(TimeDelta::minutes(plant_conf.pump_cooldown_min.into()))
.map(|t| t.with_timezone(&current_time.timezone())) // .map(|t| t.with_timezone(&current_time.timezone()))
}) // })
} else { // } else {
None // None
}, // },
} // }
} // }
} }
#[derive(Debug, PartialEq, Serialize)] #[derive(Debug, PartialEq, Serialize)]
@ -330,8 +330,8 @@ pub struct PlantInfo<'a> {
/// how often has the pump been watered without reaching target moisture /// how often has the pump been watered without reaching target moisture
consecutive_pump_count: u32, consecutive_pump_count: u32,
pump_error: Option<PumpError>, pump_error: Option<PumpError>,
/// last time when the pump was active // /// last time when the pump was active
last_pump: Option<DateTime<Tz>>, // last_pump: Option<DateTime<Tz>>,
/// next time when pump should activate // /// next time when pump should activate
next_pump: Option<DateTime<Tz>>, // next_pump: Option<DateTime<Tz>>,
} }

30
rust/src/tank.rs
View File

@ -151,21 +151,21 @@ impl TankState {
} }
} }
pub fn determine_tank_state(board: &mut std::sync::MutexGuard<'_, HAL<'_>>) -> TankState { // pub fn determine_tank_state(board: &mut std::sync::MutexGuard<'_, HAL<'_>>) -> TankState {
if board.board_hal.get_config().tank.tank_sensor_enabled { // if board.board_hal.get_config().tank.tank_sensor_enabled {
match board // match board
.board_hal // .board_hal
.get_tank_sensor() // .get_tank_sensor()
.context("no sensor") // .context("no sensor")
.and_then(|f| f.tank_sensor_voltage()) // .and_then(|f| f.tank_sensor_voltage())
{ // {
Ok(raw_sensor_value_mv) => TankState::Present(raw_sensor_value_mv), // Ok(raw_sensor_value_mv) => TankState::Present(raw_sensor_value_mv),
Err(err) => TankState::Error(TankError::BoardError(err.to_string())), // Err(err) => TankState::Error(TankError::BoardError(err.to_string())),
} // }
} else { // } else {
TankState::Disabled // TankState::Disabled
} // }
} // }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
/// Information structure send to mqtt for monitoring purposes /// Information structure send to mqtt for monitoring purposes