eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity
1,725 Commits 5 Branches 124 Tags 53 MiB
c37e7022d1
Commit Graph

503 Commits

Author SHA1 Message Date
Robin Mueller
0343372910 very important bugfix for reset pin gnss
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-09-08 19:27:49 +02:00
Robin Mueller
46e3956bca
generating finish reply
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-09-08 17:02:37 +02:00
Robin Mueller
5779f511cf
some tweaks for reset pin command
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-09-08 16:03:20 +02:00
Robin Mueller
63c7903f9b
now the print command works
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-09-08 13:41:27 +02:00
Robin Mueller
a4cd99ec90
sanity check on altitude, set unix seconds
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details
2021-09-07 16:42:04 +02:00
Robin Mueller
e837532b22
form improvements
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details
2021-09-07 16:14:54 +02:00
Robin Mueller
f7c6f16777
added gps reset callback
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details
2021-09-07 16:11:02 +02:00
Robin Mueller
3b3b2ed8c3
preproc define to log NMEA data
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-09-07 12:00:22 +02:00
Robin Mueller
30a57ad5a4
using old transition delay
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-09-06 18:42:58 +02:00
Robin Mueller
d78c746552
GPS Handler bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2021-09-06 18:27:33 +02:00
Robin Mueller
45409fc2d6
gps handler working properly now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-09-06 12:07:15 +02:00
Robin Mueller
d1a25bfa65
bugfixes hyperion handler 2021-08-22 20:25:05 +02:00
Robin Mueller
dc0c8c704c
debugging GPS: uart is blocking!
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-20 20:18:56 +02:00
Robin Mueller
5b9811a950
disabled all devices except for ADIS device
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-20 15:46:51 +02:00
Robin Mueller
7c828427e9
unix file guard diagnostic prefix adaption
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details
2021-08-19 17:08:51 +02:00
IRS Cleanroom Laptop
e98b985d66 cleaning up preproc defines 2021-08-17 17:48:51 +02:00
Jakob.Meier
1722f14a60 added debug output for pcdu modules
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
Details
2021-08-17 11:59:32 +02:00
Robin Müller
567199f460 Merge branch 'develop' into mueller/stripped-exec
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-16 10:05:55 +02:00
Robin Mueller
1962b30e5f
testing HK downlink
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-11 19:27:17 +02:00
Robin Mueller
cb330bcf29
hyperion handler: HK packet subscription
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-11 18:59:40 +02:00
Robin Mueller
268cd33677
gps handler tweaks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-11 18:52:33 +02:00
Jakob.Meier
ae08d14626 Merge branch 'develop' into meier/firmwareChanges
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
EIVE/eive-obsw/pipeline/head Build queued...
Details
2021-08-11 13:32:30 +02:00
Robin Mueller
e92af98f34
moved q7s specific code to q7s folder
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2021-08-09 17:19:10 +02:00
Robin Mueller
3b915f4c97
Merge remote-tracking branch 'origin/develop' into mueller/master 2021-08-09 16:45:32 +02:00
Robin Mueller
1d714ff85e
Moved PLOC components to q7s folder
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details
2021-08-09 16:30:59 +02:00
Jakob.Meier
8f124de79c set all devices to mode power down in doShutDown
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-09 14:41:46 +02:00
Jakob.Meier
ce1124472a Merge branch 'develop' into meier/develop 2021-08-09 14:23:27 +02:00
Robin Mueller
4a74a3ac37
API change fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-09 11:24:59 +02:00
Jakob.Meier
66f38daf56 typo in include of ploc updater
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-09 10:44:14 +02:00
Jakob.Meier
0580784d16 added mode power down in star tracker 2021-08-09 10:41:28 +02:00
Jakob.Meier
dc3dfa1292 ploc updater
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details
2021-08-08 15:02:59 +02:00
Jakob.Meier
f64356d75e ploc udpater wip 2021-08-05 16:37:39 +02:00
Jakob.Meier
0315a2a3d5 merged develop 2021-08-04 13:22:44 +02:00
Jakob.Meier
2700d4d28c ploc updater wip 2021-08-04 13:20:28 +02:00
Robin Mueller
b52aca643f Merge remote-tracking branch 'origin/develop' into mueller/master 2021-08-04 13:16:59 +02:00
Jakob.Meier
c431deede0 ploc udpdater wip 2021-08-04 10:20:36 +02:00
Robin Mueller
9790b395e6
include replacements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-03 15:58:01 +02:00
Jakob.Meier
9de28fdfc9 tmtc update 2021-08-02 15:57:14 +02:00
Jakob.Meier
aeecf33763 supervisor added debug TCs 2021-08-02 15:28:57 +02:00
Robin Mueller
009234612a
updated retval list
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
2021-08-02 12:50:36 +02:00
Jakob.Meier
340ca0618c supervisor mram dump
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details
2021-08-01 17:11:32 +02:00
Jakob.Meier
72533f1d14 updated tmtc 2021-07-31 08:54:49 +02:00
Jakob.Meier
926e1e336a mram dump reply 2021-07-31 08:32:57 +02:00
Jakob.Meier
6cd4f6cfe3 ploc supervisor mram dump 2021-07-29 09:21:33 +02:00
Jakob.Meier
f4b67945cc wipe mram command 2021-07-28 19:34:10 +02:00
Jakob.Meier
50ca738d5c select nvm command 2021-07-28 11:55:16 +02:00
Jakob.Meier
3d39ddf85c copy adc data to mram command 2021-07-28 11:08:40 +02:00
Jakob.Meier
14cd3e9eea supervisor handler get latchup status report 2021-07-28 08:38:36 +02:00
Jakob.Meier
03a601d450 auto calibrate alert and enable/disable latchup alert 2021-07-27 12:02:30 +02:00
Jakob.Meier
bd9dbc5fc8 ploc supervisor watchdog configure timeout command 2021-07-26 19:56:00 +02:00
Jakob.Meier
6506baa7b6 ploc supervisor watchdogs enable command 2021-07-26 16:30:20 +02:00
Robin Mueller
96c9069a69
new pool entry for rtd value 2021-07-26 13:56:53 +02:00
Robin Mueller
5018b24cfc
storing RTD value now as well 2021-07-26 13:55:58 +02:00
Jakob.Meier
01a02f896f ploc supervisor update available cmd, wip 2021-07-26 12:08:38 +02:00
Jakob.Meier
0cd814db76 ploc supervisor update available command, wip 2021-07-25 20:42:24 +02:00
Jakob.Meier
f6d43cdf46 typo in PlocSupervisorDefinitions.h 2021-07-25 16:24:10 +02:00
Jakob.Meier
c4616e3633 get boot status report wip 2021-07-24 13:57:05 +02:00
Jakob.Meier
0ce55d5e62 fixed conflicts 2021-07-23 18:04:51 +02:00
Jakob.Meier
a2e62b28c3 fixed merge conflicts 2021-07-23 17:48:11 +02:00
Jakob.Meier
80665a3cc5 fixed merge conflicts 2021-07-23 14:36:15 +02:00
Jakob.Meier
fab8a75839 added uart flush in ploc supervisor handler 2021-07-23 13:27:58 +02:00
Jakob.Meier
995395d11e ploc supervisor wip 2021-07-22 08:06:04 +02:00
Robin Mueller
20e8fc3400 cleaned up code a bit 2021-07-19 12:44:43 +02:00
Robin Mueller
88a20a512a corrections and tests 2021-07-16 21:51:30 +02:00
Robin Mueller
b3dfbcf7fe removed fsfw_hal 2021-07-15 19:06:57 +02:00
Robin Mueller
545625039d update fsfw 2021-07-15 01:25:32 +02:00
Jakob.Meier
ea2260a61d few commands implemented for the ploc supervisor 2021-07-13 08:32:14 +02:00
Jakob.Meier
c16a6b0178 reaction wheel handler included missing tm data 2021-07-08 14:16:49 +02:00
Jakob.Meier
45804a8675 star tracker read temperature and included arcsec lib 2021-07-08 11:20:19 +02:00
Jakob.Meier
4148a8c0bd StarTrackerHandler wip 2021-07-07 12:12:01 +02:00
Robin Mueller
0e288704d6 Merge remote-tracking branch 'origin/develop' into mueller/master 2021-07-05 15:46:21 +02:00
Robin Mueller
08c5c5ebeb added more sd card stubs 2021-07-05 12:09:31 +02:00
Jakob.Meier
0e9c1831ed reply fix in rad sensor handler 2021-07-01 17:27:51 +02:00
Jakob.Meier
d5a07f9c63 added debug output 2021-07-01 15:57:10 +02:00
Jakob.Meier
b82ed37766 commend rad sensor in again 2021-07-01 11:56:13 +02:00
Jakob.Meier
11776fe331 added get telemetry command 2021-06-30 15:07:26 +02:00
Jakob.Meier
e89719e398 save before using prepareDataLessCmd 2021-06-30 08:21:14 +02:00
Jakob.Meier
f583fc1d99 generator runs and rw transition delay 2021-06-29 17:27:39 +02:00
Jakob.Meier
6e70f2254d all reaction wheels working 2021-06-29 16:08:20 +02:00
Martin Zietz
703f29af26 created all rw objects 2021-06-29 09:50:50 +02:00
Martin Zietz
23731e367c added second reaction wheel 2021-06-28 14:07:37 +02:00
Jakob.Meier
516ef34b21 added periodically polling of reset status in rw handler 2021-06-28 09:31:10 +02:00
Jakob.Meier
8ef9760f78 added get reset and clear reset command to rw handler 2021-06-28 08:57:37 +02:00
Jakob.Meier
7c8127714e added init command 2021-06-25 16:00:32 +02:00
Jakob.Meier
93f5ce2892 Merge branch 'meier/ReactionWheelHandler' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/ReactionWheelHandler 2021-06-25 15:47:39 +02:00
Jakob.Meier
0139df4371 modified rw definitions 2021-06-25 15:47:33 +02:00
Martin Zietz
ce3fee33e0 rw handler fixes 2021-06-25 15:25:54 +02:00
Jakob.Meier
4a6cb9fa2f fixed object id merge conflicts 2021-06-25 12:15:59 +02:00
Robin Mueller
06e7193276 set id is now 0 2021-06-24 18:05:41 +02:00
Jakob.Meier
b7ca1606f7 fixed merge conflicts 2021-06-24 18:01:09 +02:00
Jakob.Meier
b5fdeb93bb get temperature and status of reaction wheel 2021-06-24 17:32:42 +02:00
Robin Mueller
bc087e2a7a removed unused code 2021-06-24 14:19:25 +02:00
Robin Mueller
136c859c90 lis3 minor form changes 2021-06-24 14:17:24 +02:00
Robin Mueller
0d12a92569 gps contd 2021-06-24 13:55:51 +02:00
Martin Zietz
8284ebec9f rw wip 2021-06-24 12:04:36 +02:00
Robin Mueller
1e3b91789c continued gps handler 2021-06-24 11:42:40 +02:00
Robin Mueller
fdd76fb600 fsfw update, rm3100 update 2021-06-24 11:16:08 +02:00
Robin Mueller
2331637350 split up PSTs and add contd GPS handler 2021-06-24 08:50:46 +02:00
Robin Mueller
56cabbc117 split up psts 2021-06-23 15:18:31 +02:00
Martin Zietz
cbdcc50cc9 rw enable wip 2021-06-22 13:48:30 +02:00
Jakob.Meier
0eb47967b5 fixed conflicts 2021-06-21 18:01:23 +02:00
Jakob.Meier
7795ad19d3 fixed merge conflicts 2021-06-21 17:51:08 +02:00
Robin Mueller
865f152bc6 Merge remote-tracking branch 'origin/develop' into meier/ImtqHandler 2021-06-21 17:45:56 +02:00
Jakob.Meier
72f7d6c88f applied changes according to pr comments 2021-06-21 17:25:13 +02:00
Robin Mueller
19269a6052 fixes for updated fsfw 2021-06-21 16:54:33 +02:00
Robin Mueller
8e674e30a2 minor tweaks, fsfw_hal update 2021-06-21 16:20:11 +02:00
Martin Zietz
d704b389e4 reaction wheels testing 2021-06-21 14:46:46 +02:00
Jakob.Meier
33a55d7114 RwHandler first commands 2021-06-21 09:50:26 +02:00
Robin Mueller
bed7f0e2d6 compiling again 2021-06-16 17:19:14 +02:00
Robin Mueller
726ca8bc7c added gps definitions file 2021-06-15 17:07:47 +02:00
Robin Mueller
2c2c82da6b added startup and shutdown sequence 2021-06-15 16:44:31 +02:00
Jakob.Meier
0913442804 fixed merge conflicts 2021-06-15 15:39:39 +02:00
Robin Mueller
70d22c7c6b fsfw update and gomspace handler doc crossref 2021-06-15 15:37:37 +02:00
Jakob.Meier
5e7cdd9f7f IMTQ handler complete 2021-06-15 15:13:47 +02:00
Robin Mueller
cffd87c0ff cross referencing 2021-06-15 13:58:19 +02:00
Robin Mueller
91cbd80f6f comment block 2021-06-15 13:40:58 +02:00
Jakob.Meier
595abf3899 IMTQ positive x dipole test 2021-06-12 15:45:24 +02:00
Robin Mueller
0f3ce791cc small cmake fix 2021-06-12 15:27:24 +02:00
Robin Mueller
fe61e83559 moved gyro handler to archive 2021-06-12 15:21:17 +02:00
Jakob.Meier
61f3a3e1c6 fixed merge conflicts 2021-06-11 14:55:28 +02:00
Jakob.Meier
d13b232658 positive x axis self test, untested 2021-06-11 11:53:43 +02:00
Robin Mueller
35ef2e202e bugfixes for RPi 2021-06-11 11:01:23 +02:00
Jakob.Meier
0de484e423 bug fixes in ImtqHandler 2021-06-09 12:00:41 +02:00
Robin Mueller
b7e26be45e object manager singleton now 2021-06-08 16:45:25 +02:00
Martin Zietz
ddd33e5752 some fixes in IMTQ Handler 2021-06-06 14:11:05 +02:00
Jakob.Meier
5144968ba5 added self test, untested 2021-06-04 16:45:54 +02:00
Jakob.Meier
076c616496 fixed merge conflicts and added threshold configuration to Max31865Handler 2021-06-02 10:25:35 +02:00
Jakob.Meier
377a9bae79 rtd test 2021-05-27 19:05:08 +02:00
Jakob.Meier
ff508c89d1 minor changes 2021-05-27 15:24:19 +02:00
Jakob.Meier
6fa9b65345 compile failure 2021-05-27 14:04:33 +02:00
Jakob.Meier
d60bf5e037 ptme bridge wip 2021-05-27 13:07:57 +02:00
Robin Mueller
ccce16dd8f adis handler fixes 2021-05-26 13:41:26 +02:00
Robin Mueller
7bab7ffb75 adis handler continued 2021-05-26 13:30:12 +02:00
Robin Mueller
cfcf2b9f46 added a few more commands 2021-05-26 13:11:48 +02:00
Robin Mueller
a6e4da6716 some more corrections 2021-05-25 15:45:48 +02:00
Robin Mueller
c3f0c78ed5 small correction 2021-05-25 15:43:09 +02:00
Robin Mueller
f11ac3519e smaller bugfixes 2021-05-25 15:16:18 +02:00
Robin Mueller
b9bf245d68 some bugfixes for adis datasets 2021-05-25 13:53:03 +02:00
Robin Mueller
1262ccd65d adis handler continued 2021-05-25 12:45:51 +02:00
Robin Mueller
9ca10f5a8e reply handling for sensor data implemented 2021-05-24 21:15:23 +02:00
Robin Mueller
853a22c55a sensor handling moved to separate function 2021-05-24 20:59:19 +02:00
Robin Mueller
0fa32ef2ea adis handler continued 2021-05-24 20:57:12 +02:00
Robin Mueller
fe62e38afc adis handler continued 2021-05-24 20:33:59 +02:00
Robin Mueller
fbac40e9cd test pst 2021-05-24 01:20:44 +02:00
Robin Mueller
3dff66fc56 added empty definitions file 2021-05-24 00:31:47 +02:00
Robin Mueller
94008574eb added gyro stubs 2021-05-24 00:30:46 +02:00
Robin Mueller
623f52398e moved fsfwconfig into linux folder 2021-05-17 20:03:56 +02:00
Robin Mueller
3dca311baa generated event translation files 2021-05-17 19:39:35 +02:00
Robin Mueller
6f9a1853ff host compiling again 2021-05-17 16:37:29 +02:00
Jakob.Meier
9c0045dbd9 ptme access wip 2021-05-17 13:47:10 +02:00
Jakob.Meier
fbad470836 save before endianess change 2021-05-16 21:53:07 +02:00
Jakob.Meier
a39d47cff5 uio implementation 2021-05-16 19:22:04 +02:00
Jakob.Meier
e337f97e62 solved merge conflicts 2021-05-12 17:01:11 +02:00
Jakob.Meier
79a5847b67 Sus handler complete 2021-05-12 16:38:20 +02:00
Jakob.Meier
48af7ef0fb sus delay implementation 2021-05-12 13:06:56 +02:00
Jakob.Meier
50d9365702 changed SusHandler MAX1227 to internal clock mode 2021-05-10 11:13:39 +02:00
Jakob.Meier
189bdb7c90 working SUS in externally clocked mode 2021-05-09 16:48:55 +02:00
Jakob.Meier
906c813e4c write setup byte and conversions 2021-05-09 14:46:42 +02:00
Jakob.Meier
07d337c6ad this works with q7s and new sus 2021-05-09 14:39:56 +02:00
Jakob.Meier
95f09469d1 this works with the old SUS 2021-05-09 12:09:39 +02:00
Jakob.Meier
451729b103 this worked with the prototype SUS 2021-05-09 10:06:36 +02:00
Jakob.Meier
6861cd399e some tries to get data from max1227 in externally clocked mode 2021-05-08 22:49:21 +02:00
Jakob.Meier
f4eb5d81ba save before making change in spicomif 2021-05-07 18:48:42 +02:00
Jakob.Meier
931c17e971 save before implementing SusHandler with chip select 2021-05-06 18:00:58 +02:00
Jakob.Meier
80b32331c9 rad sensor working 2021-05-03 13:35:16 +02:00
Jakob.Meier
ff4a156a45 rad sensor working 2021-05-03 12:49:14 +02:00
Jakob.Meier
a126812a23 another try to read out the adc 2021-05-03 12:05:19 +02:00
Jakob.Meier
8d2993f88d rad sensor change wip 2021-05-03 11:59:33 +02:00
Jakob.Meier
b708028c61 spi decoder callbacks wip 2021-05-02 13:48:39 +02:00
Jakob.Meier
fef6cf4abe Merge branch 'meier/master' into meier/max1227Handler 2021-04-30 09:04:20 +02:00
Jakob.Meier
34ad009707 integrated gyro and mgm handler 2021-04-29 17:45:19 +02:00
Jakob.Meier
f0075f7789 max1227 wip 2021-04-29 10:40:11 +02:00
Jakob.Meier
0430579795 basic structure for ILH PLOC control 2021-04-27 17:34:50 +02:00
Jakob.Meier
73d56559c3 added PLOC sequence count. Not tested yet 2021-04-27 12:18:04 +02:00
Jakob.Meier
c5aced2070 fixed conflicts 2021-04-26 17:59:26 +02:00
Jakob.Meier
d63c825c7f fixed merge conflicts 2021-04-26 17:50:36 +02:00
Jakob.Meier
ebdc492ed1 self test wip 2021-04-26 14:25:23 +02:00
Robin Mueller
4c146b27c9 corrections in plocHandler, endianness 2021-04-26 11:28:19 +02:00
Jakob.Meier
bbb50e4b4f imqt base functions 2021-04-26 07:56:02 +02:00
Jakob.Meier
ec76222907 added wiretapping mode check in handleDeviceTm of PlocHandler 2021-04-25 15:54:48 +02:00
Jakob.Meier
84a0935f63 get commanded dipole wip 2021-04-25 15:53:44 +02:00
Jakob.Meier
56c0c551cb imqt wip 2021-04-25 12:47:41 +02:00
Jakob.Meier
1a45d54383 fixed merge conflicts 2021-04-25 10:51:59 +02:00
Jakob.Meier
766c460629 merged mueller master 2021-04-25 09:33:21 +02:00
Robin Mueller
3befba560c adaptions for new fsfw, using pus c now 2021-04-24 23:04:17 +02:00
Martin Zietz
2c40bf86fb typo fix 2021-04-24 14:55:15 +02:00
Jakob.Meier
c54eccfe43 tc mem write and tc mem read implemented 2021-04-22 17:32:39 +02:00
Jakob.Meier
a973d67d07 changes in plocDefinitions and plocHandler 2021-04-19 17:17:22 +02:00
Jakob.Meier
cc075844fd wip 2021-04-16 18:59:48 +02:00
Jakob.Meier
e2242ed526 plocHandler wip 2021-04-15 13:17:15 +02:00
Jakob.Meier
67cc196169 plocHandler wip 2021-04-12 10:16:59 +02:00
Jakob.Meier
5909d4811b plocHandler wip 2021-04-11 12:04:13 +02:00
Robin Mueller
08351bcda2 added more spi test code, preprocessor defines 
and various bugfixes
 2021-04-02 15:14:08 +02:00
Jakob.Meier
9cec3f4b1a fixes in imqt 2021-03-29 16:40:14 +02:00
Jakob.Meier
5179954176 ploc handler wip 2021-03-29 14:37:52 +02:00
Jakob.Meier
34ef313ab0 imqt handler compiled 2021-03-26 13:55:32 +01:00
Jakob.Meier
d953a9ff32 fixed merge conflicts 2021-03-26 12:30:24 +01:00
Jakob.Meier
d764b77a83 transition delay set to 5000 again 2021-03-25 17:15:54 +01:00
Jakob.Meier
0b4dac0e3d rtd handler improvements 2021-03-24 12:53:25 +01:00
Martin Zietz
88138af39d solved all merge conflicts 2021-03-22 13:09:06 +01:00