Commit Graph

6610 Commits

Author SHA1 Message Date
9b6c3964c6
Merge remote-tracking branch 'origin/develop' into bugfix_adis_cfg_set
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-02-23 18:54:28 +01:00
089d04646a
prep v1.31.1 2023-02-23 18:53:29 +01:00
ed992e495b Merge pull request 'ACS Tweaks and Bugfix' (#403) from acs_tweaks_possibly_fixes into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #403
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-02-23 18:52:08 +01:00
8da373542e
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-02-23 18:51:31 +01:00
ee974d0e2d
register ADIS config set pool variables
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 18:41:25 +01:00
0907e8f5e5
use more constants
Some checks are pending
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-02-23 18:39:14 +01:00
59b80807ba
possible fix but not sure
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 18:34:28 +01:00
80e12fb194 well this is a bug
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Signed-off-by: meggert <eggertm@irs.uni-stuttgart.de>
2023-02-23 17:36:15 +01:00
7c3031de78 gps dummy fixes
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 17:08:55 +01:00
f160dfa56d bump generators 2023-02-23 17:06:36 +01:00
bf16d6d86a
more improvements for gps handler
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 16:36:17 +01:00
43a2993f4d
Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 15:59:24 +01:00
d6f537da5f
Merge remote-tracking branch 'origin/develop' into thermal_controller
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 15:58:10 +01:00
e19c03f0d7 Merge pull request 'remove shadowed member variables' (#396) from bugfix_shadowed_variables_dual_assys into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #396
2023-02-23 15:53:28 +01:00
33d552693f Merge branch 'develop' into bugfix_shadowed_variables_dual_assys
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-02-23 15:53:09 +01:00
152a9b2dce
bump eive-tmtc again
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 15:46:53 +01:00
91af3ac497
skip private retval
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 15:40:06 +01:00
Jakob Meier
ee4db78a95 removed wrong comment
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-02-23 15:37:20 +01:00
89f6314a18
prep v1.31.0
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 15:32:40 +01:00
Jakob Meier
5db1f71854 run clang formatting script
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
2023-02-23 15:27:24 +01:00
0ee7bdad0a
Merge remote-tracking branch 'origin/develop' into bugfix_shadowed_variables_dual_assys
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 15:27:15 +01:00
Jakob Meier
481e546e6d Merge branch 'develop' into meier/pdec-config-persistent 2023-02-23 15:24:53 +01:00
Jakob Meier
1e45bff0cc tmtc update 2023-02-23 15:23:35 +01:00
419864e5da Merge pull request 'tweaks for ACS scheduling' (#395) from tweaks_acs_scheduling into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #395
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-02-23 15:23:34 +01:00
cd88e8948d Merge pull request 'Com Subsystem' (#364) from meier/com-ss into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #364
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-02-23 15:22:46 +01:00
ca743ccd6c
re-run generators
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-02-23 15:22:11 +01:00
9fc6386ac5
bump tmtc again
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-02-23 15:19:56 +01:00
Jakob Meier
513dcf9be1 bugfixes in pdec handler parameter commands 2023-02-23 15:19:48 +01:00
b60891ddd1
tmtc bump
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 15:14:56 +01:00
cd988753ae
bump tmtc 2023-02-23 15:14:40 +01:00
d37770422b bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 15:05:10 +01:00
12539ba415 stuff
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-23 13:48:06 +01:00
0726b9d730 removed our copyright
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-23 13:37:12 +01:00
66d3b06f9e
Merge remote-tracking branch 'origin/develop' into meier/com-ss
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 13:06:22 +01:00
bd60255220
interior structure changes, use new sched block
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 11:57:12 +01:00
ba9268aae6
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 11:49:13 +01:00
9f83a49690
remove shadowed member variables
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-23 11:46:30 +01:00
5d9ed222f5 added returnvalue handling
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-02-23 11:26:43 +01:00
5205c5b78a include cleanup
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 11:06:45 +01:00
Jakob Meier
3b17af9d07 added local parameter handler to PdecConfig to store persistent parameters 2023-02-23 10:09:04 +01:00
205bd4648e reseting the MEKF now also resets its state in navigation
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 09:45:11 +01:00
29f1dd0f8e Merge branch 'develop' into eggert/acs-ctrl-action-cmds
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-23 09:31:58 +01:00
9a7779cffb struct heaterStates and more
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 21:46:56 +01:00
0254fb9fd2 Merge branch 'develop' into tweaks_acs_scheduling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 19:56:34 +01:00
eee3da50f2 Merge pull request 'Telemetry related Changes' (#394) from eggert/acs-dataset-stuff into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #394
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-02-22 19:56:23 +01:00
d32ce3c563
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 19:48:44 +01:00
a190d99f6d
auto-formatter
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 19:45:41 +01:00
0fa1bab94d comments
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-22 19:14:35 +01:00
5357de8da8
bump fsfe
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 18:13:52 +01:00
9614a76acf Merge remote-tracking branch 'origin/develop' into meier/com-ss 2023-02-22 18:13:29 +01:00