Commit Graph

3344 Commits

Author SHA1 Message Date
ffdd6bbc3c Merge branch 'develop' into mueller/add-schedule-pus-11
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #253
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-25 10:27:10 +02:00
0b3fd65c9a Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 10:16:31 +02:00
0ac38e8490 Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-25 10:16:14 +02:00
d79177e544 Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 10:15:48 +02:00
addcb2b21f Merge pull request 'IMTQ improvements' (#260) from meier/imtq into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #260
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-05-25 10:15:13 +02:00
7646b683b2
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:59:14 +02:00
3eca96fef5
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:58:06 +02:00
43fc1ab780
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:57:34 +02:00
2bf044422f
Merge remote-tracking branch 'origin/develop' into meier/imtq
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:56:41 +02:00
7f180ebc45 Merge pull request 'Reboot Command' (#242) from mueller/reboot-cmd into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
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
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 19:08:00 +02:00
b878508fec Thermal COntroller collecting Sus Temperatures
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-24 16:52:21 +02:00
88faf8f87d
bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 16:23:00 +02:00
c0da8aef2e
delete obsolete folder
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 15:50:39 +02:00
59d0d880bb
bump fsfw
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-24 15:45:12 +02:00
3eb8525419
update changelog
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-24 15:22:45 +02:00
3fff3ba21e
add and schedule PUS11
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-24 15:21:37 +02:00
3e9b337e31
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-24 01:14:47 +02:00
633fe00cd6
run afmt, minor improvements
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 01:14:04 +02:00
23d7b8f2fb
repoint tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 00:53:29 +02:00
1519b13b78
appears to work now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 00:52:08 +02:00
b2c286cd7e
improve and optimize SD card handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 00:20:23 +02:00
a1d2ec3db4
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 22:24:28 +02:00
b66a91da2e Merge branch 'develop' into mueller/core-controller-remount-sd-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 21:32:27 +02:00
72305cc4c2 Merge pull request 'rtd bugfixes' (#258) from mueller/rtd-bugfixes into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #258
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-23 19:36:13 +02:00
f111001572
bump tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:59:31 +02:00
5df905182c
these brackets are less confusing
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:40:17 +02:00
2f155d8350
bump changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:39:13 +02:00
e9908139e7 Merge branch 'develop' into mueller/core-controller-remount-sd-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:37:50 +02:00
43269d4add Merge branch 'develop' into mueller/rtd-bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 18:37:40 +02:00
40b02aa46b Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:37:28 +02:00
7d9ef6f887
run afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 18:37:04 +02:00
a2fad6061a
repoint tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:36:38 +02:00
62ef9c7e70
set datapool entries of rad sensor valid
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:25:39 +02:00
1f62d8284c
Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:01:37 +02:00
a4de3e9eb1
Merge remote-tracking branch 'origin/develop' into mueller/rtd-bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:00:45 +02:00
cc008623b6 Merge pull request 'PLOC handler improvements' (#257) from meier/ploc into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #257
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-05-23 17:53:55 +02:00
10e075efaf
update changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 17:52:44 +02:00
8aa664b49f
rtd bugfixes
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 17:50:54 +02:00
Jakob Meier
f18507d278 boot image select memory default argument
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 17:05:06 +02:00
Jakob Meier
e365b36ecd tmtc update 2022-05-23 17:04:03 +02:00
Jakob Meier
990759fbc6 commented in core controller file write
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 16:54:18 +02:00
Jakob Meier
d808a12c31 fixed conflicts
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 16:53:20 +02:00
Jakob Meier
379c5f06ba supervisor command to continue interrupted mpsoc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 16:43:46 +02:00
a2eabdce01 Merge pull request 'RTD Update' (#251) from mueller/rtds-update into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #251
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-23 16:20:37 +02:00