v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
6 changed files with 5 additions and 62 deletions
Showing only changes of commit ba5829a070 - Show all commits

View File

@ -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'
}
}

View File

@ -1,57 +0,0 @@
#ifndef FSFWCONFIG_DEVICES_GPIOIDS_H_
#define FSFWCONFIG_DEVICES_GPIOIDS_H_
namespace gpioIds {
enum gpioId_t {
HEATER_0,
HEATER_1,
HEATER_2,
HEATER_3,
HEATER_4,
HEATER_5,
HEATER_6,
HEATER_7,
DEPLSA1,
DEPLSA2,
MGM_0_LIS3_CS,
MGM_1_RM3100_CS,
GYRO_0_ADIS_CS,
GYRO_1_L3G_CS,
GYRO_2_L3G_CS,
MGM_2_LIS3_CS,
MGM_3_RM3100_CS,
TEST_ID_0,
TEST_ID_1,
RTD_IC_3,
RTD_IC_4,
RTD_IC_5,
RTD_IC_6,
RTD_IC_7,
RTD_IC_8,
RTD_IC_9,
RTD_IC_10,
RTD_IC_11,
RTD_IC_12,
RTD_IC_13,
RTD_IC_14,
RTD_IC_15,
RTD_IC_16,
RTD_IC_17,
RTD_IC_18,
SPI_MUX_BIT_1,
SPI_MUX_BIT_2,
SPI_MUX_BIT_3,
SPI_MUX_BIT_4,
SPI_MUX_BIT_5,
SPI_MUX_BIT_6,
CS_RAD_SENSOR,
ENABLE_RADFET
};
}
#endif /* FSFWCONFIG_DEVICES_GPIOIDS_H_ */

2
fsfw

@ -1 +1 @@
Subproject commit aebab4c73c32171930a23a5351149f65cb99c3b0
Subproject commit 7571987a1d90528d067e2ab86d1b589bc0e89b42

@ -1 +1 @@
Subproject commit 52f291692c4074a23743c799148b0432a4e405fa
Subproject commit 348877b5d93ad17db4b03d08b134a2e1c87af2df

2
tmtc

@ -1 +1 @@
Subproject commit 35ca0d9d6ee2d6755f48452c36049b679a33875f
Subproject commit e1d43b8de9e2b09493245fdf6c050b8b819eab41