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

Merge branch 'master' into ollo-dev

Browse Source
This commit is contained in:
Ollo
2024-01-07 16:02:09 +01:00
parent e4a1788698 c39f944b5a
commit 256fdeee47
6 changed files with 170 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/bin/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "LEDboardClient"
name = "ledboard_client"
version = "0.1.0"
edition = "2021"
@@ -10,7 +10,7 @@ embedded-graphics = "0.8.0"
substring = "1.4.5"
tinybmp = "0.5.0"
openweathermap = { path = "../openweathermap" }
chrono = { version = "0.4.23", default-features = false , features = ["iana-time-zone"] }
chrono = { version = "0.4.23", default-features = false , features = ["clock", "std","iana-time-zone"] }
chrono-tz = "0.8.0"
colored = "2.0.0"
datetime = "0.5.2"

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

@@ -1,4 +1,5 @@
use std::time::Duration;
use std::{time::Duration, fmt::format};
use str;
use bit::BitIndex;
use chrono_tz::Europe::Berlin;
use chrono::{DateTime, NaiveDateTime, Utc, Timelike};
@@ -9,20 +10,19 @@ use tinybmp::Bmp;
use core::time;
use embedded_graphics::{
image::Image,
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, iso_8859_1::FONT_4X6, MonoTextStyle},
pixelcolor::BinaryColor,
prelude::*,
primitives::PrimitiveStyle,
text::Text,
};
use std::net::UdpSocket;
use std::{env, thread};
use std::io;
use std::process::ExitCode;
use openweathermap::forecast::Forecast;
use straba::NextDeparture;
use ping;
// This declaration will look for a file named `straba.rs` and will
// insert its contents inside a module named `straba` under this scope
mod straba;
@@ -36,10 +36,6 @@ const IMAGE_HEIGHT_BYTE: u32 = 40;
const IMAGE_LENGTH: usize = (IMAGE_WIDTH_BYTE * IMAGE_HEIGHT_BYTE) as usize;
const PACKAGE_LENGTH: usize = (IMAGE_LENGTH + 1) as usize;
const PRIMITIVE_STYLE:PrimitiveStyle<BinaryColor> = PrimitiveStyle::with_stroke(BinaryColor::On, 1);
struct UdpDisplay {
image: [u8; IMAGE_SIZE_BYTE],
@@ -131,6 +127,7 @@ fn render_weather(display: &mut UdpDisplay ,data: &Option<Result<Forecast, Strin
println!("{}", &error);
}
Ok(result) => {
let mut temp:&f64 = &-1_f64;
if !result.list.is_empty() {
let mut max:f64 = 0_f64;
let mut best = &result.list[0];
@@ -143,11 +140,14 @@ fn render_weather(display: &mut UdpDisplay ,data: &Option<Result<Forecast, Strin
let hour = europe_time.hour();
let minute = europe_time.minute();
let cur_time = DateTime::<Utc>::default();
let cur_time = chrono::offset::Utc::now();
if zoned_time > cur_time {
println!("Skipping old result {hour}:{minute} @{time_s}");
}
temp = &forecast.main.temp;
println!("Forecast Temp is {temp}°C");
match &forecast.rain {
Some(x) => {
let rain_v = x.three_hours;
@@ -160,7 +160,6 @@ fn render_weather(display: &mut UdpDisplay ,data: &Option<Result<Forecast, Strin
None => println!("No rain at {hour}:{minute}"),
}
}
let condition = best.weather[0].to_owned();
@@ -169,6 +168,13 @@ fn render_weather(display: &mut UdpDisplay ,data: &Option<Result<Forecast, Strin
println!("Weather info: {} desc: {} icon {}", condition.main, condition.description, condition.icon);
render_weather_icon(&condition, display);
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
let temp_string = format!("{temp:.0}°C");
Text::new(&temp_string, Point::new((IMAGE_WIDTH-60) as i32, 7), text_style)
.draw(display)
.unwrap();
}
}
},
@@ -224,9 +230,59 @@ fn render_weather_icon(condition: &Weather, display: &mut UdpDisplay ){
Image::new(&icon_image.unwrap(), Point::new((IMAGE_WIDTH-40) as i32, 0)).draw(display).unwrap();
}
fn render_clock(display: &mut UdpDisplay){
let time = chrono::offset::Utc::now();
let europe_time = time.with_timezone(&Berlin);
let hour = europe_time.hour();
let minute = europe_time.minute();
let second = europe_time.second();
let time = format!("{hour:0>2}:{minute:0>2}:{second:0>2}");
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
Text::new(&time, Point::new((1) as i32, 7), text_style)
.draw(display)
.unwrap();
}
fn render_strab_partial(display: &mut UdpDisplay, station: &String, diff: i64, height: i32) {
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
let mut diff_str = format!("{}min", (diff / 60));
if diff < 60 {
diff_str = String::from("sofort");
}
let station_short: String;
if str::len(&station) > 13 {
station_short = station
.replace("Straße", "Str")
.replace("straße", "str")
.replace("Platz", "Pl")
.replace("platz", "pl")
.replace("Hauptbahnhof", "Hbf")
.replace("Bahnhof", "Bf");
} else {
station_short = station.to_string();
}
let station_clip: String;
if str::len(&station_short) > 13 {
station_clip = station_short[0..12].to_string();
} else {
station_clip = station_short.to_string();
}
Text::new(&station_clip, Point::new(1, height), text_style)
.draw(display)
.unwrap();
Text::new(&diff_str, Point::new(80, height), text_style)
.draw(display)
.unwrap();
}
fn render_strab(display: &mut UdpDisplay, straba_res: &NextDeparture) {
render_strab_partial(display, &straba_res.outbound_station, straba_res.outbound_diff, 17);
render_strab_partial(display, &straba_res.inbound_station, straba_res.inbound_diff, 27);
}
fn send_package(ipaddress: String,
data: &Option<Result<Forecast, String>>,
strabaRes: &NextDeparture) {
straba_res: &NextDeparture) {
let mut package: [u8; PACKAGE_LENGTH] = [0; PACKAGE_LENGTH];
// Brightness
@@ -236,38 +292,17 @@ fn send_package(ipaddress: String,
image: [0; IMAGE_SIZE_BYTE],
};
if (data.is_some()) {
if data.is_some() {
render_weather(&mut display, data);
}
if strabaRes.failure == false {
let text_style = MonoTextStyle::new(&FONT_6X10, BinaryColor::On);
let text_style_station = MonoTextStyle::new(&FONT_5X8, BinaryColor::On);
let mut outbound = format!("+{}min", (strabaRes.outbound_diff / 60));
if (strabaRes.outbound_diff < 60) {
outbound = String::from("sofort");
}
Text::new(&strabaRes.outbound_station, Point::new(1, 15), text_style_station)
.draw(&mut display)
.unwrap();
Text::new(&outbound, Point::new(80, 15), text_style)
.draw(&mut display)
.unwrap();
let mut inbound = format!("+{}min", (strabaRes.inbound_diff / 60));
if (strabaRes.inbound_diff < 60) {
inbound = String::from("sofort");
}
Text::new(&strabaRes.inbound_station, Point::new(1, 25), text_style_station)
.draw(&mut display)
.unwrap();
Text::new(&inbound, Point::new(80, 24), text_style)
.draw(&mut display)
.unwrap();
if straba_res.failure == false {
render_strab(&mut display, straba_res);
}
render_clock(&mut display);
package[1..PACKAGE_LENGTH].copy_from_slice(&display.image);
// 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");
@@ -286,12 +321,12 @@ LEDboardClient <ip address>"
}
fn check_connection(ipaddress: String) -> bool {
let mut device_online = false;
let device_online;
// generate a faulty package length
let mut package: [u8; PACKAGE_LENGTH/2] = [0; PACKAGE_LENGTH/2];
// 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");
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
.send_to(&package, ipaddress + ":4242")
.expect("couldn't send data");
@@ -299,28 +334,28 @@ fn check_connection(ipaddress: String) -> bool {
// self.recv_buff is a [u8; 8092]
let answer = socket.recv_from(&mut package);
match answer {
Ok((n, addr)) => {
Ok((_n, _addr)) => {
//println!("{} bytes response from {:?} {:?}", n, addr, &package[..n]);
device_online = true;
}
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => {
device_online = false;
}
Err(e) => {
Err(_e) => {
device_online = false;
}
}
return device_online;
}
fn main() {
fn main() -> ExitCode {
let args: Vec<String> = env::args().collect();
match args.len() {
// no arguments passed
1 => {
// show a help message
help();
return ExitCode::SUCCESS;
}
// one argument passed
2 => {
@@ -328,9 +363,9 @@ fn main() {
let mut device_online = check_connection(ip.to_string());
if (!device_online) {
if !device_online {
println!("{} not online", ip);
return
return ExitCode::FAILURE;
}
let receiver = openweathermap::init_forecast("Mannheim",
@@ -342,16 +377,16 @@ fn main() {
let mut last_data = Option::None;
// Test Webcrawler for public transportataion
let mut strabaRes = straba::fetch_data(Some(true));
println!("{:?} {:?}s", strabaRes.outbound_station, strabaRes.outbound_diff);
println!("{:?} {:?}s", strabaRes.inbound_station , strabaRes.inbound_diff);
let mut straba_res = straba::fetch_data(Some(true));
println!("{:?} {:?}s", straba_res.outbound_station, straba_res.outbound_diff);
println!("{:?} {:?}s", straba_res.inbound_station , straba_res.inbound_diff);
// Render start
send_package(ip.to_string(), &last_data, &strabaRes);
send_package(ip.to_string(), &last_data, &straba_res);
loop {
let st_now = SystemTime::now();
let seconds = st_now.duration_since(UNIX_EPOCH).unwrap().as_secs();
let delay = time::Duration::from_millis(10000);
let delay = time::Duration::from_millis(500);
thread::sleep(delay);
// Only request, if the device is present
if device_online == true {
@@ -366,19 +401,19 @@ fn main() {
}
}
if (strabaRes.request_time + 60) < seconds as i64 {
if (straba_res.request_time + 50) < seconds as i64 {
device_online = check_connection(ip.to_string());
// request once a minute new data
if device_online == true {
strabaRes = straba::fetch_data(None);
println!("Update {:?} {:?}s", strabaRes.outbound_station, strabaRes.outbound_diff);
println!("Update {:?} {:?}s", strabaRes.inbound_station , strabaRes.inbound_diff);
straba_res = straba::fetch_data(None);
println!("Update {:?} {:?}s", straba_res.outbound_station, straba_res.outbound_diff);
println!("Update {:?} {:?}s", straba_res.inbound_station , straba_res.inbound_diff);
}
}
if device_online == true {
// Render new image
send_package(ip.to_string(), &last_data, &strabaRes);
send_package(ip.to_string(), &last_data, &straba_res);
}
}
}
@@ -386,6 +421,7 @@ fn main() {
_ => {
// show a help message
help();
return ExitCode::SUCCESS;
}
}
}

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

@@ -1,11 +1,6 @@
use chrono::DateTime;
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 chrono::Local;
use serde::Deserialize;
const STATION_URL:&str = "https://www.rnv-online.de/rest/departure/2494";
@@ -16,7 +11,8 @@ const STATION_URL:&str = "https://www.rnv-online.de/rest/departure/2494";
pub struct Station {
pub id: String,
pub name: String,
pub graphQL: GraphQL,
#[serde(alias = "graphQL")]
pub graph_ql: GraphQL,
}
#[derive(Default, Debug, Clone, PartialEq, Deserialize)]
@@ -41,7 +37,7 @@ pub struct JourneysElement {
#[derive(Default, Debug, Clone, PartialEq, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct Line {
pub lineGroup: LineGroup,
pub line_group: LineGroup,
}
#[derive(Default, Debug, Clone, PartialEq, Deserialize)]
@@ -61,15 +57,15 @@ pub struct Journey {
#[derive(Default, Debug, Clone, PartialEq, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct StopsElement {
pub destinationLabel: String,
pub plannedDeparture: IsoStringDateTime,
pub realtimeDeparture: IsoStringDateTime,
pub destination_label: String,
pub planned_departure: IsoStringDateTime,
pub realtime_departure: IsoStringDateTime,
}
#[derive(Default, Debug, Clone, PartialEq, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct IsoStringDateTime {
pub isoString: Option<String>,
pub iso_string: Option<String>,
}
// Return value
@@ -83,13 +79,14 @@ pub struct NextDeparture {
}
pub fn fetch_data(debug_print : Option<bool>) -> NextDeparture {
let date = Local::now();
let st_now = SystemTime::now();
let seconds = st_now.duration_since(UNIX_EPOCH).unwrap().as_secs();
let url = &format!("{}?datetime={}", STATION_URL, seconds);
let timeString = date.format("%Y-%m-%d %H:%M:%S");
let url = &format!("{}?datetime={}", STATION_URL, timeString);
let result = reqwest::blocking::get(url);
let mut returnValue = NextDeparture {
let mut return_value = NextDeparture {
failure : false,
outbound_station : String::from(""),
outbound_diff : 10000,
@@ -100,64 +97,86 @@ pub fn fetch_data(debug_print : Option<bool>) -> NextDeparture {
if result.is_err() {
println!("Could not read station response {:?}", result.err());
returnValue.failure = true;
return returnValue;
return_value.failure = true;
return return_value;
}
let text = result.unwrap().text();
if text.is_err() {
println!("Could not convert response {:?}", text.err());
returnValue.failure = true;
return returnValue;
return_value.failure = true;
return return_value;
}
let rawText = &text.unwrap();
let body: std::result::Result<Station, serde_json::Error> = serde_json::from_str(&rawText);
let raw_text = &text.unwrap();
let body: std::result::Result<Station, serde_json::Error> = serde_json::from_str(&raw_text);
if body.is_err() {
println!("Could not parse json {:?}", body.err());
println!("------------------------- %< ----------------------------");
println!("{}", &rawText);
println!("{}", &raw_text);
println!("------------------------- %< ----------------------------");
returnValue.failure = true;
return returnValue;
return_value.failure = true;
return return_value;
}
if debug_print.is_some() && debug_print.unwrap() == true {
println!("----------- Seconds {:} {:} requesting ... -----------", seconds, timeString);
}
// parse JSON result.. search of both directions
let json = body.unwrap();
for el in (json.graphQL.response.journeys.elements) {
if (debug_print.is_some() && debug_print.unwrap() == true) {
println!("Line {:}", el.line.lineGroup.label);
if debug_print.is_some() && debug_print.unwrap() == true {
println!("Requesting {:}", json.graph_ql.response.name);
println!("Elements {:}", json.graph_ql.response.journeys.elements.len() );
println!("------------------------- %< ----------------------------");
println!("{}", &raw_text);
println!("------------------------- %< ----------------------------");
}
for el in json.graph_ql.response.journeys.elements {
if debug_print.is_some() && debug_print.unwrap() == true {
println!("Requesting {:}", json.graph_ql.response.name);
println!("Line {:}", el.line.line_group.label);
}
for stop in el.stops {
// use only valid data
if stop.realtimeDeparture.isoString.is_some() &&
stop.destinationLabel != "" {
let txt_departure = stop.realtimeDeparture.isoString.unwrap();
if stop.realtime_departure.iso_string.is_some() &&
stop.destination_label != "" {
let txt_departure = stop.realtime_departure.iso_string.unwrap();
let next_departure = DateTime::parse_from_rfc3339(&txt_departure).unwrap();
let diff = next_departure.timestamp() - (seconds as i64);
if (debug_print.is_some() && debug_print.unwrap() == true) {
println!("To {:} {:} (in {:} seconds)", stop.destinationLabel, txt_departure, diff );
if debug_print.is_some() && debug_print.unwrap() == true {
println!("To {:} {:} (in {:} seconds)", stop.destination_label, txt_departure, diff );
}
if stop.destinationLabel.contains("Rheinau") {
if (diff < returnValue.outbound_diff) {
returnValue.outbound_station = stop.destinationLabel;
returnValue.outbound_diff = diff;
if stop.destination_label.contains("Rheinau") {
if diff < return_value.outbound_diff {
return_value.outbound_station = stop.destination_label;
return_value.outbound_diff = diff;
} else if debug_print.is_some() && debug_print.unwrap() == true {
println!("Unkown diff Stop {:} {:} (in {:} seconds)", stop.destination_label, txt_departure, diff );
}
} else if stop.destinationLabel.contains("Hochschule") ||
stop.destinationLabel.contains("Hauptbahnhof") ||
stop.destinationLabel.contains("Schönau") {
if (diff < returnValue.inbound_diff) {
returnValue.inbound_station = stop.destinationLabel;
returnValue.inbound_diff = diff;
} else if stop.destination_label.contains("Hochschule") ||
stop.destination_label.contains("Hauptbahnhof") ||
stop.destination_label.contains("Schönau") {
if diff < return_value.inbound_diff {
return_value.inbound_station = stop.destination_label;
return_value.inbound_diff = diff;
} else if debug_print.is_some() && debug_print.unwrap() == true {
println!("Unkown diff Stop {:} {:} (in {:} seconds)", stop.destination_label, txt_departure, diff );
}
} else if debug_print.is_some() && debug_print.unwrap() == true {
println!("Unkown Stop {:} {:} (in {:} seconds)", stop.destination_label, txt_departure, diff );
}
} else {
println!("Planned {:} {:?}", stop.destinationLabel, stop.plannedDeparture.isoString)
println!("Planned {:} {:?}", stop.destination_label, stop.planned_departure.iso_string)
}
}
}
returnValue
if debug_print.is_some() && debug_print.unwrap() == true {
println!("----------- end of straba.rs -----------");
}
return_value
}

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

1
simulation/VirtualLedBoard/mainwindow.cpp
View File

@@ -22,6 +22,7 @@ MainWindow::~MainWindow()
}
void MainWindow::drawImage(QImage *target) {
(void)target; /* handle unused variable ;-) */
this->mScene=new QGraphicsScene() ;
QGraphicsView *graphicsView = new QGraphicsView();
graphicsView->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);

10
simulation/VirtualLedBoard/udpserver.cpp
View File

@@ -2,6 +2,7 @@
#include "settings.h"
#include <QUdpSocket>
#include <QNetworkDatagram>
#include <ostream>
#include "mainwindow.h"
#define UDP_IMAGE_PORT 4242
@@ -49,6 +50,7 @@ void UdpLedServer ::readPendingDatagrams()
void UdpLedServer::processTheDatagram(QNetworkDatagram datagram) {
if (datagram.isValid() && datagram.data().length() == PACKET_LENGTH) {
qInfo("Received regular datagram.");
uint8_t brightness = datagram.data().at(PACKET_INDEX_BRIGHTNESS);
int currentIndex = PACKET_INDEX_PANEL0;
@@ -70,5 +72,13 @@ void UdpLedServer::processTheDatagram(QNetworkDatagram datagram) {
qDebug() << "Received datagram:" << brightness;
} else if (datagram.isValid() && datagram.data().length() != PACKET_LENGTH) {
qDebug("Received status-check datagram.");
//socket = new QUdpSocket(this);
this->mUdpSocket->writeDatagram(datagram.data(), sizeof(datagram.data()), datagram.senderAddress(), datagram.senderPort());
//this->mUdpSocket->writeDatagram(datagram);
qDebug("Returned datagram");
} else {
qDebug("Received invalid datagram.");
}
}