Jakob Meier
|
1b7e0371c3
|
fixed merge conflict
|
2022-03-14 15:25:17 +01:00 |
|
Jakob Meier
|
d4ade5e885
|
sequence count operator overloading
|
2022-03-14 15:01:17 +01:00 |
|
|
|
d5ff6da40b
|
Merge pull request 'function to get fsfw version' (#43) from mueller/version-getter into eive/develop
Reviewed-on: #43
|
2022-03-08 12:04:13 +01:00 |
|
|
|
e498136273
|
Merge pull request 'call setTimeout' (#44) from mueller/countdown-improvement into eive/develop
Reviewed-on: #44
|
2022-03-08 12:03:13 +01:00 |
|
|
|
47d158156b
|
call setTimeout
|
2022-03-08 11:52:33 +01:00 |
|
|
|
73f0b9c0dc
|
Merge pull request 'define FSFW_DISABLE_PRINTOUT in any case' (#42) from mueller/define-fsfw-disabled-printout into eive/develop
Reviewed-on: #42
|
2022-03-08 10:11:45 +01:00 |
|
|
|
b5e55f64b0
|
Merge pull request 'Another HasModesIF improvement' (#41) from mueller/master into eive/develop
Reviewed-on: #41
|
2022-03-08 10:11:05 +01:00 |
|
|
|
7ca6d1a695
|
function to get fsfw version
|
2022-03-08 10:05:18 +01:00 |
|
|
|
cc3210f366
|
Merge branch 'eive/develop' into mueller/define-fsfw-disabled-printout
|
2022-03-08 09:57:43 +01:00 |
|
|
|
155d66e534
|
define FSFW_DISABLE_PRINTOUT in any case
|
2022-03-08 09:57:11 +01:00 |
|
|
|
202cfc6dbb
|
Merge branch 'eive/develop' into mueller/master
|
2022-03-08 09:47:37 +01:00 |
|
|
|
84f95e8d76
|
this is better
|
2022-03-08 09:45:58 +01:00 |
|
|
|
6de4798805
|
Merge pull request 'better name of invalid mode retval' (#40) from mueller/master into eive/develop
Reviewed-on: #40
|
2022-03-08 09:37:58 +01:00 |
|
|
|
82a645deba
|
Merge branch 'eive/develop' into mueller/master
|
2022-03-08 09:36:25 +01:00 |
|
|
|
8b1c277c58
|
better name of invalid mode retval
|
2022-03-08 09:34:22 +01:00 |
|
|
|
5f23f709cc
|
Merge pull request 'Update for Assembly Base' (#38) from mueller/master into eive/develop
Reviewed-on: #38
|
2022-03-08 07:53:04 +01:00 |
|
|
|
a7cb2d4354
|
small test device handler fixes
|
2022-03-07 15:54:56 +01:00 |
|
|
|
7571987a1d
|
Merge branch 'eive/develop' into mueller/master
|
2022-03-07 15:43:52 +01:00 |
|
|
|
d6c1041133
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2022-03-07 15:34:11 +01:00 |
|
|
|
5912ddd2a2
|
Merge pull request 'Activates new gcc compiler flags' (#568) from gaisser/fsfw:gaisser_compiler_flags into development
Reviewed-on: fsfw/fsfw#568
|
2022-03-07 14:44:09 +01:00 |
|
|
|
7db11588b4
|
Merge branch 'development' into gaisser_compiler_flags
|
2022-03-07 14:39:01 +01:00 |
|
|
|
c88b931ef1
|
Merge pull request 'HAL Devicehandlers: Periodic printouts are runtime configurable now' (#561) from eive/fsfw:mueller/dev-printout-runtime-configurable into development
Reviewed-on: fsfw/fsfw#561
|
2022-03-07 14:36:25 +01:00 |
|
|
|
10ffa2f44a
|
Merge branch 'development' into mueller/dev-printout-runtime-configurable
|
2022-03-07 14:20:56 +01:00 |
|
|
|
dbe31dd339
|
Merge pull request 'some forgotten size_t' (#570) from eive/fsfw:mohr/sizes into development
Reviewed-on: fsfw/fsfw#570
|
2022-03-07 14:19:59 +01:00 |
|
|
|
14b44f8bb2
|
Merge branch 'development' into gaisser_compiler_flags
|
2022-03-07 13:09:21 +01:00 |
|
|
|
117747970d
|
some forgotten size_t
|
2022-03-05 22:03:25 +01:00 |
|
|
|
3c53e2c259
|
renamed some ModeIF definitions
|
2022-03-05 03:01:43 +01:00 |
|
|
|
45f0d7fd45
|
docs
|
2022-03-04 18:06:57 +01:00 |
|
|
|
c6540650e2
|
Merge pull request 'Changing build to -j4 from -j to lessen load on build server' (#569) from mohr/slowbuild into development
Reviewed-on: fsfw/fsfw#569
|
2022-03-04 15:16:25 +01:00 |
|
|
|
aebab4c73c
|
Merge remote-tracking branch 'upstream/development' into mueller/master
|
2022-03-04 15:08:45 +01:00 |
|
|
|
c3c2e1c0dd
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2022-03-04 15:08:07 +01:00 |
|
|
|
4e6c1cb72a
|
docs
|
2022-03-04 00:55:41 +01:00 |
|
|
|
f659f13759
|
Changing build to -j4 from -j to lessen load on build server
|
2022-03-03 16:03:06 +01:00 |
|
|
|
e2eb6a46b6
|
Merge branch 'eive/develop' into mueller/master
|
2022-03-03 13:43:15 +01:00 |
|
|
|
75c56280ad
|
Merge pull request 'GPIO HAL Updates' (#36) from mueller/gpio-hal-updates into eive/develop
Reviewed-on: #36
|
2022-03-03 09:44:42 +01:00 |
|
|
|
0ccaf27fcb
|
better printout for parameter code
|
2022-03-01 19:43:21 +01:00 |
|
|
|
95078e1103
|
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
|
2022-02-28 15:52:54 +01:00 |
|
|
|
e05e203c83
|
fix merge conflict
|
2022-02-28 15:50:27 +01:00 |
|
|
|
8920255565
|
Merge pull request 'one shot flag not static anymore' (#560) from eive/fsfw:mueller/test-task-one-shot-flag-not-static into development
Reviewed-on: fsfw/fsfw#560
|
2022-02-28 15:50:06 +01:00 |
|
|
|
ac036b2a70
|
Merge remote-tracking branch 'origin/eive/develop' into mueller/gpio-hal-updates
|
2022-02-28 15:49:11 +01:00 |
|
|
|
2d12618c96
|
Merge branch 'development' into mueller/test-task-one-shot-flag-not-static
|
2022-02-28 15:42:08 +01:00 |
|
|
|
2d9216ba19
|
Merge branch 'mueller/gpio-hal-updates' into mueller/master
|
2022-02-28 15:37:03 +01:00 |
|
|
|
2fed161eff
|
Merge branch 'eive/develop' into mueller/gpio-hal-updates
|
2022-02-28 15:34:48 +01:00 |
|
|
|
68ca6fd122
|
Merge branch 'development' into gaisser_compiler_flags
|
2022-02-28 15:29:57 +01:00 |
|
|
|
33e9592659
|
Merge pull request 'Unit test for Internal Error Reporter' (#563) from gaisser/fsfw:gaisser_unit_test_internal_error into development
Reviewed-on: fsfw/fsfw#563
|
2022-02-28 15:26:00 +01:00 |
|
|
|
19d217e3b9
|
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
|
2022-02-28 15:23:54 +01:00 |
|
|
|
af286d3bc6
|
Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static
|
2022-02-28 15:23:21 +01:00 |
|
|
|
4cf2a384f3
|
Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates
|
2022-02-28 15:22:32 +01:00 |
|
|
|
27267b7cb0
|
Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates
|
2022-02-28 15:21:39 +01:00 |
|
|
|
20928732ec
|
Merge branch 'development' into gaisser_unit_test_internal_error
|
2022-02-28 15:19:44 +01:00 |
|
