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
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
3458c272ad
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 16:47:49 +02:00
ae0120f3ef
Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 17:44:02 +02:00
9449919b2b
Heaters are own objects with HealthIF now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 22:45:27 +02:00
b98c691c2b
added health helper to heater handler
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 17:51:00 +02:00
238afbaa8b
add health IF to heater handler
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 17:37:00 +02:00
bab8412f10
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-02 12:41:45 +02:00
Jakob Meier
be752997eb
fixed merge conflicts
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-30 19:12:21 +02:00
Jakob Meier
20138d52b1
decreased stack size of supervisor helper task
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-30 16:23:51 +02:00
Jakob Meier
016ca8cb7e
decreased acs handler task stack size
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-30 16:20:33 +02:00
Jakob Meier
729b8f547c
time file writing commended in again
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-30 16:19:00 +02:00
Jakob Meier
e1ffa97232
improved acknowledgment and execution handling in supervisor handler
2022-04-30 11:08:36 +02:00
c1248dd4e1
building new EM config
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-29 15:47:54 +02:00
0b64999ce2
added generic GPIO checker
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 18:38:38 +02:00
7c770b5aec
fixed conflicts
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-28 18:33:27 +02:00
73fbdfeb25
remove etl::pair usage
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 18:27:40 +02:00
31fa2f0d8d
include fix
2022-04-28 18:27:13 +02:00
1527b60fd6
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 18:26:34 +02:00
f01f63d8e8
Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir
2022-04-28 17:55:40 +02:00
bbe1e996e6
Merge pull request 'Host Fixes and CMakeLists.txt update' ( #229 ) from mueller/host-fixes-fsfw-update into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #229
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:16:03 +02:00
d0b7531e48
create and assign gomspace power fdir
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 15:58:31 +02:00
7e230b64ea
create and add syrlinks fdir
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 15:29:57 +02:00
Jakob Meier
582d2db05f
fixed conflicts
2022-04-28 14:29:23 +02:00
7682a1d214
fixed conflicts
2022-04-27 16:56:16 +02:00
7543a92dd9
added test code
2022-04-27 16:44:03 +02:00
Jakob Meier
8610e48b19
countdown based timeout
2022-04-27 16:08:17 +02:00
2b33d8772c
fixes most warnings for host build
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-26 10:37:25 +02:00
Jakob Meier
311ec7b194
mpsoc shutdown after running update procedure
2022-04-25 11:03:02 +02:00
Jakob Meier
6876952bbd
regenerated events
2022-04-24 12:34:08 +02:00
9f3a56e5e6
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
2022-04-23 12:37:25 +02:00
957b067eac
Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update
2022-04-23 12:28:51 +02:00
772a829333
small improvement
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-22 15:58:15 +02:00
4a2ba043cb
fixed conflicts
2022-04-22 14:20:17 +02:00
a416ca406b
git describe support finished
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-22 14:09:08 +02:00
aa84175382
pass power switcher for syrlinks handler creation
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 11:29:19 +02:00
d29dd48d1e
update project file: changed default unix sysroot
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 11:18:10 +02:00
Jakob Meier
a8f5a4054f
Merge branch 'develop' into meier/plocSupvUpdate
2022-04-21 17:34:26 +02:00
850722eae5
include improvements
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-19 17:24:04 +02:00
Jakob Meier
ffd64d0463
improvements in supervisor helper
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-19 13:33:37 +02:00