Commit Graph

1419 Commits

Author SHA1 Message Date
fa66fafd2c Merge branch 'development' into mueller/rtems-update-stm32 2021-01-12 15:01:33 +01:00
f81d3e81dc Merge pull request 'Bugfix Device Handler Base' (#339) from mueller/devicehandler-bugfix into development
Reviewed-on: fsfw/fsfw#339
2021-01-12 14:45:11 +01:00
67879bf12f Merge branch 'development' into mueller/devicehandler-bugfix 2021-01-12 13:28:10 +01:00
d281b56ce2 Merge pull request 'moved includes' (#335) from mueller/bugfix/defaultcfg into development
Reviewed-on: fsfw/fsfw#335
2021-01-12 13:27:57 +01:00
ba9a604c93 Merge branch 'development' into mueller/bugfix/defaultcfg 2021-01-12 13:27:19 +01:00
72e9a9516f Merge pull request 'cmake lists updates' (#336) from mueller/cmake-updates into development
Reviewed-on: fsfw/fsfw#336
2021-01-12 13:26:39 +01:00
63e80206bc rtems osal update 2021-01-04 15:34:08 +01:00
4c07ca21eb important include fix 2021-01-02 19:40:00 +01:00
4de5fc44b4 rtems init 2021-01-01 21:19:42 +01:00
0a4d0b5937 bugfix 2020-12-30 22:34:40 +01:00
c8af75f9c7 moved inlcudes 2020-12-28 18:06:34 +01:00
bc1513c649 cmake lists updates 2020-12-28 18:06:00 +01:00
426514b9a2 Merge pull request 'Move static constants to DeviceHandlerIF' (#331) from eive/fsfw:mueller/no-raw-command-moved-to-if into development
Reviewed-on: fsfw/fsfw#331
2020-12-23 23:51:40 +01:00
dcc111e4fa moved no comamnd and raw command to device handler IF 2020-12-23 20:17:10 +01:00
e94238762f Merge remote-tracking branch 'upstream/development' into development 2020-12-23 20:15:39 +01:00
52d9a55d06 Merge pull request 'better error handling' (#329) from KSat/fsfw:mueller/osal-windows-tweak into development
Reviewed-on: fsfw/fsfw#329
2020-12-22 17:34:41 +01:00
c19b838657 Merge branch 'development' into mueller/osal-windows-tweak 2020-12-22 17:34:33 +01:00
f9e36d7268 Merge pull request 'include guards' (#330) from KSat/fsfw:mueller/tmtcpacket-tiny-tweak into development
Reviewed-on: fsfw/fsfw#330
2020-12-22 17:31:35 +01:00
0eff30e065 Merge branch 'development' into mueller/tmtcpacket-tiny-tweak 2020-12-22 17:31:25 +01:00
27fe235700 Merge branch 'development' into mueller/osal-windows-tweak 2020-12-22 17:30:42 +01:00
2706669011 Merge pull request 'time stamper ID added' (#328) from KSat/fsfw:mueller/fwObject-timestamper into development
Reviewed-on: fsfw/fsfw#328
2020-12-22 17:28:49 +01:00
f017e9c6d4 include guards 2020-12-22 16:22:11 +01:00
e674b9248a better error handling 2020-12-22 16:15:40 +01:00
571a64c42a time stamper ID added 2020-12-22 16:10:53 +01:00
83458c851e Merge pull request 'timemanager update' (#315) from KSat/fsfw:mueller/timeman-update into development
Reviewed-on: fsfw/fsfw#315
2020-12-22 15:50:28 +01:00
48a89d59d6 Merge branch 'mueller/timeman-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/timeman-update 2020-12-22 15:49:39 +01:00
958db291e8 now it compiles 2020-12-22 15:49:31 +01:00
c8ca680d5f Merge branch 'development' into mueller/timeman-update 2020-12-22 15:40:14 +01:00
d2a9b769eb Merge pull request 'tmtcservices update' (#309) from KSat/fsfw:mueller/tmtcservices-update into development
Reviewed-on: fsfw/fsfw#309
2020-12-22 15:39:07 +01:00
329cd8862a Merge branch 'development' into mueller/tmtcservices-update 2020-12-22 15:37:22 +01:00
fe26fc4824 Merge branch 'development' into mueller/timeman-update 2020-12-22 15:36:48 +01:00
ddcdfb3403 Merge pull request 'Fixed file ending of devicehanlder remake' (#326) from gaisser/fsfw:development into development
Reviewed-on: fsfw/fsfw#326
2020-12-22 15:36:33 +01:00
822cc0306c Fixed file ending of devicehanlder remake 2020-12-22 15:35:23 +01:00
483cec191b Merge pull request 'updated docs, added new doc folder' (#325) from KSat/fsfw:mueller/doc-update into development
Reviewed-on: fsfw/fsfw#325
2020-12-22 15:31:50 +01:00
5a4f453aaa Merge branch 'mueller/timeman-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/timeman-update 2020-12-22 15:30:03 +01:00
ab9965cb81 clock corrected 2020-12-22 15:29:42 +01:00
afad130918 Merge branch 'development' into mueller/doc-update 2020-12-22 15:29:05 +01:00
7f3bdb6082 Merge pull request 'devicehandler updates' (#320) from KSat/fsfw:mueller/devicehandlers-update into development
Reviewed-on: fsfw/fsfw#320
2020-12-22 15:28:46 +01:00
117b29e413 Merge branch 'development' into mueller/devicehandlers-update 2020-12-22 15:28:38 +01:00
0e1eac4f14 Merge pull request 'HOST CMake Improvements' (#318) from mueller/host-cmake-improvements into development
Reviewed-on: fsfw/fsfw#318
2020-12-22 15:22:57 +01:00
041aaf01db Merge branch 'development' into mueller/host-cmake-improvements 2020-12-22 15:21:34 +01:00
6663c69ee9 Merge pull request 'cmake fixes' (#314) from mueller/cmake-fixes into development
Reviewed-on: fsfw/fsfw#314
2020-12-22 15:18:58 +01:00
cb7a22c370 Merge branch 'development' into mueller/cmake-fixes 2020-12-22 15:18:47 +01:00
5941bd710a Merge pull request 'clearing HK message included now' (#322) from KSat/fsfw:mueller/ipc-update into development
Reviewed-on: fsfw/fsfw#322
2020-12-22 15:13:51 +01:00
631bbf70c2 Merge branch 'development' into mueller/ipc-update 2020-12-22 15:13:20 +01:00
85d6e02291 Merge pull request 'nullptr check added' (#324) from KSat/fsfw:mueller/datapool-update into development
Reviewed-on: fsfw/fsfw#324
2020-12-22 15:12:03 +01:00
3b59a50e9a Merge branch 'development' into mueller/datapool-update 2020-12-22 15:11:37 +01:00
4a154140f3 Merge pull request 'unittest update' (#323) from KSat/fsfw:mueller/unittest-update into development
Reviewed-on: fsfw/fsfw#323
2020-12-22 15:11:27 +01:00
b0fcb404b3 Merge branch 'development' into mueller/unittest-update 2020-12-22 15:11:02 +01:00
422a0f1ee0 Merge pull request 'defaultcfg update' (#319) from KSat/fsfw:mueller/defaultcfg-update into development
Reviewed-on: fsfw/fsfw#319
2020-12-22 15:05:36 +01:00