Commit Graph

1273 Commits

Author SHA1 Message Date
1c9c2aba5b Merge pull request 'safety mechanism on reboots' (#308) from mueller/sdc-safety-mechanism-on-reboot into develop
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-25 13:13:41 +02:00
69099881bd small stuff
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-25 11:31:54 +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
f198a401f2
this should work as well 2022-10-25 11:22:31 +02:00
4bd2a2dac8 added and implemented all ACS related DataPools to AcsController
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-24 10:41:28 +02:00
8b23fd3dd2 fixed int32_t to double warnings. reformats 2022-10-24 10:29:57 +02:00
f4067abdac Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
All checks were successful
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
All checks were successful
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
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-21 15:33:47 +02:00
917d746d1a
small fix (which is not an issue right now)
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-21 15:19:47 +02:00
b9b850f621
object ID corrections
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-21 14:49:54 +02:00
b6a5c8c854
added TODO, remove obsolete code
Some checks failed
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
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-21 11:51:44 +02:00
22d4d7085d
adaptions so it compiles
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-21 11:31:38 +02:00
e0399a5db3 Merge branch 'mueller/acs-ss-init' into mueller/pl-ss
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-21 11:20:01 +02:00
48ed7500d8 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-20 17:03:50 +02:00
a5f2f3e8ea
Merge remote-tracking branch 'origin/develop' into mueller/imtq-updates
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-20 16:26:35 +02:00
bff4f6fa8d
reformatinng
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-20 16:09:49 +02:00
75a4cd1b69
awful solution but works
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 16:09:18 +02:00
29a34256a7
old code seems to work
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 15:08:33 +02:00
0d3509b991 added actuator command values DataSet
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 11:09:52 +02:00
62bf792888 removed comment 2022-10-20 11:09:02 +02:00
06941fcf5b fixed int32_t to double warnings 2022-10-20 11:08:21 +02:00
deb7c4e500 added saftCtrl to acsController 2022-10-20 11:07:45 +02:00
ada1111252
removed TODO
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 10:52:13 +02:00
07fe2cb122
some tweaks for dipole set handling
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 10:51:19 +02:00
2b6334b9dc
this works
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-20 10:44:28 +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
42bb2f554f
added fat TODO
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-19 19:11:21 +02:00
6bdc420d0e
bump tmtc
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-19 19:08:36 +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
a0356a5092
imtq update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-19 15:36:57 +02:00
5c2266e214 added variances for sensors for sensor fusion
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-19 11:01:53 +02:00
c50f8c716f amended GYR sensor fusion. replaced MGM sensor fusion 2022-10-19 11:01:27 +02:00
86450f9d66 Added DataSets for all OutputValues/Sensors 2022-10-19 11:00:46 +02:00
371a11684a
cleanr PL PCDU data on off cmd
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-19 10:46:57 +02:00
c3b2e3ef0f
rw fix and higher timeout for tctrl locks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-18 14:08:26 +02:00
e781da1be4 simplify power set ID handling 2022-10-18 11:01:33 +02:00
2d64892a81 inserted fusion weight optimum 2022-10-17 14:53:49 +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
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
e9a4c63127
fix one shot flag
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-14 15:05:44 +02:00
0a5bd6ef73 added sensor fusion logic for GYR
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-14 14:57:22 +02:00
3cff1c48e9
some more testing and bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-14 14:55:37 +02:00
99f703a2eb
some more important bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-14 14:34:35 +02:00
7aca487888 Merge branch 'mueller/solar-array-depl-autonomous' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/solar-array-depl-autonomous
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-14 14:17:28 +02:00
5d721706f3
bugfix for autonomous handling 2022-10-14 14:17:20 +02:00
bcef1f5d33 small delay
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-14 13:30:35 +02:00
19c73167c9 bugfixes for alternation
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-14 13:13:23 +02:00
69f34acbd2
rerun generator script
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-14 11:55:21 +02:00
8f61d14a82 implemented getParameter for AcsParameters 2022-10-14 11:11:23 +02:00
470f0ad7e8
convert some debug output into info output
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 18:52:44 +02:00
f939bfc469
remember commander
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 18:44:50 +02:00
4714c15d65
some more fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 18:42:47 +02:00
b783e9865e
start the FSM properly
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 18:39:14 +02:00
d8907d5ccc
important fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 18:20:17 +02:00
a4bf47499e
remove channel param from cmd
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 18:11:05 +02:00
0e8a085f97
add debug mode
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 17:48:32 +02:00
f9ee01b02d
removed TODO
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 17:35:57 +02:00
773747dd54
implemented alternating GPIO SA Deployment
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 17:34:33 +02:00
d97e0a1a6a
update depl handler
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 16:04:34 +02:00
0ebd0a0c0b
completed impl
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 15:59:56 +02:00
18e8827a84
add missing public keyword
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-13 15:13:19 +02:00
db7f7bdae2
continue SA DEPL impl
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-10-13 15:09:47 +02:00
f89f7630c1 removed comment
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-13 10:49:39 +02:00
20b57906b7
added TODO
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-12 19:55:47 +02:00
e1b3688869
finish file handling
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 19:55:20 +02:00
22691b6950
add TODO
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 17:23:54 +02:00
10da5cd45b
action handler init
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 17:21:10 +02:00
15fb86ddb7
continue SA DEPL handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 17:18:57 +02:00
cc35db91cd added calibration of raw MGM values
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 17:14:33 +02:00
8edf7fc0de deprecated code removed
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 15:22:26 +02:00
2bc7c7b3ae
continue autonomous depl handling
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 15:19:21 +02:00
43497b399f enabled processGps
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 15:18:07 +02:00
84fc44fd5f fixed GPS and STR inputs
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 15:06:24 +02:00
6a900693f3
continue SA DEPL
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-12 14:24:45 +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
3289a40320
update comment block
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 13:58:48 +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
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
4aecd07970 added PtgCtrl code. matched inputs to actual SensorValues inputs
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-12 10:28:44 +02:00
7be6bbc948 removed deprecated SusData input 2022-10-12 10:27:28 +02:00
430646afd0 added STR to SensorValues 2022-10-12 10:27:01 +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
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
f5adbea923
safe mode is now callback sequence
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-11 15:19:03 +02:00
8536c79445 clean up
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-11 15:01:44 +02:00
46dd2b92e5 renamed RMU related stuff to GYR. added GYR processing 2022-10-11 15:01:32 +02:00
c8d91dce7d format fix. added GYR orientation matrices 2022-10-11 14:56:18 +02:00
bb0ce1a329 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 14:04:12 +02:00
cca96f2a96
scoped thermal ctrl locks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 18:29:06 +02:00
73d9bad9e2 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 18:01:16 +02:00
7f3d827a6e
move finish action call
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 18:00:43 +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
076e67dd0b switched sensor input from AcsController to SensorValues
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 16:02:57 +02:00
82e9c6d092 comments 2022-10-10 16:02:17 +02:00
d9f2dfa725 fixed warnings 2022-10-10 15:58:51 +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
454c2f0ad1
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 10:30:45 +02:00
fd1d53aa23
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 10:18:29 +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
f77b3498ec fixed inputs. removed outputs. minor fixes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-10-10 09:54:06 +02:00
bbf4be1cfe removed reduntant parts. fixed integers messing up divisions 2022-10-10 09:53:33 +02:00
9173c4d2cb
missing commandActive reset
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-06 18:05:06 +02:00
36c9feaf3f parity helps for some reason
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-06 17:01:04 +02:00
f20acf417e some fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-10-06 16:58:43 +02:00
3079dabc20 combined SensorProcessing and SusConverter
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-10-06 15:38:23 +02:00
84e960a9ef enabled performSafe 2022-10-06 15:37:41 +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
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
a562d7e4ca
improved retval checker
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-30 15:07:20 +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
abe5f43ae9 added performDetumble and implemented ckeckModeCommand
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-30 11:06:17 +02:00
16429009b4 added LocalDataPool entries
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-30 10:13:27 +02:00
Irini Kosmidou
68fdb68fe6 Merge branch 'irini' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 23:38:59 +02:00
Irini Kosmidou
9c07a26615 commets removed
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 19:50:12 +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
Irini Kosmidou
43cda300e3 scex directory
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-29 19:38:19 +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
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
ee6d13abcc Merge branch 'develop' into petri_dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:21:08 +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
8a5248a46d
include fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:03:09 +02:00
a215657f4e
small bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 14:01:04 +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
aa56c26e25
Merge remote-tracking branch 'origin/develop' into petri_dev
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-29 13:45: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
1463963532
unittest builds now
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-29 13:20:05 +02:00
b9f48a533a Merge remote-tracking branch 'origin/develop' into scex-additions
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-28 17:02:21 +02:00
eb08d8849b added SUS datapool to AcsController
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-28 15:27:51 +02:00
02333d8267
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-09-28 10:13:53 +02:00
103d53181c
Merge remote-tracking branch 'origin/develop' into mueller/obsw-update-cmds
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-09-28 10:04:22 +02:00
c602d7bb28
clean up the dependency mess
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-09-28 00:19:29 +02:00
6888df5c44
afmt
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-09-27 23:59:38 +02:00
0c75997ba0
now it compiles for windows again 2022-09-27 23:59:17 +02:00
Irini Kosmidou
26dc4ba56e fixes for compilation
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-27 19:38:35 +02:00
Irini Kosmidou
a04372ff55 Merge remote-tracking branch 'origin/develop' into petri_dev
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-09-27 19:31:57 +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
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
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