5 Commits

Author SHA1 Message Date
nahuel 1b2862dea5 Use gnu tools to compile for aarch64 2026-07-09 03:09:38 +01:00
nahuel 6b70140869 Small improvements to the rendered image. 2026-07-09 03:09:10 +01:00
nahuel 23b1863a82 Added Cargo.toml entry for Appimage packaging 2026-07-03 22:51:29 +01:00
nahuel b7894ea559 Compilation cleanups 2026-06-30 05:24:37 +01:00
nahuel f84022b8cf Make log verbosity configurable. 2026-06-30 05:19:31 +01:00
7 changed files with 37 additions and 11 deletions
+1
View File
@@ -1,3 +1,4 @@
/target /target
/.vscode /.vscode
/libs
Cargo.lock Cargo.lock
+8 -2
View File
@@ -26,12 +26,18 @@ opt-level = 1
[profile.release] [profile.release]
opt-level = 3 opt-level = 3
[package.metadata.appimage]
assets = ["resources"]
icon = "resources/icon.png"
desktop_entry = "other/rs-dublinbus.desktop"
auto-link=true
[target.aarch64-unknown-linux-gnu] [target.aarch64-unknown-linux-gnu]
cc = "aarch64-linux-gnu-gcc" cc = "aarch64-linux-gnu-gcc"
cxx = "aarch64-linux-gnu-g++" cxx = "aarch64-linux-gnu-g++"
ar = "aarch64-linux-gnu-ar" ar = "aarch64-linux-gnu-ar"
# ranlib = "aarch64-linux-gnu-ranlib" ranlib = "aarch64-linux-gnu-ranlib"
linker = "aarch64-linux-gnu-gcc" linker = "aarch64-linux-gnu-ld"
[target.arm-unknown-linux-gnueabihf] [target.arm-unknown-linux-gnueabihf]
+11
View File
@@ -3,6 +3,17 @@
- LCD Rounded font by Jecko Development (http://www.jeckodevelopment.com) - LCD Rounded font by Jecko Development (http://www.jeckodevelopment.com)
## Dependencies (Debian/Raspberry Pi OS)
* librust-openssl-dev
* protobuf-compiler
* libsdl3-dev
* libsdl3-ttf-dev
## Install appimage package
```
cargo install cargo-appimage
```
## Install ARM toolchains: ## Install ARM toolchains:
+1 -1
View File
@@ -14,5 +14,5 @@ gtfs:
data-folder: "/home/nahuel/Downloads" data-folder: "/home/nahuel/Downloads"
gtfs-url: "https://www.transportforireland.ie/transitData/Data/GTFS_Realtime.zip" gtfs-url: "https://www.transportforireland.ie/transitData/Data/GTFS_Realtime.zip"
realtime-url: "https://api.nationaltransport.ie/gtfsr/v2/gtfsr" realtime-url: "https://api.nationaltransport.ie/gtfsr/v2/gtfsr"
realtime-api-key: "Not defined" realtime-api-key: "aa8509902455412e886b9df11f0e21ec"
refresh-seconds: 61 refresh-seconds: 61
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

+14 -6
View File
@@ -1,10 +1,10 @@
mod gtfs; mod gtfs;
mod renderer; mod renderer;
mod config; mod config;
use std::{ops::Add, process, thread::Builder, time::SystemTime}; use std::{env, ops::Add, process, thread::Builder, time::SystemTime};
use chrono::{DateTime, Duration, Local, NaiveTime}; use chrono::{DateTime, Duration, Local, NaiveTime};
use log::{Level, Metadata, Record, error, info}; use log::{Metadata, Record, error, info};
use sdl3::event::Event; use sdl3::{event::Event};
use crate::{config::load_config, gtfs::structs::{Arrival, Gtfs}, renderer::structs::{DisplayData, DisplayEntry, Screen}}; use crate::{config::load_config, gtfs::structs::{Arrival, Gtfs}, renderer::structs::{DisplayData, DisplayEntry, Screen}};
const NUM_ARRIVALS: usize = 4; const NUM_ARRIVALS: usize = 4;
@@ -54,12 +54,15 @@ fn refresh_schedule<'a>(gtfs: &'a Gtfs, screen : &mut Screen<'a>) -> Option<Vec<
fn main() { fn main() {
let args: Vec<String> = env::args().collect();
// Initialize logger // Initialize logger
static MY_LOGGER: MyLogger = MyLogger; static MY_LOGGER: MyLogger = MyLogger;
struct MyLogger; struct MyLogger;
impl log::Log for MyLogger { impl log::Log for MyLogger {
fn enabled(&self, metadata: &Metadata) -> bool { fn enabled(&self, _metadata: &Metadata) -> bool {
return metadata.level() < Level::Trace; return true;
} }
fn log(&self, record: &Record) { fn log(&self, record: &Record) {
@@ -76,7 +79,12 @@ fn main() {
print!("Error setting up the main logger:{:#?}", logger.err()); print!("Error setting up the main logger:{:#?}", logger.err());
process::exit(-1); process::exit(-1);
} }
log::set_max_level(log::LevelFilter::Trace);
if args.contains(&String::from("--debug")) {
log::set_max_level(log::LevelFilter::Trace);
} else {
log::set_max_level(log::LevelFilter::Warn);
}
let config_result = load_config(String::from("resources/dublinbus.yaml")); let config_result = load_config(String::from("resources/dublinbus.yaml"));
+2 -2
View File
@@ -18,7 +18,7 @@ const TEXT_SIZE: f32 = 160.0; // Size of the font in pixels
// Offsets of each part within a line // Offsets of each part within a line
const XOFFSET_ROUTE: u32 = 24; const XOFFSET_ROUTE: u32 = 24;
const XOFFSET_DESTINATION: u32 = 300; const XOFFSET_DESTINATION: u32 = 300;
const XOFFSEET_TIME_LEFT: u32 = 1606; const XOFFSEET_TIME_LEFT: u32 = 1560;
const INTER_LINE_OVERLAP: u32 = 15; const INTER_LINE_OVERLAP: u32 = 15;
impl Screen<'_> { impl Screen<'_> {
@@ -39,7 +39,7 @@ impl Screen<'_> {
return String::from("Due"); return String::from("Due");
} }
if due_in_mins < 60 { if due_in_mins < 60 {
return due_in_mins.to_string() + "min"; return due_in_mins.to_string() + " min";
} }
return format!("{:02}:{:02}", (departure_time / 3600) as i32, ((departure_time / 60) % 60) as i32); return format!("{:02}:{:02}", (departure_time / 3600) as i32, ((departure_time / 60) % 60) as i32);
} }