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

code style

Browse Source
This commit is contained in:
Empire 2023-09-22 21:47:59 +02:00
parent 5f26622adf
commit 34957749cb
4 changed files with 60 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/bin/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "LEDboardClient" name = "ledboard_client"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"

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

@ -12,7 +12,6 @@ use embedded_graphics::{
mono_font::{iso_8859_1::FONT_6X10, iso_8859_1::FONT_5X8, MonoTextStyle}, mono_font::{iso_8859_1::FONT_6X10, iso_8859_1::FONT_5X8, MonoTextStyle},
pixelcolor::BinaryColor, pixelcolor::BinaryColor,
prelude::*, prelude::*,
primitives::PrimitiveStyle,
text::Text, text::Text,
}; };
@ -22,7 +21,6 @@ use std::io;
use openweathermap::forecast::Forecast; use openweathermap::forecast::Forecast;
use straba::NextDeparture; use straba::NextDeparture;
use ping;
// This declaration will look for a file named `straba.rs` and will // This declaration will look for a file named `straba.rs` and will
// insert its contents inside a module named `straba` under this scope // insert its contents inside a module named `straba` under this scope
mod straba; mod straba;
@ -36,10 +34,6 @@ const IMAGE_HEIGHT_BYTE: u32 = 40;
const IMAGE_LENGTH: usize = (IMAGE_WIDTH_BYTE * IMAGE_HEIGHT_BYTE) as usize; const IMAGE_LENGTH: usize = (IMAGE_WIDTH_BYTE * IMAGE_HEIGHT_BYTE) as usize;
const PACKAGE_LENGTH: usize = (IMAGE_LENGTH + 1) as usize; const PACKAGE_LENGTH: usize = (IMAGE_LENGTH + 1) as usize;
const PRIMITIVE_STYLE:PrimitiveStyle<BinaryColor> = PrimitiveStyle::with_stroke(BinaryColor::On, 1);
struct UdpDisplay { struct UdpDisplay {
image: [u8; IMAGE_SIZE_BYTE], image: [u8; IMAGE_SIZE_BYTE],
@ -236,7 +230,7 @@ fn render_weather_icon(condition: &Weather, display: &mut UdpDisplay ){
fn send_package(ipaddress: String, fn send_package(ipaddress: String,
data: &Option<Result<Forecast, String>>, data: &Option<Result<Forecast, String>>,
strabaRes: &NextDeparture) { straba_res: &NextDeparture) {
let mut package: [u8; PACKAGE_LENGTH] = [0; PACKAGE_LENGTH]; let mut package: [u8; PACKAGE_LENGTH] = [0; PACKAGE_LENGTH];
// Brightness // Brightness
@ -246,31 +240,31 @@ fn send_package(ipaddress: String,
image: [0; IMAGE_SIZE_BYTE], image: [0; IMAGE_SIZE_BYTE],
}; };
if (data.is_some()) { if data.is_some() {
render_weather(&mut display, data); render_weather(&mut display, data);
} }
if strabaRes.failure == false { if straba_res.failure == false {
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On); let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
let text_style_station = MonoTextStyle::new(&FONT_5X8, BinaryColor::On); let text_style_station = MonoTextStyle::new(&FONT_5X8, BinaryColor::On);
let mut outbound = format!("+{}min", (strabaRes.outbound_diff / 60)); let mut outbound = format!("+{}min", (straba_res.outbound_diff / 60));
if (strabaRes.outbound_diff < 60) { if straba_res.outbound_diff < 60 {
outbound = String::from("sofort"); outbound = String::from("sofort");
} }
Text::new(&strabaRes.outbound_station, Point::new(1, 15), text_style_station) Text::new(&straba_res.outbound_station, Point::new(1, 15), text_style_station)
.draw(&mut display) .draw(&mut display)
.unwrap(); .unwrap();
Text::new(&outbound, Point::new(80, 15), text_style) Text::new(&outbound, Point::new(80, 15), text_style)
.draw(&mut display) .draw(&mut display)
.unwrap(); .unwrap();
let mut inbound = format!("+{}min", (strabaRes.inbound_diff / 60)); let mut inbound = format!("+{}min", (straba_res.inbound_diff / 60));
if (strabaRes.inbound_diff < 60) { if straba_res.inbound_diff < 60 {
inbound = String::from("sofort"); inbound = String::from("sofort");
} }
Text::new(&strabaRes.inbound_station, Point::new(1, 25), text_style_station) Text::new(&straba_res.inbound_station, Point::new(1, 25), text_style_station)
.draw(&mut display) .draw(&mut display)
.unwrap(); .unwrap();
Text::new(&inbound, Point::new(80, 24), text_style) Text::new(&inbound, Point::new(80, 24), text_style)
@ -296,12 +290,12 @@ LEDboardClient <ip address>"
} }
fn check_connection(ipaddress: String) -> bool { fn check_connection(ipaddress: String) -> bool {
let mut device_online = false; let device_online;
// generate a faulty package length // generate a faulty package length
let mut package: [u8; PACKAGE_LENGTH/2] = [0; PACKAGE_LENGTH/2]; let mut package: [u8; PACKAGE_LENGTH/2] = [0; PACKAGE_LENGTH/2];
// client need to bind to client port (1 before 4242) // client need to bind to client port (1 before 4242)
let socket = UdpSocket::bind("0.0.0.0:14242").expect("couldn't bind to address"); let socket = UdpSocket::bind("0.0.0.0:14242").expect("couldn't bind to address");
socket.set_read_timeout(Some(Duration::from_secs(10))); /* 10 seconds timeout */ socket.set_read_timeout(Some(Duration::from_secs(10))).unwrap(); /* 10 seconds timeout */
socket socket
.send_to(&package, ipaddress + ":4242") .send_to(&package, ipaddress + ":4242")
.expect("couldn't send data"); .expect("couldn't send data");
@ -309,14 +303,14 @@ fn check_connection(ipaddress: String) -> bool {
// self.recv_buff is a [u8; 8092] // self.recv_buff is a [u8; 8092]
let answer = socket.recv_from(&mut package); let answer = socket.recv_from(&mut package);
match answer { match answer {
Ok((n, addr)) => { Ok((_n, _addr)) => {
//println!("{} bytes response from {:?} {:?}", n, addr, &package[..n]); //println!("{} bytes response from {:?} {:?}", n, addr, &package[..n]);
device_online = true; device_online = true;
} }
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => { Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
device_online = false; device_online = false;
} }
Err(e) => { Err(_e) => {
device_online = false; device_online = false;
} }
} }
@ -338,7 +332,7 @@ fn main() {
let mut device_online = check_connection(ip.to_string()); let mut device_online = check_connection(ip.to_string());
if (!device_online) { if !device_online {
println!("{} not online", ip); println!("{} not online", ip);
return return
} }
@ -352,12 +346,12 @@ fn main() {
let mut last_data = Option::None; let mut last_data = Option::None;
// Test Webcrawler for public transportataion // Test Webcrawler for public transportataion
let mut strabaRes = straba::fetch_data(Some(true)); let mut straba_res = straba::fetch_data(Some(true));
println!("{:?} {:?}s", strabaRes.outbound_station, strabaRes.outbound_diff); println!("{:?} {:?}s", straba_res.outbound_station, straba_res.outbound_diff);
println!("{:?} {:?}s", strabaRes.inbound_station , strabaRes.inbound_diff); println!("{:?} {:?}s", straba_res.inbound_station , straba_res.inbound_diff);
// Render start // Render start
send_package(ip.to_string(), &last_data, &strabaRes); send_package(ip.to_string(), &last_data, &straba_res);
loop { loop {
let st_now = SystemTime::now(); let st_now = SystemTime::now();
let seconds = st_now.duration_since(UNIX_EPOCH).unwrap().as_secs(); let seconds = st_now.duration_since(UNIX_EPOCH).unwrap().as_secs();
@ -376,19 +370,19 @@ fn main() {
} }
} }
if (strabaRes.request_time + 60) < seconds as i64 { if (straba_res.request_time + 60) < seconds as i64 {
device_online = check_connection(ip.to_string()); device_online = check_connection(ip.to_string());
// request once a minute new data // request once a minute new data
if device_online == true { if device_online == true {
strabaRes = straba::fetch_data(None); straba_res = straba::fetch_data(None);
println!("Update {:?} {:?}s", strabaRes.outbound_station, strabaRes.outbound_diff); println!("Update {:?} {:?}s", straba_res.outbound_station, straba_res.outbound_diff);
println!("Update {:?} {:?}s", strabaRes.inbound_station , strabaRes.inbound_diff); println!("Update {:?} {:?}s", straba_res.inbound_station , straba_res.inbound_diff);
} }
} }
if device_online == true { if device_online == true {
// Render new image // Render new image
send_package(ip.to_string(), &last_data, &strabaRes); send_package(ip.to_string(), &last_data, &straba_res);
} }
} }
} }

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

@ -1,11 +1,6 @@
use chrono::DateTime; use chrono::DateTime;
use std::time::{SystemTime, UNIX_EPOCH}; use std::time::{SystemTime, UNIX_EPOCH};
use chrono_tz::Europe::Berlin;
/* @file straba.rs
* @brief fetch next depature of light rail vehicle
*/
use serde_json::Value;
use serde::Deserialize; use serde::Deserialize;
const STATION_URL:&str = "https://www.rnv-online.de/rest/departure/2494"; const STATION_URL:&str = "https://www.rnv-online.de/rest/departure/2494";
@ -16,7 +11,7 @@ const STATION_URL:&str = "https://www.rnv-online.de/rest/departure/2494";
pub struct Station { pub struct Station {
pub id: String, pub id: String,
pub name: String, pub name: String,
pub graphQL: GraphQL, pub graph_ql: GraphQL,
} }
#[derive(Default, Debug, Clone, PartialEq, Deserialize)] #[derive(Default, Debug, Clone, PartialEq, Deserialize)]
@ -41,7 +36,7 @@ pub struct JourneysElement {
#[derive(Default, Debug, Clone, PartialEq, Deserialize)] #[derive(Default, Debug, Clone, PartialEq, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Line { pub struct Line {
pub lineGroup: LineGroup, pub line_group: LineGroup,
} }
#[derive(Default, Debug, Clone, PartialEq, Deserialize)] #[derive(Default, Debug, Clone, PartialEq, Deserialize)]
@ -61,15 +56,15 @@ pub struct Journey {
#[derive(Default, Debug, Clone, PartialEq, Deserialize)] #[derive(Default, Debug, Clone, PartialEq, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct StopsElement { pub struct StopsElement {
pub destinationLabel: String, pub destination_label: String,
pub plannedDeparture: IsoStringDateTime, pub planned_departure: IsoStringDateTime,
pub realtimeDeparture: IsoStringDateTime, pub realtime_departure: IsoStringDateTime,
} }
#[derive(Default, Debug, Clone, PartialEq, Deserialize)] #[derive(Default, Debug, Clone, PartialEq, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct IsoStringDateTime { pub struct IsoStringDateTime {
pub isoString: Option<String>, pub iso_string: Option<String>,
} }
// Return value // Return value
@ -89,7 +84,7 @@ pub fn fetch_data(debug_print : Option<bool>) -> NextDeparture {
let url = &format!("{}?datetime={}", STATION_URL, seconds); let url = &format!("{}?datetime={}", STATION_URL, seconds);
let result = reqwest::blocking::get(url); let result = reqwest::blocking::get(url);
let mut returnValue = NextDeparture { let mut return_value = NextDeparture {
failure : false, failure : false,
outbound_station : String::from(""), outbound_station : String::from(""),
outbound_diff : 10000, outbound_diff : 10000,
@ -100,64 +95,64 @@ pub fn fetch_data(debug_print : Option<bool>) -> NextDeparture {
if result.is_err() { if result.is_err() {
println!("Could not read station response {:?}", result.err()); println!("Could not read station response {:?}", result.err());
returnValue.failure = true; return_value.failure = true;
return returnValue; return return_value;
} }
let text = result.unwrap().text(); let text = result.unwrap().text();
if text.is_err() { if text.is_err() {
println!("Could not convert response {:?}", text.err()); println!("Could not convert response {:?}", text.err());
returnValue.failure = true; return_value.failure = true;
return returnValue; return return_value;
} }
let rawText = &text.unwrap(); let raw_text = &text.unwrap();
let body: std::result::Result<Station, serde_json::Error> = serde_json::from_str(&rawText); let body: std::result::Result<Station, serde_json::Error> = serde_json::from_str(&raw_text);
if body.is_err() { if body.is_err() {
println!("Could not parse json {:?}", body.err()); println!("Could not parse json {:?}", body.err());
println!("------------------------- %< ----------------------------"); println!("------------------------- %< ----------------------------");
println!("{}", &rawText); println!("{}", &raw_text);
println!("------------------------- %< ----------------------------"); println!("------------------------- %< ----------------------------");
returnValue.failure = true; return_value.failure = true;
return returnValue; return return_value;
} }
// parse JSON result.. search of both directions // parse JSON result.. search of both directions
let json = body.unwrap(); let json = body.unwrap();
for el in (json.graphQL.response.journeys.elements) { for el in json.graph_ql.response.journeys.elements {
if (debug_print.is_some() && debug_print.unwrap() == true) { if debug_print.is_some() && debug_print.unwrap() == true {
println!("Line {:}", el.line.lineGroup.label); println!("Line {:}", el.line.line_group.label);
} }
for stop in el.stops { for stop in el.stops {
// use only valid data // use only valid data
if stop.realtimeDeparture.isoString.is_some() && if stop.realtime_departure.iso_string.is_some() &&
stop.destinationLabel != "" { stop.destination_label != "" {
let txt_departure = stop.realtimeDeparture.isoString.unwrap(); let txt_departure = stop.realtime_departure.iso_string.unwrap();
let next_departure = DateTime::parse_from_rfc3339(&txt_departure).unwrap(); let next_departure = DateTime::parse_from_rfc3339(&txt_departure).unwrap();
let diff = next_departure.timestamp() - (seconds as i64); let diff = next_departure.timestamp() - (seconds as i64);
if (debug_print.is_some() && debug_print.unwrap() == true) { if debug_print.is_some() && debug_print.unwrap() == true {
println!("To {:} {:} (in {:} seconds)", stop.destinationLabel, txt_departure, diff ); println!("To {:} {:} (in {:} seconds)", stop.destination_label, txt_departure, diff );
} }
if stop.destinationLabel.contains("Rheinau") { if stop.destination_label.contains("Rheinau") {
if (diff < returnValue.outbound_diff) { if diff < return_value.outbound_diff {
returnValue.outbound_station = stop.destinationLabel; return_value.outbound_station = stop.destination_label;
returnValue.outbound_diff = diff; return_value.outbound_diff = diff;
} }
} else if stop.destinationLabel.contains("Hochschule") || } else if stop.destination_label.contains("Hochschule") ||
stop.destinationLabel.contains("Hauptbahnhof") || stop.destination_label.contains("Hauptbahnhof") ||
stop.destinationLabel.contains("Schönau") { stop.destination_label.contains("Schönau") {
if (diff < returnValue.inbound_diff) { if diff < return_value.inbound_diff {
returnValue.inbound_station = stop.destinationLabel; return_value.inbound_station = stop.destination_label;
returnValue.inbound_diff = diff; return_value.inbound_diff = diff;
} }
} }
} else { } else {
println!("Planned {:} {:?}", stop.destinationLabel, stop.plannedDeparture.isoString) println!("Planned {:} {:?}", stop.destination_label, stop.planned_departure.iso_string)
} }
} }
} }
returnValue return_value
} }

0
client/openweathermap/src/lib.rs Executable file → Normal file
View File