compile check succesfull

2021-02-14 13:07:05 +01:00 · 2021-02-14 13:07:05 +01:00 · 38402eac45
commit 38402eac45
parent 00fa7fd67e
14 changed files with 28 additions and 30 deletions
--- a/bsp_hosted/fsfwconfig/OBSWConfig.h
+++ b/bsp_hosted/fsfwconfig/OBSWConfig.h
@ -8,9 +8,9 @@

 #define OBSW_ADD_TEST_CODE      0

-// These defines should be disabled for mission code but are useful for
-// debugging.
-#define OBSW_ENHANCED_PRINTOUT  1
+/* These defines should be disabled for mission code but are useful for
+debugging. */
+#define OBSW_VEBOSE_LEVEL       1

 #ifdef __cplusplus

--- a/bsp_q7s/CMakeLists.txt
+++ b/bsp_q7s/CMakeLists.txt
@ -6,7 +6,6 @@ target_sources(${TARGET_NAME} PUBLIC

 add_subdirectory(boardconfig)
 add_subdirectory(comIF)
-add_subdirectory(gpio)
 add_subdirectory(boardtest)


--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@ -30,10 +30,10 @@
 #include <bsp_q7s/comIF/cookies/I2cCookie.h>
 #include <bsp_q7s/comIF/CspComIF.h>
 #include <bsp_q7s/comIF/I2cComIF.h>
-#include <bsp_q7s/gpio/LinuxLibgpioIF.h>
-#include <bsp_q7s/gpio/cookies/GpioCookie.h>
+#include <linux/gpio/LinuxLibgpioIF.h>
+#include <linux/gpio/GpioCookie.h>

-# if TEST_LIBGPIOD == 1
+#if TEST_LIBGPIOD == 1
 #include "LibgpiodTest.h"
 #endif

--- a/fsfwconfig/OBSWConfig.h
+++ b/fsfwconfig/OBSWConfig.h
@ -6,18 +6,17 @@
 #ifndef FSFWCONFIG_OBSWCONFIG_H_
 #define FSFWCONFIG_OBSWCONFIG_H_

-#define TEST_LIBGPIOD      0
-#define ADD_TEST_TAST   0
+#define TEST_LIBGPIOD       0

-// These defines should be disabled for mission code but are useful for
-// debugging.
-#define OBSW_ENHANCED_PRINTOUT  1
+/* These defines should be disabled for mission code but are useful for
+debugging. */
+#define OBSW_VERBOSE_LEVEL  1

-#define TE0720  0
+#define TE0720              0

-#define P60DOCK_DEBUG   0
-#define PDU1_DEBUG  0
-#define PDU2_DEBUG  0
+#define P60DOCK_DEBUG       0
+#define PDU1_DEBUG          0
+#define PDU2_DEBUG          0

 #include "OBSWVersion.h"

--- a/fsfwconfig/devices/gpioIds.h
+++ b/fsfwconfig/devices/gpioIds.h
@ -1,7 +1,7 @@
 #ifndef FSFWCONFIG_DEVICES_GPIOIDS_H_
 #define FSFWCONFIG_DEVICES_GPIOIDS_H_

-#include <bsp_q7s/gpio/GpioIF.h>
+#include <linux/gpio/GpioIF.h>

 namespace gpioIds {
 	enum gpioId_t {
--- a/mission/devices/HeaterHandler.h
+++ b/mission/devices/HeaterHandler.h
@ -11,8 +11,8 @@
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <fsfw/timemanager/Countdown.h>
+#include <linux/gpio/GpioIF.h>
 #include <unordered_map>
-#include <bsp_q7s/gpio/GpioIF.h>

 /**
 * @brief	This class intends the control of heaters.
--- a/mission/devices/MGMHandlerLIS3MDL.cpp
+++ b/mission/devices/MGMHandlerLIS3MDL.cpp
@ -5,7 +5,7 @@ MGMHandlerLIS3MDL::MGMHandlerLIS3MDL(object_id_t objectId,
 		object_id_t deviceCommunication, CookieIF* comCookie):
 		DeviceHandlerBase(objectId, deviceCommunication, comCookie),
 		dataset(this) {
-#if OBSW_ENHANCED_PRINTOUT == 1
+#if OBSW_VERBOSE_LEVEL >= 1
 	debugDivider = new PeriodicOperationDivider(10);
 #endif
 	// Set to default values right away.
@ -247,7 +247,7 @@ ReturnValue_t MGMHandlerLIS3MDL::interpretDeviceReply(DeviceCommandId_t id,
 		float mgmZ = static_cast<float>(mgmMeasurementRawZ) * sensitivityFactor
 				*  MGMLIS3MDL::GAUSS_TO_MICROTESLA_FACTOR;

-#if OBSW_ENHANCED_PRINTOUT == 1
+#if OBSW_VERBOSE_LEVEL >= 1
 		if(debugDivider->checkAndIncrement()) {
 			sif::info << "MGMHandlerLIS3: Magnetic field strength in"
 					" microtesla:" << std::endl;
@ -271,7 +271,7 @@ ReturnValue_t MGMHandlerLIS3MDL::interpretDeviceReply(DeviceCommandId_t id,
 	case MGMLIS3MDL::READ_TEMPERATURE: {
 		int16_t tempValueRaw = packet[2] << 8 | packet[1];
 		float tempValue = 25.0 + ((static_cast<float>(tempValueRaw)) / 8.0);
-#if OBSW_ENHANCED_PRINTOUT == 1
+#if OBSW_VERBOSE_LEVEL >= 1
 		if(debugDivider->check()) {
 			// Set terminal to utf-8 if there is an issue with micro printout.
 			sif::info << "MGMHandlerLIS3: Temperature: " << tempValue<< " °C"
--- a/mission/devices/MGMHandlerLIS3MDL.h
+++ b/mission/devices/MGMHandlerLIS3MDL.h
@ -157,7 +157,7 @@ private:
 	CommunicationStep communicationStep = CommunicationStep::DATA;
 	bool commandExecuted = false;

-#if OBSW_ENHANCED_PRINTOUT == 1
+#if OBSW_VERBOSE_LEVEL >= 1
 	PeriodicOperationDivider* debugDivider;
 #endif

--- a/mission/devices/MGMHandlerRM3100.cpp
+++ b/mission/devices/MGMHandlerRM3100.cpp
@ -9,7 +9,7 @@ MGMHandlerRM3100::MGMHandlerRM3100(object_id_t objectId,
        object_id_t deviceCommunication, CookieIF* comCookie):
 		DeviceHandlerBase(objectId, deviceCommunication, comCookie),
 		primaryDataset(this) {
-#if OBSW_ENHANCED_PRINTOUT == 1
+#if OBSW_VERBOSE_LEVEL >= 1
 	debugDivider = new PeriodicOperationDivider(10);
 #endif
 }
@ -328,7 +328,7 @@ ReturnValue_t MGMHandlerRM3100::handleDataReadout(const uint8_t *packet) {
 	int32_t fieldStrengthZ = (packet[7] << 16 | packet[8] << 8 | packet[9])
 			* scaleFactorZ;

-#if OBSW_ENHANCED_PRINTOUT == 1
+#if OBSW_VERBOSE_LEVEL >= 1
 	if(debugDivider->checkAndIncrement()) {
 		sif::info << "MGMHandlerLIS3: Magnetic field strength in"
 				" microtesla:" << std::endl;
--- a/mission/devices/MGMHandlerRM3100.h
+++ b/mission/devices/MGMHandlerRM3100.h
@ -6,7 +6,7 @@

 #include <OBSWConfig.h>

-#if OBSW_ENHANCED_PRINTOUT == 1
+#if OBSW_VERBOSE_LEVEL >= 1
 #include <fsfw/globalfunctions/PeriodicOperationDivider.h>
 #endif

@ -97,7 +97,7 @@ private:
 			const uint8_t *commandData,size_t commandDataLen);

 	ReturnValue_t handleDataReadout(const uint8_t* packet);
-#if OBSW_ENHANCED_PRINTOUT == 1
+#if OBSW_VERBOSE_LEVEL >= 1
 	PeriodicOperationDivider* debugDivider;
 #endif
 };
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/devices/P60DockHandler.cpp
@ -25,7 +25,7 @@ void P60DockHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *
     */
    handleDeviceTM(&p60dockHkTableDataset, id, true);

-#if OBSW_ENHANCED_PRINTOUT == 1 && P60DOCK_DEBUG == 1
+#if OBSW_VERBOSE_LEVEL >= 1 && P60DOCK_DEBUG == 1
    p60dockHkTableDataset.read();

    float temperatureC = p60dockHkTableDataset.temperature1.value * 0.1;
--- a/mission/devices/PDU1Handler.cpp
+++ b/mission/devices/PDU1Handler.cpp
@ -23,7 +23,7 @@ void PDU1Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pac
    parseHkTableReply(packet);
 //    handleDeviceTM(&pdu1HkTableDataset, id, true);

-#if OBSW_ENHANCED_PRINTOUT == 1 && PDU1_DEBUG == 1
+#if OBSW_VERBOSE_LEVEL >= 1 && PDU1_DEBUG == 1
    pdu1HkTableDataset.read();
    sif::info << "PDU1 VCC: " << pdu1HkTableDataset.vcc << " mV" << std::endl;
    float vbat = pdu1HkTableDataset.vbat.value * 0.1;
--- a/mission/devices/PDU2Handler.cpp
+++ b/mission/devices/PDU2Handler.cpp
@ -26,7 +26,7 @@ void PDU2Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pac
     */
    handleDeviceTM(&pdu2HkTableDataset, id, true);

-#if OBSW_ENHANCED_PRINTOUT == 1 && PDU2_DEBUG == 1
+#if OBSW_VERBOSE_LEVEL >= 1 && PDU2_DEBUG == 1
    pdu2HkTableDataset.read();
    sif::info << "PDU2 Q7S current voltage: " << pdu2HkTableDataset.voltageOutQ7S << " mV" << std::endl;
    sif::info << "PDU2 VCC: " << pdu2HkTableDataset.vcc << " mV" << std::endl;
--- a/mission/devices/Tmp1075Handler.cpp
+++ b/mission/devices/Tmp1075Handler.cpp
@ -98,7 +98,7 @@ ReturnValue_t Tmp1075Handler::interpretDeviceReply(DeviceCommandId_t id,
 		int16_t tempValueRaw = 0;
 		tempValueRaw = packet[0] << 4 | packet[1] >> 4;
 		float tempValue = ((static_cast<float>(tempValueRaw)) * 0.0625);
-#if OBSW_ENHANCED_PRINTOUT == 1
+#if OBSW_VERBOSE_LEVEL >= 1
 		sif::info << "Tmp1075 with object id: 0x" << std::hex << getObjectId()
 				<< ": Temperature: " << tempValue<< " °C"
 				<< std::endl;