From bb20b470ec6e57c6974be70e1ad3ba74fbfb443a Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Thu, 3 Mar 2022 15:59:44 +0100 Subject: [PATCH 1/5] building with -j4 instead of -j to limit strain on buildserver --- automation/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 300a7749..fe79dc73 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { steps { dir(BUILDDIR_Q7) { sh 'cmake -DTGT_BSP="arm/q7s" -DCMAKE_BUILD_TYPE=Debug ..' - sh 'cmake --build . -j' + sh 'cmake --build . -j4' } } } @@ -28,7 +28,7 @@ pipeline { steps { dir(BUILDDIR_LINUX) { sh 'cmake ..' - sh 'cmake --build . -t eive-unittest -j' + sh 'cmake --build . -t eive-unittest -j4' sh './eive-unittest' } } From 8054694763fb78778ad2ca2290cd07da6879385a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 4 Mar 2022 15:14:02 +0100 Subject: [PATCH 2/5] update for generator scripts - Generators will now copy csv files into tmtc folder - Bump fsfwgen dependency, some bugfixes - Rerun formatter - Rerun generator scripts --- generators/.run/events.run.xml | 4 +- generators/bsp_q7s_events.csv | 282 ++--- generators/bsp_q7s_returnvalues.csv | 1086 ++++++++--------- generators/definitions.py | 2 +- generators/events/event_parser.py | 3 + generators/events/translateEvents.cpp | 4 +- generators/fsfwgen | 2 +- generators/objects/objects.py | 6 + generators/objects/translateObjects.cpp | 2 +- .../returnvalues/returnvalues_parser.py | 18 +- linux/devices/startracker/StrHelper.cpp | 2 +- linux/fsfwconfig/events/translateEvents.cpp | 4 +- linux/fsfwconfig/objects/translateObjects.cpp | 2 +- mission/devices/RadiationSensorHandler.h | 3 +- mission/utility/ProgressPrinter.cpp | 4 +- unittest/mocks/EventManagerMock.h | 6 +- unittest/mocks/HouseKeepingMock.cpp | 1 - unittest/mocks/HouseKeepingMock.h | 3 +- 18 files changed, 725 insertions(+), 709 deletions(-) diff --git a/generators/.run/events.run.xml b/generators/.run/events.run.xml index f495007e..18f71033 100644 --- a/generators/.run/events.run.xml +++ b/generators/.run/events.run.xml @@ -6,9 +6,9 @@ -