Commit Graph

730 Commits

Author SHA1 Message Date
Jakob Meier
914acd9925 fixed conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-11 14:37:36 +02:00
Jakob Meier
c7e4704234 fixed merge conflict 2022-05-11 14:36:23 +02:00
c5bccb661e
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-11 13:54:04 +02:00
Jakob Meier
37002b47b3 sequence count init value
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-11 12:46:04 +02:00
c043375ae3
RW Refactoring
All checks were successful
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
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
50c363fb6f new RTD reader module handling all RTD SPI Communication
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-09 21:29:54 +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
631bc61d6c changed set ids
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-07 12:01:05 +02:00
Jakob Meier
43b0ed4b04 preprocessor define adjustments
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 20:33:46 +02:00
Jakob Meier
d9c7cccf76 run clang format script
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 19:53:33 +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
Jakob Meier
4ba26f057d Merge branch 'meier/ploc' into meier/plocSupv
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 19:36:03 +02:00
Jakob Meier
97222cafd9 increased mram dump execution timeout
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 19:34:12 +02:00
Jakob Meier
132751893b bugfix in missed reply hanling of supervsior MRAM dump 2022-05-06 19:30:20 +02:00
355ca27d31 Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 08:58:31 +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
fabd81365b supervisor do startup set time 2022-05-05 19:20:14 +02:00
5911ca79b5 nvm enable command 2022-05-05 19:18:39 +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
9bd5595999 no time command sent during startup of supervisor 2022-05-05 10:50:23 +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
Jakob Meier
8aacbc2b40 cam cmd reply handling 2022-05-04 19:08:37 +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
1508a1e147
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 16:43:31 +02:00
535da53093 Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 14:34:07 +02:00
86752417f2
changed for updated FSFW GPIO API 2022-05-04 14:14:17 +02:00
Jakob Meier
475f6f1687 removed unused ploc commands, fix in logging report reply 2022-05-04 12:49:43 +02:00
d0e18f8b35 add mutex protections for switcher states 2022-05-04 11:11:29 +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
3b40e622fe
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 16:02:45 +02:00
06df558be0
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-03 16:01:09 +02:00
88842d4f07 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-03 15:59:28 +02:00
08046ef621
Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 15:57:01 +02:00
Jakob Meier
5380ed216b supervisor do startup fix 2022-05-03 15:36:38 +02:00
Jakob Meier
464821cc6f supervisor set time during start up 2022-05-03 14:59:23 +02:00
456dac6afd
SHM and socket readout working now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-03 11:33:07 +02:00
cce0d5448d
support both SHM and socket read
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-03 00:55:01 +02:00
0f4fe7694b Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling 2022-05-03 00:01:55 +02:00
c1d754d8ff
gps improvements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-02 23:52:53 +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
7db0872ee3
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-02 12:49:53 +02:00
bab8412f10
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-02 12:41:45 +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
49b0825f63 added doSendReadHook to prevent com if polling when com if is used by helper task 2022-05-02 09:56:15 +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
6d322c6e78 run clang format script
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-30 16:21:59 +02:00
Jakob Meier
e1ffa97232 improved acknowledgment and execution handling in supervisor handler 2022-04-30 11:08:36 +02:00
Jakob Meier
6524f924c9 run generator scripts 2022-04-30 09:53:42 +02:00
816dc43214 restructuring execution report handling
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-29 23:34:28 +02:00
7afb8e9070 execution status codes 2022-04-29 23:22:44 +02:00
cedc6bec23 gpio state sent with execution report 2022-04-29 22:55:01 +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
9d4cb2ea8d xecution status code parsing 2022-04-29 13:31:58 +02:00
Jakob Meier
bf281343c6 fixed conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-29 09:04:49 +02:00
Jakob Meier
73c653d21d execution status code wip 2022-04-29 09:03:13 +02:00
Jakob Meier
f0884c0096 read gpio tm handling 2022-04-29 08:34:23 +02:00
0b64999ce2
added generic GPIO checker
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 18:38:38 +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
cb47667d01 Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 17:56:33 +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
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
7e230b64ea
create and add syrlinks fdir
Some checks are pending
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
ca1365df5b Merge remote-tracking branch 'origin/develop' into mueller/rw-ass 2022-04-28 13:08:34 +02:00
636e2d62d8 Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init 2022-04-28 13:06:48 +02:00
713bfbd7dc Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-28 11:33:35 +02:00
9ce7a28cff Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-28 11:32:59 +02:00
e836ed8a2d
Merge remote-tracking branch 'origin/develop' into mueller/host-fixes-fsfw-update 2022-04-28 11:31:50 +02:00
Jakob Meier
898753f6e3 supervisor reset pl command 2022-04-28 11:27:28 +02:00
234a6b7ac3
switch gps ctrl to socket API
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-28 10:50:39 +02:00
584700a2ba
do not add ETL lib
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-28 10:21:04 +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
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
42194abb4a commented in read function again 2022-04-25 13:36:30 +02:00
Jakob Meier
3e8429b34b warning print when memory check command fails 2022-04-25 13:36:06 +02:00
Jakob Meier
311ec7b194 mpsoc shutdown after running update procedure 2022-04-25 11:03:02 +02:00
f014e2d5c7
system folder restructuring
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-25 10:36:03 +02:00
Jakob Meier
6876952bbd regenerated events 2022-04-24 12:34:08 +02:00
f421fd4dde Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler 2022-04-23 12:30:45 +02:00
957b067eac Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update 2022-04-23 12:28:51 +02:00
9301206485 fixes identified during tests
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-22 18:05:03 +02:00
4a2ba043cb fixed conflicts 2022-04-22 14:20:17 +02:00
b63c3bb9c3 increased delay cycles of execution report 2022-04-22 14:17:16 +02:00
8b612d9116 include fix 2022-04-22 14:16:40 +02:00