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

Compare commits

base: C3MA:e070c802d5fa9c253fa0857691873c76e2b68662
Branches Tags
C3MA:v2.x
C3MA:feature/esp32c6
C3MA:feature/esp32c6_i2c
C3MA:feature/2.0
C3MA:ollo-dev
C3MA:v1.x
C3MA:V3.0_first_run
C3MA:0.7-final
C3MA:0.9-final
..
compare: C3MA:34066ee4633b446785a9e8308b29e4422e8d992c
Branches Tags
C3MA:feature/esp32c6
C3MA:feature/esp32c6_i2c
C3MA:feature/2.0
C3MA:ollo-dev
C3MA:v2.x
C3MA:v1.x
C3MA:V3.0_first_run
C3MA:0.7-final
C3MA:0.9-final

No commits in common. "e070c802d5fa9c253fa0857691873c76e2b68662" and "34066ee4633b446785a9e8308b29e4422e8d992c" have entirely different histories.
e070c802d5 ... 34066ee463

6 changed files with 15 additions and 78 deletions
Show Stats Expand all files Collapse all files

29
rust/src/main.rs
View File

@ -371,7 +371,7 @@ fn safe_main() -> anyhow::Result<()> {
let _webserver = httpd(reboot_now.clone()); let _webserver = httpd(reboot_now.clone());
wait_infinity(WaitType::StayAlive, reboot_now.clone()); wait_infinity(WaitType::StayAlive, reboot_now.clone());
} }
let mut did_pump = false;
match plant_to_pump { match plant_to_pump {
Some(plant) => { Some(plant) => {
let mut state = plantstate[plant]; let mut state = plantstate[plant];
@ -395,7 +395,7 @@ fn safe_main() -> anyhow::Result<()> {
"Trying to pump for {}s with pump {} now", "Trying to pump for {}s with pump {} now",
plant_config.pump_time_s, plant plant_config.pump_time_s, plant
); );
did_pump = true;
board.any_pump(true)?; board.any_pump(true)?;
board.store_last_pump_time(plant, cur); board.store_last_pump_time(plant, cur);
board.pump(plant, true)?; board.pump(plant, true)?;
@ -522,25 +522,14 @@ fn safe_main() -> anyhow::Result<()> {
} }
12 * 60 12 * 60
} else if is_day { } else if is_day {
if did_pump { if online_mode == OnlineMode::Online {
if online_mode == OnlineMode::Online { let _ = board.mqtt_publish(
let _ = board.mqtt_publish( &config,
&config, "/deepsleep",
"/deepsleep", "normal 20m".as_bytes(),
"after pump".as_bytes(), );
);
}
0
} else {
if online_mode == OnlineMode::Online {
let _ = board.mqtt_publish(
&config,
"/deepsleep",
"normal 20m".as_bytes(),
);
}
20
} }
20
} else { } else {
if online_mode == OnlineMode::Online { if online_mode == OnlineMode::Online {
let _ = board.mqtt_publish( let _ = board.mqtt_publish(

14
rust/src/plant_hal.rs
View File

@ -717,22 +717,14 @@ impl PlantCtrlBoardInteraction for PlantCtrlBoard<'_> {
println!("Some error assembling full_topic 2"); println!("Some error assembling full_topic 2");
bail!("Some error assembling full_topic 2") bail!("Some error assembling full_topic 2")
}; };
let publish = client.publish( client.publish(
&full_topic, &full_topic,
embedded_svc::mqtt::client::QoS::ExactlyOnce, embedded_svc::mqtt::client::QoS::ExactlyOnce,
true, true,
message, message,
); )?;
match publish {
OkStd(_) => return Ok(()),
Err(err) => {
println!("Error during mqtt send on topic {} with message {:#?} error is {:?}",full_topic, message, err);
return Err(err)?
},
}
; return Ok(());
} }
fn state_charge_percent(&mut self) -> Result<u8> { fn state_charge_percent(&mut self) -> Result<u8> {

11
rust/src/webserver/config.html
View File

@ -1,13 +1,6 @@
<html> <html>
<body> <body>
<h2>Current Firmware</h2>
<div>
<div id="firmware_buildtime">Buildtime loading</div>
<div id="firmware_githash">Build githash loading</div>
</div>
<h2>firmeware OTA v3</h2> <h2>firmeware OTA v3</h2>
<form id="upload_form" method="post"> <form id="upload_form" method="post">
<input type="file" name="file1" id="file1"><br> <input type="file" name="file1" id="file1"><br>
<progress id="progressBar" value="0" max="100" style="width:300px;"></progress> <progress id="progressBar" value="0" max="100" style="width:300px;"></progress>
@ -16,8 +9,6 @@
<p id="loaded_n_total"></p> <p id="loaded_n_total"></p>
</form> </form>
<h2>config</h2> <h2>config</h2>
<div id="configform"> <div id="configform">
@ -91,4 +82,4 @@
<script src="bundle.js"></script> <script src="bundle.js"></script>
</body> </body>
</html> </html>

6
rust/src/webserver/initial_config.html
View File

@ -1,11 +1,7 @@
<html> <html>
<body> <body>
<input type="button" id="test" value="Test"> <input type="button" id="test" value="Test">
<h2>Current Firmware</h2>
<div>
<div id="firmware_buildtime">Buildtime loading</div>
<div id="firmware_githash">Build githash loading</div>
</div>
<div> <div>
<h2>firmeware OTA v3</h2> <h2>firmeware OTA v3</h2>
<form id="upload_form" method="post"> <form id="upload_form" method="post">

15
rust/src/webserver/webserver.rs
View File

@ -22,12 +22,6 @@ struct SSIDList<'a> {
ssids: Vec<&'a String<32>>, ssids: Vec<&'a String<32>>,
} }
#[derive(Serialize, Debug)]
struct VersionInfo<'a> {
git_hash: &'a str,
build_time: &'a str
}
pub fn httpd_initial(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> { pub fn httpd_initial(reboot_now: Arc<AtomicBool>) -> Box<EspHttpServer<'static>> {
let mut server = shared(); let mut server = shared();
server server
@ -176,14 +170,7 @@ pub fn shared() -> Box<EspHttpServer<'static>> {
server server
.fn_handler("/version", Method::Get, |request| { .fn_handler("/version", Method::Get, |request| {
let mut response = request.into_ok_response()?; let mut response = request.into_ok_response()?;
let git_hash = env!("VERGEN_GIT_DESCRIBE"); response.write(env!("VERGEN_GIT_DESCRIBE").as_bytes())?;
let build_time = env!("VERGEN_BUILD_TIMESTAMP");
let version_info = VersionInfo{
git_hash,
build_time,
};
let version_info_json = serde_json::to_string(&version_info)?;
response.write(version_info_json.as_bytes())?;
anyhow::Ok(()) anyhow::Ok(())
}) })
.unwrap(); .unwrap();

18
rust/src_webpack/src/ota.ts
View File

@ -33,23 +33,5 @@ export function uploadFile() {
ajax.send(file); ajax.send(file);
} }
interface VersionInfo{
git_hash:string,
build_time: string
}
let file1Upload = document.getElementById("file1") as HTMLInputElement; let file1Upload = document.getElementById("file1") as HTMLInputElement;
file1Upload.onchange = uploadFile; file1Upload.onchange = uploadFile;
let firmware_buildtime = document.getElementById("firmware_buildtime") as HTMLDivElement;
let firmware_githash = document.getElementById("firmware_githash") as HTMLDivElement;
document.addEventListener('DOMContentLoaded', function() {
fetch("/version")
.then(response => response.json())
.then(json => json as VersionInfo)
.then(versionInfo => {
firmware_buildtime.innerText = versionInfo.build_time;
firmware_githash.innerText = versionInfo.git_hash;
})
}, false);