mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop

126 Commits

Author SHA1 Message Date
muellerr d1daf78160 Merge branch 'mueller/sphinx-docs' into mueller/master 2021-12-01 11:23:40 +01:00
muellerr bc1d6731da Merge remote-tracking branch 'origin/development' into mueller/master 2021-11-30 10:24:13 +01:00
muellerr 02468a838f removed delete functions 2021-10-27 18:38:16 +02:00
muellerr b6746984d9 more cleaning up 2021-10-27 18:11:56 +02:00
muellerr f9db627ce6 msp init improvements 2021-10-27 18:05:18 +02:00
muellerr 56327833e6 grouping CS gpio definition 2021-10-27 17:31:04 +02:00
muellerr 6b4cb0827d SPI ComIF updates
1. Make setting a chip select pin optional
2. Make ComIF member functions public
2021-10-27 17:23:14 +02:00
muellerr 105d59a1f5 fixes so stm32 example compiles 2021-10-27 17:08:01 +02:00
muellerr fb960cce8d Merge remote-tracking branch 'origin/development' into mueller/master 2021-10-27 16:54:08 +02:00
muellerr f67b861be7 Merge remote-tracking branch 'origin/development' into mueller/master 2021-10-18 17:42:51 +02:00
muellerr b774f37d60 Merge remote-tracking branch 'origin/development' into mueller/master 2021-10-17 22:58:29 +02:00
muellerr a4c8577cd3 Merge remote-tracking branch 'origin/development' into mueller/master 2021-10-13 10:44:55 +02:00
muellerr f15460c7ab Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master 2021-10-11 14:34:45 +02:00
muellerr 7539dfffe3 dedicated test config objects list used now 2021-10-11 14:34:20 +02:00
muellerr d0b7a1ecf2 some tests 2021-10-11 14:22:57 +02:00
muellerr f35e8e52e8 Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master 2021-10-11 14:15:20 +02:00
muellerr cc74ae777a removed some configure files 2021-10-11 14:14:49 +02:00
muellerr e51385aadc Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master 2021-10-11 13:51:29 +02:00
muellerr 1d18ad5ebf Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master 2021-10-11 13:49:38 +02:00
muellerr 4534468d8e Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master 2021-10-11 13:45:43 +02:00
muellerr 992784d7ae Merge remote-tracking branch 'origin/development' into mueller/master 2021-10-11 12:49:25 +02:00
muellerr d81ed334d8 preserve STX char 2021-10-04 14:38:10 +02:00
muellerr f67567d0b5 refactoring, code more understandable 2021-09-30 16:49:30 +02:00
muellerr 76c3214a4f important bugfix 2021-09-30 00:59:49 +02:00
muellerr 3d80271f0d missing cast 2021-09-29 11:47:01 +02:00
muellerr e3a7127573 Merge remote-tracking branch 'eive/mueller/tcp-keep-open-pr' into mueller/master 2021-09-29 11:46:03 +02:00
muellerr f5d0c06bd4 Merge remote-tracking branch 'eive/mueller/tcp-keep-open-pr' into mueller/master 2021-09-28 17:49:17 +02:00
muellerr d9744365d2 all windows fixes 2021-09-28 17:26:02 +02:00
muellerr 5284eadca6 changes for C++11 2021-09-28 16:30:51 +02:00
muellerr ee531f8067 Merge remote-tracking branch 'eive/mueller/tcp-keep-open-pr' into mueller/master 2021-09-28 16:23:45 +02:00
muellerr 80cad3ed3f Merge remote-tracking branch 'eive/mueller/increase-absolute-packet-stored-limit' into mueller/master 2021-09-28 16:17:38 +02:00
muellerr 5d9e5e222a removed C++14 featue 2021-09-28 15:45:45 +02:00
muellerr 2c785ff187 Merge remote-tracking branch 'origin/development' into mueller/master 2021-09-28 15:45:03 +02:00
muellerr 93ad9be5d6 removed include 2021-09-28 15:42:50 +02:00
muellerr 42fc637314 resolved merge conflict 2021-09-26 22:31:43 +02:00
muellerr e31a06e702 Merge remote-tracking branch 'eive/mueller/added-missing-devicehandlers' into mueller/master 2021-09-26 22:28:26 +02:00
muellerr d4342ce2d4 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-08-18 18:21:32 +02:00
muellerr ba64b2cc3e Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-08-18 18:21:26 +02:00
muellerr 984816373d some error cases 2021-08-18 18:20:19 +02:00
muellerr 5181319900 include fix 2021-08-18 18:15:30 +02:00
muellerr d0d4359017 Merge remote-tracking branch 'ksat/mueller/master' into mueller/master 2021-08-18 18:06:56 +02:00
muellerr 57b13731e0 added first DLE unit tests 2021-08-18 18:03:38 +02:00
muellerr 026f7f00de separated encoder functions as well 2021-08-18 13:33:00 +02:00
muellerr 94c2e703e0 made two functions private and removed unnecessary if check 2021-08-18 13:17:48 +02:00
muellerr 7572d3f7cd Merge branch 'mueller/dle-improvements' into mueller/master 2021-08-17 16:03:21 +02:00
muellerr d1f4652205 documentation updated 2021-08-17 16:00:10 +02:00
muellerr 1cbd72dcfb more refactoring 2021-08-17 15:50:47 +02:00
muellerr eb6c2ce8c5 Merge branch 'mueller/dle-improvements' into mueller/master 2021-08-17 15:41:01 +02:00
muellerr e7a3a3d35f removed unrequired arguments 2021-08-17 15:13:15 +02:00
muellerr ea5a14e54c ctor and dtor public now 2021-08-17 15:11:55 +02:00
muellerr ae3c56a27e Merge branch 'mueller/dle-improvements' into mueller/master 2021-08-17 15:06:54 +02:00
muellerr 20ee0ed2c4 STX and ETX escaping are optional now 2021-08-17 14:57:09 +02:00
muellerr 80263b647d nothing 2021-08-16 11:42:14 +02:00
muellerr 39a8ee6f8d Merge remote-tracking branch 'upstream/mueller/int-unittest-osal-defines-update' into mueller/master 2021-08-16 11:35:29 +02:00
muellerr 860e143eb4 Merge remote-tracking branch 'upstream/mueller/conf-file-update' into mueller/master 2021-08-16 11:34:36 +02:00
muellerr 8e6f90ae79 Merge remote-tracking branch 'upstream/mueller/version-update' into mueller/master 2021-08-16 11:34:13 +02:00
muellerr 2147d09887 Merge branch 'mueller/conf-file-update' into mueller/master 2021-08-16 11:24:27 +02:00
muellerr 1fac84e1bc Merge branch 'mueller/version-update' into mueller/master 2021-08-16 11:21:32 +02:00
muellerr 05181ce873 reverted change 2021-08-16 11:17:38 +02:00
muellerr 73cd58f2dd internal unit test structural improvements 2021-08-16 11:15:24 +02:00
muellerr cf4c3acc01 Merge branch 'mueller/timer-utilities' into mueller/master 2021-08-16 11:04:24 +02:00
muellerr 9e36bbc11d small bugfix 2021-08-16 11:02:36 +02:00
muellerr ddac936a2c adds some utility to linux timer 2021-08-16 10:59:28 +02:00
muellerr 94bb91dbfb reverted to old action helper 2021-08-16 10:58:11 +02:00
muellerr a526611993 Merge remote-tracking branch 'upstream/development' into mueller/master 2021-08-16 10:36:40 +02:00
muellerr 420ea6f836 fixes and improvements 2021-08-10 11:36:44 +02:00
muellerr 98b58200da removed TODO 2021-08-10 11:25:10 +02:00
muellerr a747be6c65 Some fixes
1. InternalUnitTester: Mutex test now uses new defines
2. CMakeLists.txt: The OSAL defines are now defined in the FSFW.h file
2021-08-10 11:21:57 +02:00
muellerr 09d76c2e26 made semaphore tests optional 2021-08-10 11:14:18 +02:00
muellerr d06c92c478 Merge remote-tracking branch 'eive/mueller/tcp-udp-tweaks' into mueller/master 2021-08-10 11:11:06 +02:00
muellerr c6d80a5c81 Merge remote-tracking branch 'origin/development' into mueller/master 2021-08-10 11:07:58 +02:00
muellerr 8f30ae9cc3 Merge branch 'mueller/tests-accessible-from-outside' into mueller/master 2021-08-07 11:42:39 +02:00
muellerr 9e9fa047f7 printf support for cmd executor 2021-08-07 00:30:53 +02:00
muellerr 739f682dee this interface is more pus conformant 2021-08-06 17:44:38 +02:00
muellerr 420b104a0c Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-08-06 11:36:33 +02:00
muellerr 7b4fb3041c important bugfix 2021-08-06 11:05:56 +02:00
muellerr 1684c3983f minor format tweak 2021-08-06 11:02:35 +02:00
muellerr 722cf5b6fe Merge remote-tracking branch 'eive/mueller/master' into mueller/master 2021-08-06 10:57:31 +02:00
muellerr 3704d2b829 bugfix 2021-08-05 18:24:56 +02:00
muellerr 6073abb12d added some utility to timer module 2021-08-05 18:13:01 +02:00
muellerr b2c102b2c1 Service Interface and Bugfix
1. Service Interface looks better now
2. Bugfix in CommandExecutor blocking mode
2021-08-05 16:13:22 +02:00
muellerr 4202205182 getter function for current state 2021-08-05 16:02:17 +02:00
muellerr c8472beb5f added new command executor 2021-08-05 15:42:47 +02:00
muellerr 7606f585fe refactored test folder 2021-08-04 11:16:22 +02:00
muellerr 1a4a85ceb2 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master 2021-08-03 18:38:27 +02:00
muellerr 7922bf76da corrected README 2021-08-03 18:38:18 +02:00
muellerr 4d98f2da25 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-08-03 16:40:15 +02:00
muellerr ce0f30f685 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-08-03 16:32:39 +02:00
muellerr bb88490cc6 Merge remote-tracking branch 'upstream/mueller/restructuring' into mueller/master 2021-08-03 15:55:38 +02:00
muellerr 296c587e3d additional nullptr check 2021-08-03 15:29:22 +02:00
muellerr 0ff81294e7 Merge branch 'eive/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/develop 2021-08-02 12:49:50 +02:00
muellerr b6e243b8b3 var name clarification 2021-08-02 12:49:40 +02:00
meierj 3bbcc42d39 Merge pull request 'type missmatch' (#7) from mohr-patch-1 into eive/develop
Reviewed-on: #7
2021-07-26 19:04:06 +02:00
mohr fc4324a2fa type missmatch 2021-07-26 18:35:53 +02:00
muellerr 54c028f913 naming adaptions 2021-07-26 13:50:45 +02:00
muellerr 1f6a5e635f naming fixes 2021-07-26 11:46:58 +02:00
muellerr c5b4b01362 Merge branch 'mueller/master' into eive/develop 2021-07-24 15:04:01 +02:00
muellerr c5420c7b53 bumped subversion 2021-07-24 14:39:43 +02:00
muellerr 3e422f51bd corrected version number 2021-07-24 13:43:13 +02:00
meierj d1be0f9843 Merge pull request 'Update framework' (#6) from mueller/master into eive/develop
Reviewed-on: #6
2021-07-23 18:26:39 +02:00
Jakob.Meier b83259592a uart flush function 2021-07-23 18:06:36 +02:00
muellerr b0e1480383 pushed cfdp update 2021-07-21 21:56:31 +02:00
muellerr 62d109c856 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master 2021-07-21 21:19:15 +02:00
muellerr 4a495d987a Merge branch 'tompert/devel' into mueller/master 2021-07-21 21:19:13 +02:00
muellerr 86ae5d03cd API updated 2021-07-21 11:34:18 +02:00
muellerr 1c9f038e5c Merge remote-tracking branch 'eive/mueller/master' into mueller/master 2021-07-21 11:24:46 +02:00
muellerr e137ddc897 improved HasFileSystemIF api 2021-07-21 11:23:57 +02:00
muellerr d339bf2c9e deleted src/osal/host folder 2021-07-21 09:43:17 +02:00
muellerr f84d255903 using info instead of debug 2021-07-20 18:46:17 +02:00
muellerr a7a4e0f219 api consistent now 2021-07-19 19:03:20 +02:00
muellerr bdc5f593e2 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-07-19 18:50:20 +02:00
muellerr 77257320fe Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-07-19 18:49:05 +02:00
muellerr 10f7185e81 added includes 2021-07-19 13:08:40 +02:00
tomatze 974d25dbb1 added CFDPHandler (not working yet) 2021-07-18 20:36:47 +02:00
tomatze c6998b0f17 Merge remote-tracking branch 'origin/mueller/master' into tompert/devel 2021-07-16 16:47:33 +02:00
muellerr a6e5b267a3 moved mutex.cpp 2021-07-16 16:11:58 +02:00
muellerr eb89615722 update fsfw, fixes for CFDP 2021-07-15 20:06:20 +02:00
muellerr 94f8a36eb4 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-07-15 19:51:17 +02:00
tomatze 4860d984f3 refactored TcPacketCheck into TcPacketCheckIF to implement a CFDP packet checker 2021-07-04 16:20:26 +02:00
tomatze 8a4ce91501 fixed copied comment 2021-07-04 15:39:07 +02:00
muellerr 53cada41ef whitespace corrections 2021-06-24 09:47:28 +02:00
muellerr 2500a5f4f7 fixes for updated FSFW 2021-06-24 09:36:13 +02:00
muellerr 967d4964f1 Merge remote-tracking branch 'origin/mueller/master' into tompert/devel 2021-06-24 09:31:17 +02:00
tomatze 5954002ae0 added missing sif::printDebug 2021-06-12 18:45:23 +02:00
tomatze 52bf1d4714 CFDPDistributor corrected some debug prints 2021-06-10 14:29:07 +02:00
tomatze 10f6ce3a0c added dummy CFDPDistributor 2021-05-31 13:49:56 +02:00