C3MA/LED-BOARD
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed station handling

Browse Source
This commit is contained in:
Ollo 2023-09-16 13:44:30 +02:00
parent 69191e77b3
commit 489df6e33b
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/bin/src/main.rs
View File

@ -233,12 +233,9 @@ fn send_package(ipaddress: String,
image: [0; IMAGE_SIZE_BYTE], image: [0; IMAGE_SIZE_BYTE],
}; };
if (data.is_some()) {
// Line::new(Point::new(0, 0), Point::new((IMAGE_WIDTH - 1) as i32, 0))
// .into_styled(PRIMITIVE_STYLE)
// .draw(&mut display)
// .unwrap();
render_weather(&mut display, data); render_weather(&mut display, data);
}
if strabaRes.failure == false { if strabaRes.failure == false {
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On); let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
@ -274,7 +271,6 @@ fn send_package(ipaddress: String,
socket socket
.send_to(&package, ipaddress + ":4242") .send_to(&package, ipaddress + ":4242")
.expect("couldn't send data"); .expect("couldn't send data");
println!("Packet sent");
} }
fn help() { fn help() {

11
client/bin/src/straba.rs
View File

@ -137,19 +137,20 @@ pub fn fetch_data() -> NextDeparture {
let diff = next_departure.timestamp() - (seconds as i64); let diff = next_departure.timestamp() - (seconds as i64);
println!("To {:} {:} (in {:} seconds)", stop.destinationLabel, txt_departure, diff ); println!("To {:} {:} (in {:} seconds)", stop.destinationLabel, txt_departure, diff );
if returnValue.outbound_station == "" {
if stop.destinationLabel.contains("Rheinau") && (diff < returnValue.outbound_diff) { if stop.destinationLabel.contains("Rheinau") {
if (diff < returnValue.outbound_diff) {
returnValue.outbound_station = stop.destinationLabel; returnValue.outbound_station = stop.destinationLabel;
returnValue.outbound_diff = diff; returnValue.outbound_diff = diff;
}
} else if stop.destinationLabel.contains("Hochschule") || } else if stop.destinationLabel.contains("Hochschule") ||
stop.destinationLabel.contains("Hauptbahnhof") || stop.destinationLabel.contains("Hauptbahnhof") ||
stop.destinationLabel.contains("nau") { // Schönau stop.destinationLabel.contains("Schönau") {
if returnValue.inbound_station == "" && (diff < returnValue.inbound_diff) { if (diff < returnValue.inbound_diff) {
returnValue.inbound_station = stop.destinationLabel; returnValue.inbound_station = stop.destinationLabel;
returnValue.inbound_diff = diff; returnValue.inbound_diff = diff;
} }
} }
}
} else { } else {
println!("Planned {:} {:?}", stop.destinationLabel, stop.plannedDeparture.isoString) println!("Planned {:} {:?}", stop.destinationLabel, stop.plannedDeparture.isoString)
} }