Merge branch 'feature/12v' of github.com:0110/PlantCtrl into feature/12v

# Conflicts:
#	rust/Cargo.toml
This commit is contained in:
2023-11-30 19:26:03 +01:00
4 changed files with 21 additions and 14 deletions

View File

@@ -1,5 +1,4 @@
use chrono::{Datelike, Timelike, NaiveDateTime};
use build_time::build_time_utc;
use chrono_tz::Europe::Berlin;
use esp_idf_hal::delay::Delay;
@@ -23,8 +22,8 @@ fn main() -> Result<()>{
log::info!("Startup Rust");
let utc_build_time = build_time_utc!();
println!("Version was build {}", utc_build_time);
let git_hash = env!("VERGEN_GIT_DESCRIBE");
println!("Version useing git has {}", git_hash);
let mut board = PlantHal::create()?;

View File

@@ -1,6 +1,5 @@
//offer ota and config mode
use build_time::build_time_utc;
use embedded_svc::http::Method;
use esp_idf_svc::http::server::EspHttpServer;
use esp_ota::OtaUpdate;
@@ -20,9 +19,9 @@ pub fn httpd(initial_config:bool) -> EspHttpServer<'static> {
return Ok(())
}).unwrap();
server
.fn_handler("/buildtime",Method::Get, |request| {
.fn_handler("/version",Method::Get, |request| {
let mut response = request.into_ok_response()?;
response.write(build_time_utc!().as_bytes())?;
response.write(env!("VERGEN_GIT_DESCRIBE").as_bytes())?;
return Ok(())
}).unwrap();
server