Merge branch 'eive/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/develop

var name clarification
Merge pull request 'type missmatch' (#7 ) from mohr-patch-1 into eive/develop
2021-08-02 12:49:50 +02:00 · 2021-08-02 12:49:40 +02:00 · 2021-07-26 19:04:06 +02:00 · 2021-07-26 18:35:53 +02:00
2 changed files with 3 additions and 3 deletions
--- a/hal/src/fsfw/hal/linux/spi/SpiComIF.cpp
+++ b/hal/src/fsfw/hal/linux/spi/SpiComIF.cpp
@ -82,7 +82,7 @@ ReturnValue_t SpiComIF::initializeInterface(CookieIF *cookie) {
        gpioComIF->pullHigh(gpioId);
    }

-    size_t spiSpeed = 0;
+    uint32_t spiSpeed = 0;
    spi::SpiModes spiMode = spi::SpiModes::MODE_0;

    SpiCookie::UncommonParameters params;
--- a/src/fsfw/returnvalues/HasReturnvaluesIF.h
+++ b/src/fsfw/returnvalues/HasReturnvaluesIF.h
@ -22,9 +22,9 @@ public:
 	 * @param number
 	 * @return
 	 */
-	static constexpr ReturnValue_t makeReturnCode(uint8_t interfaceId,
+	static constexpr ReturnValue_t makeReturnCode(uint8_t classId,
 			uint8_t number) {
-	    return (static_cast<ReturnValue_t>(interfaceId) << 8) + number;
+	    return (static_cast<ReturnValue_t>(classId) << 8) + number;
 	}
 };
Author	SHA1	Message	Date
Robin Mueller	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
Robin Mueller	b6e243b8b3	var name clarification	2021-08-02 12:49:40 +02:00
Jakob.Meier	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
Ulrich Mohr	fc4324a2fa	type missmatch	2021-07-26 18:35:53 +02:00