Commit Graph

524 Commits

Author SHA1 Message Date
cfae090de4 improvements for ploc supv SW
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-12-23 11:46:01 +01:00
5e1d0543d7 afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-12-23 10:32:21 +01:00
30aa802069 minor udpates for PLOC SUPV code
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-12-23 10:13:26 +01:00
cbf5ca6d93 minor fixes for MPSoC code
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-12-22 17:17:23 +01:00
2b327bf3a7
initialize a variable
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-29 23:09:55 +01:00
425e7c1e52
increase regular delay to up to 80 ms
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-28 16:27:33 +01:00
2c223712ff
various fixes and improvements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-28 16:24:18 +01:00
2338d951c7
some more robustness tweaks 2022-11-28 11:21:12 +01:00
bd3350c28a
this might be a bug
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-28 09:38:32 +01:00
6766395f44
works, but SW updates hangs at 21504 bytes 2022-11-24 14:42:17 +01:00
c7b90fb8e0
something hangs up
Some checks are pending
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop Build started...
2022-11-24 11:58:41 +01:00
cc79ffc57b
some remaining bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-21 18:32:23 +01:00
9953a49b09
minor improvements for PLOC SUPV update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-21 17:55:56 +01:00
98fcf06e31
various improvements and bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-18 17:25:52 +01:00
f545928adc
some bugfixes 2022-11-18 16:13:55 +01:00
02eff4a26f
some more bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-18 14:18:45 +01:00
c248cdb876
fix for error handling longer request
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 17:46:06 +01:00
0857a480e5
zero init some values
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 17:39:16 +01:00
2c00119b47
set SP max size
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 17:28:41 +01:00
ae11f73e24
disable debug mode
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 16:43:54 +01:00
7c821e33f0
somethings wrong
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 15:59:31 +01:00
9a3fd51337
tweak do off activity
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 15:48:44 +01:00
f08709ef29
switch off debugging spam
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 15:24:26 +01:00
cdadb02420
mask corrections ,set sec header flag
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 13:58:40 +01:00
9bf6ac7a9a
clean up printouts a bit
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 13:48:40 +01:00
00dd2e99a8
getting there
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 13:39:59 +01:00
ffc4a3456b
some better names
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 13:26:03 +01:00
72f8e359bb
CRC failure
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 13:24:39 +01:00
bb66228837
re-test the simpler method
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-17 11:38:45 +01:00
bce8c71e38
crc check now works 2022-11-17 11:33:47 +01:00
4e3abb92f2
update events
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-16 15:25:29 +01:00
3ef0b3ea6d
TAS PLOC SUPV
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-16 15:03:10 +01:00
03e007fd36
afmt
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-16 14:43:22 +01:00
5b770a6407
remove HDLC framing including CRC
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-16 14:42:18 +01:00
3510cc85fc
a lot of bugfixes
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-16 13:26:49 +01:00
32005a2d3a
more printouts, switch on debug mode
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-16 11:57:29 +01:00
9163db6bcf
add debug statements
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-15 18:02:17 +01:00
1f6f11ee88
bugfix for start method
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-15 17:51:22 +01:00
a55e6a1725
logic fix 2022-11-15 17:48:44 +01:00
c436a2abda
rename helper
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-15 17:41:15 +01:00
2b4ec6d274
add start method for uart man
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-15 17:40:19 +01:00
38e74e6eaf
rename ploc supv uart man
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-15 17:24:38 +01:00
e5ec8a7490
now the linux files are compiling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-15 17:21:12 +01:00
2f0f837534
Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-15 13:42:22 +01:00
a21e938f36
renamed cookie as well
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-11 11:41:40 +01:00
4c5515c05c
update status code handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-11 11:06:08 +01:00
a07a55eac1
Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-10 18:14:53 +01:00
ceba3b9dca
renaming of fsfw_hal components
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-10 18:07:59 +01:00
ec7ce5ddb6
ploc components now compile for hosted (linux)
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-10 17:32:11 +01:00
09ccb5ddf7
re-enable wipe cmd
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-10 13:50:18 +01:00
a2b0e53301
bugfix SW update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-10 13:08:17 +01:00
3be45b32ef
renaming
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-10 11:20:27 +01:00
b88b4cc06d
tweaks and fixes for UART man
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-09 19:47:42 +01:00
9e006d93fe
move other function to graveyard
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-09 19:27:18 +01:00
c42eae9c17
re-enabled some commands
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-09 19:24:48 +01:00
2118c0691c Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-09 15:15:40 +01:00
ea6fd8c952 smaller fixes and improvements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-09 13:07:20 +01:00
e2a0db8fcc
command and function graveyard
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 20:41:20 +01:00
d3da5bd2d8
add factory reset cmd
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 20:37:57 +01:00
52f15906d8
kick out more commands
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 20:14:42 +01:00
fd5cc19231
remove non-working commands
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 20:04:57 +01:00
27e46615b6
repaire exe handling 2022-11-08 19:53:26 +01:00
54523b25d1
fixed ack reply handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 17:07:12 +01:00
1d6258d223
start fixing dev handler ack handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 16:56:42 +01:00
28cd78db96
implemented the last tricky parts 2022-11-08 16:26:30 +01:00
f564fb5c1a
some fixes for thread shutdown code
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 14:52:07 +01:00
763bf2d85b
remove flush call, belongs in lower layer
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 14:29:41 +01:00
9d02322cd7
continue refactoring
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 14:26:52 +01:00
cfe7599f62
use result namespace instead of interface
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 11:18:03 +01:00
4515703efa
added tm service IDs
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 11:08:21 +01:00
4bf22f689a
create TM base class
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 10:22:57 +01:00
3b575acd55
comment out more code which was removed
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-08 10:10:57 +01:00
8dbb3dcd9b
continue refactoring
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-07 17:31:16 +01:00
e46bb42266
continue switch to new packet format 2022-11-07 13:37:51 +01:00
f32f68d0e0
continue switch to new packet format 2022-11-07 11:26:36 +01:00
95a3ea1d23
start using new packet format 2022-11-07 11:19:10 +01:00
23025eec7a
no payload packet impl 2022-11-07 10:30:09 +01:00
32865d1834
use on/off semantics and rename handler 2022-11-07 10:00:54 +01:00
bb2f8edc77
add new APID defs 2022-11-07 09:26:36 +01:00
2b9afbedff
important fix and clarification
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-04 14:19:58 +01:00
dc024e5385
low level impl complete
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-04 13:40:42 +01:00
5df45f9fa7
start com IF function impl
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-04 12:51:01 +01:00
74837753bf
add IPC ring buf and buffer
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-04 12:45:20 +01:00
b5cd873f6d
completed ring buffer parser
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-11-04 12:38:30 +01:00
af0853a42b
continue HDLC parsing 2022-11-04 12:04:47 +01:00
45c95e559e
started HDLC ring buffer decoder
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-04 11:53:07 +01:00
6350dbe0e9
now its getting tricky
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-04 11:38:21 +01:00
d254331b8e
add basic manual UART reading 2022-11-04 11:34:33 +01:00
826f4ce29c
add lock, use generic sem interface
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-04 11:16:22 +01:00
de66ac66c6
supv helper is a com IF now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-11-04 11:08:47 +01:00
8e26ad2871
simplify max RTD low level handler 2022-11-03 15:10:42 +01:00
621966b6f3
Merge remote-tracking branch 'origin/develop' into dhb2normal
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-11-02 10:47:49 +01:00
191d5f1268
refactored TM funnels to allow multiple TM recipients 2022-11-02 10:20:14 +01:00
592cbf6fad
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-27 08:31:21 +02:00
2256ffecbe scex speed is now set from cfg
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-26 18:32:53 +02:00
b1e8be2ba5
checked FS usage
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-25 11:31:06 +02:00
63d660119e
Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-10 17:39:47 +02:00
12feb989ae
small tweaks
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2022-10-10 17:36:01 +02:00
6d9999292c
Merge branch 'mueller/scex-em-tests' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-06 15:36:26 +02:00
0341865e98
this seems to work
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-06 11:15:55 +02:00
adbece25aa add code to get frame, parity and overrun errors
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-05 19:18:25 +02:00
9e81384c5e two stop bits and even parity helps
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-05 18:44:52 +02:00
c5e5df03d9
new Uart16550 for SCEX, try stop bits
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-05 18:13:49 +02:00
1a192cd8fb
found the bug
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-04 23:04:50 +02:00
a44141c476
something is still wrong
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-04 21:17:54 +02:00
b930af52b0
simplified DLE parser 2022-10-04 20:52:11 +02:00
0c389177e3
refactor DLE parsing and move semaphore release up top
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-04 18:38:53 +02:00
66c6f08447
connect acs ctrl to subsystem
Some checks failed
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
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-30 14:14:59 +02:00
151d27985f
Merge remote-tracking branch 'origin/develop' into scex-additions
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:43:58 +02:00
97f02401fe bugfix for SCEX code
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-28 17:01:40 +02:00
90962c9f8e
rudimentary SD commanding interface
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 10:51:07 +02:00
05adc91f94
moved definitions
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-26 11:39:17 +02:00
68039d5d4a
clean up config code
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-16 12:28:39 +02:00
26216eca88
new fs helper module
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 11:53:33 +02:00
38f435d1ae
update for new FSFW code
Some checks are pending
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
c3fb285f35 Merge remote-tracking branch 'origin/develop' into mueller/test-new-cmd-handling 2022-08-31 16:32:18 +02:00
7c15ecbad2
apply afmt
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-irini This commit looks good
2022-08-31 16:12:32 +02:00
839851914a
update SCEX code 2022-08-31 16:07:38 +02:00
822e8eea4a
this is better
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-30 23:54:05 +02:00
Irini Kosmidou
a6582313f7 writing file works now
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-30 18:36:00 +02:00
Irini Kosmidou
4ce48d01c6 Merge remote-tracking branch 'origin/mueller/use-new-dhb-tm-handler' into irini
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-30 16:52:19 +02:00
Irini Kosmidou
b156d78274 huh 2022-08-30 16:51:30 +02:00
74b45f30a0
move to new DHB TM handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-08-30 15:53:20 +02:00
86337d8f47
retval replacements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-29 16:05:05 +02:00
aa0da618ca
Merge remote-tracking branch 'origin/develop' into irini
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-08-29 15:49:23 +02:00
3a80c4cb0c
additional nullptr check
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-08-29 13:32:49 +02:00
f308718256
safety check
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-08-29 13:26:13 +02:00
8c110460a6
added test to retrieve pdu config
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-26 14:28:06 +02:00
440fb4d488 Merge pull request 'all returnvalue replacements' (#286) from mueller/update-retval-if into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #286
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2022-08-25 14:50:07 +02:00
86b4747249
apid mask
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-08-24 19:54:16 +02:00
447c4d5c88
all retval replacements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-08-24 17:27:47 +02:00
bddaf120f4
Merge remote-tracking branch 'origin/develop' into irini
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-24 16:54:39 +02:00
920545b709
comment typo fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-24 15:24:57 +02:00
6d53a38f9f
small update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-24 15:16:46 +02:00
e561805f3a
update ploc supv helper 2022-08-24 12:02:16 +02:00
1aeebcc0ee
important bugfix for update conitnuation
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-23 18:26:14 +02:00
d7bc35ea45
crc check fails on mem 0
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-22 22:25:22 +02:00
e09eaae42f
update events
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-22 22:18:14 +02:00
42e3d92fb9
set hk set valid as well
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-22 17:10:19 +02:00
64b2ceea0a
set boot status report set valid
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-22 17:09:39 +02:00
51463700d5
smaller bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-22 13:52:39 +02:00
663b65f159
memory check always based on file now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-22 13:50:24 +02:00
b3bb029c47
something wrong with mem check
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-22 12:41:08 +02:00
e71e2e7879
new command to only perform mem check
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-22 12:08:39 +02:00
f98411f421
speed up crc proc significantly 2022-08-22 10:35:23 +02:00
b503836a3d
hopefully last bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-21 01:38:45 +02:00
47ebf3d8cc
allow starting update in the middle
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-20 22:52:48 +02:00
c094b45fb4
percent progress event
And some changes to allow restarting from the middle
2022-08-20 20:26:25 +02:00
f2190f8aa1
resolve merge conflict
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-20 12:24:24 +02:00