Jakob Meier
3c3884476b
Merge branch 'develop' into meier/ccsds
2022-05-12 15:57:26 +02:00
569754bdad
Merge branch 'develop' into meier/ploc
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 15:48:56 +02:00
5fe814e972
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 15:48:26 +02:00
9db58210b8
Merge branch 'develop' into meier/ploc
2022-05-12 15:47:06 +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
e6f55ba2c1
increased execution timeout of prepare update command
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 14:04:55 +02:00
382d93863f
create and pass correct comIF
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 12:21:47 +02:00
a173ef4308
create low level rtd handler in obj factory
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 12:12:47 +02:00
6b9e49e632
continued low level MAX31865 handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 11:27:30 +02:00
0dd0af73a1
change in mpsoc status codes
2022-05-12 10:50:12 +02:00
23f209fb07
added eive specific max31865 handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 09:48:41 +02:00
Jakob Meier
e5710784b9
Merge branch 'develop' into meier/ccsds
2022-05-12 07:47:28 +02:00
56f491befb
compile fix
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 00:48:49 +02:00
93f605bc0a
Merge remote-tracking branch 'origin/develop' into mueller/rtds-update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-12 00:45:57 +02:00
38d03dbe57
bump deps, regenerate translation files
EIVE/eive-obsw/pipeline/head Build started...
2022-05-11 17:59:08 +02:00
Jakob Meier
a315a8b529
fixed conflicts
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-11 17:08:44 +02:00
Jakob Meier
c7e2cc22af
init sequence count
2022-05-11 16:49:07 +02:00
835a10e538
sequence count init
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-11 16:11:17 +02:00
625abcfd5b
important bugfixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-11 15:45:38 +02:00
Jakob Meier
914acd9925
fixed conflicts
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
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
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-11 12:46:04 +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
Jakob Meier
907b8f4a5d
ccsds config for te0720-1cfa
2022-05-10 07:48:36 +02:00
50c363fb6f
new RTD reader module handling all RTD SPI Communication
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
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
631bc61d6c
changed set ids
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-07 12:01:05 +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
d9c7cccf76
run clang format script
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 19:53:33 +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
Jakob Meier
4ba26f057d
Merge branch 'meier/ploc' into meier/plocSupv
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
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
22060b9b16
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
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
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
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
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?
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:32:09 +02:00
1f6aab8124
apply afmt, some more renaming
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
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 16:47:49 +02:00
535da53093
Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 17:44:02 +02:00
47f4aebd15
update auto-generated file
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 16:32:57 +02:00
06df558be0
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
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
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-03 11:33:07 +02:00
cce0d5448d
support both SHM and socket read
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 22:45:27 +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
9e2eca3e36
re-generate event list
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
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
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
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
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
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
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
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
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
6d326137fb
Merge pull request 'OBSW Config in file update' ( #225 ) from mueller/obsw-config-infile-update into develop
...
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
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
713bfbd7dc
Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler
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
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
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
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
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
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
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
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
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
1069762903
update config.h.in file
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 11:11:04 +02:00
737d18135f
test flag for RW
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-22 11:09:06 +02:00
0da74f1bf9
bump submodules, add some more devices by default
2022-04-22 11:08:27 +02:00
604d7ab228
Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 10:51:06 +02:00
165a4ef814
continued RW Assembly
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-22 10:28:29 +02:00
d6532f8181
Merge pull request 'Update for new yocto rootfs' ( #217 ) from mueller/yocto-rootfs into develop
...
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #217
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-22 10:21:52 +02:00
Jakob Meier
2ee9b09b27
logging command
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-22 08:55:57 +02:00
Jakob Meier
cf37d74728
adc report
2022-04-21 16:30:23 +02:00
e5d5af68c1
Important bugfix and improvement for PCDU Handler
...
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- Fixed out of bounds error
- Handle multiple messages in queue handler
- PCDU Handler now only called once in PST
2022-04-21 09:35:02 +02:00
Jakob Meier
73ba4a39b0
comments
2022-04-21 09:31:52 +02:00
Jakob Meier
38ecb9e055
cam commands
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-20 21:33:39 +02:00
5d8e8a9841
delete commented code
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-19 17:52:43 +02:00
4956161701
support both gps versions
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-19 17:47:05 +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
a4c5d8de45
adaptions for gpsd 3.17
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-18 00:25:33 +02:00
Jakob Meier
1ce45acba3
merged develop
2022-04-17 14:52:43 +02:00
be2834cb1a
linux ctrl only print warning once
2022-04-17 11:48:06 +02:00
d3403d341f
if gpssmm cant be opened, return prematurely
2022-04-17 01:06:37 +02:00
Jakob Meier
7b54855397
supervisor fixes detected during testing
2022-04-16 17:19:32 +02:00
25138d8931
update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-14 09:42:59 +02:00
Jakob Meier
10343a0dab
supervisor event buffer request
2022-04-14 07:52:21 +02:00
Jakob Meier
42b7b4a7c4
Merge branch 'develop' into mueller/release-warning-fixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-13 12:04:08 +02:00
Jakob Meier
bd8cd49117
event buffer request wip
2022-04-13 11:56:37 +02:00
Jakob Meier
7f51ffc8fb
use structs instead of classes
2022-04-12 17:42:41 +02:00
a14ca283cc
using vector for convert enables
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-12 16:36:04 +02:00
604870d1fe
split up op divider, assing imtq power switcher
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-12 15:27:48 +02:00
df38903fe9
some warning fixes for release build
2022-04-11 17:16:25 +02:00
Jakob Meier
05a85ab8a1
implemeted ICD changes
2022-04-11 16:52:50 +02:00
8a0999851f
update for new fsfw API
...
EIVE/eive-obsw/pipeline/head Build started...
- Apply auto-formatter
2022-04-11 14:56:20 +02:00
f05922e19e
Merge remote-tracking branch 'origin/develop' into mueller/split-pdu1-pdu2-sets
2022-04-11 08:55:25 +02:00
Jakob Meier
b440fc3df6
ploc update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-10 18:46:39 +02:00
90e8d7ecaf
Merge remote-tracking branch 'origin/develop' into mueller/pcdu-hk-core-sets
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-08 14:15:58 +02:00
c83efd149e
small tweak
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-08 11:41:17 +02:00
6ae9e539a6
more useful printout
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-08 11:40:35 +02:00
351920aa7b
some tweaks
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-08 11:31:29 +02:00