merge stuff
This commit is contained in:
@@ -221,7 +221,7 @@ fn set_config(
|
||||
let config: PlantControllerConfig = serde_json::from_slice(&all)?;
|
||||
|
||||
let mut board = BOARD_ACCESS.lock().expect("board access");
|
||||
let _ = board.board_hal.set_config(config);
|
||||
board.board_hal.set_config(config)?;
|
||||
anyhow::Ok(Some("saved".to_owned()))
|
||||
}
|
||||
|
||||
@@ -341,6 +341,7 @@ fn ota(
|
||||
|
||||
let iter = (total_read / 1024) % 8;
|
||||
if iter != lastiter {
|
||||
board.board_hal.general_fault(iter%5==0);
|
||||
for i in 0..PLANT_COUNT {
|
||||
let _ = board.board_hal.fault(i, iter == i);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user