From 9ab9b2fdeb28ade76706072bbc8c3ac045a317d3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 24 Apr 2021 23:17:45 +0200 Subject: [PATCH 1/3] added dns name --- README.md | 6 ++++++ bsp_q7s/boardconfig/q7s_config.h | 2 +- tmtc | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f0c749be..38df4443 100644 --- a/README.md +++ b/README.md @@ -198,6 +198,12 @@ IP address and path settings differ from machine to machine. Open SSH connection to flatsat PC: +```sh +ssh eive@flatsat.eive.absatvirt.lw +``` + +or + ```sh ssh eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 ``` diff --git a/bsp_q7s/boardconfig/q7s_config.h b/bsp_q7s/boardconfig/q7s_config.h index d4b821c1..31c22046 100644 --- a/bsp_q7s/boardconfig/q7s_config.h +++ b/bsp_q7s/boardconfig/q7s_config.h @@ -4,7 +4,7 @@ /* Only one of those 2 should be enabled! */ /* Add code for ACS board */ #define OBSW_ADD_ACS_BOARD 0 -#define Q7S_ADD_SPI_TEST 1 +#define Q7S_ADD_SPI_TEST 0 diff --git a/tmtc b/tmtc index 3c343f75..7cc06ef0 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 3c343f751f4a098468150240856378ec274cc025 +Subproject commit 7cc06ef0e0882d286bab8156ca756e0211e5ebae From fa192a353ba81bacdb0cc20135a903715ab5dbaf Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 24 Apr 2021 23:41:27 +0200 Subject: [PATCH 2/3] everything seems to work now --- bsp_q7s/ObjectFactory.cpp | 17 +++++++++++++++++ fsfwconfig/FSFWConfig.h | 3 +-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp index 07b54049..caa98bfd 100644 --- a/bsp_q7s/ObjectFactory.cpp +++ b/bsp_q7s/ObjectFactory.cpp @@ -386,6 +386,23 @@ void ObjectFactory::produce(){ Max31865PT1000Handler* rtdIc18 = new Max31865PT1000Handler(objects::RTD_IC18, objects::SPI_COM_IF, spiRtdIc18, 0); // rtdIc10->setStartUpImmediately(); // rtdIc4->setStartUpImmediately(); + (void) rtdIc3; + (void) rtdIc4; + (void) rtdIc5; + (void) rtdIc6; + (void) rtdIc7; + (void) rtdIc8; + (void) rtdIc9; + (void) rtdIc10; + (void) rtdIc11; + (void) rtdIc12; + (void) rtdIc13; + (void) rtdIc14; + (void) rtdIc15; + (void) rtdIc16; + (void) rtdIc17; + (void) rtdIc18; + #endif /* Q7S_ADD_SPI_TEST == 0 */ #endif /* TE0720 == 0 */ diff --git a/fsfwconfig/FSFWConfig.h b/fsfwconfig/FSFWConfig.h index f5857d05..097f8aaf 100644 --- a/fsfwconfig/FSFWConfig.h +++ b/fsfwconfig/FSFWConfig.h @@ -17,8 +17,7 @@ #define FSFW_DISABLE_PRINTOUT 0 #endif -//! Can be used to disable the ANSI color sequences for C stdio. -#define FSFW_COLORED_OUTPUT 1 +#define FSFW_USE_PUS_C_TELEMETRY 1 //! Can be used to disable the ANSI color sequences for C stdio. #define FSFW_COLORED_OUTPUT 1 From e752e364800e34bdb8d8354ec61796b78629e5da Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 25 Apr 2021 00:00:17 +0200 Subject: [PATCH 3/3] fsfw update --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index cac9a0ee..f2ab07c7 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit cac9a0eecdc3ab77825a1d36e17e7ed1871f55ca +Subproject commit f2ab07c78242d8211aebf9e0d6911d386dbc4ec5