Commit Graph

889 Commits

Author SHA1 Message Date
b133a0538c
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-07-04 10:47:23 +02:00
d78155fd79 remove ccsds components from em object factory
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-06-27 14:56:46 +02:00
a2e7c6cca6 moved ccsds object creation back to core object factory and run auto formatter
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-27 10:58:46 +02:00
95da2372c9 run generators
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-27 09:15:29 +02:00
Jakob Meier
ed0eb4fe9c adaptions for setup with ccsds testbed
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-23 20:12:56 +02:00
89757c447c run auto-formatter
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-06-17 08:31:36 +02:00
Jakob Meier
1ebae7f938 fixes for te0720 build 2022-06-08 07:16:12 +02:00
Jakob Meier
8c850614e5 fixed merge conflicts 2022-06-05 10:54:46 +02:00
Jakob Meier
52d94f44d4 device temeprature set
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-01 10:48:18 +02:00
593cc68b84 rtd dataset
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-31 16:44:57 +02:00
0e6d2354fc thermal set fix
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-30 14:32:50 +02:00
Jakob Meier
8106722a08 replaced EM preprocessor define
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-27 16:24:41 +02:00
4632a56346 Merge branch 'develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-27 15:28:41 +02:00
Jakob Meier
9e93f1c814 adaptions for EM
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-27 13:44:40 +02:00
6f9d3c2f63 Merge branch 'develop' into meier/SdCardManager
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-05-26 12:15:14 +02:00
97db44e500
fix raspberry pi build
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-26 11:46:28 +02:00
Jakob Meier
c588ec4a1a bugfix SdCardManager
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-26 01:56:19 +02:00
95121b5120
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-25 15:47:21 +02:00
ad679a810e Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop
All checks were successful
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
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-25 11:00:18 +02:00
01bac87afb
update reset pin handling
Some checks are pending
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
All checks were successful
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
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-25 10:27:36 +02:00
83c7ec8067
solve merge conflicts
All checks were successful
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
Some checks failed
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:57:34 +02:00
3fff3ba21e
add and schedule PUS11
Some checks failed
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 00:53:29 +02:00
1519b13b78
appears to work now
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:37:50 +02:00
7d9ef6f887
run afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-23 18:37:04 +02:00
dc6fa57c03 Merge branch 'develop' into mueller/core-controller-remount-sd-handling
All checks were successful
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
Some checks failed
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
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-19 18:46:49 +02:00
e73bfc2c64
dev string for FM/EM
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 16:00:26 +02:00
d274f5647d
fix EM cofig
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 15:28:02 +02:00
377f762ca5
fixed for new SPI HAL API
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 14:54:44 +02:00
e49a1af9b7
bump fsfw
All checks were successful
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
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
7080758c67
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-16 15:11:24 +02:00
036024db7e
perm loop not necessary anymore
All checks were successful
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..
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 17:04:51 +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
e81ddaa1a5
added auto-shutdown for faulty heaters 2022-05-12 20:44:36 +02:00
e25c492aa4
create and schedule health PUS service
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 19:22:20 +02:00
82f75bde97
fix for heater creation call 2022-05-12 19:12:12 +02:00
Jakob Meier
919141ae10 ccsds handler sending command to enable transmitter 2022-05-12 18:32:19 +02:00
d7316eff66
remove merge conflict markers
Some checks failed
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 14:02:15 +02:00
c1faf65409
schedule new rtd reader component
All checks were successful
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
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
Jakob Meier
e5710784b9 Merge branch 'develop' into meier/ccsds 2022-05-12 07:47:28 +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
All checks were successful
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
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-11 15:48:34 +02:00
625abcfd5b
important bugfixes
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-11 15:45:38 +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
df7e0007d0
schedule RW ASS
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-11 01:02:29 +02:00
8ccd55dd06
update .cproject file
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-11 00:58:19 +02:00
4e78ee85c8
continued rw ass creation 2022-05-11 00:54:29 +02:00
db7dcc7e32
start creating rw ass in obj factory
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-10 18:39:23 +02:00
45c1ac0f61
update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-10 18:34:39 +02:00
Jakob Meier
907b8f4a5d ccsds config for te0720-1cfa 2022-05-10 07:48:36 +02:00
4864394590 renamed heaters
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-09 16:13:33 +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
421237bfb7 fixed ploc supervisor build error which was hidden by prerocessor define
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-08 12:01:35 +02:00
Jakob Meier
2bc2325b1f removed unused includes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-07 13:59:53 +02:00
Jakob Meier
f8addd9365 preprocessor define fixes 2022-05-07 13:38:09 +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
322db3d617 removed ploc updater 2022-05-06 19:52:43 +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
99a8cd0f2d Merge branch 'develop' into mueller/reboot-cmd
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-06 10:11:58 +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
b426475ca4
better RTD names 2022-05-05 16:55:08 +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
4c809e354d
better heater obj id names
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:23:46 +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
28c9e33d1c
separate PST for RWs 2022-05-05 02:00:56 +02:00
d108f7bbda
Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd
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-04 16:54:39 +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
d0e18f8b35 add mutex protections for switcher states 2022-05-04 11:11:29 +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
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
f435f7217e
move RW loading opt to CMakeLists.txt
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 11:54:48 +02:00
ac0b2e0dce
update object factory files
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 11:53:10 +02:00