Skip to content

Commit 5d09092

Browse files
Make it work under linux again
1 parent a1cb004 commit 5d09092

5 files changed

Lines changed: 24 additions & 10 deletions

File tree

Cargo.lock

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ slint-build = "1.12.1"
2626
members = ["moonraker-rs"]
2727

2828
[workspace.metadata.cross.target.armv7-unknown-linux-musleabihf]
29-
image = "cross-armv7:latest"
29+
image = "cross-armv7:latest"

armv7.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:latest
22

33
RUN apt-get update && \
4-
apt-get install -y libfontconfig1-dev && \
5-
rm -rf /var/lib/apt/lists/*
4+
apt-get install -y libfontconfig1-dev libssl-dev openssl && \
5+
rm -rf /var/lib/apt/lists/*

moonraker-rs/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ tokio = { version = "1", features = ["full"]}
1212
hyper-util = "0"
1313
http-body-util = "0"
1414
optional_struct = "0"
15-
reqwest = "0"
15+
reqwest = "0"
16+
17+
[target.armv7-unknown-linux-musleabihf.dependencies]
18+
openssl = { version = "0.10", features = ["vendored"] }

src/main.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ async fn main() -> Result<(), Box<dyn Error>> {
5656

5757
if let GeneralEvent::Connected = &*event
5858
{
59-
ui_weak.upgrade_in_event_loop(move |ui| ui.global::<AppState>().set_moonraker_connected(true)).unwrap();
59+
let _ = ui_weak.upgrade_in_event_loop(move |ui| ui.global::<AppState>().set_moonraker_connected(true));
6060
}
6161
else if let GeneralEvent::Disconnected = &*event
6262
{
63-
ui_weak.upgrade_in_event_loop(move |ui| ui.global::<AppState>().set_moonraker_connected(false)).unwrap();
63+
let _ = ui_weak.upgrade_in_event_loop(move |ui| ui.global::<AppState>().set_moonraker_connected(false));
6464
}
6565
else if let GeneralEvent::MoonrakerEvent(moonraker_event) = &*event
6666
{
@@ -71,21 +71,21 @@ async fn main() -> Result<(), Box<dyn Error>> {
7171
println!("Extruder event: {:?}", extruder_event);
7272
let extruder = Heater { target: extruder_event.target as i32, temperature: extruder_event.temperature as i32};
7373

74-
ui_weak.upgrade_in_event_loop(move |ui| ui.global::<State>().set_extruder(extruder)).unwrap();
74+
let _ = ui_weak.upgrade_in_event_loop(move |ui| ui.global::<State>().set_extruder(extruder));
7575
}
7676

7777
if let PrinterEvent::HeaterBed(heater_bed_event) = status_update
7878
{
7979
let bed = Heater { target: heater_bed_event.target as i32, temperature: heater_bed_event.temperature as i32};
8080

81-
ui_weak.upgrade_in_event_loop(move |ui| ui.global::<State>().set_heated_bed(bed)).unwrap();
81+
let _ = ui_weak.upgrade_in_event_loop(move |ui| ui.global::<State>().set_heated_bed(bed));
8282
}
8383

8484
if let PrinterEvent::TemperatureSensor(temperature_sensor_event) = status_update
8585
{
8686
let sensor_event = TemperatureSensor { name: SharedString::from(&temperature_sensor_event.name), temperature: temperature_sensor_event.sensor.temperature as i32 };
8787

88-
ui_weak.upgrade_in_event_loop(move |ui| {
88+
let _ = ui_weak.upgrade_in_event_loop(move |ui| {
8989
let temperature_sensors = ui.global::<State>().get_temperature_sensors();
9090
let current_sensors = temperature_sensors.as_any().downcast_ref::<VecModel<TemperatureSensor>>();
9191

@@ -104,7 +104,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
104104
}
105105

106106
ui.global::<State>().set_temperature_sensors(ModelRc::new(Rc::new(VecModel::from(entries))));
107-
}).unwrap();
107+
});
108108
}
109109
}
110110

0 commit comments

Comments
 (0)