idk
This commit is contained in:
parent
71a8a249e8
commit
e67835733f
276
src/aocs.rs
276
src/aocs.rs
@ -1,21 +1,24 @@
|
||||
use std::sync::{Arc, Mutex};
|
||||
use crate::action::ActionRequest;
|
||||
use crate::can_ids::{DeviceId, PackageId, PackageModel};
|
||||
use crate::hk::{AOCSSensorData, AocsHousekeeper};
|
||||
use crate::power_handler::{DeviceState, PowerSwitcher};
|
||||
use crate::requests::{Request, RequestWithToken};
|
||||
use satrs_core::power::SwitchId;
|
||||
use std::sync::mpsc::{channel, Receiver, Sender};
|
||||
use std::u32;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use byteorder::{LittleEndian, ByteOrder};
|
||||
use crate::tmtc::TmStore;
|
||||
use byteorder::{ByteOrder, LittleEndian};
|
||||
use num_derive::ToPrimitive;
|
||||
use satrs_core::hk::HkRequest;
|
||||
use satrs_core::mode::ModeRequest;
|
||||
use satrs_core::pool::StoreAddr;
|
||||
use satrs_core::pus::verification::{StdVerifSenderError, TcStateAccepted, TcStateNone, VerificationReporterWithSender, VerificationToken};
|
||||
use satrs_core::power::SwitchId;
|
||||
use satrs_core::pus::verification::{
|
||||
TcStateAccepted, TcStateNone, VerificationReporterWithSender, VerificationToken,
|
||||
};
|
||||
use satrs_core::pus::MpscPusInStoreSendError;
|
||||
use satrs_core::seq_count::SeqCountProviderSyncClonable;
|
||||
use crate::action::ActionRequest;
|
||||
use crate::hk::{AOCSHousekeeper, AOCSSensorData};
|
||||
use crate::tmtc::{TmStore};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::sync::mpsc::{channel, Receiver, Sender};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::u32;
|
||||
|
||||
#[derive(ToPrimitive)]
|
||||
pub enum AOCSSensorMode {
|
||||
@ -53,20 +56,23 @@ pub struct MGMData {
|
||||
}
|
||||
|
||||
impl MGMData {
|
||||
pub fn from_floats(axis_1: f64,
|
||||
axis_2: f64,
|
||||
axis_3: f64,
|
||||
) -> MGMData {
|
||||
MGMData{axis_1, axis_2, axis_3}
|
||||
pub fn from_floats(axis_1: f64, axis_2: f64, axis_3: f64) -> MGMData {
|
||||
MGMData {
|
||||
axis_1,
|
||||
axis_2,
|
||||
axis_3,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new() -> MGMData { MGMData{axis_1: 0.0, axis_2: 0.0, axis_3: 0.0} }
|
||||
pub fn new() -> MGMData {
|
||||
MGMData {
|
||||
axis_1: 0.0,
|
||||
axis_2: 0.0,
|
||||
axis_3: 0.0,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn update(&mut self,
|
||||
axis_1: f64,
|
||||
axis_2: f64,
|
||||
axis_3: f64
|
||||
) {
|
||||
pub fn update(&mut self, axis_1: f64, axis_2: f64, axis_3: f64) {
|
||||
self.axis_1 = axis_1;
|
||||
self.axis_2 = axis_2;
|
||||
self.axis_3 = axis_3;
|
||||
@ -92,25 +98,43 @@ pub struct CSSData {
|
||||
}
|
||||
|
||||
impl CSSData {
|
||||
pub fn from_floats(voltage_1: f64,
|
||||
voltage_2: f64,
|
||||
voltage_3: f64,
|
||||
voltage_4: f64,
|
||||
voltage_5: f64,
|
||||
voltage_6: f64,
|
||||
pub fn from_floats(
|
||||
voltage_1: f64,
|
||||
voltage_2: f64,
|
||||
voltage_3: f64,
|
||||
voltage_4: f64,
|
||||
voltage_5: f64,
|
||||
voltage_6: f64,
|
||||
) -> CSSData {
|
||||
CSSData{voltage_1, voltage_2, voltage_3, voltage_4, voltage_5, voltage_6}
|
||||
CSSData {
|
||||
voltage_1,
|
||||
voltage_2,
|
||||
voltage_3,
|
||||
voltage_4,
|
||||
voltage_5,
|
||||
voltage_6,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new() -> CSSData { CSSData{voltage_1: 0.0, voltage_2: 0.0, voltage_3: 0.0, voltage_4: 0.0, voltage_5: 0.0, voltage_6: 0.0} }
|
||||
pub fn new() -> CSSData {
|
||||
CSSData {
|
||||
voltage_1: 0.0,
|
||||
voltage_2: 0.0,
|
||||
voltage_3: 0.0,
|
||||
voltage_4: 0.0,
|
||||
voltage_5: 0.0,
|
||||
voltage_6: 0.0,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn update(&mut self,
|
||||
voltage_1: f64,
|
||||
voltage_2: f64,
|
||||
voltage_3: f64,
|
||||
voltage_4: f64,
|
||||
voltage_5: f64,
|
||||
voltage_6: f64,
|
||||
pub fn update(
|
||||
&mut self,
|
||||
voltage_1: f64,
|
||||
voltage_2: f64,
|
||||
voltage_3: f64,
|
||||
voltage_4: f64,
|
||||
voltage_5: f64,
|
||||
voltage_6: f64,
|
||||
) {
|
||||
self.voltage_1 = voltage_1;
|
||||
self.voltage_2 = voltage_2;
|
||||
@ -121,11 +145,25 @@ impl CSSData {
|
||||
}
|
||||
|
||||
pub fn to_array(&self) -> [f64; 6] {
|
||||
[self.voltage_1, self.voltage_2, self.voltage_3, self.voltage_4, self.voltage_5, self.voltage_6]
|
||||
[
|
||||
self.voltage_1,
|
||||
self.voltage_2,
|
||||
self.voltage_3,
|
||||
self.voltage_4,
|
||||
self.voltage_5,
|
||||
self.voltage_6,
|
||||
]
|
||||
}
|
||||
|
||||
pub fn to_tuple(&self) -> (f64, f64, f64, f64, f64, f64) {
|
||||
(self.voltage_1, self.voltage_2, self.voltage_3, self.voltage_4, self.voltage_5, self.voltage_6)
|
||||
(
|
||||
self.voltage_1,
|
||||
self.voltage_2,
|
||||
self.voltage_3,
|
||||
self.voltage_4,
|
||||
self.voltage_5,
|
||||
self.voltage_6,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@ -149,7 +187,9 @@ impl AOCSSensorHandler for CSSHandler {
|
||||
}
|
||||
|
||||
fn send_message(&mut self, id: PackageId, buf: &[u8]) -> Result<(), Self::Error> {
|
||||
self.can_tx.send(PackageModel::new(id, buf).unwrap()).unwrap();
|
||||
self.can_tx
|
||||
.send(PackageModel::new(id, buf).unwrap())
|
||||
.unwrap();
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
@ -166,7 +206,17 @@ impl CSSHandler {
|
||||
can_rx: Receiver<PackageModel>,
|
||||
request_rx: Receiver<RequestWithToken>,
|
||||
) -> CSSHandler {
|
||||
CSSHandler{power_switcher, device_id, switch_id, device_state, device_mode, css_data: Arc::new(Mutex::new(CSSData::default())), can_tx, can_rx, request_rx}
|
||||
CSSHandler {
|
||||
power_switcher,
|
||||
device_id,
|
||||
switch_id,
|
||||
device_state,
|
||||
device_mode,
|
||||
css_data: Arc::new(Mutex::new(CSSData::default())),
|
||||
can_tx,
|
||||
can_rx,
|
||||
request_rx,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_data_ref(&mut self) -> Arc<Mutex<CSSData>> {
|
||||
@ -179,37 +229,39 @@ impl CSSHandler {
|
||||
|
||||
fn handle_request_messages(&mut self) {
|
||||
let request = self.request_rx.try_recv().unwrap();
|
||||
let token = request.1;
|
||||
let token = request.1.unwrap();
|
||||
match request.0 {
|
||||
Request::HkRequest(_) => {}
|
||||
Request::ModeRequest(request) => {
|
||||
self.handle_mode_request(request, token);
|
||||
}
|
||||
Request::ActionRequest(request) => {
|
||||
self.handle_action_request(request, token)
|
||||
}
|
||||
Request::ActionRequest(request) => self.handle_action_request(request, token),
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_mode_request(&mut self, request: ModeRequest, token: VerificationToken<TcStateAccepted>) {
|
||||
fn handle_mode_request(
|
||||
&mut self,
|
||||
request: ModeRequest,
|
||||
token: VerificationToken<TcStateAccepted>,
|
||||
) {
|
||||
match request {
|
||||
ModeRequest::SetMode(mode) => {
|
||||
match mode.mode() {
|
||||
0 => {}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
ModeRequest::ReadMode(_) => {}
|
||||
ModeRequest::AnnounceMode(_) => {}
|
||||
ModeRequest::AnnounceModeRecursive(_) => {}
|
||||
ModeRequest::SetMode(mode) => match mode.mode() {
|
||||
0 => {}
|
||||
_ => {}
|
||||
},
|
||||
ModeRequest::ReadMode => {}
|
||||
ModeRequest::AnnounceMode => {}
|
||||
ModeRequest::AnnounceModeRecursive => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_action_request(&mut self, request: ActionRequest, token: VerificationToken<TcStateAccepted>) {
|
||||
fn handle_action_request(
|
||||
&mut self,
|
||||
request: ActionRequest,
|
||||
token: VerificationToken<TcStateAccepted>,
|
||||
) {
|
||||
match request {
|
||||
ActionRequest::ImageRequest(target_id) => {
|
||||
|
||||
}
|
||||
ActionRequest::ImageRequest(target_id) => {}
|
||||
ActionRequest::OrientationRequest(_) => {}
|
||||
ActionRequest::PointingRequest(_) => {}
|
||||
}
|
||||
@ -236,7 +288,9 @@ impl AOCSSensorHandler for MGMHandler {
|
||||
}
|
||||
|
||||
fn send_message(&mut self, id: PackageId, buf: &[u8]) -> Result<(), Self::Error> {
|
||||
self.can_tx.send(PackageModel::new(id, buf).unwrap()).unwrap();
|
||||
self.can_tx
|
||||
.send(PackageModel::new(id, buf).unwrap())
|
||||
.unwrap();
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
@ -273,8 +327,7 @@ impl MGMHandler {
|
||||
self.read_sensor_data();
|
||||
}
|
||||
|
||||
pub fn update_mode(&mut self) {
|
||||
}
|
||||
pub fn update_mode(&mut self) {}
|
||||
|
||||
pub fn handle_requests(&mut self) {
|
||||
if self.device_state == DeviceState::On {
|
||||
@ -295,11 +348,11 @@ impl MGMHandler {
|
||||
}
|
||||
|
||||
pub fn handle_mode_request(&mut self, mode_request: ModeRequest) {
|
||||
match mode_request{
|
||||
match mode_request {
|
||||
ModeRequest::SetMode(_) => {}
|
||||
ModeRequest::ReadMode(_) => {}
|
||||
ModeRequest::AnnounceMode(_) => {}
|
||||
ModeRequest::AnnounceModeRecursive(_) => {}
|
||||
ModeRequest::ReadMode => {}
|
||||
ModeRequest::AnnounceMode => {}
|
||||
ModeRequest::AnnounceModeRecursive => {}
|
||||
}
|
||||
}
|
||||
|
||||
@ -332,13 +385,12 @@ impl MGMHandler {
|
||||
let float_data = self.decode_sensor_data(package.data());
|
||||
if let Ok(mut mgm_data) = self.mgm_data.lock() {
|
||||
match package.package_id() {
|
||||
PackageId::AOCSDataMGM1 => { mgm_data.axis_1 = float_data }
|
||||
PackageId::AOCSDataMGM2 => { mgm_data.axis_2 = float_data }
|
||||
PackageId::AOCSDataMGM3 => { mgm_data.axis_3 = float_data }
|
||||
PackageId::AOCSDataMGM1 => mgm_data.axis_1 = float_data,
|
||||
PackageId::AOCSDataMGM2 => mgm_data.axis_2 = float_data,
|
||||
PackageId::AOCSDataMGM3 => mgm_data.axis_3 = float_data,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -349,93 +401,11 @@ impl MGMHandler {
|
||||
}
|
||||
|
||||
pub struct AOCSController {
|
||||
aocs_housekeeper: AOCSHousekeeper,
|
||||
aocs_housekeeper: AocsHousekeeper,
|
||||
mgm_handler: MGMHandler,
|
||||
request_rx: Receiver<RequestWithToken>,
|
||||
hk_request_tx: Sender<RequestWithToken>,
|
||||
mgm_request_tx: Sender<RequestWithToken>,
|
||||
}
|
||||
|
||||
impl AOCSController {
|
||||
pub fn new(
|
||||
sensor_data_pool: Arc<Mutex<AOCSSensorData>>,
|
||||
seq_count_provider: SeqCountProviderSyncClonable,
|
||||
aocs_can_receiver_rx: Receiver<PackageModel>,
|
||||
aocs_can_sender_tx: Sender<PackageModel>,
|
||||
mgm_can_receiver_rx: Receiver<PackageModel>,
|
||||
aocs_tm_store: TmStore,
|
||||
aocs_tm_funnel_tx: Sender<StoreAddr>,
|
||||
verif_reporter: VerificationReporterWithSender<StdVerifSenderError>,
|
||||
power_switcher: PowerSwitcher,
|
||||
aocs_request_rx: Receiver<RequestWithToken>,
|
||||
) -> AOCSController {
|
||||
let mgm_can_sender_tx = aocs_can_sender_tx.clone();
|
||||
|
||||
let (mgm_request_tx, mgm_request_rx) = channel();
|
||||
let (hk_request_tx, hk_request_rx) = channel();
|
||||
|
||||
let aocs_housekeeper = AOCSHousekeeper::new(sensor_data_pool, hk_request_rx, seq_count_provider, aocs_tm_store, aocs_tm_funnel_tx, verif_reporter);
|
||||
|
||||
let mgm_handler = MGMHandler::new(power_switcher, DeviceId::MGM1, mgm_can_sender_tx, mgm_can_receiver_rx, mgm_request_rx);
|
||||
|
||||
AOCSController{aocs_housekeeper, mgm_handler, request_rx: aocs_request_rx, hk_request_tx, mgm_request_tx}
|
||||
}
|
||||
|
||||
pub fn periodic_op(&mut self) {
|
||||
self.update_sensors();
|
||||
self.process_requests();
|
||||
}
|
||||
|
||||
pub fn process_requests(&mut self) {
|
||||
if let Ok(request) = self.request_rx.try_recv() {
|
||||
match request.0 {
|
||||
Request::HkRequest(hk_request) => {
|
||||
self.handle_hk_request(hk_request);
|
||||
}
|
||||
Request::ModeRequest(mode_request) => {
|
||||
self.handle_mode_request(mode_request);
|
||||
}
|
||||
Request::ActionRequest(_) => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn handle_hk_request(&mut self, request: HkRequest) {
|
||||
match request {
|
||||
HkRequest::OneShot(id) => {
|
||||
self.aocs_housekeeper.one_shot_hk(id);
|
||||
}
|
||||
HkRequest::Enable(id) => {
|
||||
self.aocs_housekeeper.enable_hk(id);
|
||||
}
|
||||
HkRequest::Disable(id) => {
|
||||
self.aocs_housekeeper.disable_hk(id);
|
||||
}
|
||||
HkRequest::ModifyCollectionInterval(_, _) => {}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn handle_mode_request(&mut self, mode_request: ModeRequest) {
|
||||
match mode_request {
|
||||
ModeRequest::SetMode(mode_command) => {
|
||||
// if let mode_command.target_id
|
||||
match mode_command.mode() {
|
||||
0 => self.set_mode_off(),
|
||||
1 => self.set_mode_on(),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
ModeRequest::ReadMode(_) => {}
|
||||
ModeRequest::AnnounceMode(_) => {}
|
||||
ModeRequest::AnnounceModeRecursive(_) => {}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_mode_off(&mut self) {}
|
||||
|
||||
pub fn set_mode_on(&mut self) {}
|
||||
|
||||
pub fn update_sensors(&mut self) {
|
||||
self.mgm_handler.periodic_op();
|
||||
}
|
||||
}
|
||||
pub fn core_aocs_loop() {}
|
||||
|
20
src/can.rs
20
src/can.rs
@ -1,6 +1,6 @@
|
||||
use crate::can_ids::{
|
||||
can_id_to_package_id, package_id_to_can_id, DeviceId, PackageId,
|
||||
PackageModel, SenderReceiverThread, ThreadId,
|
||||
can_id_to_package_id, package_id_to_can_id, DeviceId, PackageId, PackageModel,
|
||||
SenderReceiverApid, SenderReceiverThread, ThreadId,
|
||||
};
|
||||
use embedded_can::{self, Frame};
|
||||
use log::{debug, warn};
|
||||
@ -13,9 +13,9 @@ pub struct CanRxHandler {
|
||||
interface: &'static str,
|
||||
socket: socket::CanSocket,
|
||||
//frame_id_to_sender_id: HashMap<embedded_can::Id, u32>, // double hash map: frame id -> receiver id -> sender handle
|
||||
can_senders: HashMap<ThreadId, Sender<PackageModel>>,
|
||||
can_senders: HashMap<u16, Sender<PackageModel>>,
|
||||
//dismissed_ids: Vec<embedded_can::Id>,
|
||||
package_map: HashMap<PackageId, SenderReceiverThread>,
|
||||
package_map: HashMap<PackageId, SenderReceiverApid>,
|
||||
//packet_id_to_sender_id: HashMap<PackageId, ThreadId>,
|
||||
}
|
||||
|
||||
@ -23,8 +23,8 @@ impl CanRxHandler {
|
||||
pub fn new_socket(
|
||||
interface: &'static str,
|
||||
//frame_id_to_sender_id: HashMap<embedded_can::Id, u32>,
|
||||
can_senders: HashMap<ThreadId, Sender<PackageModel>>,
|
||||
package_map: HashMap<PackageId, SenderReceiverThread>,
|
||||
can_senders: HashMap<u16, Sender<PackageModel>>,
|
||||
package_map: HashMap<PackageId, SenderReceiverApid>,
|
||||
) -> Result<CanRxHandler, ()> {
|
||||
let socket = socket::CanSocket::open(&interface);
|
||||
if let Ok(socket) = socket {
|
||||
@ -66,13 +66,13 @@ impl CanRxHandler {
|
||||
if self.package_map.contains_key(&frame_id) {
|
||||
let value = self.package_map.get(&frame_id).unwrap();
|
||||
if value.get_sender() != DeviceId::OBC {
|
||||
let message_sender = self.can_senders.get(&value.get_thread()).unwrap();
|
||||
let message_sender = self.can_senders.get(&value.get_apid()).unwrap();
|
||||
let data = frame.data();
|
||||
let message =
|
||||
PackageModel::new(frame_id, data).expect("Error generating message.");
|
||||
message_sender.send(message).expect(&*format!(
|
||||
"Failure sending can bus frame to thread{:?}, frame id {:?}",
|
||||
value.get_thread(),
|
||||
value.get_apid(),
|
||||
frame_id
|
||||
));
|
||||
}
|
||||
@ -84,14 +84,14 @@ impl CanRxHandler {
|
||||
pub struct CanTxHandler {
|
||||
interface: &'static str,
|
||||
socket: socket::CanSocket,
|
||||
package_map: HashMap<PackageId, SenderReceiverThread>,
|
||||
package_map: HashMap<PackageId, SenderReceiverApid>,
|
||||
message_receiver: Receiver<PackageModel>,
|
||||
}
|
||||
|
||||
impl CanTxHandler {
|
||||
pub fn new_socket(
|
||||
interface: &'static str,
|
||||
package_map: HashMap<PackageId, SenderReceiverThread>,
|
||||
package_map: HashMap<PackageId, SenderReceiverApid>,
|
||||
message_receiver: Receiver<PackageModel>,
|
||||
) -> Result<CanTxHandler, ()> {
|
||||
let socket = socket::CanSocket::open(&interface);
|
||||
|
@ -2,6 +2,7 @@ use embedded_can::{Id, StandardId};
|
||||
use log::warn;
|
||||
use std::collections::HashMap;
|
||||
|
||||
use crate::tmtc::{CSS_APID, MGM_APID, MGT_APID, PLD_APID, PWR_APID, RWL_APID, STR_APID};
|
||||
pub use num_derive::{FromPrimitive, ToPrimitive};
|
||||
pub use num_traits::{FromPrimitive, ToPrimitive};
|
||||
pub use strum::IntoEnumIterator; // 0.17.1
|
||||
@ -154,6 +155,7 @@ impl PackageModel {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO delete!!
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct SenderReceiverThread {
|
||||
sender: DeviceId,
|
||||
@ -181,7 +183,7 @@ impl SenderReceiverThread {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn load_package_ids() -> HashMap<PackageId, SenderReceiverThread> {
|
||||
pub fn load_package_id_to_threads() -> HashMap<PackageId, SenderReceiverThread> {
|
||||
let mut package_map: HashMap<PackageId, SenderReceiverThread> = HashMap::new();
|
||||
|
||||
let properties = vec![
|
||||
@ -244,6 +246,96 @@ pub fn load_package_ids() -> HashMap<PackageId, SenderReceiverThread> {
|
||||
return package_map;
|
||||
}
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct SenderReceiverApid {
|
||||
sender: DeviceId,
|
||||
receiver: DeviceId,
|
||||
apid: u16,
|
||||
}
|
||||
|
||||
impl SenderReceiverApid {
|
||||
pub fn new(sender: DeviceId, receiver: DeviceId, apid: u16) -> Self {
|
||||
Self {
|
||||
sender,
|
||||
receiver,
|
||||
apid,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_sender(&self) -> DeviceId {
|
||||
self.sender
|
||||
}
|
||||
pub fn get_receiver(&self) -> DeviceId {
|
||||
self.receiver
|
||||
}
|
||||
pub fn get_apid(&self) -> u16 {
|
||||
self.apid
|
||||
}
|
||||
}
|
||||
|
||||
pub fn load_package_id_to_apids() -> HashMap<PackageId, SenderReceiverApid> {
|
||||
let mut package_map: HashMap<PackageId, SenderReceiverApid> = HashMap::new();
|
||||
|
||||
let properties = vec![
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::PCDU, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::PCDU, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::PCDU, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::PCDU, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::PCDU, DeviceId::OBC, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::PCDU, DeviceId::OBC, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::PCDU, DeviceId::OBC, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::PCDU, DeviceId::OBC, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::PCDU, DeviceId::OBC, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::PCDU, DeviceId::OBC, PWR_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::MGT1, MGT_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::MGT2, MGT_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::MGT3, MGT_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::MGT4, MGT_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::RWL1, RWL_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::RWL2, RWL_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::RWL3, RWL_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::RWL4, RWL_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::MGM1, MGM_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::MGM2, MGM_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::MGM3, MGM_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::MGM4, MGM_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::SunSensor1, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::SunSensor2, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::SunSensor3, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::SunSensor4, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::SunSensor5, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::SunSensor6, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::StarTracker, STR_APID),
|
||||
SenderReceiverApid::new(DeviceId::MGM1, DeviceId::OBC, MGM_APID),
|
||||
SenderReceiverApid::new(DeviceId::MGM2, DeviceId::OBC, MGM_APID),
|
||||
SenderReceiverApid::new(DeviceId::MGM3, DeviceId::OBC, MGM_APID),
|
||||
SenderReceiverApid::new(DeviceId::MGM4, DeviceId::OBC, MGM_APID),
|
||||
SenderReceiverApid::new(DeviceId::SunSensor1, DeviceId::OBC, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::SunSensor2, DeviceId::OBC, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::SunSensor3, DeviceId::OBC, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::SunSensor4, DeviceId::OBC, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::SunSensor5, DeviceId::OBC, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::SunSensor6, DeviceId::OBC, CSS_APID),
|
||||
SenderReceiverApid::new(DeviceId::StarTracker, DeviceId::OBC, STR_APID),
|
||||
SenderReceiverApid::new(DeviceId::StarTracker, DeviceId::OBC, STR_APID),
|
||||
SenderReceiverApid::new(DeviceId::StarTracker, DeviceId::OBC, STR_APID),
|
||||
SenderReceiverApid::new(DeviceId::StarTracker, DeviceId::OBC, STR_APID),
|
||||
SenderReceiverApid::new(DeviceId::OBC, DeviceId::Camera, PLD_APID),
|
||||
SenderReceiverApid::new(DeviceId::Camera, DeviceId::OBC, PLD_APID),
|
||||
SenderReceiverApid::new(DeviceId::Camera, DeviceId::OBC, PLD_APID),
|
||||
SenderReceiverApid::new(DeviceId::Camera, DeviceId::OBC, PLD_APID),
|
||||
];
|
||||
|
||||
let mut i = 0;
|
||||
for id in PackageId::iter() {
|
||||
let value = properties.get(i).unwrap();
|
||||
package_map.insert(id, *value);
|
||||
i += 1;
|
||||
}
|
||||
|
||||
return package_map;
|
||||
}
|
||||
|
||||
/*
|
||||
pub fn load_device_ids() {
|
||||
let mut package_map: HashMap<DeviceId, DeviceProperties> = HashMap::new();
|
||||
|
20
src/ccsds.rs
20
src/ccsds.rs
@ -1,5 +1,8 @@
|
||||
use crate::tmtc::{
|
||||
MpscStoreAndSendError, PusTcSource, AOCS_APID, AOCS_HK_APID, CSS_APID, MGM_APID, MGT_APID,
|
||||
PLD_APID, PUS_APID, PWR_APID, RWL_APID, STR_APID,
|
||||
};
|
||||
use log::warn;
|
||||
use crate::tmtc::{MpscStoreAndSendError, PusTcSource, PUS_APID};
|
||||
use satrs_core::spacepackets::{CcsdsPacket, SpHeader};
|
||||
use satrs_core::tmtc::{CcsdsPacketHandler, ReceivesCcsdsTc};
|
||||
|
||||
@ -11,7 +14,18 @@ impl CcsdsPacketHandler for CcsdsReceiver {
|
||||
type Error = MpscStoreAndSendError;
|
||||
|
||||
fn valid_apids(&self) -> &'static [u16] {
|
||||
&[PUS_APID]
|
||||
&[
|
||||
PUS_APID,
|
||||
PLD_APID,
|
||||
PWR_APID,
|
||||
AOCS_APID,
|
||||
AOCS_HK_APID,
|
||||
MGM_APID,
|
||||
CSS_APID,
|
||||
STR_APID,
|
||||
MGT_APID,
|
||||
RWL_APID,
|
||||
]
|
||||
}
|
||||
|
||||
fn handle_known_apid(
|
||||
@ -21,6 +35,8 @@ impl CcsdsPacketHandler for CcsdsReceiver {
|
||||
) -> Result<(), Self::Error> {
|
||||
if sp_header.apid() == PUS_APID {
|
||||
return self.tc_source.pass_ccsds(sp_header, tc_raw);
|
||||
} else {
|
||||
return self.tc_source.pass_ccsds(sp_header, tc_raw);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
233
src/hk.rs
233
src/hk.rs
@ -1,13 +1,19 @@
|
||||
use std::collections::HashMap;
|
||||
use strum::IntoEnumIterator;
|
||||
|
||||
use crate::aocs::{CSSData, MGMData};
|
||||
use crate::hk::AocsDataType::float_value;
|
||||
use crate::requests::Request;
|
||||
use crate::requests::RequestWithToken;
|
||||
use crate::tmtc::TmStore;
|
||||
use eurosim_obsw::{hk_err};
|
||||
use crate::tmtc::{TmStore, AOCS_HK_APID};
|
||||
use byteorder::{ByteOrder, LittleEndian};
|
||||
use eurosim_obsw::hk_err;
|
||||
use num_enum::FromPrimitive;
|
||||
use satrs_core::hk::{HkRequest, UniqueId};
|
||||
use satrs_core::pool::StoreAddr;
|
||||
use satrs_core::pus::hk::Subservice;
|
||||
use satrs_core::pus::verification::{
|
||||
FailParams, StdVerifSenderError, VerificationReporterWithSender,
|
||||
};
|
||||
use satrs_core::pus::verification::{FailParams, VerificationReporterWithSender};
|
||||
use satrs_core::pus::MpscPusInStoreSendError;
|
||||
use satrs_core::seq_count::{SeqCountProviderSyncClonable, SequenceCountProviderCore};
|
||||
use satrs_core::spacepackets::time::cds::TimeProvider;
|
||||
use satrs_core::spacepackets::time::TimeWriter;
|
||||
@ -15,24 +21,82 @@ use satrs_core::spacepackets::tm::{PusTm, PusTmSecondaryHeader};
|
||||
use satrs_core::spacepackets::SpHeader;
|
||||
use satrs_core::tmtc::AddressableId;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::ops::{Deref};
|
||||
use std::ops::Deref;
|
||||
use std::sync::mpsc::{Receiver, Sender};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use satrs_core::hk::HkRequest;
|
||||
use strum_macros::EnumIter;
|
||||
|
||||
pub type CollectionIntervalFactor = u32;
|
||||
|
||||
pub const MGM_VOLTAGE_1: UniqueId = 1;
|
||||
pub const MGM_VOLTAGE_2: UniqueId = 2;
|
||||
pub const MGM_VOLTAGE_3: UniqueId = 3;
|
||||
pub const CSS_VOLTAGE_1: UniqueId = 4;
|
||||
pub const CSS_VOLTAGE_2: UniqueId = 5;
|
||||
pub const CSS_VOLTAGE_3: UniqueId = 6;
|
||||
pub const CSS_VOLTAGE_4: UniqueId = 7;
|
||||
pub const CSS_VOLTAGE_5: UniqueId = 8;
|
||||
pub const CSS_VOLTAGE_6: UniqueId = 9;
|
||||
pub const STR_QUATERNION_1: UniqueId = 10;
|
||||
pub const STR_QUATERNION_2: UniqueId = 11;
|
||||
pub const STR_QUATERNION_3: UniqueId = 12;
|
||||
pub const STR_QUATERNION_4: UniqueId = 13;
|
||||
|
||||
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
||||
pub enum AocsHkIds {
|
||||
TestAocsSet = 1,
|
||||
TestMgmSet = 2,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct AocsDataMap {
|
||||
map: HashMap<UniqueId, AocsDataType>,
|
||||
}
|
||||
|
||||
impl AocsDataMap {
|
||||
pub fn new() -> Self {
|
||||
let mut data_map = HashMap::new();
|
||||
|
||||
data_map.insert(MGM_VOLTAGE_1, float_value(0.0));
|
||||
data_map.insert(MGM_VOLTAGE_2, float_value(0.0));
|
||||
data_map.insert(MGM_VOLTAGE_3, float_value(0.0));
|
||||
data_map.insert(CSS_VOLTAGE_1, float_value(0.0));
|
||||
data_map.insert(CSS_VOLTAGE_2, float_value(0.0));
|
||||
data_map.insert(CSS_VOLTAGE_3, float_value(0.0));
|
||||
data_map.insert(CSS_VOLTAGE_4, float_value(0.0));
|
||||
data_map.insert(CSS_VOLTAGE_5, float_value(0.0));
|
||||
data_map.insert(CSS_VOLTAGE_6, float_value(0.0));
|
||||
data_map.insert(STR_QUATERNION_1, float_value(0.0));
|
||||
data_map.insert(STR_QUATERNION_2, float_value(0.0));
|
||||
data_map.insert(STR_QUATERNION_3, float_value(0.0));
|
||||
data_map.insert(STR_QUATERNION_4, float_value(0.0));
|
||||
|
||||
Self { map: data_map }
|
||||
}
|
||||
|
||||
pub fn update_value(&mut self, id: UniqueId, val: AocsDataType) -> Result<(), ()> {
|
||||
if self.map.contains_key(&id) {
|
||||
self.map.insert(id, val);
|
||||
return Ok(());
|
||||
}
|
||||
Err(())
|
||||
}
|
||||
|
||||
pub fn get_value(&self, id: UniqueId) -> Option<&AocsDataType> {
|
||||
self.map.get(&id)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, EnumIter, PartialEq, Copy, Clone)]
|
||||
pub enum AocsDataType {
|
||||
float_value(f64),
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct AOCSSensorData {
|
||||
mgm_data: MGMData, // Voltage for 3 axis
|
||||
css_data: CSSData, // Voltage for 18 sun sensors
|
||||
str_data: [f64; 4], // Quaternion for position of satellite
|
||||
css_data: CSSData, // Voltage for 18 sun sensors
|
||||
str_data: [f64; 4], // Quaternion for position of satellite
|
||||
}
|
||||
|
||||
impl AOCSSensorData {
|
||||
@ -74,35 +138,51 @@ impl AOCSSensorData {
|
||||
}
|
||||
}
|
||||
|
||||
pub struct AOCSHousekeeper {
|
||||
sensor_data_pool: Arc<Mutex<AOCSSensorData>>,
|
||||
pub struct AocsHousekeeper {
|
||||
data_map: Arc<Mutex<AocsDataMap>>,
|
||||
id_list: Vec<UniqueId>,
|
||||
request_rx: Receiver<RequestWithToken>,
|
||||
seq_count_provider: SeqCountProviderSyncClonable,
|
||||
aocs_tm_store: TmStore,
|
||||
aocs_tm_funnel_tx: Sender<StoreAddr>,
|
||||
verif_reporter: VerificationReporterWithSender<StdVerifSenderError>,
|
||||
periodic_hk_enabled: bool,
|
||||
periodic_hk_id: Option<AddressableId>,
|
||||
verif_reporter: VerificationReporterWithSender<MpscPusInStoreSendError>,
|
||||
periodic_hk_ids: Option<Vec<UniqueId>>,
|
||||
}
|
||||
|
||||
impl AOCSHousekeeper {
|
||||
impl AocsHousekeeper {
|
||||
pub fn new(
|
||||
sensor_data_pool: Arc<Mutex<AOCSSensorData>>,
|
||||
sensor_data_pool: Arc<Mutex<AocsDataMap>>,
|
||||
request_rx: Receiver<RequestWithToken>,
|
||||
seq_count_provider: SeqCountProviderSyncClonable,
|
||||
aocs_tm_store: TmStore,
|
||||
aocs_tm_funnel_tx: Sender<StoreAddr>,
|
||||
verif_reporter: VerificationReporterWithSender<StdVerifSenderError>,
|
||||
) -> AOCSHousekeeper {
|
||||
AOCSHousekeeper {
|
||||
sensor_data_pool,
|
||||
verif_reporter: VerificationReporterWithSender<MpscPusInStoreSendError>,
|
||||
) -> AocsHousekeeper {
|
||||
let id_list = vec![
|
||||
MGM_VOLTAGE_1,
|
||||
MGM_VOLTAGE_2,
|
||||
MGM_VOLTAGE_3,
|
||||
CSS_VOLTAGE_1,
|
||||
CSS_VOLTAGE_2,
|
||||
CSS_VOLTAGE_3,
|
||||
CSS_VOLTAGE_4,
|
||||
CSS_VOLTAGE_5,
|
||||
CSS_VOLTAGE_6,
|
||||
STR_QUATERNION_1,
|
||||
STR_QUATERNION_2,
|
||||
STR_QUATERNION_3,
|
||||
STR_QUATERNION_4,
|
||||
];
|
||||
|
||||
AocsHousekeeper {
|
||||
data_map: sensor_data_pool,
|
||||
id_list,
|
||||
request_rx,
|
||||
seq_count_provider,
|
||||
aocs_tm_store,
|
||||
aocs_tm_funnel_tx,
|
||||
verif_reporter,
|
||||
periodic_hk_enabled: false,
|
||||
periodic_hk_id: None,
|
||||
periodic_hk_ids: None,
|
||||
}
|
||||
}
|
||||
|
||||
@ -115,7 +195,7 @@ impl AOCSHousekeeper {
|
||||
cds_stamp.write_to_bytes(&mut time_stamp_buf).unwrap();
|
||||
let start_token = self //implement this for verification
|
||||
.verif_reporter
|
||||
.start_success(request_with_token.1, Some(&time_stamp_buf))
|
||||
.start_success(request_with_token.1.unwrap(), Some(&time_stamp_buf))
|
||||
.expect("Error sending start success");
|
||||
if let Ok(()) = match hk_req {
|
||||
HkRequest::OneShot(id) => self.one_shot_hk(id),
|
||||
@ -147,38 +227,84 @@ impl AOCSHousekeeper {
|
||||
}
|
||||
|
||||
pub fn periodic_hk(&mut self) {
|
||||
if self.periodic_hk_enabled {
|
||||
let json_string = self.aocs_data_to_str();
|
||||
if let Some(id) = self.periodic_hk_id {
|
||||
self.send_hk_packet(id, &json_string);
|
||||
//let json_string = self.aocs_data_to_str();
|
||||
let data = self.data_map.lock().unwrap();
|
||||
let data_copy = data.clone();
|
||||
drop(data);
|
||||
let mut buf: [u8; 8] = [0; 8];
|
||||
if let Some(ids) = &self.periodic_hk_ids {
|
||||
for id in ids.clone() {
|
||||
if let Some(float_value(field)) = data_copy.get_value(id) {
|
||||
let data_str = LittleEndian::write_f64(&mut buf, *field);
|
||||
&self.send_hk_packet(id, &buf);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn one_shot_hk(&mut self, id: AddressableId) -> Result<(), ()> {
|
||||
let json_string = self.aocs_data_to_str();
|
||||
self.send_hk_packet(id, &json_string);
|
||||
pub fn one_shot_hk(&mut self, id: UniqueId) -> Result<(), ()> {
|
||||
let data = self.data_map.lock().unwrap();
|
||||
let data_copy = data.clone();
|
||||
drop(data);
|
||||
let mut buf: [u8; 8] = [0; 8];
|
||||
if let Some(float_value(field)) = data_copy.get_value(id) {
|
||||
let data_str = LittleEndian::write_f64(&mut buf, *field);
|
||||
self.send_hk_packet(id, &buf);
|
||||
return Ok(());
|
||||
}
|
||||
Err(())
|
||||
}
|
||||
|
||||
pub fn enable_hk(&mut self, id: UniqueId) -> Result<(), ()> {
|
||||
if !self.id_list.contains(&id) {
|
||||
return Err(());
|
||||
}
|
||||
|
||||
let periodic_hk_ids = self.periodic_hk_ids.clone();
|
||||
match periodic_hk_ids {
|
||||
None => self.periodic_hk_ids = Some(vec![id]),
|
||||
Some(mut ids) => {
|
||||
ids.push(id);
|
||||
self.periodic_hk_ids = Some(ids);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn enable_hk(&mut self, id: AddressableId) -> Result<(), ()> {
|
||||
self.periodic_hk_enabled = true;
|
||||
self.periodic_hk_id = Some(id);
|
||||
return Ok(())
|
||||
}
|
||||
|
||||
pub fn disable_hk(&mut self, _id: AddressableId) -> Result<(), ()> {
|
||||
self.periodic_hk_enabled = false;
|
||||
self.periodic_hk_id = None;
|
||||
return Ok(())
|
||||
pub fn disable_hk(&mut self, id: UniqueId) -> Result<(), ()> {
|
||||
if !self.id_list.contains(&id) {
|
||||
return Err(());
|
||||
}
|
||||
|
||||
let periodic_hk_ids = self.periodic_hk_ids.clone();
|
||||
match periodic_hk_ids {
|
||||
None => return Err(()),
|
||||
Some(mut ids) => {
|
||||
if !ids.contains(&id) {
|
||||
return Err(());
|
||||
}
|
||||
// .unwrap is allowed, since existence check is performed
|
||||
let index = ids.iter().position(|x| *x == id).unwrap();
|
||||
ids.remove(index);
|
||||
if ids.len() < 1 {
|
||||
self.periodic_hk_ids = None;
|
||||
} else {
|
||||
self.periodic_hk_ids = Some(ids);
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/*
|
||||
pub fn aocs_data_to_str(&mut self) -> String {
|
||||
let pool = self.sensor_data_pool.lock().unwrap();
|
||||
let pool = self.data_map.lock().unwrap();
|
||||
serde_json::to_string(pool.deref()).unwrap()
|
||||
}
|
||||
|
||||
pub fn send_hk_packet(&mut self, id: AddressableId, data: &str) {
|
||||
*/
|
||||
|
||||
pub fn send_hk_packet_from_str(&mut self, id: UniqueId, data: &str) {
|
||||
let mut time_stamp_buf: [u8; 7] = [0; 7];
|
||||
let mut huge_buf: [u8; 8192] = [0; 8192];
|
||||
|
||||
@ -186,7 +312,8 @@ impl AOCSHousekeeper {
|
||||
SpHeader::tm_unseg(0x02, self.seq_count_provider.get_and_increment(), 0).unwrap();
|
||||
let cds_stamp = TimeProvider::from_now_with_u16_days().unwrap();
|
||||
cds_stamp.write_to_bytes(&mut time_stamp_buf).unwrap();
|
||||
let mut len = id.write_to_be_bytes(&mut huge_buf).unwrap();
|
||||
huge_buf[0..4].copy_from_slice(&id.to_be_bytes());
|
||||
let mut len = 4;
|
||||
huge_buf[8..data.len() + 8].copy_from_slice(data.as_bytes());
|
||||
len += data.len();
|
||||
let tm_sec_header =
|
||||
@ -195,4 +322,24 @@ impl AOCSHousekeeper {
|
||||
let addr = self.aocs_tm_store.add_pus_tm(&hk_tm);
|
||||
self.aocs_tm_funnel_tx.send(addr).expect("sending failed");
|
||||
}
|
||||
|
||||
pub fn send_hk_packet(&mut self, id: UniqueId, data: &[u8]) {
|
||||
let mut time_stamp_buf: [u8; 7] = [0; 7];
|
||||
let mut huge_buf: [u8; 8192] = [0; 8192];
|
||||
|
||||
let mut sp_header =
|
||||
SpHeader::tm_unseg(AOCS_HK_APID, self.seq_count_provider.get_and_increment(), 0)
|
||||
.unwrap();
|
||||
let cds_stamp = TimeProvider::from_now_with_u16_days().unwrap();
|
||||
cds_stamp.write_to_bytes(&mut time_stamp_buf).unwrap();
|
||||
huge_buf[0..4].copy_from_slice(&id.to_be_bytes());
|
||||
let mut len = 4;
|
||||
huge_buf[8..data.len() + 8].copy_from_slice(data);
|
||||
len += data.len();
|
||||
let tm_sec_header =
|
||||
PusTmSecondaryHeader::new_simple(3, Subservice::TmHkPacket as u8, &time_stamp_buf);
|
||||
let hk_tm = PusTm::new(&mut sp_header, tm_sec_header, Some(&huge_buf[0..len]), true);
|
||||
let addr = self.aocs_tm_store.add_pus_tm(&hk_tm);
|
||||
self.aocs_tm_funnel_tx.send(addr).expect("sending failed");
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
use std::net::Ipv4Addr;
|
||||
use num_enum::{IntoPrimitive, TryFromPrimitive};
|
||||
use satrs_core::events::{EventU32TypedSev, SeverityInfo};
|
||||
use std::net::Ipv4Addr;
|
||||
|
||||
use satrs_mib::res_code::{ResultU16, ResultU16Info};
|
||||
use satrs_mib::resultcode;
|
||||
@ -41,7 +41,7 @@ pub mod tmtc_err {
|
||||
pub const PUS_SERVICE_NOT_IMPLEMENTED: ResultU16 = ResultU16::const_new(GroupId::Tmtc as u8, 2);
|
||||
|
||||
#[resultcode(
|
||||
info = "Not enough data inside the TC application data field. Optionally includes: \
|
||||
info = "Not enough data inside the TC application data field. Optionally includes: \
|
||||
8 bytes of failure data containing 2 failure parameters, \
|
||||
P1 (u32 big endian): Expected data length, P2: Found data length"
|
||||
)]
|
||||
|
155
src/main.rs
155
src/main.rs
@ -11,16 +11,17 @@ mod can_ids;
|
||||
mod ccsds;
|
||||
mod hk;
|
||||
mod logger;
|
||||
mod messages;
|
||||
mod pld_handler;
|
||||
mod power_handler;
|
||||
mod pus;
|
||||
mod requests;
|
||||
mod tmtc;
|
||||
mod messages;
|
||||
|
||||
use crate::requests::{RequestWithToken};
|
||||
use crate::requests::RequestWithToken;
|
||||
use crate::tmtc::{
|
||||
core_tmtc_task, OtherArgs, PusTcSource, TcArgs, TcStore, TmArgs, TmFunnel, TmStore, PUS_APID,
|
||||
core_tmtc_task, OtherArgs, PusTcSource, TcArgs, TcStore, TmArgs, TmFunnel, TmStore, AOCS_APID,
|
||||
AOCS_HK_APID, CSS_APID, MGM_APID, MGT_APID, PLD_APID, PUS_APID, PWR_APID, RWL_APID, STR_APID,
|
||||
};
|
||||
use eurosim_obsw::{RequestTargetId, OBSW_SERVER_ADDR, SERVER_PORT};
|
||||
use satrs_core::event_man::{
|
||||
@ -36,13 +37,13 @@ use satrs_core::pus::verification::{
|
||||
};
|
||||
use satrs_core::pus::{EcssTmErrorWithSend, EcssTmSenderCore};
|
||||
use satrs_core::seq_count::SeqCountProviderSyncClonable;
|
||||
use satrs_core::{spacepackets::tm::PusTm};
|
||||
use satrs_core::spacepackets::tm::PusTm;
|
||||
use strum::IntoEnumIterator;
|
||||
|
||||
use crate::can_ids::{
|
||||
load_package_ids, DeviceId, PackageModel, ThreadId,
|
||||
load_package_id_to_apids, load_package_id_to_threads, DeviceId, PackageModel, ThreadId,
|
||||
};
|
||||
use log::{info};
|
||||
use log::info;
|
||||
use satrs_core::power::{SwitchId, SwitchState};
|
||||
use std::collections::HashMap;
|
||||
use std::net::{IpAddr, SocketAddr};
|
||||
@ -50,39 +51,13 @@ use std::sync::mpsc::channel;
|
||||
use std::sync::{mpsc, Arc, Mutex, RwLock};
|
||||
use std::thread;
|
||||
//use libc::time64_t;
|
||||
use crate::aocs::{MGMData, MGMHandler};
|
||||
use crate::aocs::{core_aocs_loop, MGMData, MGMHandler};
|
||||
#[cfg(feature = "can")]
|
||||
use crate::can::CanTxHandler;
|
||||
use crate::hk::{AOCSHousekeeper, AOCSSensorData};
|
||||
use crate::pld_handler::{core_pld_task};
|
||||
use crate::hk::{AOCSSensorData, AocsDataMap, AocsHousekeeper};
|
||||
use crate::pld_handler::core_pld_task;
|
||||
use crate::power_handler::{core_power_task, PowerSwitcher};
|
||||
|
||||
#[derive(Clone)]
|
||||
struct EventTmSender {
|
||||
store_helper: TmStore,
|
||||
sender: mpsc::Sender<StoreAddr>,
|
||||
}
|
||||
|
||||
impl EventTmSender {
|
||||
fn new(store_helper: TmStore, sender: mpsc::Sender<StoreAddr>) -> Self {
|
||||
Self {
|
||||
store_helper,
|
||||
sender,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl EcssTmSenderCore for EventTmSender {
|
||||
type Error = mpsc::SendError<StoreAddr>;
|
||||
|
||||
fn send_tm(&mut self, tm: PusTm) -> Result<(), EcssTmErrorWithSend<Self::Error>> {
|
||||
let addr = self.store_helper.add_pus_tm(&tm);
|
||||
self.sender
|
||||
.send(addr)
|
||||
.map_err(EcssTmErrorWithSend::SendError)
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {
|
||||
logger::setup_logger().unwrap();
|
||||
info!("Running DemoSat OBSW!");
|
||||
@ -111,17 +86,20 @@ fn main() {
|
||||
};
|
||||
|
||||
let seq_count_provider = SeqCountProviderSyncClonable::default();
|
||||
let msg_count_provider = SeqCountProviderSyncClonable::default();
|
||||
let aocs_seq_count_provider = seq_count_provider.clone();
|
||||
let verif_seq_count_provider = seq_count_provider.clone();
|
||||
let tmtc_seq_count_provider = seq_count_provider.clone();
|
||||
|
||||
let sock_addr = SocketAddr::new(IpAddr::V4(OBSW_SERVER_ADDR), SERVER_PORT);
|
||||
let (tc_source_tx, tc_source_rx) = channel();
|
||||
let (tm_funnel_tx, tm_funnel_rx) = channel();
|
||||
let (tm_server_tx, tm_server_rx) = channel();
|
||||
let verif_sender = MpscVerifSender::new(tm_store.pool.clone(), tm_funnel_tx.clone());
|
||||
let verif_sender = MpscVerifSender::new(1, "name", tm_store.pool.clone(), tm_funnel_tx.clone());
|
||||
let verif_cfg = VerificationReporterCfg::new(
|
||||
PUS_APID,
|
||||
#[allow(clippy::box_default)]
|
||||
Box::new(seq_count_provider.clone()),
|
||||
Box::new(verif_seq_count_provider.clone()),
|
||||
Box::new(msg_count_provider),
|
||||
1,
|
||||
2,
|
||||
8,
|
||||
@ -137,8 +115,7 @@ fn main() {
|
||||
let mut event_man = EventManagerWithMpscQueue::new(Box::new(event_recv));
|
||||
let event_reporter = EventReporter::new(PUS_APID, 128).unwrap();
|
||||
let pus_tm_backend = DefaultPusMgmtBackendProvider::<EventU32>::default();
|
||||
let pus_event_dispatcher =
|
||||
PusEventDispatcher::new(event_reporter, Box::new(pus_tm_backend));
|
||||
let pus_event_dispatcher = PusEventDispatcher::new(event_reporter, Box::new(pus_tm_backend));
|
||||
let (pus_event_man_tx, pus_event_man_rx) = channel();
|
||||
let pus_event_man_send_provider = MpscEventU32SendProvider::new(1, pus_event_man_tx);
|
||||
let reporter_event_handler = verif_reporter.clone();
|
||||
@ -146,11 +123,19 @@ fn main() {
|
||||
let mut reporter_pld = verif_reporter.clone();
|
||||
event_man.subscribe_all(pus_event_man_send_provider.id());
|
||||
|
||||
// possibly deprecated, as the apid should replace the target id
|
||||
let mut request_map = HashMap::new();
|
||||
let (aocs_thread_tx, aocs_thread_rx) = channel::<RequestWithToken>();
|
||||
let (pld_thread_tx, pld_thread_rx) = channel::<RequestWithToken>();
|
||||
request_map.insert(RequestTargetId::AcsSubsystem as u32, aocs_thread_tx);
|
||||
request_map.insert(RequestTargetId::PldSubsystem as u32, pld_thread_tx);
|
||||
let (pwr_thread_tx, pwr_thread_rx) = channel::<RequestWithToken>();
|
||||
let (aocs_hk_tx, aocs_hk_rx) = channel::<RequestWithToken>();
|
||||
let (mgm_tx, mgm_rx) = channel::<RequestWithToken>();
|
||||
let (css_tx, css_rx) = channel::<RequestWithToken>();
|
||||
let (str_tx, str_rx) = channel::<RequestWithToken>();
|
||||
let (mgt_tx, mgt_rx) = channel::<RequestWithToken>();
|
||||
let (rwl_tx, rwl_rx) = channel::<RequestWithToken>();
|
||||
request_map.insert(RequestTargetId::AcsSubsystem as u32, aocs_thread_tx.clone());
|
||||
request_map.insert(RequestTargetId::PldSubsystem as u32, pld_thread_tx.clone());
|
||||
//add here receivers for tmtc task to send requests to
|
||||
//request_map.insert(RequestTargetId::CanTask as u32, can_thread_tx);
|
||||
|
||||
@ -159,6 +144,18 @@ fn main() {
|
||||
tc_source: tc_source_tx,
|
||||
};
|
||||
|
||||
let mut apid_map = HashMap::new();
|
||||
|
||||
apid_map.insert(PLD_APID, pld_thread_tx.clone());
|
||||
apid_map.insert(PWR_APID, pwr_thread_tx.clone());
|
||||
apid_map.insert(AOCS_APID, aocs_thread_tx.clone());
|
||||
apid_map.insert(AOCS_HK_APID, aocs_hk_tx.clone());
|
||||
apid_map.insert(MGM_APID, mgm_tx.clone());
|
||||
apid_map.insert(CSS_APID, css_tx.clone());
|
||||
apid_map.insert(STR_APID, str_tx.clone());
|
||||
apid_map.insert(MGT_APID, mgt_tx.clone());
|
||||
apid_map.insert(RWL_APID, rwl_tx.clone());
|
||||
|
||||
// Create clones here to allow moving the values
|
||||
let core_args = OtherArgs {
|
||||
sock_addr,
|
||||
@ -166,6 +163,8 @@ fn main() {
|
||||
event_sender,
|
||||
event_request_tx,
|
||||
request_map,
|
||||
apid_map,
|
||||
seq_count_provider: verif_seq_count_provider,
|
||||
};
|
||||
let tc_args = TcArgs {
|
||||
tc_source,
|
||||
@ -177,18 +176,26 @@ fn main() {
|
||||
tm_server_rx,
|
||||
};
|
||||
|
||||
let (aocs_can_tx, aocs_can_rx) = mpsc::channel::<PackageModel>();
|
||||
let (mgm_can_tx, mgm_can_rx) = mpsc::channel::<PackageModel>();
|
||||
let (mgt_can_tx, mgt_can_rx) = mpsc::channel::<PackageModel>();
|
||||
let (css_can_tx, css_can_rx) = mpsc::channel::<PackageModel>();
|
||||
let (rwl_can_tx, rwl_can_rx) = mpsc::channel::<PackageModel>();
|
||||
let (str_can_tx, str_can_rx) = mpsc::channel::<PackageModel>();
|
||||
let (power_can_tx, power_can_rx) = mpsc::channel::<PackageModel>();
|
||||
let (pld_can_tx, pld_can_rx) = mpsc::channel::<PackageModel>();
|
||||
|
||||
// make tx thread id hashmap
|
||||
let mut can_senders = HashMap::new();
|
||||
can_senders.insert(ThreadId::AOCSThread, aocs_can_tx);
|
||||
can_senders.insert(ThreadId::PowerThread, power_can_tx);
|
||||
can_senders.insert(ThreadId::PLDThread, pld_can_tx);
|
||||
can_senders.insert(PWR_APID, power_can_tx);
|
||||
can_senders.insert(PLD_APID, pld_can_tx);
|
||||
can_senders.insert(MGM_APID, mgm_can_tx);
|
||||
can_senders.insert(MGT_APID, mgt_can_tx);
|
||||
can_senders.insert(RWL_APID, rwl_can_tx);
|
||||
can_senders.insert(CSS_APID, css_can_tx);
|
||||
can_senders.insert(STR_APID, str_can_tx);
|
||||
|
||||
// get package id hashmap
|
||||
let package_ids_rx = load_package_ids();
|
||||
let package_ids_rx = load_package_id_to_apids();
|
||||
|
||||
info!("Starting TMTC task");
|
||||
let builder0 = thread::Builder::new().name("TMTCThread".into());
|
||||
@ -199,7 +206,8 @@ fn main() {
|
||||
let (can_tx_sender, can_tx_receiver) = channel();
|
||||
|
||||
#[cfg(feature = "can")]
|
||||
let mut can_rx_socket = can::CanRxHandler::new_socket("can0", can_senders.clone(), package_ids_rx.clone()).unwrap();
|
||||
let mut can_rx_socket =
|
||||
can::CanRxHandler::new_socket("can0", can_senders.clone(), package_ids_rx.clone()).unwrap();
|
||||
|
||||
#[cfg(feature = "can")]
|
||||
info!("Starting CAN Socket listening task");
|
||||
@ -210,19 +218,19 @@ fn main() {
|
||||
});
|
||||
|
||||
#[cfg(feature = "can")]
|
||||
let mut can_tx_socket = CanTxHandler::new_socket("can0", package_ids_rx.clone(), can_tx_receiver).unwrap();
|
||||
let mut can_tx_socket =
|
||||
CanTxHandler::new_socket("can0", package_ids_rx.clone(), can_tx_receiver).unwrap();
|
||||
|
||||
#[cfg(feature = "can")]
|
||||
info!("Starting CAN Socket writing task");
|
||||
let builder_can_tx = thread::Builder::new().name("TxHandler".into());
|
||||
let jh_can_tx = builder_can_tx.spawn( move || loop {
|
||||
let jh_can_tx = builder_can_tx.spawn(move || loop {
|
||||
#[cfg(feature = "can")]
|
||||
can_tx_socket.process_incoming();
|
||||
});
|
||||
|
||||
let (pcdu_tx, pcdu_rx) = mpsc::channel::<(SwitchId, SwitchState)>();
|
||||
let pcdu_can_tx_sender =
|
||||
can_tx_sender.clone();
|
||||
let pcdu_can_tx_sender = can_tx_sender.clone();
|
||||
|
||||
let mut device_state_map = HashMap::new();
|
||||
for id in DeviceId::iter() {
|
||||
@ -243,12 +251,11 @@ fn main() {
|
||||
);
|
||||
});
|
||||
|
||||
let package_map_pld_tx = load_package_ids();
|
||||
let package_map_pld_tx = load_package_id_to_threads();
|
||||
let pld_tm_funnel_tx = tm_funnel_tx.clone();
|
||||
let pld_tm_store = tm_store.clone();
|
||||
|
||||
let pld_can_tx_sender =
|
||||
can_tx_sender.clone();
|
||||
let pld_can_tx_sender = can_tx_sender.clone();
|
||||
|
||||
let power_switcher_pld = power_switcher.clone();
|
||||
|
||||
@ -282,24 +289,42 @@ fn main() {
|
||||
}
|
||||
});
|
||||
|
||||
let package_map_aocs_tx = load_package_ids();
|
||||
let package_map_aocs_tx = load_package_id_to_threads();
|
||||
let aocs_tm_funnel_tx = tm_funnel_tx.clone();
|
||||
let aocs_tm_store = tm_store.clone();
|
||||
|
||||
let mgm_shared_data: Arc<Mutex<MGMData>> = Arc::default();
|
||||
|
||||
let aocs_sensor_data = Arc::new(Mutex::new(AOCSSensorData::new()));
|
||||
let (mgm_action_tx, mgm_action_rx) = channel();
|
||||
let aocs_data = Arc::new(Mutex::new(AocsDataMap::new()));
|
||||
let (mgm_action_tx, mgm_action_rx) = channel::<RequestWithToken>();
|
||||
|
||||
let power_switcher_aocs = power_switcher.clone();
|
||||
|
||||
info!("Starting AOCS task");
|
||||
let builder5 = thread::Builder::new().name("AOCSThread".into());
|
||||
let jh5 = builder5.spawn(move || {
|
||||
let mut mgm_handler = MGMHandler::new(power_switcher_aocs.clone(), DeviceId::MGM1, can_tx_sender.clone(), aocs_can_rx, mgm_action_rx);
|
||||
let mut aocs_housekeeper = AocsHousekeeper::new(
|
||||
aocs_data,
|
||||
aocs_hk_rx,
|
||||
aocs_seq_count_provider,
|
||||
aocs_tm_store,
|
||||
aocs_tm_funnel_tx,
|
||||
reporter_aocs,
|
||||
);
|
||||
|
||||
let aocs_sensor_data = Arc::new(Mutex::new(AOCSSensorData::new()));
|
||||
let mut aocs_housekeeper = AOCSHousekeeper::new(
|
||||
loop {
|
||||
aocs_housekeeper.handle_hk_request();
|
||||
}
|
||||
/*let mut mgm_handler = MGMHandler::new(
|
||||
power_switcher_aocs.clone(),
|
||||
DeviceId::MGM1,
|
||||
can_tx_sender.clone(),
|
||||