Merge remote-tracking branch 'origin/main' into make-server-port-confgurable

Cargo.lock

@@ -489,10 +489,10 @@ dependencies = [
  "num_enum",
  "satrs",
  "satrs-mib",
- "socket2",
+ "serde",
+ "serde_json",
  "strum",
  "thiserror",
- "toml",
 ]
 
 [[package]]
@@ -520,7 +520,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
 ]
 
 [[package]]
@@ -593,9 +593,9 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "satrs"
-version = "0.2.0-rc.3"
+version = "0.2.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa9241e4d6cb0cc395927cfe653d8bc4a9cb6b2c27f28fec713d5e6ceb0ba23"
+checksum = "8d6f3286d35464fdc75dc846b663aaad4a81437a50e623053b1b4d481d782cd0"
 dependencies = [
  "bus",
  "cobs",
@@ -683,11 +683,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_spanned"
-version = "0.6.5"
+name = "serde_json"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
 dependencies = [
+ "itoa",
+ "ryu",
  "serde",
 ]
 
@@ -796,26 +798,11 @@ dependencies = [
  "syn 2.0.59",
 ]
 
-[[package]]
-name = "toml"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.9",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "toml_edit"
@@ -825,20 +812,7 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
  "indexmap",
  "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.6.6",
+ "winnow",
 ]
 
 [[package]]
@@ -1076,15 +1050,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winnow"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.32"

Cargo.toml

@@ -16,6 +16,8 @@ strum = { version = "0.26", features = ["derive"] }
 thiserror = "1"
 derive-new = "0.6"
 num_enum = "0.7"
+serde = "1"
+serde_json = "1"
 mio = "0.8"
 socket2 = "0.5"
 

pytmtc/pyclient.py

@@ -239,13 +239,13 @@ def main():
     raw_logger = RawTmtcTimedLogWrapper(when=TimedLogWhen.PER_HOUR, interval=1)
     verificator = PusVerificator()
     verification_wrapper = VerificationWrapper(verificator, _LOGGER, file_logger)
-    # Create primary TM handler and add it to the CCSDS Packet Handler
+    # Create primary TM handlers and add it to the CCSDS Packet Handler
     tm_handler = PusHandler(file_logger, verification_wrapper, raw_logger)
     ccsds_handler = CcsdsTmHandler(generic_handler=tm_handler)
-    # TODO: We could add the CFDP handler for the CFDP APID at a later stage.
+    # TODO: We could add the CFDP handlers for the CFDP APID at a later stage.
     # ccsds_handler.add_apid_handler(tm_handler)
 
-    # Create TC handler
+    # Create TC handlers
     seq_count_provider = PusFileSeqCountProvider()
     tc_handler = TcHandler(seq_count_provider, verification_wrapper)
     tmtccmd.setup(setup_args=setup_args)

src/handlers/camera.rs

