 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
|
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 |
|
|
gaisser
|
45b02083c9
|
Merge branch 'development' into mueller/DeviceHandler-LocalPools
|
2020-12-10 17:22:44 +01:00 |
|
|
gaisser
|
5577eb893f
|
Merge pull request 'Local Pool Refactoring' (#275) from KSat/fsfw:mueller/LocalPoolRefactoring into development
Reviewed-on: #275
|
2020-12-10 17:21:26 +01:00 |
|
|
gaisser
|
b8f4cfe953
|
Merge branch 'development' into mueller/DeviceHandler-LocalPools
|
2020-12-10 17:10:45 +01:00 |
|
|
gaisser
|
2c7936cecd
|
Merge pull request 'Parameter Improvements' (#250) from KSat/fsfw:mueller/parameter-convergence into development
Reviewed-on: #250
|
2020-12-10 17:09:55 +01:00 |
|
|
gaisser
|
3fd18f9c58
|
Merge branch 'development' into mueller/DeviceHandler-LocalPools
|
2020-12-10 17:00:51 +01:00 |
|
|
gaisser
|
c99ef61c77
|
Merge pull request 'added new interface for file systems' (#287) from KSat/fsfw:feature/has-file-system-if-init into development
Reviewed-on: #287
|
2020-12-10 17:00:37 +01:00 |
|
|
gaisser
|
616a073bb0
|
Merge branch 'development' into feature/has-file-system-if-init
|
2020-12-10 17:00:08 +01:00 |
|
|
gaisser
|
18f90ef2fc
|
Merge pull request 'power update' (#295) from KSat/fsfw:mueller/power-update into development
Reviewed-on: #295
|
2020-12-10 16:59:52 +01:00 |
|
|
gaisser
|
9813e65dda
|
Merge branch 'development' into mueller/power-update
|
2020-12-10 16:59:43 +01:00 |
|
|
gaisser
|
f0380e4acc
|
Merge branch 'development' into mueller/DeviceHandler-LocalPools
|
2020-12-10 16:57:24 +01:00 |
|
|
gaisser
|
9fe2fc4cae
|
Merge pull request 'new internal error reporter using local pools' (#292) from KSat/fsfw:mueller/internal-error-rprtr-update into development
Reviewed-on: #292
|
2020-12-10 16:55:06 +01:00 |
|
|
gaisser
|
0120ec29fd
|
Merge branch 'development' into mueller/internal-error-rprtr-update
|
2020-12-10 16:53:45 +01:00 |
|
|
gaisser
|
7d3641d42e
|
Merge pull request 'thermal update' (#296) from KSat/fsfw:mueller/thermal-update into development
Reviewed-on: #296
|
2020-12-10 16:53:30 +01:00 |
|
|
gaisser
|
65f411ace2
|
Merge branch 'development' into mueller/thermal-update
|
2020-12-10 16:53:16 +01:00 |
|
|
gaisser
|
03e4504815
|
Merge pull request 'some minor changes' (#291) from KSat/fsfw:mueller/datalinklayer-convergence into development
Reviewed-on: #291
|
2020-12-10 16:45:21 +01:00 |
|
|
gaisser
|
80531e73c9
|
Merge branch 'development' into mueller/datalinklayer-convergence
|
2020-12-10 16:45:14 +01:00 |
|
|
gaisser
|
3dafdc9071
|
Merge pull request 'controller base update' (#290) from KSat/fsfw:mueller/controller-update into development
Reviewed-on: #290
|
2020-12-10 16:42:45 +01:00 |
|
|
gaisser
|
d412e4ff5d
|
Merge branch 'development' into mueller/controller-update
|
2020-12-10 16:42:30 +01:00 |
|
|
gaisser
|
14ecce084e
|
Merge branch 'development' into mueller/parameter-convergence
|
2020-12-10 16:24:19 +01:00 |
|
|
gaisser
|
4fbebcb019
|
Merge pull request 'monitoring update' (#294) from KSat/fsfw:mueller/monitoring-update into development
Reviewed-on: #294
|
2020-12-10 16:24:00 +01:00 |
|
|
gaisser
|
96a9ee9fc4
|
Merge branch 'development' into mueller/monitoring-update
|
2020-12-10 16:18:34 +01:00 |
|
|
gaisser
|
a0a2752fd0
|
Merge branch 'development' into mueller/cmake-init
|
2020-12-09 10:07:22 +01:00 |
|
|
gaisser
|
faedd40665
|
Merge pull request 'DHB additional step for performOperation' (#281) from KSat/fsfw:mueller/DHB-update into development
Reviewed-on: #281
|
2020-12-08 15:53:05 +01:00 |
|
|
gaisser
|
7ff772d9d6
|
Merge pull request 'Local Data Pool Init' (#280) from KSat/fsfw:mueller/newLocalDataPools into development
Reviewed-on: #280
|
2020-12-08 15:34:30 +01:00 |
|
|
gaisser
|
2b8a2c4f29
|
Merge branch 'development' into mueller/newLocalDataPools
|
2020-12-08 15:18:48 +01:00 |
|
|
gaisser
|
5e132de712
|
Merge pull request 'makeEvent API improved' (#288) from KSat/fsfw:mueller/make-event-update into development
Reviewed-on: #288
|
2020-12-08 15:10:55 +01:00 |
|
|
gaisser
|
d7839b46a5
|
Merge branch 'development' into mueller/make-event-update
|
2020-12-08 14:53:09 +01:00 |
|
|
gaisser
|
4084df6214
|
Merge branch 'development' into mueller/parameter-convergence
|
2020-12-08 14:52:22 +01:00 |
|
|
gaisser
|
6bda443181
|
Merge branch 'development' into mueller/DHB-update
|
2020-12-08 14:51:38 +01:00 |
|
|
gaisser
|
de0fd94b7f
|
Merge branch 'development' into mueller/enhanced-controller
|
2020-12-08 14:51:27 +01:00 |
|
|
gaisser
|
31373e9605
|
Merge pull request 'Includes for unittest folder relative' (#285) from KSat/fsfw:mueller/unittest-fixes into development
Reviewed-on: #285
|
2020-12-08 14:49:47 +01:00 |
|
|
gaisser
|
1ecdf34df4
|
Merge branch 'development' into mueller/unittest-fixes
|
2020-12-08 14:49:20 +01:00 |
|
|
gaisser
|
6f474daae0
|
Merge branch 'development' into mueller/controller-update
|
2020-12-08 14:46:18 +01:00 |
|
|
gaisser
|
0c5050ceac
|
Merge branch 'development' into feature/has-file-system-if-init
|
2020-12-08 14:40:02 +01:00 |
|
|
gaisser
|
66e902d75d
|
Merge branch 'development' into mueller/make-event-update
|
2020-12-08 14:17:56 +01:00 |
|
|
gaisser
|
2e9e8331ea
|
Merge pull request 'op divider additional features' (#286) from KSat/fsfw:mueller/op-divider-update into development
Reviewed-on: #286
|
2020-12-08 14:15:34 +01:00 |
|
|
gaisser
|
2df41cad88
|
Merge branch 'development' into mueller/op-divider-update
|
2020-12-08 14:13:44 +01:00 |
|
|
gaisser
|
6e852c6c05
|
Merge pull request 'Fix for ActionHelper unittests' (#293) from mueller/action-unittest-fix into development
Reviewed-on: #293
|
2020-12-08 14:13:23 +01:00 |
|
|
gaisser
|
db5c54fcfe
|
Merge branch 'development' into mueller/action-unittest-fix
|
2020-12-08 14:12:49 +01:00 |
|
|
gaisser
|
aa3fe1e7f0
|
Merge pull request 'Host OSAL bugfixes' (#289) from mueller/host-osal-atomic into development
Reviewed-on: #289
|
2020-12-08 14:10:31 +01:00 |
|
|
gaisser
|
409f2d1779
|
Merge pull request 'PUS Improvements' (#283) from KSat/fsfw:mueller/pus-improvements into development
Reviewed-on: #283
|
2020-12-01 15:27:05 +01:00 |
|
|
gaisser
|
052e6e86db
|
Merge pull request 'Small tweaks' (#263) from fsfwexample/small-tweaks into development
Reviewed-on: #263
|
2020-12-01 15:21:22 +01:00 |
|
|
gaisser
|
0217dda67b
|
Merge pull request 'Added health service' (#282) from KSat/fsfw:mueller/healthservice into development
Reviewed-on: #282
|
2020-12-01 15:09:56 +01:00 |
|
|
gaisser
|
708a47840b
|
Merge pull request 'Defaultcfg folder update' (#274) from KSat/fsfw:mueller/defaultcfg-update into development
Reviewed-on: #274
|
2020-12-01 14:46:36 +01:00 |
|
|
gaisser
|
ea8f73120d
|
Merge pull request 'Merge current release of FSFW development' (#278) from master into development
Reviewed-on: #278
|
2020-12-01 14:20:15 +01:00 |
|
|
gaisser
|
da9658e2a1
|
Merge branch 'development' into master
|
2020-12-01 14:19:30 +01:00 |
|
|
gaisser
|
64b6edab6f
|
Update 'README.md'
|
2020-12-01 13:32:50 +01:00 |
|
|
gaisser
|
3bd144e6f4
|
Merge pull request 'Added the new logos, colors are WIP at the moment' (#270) from gaisser/fsfw:gaisser_logo into master
Reviewed-on: #270
|
2020-12-01 13:32:13 +01:00 |
|
|
gaisser
|
4764f6ba54
|
Merge branch 'master' into gaisser_logo
|
2020-12-01 13:31:48 +01:00 |
|
|
Steffen Gaisser
|
4241c00448
|
Added the new logos, colors are WIP at the moment
|
2020-11-30 18:30:58 +01:00 |
|
|
gaisser
|
4406c6eb86
|
Merge pull request 'meier/gaisser_readme_update' (#267) from gaisser/fsfw:meier/gaisser_readme_update into master
Reviewed-on: #267
|
2020-11-30 16:28:09 +01:00 |
|
|
gaisser
|
ce629dfd83
|
Merge branch 'master' into meier/gaisser_readme_update
|
2020-11-30 16:27:53 +01:00 |
|
|
gaisser
|
293d34147e
|
Merge pull request 'Readme Update' (#260) from gaisser/fsfw:gaisser_readme_update into master
Reviewed-on: #260
|
2020-11-30 16:27:24 +01:00 |
|
|
gaisser
|
5a20ec583b
|
Merge branch 'master' into gaisser_readme_update
|
2020-11-27 20:21:23 +01:00 |
|
|
gaisser
|
d3a7f86ea2
|
Merge pull request 'Fixes for RTEMS #173' (#262) from gaisser_rtems_fixes into master
Reviewed-on: #262
|
2020-11-27 20:21:08 +01:00 |
|
|
gaisser
|
25e3d25b28
|
Merge branch 'master' into mueller/pus-improvements
|
2020-11-26 16:11:45 +01:00 |
|
|
Steffen Gaisser
|
6489246c4b
|
Updated include guards
|
2020-11-17 19:35:37 +01:00 |
|
|
Steffen Gaisser
|
273ddf9061
|
Rtems compiles again fixes #176
|
2020-11-17 19:25:57 +01:00 |
|
|
Steffen Gaisser
|
5b5f2f3e1d
|
Added hardware recommendations
|
2020-11-17 09:42:38 +01:00 |
|
|
Steffen Gaisser
|
51443d7a68
|
Version number
|
2020-11-13 15:09:00 +01:00 |
|
|
Steffen Gaisser
|
8aef4b9b99
|
Updated formatting
|
2020-11-13 14:36:32 +01:00 |
|
|
Steffen Gaisser
|
752601e85f
|
WIP readme
|
2020-11-13 14:31:30 +01:00 |
|
|
gaisser
|
0075ae53b3
|
Merge pull request 'meier/udp_bridge_embedded_linux' (#259) from eive/fsfw:meier/udp_bridge_embedded_linux into master
Reviewed-on: #259
|
2020-11-10 15:10:47 +01:00 |
|
|
gaisser
|
030f1beb93
|
Merge branch 'master' into meier/udp_bridge_embedded_linux
|
2020-11-10 14:53:15 +01:00 |
|
|
gaisser
|
2a4b4f2114
|
Merge pull request 'config folder renamed and improved' (#255) from KSat/fsfw:mueller/fsfwconfig-better into master
Reviewed-on: #255
|
2020-11-10 14:46:55 +01:00 |
|
|
gaisser
|
bb7709fea1
|
Merge branch 'master' into mueller/fsfwconfig-better
|
2020-11-10 14:46:04 +01:00 |
|
|
gaisser
|
bc58213482
|
Merge pull request 'Action folder: some minor form stuff' (#256) from KSat/fsfw:mueller/action-yet-another-update into master
Reviewed-on: #256
|
2020-11-10 14:45:55 +01:00 |
|
|
gaisser
|
3920fd89bd
|
Merge branch 'master' into mueller/enhanced-controller
|
2020-11-03 12:06:56 +01:00 |
|
|
gaisser
|
6bedc9b805
|
Merge pull request 'added new windows udp bridge' (#188) from KSat/fsfw:mueller/feature/windowsUdpBridge into master
Reviewed-on: #188
|
2020-11-02 15:29:08 +01:00 |
|
|
gaisser
|
719aab2a26
|
Merge pull request 'health update' (#246) from KSat/fsfw:mueller/health-convergence into master
Reviewed-on: #246
|
2020-11-02 15:26:51 +01:00 |
|
|
gaisser
|
470196a044
|
Merge branch 'master' into mueller/health-convergence
|
2020-11-02 15:22:58 +01:00 |
|
|
gaisser
|
9c9facf4a1
|
Merge pull request 'host osal fixes' (#247) from eive/fsfw:development into master
Reviewed-on: #247
|
2020-11-02 15:22:37 +01:00 |
|
|
gaisser
|
cf46aebf32
|
Merge branch 'master' into development
|
2020-11-02 15:16:10 +01:00 |
|
|
gaisser
|
449a08c92c
|
Merge pull request 'testcfg fix' (#248) from fsfwtest/testcfg-fix into master
Reviewed-on: #248
|
2020-11-02 15:15:59 +01:00 |
|
|
gaisser
|
0c15a90399
|
Merge pull request 'Default Configuration' (#243) from KSat/fsfw:mueller/defaultcfg into master
Reviewed-on: #243
|
2020-11-02 15:09:55 +01:00 |
|
|
gaisser
|
093d3562b6
|
Merge branch 'master' into mueller/health-convergence
|
2020-11-02 14:53:20 +01:00 |
|
|
gaisser
|
2761ee8109
|
Merge branch 'master' into mueller/defaultcfg
|
2020-11-02 14:48:23 +01:00 |
|
|
gaisser
|
52d3dbfd20
|
Merge pull request 'HasReturnvaluesIF small improvements' (#245) from KSat/fsfw:mueller/returnvalue-convergence into master
Reviewed-on: #245
|
2020-11-02 14:48:10 +01:00 |
|
|
gaisser
|
0b855c5b55
|
Merge branch 'master' into mueller/defaultcfg
|
2020-10-29 20:09:31 +01:00 |
|
|
gaisser
|
38830dfc17
|
Merge branch 'master' into mueller/health-convergence
|
2020-10-29 20:06:03 +01:00 |
|
|
gaisser
|
11a351a202
|
Merge pull request 'Unittest integrated in FSFW now' (#242) from KSat/fsfw:mueller/unittest-integration-from-master into master
Reviewed-on: #242
|
2020-10-29 20:05:30 +01:00 |
|