Commit Graph

946 Commits

Author SHA1 Message Date
29da8d9fd5 Merge pull request 'v1.5.0 Release' (#61) from develop into main
Reviewed-on: #61
2021-07-26 10:48:13 +02:00
8b14e1a31e Merge pull request 'v1.5.0' (#60) from mueller/v1.5.0-staging into develop
Reviewed-on: #60
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-25 16:23:06 +02:00
2b45c1d407
another minor fix 2021-07-24 15:17:54 +02:00
082e820e92
minor fix 2021-07-24 15:15:49 +02:00
2554afd503
Merge remote-tracking branch 'origin/develop' into mueller/master 2021-07-24 15:13:56 +02:00
a12fa4c42b
fsfw update 2021-07-24 15:06:21 +02:00
6d48f70269
all versions written to version.txt file now 2021-07-24 15:00:07 +02:00
9caa9451e1
printing FSFW version now 2021-07-24 13:47:09 +02:00
cb006c84d3
fsfw update 2021-07-24 13:36:45 +02:00
de1f61a804 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop 2021-07-23 18:32:06 +02:00
8f070cdb44 subversion change 2021-07-23 18:31:53 +02:00
7bab6e6c15 Merge pull request 'fixes for file system' (#57) from mueller/fs-fixes into develop
Reviewed-on: #57
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-23 18:27:23 +02:00
1cc6a52a3a deleted fsfw_hal 2021-07-23 18:22:50 +02:00
d419e31296 fixes for file system 2021-07-23 18:20:01 +02:00
54d8233395 Merge pull request 'meier/plocSupervisorHandler' (#56) from meier/plocSupervisorHandler into develop
Reviewed-on: #56
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2021-07-23 18:15:34 +02:00
Jakob.Meier
ad9938cb4a readme update 2021-07-23 18:12:32 +02:00
Jakob.Meier
d1c891638b fsfw update 2021-07-23 18:07:50 +02:00
Jakob.Meier
0ce55d5e62 fixed conflicts 2021-07-23 18:04:51 +02:00
Jakob.Meier
a2e62b28c3 fixed merge conflicts 2021-07-23 17:48:11 +02:00
Jakob.Meier
0cc454d891 Merge remote-tracking branch 'origin' into meier/plocSupervisorHandler 2021-07-23 17:25:28 +02:00
Jakob.Meier
b66661d7dc updated submodules 2021-07-23 17:25:24 +02:00
62fe0571b1 Merge pull request 'Update before changing history' (#55) from mueller/staging-1-before-history-change into develop
Reviewed-on: #55
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-23 17:20:19 +02:00
46e2e40cb1
various bugfixes 2021-07-23 17:06:10 +02:00
Jakob.Meier
80665a3cc5 fixed merge conflicts 2021-07-23 14:36:15 +02:00
Jakob.Meier
ac62735b57 fsfw_hal update 2021-07-23 14:13:12 +02:00
Jakob.Meier
fab8a75839 added uart flush in ploc supervisor handler 2021-07-23 13:27:58 +02:00
64844f83a9 readme correction 2021-07-22 15:16:52 +02:00
ff341107ec updated link in README 2021-07-22 15:11:12 +02:00
3fc9ab5d72 added new user manual 2021-07-22 15:09:15 +02:00
db4494ab7a Merge remote-tracking branch 'origin/develop' into mueller/staging-1-before-history-change 2021-07-22 14:41:23 +02:00
68bb30b200 Merge pull request 'Release v1.3.0' (#54) from develop into master
Reviewed-on: #54
2021-07-22 11:53:07 +02:00
385eb6a7e5 config option needs to be in config namespace 2021-07-22 11:51:58 +02:00
e9a808fdf5 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master 2021-07-22 11:42:09 +02:00
c5a53abacc added scratch buffer section 2021-07-22 11:41:55 +02:00
c8fc267d7d Merge pull request 'Filesystem Update' (#53) from mueller/filesystem-update into develop
Reviewed-on: #53
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-22 09:03:43 +02:00
Jakob.Meier
995395d11e ploc supervisor wip 2021-07-22 08:06:04 +02:00
33ad5e57ca more documentation 2021-07-19 20:12:21 +02:00
5c01401042 added command to list directory into file 2021-07-19 20:06:28 +02:00
81ac5a3b2c tested dir remove functionality 2021-07-19 19:21:34 +02:00
4e05b396c4 fsfw update 2021-07-19 18:50:40 +02:00
42578ba2ac more tests added 2021-07-19 14:34:03 +02:00
d4e5919a21 bugfix for file system handler, running now 2021-07-19 14:02:17 +02:00
fb3b5582ad some refactoring 2021-07-19 13:15:45 +02:00
20e8fc3400 cleaned up code a bit 2021-07-19 12:44:43 +02:00
d98313de6c tested clear function 2021-07-16 22:22:24 +02:00
3f1fef4bdf scratch buffer API finished 2021-07-16 22:20:53 +02:00
3b1a68b75b updated ninja configs and cproject 2021-07-16 21:54:15 +02:00
88a20a512a corrections and tests 2021-07-16 21:51:30 +02:00
434a0f6a7a added JSON lib, bugfixes in FileSystemHandler 2021-07-16 20:32:13 +02:00
b3dfbcf7fe removed fsfw_hal 2021-07-15 19:06:57 +02:00