Commit Graph

384 Commits

Author SHA1 Message Date
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
fb5c6c4c17 continuation of failed mpsoc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 12:05:42 +02:00
28a4f782f9
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
Some checks failed
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
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-17 13:40:19 +02:00
a26b1bb311
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-16 15:17:29 +02:00
f20fcd9a72 Merge remote-tracking branch 'origin/develop' into mueller/rtds-update 2022-05-14 17:07:27 +02:00
478975db26
spi setup more stable now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 11:34:25 +02:00
1c9f411e75
new RTD handler working
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 09:41:28 +02:00
d60e7a706a fixed conflicts
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 18:44:52 +02:00
ac34bcbb3d
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 20:46:00 +02:00
5fe814e972 Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 15:48:26 +02:00
51466e68d7
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-12 14:11:46 +02:00
382d93863f
create and pass correct comIF
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 12:21:47 +02:00
38d03dbe57
bump deps, regenerate translation files
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-05-11 17:59:08 +02:00
91b69eacf6
A lot of stuff
All checks were successful
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
71d9553f90
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-08 13:06:47 +02:00
Jakob Meier
6dd57a3f5e fixed merge conflicts
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-06 19:44:18 +02:00
22060b9b16
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 01:12:07 +02:00
a11a8c493d
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-05 19:53:18 +02:00
0c82d06ec4
Merge remote-tracking branch 'origin/develop' into mueller/rename-sus
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 19:41:36 +02:00
b426475ca4
better RTD names 2022-05-05 16:55:08 +02:00
a232b9bf98
assign better sus names
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:46:04 +02:00
cf4edac604
maybe this fixes the timing issue?
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:32:09 +02:00
1f6aab8124
apply afmt, some more renaming
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 13:40:43 +02:00
Jakob Meier
8832d06d03 improvements for mram dump
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 08:55:45 +02:00
28c9e33d1c
separate PST for RWs 2022-05-05 02:00:56 +02:00
bcb6df87b0
update tmtc, gen files and formatting in config file
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 00:47:50 +02:00
3458c272ad
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 16:47:49 +02:00
Jakob Meier
475f6f1687 removed unused ploc commands, fix in logging report reply 2022-05-04 12:49:43 +02:00
50ca378318 update for updated gpio API
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 10:34:11 +02:00
ae0120f3ef
Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 17:44:02 +02:00
47f4aebd15
update auto-generated file
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 16:32:57 +02:00
9449919b2b
Heaters are own objects with HealthIF now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 22:45:27 +02:00
9e2eca3e36
re-generate event list
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 12:41:20 +02:00
Jakob Meier
be752997eb fixed merge conflicts
All checks were successful
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
6524f924c9 run generator scripts 2022-04-30 09:53:42 +02:00
c1248dd4e1
building new EM config
All checks were successful
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
7c770b5aec fixed conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-28 18:33:27 +02:00
794ed04761 prevent sending boot command when mpsoc booted via jtag 2022-04-28 18:30:40 +02:00
1527b60fd6
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 18:26:34 +02:00
bbe1e996e6 Merge pull request 'Host Fixes and CMakeLists.txt update' (#229) from mueller/host-fixes-fsfw-update into develop
All checks were successful
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
6d326137fb Merge pull request 'OBSW Config in file update' (#225) from mueller/obsw-config-infile-update into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #225
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-28 17:15:37 +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
2b33d8772c
fixes most warnings for host build
Some checks failed
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
4a2ba043cb fixed conflicts 2022-04-22 14:20:17 +02:00
1069762903
update config.h.in file
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 11:11:04 +02:00