|
|
5b0f1efefd
|
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
|
2022-05-25 15:48:00 +02:00 |
|
|
|
95121b5120
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
|
2022-05-25 15:47:21 +02:00 |
|
|
|
335d3ba3b0
|
bump submodules
|
2022-05-25 15:45:11 +02:00 |
|
|
|
f50682b56a
|
Merge pull request 'Split ACU HK' (#256) from mueller/split-acu-hk into develop
Reviewed-on: #256
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 15:23:19 +02:00 |
|
|
|
ad679a810e
|
Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop
Reviewed-on: #259
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 15:21:25 +02:00 |
|
|
|
686ec4bffa
|
Merge pull request 'GPS Reset Pin Handling Update' (#261) from mueller/gps-reset-pin-update into develop
Reviewed-on: #261
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 15:20:12 +02:00 |
|
|
|
ae434853aa
|
bump number stored packets
|
2022-05-25 13:14:36 +02:00 |
|
|
|
bb1e1d80cc
|
resolve merge conflict
|
2022-05-25 11:00:18 +02:00 |
|
|
|
01bac87afb
|
update reset pin handling
|
2022-05-25 10:59:20 +02:00 |
|
Irini Kosmidou
|
44d36587aa
|
precised printouts
|
2022-05-25 10:51:22 +02:00 |
|
|
|
5d2a70b6c6
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
|
2022-05-25 10:28:06 +02:00 |
|
|
|
96564f890e
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
|
2022-05-25 10:28:00 +02:00 |
|
|
|
ffdd6bbc3c
|
Merge branch 'develop' into mueller/add-schedule-pus-11
|
2022-05-25 10:27:36 +02:00 |
|
|
|
d870f5ab10
|
Merge pull request 'Core Controller Remount SD Handling' (#253) from mueller/core-controller-remount-sd-handling into develop
Reviewed-on: #253
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-25 10:27:10 +02:00 |
|
|
|
c86e000f09
|
Update PL SS
|
2022-05-25 10:25:40 +02:00 |
|
|
|
f7d436dc6b
|
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
|
2022-05-25 10:23:22 +02:00 |
|
|
|
0b3fd65c9a
|
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11
|
2022-05-25 10:16:31 +02:00 |
|
|
|
0ac38e8490
|
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
|
2022-05-25 10:16:14 +02:00 |
|
|
|
d79177e544
|
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
|
2022-05-25 10:15:48 +02:00 |
|
|
|
addcb2b21f
|
Merge pull request 'IMTQ improvements' (#260) from meier/imtq into develop
Reviewed-on: #260
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2022-05-25 10:15:13 +02:00 |
|
|
|
e537080166
|
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
|
2022-05-25 10:14:09 +02:00 |
|
|
|
83c7ec8067
|
solve merge conflicts
|
2022-05-25 10:12:37 +02:00 |
|
|
|
581423a40e
|
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
|
2022-05-25 10:09:24 +02:00 |
|
|
|
e1ed532f91
|
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
|
2022-05-25 10:01:53 +02:00 |
|
|
|
7646b683b2
|
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
|
2022-05-25 09:59:14 +02:00 |
|
|
|
3eca96fef5
|
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
|
2022-05-25 09:58:06 +02:00 |
|
|
|
43fc1ab780
|
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11
|
2022-05-25 09:57:34 +02:00 |
|
|
|
2bf044422f
|
Merge remote-tracking branch 'origin/develop' into meier/imtq
|
2022-05-25 09:56:41 +02:00 |
|
|
|
7f180ebc45
|
Merge pull request 'Reboot Command' (#242) from mueller/reboot-cmd into develop
Reviewed-on: #242
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-24 19:11:07 +02:00 |
|
Jakob Meier
|
1ccd12e2e1
|
enable hk in imtq
|
2022-05-24 19:08:00 +02:00 |
|
Irini Kosmidou
|
2f4d44433d
|
scexDeviceHandler::interpretDeviceReply
|
2022-05-24 18:38:34 +02:00 |
|
|
|
b878508fec
|
Thermal COntroller collecting Sus Temperatures
|
2022-05-24 16:52:21 +02:00 |
|
|
|
88faf8f87d
|
bump fsfw
|
2022-05-24 16:23:00 +02:00 |
|
|
|
c0da8aef2e
|
delete obsolete folder
|
2022-05-24 15:50:39 +02:00 |
|
|
|
59d0d880bb
|
bump fsfw
|
2022-05-24 15:45:12 +02:00 |
|
|
|
3eb8525419
|
update changelog
|
2022-05-24 15:22:45 +02:00 |
|
|
|
3fff3ba21e
|
add and schedule PUS11
|
2022-05-24 15:21:37 +02:00 |
|
|
|
3e9b337e31
|
changelog
|
2022-05-24 01:14:47 +02:00 |
|
|
|
633fe00cd6
|
run afmt, minor improvements
|
2022-05-24 01:14:04 +02:00 |
|
|
|
23d7b8f2fb
|
repoint tmtc
|
2022-05-24 00:55:17 +02:00 |
|
|
|
d088d728b1
|
Merge branch 'mueller/reboot-cmd' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/reboot-cmd
|
2022-05-24 00:54:55 +02:00 |
|
|
|
237dd00216
|
Merge branch 'develop' into mueller/reboot-cmd
|
2022-05-24 00:54:49 +02:00 |
|
|
|
f7075a1397
|
Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd
|
2022-05-24 00:54:39 +02:00 |
|
|
|
2ebdb5c797
|
tweak sd card check countdown
|
2022-05-24 00:53:29 +02:00 |
|
|
|
1519b13b78
|
appears to work now
|
2022-05-24 00:52:08 +02:00 |
|
|
|
b2c286cd7e
|
improve and optimize SD card handling
|
2022-05-24 00:20:23 +02:00 |
|
|
|
a1d2ec3db4
|
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
|
2022-05-23 22:24:28 +02:00 |
|
|
|
b66a91da2e
|
Merge branch 'develop' into mueller/core-controller-remount-sd-handling
|
2022-05-23 21:32:27 +02:00 |
|
|
|
72305cc4c2
|
Merge pull request 'rtd bugfixes' (#258) from mueller/rtd-bugfixes into develop
Reviewed-on: #258
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
|
2022-05-23 19:36:13 +02:00 |
|
|
|
f111001572
|
bump tmtc
|
2022-05-23 18:59:31 +02:00 |
|
