cfad85c6c5
fixed some bugs
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-16 17:57:21 +01:00
c29d7e6f3e
no bugs
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-16 16:54:58 +01:00
feb59d321c
done and bugfree
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-16 16:08:17 +01:00
8b0eceb072
continue rw refactoring
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-15 17:02:22 +01:00
Jakob Meier
e7123a4bb1
fixed merge conflicts
2023-02-15 10:29:34 +01:00
166fd77f7b
stupid RW
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-14 18:41:43 +01:00
ecb22bdd85
further cut down the number of threads
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-14 11:32:03 +01:00
2aac3c67ee
instrumented some more tasks
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-14 11:10:18 +01:00
66d20dc118
add tracing for first tasks
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-14 10:59:35 +01:00
4ba0d36800
Merge remote-tracking branch 'origin/develop' into make_satsyste_work_on_em
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-02-13 18:01:20 +01:00
6a1d4bd52f
continue
2023-02-13 18:01:16 +01:00
17fa9a6e82
add TCS board assy for EM
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-13 17:04:04 +01:00
2813d229bb
comntinue
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-13 16:39:26 +01:00
efbb5d69c7
remove removed task start
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-13 15:44:19 +01:00
b4d9ea6c19
lets see if this fixes issues
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-13 15:37:42 +01:00
97a001a1da
continue satsytem for EM
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-13 13:53:13 +01:00
59a0a74032
start adding assy components for EM
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-13 11:49:26 +01:00
Jakob Meier
60c99fdbfb
local parameter handler wip
2023-02-13 11:28:27 +01:00
7e3de3ca95
timing problem does not fully disappear..
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-13 09:56:57 +01:00
3759b5d34a
I am happy with this version
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-13 01:26:30 +01:00
2f2d164526
this is crap but might just work
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-12 21:27:10 +01:00
f5b5ef66b7
some tweaks for SPI, some fixes
2023-02-12 20:01:20 +01:00
84a4d093bc
schedule new EIVE system
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-10 18:07:44 +01:00
37b786898e
prep v1.26.4
2023-02-10 14:02:27 +01:00
29eda50e35
EM compiles
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-09 17:23:30 +01:00
7eab7169f7
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
2023-02-08 21:17:33 +01:00
c04936d0dc
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-08 16:54:07 +01:00
13b3fe03b8
afmt and changelog
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-08 16:46:30 +01:00
79a13b8b6a
update sched again
2023-02-08 16:45:19 +01:00
b1da4bb81b
remove doubly scheduled ACS CTRL
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-08 14:33:48 +01:00
6fa1084d21
Merge remote-tracking branch 'origin/develop' into acs_update_scheduling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-08 13:01:21 +01:00
02f0349525
done
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-02-08 11:53:20 +01:00
37988fbfd4
complete impl
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-08 11:17:08 +01:00
c170bff720
add release checklist
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-08 11:08:38 +01:00
835d2277d8
impl variable freq depending on build type
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-07 17:54:56 +01:00
8bc71b268e
some tests with subsystem
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-07 17:28:59 +01:00
b6022d2ff1
should be covered by PST now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-07 10:34:09 +01:00
b1ea53ef1e
Merge remote-tracking branch 'origin/develop' into acs_update_scheduling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-07 10:31:40 +01:00
86babcf07b
important fix
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-02-06 18:23:04 +01:00
4d6215f546
fixes for scheduling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-06 10:20:22 +01:00
10378ef1bb
bugfix for GPS handler
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-02-05 13:13:09 +01:00
e4a227359b
some bugfixes, syrlinks needs to remain in PST cause of some bug
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-02-03 15:02:08 +01:00
e46b4c51d5
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-03 11:47:16 +01:00
c2fb224fea
ACS Update scheduling
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-02 17:06:26 +01:00
Jakob Meier
fc1dedeb7a
moved transmitter timer and event handling of carrier and bitlock to ComSubsystem
2023-02-02 15:33:04 +01:00
c63ca66f68
done
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-01-28 14:49:28 +01:00
9ad34aa395
schedule COM subsystem
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-01-27 15:19:09 +01:00
9b211e1de7
do COM SS interconnect
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-01-27 15:10:26 +01:00
438f9f3358
com subsystem
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-01-27 14:44:40 +01:00
9410902454
go to startup immediately
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-01-26 13:02:29 +01:00
d432443545
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-01-25 14:07:48 +01:00
ae6f6538d2
add syrlinks submode handling
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-01-24 19:40:27 +01:00
1f08d85319
rename syrlinks handler
EIVE/eive-obsw/pipeline/head This commit looks good
2023-01-24 19:11:17 +01:00
fe80ff4070
move some config and tweak queue sizes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-01-23 11:52:46 +01:00
aa4f0b4eea
tested TCS subsystem
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-01-23 11:31:15 +01:00
5e7a088da9
try to understand the thermal stuff
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-01-17 15:45:54 +01:00
bc169d50b9
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-01-13 11:26:07 +01:00
6503778cd5
various bugfixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-01-10 14:17:55 +01:00
88dcba7966
Merge branch 'develop' into mueller_5v_stack_cmd_for_devices
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-01-10 10:56:19 +01:00
d51904de2d
disabled damaged PL PCDU1 TMP1075
EIVE/eive-obsw/pipeline/head This commit looks good
2023-01-09 11:57:48 +01:00
73df54abb0
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-12-22 16:22:53 +01:00
268233551d
use stack handler in PL PCDU component
EIVE/eive-obsw/pipeline/head This commit looks good
2022-12-22 11:10:55 +01:00
9aedc32527
disable rad sensor auto-on
EIVE/eive-obsw/pipeline/head This commit looks good
2022-12-22 11:00:04 +01:00
b75102f670
add 5V stack handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-12-21 14:11:31 +01:00
de3b2cefb0
reinitiate reboot file disabled
EIVE/eive-obsw/pipeline/head This commit looks good
2022-12-20 11:45:21 +01:00
141a3e9be8
Merge remote-tracking branch 'origin/develop' into heater_handling
2022-12-02 18:05:55 +01:00
1c4e9c8db6
Merge remote-tracking branch 'origin/develop' into mueller_consecutive_tmtc_server
2022-12-02 16:39:45 +01:00
d36202d86b
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-12-02 16:24:19 +01:00
c6c2469487
allow consecutive tcp and udp server
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-12-02 13:55:19 +01:00
266e1a8527
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-12-01 16:40:18 +01:00
fb2325b9ea
Merge remote-tracking branch 'origin/develop' into acs-ctrl-v1
2022-12-01 15:57:09 +01:00
f73d293cdd
schedule PL task
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-30 18:08:16 +01:00
46165f8166
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-28 08:49:00 +01:00
a20dce5a87
cmakelists fix, bump fsfw
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-28 08:48:19 +01:00
23f12d2fd1
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-25 11:04:46 +01:00
f771fefbc9
rename scheduling file
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-11-25 11:04:33 +01:00
44aae18311
q7s compiles again
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-25 11:01:06 +01:00
35cd18240c
generic scheduler function
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-25 10:37:10 +01:00
f3ac6d4a7e
added GPS and RW sensor readings. added RW1..4 dummies to acsTask
2022-11-21 11:18:39 +01:00
3ef0b3ea6d
TAS PLOC SUPV
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-16 15:03:10 +01:00
2f0f837534
Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-15 13:42:22 +01:00
d51c088afd
there is only one tmp1075 left
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-14 09:16:17 +01:00
a855920fb2
README update, I2C addr update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-14 09:12:15 +01:00
1a17770bbc
all TMP1075 dev except the OBC IF board one working
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-11 18:52:12 +01:00
0815380044
create all available TMP devices
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-11 16:24:44 +01:00
7921acefd4
Merge remote-tracking branch 'origin/develop' into mueller/tmp_dev_updates
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-11 15:50:23 +01:00
a21e938f36
renamed cookie as well
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-11 11:41:40 +01:00
7ce24ef392
update TMP1075 dev handlers
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-11 11:12:43 +01:00
a07a55eac1
Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-10 18:14:53 +01:00
ceba3b9dca
renaming of fsfw_hal components
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-10 18:07:59 +01:00
02df949a48
this seems to work
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-10 17:42:19 +01:00
ec7ce5ddb6
ploc components now compile for hosted (linux)
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-10 17:32:11 +01:00
d690a54005
connect payload children to subsystem
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-10 15:39:08 +01:00
07d93b6b67
schedule PL components differently
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-10 14:08:44 +01:00
47b65a1fa3
create cam switcher, create new PL task
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-10 13:09:31 +01:00
cb49ec1c7e
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-09 15:15:57 +01:00
ea6fd8c952
smaller fixes and improvements
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-09 13:07:20 +01:00
d184f7487e
post merge cleanup
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-11-04 14:54:23 +01:00
895d03a35c
Merge branch 'develop' into eggert/acs
...
# Conflicts:
# dummies/CMakeLists.txt
# mission/controller/AcsController.cpp
# mission/controller/AcsController.h
2022-11-04 14:19:43 +01:00
fe6b13bb81
start fixing this crap
2022-11-03 22:59:51 +01:00
9503b2ca93
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
2022-11-03 20:10:05 +01:00
beb99d53f7
pus test service has higher prio now
2022-11-02 19:35:35 +01:00
70092b348a
pdec handler has higher priority now
2022-11-02 19:15:07 +01:00
964f9dc688
Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-02 14:16:14 +01:00
b1f7c66066
Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-02 10:37:52 +01:00
39778f9663
Merge remote-tracking branch 'origin/develop' into mueller/tm_funnel_improvements
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-02 10:37:15 +01:00
76283e0e49
refactored TM funnels to allow multiple TM recipients
2022-11-02 10:26:45 +01:00
d19ddaa46c
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 17:00:14 +02:00
51572208a9
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 16:59:32 +02:00
655c38a210
Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 15:34:54 +02:00
82af8e00df
bufixes for PDEC
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 14:02:34 +02:00
95d2bc0887
first IRQ impl
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 10:49:52 +02:00
890fba18e1
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 09:18:12 +02:00
ae16dcc4a7
afmt + changelog
EIVE/eive-obsw/pipeline/head Build started...
2022-10-27 09:00:21 +02:00
23238a1e58
reenable core ctrl + minor fm fix
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-27 08:48:46 +02:00
db47e56474
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 08:31:47 +02:00
592cbf6fad
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 08:31:21 +02:00
5173a0c9cb
its the rad sensor
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-26 17:11:57 +02:00
d7ff74b6bd
better configurability for PDEC/PTME usage
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-26 16:11:34 +02:00
3475e167ee
perform SD card check more often for 2-3 cycles
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-26 15:57:07 +02:00
00059251f0
further clean up em and general code
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-26 15:47:23 +02:00
1c9c2aba5b
Merge pull request 'safety mechanism on reboots' ( #308 ) from mueller/sdc-safety-mechanism-on-reboot into develop
...
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #308
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2022-10-25 14:33:58 +02:00
9b8d2f3097
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-25 13:13:41 +02:00
a9096a46c0
safety mechanism on reboots
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-25 11:04:24 +02:00
f4067abdac
Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-21 15:37:52 +02:00
dd7521cc4b
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-21 15:37:25 +02:00
83b8cf3198
Merge remote-tracking branch 'origin/develop' into mueller/imtq-updates
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-21 15:33:47 +02:00
b9b850f621
object ID corrections
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-21 14:49:54 +02:00
b6a5c8c854
added TODO, remove obsolete code
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-21 11:54:14 +02:00
dc45c53e38
add new CFDP and PUS TM funnel
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-21 11:51:44 +02:00
ab273a8a59
re-use dipole set in IMTQ handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 10:32:17 +02:00
386fc60441
new static variables to make torque status available
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-19 18:52:16 +02:00
d190165bf3
Merge remote-tracking branch 'origin/mueller/acs-ss-init' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-17 10:52:05 +02:00
ed7bba2cf5
renaming
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-17 10:34:57 +02:00
a8e03ab8fe
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-10-17 10:28:53 +02:00
c800ddfa31
basic SD card remount FDIR
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-14 15:33:34 +02:00
213787d435
start SA depl task
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 18:15:28 +02:00
2a9dc518a0
added GpsDummy
2022-10-12 15:04:19 +02:00
a2e1ed56c9
pass SDC man to SA DEPL handler
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 14:09:07 +02:00
09c0afbe7f
simplified SA Depl init
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 13:56:25 +02:00
ea82748496
new solar array deployment task
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 13:29:38 +02:00
b6b258d82c
remove gpio pst
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 13:21:58 +02:00
214428295b
only do time file handling with mounted SD card
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 12:01:48 +02:00
d929b27c08
emplaced STR quaternion related dataPool. added STR dummy to acsTask
2022-10-12 10:26:33 +02:00
d3d29a3691
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-11 23:13:37 +02:00
21258c2d79
fix core controller
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-11 22:58:31 +02:00
b2a715ef6a
added GYR dummies to acsTask. Added complete GYR dataSets to the dummies
2022-10-11 15:00:37 +02:00
964e0a3d8e
re-run afmt
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 17:41:52 +02:00
0f57810a9a
re-run afmt
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-10 17:40:30 +02:00
63d660119e
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-10-10 17:39:47 +02:00
c82c4cf9d1
Merge remote-tracking branch 'origin/develop' into scex-additions
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-10 11:16:19 +02:00
20b7f8b46b
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-10 11:10:07 +02:00
50d41215fa
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-10 10:15:55 +02:00
9d0e10eb1e
fixed dummies, scheduled dummies as part of acsTask
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-04 13:45:13 +02:00
470b236008
fixed some of the acs ss code
2022-09-30 15:05:48 +02:00
66c6f08447
connect acs ctrl to subsystem
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-30 14:30:30 +02:00
57d37f14f3
fixed some bugs
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-30 14:14:59 +02:00
dcd0a650f0
this should do the job
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-30 13:30:22 +02:00
d10ff4efa6
compiles again
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-30 12:09:03 +02:00
6af7ccc6a2
need to fix all of these TODOs
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 19:40:00 +02:00
9512a7d280
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 17:50:09 +02:00
f27fccfd29
set DHB parents differently now
2022-09-29 17:06:19 +02:00
0f609fdaba
thats a bit tricky
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 16:47:47 +02:00
541b44cea7
re-run afmt
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 14:10:21 +02:00
49efbc4725
some bugfixes
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:53:42 +02:00
151d27985f
Merge remote-tracking branch 'origin/develop' into scex-additions
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:43:58 +02:00
a152553d00
Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 13:32:10 +02:00
269de1782a
Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-27 19:26:23 +02:00
Irini Kosmidou
5f2a0e107d
Merge branch 'scex-additions' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into scex-additions
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 19:18:19 +02:00
Irini Kosmidou
071e00e0ef
dog fixed
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 19:17:24 +02:00
aab2dc6367
Merge branch 'develop' into scex-additions
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 19:14:40 +02:00
Irini Kosmidou
32c2b2038c
constructor correction
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 19:06:55 +02:00
Irini Kosmidou
308a855d8c
bugfix for scex testcode
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 18:54:48 +02:00
Irini Kosmidou
a1cc5b0ca7
Merge remote-tracking branch 'origin/develop' into irini
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 17:36:19 +02:00
2b41b3ee26
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
2022-09-27 14:57:01 +02:00
3c746e954b
updates on same image are problematic..
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 14:29:39 +02:00
ff243fa46c
some bugfixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 12:19:42 +02:00
51976730aa
important bugfix
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 11:14:54 +02:00
caca7f5da8
small bugfix
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 10:55:00 +02:00
8c0fd8d9e2
some informative docs
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 10:51:56 +02:00
90962c9f8e
rudimentary SD commanding interface
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 10:51:07 +02:00
2614239fe4
this should work for the same chip/copy as well
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 09:27:40 +02:00
d87baa8da9
successfull SW update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-26 23:17:12 +02:00
9d440838e9
set correct owner for SW update procedure
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-26 18:40:31 +02:00
8161d1cd88
finished update cmd impl
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-26 12:26:08 +02:00
eb0ace3bc6
continuing SW update impl
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-26 12:00:57 +02:00
b3275d015f
start update handler impl
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-26 11:50:35 +02:00
05adc91f94
moved definitions
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-26 11:39:17 +02:00
7d824f5448
updated helper scripts
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-26 11:31:29 +02:00
ec91d9977a
move shell scripts helpers to root
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-26 11:20:03 +02:00
80f0664139
added some more fixed file names
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-26 11:15:37 +02:00
65a7d38f54
adaptions for update sequence
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-26 11:12:41 +02:00
15641c61ea
these commands make more sense
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-26 10:56:57 +02:00
0fc639cc11
added action IDs for new commands
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-16 18:48:05 +02:00
8aa412e865
add CFDP APID to TCP parse list
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 18:10:23 +02:00
9411b740ae
CFDP integration almost complete
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 17:28:43 +02:00
54f73661fc
fix init error
2022-09-16 14:01:54 +02:00
68039d5d4a
clean up config code
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-16 12:28:39 +02:00
0b43c3137f
add new constants for CFDP, clean up
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-16 12:22:46 +02:00
547fcf22dd
add very basic test in Q7S Test task for FS helpers
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 12:05:50 +02:00
26216eca88
new fs helper module
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 11:53:33 +02:00
38f435d1ae
update for new FSFW code
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 11:43:11 +02:00
8ebc62cbe6
new ACS preproc defines
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-15 13:03:22 +02:00
57331380c3
small fix for ACS task
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-15 11:38:29 +02:00
4649a75d40
update to new API
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-12 17:23:43 +02:00
31b3de784b
stuff
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-12 17:00:49 +02:00
86d3732f65
retval replacements
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-29 15:57:26 +02:00
aa86bc722f
retval corrections
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-29 15:56:18 +02:00
3ad7a35f0e
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-08-29 15:53:57 +02:00
975f202ddb
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-08-29 15:50:55 +02:00
8c110460a6
added test to retrieve pdu config
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-26 14:28:06 +02:00
0f553e3431
Merge remote-tracking branch 'origin/develop' into mueller/update-p60-module-code
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-26 13:45:53 +02:00
a7482b657a
changed all table parsing to use gom space API
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-26 13:42:58 +02:00
efb0bce718
finally it works
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-26 03:20:44 +02:00
447c4d5c88
all retval replacements
EIVE/eive-obsw/pipeline/head This commit looks good
2022-08-24 17:27:47 +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
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
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
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
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
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
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
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
d274f5647d
fix EM cofig
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 15:28:02 +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
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
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
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
4e78ee85c8
continued rw ass creation
2022-05-11 00:54:29 +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
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
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
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
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
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