Commit Graph

4210 Commits

Author SHA1 Message Date
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
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
c3c2e1c0dd
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-03-04 15:08:07 +01:00
f659f13759 Changing build to -j4 from -j to lessen load on build server 2022-03-03 16:03:06 +01:00
75c56280ad Merge pull request 'GPIO HAL Updates' (#36) from mueller/gpio-hal-updates into eive/develop
Reviewed-on: eive/fsfw#36
2022-03-03 09:44:42 +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
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
68225586d2 some fixes 2022-02-28 15:16:43 +01:00
a8426750f2 Merge pull request 'display run commands in helper script' (#564) from eive/fsfw:mueller/update-helper-script into development
Reviewed-on: fsfw/fsfw#564
2022-02-28 15:13:39 +01:00
2635f39344 Merge branch 'development' into mueller/update-helper-script 2022-02-28 15:05:02 +01:00
89327463e3 Merge pull request 'HkSwitchHelper should not be needed anymore' (#557) from eive/fsfw:mueller/delete-obsolete-module into development
Reviewed-on: fsfw/fsfw#557
2022-02-28 15:03:09 +01:00
cf45eca100
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable 2022-02-28 15:00:38 +01:00
c0fa365f8f
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module 2022-02-28 14:58:28 +01:00
9d9f19781d
Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static 2022-02-28 14:57:38 +01:00
f4520ea346 Merge remote-tracking branch 'upstream/development' into mueller/test-task-one-shot-flag-not-static 2022-02-28 14:56:51 +01:00
331aa9442d
some updates 2022-02-28 14:56:37 +01:00
bbacdc5cac Merge pull request 'Linux HAL: Add I2C wiretapping option' (#559) from eive/fsfw:mueller/hal-i2c-wiretapping into development
Reviewed-on: fsfw/fsfw#559
2022-02-28 14:55:21 +01:00
afd3a942e2
use enum class 2022-02-28 14:46:12 +01:00
729bcc4aaf Merge remote-tracking branch 'upstream/development' into mueller/gpio-hal-updates 2022-02-28 14:39:35 +01:00
a6c0f3fef5 Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module 2022-02-28 14:17:09 +01:00
6e0b90696d Merge pull request 'initial submode' (#35) from meier/dhbInitialSubmode into eive/develop
Reviewed-on: eive/fsfw#35
2022-02-28 13:23:26 +01:00
Jakob Meier
eacb4ac407 initial submode 2022-02-25 14:41:43 +01:00
09c1918c1f Merge pull request 'Update FSFW' (#34) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#34
2022-02-25 11:38:11 +01:00
123f2ff360
removed unnecessary warning 2022-02-25 11:10:48 +01:00
0e8328fca3 Fixed include based on Feedback 2022-02-24 11:22:51 +01:00
1ef3dae72e Fixed an missing include 2022-02-23 22:36:29 +01:00
32381a7872 Fixed an issue with wrong buffer size 2022-02-23 21:20:22 +01:00
09815f5cce Clang format 2022-02-23 18:24:07 +01:00
f6357b4531 WIP compiler Flags and new unit tests for fixes 2022-02-23 18:23:22 +01:00
a10e5c6ed4 Merge branch 'development' into mueller/update-helper-script 2022-02-23 15:38:25 +01:00
d6d13eec95 Merge branch 'development' into gaisser_unit_test_internal_error 2022-02-23 12:37:55 +01:00
457bc6609e Merge pull request 'apply clang format' (#558) from eive/fsfw:mueller/apply-clang-format into development
Reviewed-on: fsfw/fsfw#558
2022-02-23 12:36:24 +01:00