From 21b3e46a720c0a65d0a334034c1f1be5fbc86914 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 17 May 2022 18:55:23 +0200 Subject: [PATCH 01/16] add lto option --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b7f906..6238902 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,12 @@ endif() # Project Name project(fsfw-example-hosted C CXX) +option(OBSW_ENABLE_IPO "Enable IPO/LTO optimization" ON) + +if(OBSW_ENABLE_IPO) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) +endif() + ################################################################################ # Pre-Sources preparation ################################################################################ From 878988bb09d035aa1273411117bce94f85c4a353 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 18 May 2022 15:49:29 +0200 Subject: [PATCH 02/16] bump deps and C++ version --- CMakeLists.txt | 2 +- example_common | 2 +- fsfw | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b7f906..c881b42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ project(fsfw-example-hosted C CXX) ################################################################################ # Specify the C++ standard -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) # Set names and variables diff --git a/example_common b/example_common index 9d70db9..e1aa39f 160000 --- a/example_common +++ b/example_common @@ -1 +1 @@ -Subproject commit 9d70db97f83e1d8886a5c1372a40124b79cee53d +Subproject commit e1aa39f5e4ccd7dc5694e2f5bffb5e3161778097 diff --git a/fsfw b/fsfw index 1a07864..5764144 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 1a07864a5faf0ceba707b3174172e133e083ff53 +Subproject commit 576414438c81b43d18ac0472c4baa8bc545f8d3f From 0a923a38a6d724d046591317784b21f631343fa2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 18 May 2022 16:02:42 +0200 Subject: [PATCH 03/16] use TCP server by default --- bsp_hosted/fsfwconfig/OBSWConfig.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp_hosted/fsfwconfig/OBSWConfig.h.in b/bsp_hosted/fsfwconfig/OBSWConfig.h.in index c9f2acb..9487c31 100644 --- a/bsp_hosted/fsfwconfig/OBSWConfig.h.in +++ b/bsp_hosted/fsfwconfig/OBSWConfig.h.in @@ -10,7 +10,7 @@ #define OBSW_TASK_PERIODIC_EVENT 0 // Use a TCP server instead of a UDP server for TMTC reception -#define OBSW_USE_TCP_SERVER 0 +#define OBSW_USE_TCP_SERVER 1 #ifdef __cplusplus From 044d56e96a861805eea5fd0a3be17bebf2d8cf77 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 18 May 2022 23:41:05 +0200 Subject: [PATCH 04/16] update tmtc python program --- .idea/cmake.xml | 2 +- fsfw | 2 +- tmtc/.idea/runConfigurations/TMTC_CLI.xml | 2 +- tmtc/common_tmtc | 2 +- tmtc/tmtc_conf.json | 6 ++ tmtc/tmtccli.py | 73 ++++------------------- tmtc/tmtccmd | 2 +- tmtc/tmtcgui.py | 61 ++----------------- 8 files changed, 28 insertions(+), 122 deletions(-) create mode 100644 tmtc/tmtc_conf.json diff --git a/.idea/cmake.xml b/.idea/cmake.xml index 88e346c..e52420a 100644 --- a/.idea/cmake.xml +++ b/.idea/cmake.xml @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/fsfw b/fsfw index 5764144..64e7d4b 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 576414438c81b43d18ac0472c4baa8bc545f8d3f +Subproject commit 64e7d4bb5e61c5ce2ece0bedddaffde086d7fe99 diff --git a/tmtc/.idea/runConfigurations/TMTC_CLI.xml b/tmtc/.idea/runConfigurations/TMTC_CLI.xml index 474a141..5758fd7 100644 --- a/tmtc/.idea/runConfigurations/TMTC_CLI.xml +++ b/tmtc/.idea/runConfigurations/TMTC_CLI.xml @@ -15,7 +15,7 @@