rust/Cargo.toml

@@ -87,7 +87,6 @@ ringbuffer = "0.15.0"
 text-template = "0.1.0"
 strum_macros = "0.27.0"
 esp-ota = { version = "0.2.2", features = ["log"] }
-unit-enum = "1.4.1"
 
 
 [patch.crates-io]

rust/src/log/mod.rs

@@ -7,12 +7,11 @@ use esp_idf_svc::systime::EspSystemTime;
 use once_cell::sync::Lazy;
 use ringbuffer::{ConstGenericRingBuffer, RingBuffer};
 use text_template::Template;
-use unit_enum::UnitEnum;
 
 const TXT_SHORT_LENGTH:usize = 8;
 const TXT_LONG_LENGTH:usize = 32;
 
-const BUFFER_SIZE:usize = 220;
+const BUFFER_SIZE:usize = 210;
 
 #[link_section = ".rtc.data"]
 static mut BUFFER:ConstGenericRingBuffer::<LogEntry, BUFFER_SIZE> = ConstGenericRingBuffer::<LogEntry, BUFFER_SIZE>::new();
@@ -23,7 +22,7 @@ static BUFFER_ACCESS: Lazy<Mutex<&mut ConstGenericRingBuffer::<LogEntry, BUFFER_
 #[derive(Serialize, Debug, Clone)]
 pub struct LogEntry {
     pub timestamp: u64,
-    pub message_id: u16,
+    pub message_id: u32,
     pub a: u32,
     pub b: u32,
     pub txt_short: heapless::String<TXT_SHORT_LENGTH>,
@@ -76,8 +75,6 @@ pub fn log(message_key: LogMessage, number_a: u32, number_b: u32, txt_short:&str
     
     let time = EspSystemTime {}.now().as_millis() as u64;
 
-    
-    let ordinal = message_key.ordinal() as u16;
     let template_string:&str = message_key.into();
 
 
@@ -94,12 +91,11 @@ pub fn log(message_key: LogMessage, number_a: u32, number_b: u32, txt_short:&str
     let serial_entry = template.fill_in(&values);
    
     println!("{serial_entry}");
-    
 
 
     let entry = LogEntry{
         timestamp: time,
-        message_id: ordinal,
+        message_id: 1,
         a: number_a,
         b: number_b,
         txt_short: txt_short_stack,
@@ -134,35 +130,35 @@ mod tests {
 
 
 
-#[derive(IntoStaticStr, EnumIter, Serialize, PartialEq, Eq, PartialOrd, Ord, Clone, UnitEnum)]
+#[derive(IntoStaticStr, EnumIter, Serialize, PartialEq, Eq, PartialOrd, Ord, Clone)]
 pub enum LogMessage {
-    #[strum(serialize = "Reset due to ${txt_long} requires rtc clear ${number_a} and force config mode ${number_b}")]   
+    #[strum(serialize = "Reset due to {{txt_long}} requires rtc clear {{a}} and force config mode {{b}}")]   
     ResetReason,
-    #[strum(serialize = "Current restart to conf mode ${number_a}")]   
+    #[strum(serialize = "Current restart to conf mode {{a}}")]   
     RestartToConfig,
-    #[strum(serialize = "Current low voltage detection is ${number_a}")]   
+    #[strum(serialize = "Current low voltage detection is {{a}}")]   
     LowVoltage,
-    #[strum(serialize = "Error communicating with battery!! ${txt_long}")]   
+    #[strum(serialize = "Error communicating with battery!! {{txt_long}}")]   
     BatteryCommunicationError,
-    #[strum(serialize = "Tank sensor raw ${number_a} percent ${number_b}")]   
+    #[strum(serialize = "Tank sensor raw {{a}} percent {{b}}")]   
     SensorTankRaw,
-    #[strum(serialize = "raw measure unscaled ${number_a} hz ${number_b}, plant ${txt_short} sensor ${txt_long}")]   
+    #[strum(serialize = "raw measure unscaled {{a}} hz {{b}}, plant {{txt_short}} sensor {{txt_long}}")]   
     RawMeasure,
-    #[strum(serialize = "IP info: ${txt_long}")]   
+    #[strum(serialize = "IP info: {{txt_long}}")]   
     WifiInfo,
-    #[strum(serialize = "Plant:${txt_short} a:${number_a} b:${number_b}")]   
+    #[strum(serialize = "Plant:{{txt_short}} a:{{a}} b:{{b}}")]   
     TestSensor,
-    #[strum(serialize = "Stay alive topic is ${txt_long}")]   
+    #[strum(serialize = "Stay alive topic is {{txt_long}}")]   
     StayAlive,
-    #[strum(serialize = "Connecting mqtt ${txt_short} with id ${txt_long}")]   
+    #[strum(serialize = "Connecting mqtt {{txt_short}} with id {{txt_long}}")]   
     MqttInfo,
-    #[strum(serialize = "Received stay alive with value ${txt_short}")]   
+    #[strum(serialize = "Received stay alive with value {{txt_short}}")]   
     MqttStayAliveRec,
-    #[strum(serialize = "Unknown topic recieved ${txt_long}")]   
+    #[strum(serialize = "Unknown topic recieved {{txt_long}}")]   
     UnknownTopic,
-    #[strum(serialize = "Partition state is ${txt_long}")]   
+    #[strum(serialize = "Partition state is {{txt_long}}")]   
     PartitionState,
-    #[strum(serialize = "Mounted Filesystem free ${number_a} total ${number_b} use ${txt_short}")]
+    #[strum(serialize = "Mounted Filesystem free {{a}} total {{b}} use {{txt_short}}")]
     FilesystemMount,
     #[strum(serialize = "Mounting Filesystem, this will format the first time and needs quite some time!")]
     MountingFilesystem,
@@ -174,15 +170,15 @@ pub enum LogMessage {
     ConfigModeButtonOverride,
     #[strum(serialize = "Going to normal mode")]
     NormalRun,
-    #[strum(serialize = "Missing normal config, entering config mode ${txt_long}")]
+    #[strum(serialize = "Missing normal config, entering config mode {{txt_long}}")]
     ConfigModeMissingConfig,
-    #[strum(serialize = "startup state wifi ${number_a} sntp ${number_b} mqtt ${txt_short}")]
+    #[strum(serialize = "startup state wifi {{a}} sntp {{b}} mqtt {{txt_short}}")]
     StartupInfo,
-    #[strum(serialize = "Trying to pump for ${number_b}s with pump ${number_a} now dryrun: ${txt_short}")]
+    #[strum(serialize = "Trying to pump for {{b}}s with pump {{a}} now dryrun: {{txt_short}}")]
     PumpPlant,
-    #[strum(serialize = "Enable main power dryrun: ${number_a}")]
+    #[strum(serialize = "Enable main power dryrun: {{a}}")]
     EnableMain,
-    #[strum(serialize = "Pumped multiple times, but plant is still to try attempt: ${number_a} limit :: ${number_b} plant: ${txt_short}")]
+    #[strum(serialize = "Pumped multiple times, but plant is still to try attempt: {{a}} limit :: {{b}} plant: {{txt_short}}")]
     ConsecutivePumpCountLimit
 }
 

rust/src/main.rs

@@ -180,8 +180,6 @@ struct PlantStateMQTT<'a> {
     next_pump: &'a str,
 }
 
-
-
 fn safe_main() -> anyhow::Result<()> {
     // It is necessary to call this function once. Otherwise some patches to the runtime
     // implemented by esp-idf-sys might not link properly. See https://github.com/esp-rs/esp-idf-template/issues/71
@@ -258,9 +256,7 @@ fn safe_main() -> anyhow::Result<()> {
         log(log::LogMessage::YearInplausibleForceConfig, 0,0,"","");
     }
 
-    
     println!("cur is {}", cur);
-    board.update_charge_indicator();
 
     if board.get_restart_to_conf() {
         log(log::LogMessage::ConfigModeSoftwareOverride, 0,0,"","");
@@ -945,7 +941,6 @@ fn wait_infinity(wait_type: WaitType, reboot_now: Arc<AtomicBool>) -> ! {
             led_count += 1;
         };
         unsafe {
-            BOARD_ACCESS.lock().unwrap().update_charge_indicator();
             //do not trigger watchdog
             for i in 0..8 {
                 BOARD_ACCESS.lock().unwrap().fault(i, i < led_count);

rust/src/plant_hal.rs

@@ -216,17 +216,7 @@ pub struct BackupHeader{
 }
 
 impl PlantCtrlBoard<'_> {
-    pub fn update_charge_indicator(&mut self){
-        let is_charging = match self.battery_driver.average_current() {
-            OkStd(current) => current < 20,
-            Err(_) => false,
-        };
-        self.shift_register.decompose()[CHARGING].set_state(is_charging.into()).unwrap();
-    }
-
-
     pub fn deep_sleep(&mut self, duration_in_ms:u64) -> !{
-        self.shift_register.decompose()[AWAKE].set_low().unwrap();
         unsafe { 
             //if we dont do this here, we might just revert a newly flashed firmeware
             mark_app_valid();