@@ -0,0 +1,284 @@
+/// Device handler implementation for the IMS-100 Imager used on the OPS-SAT mission.
+///
+/// from the [OPSSAT Experimenter Wiki](https://opssat1.esoc.esa.int/projects/experimenter-information/wiki/Camera_Introduction):
+/// OPS-SAT has a BST IMS-100 Imager onboard for image acquisition. These RGGB images are 2048x1944px in size.
+///
+/// There are two ways of taking pictures, with the NMF or by using the camera API directly.
+///
+/// As the NMF method is already explained in the NMF documentation we will focus on triggering the camera API.
+///
+/// The camera is located on the -Z face of OPS-SAT
+///
+/// Mapping between camera and satellite frames:
+/// cam body
+/// +x -z
+/// +y -x
+/// +z +y
+///
+/// If you look onto Flatsat as in your picture coordinate system for camera it is
+///
+/// Z              Z pointing inside Flatsat
+///  x---> X
+/// |
+/// |
+///  v Y
+///
+/// see also https://opssat1.esoc.esa.int/dmsf/files/6/view
+
+use crate::requests::CompositeRequest;
+use derive_new::new;
+use log::debug;
+use ops_sat_rs::TimeStampHelper;
+use satrs::action::{ActionRequest, ActionRequestVariant};
+use satrs::hk::HkRequest;
+use satrs::request::{GenericMessage, MessageMetadata, UniqueApidTargetId};
+use satrs::tmtc::PacketAsVec;
+use serde::{Deserialize, Serialize};
+use std::io::Error;
+use std::process::Command;
+use std::sync::mpsc;
+
+const DEFAULT_SINGLE_CAM_PARAMS: CameraPictureParameters = CameraPictureParameters {
+    R: 8,
+    G: 8,
+    B: 8,
+    N: 1,
+    P: true,
+    E: 2,
+    W: 1000,
+};
+
+const BALANCED_SINGLE_CAM_PARAMS: CameraPictureParameters = CameraPictureParameters {
+    R: 13,
+    G: 7,
+    B: 8,
+    N: 1,
+    P: true,
+    E: 2,
+    W: 1000,
+};
+
+const DEFAULT_SINGLE_FLATSAT_CAM_PARAMS: CameraPictureParameters = CameraPictureParameters {
+    R: 8,
+    G: 8,
+    B: 8,
+    N: 1,
+    P: true,
+    E: 200,
+    W: 1000,
+};
+
+const BALANCED_SINGLE_FLATSAT_CAM_PARAMS: CameraPictureParameters = CameraPictureParameters {
+    R: 13,
+    G: 7,
+    B: 8,
+    N: 1,
+    P: true,
+    E: 200,
+    W: 1000,
+};
+
+#[derive(Debug)]
+pub enum CameraActionIds {
+    DefaultSingle = 1,
+    BalancedSingle = 2,
+    DefaultSingleFlatSat = 3,
+    BalancedSingleFlatSat = 4,
+    CustomParameters = 5,
+}
+
+impl TryFrom<u32> for CameraActionIds {
+    type Error = ();
+
+    fn try_from(value: u32) -> Result<Self, Self::Error> {
+        match value {
+            value if value == CameraActionIds::DefaultSingle as u32 => {
+                Ok(CameraActionIds::DefaultSingle)
+            }
+            value if value == CameraActionIds::BalancedSingle as u32 => {
+                Ok(CameraActionIds::BalancedSingle)
+            }
+            value if value == CameraActionIds::DefaultSingleFlatSat as u32 => {
+                Ok(CameraActionIds::DefaultSingleFlatSat)
+            }
+            value if value == CameraActionIds::BalancedSingleFlatSat as u32 => {
+                Ok(CameraActionIds::BalancedSingleFlatSat)
+            }
+            value if value == CameraActionIds::CustomParameters as u32 => {
+                Ok(CameraActionIds::CustomParameters)
+            }
+            _ => Err(()),
+        }
+    }
+}
+
+// TODO what happens if limits are exceded
+#[allow(non_snake_case)]
+#[derive(Serialize, Deserialize, new)]
+pub struct CameraPictureParameters {
+    pub R: u8,
+    pub G: u8,
+    pub B: u8,
+    pub N: u8,   // number of images, max: 26
+    pub P: bool, // .png flag, true converts raw extracted image from camera to a png
+    pub E: u32,  // exposure time in ms, max: 1580, default: 2, FlatSat: 200
+    pub W: u32,  // wait time between pictures in ms, max: 40000
+}
+
+#[allow(dead_code)]
+#[derive(new)]
+pub struct IMS100BatchHandler {
+    id: UniqueApidTargetId,
+    // mode_interface: MpscModeLeafInterface,
+    composite_request_receiver: mpsc::Receiver<GenericMessage<CompositeRequest>>,
+    // hk_reply_sender: mpsc::Sender<GenericMessage<HkReply>>,
+    tm_sender: mpsc::Sender<PacketAsVec>,
+    stamp_helper: TimeStampHelper,
+}
+
+#[allow(non_snake_case)]
+#[allow(dead_code)]
+impl IMS100BatchHandler {
+    pub fn periodic_operation(&mut self) {
+        self.stamp_helper.update_from_now();
+        // Handle requests.
+        self.handle_composite_requests();
+        // self.handle_mode_requests();
+    }
+
+    pub fn handle_composite_requests(&mut self) {
+        loop {
+            match self.composite_request_receiver.try_recv() {
+                Ok(ref msg) => match &msg.message {
+                    CompositeRequest::Hk(hk_request) => {
+                        self.handle_hk_request(&msg.requestor_info, hk_request);
+                    }
+                    CompositeRequest::Action(action_request) => {
+                        self.handle_action_request(&msg.requestor_info, action_request);
+                    }
+                },
+                Err(_) => {}
+            }
+        }
+    }
+
+    pub fn handle_hk_request(
+        &mut self,
+        _requestor_info: &MessageMetadata,
+        _hk_request: &HkRequest,
+    ) {
+        // TODO add hk to opssat
+    }
+
+    pub fn handle_action_request(
+        &mut self,
+        _requestor_info: &MessageMetadata,
+        action_request: &ActionRequest,
+    ) -> std::io::Result<()> {
+        let param = match CameraActionIds::try_from(action_request.action_id).unwrap() {
+            CameraActionIds::DefaultSingle => DEFAULT_SINGLE_CAM_PARAMS,
+            CameraActionIds::BalancedSingle => BALANCED_SINGLE_CAM_PARAMS,
+            CameraActionIds::DefaultSingleFlatSat => DEFAULT_SINGLE_FLATSAT_CAM_PARAMS,
+            CameraActionIds::BalancedSingleFlatSat => BALANCED_SINGLE_FLATSAT_CAM_PARAMS,
+            CameraActionIds::CustomParameters => match &action_request.variant {
+                ActionRequestVariant::NoData => return Err(Error::other("No Data sent!")),
+                ActionRequestVariant::StoreData(_) => {
+                    // let param = serde_json::from_slice()
+                    // TODO implement non dynamic version
+                    return Err(Error::other(
+                        "Static parameter transfer not implemented yet!",
+                    ));
+                }
+                ActionRequestVariant::VecData(data) => {
+                    let param: serde_json::Result<CameraPictureParameters> =
+                        serde_json::from_slice(data.as_slice());
+                    match param {
+                        Ok(param) => param,
+                        Err(_) => {
+                            return Err(Error::other("Unable to deserialize parameters"));
+                        }
+                    }
+                }
+                _ => return Err(Error::other("Invalid Action Request Variant!")),
+            },
+        };
+        self.take_picture(param)
+    }
+
+    pub fn take_picture(&mut self, param: CameraPictureParameters) -> std::io::Result<()> {
+        let mut cmd = Command::new("ims100_testapp");
+        cmd.arg("-R")
+            .arg(&param.R.to_string())
+            .arg("-G")
+            .arg(&param.G.to_string())
+            .arg("-B")
+            .arg(&param.B.to_string())
+            .arg("-c")
+            .arg("/dev/cam_tty")
+            .arg("-m")
+            .arg("/dev/cam_sd")
+            .arg("-v")
+            .arg("0")
+            .arg("-n")
+            .arg(&param.N.to_string());
+        if param.P {
+            cmd.arg("-p");
+        }
+        cmd.arg("-e")
+            .arg(&param.E.to_string())
+            .arg("-w")
+            .arg(&param.W.to_string());
+
+        let output = cmd.output()?;
+
+        debug!("{}", String::from_utf8_lossy(&output.stdout));
+
+        Ok(())
+    }
+
+    pub fn take_picture_from_str(
+        &mut self,
+        R: &str,
+        G: &str,
+        B: &str,
+        N: &str,
+        P: &str,
+        E: &str,
+        W: &str,
+    ) -> std::io::Result<()> {
+        let mut cmd = Command::new("ims100_testapp");
+        cmd.arg("-R")
+            .arg(R)
+            .arg("-G")
+            .arg(G)
+            .arg("-B")
+            .arg(B)
+            .arg("-c")
+            .arg("/dev/cam_tty")
+            .arg("-m")
+            .arg("/dev/cam_sd")
+            .arg("-v")
+            .arg("0")
+            .arg("-n")
+            .arg(N)
+            .arg(P)
+            .arg("-e")
+            .arg(E)
+            .arg("-w")
+            .arg(W);
+
+        let output = cmd.output()?;
+
+        debug!("{}", String::from_utf8_lossy(&output.stdout));
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_crc() {
+        // TODO
+    }
+}

src/handlers/mod.rs

@@ -0,0 +1 @@
+pub mod camera;

src/main.rs

@@ -30,6 +30,7 @@ use crate::{
 };
 
 mod controller;
+mod handlers;
 mod interface;
 mod logger;
 mod pus;
@@ -252,7 +253,7 @@ fn main() {
         })
         .unwrap();
 
