Compare commits
5 Commits
legacy/v3-
...
55bcc0c52f
| Author | SHA1 | Date | |
|---|---|---|---|
|
55bcc0c52f
|
|||
|
54a2f2d9e5
|
|||
|
ba5159708f
|
|||
|
2df120f73b
|
|||
|
58aa55fd12
|
@@ -415,10 +415,10 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
|
|||||||
.get_esp()
|
.get_esp()
|
||||||
.store_last_pump_time(plant_id, cur);
|
.store_last_pump_time(plant_id, cur);
|
||||||
board.board_hal.get_esp().last_pump_time(plant_id);
|
board.board_hal.get_esp().last_pump_time(plant_id);
|
||||||
mqtt::pump_info(plant_id, true, pump_ineffective, 0, 0, 0, false).await;
|
pump_info(plant_id, true, pump_ineffective, 0, 0, 0, false).await;
|
||||||
let result = do_secure_pump(&mut board, plant_id, plant_config, dry_run).await?;
|
let result = do_secure_pump(&mut board, plant_id, plant_config, dry_run).await?;
|
||||||
board.board_hal.pump(plant_id, false).await?;
|
board.board_hal.pump(plant_id, false).await?;
|
||||||
mqtt::pump_info(
|
pump_info(
|
||||||
plant_id,
|
plant_id,
|
||||||
false,
|
false,
|
||||||
pump_ineffective,
|
pump_ineffective,
|
||||||
@@ -561,8 +561,7 @@ async fn safe_main(spawner: Spawner) -> FatResult<()> {
|
|||||||
|
|
||||||
if stay_alive {
|
if stay_alive {
|
||||||
let reboot_now = Arc::new(AtomicBool::new(false));
|
let reboot_now = Arc::new(AtomicBool::new(false));
|
||||||
|
let _webserver = http_server(reboot_now.clone(), stack.take().unwrap());
|
||||||
spawner.spawn(http_server(reboot_now.clone(), stack.take().unwrap())?);
|
|
||||||
wait_infinity(board, WaitType::MqttConfig, reboot_now.clone(), UTC).await;
|
wait_infinity(board, WaitType::MqttConfig, reboot_now.clone(), UTC).await;
|
||||||
} else {
|
} else {
|
||||||
//TODO wait for all mqtt publishes?
|
//TODO wait for all mqtt publishes?
|
||||||
|
|||||||
@@ -300,7 +300,7 @@ impl PlantState {
|
|||||||
false
|
false
|
||||||
},
|
},
|
||||||
cooldown: self.pump_in_timeout(plant_conf, current_time),
|
cooldown: self.pump_in_timeout(plant_conf, current_time),
|
||||||
out_of_work_hour: !in_time_range(
|
out_of_work_hour: in_time_range(
|
||||||
current_time,
|
current_time,
|
||||||
plant_conf.pump_hour_start,
|
plant_conf.pump_hour_start,
|
||||||
plant_conf.pump_hour_end,
|
plant_conf.pump_hour_end,
|
||||||
|
|||||||
Reference in New Issue
Block a user