95121b5120
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 15:47:21 +02:00
ad679a810e
Merge pull request 'add and schedule PUS11' ( #259 ) from mueller/add-schedule-pus-11 into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #259
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-25 15:21:25 +02:00
bb1e1d80cc
resolve merge conflict
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-25 11:00:18 +02:00
01bac87afb
update reset pin handling
EIVE/eive-obsw/pipeline/head Build started...
2022-05-25 10:59:20 +02:00
5d2a70b6c6
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 10:28:06 +02:00
ffdd6bbc3c
Merge branch 'develop' into mueller/add-schedule-pus-11
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
83c7ec8067
solve merge conflicts
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 10:12:37 +02:00
e1ed532f91
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-25 10:01:53 +02:00
3eca96fef5
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:57:34 +02:00
3fff3ba21e
add and schedule PUS11
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
633fe00cd6
run afmt, minor improvements
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 01:14:04 +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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 00:53:29 +02:00
1519b13b78
appears to work now
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 00:20:23 +02:00
e9908139e7
Merge branch 'develop' into mueller/core-controller-remount-sd-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:37:50 +02:00
dc6fa57c03
Merge branch 'develop' into mueller/core-controller-remount-sd-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-20 08:20:13 +02:00
49a06772d2
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-20 08:18:57 +02:00
a63e87f5f4
subscribe for periodic core ctrl packet
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-19 18:46:49 +02:00
d274f5647d
fix EM cofig
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 15:28:02 +02:00
e49a1af9b7
bump fsfw
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-18 14:51:33 +02:00
28a4f782f9
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-17 17:55:25 +02:00
8a5090b8ee
apply new auto-formatter on all files
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-17 13:40:19 +02:00
7080758c67
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-16 15:18:55 +02:00
2fa1061c65
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-16 15:11:24 +02:00
036024db7e
perm loop not necessary anymore
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 17:22:57 +02:00
f20fcd9a72
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
2022-05-14 17:07:27 +02:00
017cfb9d56
a lot of fixes, but some stuff doesnt work..
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 17:04:51 +02:00
478975db26
spi setup more stable now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 11:34:25 +02:00
1c9f411e75
new RTD handler working
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 09:41:28 +02:00
e81ddaa1a5
added auto-shutdown for faulty heaters
2022-05-12 20:44:36 +02:00
e25c492aa4
create and schedule health PUS service
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 19:22:20 +02:00
d7316eff66
remove merge conflict markers
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-12 14:23:10 +02:00
51466e68d7
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-12 14:11:46 +02:00
dd67191044
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 14:02:15 +02:00
c1faf65409
schedule new rtd reader component
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 12:35:05 +02:00
c1992f59d6
Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd
2022-05-11 17:04:19 +02:00
5a82fe93d9
core ctrl remount sd handling
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-11 17:02:57 +02:00
1d1f04f57b
Merge branch 'develop' into mueller/reboot-cmd
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-11 15:48:34 +02:00
c043375ae3
RW Refactoring
...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- FSFW update: SPI device is part of ComIF now
- Only set RW mode (speed is set a side effect but not necessary) once
- Release SPI bus in the 70 ms delay duration
2022-05-11 11:13:00 +02:00
91b69eacf6
A lot of stuff
...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- refactored and simplified RW assemblies
- create separate SPI Com IF for RWs
- Update .cproject file: Fixed to decrease indexer parsing times
2022-05-11 01:48:26 +02:00
df7e0007d0
schedule RW ASS
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-11 01:02:29 +02:00
4e78ee85c8
continued rw ass creation
2022-05-11 00:54:29 +02:00
71d9553f90
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-08 13:11:56 +02:00
d9085e81a1
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-08 13:06:47 +02:00
Jakob Meier
f8addd9365
preprocessor define fixes
2022-05-07 13:38:09 +02:00
Jakob Meier
43b0ed4b04
preprocessor define adjustments
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 20:33:46 +02:00
Jakob Meier
6dd57a3f5e
fixed merge conflicts
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-06 19:44:18 +02:00
28c9e33d1c
separate PST for RWs
2022-05-05 02:00:56 +02:00