-    info!("Starting PUS handler thread");
+    info!("Starting PUS handlers thread");
     let pus_stop_signal = stop_signal.clone();
     let jh_pus_handler = thread::Builder::new()
         .name("ops-sat pus".to_string())
@@ -282,5 +283,5 @@ fn main() {
         .expect("Joining TM Funnel thread failed");
     jh_pus_handler
         .join()
-        .expect("Joining PUS handler thread failed");
+        .expect("Joining PUS handlers thread failed");
 }

src/pus/mod.rs

@@ -176,7 +176,7 @@ pub trait TargetedPusService {
     fn check_for_request_timeouts(&mut self);
 }
 
-/// This is a generic handler class for all PUS services where a PUS telecommand is converted
+/// This is a generic handlers class for all PUS services where a PUS telecommand is converted
 /// to a targeted request.
 ///
 /// The generic steps for this process are the following
@@ -186,12 +186,12 @@ pub trait TargetedPusService {
 ///  3. Convert the PUS TC to a typed request using the [PusTcToRequestConverter].
 ///  4. Route the requests using the [GenericRequestRouter].
 ///  5. Add the request to the active request map using the [ActiveRequestMapProvider] abstraction.
-///  6. Check for replies which complete the forwarded request. The handler takes care of
+///  6. Check for replies which complete the forwarded request. The handlers takes care of
 ///     the verification process.
 ///  7. Check for timeouts of active requests. Generally, the timeout on the service level should
 ///     be highest expected timeout for the given target.
 ///
-/// The handler exposes the following API:
+/// The handlers exposes the following API:
 ///
 ///  1. [Self::handle_one_tc] which tries to poll and handle one TC packet, covering steps 1-5.
 ///  2. [Self::check_one_reply] which tries to poll and handle one reply, covering step 6.

src/pus/test.rs

@@ -48,7 +48,7 @@ impl TestCustomServiceWrapper {
     pub fn poll_and_handle_next_packet(&mut self, time_stamp: &[u8]) -> HandlingStatus {
         let res = self.handler.poll_and_handle_next_tc(time_stamp);
         if res.is_err() {
-            warn!("PUS17 handler failed with error {:?}", res.unwrap_err());
+            warn!("PUS17 handlers failed with error {:?}", res.unwrap_err());
             return HandlingStatus::Empty;
         }
         match res.unwrap() {