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

305d8ef840 taken over changes Robin Mueller 2020-09-04 15:56:52 +02:00
84308c74d9 taken over some changes Robin Mueller 2020-09-04 15:56:08 +02:00
f2f7a5de87 taken over convergence changes Robin Mueller 2020-09-04 15:47:33 +02:00
d4d96a128e adapted doc Robin Mueller 2020-09-04 15:47:08 +02:00
0d69e9beca taken over serial uffer adapter from upstream Robin Mueller 2020-09-04 15:42:15 +02:00
e83de82481 gathering remaining differences.. Robin Mueller 2020-09-04 15:40:42 +02:00
37764f7ca7 include guard fixed Robin Mueller 2020-09-04 15:39:17 +02:00
be89e7ebb7 taken over from upstream with little tweak Robin Mueller 2020-09-04 15:36:53 +02:00
cfa952d982 hybrid iterator same to FSFW Robin Mueller 2020-09-04 15:33:36 +02:00
fff0131c9b taken over changes Robin Mueller 2020-09-04 15:20:07 +02:00
62eb327df6 health helper update Robin Mueller 2020-09-04 15:19:33 +02:00
147ab94149 include guard improvements Robin Mueller 2020-09-04 15:13:32 +02:00
dbac6e139b shared ring buffer update Robin Mueller 2020-09-04 15:11:53 +02:00
06400fa7bb share dring buffer update Robin Mueller 2020-09-04 15:10:44 +02:00
3e67701933 taken over ring buffer base changes Robin Mueller 2020-09-04 15:09:24 +02:00
e105be229a include guards fand include improvements Robin Mueller 2020-09-04 15:06:48 +02:00
d885dddee8 renormalize files Robin Mueller 2020-09-04 15:04:53 +02:00
a53b9dc3db renormalization Robin Mueller 2020-09-04 14:59:59 +02:00
a6b2b4dd93 renormalization Robin Mueller 2020-09-04 14:58:36 +02:00
a3b80288e1 Merge remote-tracking branch 'upstream/master' into mueller/dledoc Robin Mueller 2020-09-04 14:54:49 +02:00
91d5277a94 added new returnvalues Robin Mueller 2020-09-04 14:54:08 +02:00
f4a5067775 update fw class Ids Robin Mueller 2020-09-04 14:53:27 +02:00
975fb9832b added interface ID Robin Mueller 2020-09-04 14:52:17 +02:00
4bdac1e017 changed from mueller/master taken over Robin Mueller 2020-09-04 14:49:59 +02:00
94b45d7407 changed taken over Robin Mueller 2020-09-04 14:49:27 +02:00
381914886d initAfterTaskCreation added for linux Robin Mueller 2020-09-04 14:43:53 +02:00
9d1f292af0 changed taken over Robin Mueller 2020-09-04 14:32:32 +02:00
0eb4c3817e added initialize after taks creation for linux Robin Mueller 2020-09-04 14:31:39 +02:00
6980245c98 added line break Robin Mueller 2020-09-04 14:30:04 +02:00
31c16382fc took over changed for fixed slot sequence Robin Mueller 2020-09-04 14:28:43 +02:00
4d7d48e8ca added a generic way to add a custom check Robin Mueller 2020-09-04 14:24:34 +02:00
b8754fbc16 made fixed sequence slot doc generic Robin Mueller 2020-09-04 14:11:59 +02:00
92c7369276 include guard fix Robin Mueller 2020-09-04 13:56:12 +02:00
04532b8f6b renormalizing pull request step2 Robin Mueller 2020-09-04 13:52:54 +02:00
5eaf6cfd1f renormalizing pull request step1 Robin Mueller 2020-09-04 13:52:02 +02:00
7ad5274803 Merge remote-tracking branch 'upstream/master' into mueller/FixedTimeslotUpdate Robin Mueller 2020-09-04 13:51:09 +02:00
403d83f32c removed commented out code Robin.Mueller 2020-09-03 13:01:14 +02:00
dbb394f761 new member to store last step Robin.Mueller 2020-09-03 00:22:16 +02:00
822a908353 separated steps, everything seems to work Robin.Mueller 2020-09-03 00:17:01 +02:00
e8fa9816ce doc improved Robin.Mueller 2020-09-02 23:45:14 +02:00
6069c64048 doc improved Robin.Mueller 2020-09-02 23:36:54 +02:00
631b2ca705 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master Robin.Mueller 2020-09-02 17:59:45 +02:00
ae9bc39bda some bugfixes and improvements Robin.Mueller 2020-09-02 17:59:26 +02:00
ab9f58438f Merge branch 'master' into mueller_tcPacketBase gaisser 2020-09-01 13:24:41 +02:00
4da21d2c38 Merge branch 'master' into mueller/ipc-updates gaisser 2020-09-01 13:12:39 +02:00
b3d08cd40b Merge pull request 'FIFO is StaticFIFO now, new FIFO using vector' (#127) from KSat/fsfw:mueller_FIFO_static_normal into master gaisser 2020-09-01 13:08:58 +02:00
d5accd16ba Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal Robin.Mueller 2020-09-01 12:58:38 +02:00
03b2ca679d include guard correction Robin.Mueller 2020-09-01 12:58:29 +02:00
33039f8c60 include guard correction Robin.Mueller 2020-09-01 12:57:56 +02:00
75f6cacd10 Merge branch 'master' into mueller_FIFO_static_normal gaisser 2020-09-01 12:56:41 +02:00
b32ea6e316 Merge pull request 'RingBuffer, static CTOR' (#132) from KSat/fsfw:mueller_ringBufferStatic into master gaisser 2020-09-01 12:56:23 +02:00
bec562ece0 FIFO updates Robin.Mueller 2020-09-01 12:54:33 +02:00
5308cb6237 Merge branch 'master' into mueller_ringBufferStatic gaisser 2020-09-01 12:54:08 +02:00
4f3869de8d Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal Robin.Mueller 2020-09-01 12:54:02 +02:00
b522b3c29c fifo updates Robin.Mueller 2020-09-01 12:53:53 +02:00
a634875b4b dynamic fifo update Robin.Mueller 2020-09-01 12:50:17 +02:00
7cf79c17a9 fifo update Robin.Mueller 2020-09-01 12:48:51 +02:00
f7f134ac20 corrections Robin.Mueller 2020-09-01 12:48:11 +02:00
02cfa8bcd5 Merge branch 'master' into mueller_FIFO_static_normal Robin Müller 2020-09-01 12:45:25 +02:00
96c421b72c Merge pull request 'parameter improvements' (#181) from KSat/fsfw:mueller/parameter-updates into master gaisser 2020-09-01 12:45:20 +02:00
f85e4eb22f Merge branch 'master' into mueller/parameter-updates gaisser 2020-09-01 12:44:14 +02:00
edde2ee58b offsetr update Robin.Mueller 2020-09-01 12:43:50 +02:00
66bc60f176 Merge branch 'mueller/parameter-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/parameter-updates Robin.Mueller 2020-09-01 12:43:02 +02:00
695a4e7842 offset is size_t now Robin.Mueller 2020-09-01 12:42:52 +02:00
f068df9028 Merge pull request 'event manager improvements' (#180) from KSat/fsfw:mueller/eventmanager-improvements into master gaisser 2020-09-01 12:39:33 +02:00
636e5fb888 Merge branch 'master' into gaisser_fixes_fixedMap gaisser 2020-09-01 12:35:53 +02:00
77927363ce Merge branch 'master' into mueller/eventmanager-improvements gaisser 2020-09-01 12:29:16 +02:00
5d87650833 Merge branch 'master' into mueller/parameter-updates gaisser 2020-09-01 12:28:53 +02:00
e949637271 Merge branch 'master' into mueller_FIFO_static_normal gaisser 2020-09-01 12:24:41 +02:00
4a80872c3c Merge pull request 'DHB Update' (#144) from KSat/fsfw:mueller/feature/DHBupdate into master gaisser 2020-09-01 12:24:19 +02:00
a9e5b54238 Merge branch 'master' into mueller/feature/DHBupdate gaisser 2020-09-01 12:22:14 +02:00
e77c294360 Merge pull request 'fdir update' (#158) from KSat/fsfw:mueller/devices/FDIR into master gaisser 2020-09-01 12:21:48 +02:00
7059d5f158 Merge branch 'master' into mueller/devices/FDIR gaisser 2020-09-01 12:21:28 +02:00
b07b19327c renormalize CHB Robin.Mueller 2020-09-01 11:52:18 +02:00
4abdc436fb Revert "renormalize CHB" Robin.Mueller 2020-09-01 11:51:43 +02:00
d644a40e14 Merge branch 'mueller/feature/DHBupdate' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/feature/DHBupdate Robin.Mueller 2020-09-01 11:49:53 +02:00
a4d9c761a7 renormalize CHB Robin.Mueller 2020-09-01 11:49:43 +02:00
cc5c944c84 Merge branch 'master' into gaisser_fixes_fixedMap Steffen Gaisser 2020-09-01 11:41:03 +02:00
f645fe6607 Merge pull request 'Comments in serializeIF' (#174) from gaisser/fsfw:gaisser_comments_serialize into master Robin Müller 2020-09-01 11:37:21 +02:00
c0ed474373 Update 'serialize/SerializeIF.h' gaisser 2020-09-01 11:34:28 +02:00
f12c56c75f Merge branch 'master' into mueller/feature/DHBupdate gaisser 2020-09-01 11:20:21 +02:00
15bb0aee98 handler ID cached, debug output improved Robin.Mueller 2020-08-29 19:08:10 +02:00
6c02776975 added srv9 Robin.Mueller 2020-08-29 00:16:40 +02:00
b0673c7fa6 typo fixes Robin.Mueller 2020-08-28 18:47:11 +02:00
7a5c70e753 typo fixes Robin.Mueller 2020-08-28 18:46:47 +02:00
b6a19f911d include guards improved Robin.Mueller 2020-08-28 18:45:19 +02:00
1b9c8446b7 renormalized line endings Robin.Mueller 2020-08-28 18:33:29 +02:00
478b88d7a2 Merge branch 'master' into gaisser_comments_serialize gaisser 2020-08-28 18:15:41 +02:00
b54d63edcb event manager improvements Robin.Mueller 2020-08-28 18:10:02 +02:00
9abd796e6f updated map packet extraction Robin.Mueller 2020-08-28 17:58:36 +02:00
8596810fe2 Merge branch 'event/git-update' into mueller/master Robin.Mueller 2020-08-28 17:58:31 +02:00
b71cab3993 integrated all changes Robin.Mueller 2020-08-28 17:55:13 +02:00
9f522466f0 wrapped info output in additonal ifdef Robin.Mueller 2020-08-28 17:52:13 +02:00
e800aad979 event git update Robin.Mueller 2020-08-28 17:44:10 +02:00
d2ef2b2be4 taken over datalinklayer form upstream Robin.Mueller 2020-08-28 17:40:53 +02:00
5ce954672b taken over coordinates from upstream Robin.Mueller 2020-08-28 17:40:21 +02:00
2e23fc1201 Merge pull request 'git is weird' (#15) from mueller/action-git-update into mueller/master Robin Müller 2020-08-28 17:37:29 +02:00
8862f35ad1 git is weird Robin.Mueller 2020-08-28 17:35:27 +02:00
69f26bf72e test branch Robin.Mueller 2020-08-28 17:24:16 +02:00
468ebfb809 include improvement Robin.Mueller 2020-08-28 17:18:11 +02:00