3686 Commits

Author SHA1 Message Date
7f42de1c82
added PL PCDU code 2022-03-04 15:26:36 +01:00
8054694763
update for generator scripts
- Generators will now copy csv files into tmtc folder
- Bump fsfwgen dependency, some bugfixes
- Rerun formatter
- Rerun generator scripts
2022-03-04 15:14:02 +01:00
f419ac8fd7 Merge branch 'develop' into mueller/move-archive-folder 2022-03-04 15:05:27 +01:00
392faa6664 Merge pull request 'building with -j4 instead of -j to limit load on buildserver' () from mohr/slowbuild into develop
Reviewed-on: 
2022-03-04 15:05:07 +01:00
b71ea7c4c7
move archive folder 2022-03-04 15:00:14 +01:00
a0897c3afb
Merge remote-tracking branch 'origin/develop' into mueller/master 2022-03-04 14:55:42 +01:00
fe7394bded Merge branch 'develop' into mueller/system-subsystems 2022-03-04 14:53:58 +01:00
f39a755815 Merge branch 'develop' into mohr/slowbuild 2022-03-04 14:53:18 +01:00
535a2eea84 Merge pull request 'doge' () from mueller/doge into develop
Reviewed-on: 
2022-03-04 14:53:05 +01:00
c4ed263e6c Merge branch 'develop' into mueller/system-subsystems 2022-03-04 14:52:12 +01:00
e2d6202d56 Merge branch 'develop' into mueller/doge 2022-03-04 14:50:48 +01:00
12b0ac5847
comment fix 2022-03-04 14:28:44 +01:00
ad3fcbf0f3
regenerated events 2022-03-04 11:03:03 +01:00
a74c606307
moved some archive files 2022-03-04 10:38:39 +01:00
38e5a97015
regenerate returnvalues 2022-03-04 10:29:56 +01:00
bc310c9dfb
regenerated events 2022-03-04 10:26:29 +01:00
7b9023cb6f Merge pull request 'Update for generator scripts' () from mueller/generators-update into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:56:08 +01:00
6c51553f71 Merge pull request 'ADIS Gyro Handler: Use OSAL define instead of dedicated define' () from mueller/adis-optimization into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:55:43 +01:00
b6de685ea2 Merge pull request 'Update for memory management' () from mueller/sdcman-mg into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:55:06 +01:00
f6a69e2eca Merge pull request 'added try catch for more safety' () from mueller/catch-nlohmann-json into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-04 09:54:17 +01:00
60f9bf8fe5
Merge branch 'mueller/system-subsystems' into mueller/master 2022-03-04 09:40:53 +01:00
120153e9c7
added some missing acs board ass code 2022-03-04 00:55:51 +01:00
0595e29100
finished most of sus handler 2022-03-03 20:11:12 +01:00
a7c1dafce5
added mutex protection for power switches 2022-03-03 19:39:36 +01:00
74c1bba814
doge 2022-03-03 19:21:56 +01:00
ebdd3914f4
added try catch for more safety 2022-03-03 19:13:43 +01:00
90972cf2f5
Merge branch 'mueller/plpcdu' into mueller/master 2022-03-03 19:11:44 +01:00
cc9a2dab50 Merge remote-tracking branch 'origin/develop' into mueller/master 2022-03-03 19:35:15 +01:00
b44442b282 some fixes for pl pcdu 2022-03-03 19:34:52 +01:00
bf10fe4cdb
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu 2022-03-03 19:10:00 +01:00
42d3ebe1b0 update .h.in config 2022-03-03 17:19:23 +01:00
bb20b470ec building with -j4 instead of -j to limit strain on buildserver 2022-03-03 15:59:44 +01:00
63c4095d4d Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems 2022-03-03 15:50:31 +01:00
261b4a808d
completed switcher switch case 2022-03-03 15:43:21 +01:00
ff0da65662
started SUS assembly
fixes for PCDU code and switcher list handling
2022-03-03 15:37:36 +01:00
1586c3e69a
submodule update 2022-03-03 13:43:52 +01:00
714167f112 Merge remote-tracking branch 'origin/develop' into mueller/sdcman-mg 2022-03-03 13:38:39 +01:00
5ce46beebf Merge remote-tracking branch 'origin/develop' into mueller/adis-optimization 2022-03-03 13:38:21 +01:00
0f60d82c06 Merge remote-tracking branch 'origin/develop' into mueller/generators-update 2022-03-03 13:37:51 +01:00
e07713a6f7 Merge pull request 'Adding Catch2 for unittests, reworked CI' () from mohr/catch2 into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-03-03 13:34:24 +01:00
fd368343c4
submodule updates 2022-03-03 10:36:53 +01:00
97a0662adc
submodule updates 2022-03-03 10:36:33 +01:00
3f7fb259c9
submodule updates 2022-03-03 10:36:10 +01:00
458b33e5fd
submodule updates 2022-03-03 10:34:49 +01:00
c7183b730e
check children state on implementation 2022-03-03 10:28:55 +01:00
5255e7d2ed
finished ACS board ASS 2022-03-03 10:12:59 +01:00
221d7b408a using new docker container name docker_d2 2022-03-02 18:01:21 +01:00
5873371d36
continued acs board assembly 2022-03-02 17:56:54 +01:00
f413ed6f7d Merge branch 'mohr/buildfix' into mohr/catch2 2022-03-02 17:52:41 +01:00
05bd1cc8c6 forgot one 2022-03-02 17:47:48 +01:00