Commit Graph

2972 Commits

Author SHA1 Message Date
ef14fa3789 Merge remote-tracking branch 'origin/mueller/fixes-for-spi-update' into mohr/thermal_controller 2022-05-19 16:29:30 +02:00
e73bfc2c64
dev string for FM/EM
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 16:00:26 +02:00
Uli
710bd58ee1 Merge branch 'develop' into mohr/thermal_controller 2022-05-19 15:31:13 +02:00
d274f5647d
fix EM cofig
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 15:28:02 +02:00
377f762ca5
fixed for new SPI HAL API
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-19 14:54:44 +02:00
847aadc7bf
update shell script helper to support EM installation
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-19 14:48:16 +02:00
90a92feee1 some thermal controller code to test TM chain
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-19 00:40:42 +02:00
8eaae461b4 Merge pull request 'apply new auto-formatter on all files' (#254) from mueller/update-aformatters into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #254
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-17 14:53:20 +02:00
8a5090b8ee
apply new auto-formatter on all files
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-17 13:40:19 +02:00
e2cfce634b
GenericFactory bugfix
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-17 13:35:21 +02:00
8b875e13c5
repoint fsfw
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-16 15:46:20 +02:00
5f165f666b Merge pull request 'PLOC Handler Improvements' (#252) from meier/ploc into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #252
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-05-16 15:12:28 +02:00
a6abeb697f
comment
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-16 15:09:02 +02:00
d60e7a706a fixed conflicts
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 18:44:52 +02:00
45f34df6b9 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop 2022-05-13 18:38:26 +02:00
4cbe732087 Merge pull request 'Heater Health IF' (#236) from mueller/heater-health-if into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #236
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-13 18:38:12 +02:00
54d7392467 improved mpsoc update handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 18:37:16 +02:00
Jakob Meier
bb397a58de event with packet number for which mpsoc update failed
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-13 10:47:10 +02:00
bf7acf83ff
update .cproject file
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-13 09:51:11 +02:00
23f37e19af
bump fsfw
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-13 09:39:49 +02:00
b5821ec6dc
changelog update
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-13 09:35:47 +02:00
da4d3e4891
update changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 20:47:19 +02:00
ac34bcbb3d
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 20:46:00 +02:00
e81ddaa1a5
added auto-shutdown for faulty heaters 2022-05-12 20:44:36 +02:00
21ba8c95ff
additional parameter to identify cmd source
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 20:12:01 +02:00
e25c492aa4
create and schedule health PUS service
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 19:22:20 +02:00
82f75bde97
fix for heater creation call 2022-05-12 19:12:12 +02:00
e48aa64766
repoint fsfw
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-12 17:48:18 +02:00
569754bdad Merge branch 'develop' into meier/ploc
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 15:48:56 +02:00
06219744ea Merge branch 'meier/ploc' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/ploc
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 15:47:16 +02:00
9db58210b8 Merge branch 'develop' into meier/ploc 2022-05-12 15:47:06 +02:00
ee99c3312e Merge pull request 'Update EIVE OBSW' (#250) from mueller/update-eive-obsw into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #250
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-12 15:34:07 +02:00
Jakob Meier
3a6beafae5 commented time file writing in again
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2022-05-12 15:31:52 +02:00
d7316eff66
remove merge conflict markers
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-12 14:23:10 +02:00
51466e68d7
Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-12 14:11:46 +02:00
e6f55ba2c1 increased execution timeout of prepare update command
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-12 14:04:55 +02:00
0dd0af73a1 change in mpsoc status codes 2022-05-12 10:50:12 +02:00
d1d365c76d
bump tmtc again
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-11 18:00:11 +02:00
38d03dbe57
bump deps, regenerate translation files
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2022-05-11 17:59:08 +02:00
Jakob Meier
af52b90abe fsfwgen update
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-11 17:16:40 +02:00
Jakob Meier
a315a8b529 fixed conflicts
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-11 17:08:44 +02:00
658acb0554 Merge pull request 'RW Assembly' (#224) from mueller/rw-ass into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #224
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2022-05-11 17:03:32 +02:00
Jakob Meier
8a90f0025b commented in time file write
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2022-05-11 17:01:03 +02:00
Jakob Meier
beba258a77 update fsfw
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-11 16:57:23 +02:00
Jakob Meier
c7e2cc22af init sequence count 2022-05-11 16:49:07 +02:00
835a10e538 sequence count init
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-11 16:11:17 +02:00
625abcfd5b
important bugfixes
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-11 15:45:38 +02:00
Jakob Meier
914acd9925 fixed conflicts
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2022-05-11 14:37:36 +02:00
Jakob Meier
c7e4704234 fixed merge conflict 2022-05-11 14:36:23 +02:00
c5bccb661e
Merge remote-tracking branch 'origin/develop' into mueller/rw-ass
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2022-05-11 13:54:04 +02:00