1730 Commits

Author SHA1 Message Date
fd85ab3122 Merge pull request 'ctor fix for srv5' () from mueller/srv5-ctor-fix into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-23 18:49:01 +01:00
2551e673d8 Merge pull request 'adaptions to updated fsfw' () from mueller/pass-mq-args into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-23 18:48:16 +01:00
4ad3339331 Merge pull request 'moved and refactored sus handler' () from mueller/sus-update into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-23 18:46:45 +01:00
d5b22ca636 small fix in obj factory 2022-02-22 20:50:56 +01:00
f5c1263dd3 now it compiles 2022-02-22 20:47:09 +01:00
ee53485d4e update dev conf 2022-02-22 20:44:23 +01:00
940115b588 fsfw update 2022-02-22 20:38:28 +01:00
9c625a5743 cmakelists.txt fix 2022-02-22 20:36:47 +01:00
e58c375cb9 moved and refactored sus handler 2022-02-22 20:34:25 +01:00
d27a57ab28 adaptions to updated fsfw 2022-02-22 20:27:13 +01:00
9387fdce1c ctor fix for srv5 2022-02-22 20:17:15 +01:00
6c988ecf50 Merge pull request 'fixes for RPi build' () from mueller/rpi-fixes into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-22 18:17:33 +01:00
3f35dbfad8 Merge pull request 'add max1227 module' () from mueller/max1227-module into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-22 18:16:57 +01:00
b9e8346e82 Merge pull request 'watchdog updates' () from mueller/watchdog-tweaks into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-22 18:16:12 +01:00
7a97471ed9 Merge pull request 'create unique bin name again' () from mueller/create-unique-bin-name into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-22 18:15:11 +01:00
27ee6bfffc
fixes for RPi build 2022-02-22 13:50:46 +01:00
f5c525699e
REAMDE fix 2022-02-22 13:47:02 +01:00
7427d93c1d
fix in config file 2022-02-22 13:46:13 +01:00
63ec6d3eae
add max1227 module 2022-02-22 13:39:04 +01:00
56a57fadc8
update project file 2022-02-22 13:37:26 +01:00
0f9690f6c2
watchdog updates 2022-02-22 13:35:12 +01:00
7c1dcb5f11 Merge branch 'develop' into mueller/create-unique-bin-name 2022-02-21 14:46:56 +01:00
8394f6226a Merge pull request 'important bugfix for ADIS handler' () from mueller/adis-hotfix into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-21 11:07:18 +01:00
9c7a203930
make unique name optional 2022-02-21 10:41:22 +01:00
23ba1a997d
create unique bin name again 2022-02-20 10:34:41 +01:00
8498a84354
important bugfix for ADIS handler 2022-02-19 16:51:46 +01:00
6ddd2e4759 Merge pull request 'minor gps fixes' () from mueller/minor-gps-fixes into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-15 16:12:22 +01:00
208f417d17 minor gps fixes 2022-02-15 17:03:34 +01:00
3a6dcdc78e Merge pull request 'Reworked cmake' () from mohr/cmake into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-02-15 15:53:10 +01:00
50cf01376f Merge branch 'develop' into mohr/cmake 2022-02-10 16:22:28 +01:00
e59a98f11c removed q7s/watchdog and q7s/simple configurations scripts, as there is no special configuration needed any more 2022-02-10 15:28:12 +01:00
00042af77c updated README to cmake changes 2022-02-10 15:27:03 +01:00
4d154b7cee reworked cmake, unfortunately a big one due to interdependence
- /mission is a library now, in preparation of unittests (which bring their own main)
- eive-simple is now only available in bsp=arm/q7s (but is still not compiling)
- watchdog and simple are their own executables, not configurations any more
- moved some q7s specific code into /bsp-q7s to flatten if-hierarchy in main CMakeLists.txt
- compiler and linker options are not globally applied to all targets
- linux is the default fsfw osal now, as current code does not compile on hosted
2022-02-09 21:38:56 +01:00
20f091d54e Merge pull request 'SCEX test code' () from mueller/scex-test-code into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-09 14:24:49 +01:00
7005314d4b
apply clang-format 2022-02-09 12:07:29 +01:00
0108a913e6 ping test working 2022-02-08 17:23:02 +01:00
fb6b5b9e46 bugfixes for test code 2022-02-08 15:58:17 +01:00
00eeeade3f
some fixes for updates q7s-cp script 2022-02-08 15:09:46 +01:00
acfd6bfd5e Merge remote-tracking branch 'origin/mueller/update-q7s-script' into mueller/scex-test 2022-02-08 15:00:28 +01:00
1fa0e3f9c2 Merge remote-tracking branch 'origin/develop' into mueller/scex-test 2022-02-08 15:00:03 +01:00
90da51ed5a
q7s-cp can now copy to flatsat as well 2022-02-08 14:59:33 +01:00
0c086f9f15 Merge branch 'mueller/master' into mueller/scex-test 2022-02-07 13:33:06 +01:00
632b8c7355 submodule updates 2022-02-07 13:29:06 +01:00
470f0c05bf Merge branch 'mueller/master' into mueller/scex-test 2022-02-07 11:58:18 +01:00
826cb13c3e update config.h.in 2022-02-07 11:56:53 +01:00
6543264691 manually preparing sysroots for cross compiling gpsd lib 2022-02-05 11:43:40 +01:00
c42b3f56c3
applied clang-format 2022-02-04 17:48:05 +01:00
a56b80ec55
tmtc update 2022-02-04 17:05:40 +01:00
6781b6debe Merge pull request 'BPX Handler and a lot more' () from mueller/bpx-handler into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-02-04 13:02:18 +01:00
e1d506926f
and another fsfw update 2022-02-03 17:37:37 +01:00