Commit Graph

937 Commits

Author SHA1 Message Date
521601fc6a Merge pull request 'v1.4.0' (#58) from develop into master
Reviewed-on: #58
2021-07-23 18:32:35 +02:00
5a5d50a91c Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop 2021-07-23 18:32:06 +02:00
0220482360
subversion change 2021-07-23 18:31:53 +02:00
aeb1946776 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
d62f968e67
deleted fsfw_hal 2021-07-23 18:22:50 +02:00
902eb7d4cb
fixes for file system 2021-07-23 18:20:01 +02:00
13d4a15389 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
93ab89f925 readme update 2021-07-23 18:12:32 +02:00
Jakob.Meier
d410110ab3 fsfw update 2021-07-23 18:07:50 +02:00
Jakob.Meier
d430c5fbc7 fixed conflicts 2021-07-23 18:04:51 +02:00
Jakob.Meier
2e60f4edaf fixed merge conflicts 2021-07-23 17:48:11 +02:00
Jakob.Meier
04a715530e Merge remote-tracking branch 'origin' into meier/plocSupervisorHandler 2021-07-23 17:25:28 +02:00
Jakob.Meier
dbaffd8723 updated submodules 2021-07-23 17:25:24 +02:00
09c5cd4373 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
Jakob.Meier
97f36a6ac7 fixed merge conflicts 2021-07-23 14:36:15 +02:00
Jakob.Meier
3b1b417e79 fsfw_hal update 2021-07-23 14:13:12 +02:00
Jakob.Meier
90b31f5ee7 added uart flush in ploc supervisor handler 2021-07-23 13:27:58 +02:00
9af9bdc6b3
readme correction 2021-07-22 15:16:52 +02:00
9134ec9026
updated link in README 2021-07-22 15:11:12 +02:00
46f73ef056
added new user manual 2021-07-22 15:09:15 +02:00
f76800793a Merge remote-tracking branch 'origin/develop' into mueller/staging-1-before-history-change 2021-07-22 14:41:23 +02:00
a9813aedbb Merge pull request 'Release v1.3.0' (#54) from develop into master
Reviewed-on: #54
2021-07-22 11:53:07 +02:00
bda4dad22b
config option needs to be in config namespace 2021-07-22 11:51:58 +02:00
1688fb89fa 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
ec205e745a
added scratch buffer section 2021-07-22 11:41:55 +02:00
ce15ee8107 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
009139ae50 ploc supervisor wip 2021-07-22 08:06:04 +02:00
28470be24f
more documentation 2021-07-19 20:12:21 +02:00
914336ba66
added command to list directory into file 2021-07-19 20:06:28 +02:00
74e77437b7
tested dir remove functionality 2021-07-19 19:21:34 +02:00
1442bd0d9c
fsfw update 2021-07-19 18:50:40 +02:00
a618562807
more tests added 2021-07-19 14:34:03 +02:00
a6280da4ba
bugfix for file system handler, running now 2021-07-19 14:02:17 +02:00
674865429f
some refactoring 2021-07-19 13:15:45 +02:00
7f0c6863d6
cleaned up code a bit 2021-07-19 12:44:43 +02:00
1348f7dafb
tested clear function 2021-07-16 22:22:24 +02:00
27281af392
scratch buffer API finished 2021-07-16 22:20:53 +02:00
ea8af2a7dd
updated ninja configs and cproject 2021-07-16 21:54:15 +02:00
3bf02e693f
corrections and tests 2021-07-16 21:51:30 +02:00
fcf8c00589
added JSON lib, bugfixes in FileSystemHandler 2021-07-16 20:32:13 +02:00
e9a511a27e
removed fsfw_hal 2021-07-15 19:06:57 +02:00
6a65474db2 Merge branch 'develop' into mueller/filesystem-update 2021-07-15 18:37:40 +02:00
b53325f216
added configuration 2021-07-15 18:29:24 +02:00
80095a600b
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into mueller/master 2021-07-15 18:25:35 +02:00
eb72b7e6e8
fsfw and fsfw_hal update 2021-07-15 17:55:07 +02:00
ae6ec2e7ba
updated project file 2021-07-15 01:31:01 +02:00
25e4c98f3a
author tag update 2021-07-15 01:29:13 +02:00
baee066f44
script corrections 2021-07-15 01:28:25 +02:00
4c2620fc3e
update fsfw 2021-07-15 01:25:32 +02:00
76e0501813
q7s x-compile file update 2021-07-15 01:21:42 +02:00