@@ -37,11 +37,13 @@ async fn main() -> Result<(), Box<dyn Error>> {
3737
3838 let mut receiver = moonraker_connection. get_listener ( ) ;
3939 let ui = init_display ( & config. display ) ?;
40+ ui. global :: < AppState > ( ) . set_moonraker_connected ( false ) ;
4041 let ui_weak = ui. as_weak ( ) ;
4142 let ui_weak_2 = ui. as_weak ( ) ;
4243 let ui_weak_3 = ui. as_weak ( ) ;
4344
4445 tokio:: spawn ( async move {
46+ tokio:: time:: sleep ( Duration :: from_secs ( 1 ) ) . await ;
4547 moonraker_connection. connection_loop ( ) . await ;
4648 } ) ;
4749
@@ -56,36 +58,36 @@ async fn main() -> Result<(), Box<dyn Error>> {
5658
5759 if let GeneralEvent :: Connected = & * event
5860 {
59- let _ = ui_weak. upgrade_in_event_loop ( move |ui| ui. global :: < AppState > ( ) . set_moonraker_connected ( true ) ) ;
61+ ui_weak. upgrade_in_event_loop ( move |ui| ui. global :: < AppState > ( ) . set_moonraker_connected ( true ) ) . unwrap ( ) ;
6062 }
6163 else if let GeneralEvent :: Disconnected = & * event
6264 {
63- let _ = ui_weak. upgrade_in_event_loop ( move |ui| ui. global :: < AppState > ( ) . set_moonraker_connected ( false ) ) ;
65+ ui_weak. upgrade_in_event_loop ( move |ui| ui. global :: < AppState > ( ) . set_moonraker_connected ( false ) ) . unwrap ( ) ;
6466 }
6567 else if let GeneralEvent :: MoonrakerEvent ( moonraker_event) = & * event
6668 {
6769 if let MoonrakerEvent :: NotifyStatusUpdate ( status_update) = moonraker_event
6870 {
6971 if let PrinterEvent :: Extruder ( extruder_event) = status_update
7072 {
71- println ! ( "Extruder event: {:?}" , extruder_event) ;
73+ // println!("Extruder event: {:?}", extruder_event);
7274 let extruder = Heater { target : extruder_event. target as i32 , temperature : extruder_event. temperature as i32 } ;
7375
74- let _ = ui_weak. upgrade_in_event_loop ( move |ui| ui. global :: < State > ( ) . set_extruder ( extruder) ) ;
76+ ui_weak. upgrade_in_event_loop ( move |ui| ui. global :: < State > ( ) . set_extruder ( extruder) ) . unwrap ( ) ;
7577 }
7678
7779 if let PrinterEvent :: HeaterBed ( heater_bed_event) = status_update
7880 {
7981 let bed = Heater { target : heater_bed_event. target as i32 , temperature : heater_bed_event. temperature as i32 } ;
8082
81- let _ = ui_weak. upgrade_in_event_loop ( move |ui| ui. global :: < State > ( ) . set_heated_bed ( bed) ) ;
83+ ui_weak. upgrade_in_event_loop ( move |ui| ui. global :: < State > ( ) . set_heated_bed ( bed) ) . unwrap ( ) ;
8284 }
8385
8486 if let PrinterEvent :: TemperatureSensor ( temperature_sensor_event) = status_update
8587 {
8688 let sensor_event = TemperatureSensor { name : SharedString :: from ( & temperature_sensor_event. name ) , temperature : temperature_sensor_event. sensor . temperature as i32 } ;
8789
88- let _ = ui_weak. upgrade_in_event_loop ( move |ui| {
90+ ui_weak. upgrade_in_event_loop ( move |ui| {
8991 let temperature_sensors = ui. global :: < State > ( ) . get_temperature_sensors ( ) ;
9092 let current_sensors = temperature_sensors. as_any ( ) . downcast_ref :: < VecModel < TemperatureSensor > > ( ) ;
9193
@@ -104,7 +106,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
104106 }
105107
106108 ui. global :: < State > ( ) . set_temperature_sensors ( ModelRc :: new ( Rc :: new ( VecModel :: from ( entries) ) ) ) ;
107- } ) ;
109+ } ) . unwrap ( ) ;
108110 }
109111 }
110112
@@ -231,8 +233,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
231233 SharedString :: from ( format ! ( "{:.2} {}" , value, units[ idx] ) )
232234 } ) ;
233235
234- ui. global :: < AppState > ( ) . set_moonraker_connected ( false ) ;
235-
236236 tokio:: task:: block_in_place ( || {
237237 ui. run ( ) . unwrap ( ) ;
238238 } ) ;
0 commit comments