|
|
2f0aed97dc
|
Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching
|
2023-03-16 17:44:46 +01:00 |
|
|
|
52ab77eded
|
Merge pull request 'Init Boot Mode' (#474) from feature_boot_sequence_eive_sys into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #474
|
2023-03-15 16:29:18 +01:00 |
|
|
|
4ff1548cf2
|
Merge branch 'develop' into feature_boot_sequence_eive_sys
|
2023-03-15 16:29:11 +01:00 |
|
|
|
f6d1a41cb9
|
Merge pull request 'tweak scheduling frequencies' (#471) from feature_scheduling_tweaks into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #471
|
2023-03-15 16:28:36 +01:00 |
|
|
|
1623dd1c80
|
Merge branch 'develop' into feature_scheduling_tweaks
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-15 16:28:26 +01:00 |
|
|
|
94ae33a554
|
Merge branch 'develop' into refactoring_bugfixes_power_switching
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:27:54 +01:00 |
|
|
|
e3c41dd807
|
Merge pull request 'ACS Safe Ctrl Failure Event' (#484) from acs-safe-mode-failure into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #484
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2023-03-15 16:27:42 +01:00 |
|
|
|
2f263c6aa6
|
small bugfix
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:21:05 +01:00 |
|
|
|
8c83ec78fd
|
Merge branch 'develop' into feature_boot_sequence_eive_sys
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 15:51:38 +01:00 |
|
|
|
f229ebb141
|
Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 14:16:21 +01:00 |
|
|
|
a2f2e1b84e
|
Merge pull request 'some user code fixes' (#487) from bump_fsfw into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #487
|
2023-03-15 14:14:43 +01:00 |
|
|
|
19753c43f1
|
Merge branch 'develop' into bump_fsfw
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-15 14:14:31 +01:00 |
|
|
|
7ab01687ce
|
some user code fixes
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 11:49:01 +01:00 |
|
|
|
22076ea25e
|
Merge pull request 'bump fsfw' (#486) from bump_fsfw into develop
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #486
|
2023-03-15 11:42:21 +01:00 |
|
|
|
7c54e920ef
|
bump fsfw
EIVE/eive-obsw/pipeline/head Build queued...
|
2023-03-15 11:42:03 +01:00 |
|
|
|
be848ea5e4
|
changelog update
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 11:32:58 +01:00 |
|
|
|
8dd22b6ea0
|
Merge branch 'develop' into feature_scheduling_tweaks
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 11:31:55 +01:00 |
|
|
|
53c38d9c05
|
Merge remote-tracking branch 'origin/develop' into acs-ctrl-finite-check
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 11:31:31 +01:00 |
|
|
|
d894479f75
|
Merge remote-tracking branch 'origin/develop' into acs-safe-mode-failure
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 11:29:06 +01:00 |
|
|
|
37e128041f
|
Merge pull request 'Reset RW dataset on shutdown' (#485) from rw-dataset-reset into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #485
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2023-03-15 11:27:29 +01:00 |
|
|
|
bab0bbf82d
|
changelog
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 10:38:00 +01:00 |
|
|
|
7d9be35cb4
|
reset relevant datasets on shutdown
|
2023-03-15 10:36:25 +01:00 |
|
|
|
95a4d88ed4
|
cleanup
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 10:17:24 +01:00 |
|
|
|
102228100e
|
reran event gens
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-03-15 10:10:47 +01:00 |
|
|
|
c4fe772fe7
|
changelog
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-03-15 10:08:58 +01:00 |
|
|
|
ccf1fcaa79
|
stuff
|
2023-03-15 10:06:24 +01:00 |
|
|
|
4fdb2de510
|
Merge branch 'develop' into acs-safe-mode-failure
# Conflicts:
# CHANGELOG.md
# mission/controller/AcsController.cpp
# mission/controller/AcsController.h
|
2023-03-15 10:06:02 +01:00 |
|
|
|
5e2f7fa3ed
|
reran gens
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 09:39:46 +01:00 |
|
|
|
7ddfdc0978
|
post merge fix
|
2023-03-15 09:38:31 +01:00 |
|
|
|
bb895c9e12
|
Merge branch 'develop' into acs-ctrl-finite-check
|
2023-03-15 09:37:15 +01:00 |
|
|
|
3eb5fc7f47
|
Merge pull request 'patch for v1.37.2' (#483) from patch_v1.37.2 into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #483
|
2023-03-14 20:03:00 +01:00 |
|
|
|
533aaa207c
|
bump version
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-14 20:02:39 +01:00 |
|
|
|
005d5a5223
|
prep patch version
|
2023-03-14 20:02:27 +01:00 |
|
|
|
2b12cc4fa2
|
Merge branch 'develop' into feature_boot_sequence_eive_sys
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-14 18:49:25 +01:00 |
|
|
|
ec2db69236
|
Merge branch 'develop' into feature_scheduling_tweaks
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-14 18:49:16 +01:00 |
|
|
|
263f4eb25f
|
Merge branch 'develop' into refactoring_bugfixes_power_switching
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-14 18:49:06 +01:00 |
|
|
|
13c7ef373d
|
Merge pull request 'unittest hotfix' (#482) from unttest_hotfix into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #482
|
2023-03-14 18:48:05 +01:00 |
|
|
|
adcc68e0fa
|
unittest hotfix
EIVE/eive-obsw/pipeline/head Build queued...
|
2023-03-14 18:47:48 +01:00 |
|
|
|
11106cf755
|
Merge pull request 'prep v1.37.1' (#481) from prep_v1.37.1 into develop
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #481
|
2023-03-14 18:45:20 +01:00 |
|
|
|
f966b517a4
|
prep v1.37.1
EIVE/eive-obsw/pipeline/head Build queued...
|
2023-03-14 18:44:50 +01:00 |
|
|
|
3e5937db67
|
Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-14 18:41:28 +01:00 |
|
|
|
d322096573
|
changelog
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-14 18:41:11 +01:00 |
|
|
|
a392e31f99
|
Merge remote-tracking branch 'origin/develop' into feature_boot_sequence_eive_sys
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-14 18:39:08 +01:00 |
|
|
|
719ffcad2b
|
Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-14 18:36:43 +01:00 |
|
|
|
59ee375fc1
|
Merge pull request 'bump fsfw' (#480) from bump_fsfw into develop
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #480
|
2023-03-14 18:34:45 +01:00 |
|
|
|
bbb8dd7a8a
|
bump fsfw
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-14 18:34:23 +01:00 |
|
|
|
8fa2d0be0b
|
Merge branch 'develop' into feature_scheduling_tweaks
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-14 18:33:33 +01:00 |
|
|
|
af1d03f53f
|
Merge pull request 'bump fsfw, tmtc and allow spilling for pools' (#479) from feature_stores_allow_spilling into develop
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #479
|
2023-03-14 18:30:32 +01:00 |
|
|
|
8a6d292a48
|
bump fsfw, tmtc and allow spilling for pools
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-14 18:29:21 +01:00 |
|
|
|
017171f221
|
changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-14 17:22:59 +01:00 |
|
