Commit Graph - fsfw - IRS git hosting

KSat/fsfw

Fork 0

forked from fsfw/fsfw

Commit Graph

Select branches

Hide Pull Requests

event-definition

event-definition-update

main

mdemke/mgm_helpers

meier/debug

meier/space-packet-crc-check

mueller/refactor-logging-with-fmt

ploc

refactor-periodic-hk-helpers

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#6

#7

#8

#9

ASTP_0.0.1

ASTP_1.0.0

ASTP_1.1.0

PLOC-obsw

docker_d1

docker_d2

docker_d3

docker_d4

docker_d5

docker_d6

v1.3.0

v2.0.0

v2.0.1

v3.0.0

v3.0.1

v4.0.0

v5.0.0

bff08a69fa Merge branch 'master' into mueller/hostosal gaisser 2020-09-15 15:08:58 +02:00
4f5b233505 Merge pull request 'init after task creation moved to task functionality' (#178) from KSat/fsfw:mueller/TaskUpdates into master gaisser 2020-09-15 15:08:18 +02:00
9334a705f8 Merge branch 'master' into mueller/TaskUpdates gaisser 2020-09-15 15:05:45 +02:00
2c6a239d5e Merge pull request 'added new periodic op divider' (#195) from KSat/fsfw:mueller/feature/periodicOpDivider into master gaisser 2020-09-15 15:04:30 +02:00
fbd75f947a Merge branch 'master' into mueller/feature/periodicOpDivider gaisser 2020-09-15 15:02:34 +02:00
4c17ef7be5 Merge pull request 'DLE encoder doc added' (#177) from KSat/fsfw:mueller/dledoc into master gaisser 2020-09-15 15:01:07 +02:00
86f2004569 Increased minimum stack size, to avoid seg fault when initalizing MeSHCam petriVM18 2020-09-15 12:32:16 +02:00
e8de2fc47a added srv3 Robin Mueller 2020-09-14 18:29:19 +02:00
2d2316a0c7 hk message continued Robin Mueller 2020-09-14 18:01:48 +02:00
f9612afe06 added report status toggler Robin Mueller 2020-09-11 14:06:08 +02:00
71125c075a added new setter function Robin.Mueller 2020-09-10 21:05:50 +02:00
2d2d0de35c local data pool manager bugfixes Robin.Mueller 2020-09-10 20:24:49 +02:00
4f48ed9756 added new periodic op divider Robin.Mueller 2020-09-10 19:53:52 +02:00
d7bbd4b652 severla bugfixes, new periodic op divider added Robin.Mueller 2020-09-10 19:51:17 +02:00
6362de5bc0 Merge branch 'master' into mueller/FixedTimeslotUpdate gaisser 2020-09-10 18:20:17 +02:00
058a036bac Merge branch 'master' into mueller/oldPoolRenaming Robin Müller 2020-09-10 16:47:21 +02:00
d83573cefc additional IDs removed Robin.Mueller 2020-09-10 16:47:01 +02:00
8048195f63 Merge remote-tracking branch 'upstream/master' into mueller/dledoc Robin.Mueller 2020-09-10 16:46:31 +02:00
853bd75fec Merge branch 'mueller/HealthHelperIdFix' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/HealthHelperIdFix Robin.Mueller 2020-09-10 16:42:25 +02:00
d807ea3afe using MessageQueueIF::NO_QUEUE now Robin.Mueller 2020-09-10 16:42:11 +02:00
036a022e66 Merge branch 'master' into mueller/HealthHelperIdFix Robin Müller 2020-09-10 16:40:20 +02:00
489d8f1903 Merge branch 'master' into mueller/serialize-convergence Robin Müller 2020-09-10 16:40:02 +02:00
be0cf56994 Merge branch 'master' into mueller/feature/windowsUdpBridge Robin Müller 2020-09-10 16:39:46 +02:00
bbd81c2d6a Merge pull request 'FixedMap Fixes #47 and #36' (#182) from gaisser/fsfw:gaisser_fixes_fixedMap into master Robin Müller 2020-09-10 16:38:42 +02:00
e4d95a4e09 subsystem changes taken over Robin.Mueller 2020-09-10 16:07:09 +02:00
e57d4a11ae fixed ordered multi map changes integrated Robin.Mueller 2020-09-10 16:01:05 +02:00
d9dcee3692 array list changes taken over Robin.Mueller 2020-09-10 15:55:56 +02:00
f35efa3cbe taken over CSB changes Robin.Mueller 2020-09-10 15:52:00 +02:00
96e471add6 merged fixed map changes Robin.Mueller 2020-09-10 15:51:11 +02:00
e7444912d5 corrected include guard Robin Müller 2020-09-10 15:29:19 +02:00
b8d638cb69 Merge branch 'master' into gaisser_fixes_fixedMap Robin Müller 2020-09-10 15:27:15 +02:00
1635f16bc0 removed changes from datapool separation Robin.Mueller 2020-09-10 15:26:33 +02:00
c63baf70a1 Merge remote-tracking branch 'upstream/master' into mueller/feature/windowsUdpBridge Robin.Mueller 2020-09-10 15:26:13 +02:00
bbc73a6aaf taken over serialize adapter changes Robin.Mueller 2020-09-10 15:25:29 +02:00
0da6456bad Merge remote-tracking branch 'upstream/master' into mueller/serialize-convergence Robin.Mueller 2020-09-10 15:23:22 +02:00
fd09774fc3 serialize if update Robin.Mueller 2020-09-10 15:18:45 +02:00
f663de2418 taken over changes from master Robin.Mueller 2020-09-10 15:17:38 +02:00
224ea3914a deleted file not needed anymore Robin.Mueller 2020-09-10 15:15:13 +02:00
db2a31aef4 Merge pull request 'Implements #192' (#193) from gaisser/fsfw:gaisser_serialize_c11_update into master Robin Müller 2020-09-10 15:13:54 +02:00
de46cf5b08 Merge branch 'master' into gaisser_serialize_c11_update Robin Müller 2020-09-10 15:06:05 +02:00
db3e32655d changes taken over from master Robin.Mueller 2020-09-10 15:05:26 +02:00
18e6de7d6b added compile time check Robin.Mueller 2020-09-10 15:04:43 +02:00
cefac2db0b assignment operator added Robin.Mueller 2020-09-10 15:03:28 +02:00
d43ef479b6 assignment operator added Robin.Mueller 2020-09-10 15:02:58 +02:00
26bb2de050 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master Robin.Mueller 2020-09-10 15:01:49 +02:00
a364f36f38 Merge pull request 'Fixes for #190 and #189' (#191) from gaisser/fsfw:gaisser_bugs_fixedMap_FIFO into master Robin Müller 2020-09-10 15:00:34 +02:00
2d76c744c5 Merge branch 'master' into mueller/HealthHelperIdFix gaisser 2020-09-08 14:34:33 +02:00
d1f8040599 Merge branch 'master' into mueller/ipc-updates gaisser 2020-09-08 14:33:50 +02:00
e24e080f31 Merge branch 'master' into mueller/sharedRingBufferPullRequest gaisser 2020-09-08 14:31:40 +02:00
dab10d761a Merge branch 'master' into mueller/serialize-convergence gaisser 2020-09-08 14:27:12 +02:00
976fd54f5e Merge branch 'master' into gaisser_fixes_fixedMap gaisser 2020-09-08 14:17:53 +02:00
d87cf0a612 Merge branch 'master' into gaisser_bugs_fixedMap_FIFO gaisser 2020-09-08 14:14:38 +02:00
b3af2b5fbc Merge branch 'master' into mueller/feature/windowsUdpBridge gaisser 2020-09-08 14:14:03 +02:00
fb36c55419 Merge pull request 'new tmtc unix udp bridge' (#141) from KSat/fsfw:mueller/feature/TmTcUnixBridge into master taheran 2020-09-08 14:14:00 +02:00
5dd08877a5 Merge pull request 'tmtc bridge update, uses dynamic FIFO now' (#187) from KSat/fsfw:mueller/TmTcBridgeUpdate into master taheran 2020-09-08 14:12:43 +02:00
0258ce62f0 Added documentation Steffen Gaisser 2020-09-07 18:35:25 +02:00
b65789824c Removed old hacks and replaced by standard c++ Steffen Gaisser 2020-09-07 18:06:08 +02:00
278053a342 Another fix in DynamicFIFO Steffen Gaisser 2020-09-07 15:49:28 +02:00
2a28114b49 Fixes for #190 and #189 Steffen Gaisser 2020-09-07 15:43:48 +02:00
e085deb235 fifo fix Robin.Mueller 2020-09-07 15:23:27 +02:00
d99b100ace debug output removed Robin.Mueller 2020-09-06 18:46:56 +02:00
67b11c0535 Merge branch 'master' into mueller/feature/TmTcUnixBridge Robin Müller 2020-09-06 15:51:34 +02:00
6c42189371 some minor improvements Robin.Mueller 2020-09-06 15:49:32 +02:00
2439ac455b tmtc bridge update, uses dynamic FIFO now Robin.Mueller 2020-09-06 15:48:30 +02:00
a9975f5aef added new windows udp bridge Robin.Mueller 2020-09-06 15:46:49 +02:00
ba01b4578c Merge branch 'master' into mueller/TaskUpdates Robin Müller 2020-09-06 15:41:40 +02:00
f61056eeb7 adapted DHB to renaming Robin.Mueller 2020-09-06 15:30:56 +02:00
790d3f1465 taken over all changes Robin.Mueller 2020-09-06 15:25:56 +02:00
e9b86e51df init commit Robin.Mueller 2020-09-06 15:23:38 +02:00
26cbcdbff0 removed comment Robin.Mueller 2020-09-06 15:21:02 +02:00
673af26472 rework/restructuring Robin.Mueller 2020-09-06 14:57:05 +02:00
50ae50d286 removed pool raw access helper Robin.Mueller 2020-09-06 14:01:41 +02:00
ac2f6c5ed4 minor improvements Robin.Mueller 2020-09-06 12:59:59 +02:00
efa41b29aa added informative comment Robin.Mueller 2020-09-06 12:16:43 +02:00
8db9a4a191 some minor tweaks Robin.Mueller 2020-09-06 12:00:57 +02:00
7774434d7a windows sockets working Robin.Mueller 2020-09-06 11:58:12 +02:00
3e0819f954 some bugfixes Robin.Mueller 2020-09-06 11:48:32 +02:00
b7c4f5ce05 continued win sockets Robin.Mueller 2020-09-06 10:36:39 +02:00
0c85b05aca continued win bridge Robin.Mueller 2020-09-06 09:54:22 +02:00
234fbcbf41 small bugfix in error checking Robin.Mueller 2020-09-06 09:34:06 +02:00
08ffbfefae added windows udp bridge Robin.Mueller 2020-09-06 09:33:02 +02:00
f698275a0b removed seconds typedef, confusing Robin.Mueller 2020-09-05 21:59:17 +02:00
c7606b7b1e updating and cleaning pool files Robin.Mueller 2020-09-05 21:51:17 +02:00
cb970b1883 task IF is set now Robin.Mueller 2020-09-05 21:24:59 +02:00
f7223abaa3 added define necessary for minGW Robin.Mueller 2020-09-05 21:20:10 +02:00
902cd4d210 host osal update Robin.Mueller 2020-09-05 21:19:53 +02:00
7a24f89915 removed comment Robin.Mueller 2020-09-05 21:19:15 +02:00
c43ae66205 some tweaks Robin.Mueller 2020-09-05 21:18:30 +02:00
883103af2b queue map manager update Robin.Mueller 2020-09-05 21:13:07 +02:00
80e60566d8 compiling and working again Robin.Mueller 2020-09-05 21:11:27 +02:00
39b675cf99 repairing host osal Robin.Mueller 2020-09-05 20:39:10 +02:00
a1155686c5 updated host osal Robin.Mueller 2020-09-05 20:18:52 +02:00
c6dbce7446 Merge remote-tracking branch 'upstream/master' into mueller/hostosal Robin.Mueller 2020-09-05 20:18:18 +02:00
05814dc805 added way to start DH immediately, bugfix in event manager Robin.Mueller 2020-09-05 15:58:53 +02:00
faeeca8707 seiralize folder converged Robin Mueller 2020-09-04 16:07:54 +02:00
1a62158f33 took over serial array list adapter changes Robin Mueller 2020-09-04 16:07:11 +02:00
1803030640 taken over serialize element changes Robin Mueller 2020-09-04 16:04:11 +02:00
328c1b7195 takne over serialize element changes Robin Mueller 2020-09-04 16:03:36 +02:00
721b981df2 changes taken over Robin Mueller 2020-09-04 16:01:18 +02:00
ed21ec6c78 changes taken over for serial linked list adapter Robin Mueller 2020-09-04 16:00:45 +02:00