2639 Commits

Author SHA1 Message Date
a9cf5f9ae9 Merge pull request 'update cp script' () from mueller/update-q7s-cp-script into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-03 13:42:08 +02:00
e088bec582 Merge pull request 'GPS controller update' () from mueller/gps-tests into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-03 13:41:30 +02:00
51bcdafe33
renaming 2022-05-03 11:39:49 +02:00
c131c685a4
fix test task 2022-05-03 11:39:12 +02:00
08d7b3b859
update changelog 2022-05-03 11:34:47 +02:00
456dac6afd
SHM and socket readout working now 2022-05-03 11:33:07 +02:00
cce0d5448d
support both SHM and socket read 2022-05-03 00:55:01 +02:00
7aa900e6d5 Merge branch 'develop' into mueller/update-q7s-cp-script 2022-05-02 23:59:31 +02:00
c1d754d8ff
gps improvements 2022-05-02 23:52:53 +02:00
10d0bf1550
mini fix 2022-05-02 23:51:39 +02:00
9dc382706a Merge pull request 'Bugfix PCDU Handler' () from meier/pcduhandler-bugfix into develop
Reviewed-on: 
2022-05-02 15:51:54 +02:00
Jakob Meier
2f90c3e937 removed debug print 2022-05-02 13:51:56 +02:00
Jakob Meier
5f6a8fa37d bugfix pcdu handler command queue reading 2022-05-02 13:50:44 +02:00
2f3d60e974 Merge pull request 'Syrlinks FDIR' () from mueller/syrlinks-fdir into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-30 19:03:16 +02:00
c1fb7ce0df
update fsfw submodule 2022-04-30 16:38:43 +02:00
e919d3b7ef
delete ETL submodule 2022-04-30 16:36:45 +02:00
Jakob Meier
52bfcd7039 tmtc update 2022-04-30 15:55:45 +02:00
3d817363e6 fixed conflicts 2022-04-29 18:26:20 +02:00
7e36edc41c Merge pull request 'GOMSPACE Power components FDIR' () from mueller/gomspace-fdir into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-29 18:24:18 +02:00
074e2d8517
update cp script 2022-04-29 16:05:40 +02:00
3a03d6ca55
update CHANGELOG 2022-04-28 17:56:06 +02:00
f01f63d8e8 Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir 2022-04-28 17:55:40 +02:00
e16f5e68d6
update changelog 2022-04-28 17:54:47 +02:00
517aaf2146 Merge remote-tracking branch 'origin/develop' into mueller/syrlinks-fdir 2022-04-28 17:54:07 +02:00
bbe1e996e6 Merge pull request 'Host Fixes and CMakeLists.txt update' () from mueller/host-fixes-fsfw-update into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:16:03 +02:00
6d326137fb Merge pull request 'OBSW Config in file update' () from mueller/obsw-config-infile-update into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:15:37 +02:00
b40ceafbe0 Merge pull request 'disable -Wformat-truncation error' () from mueller/disable-warning-in-csp-lib into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:15:06 +02:00
a9e106bb71 Merge pull request 'Update README' () from mueller/update-README into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:14:42 +02:00
199acec3b5 Merge pull request 'Improvement for PCDU Handler' () from mueller/minor-tweaks-pcdu-handler into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:14:09 +02:00
d0b7531e48
create and assign gomspace power fdir 2022-04-28 15:58:31 +02:00
b97604d7d2
override event confirmed as well 2022-04-28 15:36:56 +02:00
7e230b64ea
create and add syrlinks fdir 2022-04-28 15:29:57 +02:00
7e2a993211
create rudimentary syrlinks fdir 2022-04-28 15:25:03 +02:00
ab85ebf83e
update CHANGELOG 2022-04-28 11:37:06 +02:00
b40302210f Merge remote-tracking branch 'origin/develop' into mueller/update-README 2022-04-28 11:33:54 +02:00
713bfbd7dc Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler 2022-04-28 11:33:35 +02:00
40168bcd5f Merge branch 'develop' into mueller/disable-warning-in-csp-lib 2022-04-28 11:33:13 +02:00
9ce7a28cff Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update 2022-04-28 11:32:59 +02:00
9bb6c41134
Merge branch 'mueller/host-fixes-fsfw-update' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/host-fixes-fsfw-update 2022-04-28 11:32:15 +02:00
e836ed8a2d
Merge remote-tracking branch 'origin/develop' into mueller/host-fixes-fsfw-update 2022-04-28 11:31:50 +02:00
a45f298505 Merge pull request 'GPSD test' () from mueller/gps-test into develop
Reviewed-on: 
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 11:12:52 +02:00
234a6b7ac3
switch gps ctrl to socket API 2022-04-28 10:50:39 +02:00
584700a2ba
do not add ETL lib 2022-04-28 10:21:04 +02:00
a1c3b1786f
bump submodules 2022-04-28 10:07:42 +02:00
bed58a45e5
move catch2 load directive to bottom 2022-04-27 09:02:12 +02:00
5b2239cee6
repoint fsfw 2022-04-27 08:55:21 +02:00
b3f0d19bb9
CMakeLists.txt order fixes 2022-04-26 20:20:56 +02:00
00bbc86d39
update CMakeLists.txt file 2022-04-26 20:10:09 +02:00
49b3120ada
remove etl submodule , want to use the one provided by the fsfw 2022-04-26 11:15:35 +02:00
2b33d8772c
fixes most warnings for host build 2022-04-26 10:37:25 +02:00