geoffsee/yachtpit
1
0
Fork 0
mirror of https://github.com/seemueller-io/yachtpit.git synced 2025-09-08 22:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add conditional compilation for non-WASM targets in AIS system

Browse Source
This commit is contained in:
geoffsee
2025-07-03 13:44:34 -04:00
parent a5a87a86fd
commit f6f3d1a512
2 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/systems/Cargo.toml
View File

@@ -18,4 +18,6 @@ bevy = { workspace = true, features = [
rand = { version = "0.8.3" } rand = { version = "0.8.3" }
components = { path = "../components" } components = { path = "../components" }
datalink = { path = "../datalink" } datalink = { path = "../datalink" }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
datalink-provider = { path = "../datalink-provider" } datalink-provider = { path = "../datalink-provider" }

50
crates/systems/src/ais/ais_system.rs
View File

@@ -1,7 +1,10 @@
use bevy::prelude::Time; use bevy::prelude::Time;
use components::VesselData; use components::VesselData;
use crate::{SystemInteraction, SystemStatus, VesselSystem}; use crate::{SystemInteraction, SystemStatus, VesselSystem};
use datalink::{DataLink, DataLinkConfig, DataLinkReceiver, DataMessage}; use datalink::DataMessage;
#[cfg(not(target_arch = "wasm32"))]
use datalink::{DataLink, DataLinkConfig, DataLinkReceiver};
#[cfg(not(target_arch = "wasm32"))]
use datalink_provider::AisDataLinkProvider; use datalink_provider::AisDataLinkProvider;
use std::collections::HashMap; use std::collections::HashMap;
@@ -10,31 +13,38 @@ pub struct AisSystem {
status: SystemStatus, status: SystemStatus,
own_mmsi: u32, own_mmsi: u32,
receiving: bool, receiving: bool,
#[cfg(not(target_arch = "wasm32"))]
datalink: AisDataLinkProvider, datalink: AisDataLinkProvider,
vessel_data: HashMap<String, DataMessage>, vessel_data: HashMap<String, DataMessage>,
} }
impl AisSystem { impl AisSystem {
pub fn new() -> Self { pub fn new() -> Self {
let mut datalink = AisDataLinkProvider::new(); #[cfg(not(target_arch = "wasm32"))]
let datalink = {
let mut datalink = AisDataLinkProvider::new();
// Configure for serial AIS receiver (default configuration) // Configure for serial AIS receiver (default configuration)
// This can be customized based on available hardware // This can be customized based on available hardware
let config = DataLinkConfig::new("ais".to_string()) let config = DataLinkConfig::new("ais".to_string())
.with_parameter("connection_type".to_string(), "serial".to_string()) .with_parameter("connection_type".to_string(), "serial".to_string())
.with_parameter("port".to_string(), "/dev/ttyUSB0".to_string()) .with_parameter("port".to_string(), "/dev/ttyUSB0".to_string())
.with_parameter("baud_rate".to_string(), "38400".to_string()); .with_parameter("baud_rate".to_string(), "38400".to_string());
// Try to connect to the AIS datalink // Try to connect to the AIS datalink
// If it fails, the system will still work but won't receive real AIS data // If it fails, the system will still work but won't receive real AIS data
if let Err(e) = datalink.connect(&config) { if let Err(e) = datalink.connect(&config) {
eprintln!("Failed to connect AIS datalink: {} (falling back to no external data)", e); eprintln!("Failed to connect AIS datalink: {} (falling back to no external data)", e);
} }
datalink
};
Self { Self {
status: SystemStatus::Active, status: SystemStatus::Active,
own_mmsi: 123456789, own_mmsi: 123456789,
receiving: true, receiving: true,
#[cfg(not(target_arch = "wasm32"))]
datalink, datalink,
vessel_data: HashMap::new(), vessel_data: HashMap::new(),
} }
@@ -52,6 +62,7 @@ impl VesselSystem for AisSystem {
fn update(&mut self, _yacht_data: &VesselData, _time: &Time) { fn update(&mut self, _yacht_data: &VesselData, _time: &Time) {
// Receive new AIS messages from the datalink // Receive new AIS messages from the datalink
#[cfg(not(target_arch = "wasm32"))]
if self.receiving && self.datalink.is_connected() { if self.receiving && self.datalink.is_connected() {
if let Ok(messages) = self.datalink.receive_all_messages() { if let Ok(messages) = self.datalink.receive_all_messages() {
for message in messages { for message in messages {
@@ -82,6 +93,17 @@ impl VesselSystem for AisSystem {
} }
fn render_display(&self, _yacht_data: &VesselData) -> String { fn render_display(&self, _yacht_data: &VesselData) -> String {
let datalink_status = {
#[cfg(not(target_arch = "wasm32"))]
{
if self.datalink.is_connected() { "CONNECTED" } else { "DISCONNECTED" }
}
#[cfg(target_arch = "wasm32")]
{
"OFFLINE"
}
};
let mut display = format!( let mut display = format!(
"AIS - AUTOMATIC IDENTIFICATION SYSTEM\n\n\ "AIS - AUTOMATIC IDENTIFICATION SYSTEM\n\n\
Status: {}\n\ Status: {}\n\
@@ -91,7 +113,7 @@ impl VesselSystem for AisSystem {
NEARBY VESSELS:\n", NEARBY VESSELS:\n",
if self.receiving { "RECEIVING" } else { "STANDBY" }, if self.receiving { "RECEIVING" } else { "STANDBY" },
self.own_mmsi, self.own_mmsi,
if self.datalink.is_connected() { "CONNECTED" } else { "DISCONNECTED" } datalink_status
); );
if self.vessel_data.is_empty() { if self.vessel_data.is_empty() {