Commit Graph

2678 Commits

Author SHA1 Message Date
c6e16e0866
resolve merge conflict, ran afmt
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-07 09:57:19 +02:00
042a6b2960
Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-update-mode-handling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-07 09:50:21 +02:00
06a15ccec1
submodule updates
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-07 00:16:15 +02:00
834e935c64
switch handling working now 2022-04-07 00:14:18 +02:00
d7e899e113
Merge remote-tracking branch 'origin/develop' into mueller/improve-pcdu-hk-handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-06 12:10:50 +02:00
f325d139da
p60 dock HK does not need to be diagnostic
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-06 12:10:22 +02:00
1d6ae35465 Merge pull request 'meier/syrlinks' (#199) from meier/syrlinks into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #199
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-04-06 12:09:50 +02:00
65d504bed1
p60 dock HK is diagnostic again
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-05 19:49:57 +02:00
36db47466f
tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-05 19:43:28 +02:00
3cfd0deb22
set p60 dock HK vars to valid
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-05 19:29:09 +02:00
Jakob Meier
146868da21 fsfw update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-05 14:43:20 +02:00
Jakob Meier
d48ec92d09 fixed conflicts
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-05 13:57:16 +02:00
Jakob Meier
29b7c97892 tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-05 12:00:12 +02:00
Jakob Meier
1f4328d9a0 prepared pr
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-05 11:52:01 +02:00
Jakob Meier
f91efd8c1e prepared pr
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-05 11:50:45 +02:00
Jakob Meier
40403b81c3 debug flag
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-05 08:38:36 +02:00
6020b20fc9
hk handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-04 18:47:09 +02:00
5031e78365 Merge remote-tracking branch 'origin/develop' into mueller/improve-pcdu-hk-handling
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-04 17:22:33 +02:00
65ce25ec7a
improved P60 HK handling
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 17:16:52 +02:00
Jakob Meier
a30e57142a tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 15:05:56 +02:00
Jakob Meier
d2f54f033f syrlinks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 14:58:35 +02:00
4327fcb92e
set internal state properly
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 13:55:25 +02:00
d315d6b458
tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 13:53:44 +02:00
734972af07 Merge pull request 'apply auto-formatter' (#197) from mueller/afmt into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #197
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-04 13:51:37 +02:00
ec880d4232
apply auto-formatter
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 13:40:45 +02:00
b12ffb6f44
PL PCDU switch states like mode bitmask now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 13:39:35 +02:00
99f56a89af
tmtc update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-04 12:00:39 +02:00
5e3e152d8e Merge remote-tracking branch 'origin/develop' into mueller/master 2022-04-04 11:58:51 +02:00
50db2fedef Merge pull request 'bugfix in SUS device handler' (#196) from mueller/sus-bugfix into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #196
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-04 07:49:53 +02:00
4cb434e750 Merge branch 'mueller/sus-bugfix' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-03 20:36:10 +02:00
007badc324
bugfix in SUS device handler
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-03 20:35:49 +02:00
36666f214c
Merge remote-tracking branch 'origin/develop' into mueller/master
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-03 20:15:41 +02:00
189674a9bb
re-enable all suses
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-03 20:12:14 +02:00
a57f3faafb Merge pull request 'update fsfw dependency' (#195) from mueller/update-fsfw into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #195
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-01 14:58:22 +02:00
04de6c7136 Merge pull request 'move GNSS NReset handling to assembly' (#194) from mueller/move-gnss-nreset-handling into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #194
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-01 14:55:49 +02:00
afb1d22f76 Merge pull request 'activate all suses again' (#193) from mueller/rpi-sus-port into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #193
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-04-01 14:52:10 +02:00
07c242282d syrlinks test
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-01 14:15:42 +02:00
8a4de72713
update header file as well
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-01 14:13:37 +02:00
d3050625bb
update fsfw dependency
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-01 14:12:14 +02:00
c55fafee48
fsfw update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-01 14:11:41 +02:00
c231a775b3 Merge remote-tracking branch 'origin/develop' into mueller/move-gnss-nreset-handling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-04-01 14:05:32 +02:00
2cc14532cd Merge pull request 'meier/deviceHandlerUpdate' (#192) from meier/deviceHandlerUpdate into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #192
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-04-01 14:05:04 +02:00
1eb5a428cb
move GNSS NReset handling to assembly
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
- Also update fsfwgen dependency
2022-04-01 14:01:12 +02:00
1a280dd5cf Merge branch 'develop' into mueller/rpi-sus-port
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-01 13:46:14 +02:00
0fba9cbf7e
Merge remote-tracking branch 'origin/develop' into mueller/master
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-04-01 13:44:47 +02:00
d769d3ce22 Merge remote-tracking branch 'origin/develop' into meier/deviceHandlerUpdate
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-04-01 13:41:04 +02:00
Jakob Meier
ca1e8f3dc1 syrlinks fault flag
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-04-01 09:20:35 +02:00
61769de4bf activate all suses again
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-03-31 19:12:40 +02:00
ff86b9bbb3 Merge pull request 'Port of Sun Sensor and RTD code to Raspberry Pi' (#190) from mueller/rpi-sus-port into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #190
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-03-31 18:58:10 +02:00
487c21f16a fixes
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-03-31 18:04:55 +02:00