a134f3f100
Merge remote-tracking branch 'origin/develop' into irini
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-16 18:52:16 +02:00
6ead94b5f4
this is even better
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-16 17:49:50 +02:00
7e3517d309
it compiles again
2022-08-15 18:34:26 +02:00
c99cb4a81e
schedule ACS controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-15 09:58:18 +02:00
4649c97205
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-08 17:12:12 +02:00
bd40af34c8
Merge branch 'develop' into irini
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-08 17:10:57 +02:00
89b3b2ff42
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-08 17:08:56 +02:00
722d7a67f5
important bugfix for FM SW
EIVE/eive-obsw/pipeline/head This commit looks good
2022-08-04 01:45:49 +02:00
8b39f65472
modify oss to append at end
2022-07-13 11:25:53 +02:00
563e13765d
Merge remote-tracking branch 'origin/develop' into irini
EIVE/eive-obsw/pipeline/head This commit looks good
2022-07-08 16:27:50 +02:00
b133a0538c
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-07-04 10:47:23 +02:00
9e89a0689f
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-07-04 10:46:47 +02:00
d78155fd79
remove ccsds components from em object factory
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
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-27 10:58:46 +02:00
95da2372c9
run generators
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
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-23 20:12:56 +02:00
89757c447c
run auto-formatter
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
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-01 10:48:18 +02:00
593cc68b84
rtd dataset
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-31 16:44:57 +02:00
0e6d2354fc
thermal set fix
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-27 15:28:41 +02:00
10a82eca25
Merge branch 'develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-27 15:28:23 +02:00
Jakob Meier
9e93f1c814
adaptions for EM
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
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-05-26 12:15:14 +02:00
1f616a101d
add scex preproc define to OBSWConfig.h.in
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-26 12:10:56 +02:00
97db44e500
fix raspberry pi build
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-26 11:46:28 +02:00
Jakob Meier
c588ec4a1a
bugfix SdCardManager
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
5b0f1efefd
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 15:48:00 +02:00
95121b5120
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
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
...
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
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
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
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
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
c86e000f09
Update PL SS
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 10:25:40 +02:00
e537080166
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-25 10:14:09 +02:00
83c7ec8067
solve merge conflicts
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 10:12:37 +02:00
581423a40e
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-25 10:09:24 +02:00
e1ed532f91
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:57:34 +02:00
3fff3ba21e
add and schedule PUS11
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-24 00:53:29 +02:00
1519b13b78
appears to work now
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-23 18:37:50 +02:00
7d9ef6f887
run afmt
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
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
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 16:00:26 +02:00
d274f5647d
fix EM cofig
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
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
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
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
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-16 15:11:24 +02:00
036024db7e
perm loop not necessary anymore
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..
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 17:04:51 +02:00
478975db26
spi setup more stable now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-14 11:34:25 +02:00
1c9f411e75
new RTD handler working
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
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
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
dd67191044
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 14:02:15 +02:00
c1faf65409
schedule new rtd reader component
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
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
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
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-11 15:48:34 +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
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
8ccd55dd06
update .cproject file
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-10 18:39:23 +02:00
45c1ac0f61
update
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
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
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
421237bfb7
fixed ploc supervisor build error which was hidden by prerocessor define
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-08 12:01:35 +02:00
Jakob Meier
2bc2325b1f
removed unused includes
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
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
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
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
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?
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:32:09 +02:00
4c809e354d
better heater obj id names
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-05 16:23:46 +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
28c9e33d1c
separate PST for RWs
2022-05-05 02:00:56 +02:00
d108f7bbda
Merge remote-tracking branch 'origin/develop' into mueller/reboot-cmd
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 16:43:31 +02:00
a6c6325d41
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-04 16:41:08 +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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 17:44:02 +02:00
e8e3138fba
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 16:05:01 +02:00
3b40e622fe
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
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
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
f435f7217e
move RW loading opt to CMakeLists.txt
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 11:54:48 +02:00
ac0b2e0dce
update object factory files
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-03 11:53:10 +02:00
51bcdafe33
renaming
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-03 11:39:49 +02:00
c131c685a4
fix test task
EIVE/eive-obsw/pipeline/head Build started...
2022-05-03 11:39:12 +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
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
0e97c4ad9a
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-02 12:55:15 +02:00
7db0872ee3
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
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
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
6d322c6e78
run clang format script
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-30 16:21:59 +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
5888d90fbc
continued reboot command
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-29 11:16:53 +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
cb47667d01
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
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
...
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
0697cca88a
started acs subsystem
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-25 13:36:11 +02:00
Jakob Meier
311ec7b194
mpsoc shutdown after running update procedure
2022-04-25 11:03:02 +02:00
f9dd77b8ec
create and schedule ACS SS
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-25 10:50:59 +02:00
f014e2d5c7
system folder restructuring
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-25 10:36:03 +02:00
9ba65b04fd
add IDLE charge mode
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-25 10:30:47 +02:00
bbb4ba2191
baseline acs mode tree done
2022-04-25 10:08:29 +02:00
baa6f05f8e
neat
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-25 08:48:22 +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
c262d1ef90
Merge remote-tracking branch 'origin/develop' into mueller/hand-written-subsystem
2022-04-23 12:21:04 +02:00
874e06baa1
continued acs subsystem
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-22 17:49:28 +02:00
a0db5dcc7c
add first mode sequence for acs ss
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-22 17:00:23 +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
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
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
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
07d345183e
rename gps dev
2022-04-17 01:07:23 +02:00
a14af7f728
update path setter
2022-04-17 01:04:53 +02:00
aa95aa185b
Merge remote-tracking branch 'origin/develop' into mueller/master
2022-04-17 01:01:08 +02:00
2e93d7300a
some more fixes
2022-04-17 01:00:06 +02:00
f6f51665a2
fix for script path
2022-04-17 00:56:31 +02:00
Jakob Meier
7b54855397
supervisor fixes detected during testing
2022-04-16 17:19:32 +02:00
1db5d278f6
switcher handling extension
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build started...
2022-04-14 11:17:07 +02:00
25138d8931
update
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-14 09:42:59 +02:00
655497934b
apply afmt
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-13 18:55:49 +02:00
fd3313fc62
assign power switcher for imtq and star tracker
EIVE/eive-obsw/pipeline/head Build started...
2022-04-13 18:55:07 +02:00
a72c2f7b7d
submodule and obj factory updates
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-13 18:51:22 +02:00
Jakob Meier
bd8cd49117
event buffer request wip
2022-04-13 11:56:37 +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
5e0e8232df
dev conf update for updated fsfw
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-11 14:54:44 +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
d5bdc00abf
start bpx batt immediately
...
EIVE/eive-obsw/pipeline/head This commit looks good
but defer it until the com mode was set to i2c
2022-04-09 18:56:32 +02:00
a5881a238b
store time file with lower frequency
2022-04-09 18:51:46 +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
4a6840f098
bugfixes and improvements
...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- Tests finished
2022-04-08 11:22:16 +02:00
59d58da4f2
splitting pdu1 and pdu2 sets done
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-07 19:48:09 +02:00
796b814b49
Add time file handling
2022-04-07 17:23:50 +02:00
3f6a534db5
fixes identified during tests
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-06 17:27:44 +02:00
Jakob Meier
d48ec92d09
fixed conflicts
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-05 13:57:16 +02:00
Jakob Meier
d2f54f033f
syrlinks
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 14:58:35 +02:00
ec880d4232
apply auto-formatter
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 13:40:45 +02:00
007badc324
bugfix in SUS device handler
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-03 20:35:49 +02:00
8a4de72713
update header file as well
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-01 14:13:37 +02:00
c231a775b3
Merge remote-tracking branch 'origin/develop' into mueller/move-gnss-nreset-handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-01 14:05:32 +02:00
1eb5a428cb
move GNSS NReset handling to assembly
...
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
- Also update fsfwgen dependency
2022-04-01 14:01:12 +02:00
d769d3ce22
Merge remote-tracking branch 'origin/develop' into meier/deviceHandlerUpdate
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-01 13:41:04 +02:00
Jakob Meier
ca1e8f3dc1
syrlinks fault flag
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-01 09:20:35 +02:00
33ec092998
ported RTD code as well
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-31 17:58:16 +02:00
Jakob Meier
b29a0cd0fb
syrlinks temperature set and temperature protection
2022-03-31 17:44:29 +02:00
053c65b6cd
Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-31 16:42:52 +02:00
Jakob Meier
222f17edcc
Merge branch 'develop' into meier/deviceHandlerUpdate
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-31 15:48:58 +02:00
Jakob Meier
2dca9d598d
mpsoc startup command
2022-03-30 09:19:30 +02:00
9f937781b7
Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-29 15:43:35 +02:00
b5363604bc
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-29 15:40:02 +02:00
618d7a3358
Merge branch 'meier/plocMPSoC' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/plocMPSoC
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-28 17:39:38 +02:00
991f864375
star tracker fixes
2022-03-28 17:38:57 +02:00
e6ad0978de
run auto-formatter
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-28 13:54:46 +02:00
d6ed952fa9
use power switcher to turn on supervisor
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-28 11:34:06 +02:00
0c889f9492
Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-refactoring
2022-03-28 10:33:49 +02:00
a9a6bbd948
fixed conflicts
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-28 10:10:01 +02:00
Jakob Meier
758c4e6f4f
uart isolator switch handling
2022-03-28 09:08:11 +02:00
Jakob Meier
e2c9bece05
adding uart isolator switches wip
2022-03-27 14:42:20 +02:00
Jakob Meier
6d04c278c3
run clang formatting script
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-27 13:07:18 +02:00
Jakob Meier
44a0d4af61
removed te0720 code form q7s files
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-27 10:56:40 +02:00
Jakob Meier
ceb7f40d35
fixed merge conflicts
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-27 10:44:32 +02:00
Jakob Meier
471a981ccf
mpsoc flash write command
2022-03-26 20:47:25 +01:00
2410c6ccc6
added SUS component creation to RPi
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-26 16:38:42 +01:00
ac0326a944
various improvements
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-26 13:54:05 +01:00
Jakob Meier
47a3804145
fixed conflicts
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-26 10:41:30 +01:00
2f6d9ab7f1
fixed merge conflicts
2022-03-25 18:49:34 +01:00
4bf0521a5d
increased pl pcdu debug divider
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-25 17:02:21 +01:00
74fa98d161
add dual lane power switcher for PL PCDU
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-25 15:56:44 +01:00
931c53f1a6
corrections during e-band test
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-25 12:57:42 +01:00
6e91462cba
better rtd printout
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-23 15:02:48 +01:00
1cd98c5604
Merge remote-tracking branch 'origin/mueller/tcs-subsystem' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-23 13:39:25 +01:00
368b01c081
include fixes
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-23 11:13:59 +01:00
4afacbe82b
new system ctl task
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-22 19:15:13 +01:00
5b7dd7c432
assign rtd fdir , create TCS BOARD ASS
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-22 19:10:28 +01:00
1d712854bf
Merge remote-tracking branch 'origin/develop' into mueller/master
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-22 17:59:05 +01:00
ce8253b940
TCS subsystem continued
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-22 15:49:22 +01:00
bcd97076e1
started TCS subsystem
EIVE/eive-obsw/pipeline/head This commit looks good
2022-03-22 11:57:48 +01:00
c95374bfbd
refresh events, objects, retvals
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-03-22 10:15:04 +01:00
a18a752b8e
rerun generators
2022-03-18 11:37:44 +01:00
Jakob Meier
253e2731bd
only include lxiphos when building for q7s
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-18 06:45:40 +01:00
Jakob Meier
33b250562b
fixed conflicts
2022-03-17 20:03:04 +01:00
e5a4065055
add and instantiate SUS ASS + SUS FDIR
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-17 19:59:47 +01:00
Jakob Meier
8d70560968
fixed conflicts
2022-03-17 19:52:37 +01:00
acd0307591
continued ACS board + SUS board assemblies
...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
- Handling and Testing of basic FDIR
2022-03-17 19:23:39 +01:00