@@ -104,41 +104,31 @@ async fn main(spawner: Spawner) {
104104 let global_state = Rc :: new ( GlobalStateInner :: new ( & nvs) ) ;
105105 let wifi_setup_sig = Rc :: new ( Signal :: new ( ) ) ;
106106
107- // mark ota as valid
108- {
109- if let Ok ( mut ota) = esp_hal_ota:: Ota :: new ( FlashStorage :: new ( ) ) {
110- let res = ota. ota_mark_app_valid ( ) ;
111- if let Err ( e) = res {
112- log:: error!( "Ota mark app valid failed: {e:?}" ) ;
113- }
114- }
115- }
116-
117- _ = spawner. spawn ( lcd:: lcd_task (
107+ spawner. must_spawn ( lcd:: lcd_task (
118108 board. lcd ,
119109 global_state. clone ( ) ,
120110 wifi_setup_sig. clone ( ) ,
121111 board. digits_shifters . clone ( ) ,
122112 ) ) ;
123113
124- _ = spawner. spawn ( battery:: battery_read_task (
114+ spawner. must_spawn ( battery:: battery_read_task (
125115 board. battery ,
126116 board. adc1 ,
127117 global_state. clone ( ) ,
128118 ) ) ;
129- _ = spawner. spawn ( buttons:: buttons_task (
119+ spawner. must_spawn ( buttons:: buttons_task (
130120 global_state. clone ( ) ,
131121 board. button_input ,
132122 #[ cfg( feature = "esp32c3" ) ]
133123 board. buttons_shifter ,
134124 ) ) ;
135- _ = spawner. spawn ( stackmat:: stackmat_task (
125+ spawner. must_spawn ( stackmat:: stackmat_task (
136126 board. uart1 ,
137127 board. stackmat_rx ,
138128 board. digits_shifters ,
139129 global_state. clone ( ) ,
140130 ) ) ;
141- _ = spawner. spawn ( rfid:: rfid_task (
131+ spawner. must_spawn ( rfid:: rfid_task (
142132 board. miso ,
143133 board. mosi ,
144134 board. sck ,
@@ -160,6 +150,16 @@ async fn main(spawner: Spawner) {
160150 wm_settings. esp_restart_after_connection = true ;
161151 }
162152
153+ // mark ota as valid
154+ {
155+ if let Ok ( mut ota) = esp_hal_ota:: Ota :: new ( FlashStorage :: new ( ) ) {
156+ let res = ota. ota_mark_app_valid ( ) ;
157+ if let Err ( e) = res {
158+ log:: error!( "Ota mark app valid failed: {e:?}" ) ;
159+ }
160+ }
161+ }
162+
163163 let wifi_res = esp_hal_wifimanager:: init_wm (
164164 wm_settings,
165165 & spawner,
0 commit comments