remove anyhow

rust/src/log/mod.rs

@@ -1,39 +1,48 @@
+use crate::hal::TIME_ACCESS;
 use crate::vec;
 use alloc::string::ToString;
 use alloc::vec::Vec;
-use bytemuck::{AnyBitPattern, Contiguous, Pod, Zeroable};
+use bytemuck::{AnyBitPattern, Pod, Zeroable};
+use deranged::RangedU8;
 use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
 use embassy_sync::mutex::Mutex;
-use embassy_time::Instant;
 use esp_hal::Persistable;
 use log::info;
 use serde::Serialize;
 use strum_macros::IntoStaticStr;
 use unit_enum::UnitEnum;
-use crate::hal::TIME_ACCESS;
 
+const LOG_ARRAY_SIZE: u8 = 220;
+const MAX_LOG_ARRAY_INDEX: u8 = LOG_ARRAY_SIZE - 1;
 #[esp_hal::ram(rtc_fast, persistent)]
 static mut LOG_ARRAY: LogArray = LogArray {
-    buffer: [LogEntryInner { timestamp: 0, message_id: 0, a: 0, b: 0, txt_short: [0;TXT_SHORT_LENGTH], txt_long: [0;TXT_LONG_LENGTH] }; 256],
+    buffer: [LogEntryInner {
+        timestamp: 0,
+        message_id: 0,
+        a: 0,
+        b: 0,
+        txt_short: [0; TXT_SHORT_LENGTH],
+        txt_long: [0; TXT_LONG_LENGTH],
+    }; LOG_ARRAY_SIZE as usize],
     head: 0,
 };
-pub static LOG_ACCESS: Mutex<CriticalSectionRawMutex, LogArray> = Mutex::new(unsafe { LOG_ARRAY });
+pub static LOG_ACCESS: Mutex<CriticalSectionRawMutex, &'static mut LogArray> =
+    unsafe { Mutex::new(&mut *&raw mut LOG_ARRAY) };
 
 const TXT_SHORT_LENGTH: usize = 8;
 const TXT_LONG_LENGTH: usize = 32;
 
-
 #[derive(Debug, Clone, Copy, AnyBitPattern)]
 #[repr(C)]
-pub struct LogArray{
-    buffer: [LogEntryInner; (u8::MAX_VALUE  as usize) +1],
-    head: u8
+pub struct LogArray {
+    buffer: [LogEntryInner; LOG_ARRAY_SIZE as usize],
+    head: u8,
 }
 
 unsafe impl Persistable for LogArray {}
 unsafe impl Zeroable for LogEntryInner {}
 
-unsafe impl Pod for LogEntryInner{}
+unsafe impl Pod for LogEntryInner {}
 
 #[derive(Debug, Clone, Copy)]
 struct LogEntryInner {
@@ -57,7 +66,7 @@ pub struct LogEntry {
 
 impl From<LogEntryInner> for LogEntry {
     fn from(value: LogEntryInner) -> Self {
-        LogEntry{
+        LogEntry {
             timestamp: value.timestamp,
             message_id: value.message_id,
             a: value.a,
@@ -70,10 +79,13 @@ impl From<LogEntryInner> for LogEntry {
 
 impl LogArray {
     pub fn get(&mut self) -> Vec<LogEntry> {
+        let head: RangedU8<0, MAX_LOG_ARRAY_INDEX> =
+            RangedU8::new(self.head).unwrap_or(RangedU8::new(0).unwrap());
+
         let mut rv: Vec<LogEntry> = Vec::new();
-        let mut index = self.head.wrapping_sub(1);
+        let mut index = head.wrapping_sub(1);
         for _ in 0..self.buffer.len() {
-            let entry = self.buffer[index as usize];
+            let entry = self.buffer[index.get() as usize];
             if (entry.message_id as usize) != LogMessage::Empty.ordinal() {
                 rv.push(entry.into());
             }
@@ -90,13 +102,16 @@ impl LogArray {
         txt_short: &str,
         txt_long: &str,
     ) {
+        let mut head: RangedU8<0, MAX_LOG_ARRAY_INDEX> =
+            RangedU8::new(self.head).unwrap_or(RangedU8::new(0).unwrap());
+
         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(txt_short, &mut txt_short_stack);
         limit_length(txt_long, &mut txt_long_stack);
 
-        let time = TIME_ACCESS.get().await.current_time_us()/1000;
+        let time = TIME_ACCESS.get().await.current_time_us() / 1000;
 
         let ordinal = message_key.ordinal() as u16;
         let template: &str = message_key.into();
@@ -108,14 +123,19 @@ impl LogArray {
 
         info!("{}", template_string);
 
-        let to_modify = &mut self.buffer[self.head as usize];
+        let to_modify = &mut self.buffer[head.get() as usize];
         to_modify.timestamp = time;
         to_modify.message_id = ordinal;
         to_modify.a = number_a;
         to_modify.b = number_b;
-        to_modify.txt_short.clone_from_slice(&txt_short_stack.as_bytes());
-        to_modify.txt_long.clone_from_slice(&txt_long_stack.as_bytes());
-        self.head = self.head.wrapping_add(1);
+        to_modify
+            .txt_short
+            .clone_from_slice(&txt_short_stack.as_bytes());
+        to_modify
+            .txt_long
+            .clone_from_slice(&txt_long_stack.as_bytes());
+        head = head.wrapping_add(1);
+        self.head = head.get();
     }
 }
 
@@ -140,13 +160,9 @@ fn limit_length<const LIMIT: usize>(input: &str, target: &mut heapless::String<L
     }
 }
 
-
-
 #[derive(IntoStaticStr, Serialize, PartialEq, Eq, PartialOrd, Ord, Clone, UnitEnum)]
 pub enum LogMessage {
-    #[strum(
-        serialize = ""
-    )]
+    #[strum(serialize = "")]
     Empty,
     #[strum(
         serialize = "Reset due to ${txt_long} requires rtc clear ${number_a} and force config mode ${number_b}"