Skip to content

Commit

Permalink
feat: implement messages according to arinc667 spec
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gurgel100
Gurgel100 committed Apr 4, 2024
1 parent e73c4b5 commit 46d2cef
Show file tree
Hide file tree
Showing 7 changed files with 315 additions and 87 deletions.
5 changes: 4 additions & 1 deletion fbw-a380x/src/wasm/systems/a380_systems/src/air_conditioning/cpiom_b.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ use systems::{
},
};

use crate::avionics_data_communication_network::A380AvionicsDataCommunicationNetworkMessageData;

use super::local_controllers::{
outflow_valve_control_module::{CpcsShared, OcsmShared},
trim_air_drive_device::TaddShared,
Expand Down Expand Up @@ -65,7 +67,8 @@ impl CoreProcessingInputOutputModuleB {
acs_overhead: &impl AirConditioningOverheadShared,
cabin_temperature: &impl CabinSimulation,
cargo_door_open: &impl CargoDoorLocked,
cpiom_b: [&CoreProcessingInputOutputModule; 4],
cpiom_b: [&CoreProcessingInputOutputModule<A380AvionicsDataCommunicationNetworkMessageData>;
4],
engines: &[&impl EngineCorrectedN1],
lgciu: [&impl LgciuWeightOnWheels; 2],
pneumatic: &(impl EngineStartState + PackFlowValveState + PneumaticBleed),
Expand Down
61 changes: 49 additions & 12 deletions fbw-a380x/src/wasm/systems/a380_systems/src/air_conditioning/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use systems::{
PackFlowControllers, PressurizationConstants, PressurizationOverheadShared, TrimAirSystem,
VcmShared, ZoneType,
},
integrated_modular_avionics::AvionicsDataCommunicationNetwork,
overhead::{
AutoManFaultPushButton, NormalOnPushButton, OnOffFaultPushButton, OnOffPushButton,
ValueKnob,
Expand All @@ -31,7 +32,8 @@ use uom::si::{
};

use crate::{
avionics_data_communication_network::CoreProcessingInputOutputModuleShared, payload::A380Pax,
avionics_data_communication_network::A380AvionicsDataCommunicationNetworkMessageData,
payload::A380Pax,
};

use self::{
Expand Down Expand Up @@ -93,12 +95,15 @@ impl A380AirConditioning {
}
}

pub(super) fn update(
pub(super) fn update<'a>(
&mut self,
context: &UpdateContext,
adirs: &impl AdirsToAirCondInterface,
cargo_door_open: &impl CargoDoorLocked,
cpiom_b: &impl CoreProcessingInputOutputModuleShared,
cpiom_b: &impl AvionicsDataCommunicationNetwork<
'a,
A380AvionicsDataCommunicationNetworkMessageData,
>,
engines: [&impl EngineCorrectedN1; 4],
engine_fire_push_buttons: &impl EngineFirePushButtons,
number_of_passengers: &impl NumberOfPassengers,
Expand All @@ -109,8 +114,7 @@ impl A380AirConditioning {
) {
self.pressurization_updater.update(context);

let cpiom =
["B1", "B2", "B3", "B4"].map(|name| cpiom_b.core_processing_input_output_module(name));
let cpiom = ["B1", "B2", "B3", "B4"].map(|name| cpiom_b.get_cpiom(name));

self.cpiom_b.update(
context,
Expand Down Expand Up @@ -1065,7 +1069,11 @@ mod tests {
use systems::{
air_conditioning::PackFlow,
electrical::{test::TestElectricitySource, ElectricalBus, Electricity},
integrated_modular_avionics::core_processing_input_output_module::CoreProcessingInputOutputModule,
integrated_modular_avionics::{
avionics_full_duplex_switch::AvionicsFullDuplexSwitch,
core_processing_input_output_module::CoreProcessingInputOutputModule,
input_output_module::InputOutputModule,
},
overhead::AutoOffFaultPushButton,
pneumatic::{
valve::{DefaultValve, ElectroPneumaticValve, PneumaticExhaust},
Expand Down Expand Up @@ -1142,7 +1150,10 @@ mod tests {
}

struct TestAdcn {
cpiom_b: FxHashMap<&'static str, CoreProcessingInputOutputModule>,
cpiom_b: FxHashMap<
&'static str,
CoreProcessingInputOutputModule<A380AvionicsDataCommunicationNetworkMessageData>,
>,
}
impl TestAdcn {
fn new(context: &mut InitContext) -> Self {
Expand All @@ -1164,13 +1175,39 @@ mod tests {
}
}
}
impl CoreProcessingInputOutputModuleShared for TestAdcn {
fn core_processing_input_output_module(
impl AvionicsDataCommunicationNetwork<'_, A380AvionicsDataCommunicationNetworkMessageData>
for TestAdcn
{
type NetworkEndpoint =
AvionicsFullDuplexSwitch<A380AvionicsDataCommunicationNetworkMessageData>;
type NetworkEndpointRef = &'static Self::NetworkEndpoint; // Not needed therefore this works

fn get_message_identifier(
&mut self,
name: String,
) -> systems::integrated_modular_avionics::AvionicsDataCommunicationNetworkMessageIdentifier
{
unimplemented!()
}

fn get_endpoint(&'_ self, id: u8) -> Self::NetworkEndpointRef {
unimplemented!()
}

fn get_cpiom(
&self,
cpiom: &str,
) -> &CoreProcessingInputOutputModule {
name: &str,
) -> &CoreProcessingInputOutputModule<A380AvionicsDataCommunicationNetworkMessageData>
{
// If the string is not found this will panic
self.cpiom_b.get(cpiom).unwrap()
self.cpiom_b.get(name).unwrap()
}

fn get_iom(
&self,
name: &str,
) -> &InputOutputModule<A380AvionicsDataCommunicationNetworkMessageData> {
unimplemented!()
}
}
impl SimulationElement for TestAdcn {
Expand Down
125 changes: 89 additions & 36 deletions fbw-a380x/src/wasm/systems/a380_systems/src/avionics_data_communication_network.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ use std::{
rc::Rc,
vec::Vec,
};

// TODO: deprecate
pub(crate) trait CoreProcessingInputOutputModuleShared {
fn core_processing_input_output_module(&self, cpiom: &str) -> &CoreProcessingInputOutputModule;
}
use systems::integrated_modular_avionics::{
AvionicsDataCommunicationNetworkMessage,
AvionicsDataCommunicationNetworkMessageFunctionalDataSetStatus,
};

struct RoutingTableEntry {
routing_id_1: VariableIdentifier,
Expand Down Expand Up @@ -69,10 +68,16 @@ impl RoutingTableEntry {
// The routing tables define the upper triangular matrix for the two networks.
// A breadth-first-search is used to update the routing table per AFDX switch.
pub struct A380AvionicsDataCommunicationNetwork {
afdx_switches: [Rc<RefCell<AvionicsFullDuplexSwitch>>; 16],
afdx_switches: [Rc<
RefCell<AvionicsFullDuplexSwitch<A380AvionicsDataCommunicationNetworkMessageData>>,
>; 16],
afdx_networks: [FxHashMap<u8, Vec<u8>>; 2],
cpio_modules: FxHashMap<&'static str, CoreProcessingInputOutputModule>,
io_modules: FxHashMap<&'static str, InputOutputModule>,
cpio_modules: FxHashMap<
&'static str,
CoreProcessingInputOutputModule<A380AvionicsDataCommunicationNetworkMessageData>,
>,
io_modules:
FxHashMap<&'static str, InputOutputModule<A380AvionicsDataCommunicationNetworkMessageData>>,
routing_tables: [[Vec<RoutingTableEntry>; 8]; 2],
publish_routing_table: bool,
next_message_identifier: AvionicsDataCommunicationNetworkMessageIdentifier,
Expand Down Expand Up @@ -347,7 +352,8 @@ impl A380AvionicsDataCommunicationNetwork {
}

fn switches_reachable(
afdx_switches: &[Rc<RefCell<AvionicsFullDuplexSwitch>>; 16],
afdx_switches: &[Rc<RefCell<AvionicsFullDuplexSwitch<A380AvionicsDataCommunicationNetworkMessageData>>>;
16],
network: &FxHashMap<u8, Vec<u8>>,
from: u8,
to: u8,
Expand Down Expand Up @@ -477,17 +483,12 @@ impl A380AvionicsDataCommunicationNetwork {
}
}
}

impl CoreProcessingInputOutputModuleShared for A380AvionicsDataCommunicationNetwork {
fn core_processing_input_output_module(&self, cpiom: &str) -> &CoreProcessingInputOutputModule {
// If the string is not found this will panic
self.cpio_modules.get(cpiom).unwrap()
}
}

impl<'a> AvionicsDataCommunicationNetwork<'a> for A380AvionicsDataCommunicationNetwork {
type NetworkEndpoint = AvionicsFullDuplexSwitch;
type NetworkEndpointRef = Ref<'a, AvionicsFullDuplexSwitch>;
impl<'a> AvionicsDataCommunicationNetwork<'a, A380AvionicsDataCommunicationNetworkMessageData>
for A380AvionicsDataCommunicationNetwork
{
type NetworkEndpoint =
AvionicsFullDuplexSwitch<A380AvionicsDataCommunicationNetworkMessageData>;
type NetworkEndpointRef = Ref<'a, Self::NetworkEndpoint>;

fn get_message_identifier(
&mut self,
Expand All @@ -504,11 +505,17 @@ impl<'a> AvionicsDataCommunicationNetwork<'a> for A380AvionicsDataCommunicationN
self.afdx_switches[Self::map_switch_id(id)].borrow()
}

fn get_cpiom(&self, name: &str) -> &CoreProcessingInputOutputModule {
fn get_cpiom(
&self,
name: &str,
) -> &CoreProcessingInputOutputModule<A380AvionicsDataCommunicationNetworkMessageData> {
&self.cpio_modules[name]
}

fn get_iom(&self, name: &str) -> &InputOutputModule {
fn get_iom(
&self,
name: &str,
) -> &InputOutputModule<A380AvionicsDataCommunicationNetworkMessageData> {
&self.io_modules[name]
}
}
Expand Down Expand Up @@ -545,29 +552,62 @@ pub struct A380AvionicsDataCommunicationNetworkSimvarTranslator {}
impl A380AvionicsDataCommunicationNetworkSimvarTranslator {
pub fn new<'a>(
_context: &mut InitContext,
_adcn: &mut impl AvionicsDataCommunicationNetwork<'a>,
_adcn: &mut impl AvionicsDataCommunicationNetwork<
'a,
A380AvionicsDataCommunicationNetworkMessageData,
>,
) -> Self {
Self {}
}

pub fn update<'a>(&mut self, _adcn: &impl AvionicsDataCommunicationNetwork<'a>) {}
pub fn update<'a>(
&mut self,
_adcn: &impl AvionicsDataCommunicationNetwork<
'a,
A380AvionicsDataCommunicationNetworkMessageData,
>,
) {
}
}
impl SimulationElement for A380AvionicsDataCommunicationNetworkSimvarTranslator {}

/// This type represents all the messages which can be send over AFDX
#[derive(Clone, Debug, Eq, PartialEq)]
pub enum A380AvionicsDataCommunicationNetworkMessageData {
#[cfg(test)]
TestValue(&'static str),
}
impl A380AvionicsDataCommunicationNetworkMessageData {
pub(crate) fn into_message(
self,
status: AvionicsDataCommunicationNetworkMessageFunctionalDataSetStatus,
) -> AvionicsDataCommunicationNetworkMessage<Self> {
AvionicsDataCommunicationNetworkMessage::new(status, self)
}
}
impl From<A380AvionicsDataCommunicationNetworkMessageData>
for AvionicsDataCommunicationNetworkMessage<A380AvionicsDataCommunicationNetworkMessageData>
{
fn from(value: A380AvionicsDataCommunicationNetworkMessageData) -> Self {
value.into_message(
AvionicsDataCommunicationNetworkMessageFunctionalDataSetStatus::NormalOperation,
)
}
}

#[cfg(test)]
mod tests {
use super::*;
use crate::systems::{
electrical::{test::TestElectricitySource, ElectricalBus, Electricity},
integrated_modular_avionics::{
AvionicsDataCommunicationNetworkEndpoint, AvionicsDataCommunicationNetworkMessageData,
},
integrated_modular_avionics::AvionicsDataCommunicationNetworkEndpoint,
shared::PotentialOrigin,
simulation::{
test::{ReadByName, SimulationTestBed, TestBed, WriteByName},
Aircraft, InitContext, SimulationElement, SimulationElementVisitor, UpdateContext,
},
};
use systems::integrated_modular_avionics::AvionicsDataCommunicationNetworkMessage;
use uom::si::{electric_potential::volt, f64::*};

struct AdcnTestAircraft {
Expand Down Expand Up @@ -617,7 +657,9 @@ mod tests {
&self,
switch_id: u8,
id: &AvionicsDataCommunicationNetworkMessageIdentifier,
message: AvionicsDataCommunicationNetworkMessageData,
message: AvionicsDataCommunicationNetworkMessage<
A380AvionicsDataCommunicationNetworkMessageData,
>,
) {
self.adcn.get_endpoint(switch_id).send_value(id, message);
}
Expand All @@ -626,7 +668,11 @@ mod tests {
&self,
switch_id: u8,
id: &AvionicsDataCommunicationNetworkMessageIdentifier,
) -> Option<AvionicsDataCommunicationNetworkMessageData> {
) -> Option<
AvionicsDataCommunicationNetworkMessage<
A380AvionicsDataCommunicationNetworkMessageData,
>,
> {
self.adcn.get_endpoint(switch_id).recv_value(id)
}
}
Expand Down Expand Up @@ -833,7 +879,8 @@ mod tests {

let mut message_id = Default::default();
test_bed.command(|a| message_id = a.get_message_identifier("test_value".to_owned()));
let message_sent = AvionicsDataCommunicationNetworkMessageData::Str("testval");
let message_sent: AvionicsDataCommunicationNetworkMessage<_> =
A380AvionicsDataCommunicationNetworkMessageData::TestValue("testval").into();
test_bed.command(|a| a.set_elec_powered(true));
test_bed.run();
test_bed.command(|a| a.send_message(1, &message_id, message_sent.clone()));
Expand All @@ -853,7 +900,8 @@ mod tests {

let mut message_id = Default::default();
test_bed.command(|a| message_id = a.get_message_identifier("test_value".to_owned()));
let message_sent = AvionicsDataCommunicationNetworkMessageData::Str("testval");
let message_sent: AvionicsDataCommunicationNetworkMessage<_> =
A380AvionicsDataCommunicationNetworkMessageData::TestValue("testval").into();
test_bed.command(|a| a.set_elec_powered(true));
test_bed.run();
test_bed.command(|a| a.send_message(11, &message_id, message_sent.clone()));
Expand All @@ -873,7 +921,8 @@ mod tests {

let mut message_id = Default::default();
test_bed.command(|a| message_id = a.get_message_identifier("test_value".to_owned()));
let message_sent = AvionicsDataCommunicationNetworkMessageData::Str("testval");
let message_sent: AvionicsDataCommunicationNetworkMessage<_> =
A380AvionicsDataCommunicationNetworkMessageData::TestValue("testval").into();
test_bed.run();
test_bed.command(|a| a.send_message(1, &message_id, message_sent.clone()));
for i in (2..=7).chain(9..=9) {
Expand All @@ -892,7 +941,8 @@ mod tests {

let mut message_id = Default::default();
test_bed.command(|a| message_id = a.get_message_identifier("test_value".to_owned()));
let message_sent = AvionicsDataCommunicationNetworkMessageData::Str("testval");
let message_sent: AvionicsDataCommunicationNetworkMessage<_> =
A380AvionicsDataCommunicationNetworkMessageData::TestValue("testval").into();
test_bed.run();
test_bed.command(|a| a.send_message(11, &message_id, message_sent.clone()));
for i in (1..=7).chain(9..=9) {
Expand All @@ -911,7 +961,8 @@ mod tests {

let mut message_id = Default::default();
test_bed.command(|a| message_id = a.get_message_identifier("test_value".to_owned()));
let message_sent = AvionicsDataCommunicationNetworkMessageData::Str("testval");
let message_sent: AvionicsDataCommunicationNetworkMessage<_> =
A380AvionicsDataCommunicationNetworkMessageData::TestValue("testval").into();
test_bed.command(|a| a.set_elec_powered(true));
test_bed.write_by_name("AFDX_SWITCH_1_FAILURE", true);
test_bed.run();
Expand All @@ -928,8 +979,10 @@ mod tests {

let mut message_id = Default::default();
test_bed.command(|a| message_id = a.get_message_identifier("test_value".to_owned()));
let message1 = AvionicsDataCommunicationNetworkMessageData::Str("message1");
let message2 = AvionicsDataCommunicationNetworkMessageData::Str("message2");
let message1: AvionicsDataCommunicationNetworkMessage<_> =
A380AvionicsDataCommunicationNetworkMessageData::TestValue("message1").into();
let message2: AvionicsDataCommunicationNetworkMessage<_> =
A380AvionicsDataCommunicationNetworkMessageData::TestValue("message2").into();
test_bed.command(|a| a.set_elec_powered(true));
test_bed.write_by_name("AFDX_SWITCH_3_FAILURE", true);
test_bed.write_by_name("AFDX_SWITCH_4_FAILURE", true);
Expand Down
Loading

0 comments on commit 46d2cef

Please sign in to comment.