 gaisser
|
35d75bae56
|
Merge pull request 'FSFW Update' (#361) from KSat/fsfw:mueller/fsfw-update into development
Reviewed-on: #361
|
2021-01-26 14:29:20 +01:00 |
|
|
gaisser
|
86d0d5c4ee
|
Merge pull request 'Arrayprinter, Event Manager update' (#355) from KSat/fsfw:mueller/comp_branch into development
Reviewed-on: #355
|
2021-01-26 14:24:56 +01:00 |
|
|
gaisser
|
38c7e050ab
|
Merge branch 'development' into mueller/comp_branch
|
2021-01-25 14:44:06 +01:00 |
|
|
gaisser
|
7310d2b5fe
|
Merge pull request 'improved options' (#359) from eive/fsfw:eive/shadow-local-warning into development
Reviewed-on: #359
|
2021-01-25 14:40:21 +01:00 |
|
|
gaisser
|
d39c729a16
|
Merge branch 'development' into eive/shadow-local-warning
|
2021-01-25 14:40:06 +01:00 |
|
|
gaisser
|
f11e7407d6
|
Merge pull request 'important bugfix' (#360) from KSat/fsfw:mueller/hk-bugfix into development
Reviewed-on: #360
|
2021-01-25 14:39:48 +01:00 |
|
|
gaisser
|
2f64c16a8a
|
Merge pull request 'Warning on local shadowing can be disabled optionally for GCC' (#357) from eive/fsfw:eive/shadow-local-warning into development
Reviewed-on: #357
|
2021-01-19 16:28:56 +01:00 |
|
|
gaisser
|
543e0d4649
|
Merge pull request 'Local Pool Update' (#349) from KSat/fsfw:mueller/local-pool-update into development
Reviewed-on: #349
|
2021-01-19 15:38:07 +01:00 |
|
|
gaisser
|
aea258cf5a
|
Merge pull request 'important bugfix HasActionIF' (#353) from KSat/fsfw:mueller/action-bugfix into development
Reviewed-on: #353
|
2021-01-19 14:56:09 +01:00 |
|
|
gaisser
|
2469da757e
|
Merge branch 'development' into mueller/action-bugfix
|
2021-01-19 14:52:58 +01:00 |
|
|
gaisser
|
d77e356ce5
|
Merge pull request 'Added Service 3 to CMake sources' (#352) from mueller/added-hkservie3-cmake into development
Reviewed-on: #352
|
2021-01-19 14:52:42 +01:00 |
|
|
gaisser
|
6f3e90c2f0
|
Merge branch 'development' into mueller/added-hkservie3-cmake
|
2021-01-19 14:52:35 +01:00 |
|
|
gaisser
|
867fa577b6
|
Merge pull request 'updated defaultcfg' (#351) from KSat/fsfw:mueller/defaultcfg-update into development
Reviewed-on: #351
|
2021-01-19 14:52:22 +01:00 |
|
|
gaisser
|
ff2c05012e
|
Merge branch 'development' into mueller/defaultcfg-update
|
2021-01-19 14:52:05 +01:00 |
|
|
gaisser
|
6ef11678d0
|
Merge pull request 'pool entry update' (#350) from KSat/fsfw:mueller/pool-entry-update into development
Reviewed-on: #350
|
2021-01-19 14:51:55 +01:00 |
|
|
gaisser
|
8bb67cd919
|
Merge branch 'development' into mueller/pool-entry-update
|
2021-01-19 14:51:46 +01:00 |
|
|
gaisser
|
fe09add0fe
|
Merge pull request 'updated cmakelists' (#348) from KSat/fsfw:mueller/cmake-update into development
Reviewed-on: #348
|
2021-01-19 14:51:12 +01:00 |
|
|
gaisser
|
d7220b7350
|
Merge branch 'development' into mueller/cmake-update
|
2021-01-19 14:50:25 +01:00 |
|
|
gaisser
|
9d179f90ad
|
Merge pull request 'doc update' (#347) from KSat/fsfw:mueller/doc-update into development
Reviewed-on: #347
|
2021-01-19 14:50:14 +01:00 |
|
|
gaisser
|
5639273d9b
|
Merge pull request 'C++ ostream made optional' (#342) from mueller/fsfw-printers into development
Reviewed-on: #342
|
2021-01-12 15:27:14 +01:00 |
|
|
gaisser
|
8332b348ee
|
Merge branch 'development' into mueller/fsfw-printers
|
2021-01-12 15:25:52 +01:00 |
|
|
gaisser
|
b42535dd2d
|
Merge pull request 'TM storage convergence' (#327) from KSat/fsfw:mueller/tmstorage into development
Reviewed-on: #327
|
2021-01-12 15:09:14 +01:00 |
|
|
gaisser
|
e30d020445
|
Merge branch 'development' into mueller/tmstorage
|
2021-01-12 15:09:00 +01:00 |
|
|
gaisser
|
a89d9eab36
|
Merge branch 'development' into mueller/datapool-update
|
2021-01-12 15:07:06 +01:00 |
|
|
gaisser
|
4d6d951ae6
|
Merge pull request 'rtems stm32 init' (#341) from mueller/rtems-update-stm32 into development
Reviewed-on: #341
|
2021-01-12 15:06:46 +01:00 |
|
|
gaisser
|
fa66fafd2c
|
Merge branch 'development' into mueller/rtems-update-stm32
|
2021-01-12 15:01:33 +01:00 |
|
|
gaisser
|
f81d3e81dc
|
Merge pull request 'Bugfix Device Handler Base' (#339) from mueller/devicehandler-bugfix into development
Reviewed-on: #339
|
2021-01-12 14:45:11 +01:00 |
|
|
gaisser
|
67879bf12f
|
Merge branch 'development' into mueller/devicehandler-bugfix
|
2021-01-12 13:28:10 +01:00 |
|
|
gaisser
|
d281b56ce2
|
Merge pull request 'moved includes' (#335) from mueller/bugfix/defaultcfg into development
Reviewed-on: #335
|
2021-01-12 13:27:57 +01:00 |
|
|
gaisser
|
ba9a604c93
|
Merge branch 'development' into mueller/bugfix/defaultcfg
|
2021-01-12 13:27:19 +01:00 |
|
|
gaisser
|
72e9a9516f
|
Merge pull request 'cmake lists updates' (#336) from mueller/cmake-updates into development
Reviewed-on: #336
|
2021-01-12 13:26:39 +01:00 |
|
|
gaisser
|
c5eae8c41b
|
Merge branch 'development' into mueller/tmstorage
|
2020-12-23 23:51:54 +01:00 |
|
|
gaisser
|
426514b9a2
|
Merge pull request 'Move static constants to DeviceHandlerIF' (#331) from eive/fsfw:mueller/no-raw-command-moved-to-if into development
Reviewed-on: #331
|
2020-12-23 23:51:40 +01:00 |
|
|
gaisser
|
bda9546f51
|
Merge branch 'development' into mueller/tmstorage
|
2020-12-22 17:35:26 +01:00 |
|
|
gaisser
|
52d9a55d06
|
Merge pull request 'better error handling' (#329) from KSat/fsfw:mueller/osal-windows-tweak into development
Reviewed-on: #329
|
2020-12-22 17:34:41 +01:00 |
|
|
gaisser
|
c19b838657
|
Merge branch 'development' into mueller/osal-windows-tweak
|
2020-12-22 17:34:33 +01:00 |
|
|
gaisser
|
f9e36d7268
|
Merge pull request 'include guards' (#330) from KSat/fsfw:mueller/tmtcpacket-tiny-tweak into development
Reviewed-on: #330
|
2020-12-22 17:31:35 +01:00 |
|
|
gaisser
|
0eff30e065
|
Merge branch 'development' into mueller/tmtcpacket-tiny-tweak
|
2020-12-22 17:31:25 +01:00 |
|
|
gaisser
|
27fe235700
|
Merge branch 'development' into mueller/osal-windows-tweak
|
2020-12-22 17:30:42 +01:00 |
|
|
gaisser
|
bc8c3da1b7
|
Merge branch 'development' into mueller/tmstorage
|
2020-12-22 17:30:27 +01:00 |
|
|
gaisser
|
2706669011
|
Merge pull request 'time stamper ID added' (#328) from KSat/fsfw:mueller/fwObject-timestamper into development
Reviewed-on: #328
|
2020-12-22 17:28:49 +01:00 |
|
|
gaisser
|
83458c851e
|
Merge pull request 'timemanager update' (#315) from KSat/fsfw:mueller/timeman-update into development
Reviewed-on: #315
|
2020-12-22 15:50:28 +01:00 |
|
|
gaisser
|
c8ca680d5f
|
Merge branch 'development' into mueller/timeman-update
|
2020-12-22 15:40:14 +01:00 |
|
|
gaisser
|
d2a9b769eb
|
Merge pull request 'tmtcservices update' (#309) from KSat/fsfw:mueller/tmtcservices-update into development
Reviewed-on: #309
|
2020-12-22 15:39:07 +01:00 |
|
|
gaisser
|
329cd8862a
|
Merge branch 'development' into mueller/tmtcservices-update
|
2020-12-22 15:37:22 +01:00 |
|
|
gaisser
|
fe26fc4824
|
Merge branch 'development' into mueller/timeman-update
|
2020-12-22 15:36:48 +01:00 |
|
|
gaisser
|
ddcdfb3403
|
Merge pull request 'Fixed file ending of devicehanlder remake' (#326) from gaisser/fsfw:development into development
Reviewed-on: #326
|
2020-12-22 15:36:33 +01:00 |
|
|
Steffen Gaisser
|
822cc0306c
|
Fixed file ending of devicehanlder remake
|
2020-12-22 15:35:23 +01:00 |
|
|
gaisser
|
483cec191b
|
Merge pull request 'updated docs, added new doc folder' (#325) from KSat/fsfw:mueller/doc-update into development
Reviewed-on: #325
|
2020-12-22 15:31:50 +01:00 |
|
|
gaisser
|
afad130918
|
Merge branch 'development' into mueller/doc-update
|
2020-12-22 15:29:05 +01:00 |
|
|
gaisser
|
7f3bdb6082
|
Merge pull request 'devicehandler updates' (#320) from KSat/fsfw:mueller/devicehandlers-update into development
Reviewed-on: #320
|
2020-12-22 15:28:46 +01:00 |
|
|
gaisser
|
117b29e413
|
Merge branch 'development' into mueller/devicehandlers-update
|
2020-12-22 15:28:38 +01:00 |
|
|
gaisser
|
0e1eac4f14
|
Merge pull request 'HOST CMake Improvements' (#318) from mueller/host-cmake-improvements into development
Reviewed-on: #318
|
2020-12-22 15:22:57 +01:00 |
|
|
gaisser
|
041aaf01db
|
Merge branch 'development' into mueller/host-cmake-improvements
|
2020-12-22 15:21:34 +01:00 |
|
|
gaisser
|
6663c69ee9
|
Merge pull request 'cmake fixes' (#314) from mueller/cmake-fixes into development
Reviewed-on: #314
|
2020-12-22 15:18:58 +01:00 |
|
|
gaisser
|
cb7a22c370
|
Merge branch 'development' into mueller/cmake-fixes
|
2020-12-22 15:18:47 +01:00 |
|
|
gaisser
|
5941bd710a
|
Merge pull request 'clearing HK message included now' (#322) from KSat/fsfw:mueller/ipc-update into development
Reviewed-on: #322
|
2020-12-22 15:13:51 +01:00 |
|
|
gaisser
|
631bbf70c2
|
Merge branch 'development' into mueller/ipc-update
|
2020-12-22 15:13:20 +01:00 |
|
|
gaisser
|
85d6e02291
|
Merge pull request 'nullptr check added' (#324) from KSat/fsfw:mueller/datapool-update into development
Reviewed-on: #324
|
2020-12-22 15:12:03 +01:00 |
|
|
gaisser
|
3b59a50e9a
|
Merge branch 'development' into mueller/datapool-update
|
2020-12-22 15:11:37 +01:00 |
|
|
gaisser
|
4a154140f3
|
Merge pull request 'unittest update' (#323) from KSat/fsfw:mueller/unittest-update into development
Reviewed-on: #323
|
2020-12-22 15:11:27 +01:00 |
|
|
gaisser
|
b0fcb404b3
|
Merge branch 'development' into mueller/unittest-update
|
2020-12-22 15:11:02 +01:00 |
|
|
gaisser
|
422a0f1ee0
|
Merge pull request 'defaultcfg update' (#319) from KSat/fsfw:mueller/defaultcfg-update into development
Reviewed-on: #319
|
2020-12-22 15:05:36 +01:00 |
|
|
gaisser
|
d396bab455
|
Merge branch 'development' into mueller/defaultcfg-update
|
2020-12-22 15:05:16 +01:00 |
|
|
gaisser
|
11778c706c
|
Merge pull request 'deleted tpp files, replaced by source files' (#313) from mueller/deleted-storagman-tpp into development
Reviewed-on: #313
|
2020-12-22 15:05:01 +01:00 |
|
|
gaisser
|
cf954ac8d1
|
Merge branch 'development' into mueller/deleted-storagman-tpp
|
2020-12-22 14:46:19 +01:00 |
|
|
gaisser
|
5e315ce083
|
Merge pull request 'LocalPoolVar: using long name now' (#312) from KSat/fsfw:mueller/datapoollocal-long-name into development
Reviewed-on: #312
|
2020-12-22 14:45:56 +01:00 |
|
|
gaisser
|
49aa937968
|
Merge branch 'development' into mueller/datapoollocal-long-name
|
2020-12-22 14:45:24 +01:00 |
|
|
gaisser
|
eb310a72ef
|
Merge pull request 'added hk service 3' (#311) from KSat/fsfw:mueller/hk-service3 into development
Reviewed-on: #311
|
2020-12-22 14:44:05 +01:00 |
|
|
gaisser
|
dca5e1b51c
|
Merge branch 'development' into mueller/hk-service3
|
2020-12-22 14:43:26 +01:00 |
|
|
gaisser
|
d8be07b4db
|
Merge pull request 'Linux convergence' (#310) from KSat/fsfw:mueller/linux-update into development
Reviewed-on: #310
|
2020-12-22 14:43:15 +01:00 |
|
|
gaisser
|
8349e12e43
|
Merge branch 'development' into mueller/timeman-update
|
2020-12-22 15:14:08 +01:00 |
|
|
gaisser
|
332a327777
|
Merge branch 'development' into mueller/timeman-update
|
2020-12-22 14:48:11 +01:00 |
|
|
gaisser
|
6135c6b2df
|
Merge branch 'development' into mueller/devicehandlers-update
|
2020-12-22 15:08:14 +01:00 |
|
|
gaisser
|
e7da1e37c3
|
Merge branch 'development' into mueller/tmtcservices-update
|
2020-12-15 15:57:09 +01:00 |
|
|
gaisser
|
356bd2717e
|
Merge pull request 'event update' (#308) from KSat/fsfw:mueller/event-update into development
Reviewed-on: #308
|
2020-12-15 15:56:47 +01:00 |
|
|
gaisser
|
175db9e6fc
|
Merge branch 'development' into mueller/event-update
|
2020-12-15 15:20:29 +01:00 |
|
|
gaisser
|
5ba1932076
|
Merge pull request 'task convergence' (#307) from KSat/fsfw:mueller/tasks-update into development
Reviewed-on: #307
|
2020-12-15 15:20:15 +01:00 |
|
|
gaisser
|
9dabdf4b56
|
Merge branch 'development' into mueller/tasks-update
|
2020-12-15 15:19:38 +01:00 |
|
|
gaisser
|
a343baa813
|
Merge pull request 'Subsystem Update' (#306) from KSat/fsfw:mueller/subsyste-update into development
Reviewed-on: #306
|
2020-12-15 15:16:58 +01:00 |
|
|
gaisser
|
2c92fa64bc
|
Merge branch 'development' into mueller/subsyste-update
|
2020-12-15 14:44:19 +01:00 |
|
|
gaisser
|
d85686fd8d
|
Merge pull request 'FreeRTOS update' (#305) from KSat/fsfw:mueller/FreeRTOS into development
Reviewed-on: #305
|
2020-12-15 14:44:08 +01:00 |
|
|
gaisser
|
534805957c
|
Merge branch 'development' into mueller/FreeRTOS
|
2020-12-15 14:42:31 +01:00 |
|
|
gaisser
|
4e6aa3128b
|
Merge pull request 'type update' (#304) from KSat/fsfw:mueller/type into development
Reviewed-on: #304
|
2020-12-15 14:42:16 +01:00 |
|
|
gaisser
|
335c75ba5b
|
Merge branch 'development' into mueller/type
|
2020-12-15 14:31:27 +01:00 |
|
|
gaisser
|
c53920f5ac
|
Merge pull request 'RMAP folder convergence' (#302) from KSat/fsfw:mueller/rmap-convergence into development
Reviewed-on: #302
|
2020-12-15 14:31:13 +01:00 |
|
|
gaisser
|
a6a95b7719
|
Merge branch 'development' into mueller/rmap-convergence
|
2020-12-15 14:30:01 +01:00 |
|
|
gaisser
|
7f7c4aea84
|
Merge pull request 'removed glob pool' (#300) from KSat/fsfw:mueller/removed-glob-pool into development
Reviewed-on: #300
|
2020-12-15 14:29:49 +01:00 |
|
|
gaisser
|
6deb0b565e
|
Merge branch 'development' into mueller/removed-glob-pool
|
2020-12-15 14:28:54 +01:00 |
|
|
gaisser
|
b9f50e8e42
|
Merge branch 'development' into mueller/rmap-convergence
|
2020-12-15 14:08:51 +01:00 |
|
|
gaisser
|
3bae575b5a
|
Merge branch 'development' into mueller/subsyste-update
|
2020-12-14 13:16:44 +01:00 |
|
|
gaisser
|
4d5186b6cd
|
Merge branch 'development' into mueller/tasks-update
|
2020-12-14 13:16:36 +01:00 |
|
|
gaisser
|
e06b15cb9c
|
Merge pull request 'fixed includes' (#303) from KSat/fsfw:mueller/int-unittest-fixes into development
Reviewed-on: #303
|
2020-12-14 13:16:27 +01:00 |
|
|
gaisser
|
3f3c2481ad
|
Merge branch 'development' into mueller/int-unittest-fixes
|
2020-12-14 13:16:09 +01:00 |
|
|
gaisser
|
bd4ca743f5
|
Merge pull request 'Hotfixes for development branch' (#301) from hotfix/deviceHandlerThermalSet into development
Reviewed-on: #301
|
2020-12-14 13:15:49 +01:00 |
|
|
gaisser
|
3c316218f7
|
Merge pull request 'Enhanced Controller Base' (#276) from KSat/fsfw:mueller/enhanced-controller into development
Reviewed-on: #276
|
2020-12-10 17:25:25 +01:00 |
|
|
gaisser
|
d61c25f2d2
|
Merge branch 'development' into mueller/enhanced-controller
|
2020-12-10 17:25:10 +01:00 |
|
|
gaisser
|
60ee66ec36
|
Merge pull request 'CMake Init' (#298) from mueller/cmake-init into development
Reviewed-on: #298
|
2020-12-10 17:23:21 +01:00 |
|
|
gaisser
|
03cc343527
|
Merge branch 'development' into mueller/cmake-init
|
2020-12-10 17:23:09 +01:00 |
|
|
gaisser
|
000129172a
|
Merge pull request 'device handler uses local pools now' (#299) from KSat/fsfw:mueller/DeviceHandler-LocalPools into development
Reviewed-on: #299
|
2020-12-10 17:22:55 +01:00 |
|