Commit Graph

5060 Commits

Author SHA1 Message Date
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
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
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
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
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
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
0466622a16
tweaks for ACS scheduling
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 18:07:15 +01:00
Jakob Meier
0d8cb295d9 removed duplicate code
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 16:55:12 +01:00
eaceb32359 Merge branch 'develop' into eggert/acs-dataset-stuff
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 16:03:36 +01:00
01d8eccdd2 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 16:00:28 +01:00
19d04c0023
v1.30.0
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-22 15:03:07 +01:00
67a14ca6f6 handle ACS event in AcsSubsystem
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 15:02:15 +01:00
83b81e1ba8 changed mekf events again
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 14:57:44 +01:00
e915f6cc90 Merge pull request 'PDEC possible fixes' (#393) from pdec_possible_fixes_and_fdir into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #393
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2023-02-22 14:45:48 +01:00
c9f16b223a
Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build started...
2023-02-22 14:30:31 +01:00
Jakob Meier
3137ebb86e com subsystem complete
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-22 13:02:40 +01:00
Jakob Meier
fd1c090141 tmtc update 2023-02-22 13:02:04 +01:00
Jakob Meier
82d428440b tmtc update 2023-02-22 09:53:39 +01:00
Jakob Meier
018f93cfbe fixed bugs in com subsystem 2023-02-22 09:53:09 +01:00
Jakob Meier
c64a490324 Merge branch 'develop' into meier/com-ss 2023-02-22 07:17:02 +01:00
2c3a7791e1 Merge branch 'develop' into eggert/acs-dataset-stuff
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-21 17:16:15 +01:00
f19729e11d throw a single event every time the mekf stops working
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 17:10:59 +01:00
019cc29c24 useMekf actually now uses returnvalues as inteded 2023-02-21 17:09:49 +01:00
d1402587dc differentiate between mekf not working during safe/detumble or any higer mode
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 17:06:24 +01:00
793e6f4119 returnvalues for all mekf termination cases now
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 16:56:13 +01:00
0ec0d551a3 added functions for updating datasets upon errors or success
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 16:08:46 +01:00
2a9c1aab7f added mekf status to dataset
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 16:02:26 +01:00
243088252c
bump revision
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:41:38 +01:00
9be00603f4 Merge pull request 'Fix some issues' (#392) from bugfixes_code_review_msg_handling into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #392
Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de>
2023-02-21 11:40:51 +01:00
f3fe65080b
Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-02-21 11:40:48 +01:00
d9ef0f9a9d
small tweak
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:39:56 +01:00
7aa977efdf
move changelog entry
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-02-21 11:32:51 +01:00
adda32854d Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling 2023-02-21 11:32:17 +01:00
01ac2f4aff
Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-21 11:32:05 +01:00
b01b9d3b99 Merge branch 'develop' into eggert/acs-dataset-stuff
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:31:27 +01:00
a2a822c118 get
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:30:42 +01:00
1bdfd5f8ea
prep v1.29.0
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:29:18 +01:00
0f5e65e5ce Merge branch 'develop' into bugfixes_code_review_msg_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-21 11:29:03 +01:00
62e7e23512
prep v1.29.0 2023-02-21 11:23:27 +01:00