diff --git a/satrs-example-stm32f3-disco/pyclient/.gitignore b/satrs-example-stm32f3-disco/pyclient/.gitignore index a0c9366..da26576 100644 --- a/satrs-example-stm32f3-disco/pyclient/.gitignore +++ b/satrs-example-stm32f3-disco/pyclient/.gitignore @@ -1,4 +1,5 @@ /venv +/.tmtc-history.txt /log /.idea/* !/.idea/runConfigurations diff --git a/satrs-example-stm32f3-disco/pyclient/def_tmtc_conf.json b/satrs-example-stm32f3-disco/pyclient/def_tmtc_conf.json index 5665681..76db442 100644 --- a/satrs-example-stm32f3-disco/pyclient/def_tmtc_conf.json +++ b/satrs-example-stm32f3-disco/pyclient/def_tmtc_conf.json @@ -1,4 +1,4 @@ { "com_if": "serial_cobs", "serial_baudrate": 115200 -} \ No newline at end of file +} diff --git a/satrs-example-stm32f3-disco/pyclient/main.py b/satrs-example-stm32f3-disco/pyclient/main.py index 8f5aee4..d37da58 100755 --- a/satrs-example-stm32f3-disco/pyclient/main.py +++ b/satrs-example-stm32f3-disco/pyclient/main.py @@ -16,6 +16,7 @@ from spacepackets.ecss.pus_1_verification import UnpackParams, Service1Tm from tmtccmd import TcHandlerBase, ProcedureParamsWrapper from tmtccmd.core.base import BackendRequest from tmtccmd.core.ccsds_backend import QueueWrapper +from tmtccmd.logging import add_colorlog_console_logger from tmtccmd.pus import VerificationWrapper from tmtccmd.tmtc import CcsdsTmHandler, SpecificApidHandlerBase from tmtccmd.com import ComInterface @@ -45,8 +46,6 @@ from tmtccmd.pus.s5_fsfw_event import Service5Tm from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider from tmtccmd.util.obj_id import ObjectIdDictT -# from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter - _LOGGER = logging.getLogger() EXAMPLE_PUS_APID = 0x02 @@ -215,10 +214,11 @@ class TcHandler(TcHandlerBase): cmd_path = def_proc.cmd_path if cmd_path == "/ping": q.add_log_cmd("Sending PUS ping telecommand") - return q.add_pus_tc(PusTelecommand(service=17, subservice=1)) + q.add_pus_tc(PusTelecommand(service=17, subservice=1)) def main(): + add_colorlog_console_logger(_LOGGER) tmtccmd.init_printout(False) hook_obj = SatRsConfigHook(json_cfg_path=default_json_path()) parser_wrapper = PreArgsParsingWrapper() diff --git a/satrs-example-stm32f3-disco/src/main.rs b/satrs-example-stm32f3-disco/src/main.rs index 1c7a8c6..ab02b2a 100644 --- a/satrs-example-stm32f3-disco/src/main.rs +++ b/satrs-example-stm32f3-disco/src/main.rs @@ -501,7 +501,6 @@ mod app { stamp_buf, ) .unwrap(); - // let mem_block = poolmod::TM::alloc().unwrap().init([0u8; MAX_TM_LEN]); let sender = TmSender::new(TmPacket::new(), tgt); if let Err(e) = verif_reporter.send_step_or_completion_success(sendable, &sender) { warn!(target: tgt, "Sending completion success failed: {:?}", e.0);