fix rtc storage

rust/src/webserver/webserver.rs

@@ -5,10 +5,10 @@ use std::{
     sync::{atomic::AtomicBool, Arc},
 };
 
-use crate::BOARD_ACCESS;
+use crate::{espota::OtaUpdate, BOARD_ACCESS};
+use core::result::Result::Ok;
 use embedded_svc::http::Method;
 use esp_idf_svc::http::server::{Configuration, EspHttpServer};
-use esp_ota::OtaUpdate;
 use heapless::String;
 use serde::Serialize;
 
@@ -28,7 +28,7 @@ pub fn httpd_initial(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>>
         .fn_handler("/", Method::Get, move |request| {
             let mut response = request.into_ok_response()?;
             response.write(include_bytes!("initial_config.html"))?;
-            Ok(())
+            anyhow::Ok(())
         })
         .unwrap();
 
@@ -48,7 +48,7 @@ pub fn httpd_initial(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>>
                     response.write(ssid_json.as_bytes())?;
                 }
             }
-            Ok(())
+            anyhow::Ok(())
         })
         .unwrap();
 
@@ -62,7 +62,7 @@ pub fn httpd_initial(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>>
                 request
                     .into_status_response(500)?
                     .write(error_text.as_bytes())?;
-                return Ok(());
+                return anyhow::Ok(());
             }
             let actual_data = &buf[0..read.unwrap()];
             println!("raw {:?}", actual_data);
@@ -75,14 +75,14 @@ pub fn httpd_initial(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>>
                 request
                     .into_status_response(500)?
                     .write(error_text.as_bytes())?;
-                return Ok(());
+                return anyhow::Ok(());
             }
             let mut board = BOARD_ACCESS.lock().unwrap();
             board.set_wifi(&wifi_config.unwrap())?;
             let mut response = request.into_status_response(202)?;
             response.write("saved".as_bytes())?;
             reboot_now.store(true, std::sync::atomic::Ordering::Relaxed);
-            Ok(())
+            anyhow::Ok(())
         })
         .unwrap();
 
@@ -90,7 +90,7 @@ pub fn httpd_initial(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>>
         .fn_handler("/boardtest", Method::Post, move |_| {
             let mut board = BOARD_ACCESS.lock().unwrap();
             board.test()?;
-            Ok(())
+            anyhow::Ok(())
         })
         .unwrap();
 
@@ -104,14 +104,14 @@ pub fn httpd(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
         .fn_handler("/", Method::Get, move |request| {
             let mut response = request.into_ok_response()?;
             response.write(include_bytes!("config.html"))?;
-            Ok(())
+            anyhow::Ok(())
         })
         .unwrap();
 
     server
         .fn_handler("/get_config", Method::Get, move |request| {
             let mut response = request.into_ok_response()?;
-            let mut board = BOARD_ACCESS.lock()?;
+            let mut board = BOARD_ACCESS.lock().unwrap();
             match board.get_config() {
                 Ok(config) => {
                     let config_json = serde_json::to_string(&config)?;
@@ -122,7 +122,7 @@ pub fn httpd(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
                     response.write(config_json.as_bytes())?;
                 }
             }
-            Ok(())
+            anyhow::Ok(())
         })
         .unwrap();
 
@@ -136,7 +136,7 @@ pub fn httpd(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
                 request
                     .into_status_response(500)?
                     .write(error_text.as_bytes())?;
-                return Ok(());
+                return anyhow::Ok(());
             }
             let actual_data = &buf[0..read.unwrap()];
             println!("Raw data {}", from_utf8(actual_data).unwrap());
@@ -171,21 +171,21 @@ pub fn shared() -> Box<EspHttpServer<'static>> {
         .fn_handler("/version", Method::Get, |request| {
             let mut response = request.into_ok_response()?;
             response.write(env!("VERGEN_GIT_DESCRIBE").as_bytes())?;
-            Ok(())
+            anyhow::Ok(())
         })
         .unwrap();
     server
         .fn_handler("/bundle.js", Method::Get, |request| {
             let mut response = request.into_ok_response()?;
             response.write(include_bytes!("bundle.js"))?;
-            Ok(())
+            anyhow::Ok(())
         })
         .unwrap();
     server
         .fn_handler("/favicon.ico", Method::Get, |request| {
             let mut response = request.into_ok_response()?;
             response.write(include_bytes!("favicon.ico"))?;
-            Ok(())
+            anyhow::Ok(())
         })
         .unwrap();
     server
@@ -196,7 +196,7 @@ pub fn shared() -> Box<EspHttpServer<'static>> {
                 request
                     .into_status_response(500)?
                     .write(error_text.as_bytes())?;
-                return Ok(());
+                return anyhow::Ok(());
             }
             let mut ota = ota.unwrap();
             println!("start ota");