Commit Graph

1066 Commits

Author SHA1 Message Date
b2688c5ac0
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-21 11:18:39 +02:00
5abbaeddb0 update EM obj factory
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 17:16:37 +02:00
ab273a8a59
re-use dipole set in IMTQ handler
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-17 10:52:05 +02:00
ed7bba2cf5
renaming
All checks were successful
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-14 15:33:34 +02:00
213787d435
start SA depl task
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 14:09:07 +02:00
09c0afbe7f
simplified SA Depl init
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 13:56:25 +02:00
ea82748496
new solar array deployment task
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 13:29:38 +02:00
b6b258d82c
remove gpio pst
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-11 23:13:37 +02:00
607822b413
fix in SDC manager
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-11 23:07:44 +02:00
21258c2d79
fix core controller
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 17:41:52 +02:00
0f57810a9a
re-run afmt
Some checks failed
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
Some checks failed
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
All checks were successful
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
All checks were successful
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
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-10 10:15:55 +02:00
d726ce4e49 permanently activated ACS_CTRL 2022-10-10 09:43:52 +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
8b35bbd241
use new SCEX uart dev name
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-06 15:08:33 +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
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
3fa2c63a03
add EM code
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-05 14:38:48 +02:00
9d0e10eb1e fixed dummies, scheduled dummies as part of acsTask
All checks were successful
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
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
dcd0a650f0
this should do the job
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-30 13:30:22 +02:00
d10ff4efa6
compiles again
Some checks failed
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
Some checks failed
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
All checks were successful
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 14:10:21 +02:00
49efbc4725
some bugfixes
Some checks failed
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 13:32:10 +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
269de1782a
Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 19:18:19 +02:00
Irini Kosmidou
071e00e0ef dog fixed
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 19:17:24 +02:00
aab2dc6367 Merge branch 'develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 19:14:40 +02:00
Irini Kosmidou
32c2b2038c constructor correction
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-27 19:06:55 +02:00
Irini Kosmidou
308a855d8c bugfix for scex testcode
All checks were successful
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
All checks were successful
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..
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 14:29:39 +02:00
ff243fa46c
some bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 12:19:42 +02:00
51976730aa
important bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 11:14:54 +02:00
caca7f5da8
small bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 10:55:00 +02:00
8c0fd8d9e2
some informative docs
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 10:51:56 +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
2614239fe4
this should work for the same chip/copy as well
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-27 09:27:40 +02:00
d87baa8da9
successfull SW update
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-26 18:40:31 +02:00
8161d1cd88
finished update cmd impl
Some checks are pending
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-26 11:50:35 +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
7d824f5448
updated helper scripts
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-26 11:31:29 +02:00
ec91d9977a
move shell scripts helpers to root
Some checks failed
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
Some checks failed
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
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-26 10:56:57 +02:00
0fc639cc11
added action IDs for new commands
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 18:10:23 +02:00
9411b740ae
CFDP integration almost complete
All checks were successful
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
65f4daf305
move config define
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 12:35:10 +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
0b43c3137f
add new constants for CFDP, clean up
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-16 12:22:46 +02:00
6b48fb64d8
start integrating cfdp code
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 12:14:27 +02:00
547fcf22dd
add very basic test in Q7S Test task for FS helpers
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-16 12:05:50 +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
9ad649e43e
ACS controller running in EM SW withour errors now
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-15 13:40:57 +02:00
8a6a69d230
update EM code
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-15 13:15:39 +02:00
8ebc62cbe6
new ACS preproc defines
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-15 13:03:22 +02:00
2261ccb304
create ACS controller in EM sw
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-15 11:40:10 +02:00
57331380c3
small fix for ACS task
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-15 11:38:29 +02:00
fb3214fef9
swap order
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-12 17:25:20 +02:00
4649a75d40
update to new API
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-12 17:23:43 +02:00
31b3de784b
stuff
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-12 17:00:49 +02:00
86d3732f65
retval replacements
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-29 15:57:26 +02:00
aa86bc722f
retval corrections
All checks were successful
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
Some checks failed
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
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-08-29 15:50:55 +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
3b2794735b
disable test
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-27 15:54:52 +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
0f553e3431
Merge remote-tracking branch 'origin/develop' into mueller/update-p60-module-code
Some checks failed
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
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-26 13:42:58 +02:00
efb0bce718
finally it works
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-26 03:20:44 +02:00
d098ed6403
gomspace lib working 2022-08-26 00:39:06 +02:00
7a1dbf8456
add gom space client code
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-08-25 23:22:17 +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
a134f3f100
Merge remote-tracking branch 'origin/develop' into irini
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-16 18:52:16 +02:00
6ead94b5f4
this is even better
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-08 17:12:12 +02:00
bd40af34c8
Merge branch 'develop' into irini
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-08-08 17:08:56 +02:00
722d7a67f5
important bugfix for FM SW
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-06-27 14:56:46 +02:00
a2e7c6cca6 moved ccsds object creation back to core object factory and run auto formatter
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-27 10:58:46 +02:00
95da2372c9 run generators
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-27 09:15:29 +02:00
Jakob Meier
ed0eb4fe9c adaptions for setup with ccsds testbed
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-23 20:12:56 +02:00
89757c447c run auto-formatter
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-06-17 08:31:36 +02:00
Jakob Meier
1ebae7f938 fixes for te0720 build 2022-06-08 07:16:12 +02:00
Jakob Meier
8c850614e5 fixed merge conflicts 2022-06-05 10:54:46 +02:00
Jakob Meier
52d94f44d4 device temeprature set
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-06-01 10:48:18 +02:00
593cc68b84 rtd dataset
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-31 16:44:57 +02:00
0e6d2354fc thermal set fix
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-30 14:32:50 +02:00
Jakob Meier
8106722a08 replaced EM preprocessor define
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-27 16:24:41 +02:00
4632a56346 Merge branch 'develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-27 15:28:41 +02:00
10a82eca25 Merge branch 'develop' into mueller/pl-ss
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-27 15:28:23 +02:00
Jakob Meier
9e93f1c814 adaptions for EM
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-27 13:44:40 +02:00
6f9d3c2f63 Merge branch 'develop' into meier/SdCardManager
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2022-05-26 12:15:14 +02:00
1f616a101d
add scex preproc define to OBSWConfig.h.in
Some checks failed
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
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-26 11:46:28 +02:00
Jakob Meier
c588ec4a1a bugfix SdCardManager
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-26 01:56:19 +02:00
5b0f1efefd
Merge remote-tracking branch 'origin/develop' into mueller/pl-ss
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 15:47:21 +02:00
ad679a810e Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #259
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-25 15:21:25 +02:00
bb1e1d80cc
resolve merge conflict
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-25 11:00:18 +02:00
01bac87afb
update reset pin handling
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-05-25 10:59:20 +02:00
5d2a70b6c6 Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 10:28:06 +02:00
ffdd6bbc3c Merge branch 'develop' into mueller/add-schedule-pus-11
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-25 10:27:36 +02:00
c86e000f09
Update PL SS
All checks were successful
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
Some checks failed
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
All checks were successful
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
Some checks failed
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
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-25 10:01:53 +02:00
3eca96fef5
Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:58:06 +02:00
43fc1ab780
Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-25 09:57:34 +02:00