eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge pull request 'ADIS Gyro Handler: Use OSAL define instead of dedicated define' (#162) from mueller/adis-optimization into develop

Browse Source 
Reviewed-on: #162
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
This commit is contained in:
Jakob Meier 2022-03-04 09:55:43 +01:00
commit 6c51553f71
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linux/fsfwconfig/OBSWConfig.h.in
View File

@ -140,10 +140,9 @@ debugging. */
#endif #endif
/*******************************************************************/ /*******************************************************************/
/** Hardcoded */ /** CMake Defines */
/*******************************************************************/ /*******************************************************************/
// Leave at one as the BSP is linux. Used by the ADIS1650X device handler #cmakedefine EIVE_BUILD_GPSD_GPS_HANDLER
#define OBSW_ADIS1650X_LINUX_COM_IF 1
#include "OBSWVersion.h" #include "OBSWVersion.h"

8
mission/devices/GyroADIS1650XHandler.cpp
View File

@ -3,7 +3,9 @@
#include <fsfw/action/HasActionsIF.h> #include <fsfw/action/HasActionsIF.h>
#include <fsfw/datapool/PoolReadGuard.h> #include <fsfw/datapool/PoolReadGuard.h>
#if OBSW_ADIS1650X_LINUX_COM_IF == 1 #include "fsfw/FSFW.h"
#ifdef FSFW_OSAL_LINUX
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>
@ -20,7 +22,7 @@ GyroADIS1650XHandler::GyroADIS1650XHandler(object_id_t objectId, object_id_t dev
primaryDataset(this), primaryDataset(this),
configDataset(this), configDataset(this),
breakCountdown() { breakCountdown() {
#if OBSW_ADIS1650X_LINUX_COM_IF == 1 #ifdef FSFW_OSAL_LINUX
SpiCookie *cookie = dynamic_cast<SpiCookie *>(comCookie); SpiCookie *cookie = dynamic_cast<SpiCookie *>(comCookie);
if (cookie != nullptr) { if (cookie != nullptr) {
cookie->setCallbackMode(&spiSendCallback, this); cookie->setCallbackMode(&spiSendCallback, this);
@ -383,7 +385,7 @@ GyroADIS1650XHandler::BurstModes GyroADIS1650XHandler::getBurstMode() {
} }
} }
#if OBSW_ADIS1650X_LINUX_COM_IF == 1 #ifdef FSFW_OSAL_LINUX
ReturnValue_t GyroADIS1650XHandler::spiSendCallback(SpiComIF *comIf, SpiCookie *cookie, ReturnValue_t GyroADIS1650XHandler::spiSendCallback(SpiComIF *comIf, SpiCookie *cookie,
const uint8_t *sendData, size_t sendLen, const uint8_t *sendData, size_t sendLen,

4
mission/devices/GyroADIS1650XHandler.h
View File

@ -7,7 +7,7 @@
#include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h"
#include "fsfw/globalfunctions/PeriodicOperationDivider.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
#if OBSW_ADIS1650X_LINUX_COM_IF == 1 #ifdef FSFW_OSAL_LINUX
class SpiComIF; class SpiComIF;
class SpiCookie; class SpiCookie;
#endif #endif
@ -65,7 +65,7 @@ class GyroADIS1650XHandler : public DeviceHandlerBase {
BurstModes getBurstMode(); BurstModes getBurstMode();
#if OBSW_ADIS1650X_LINUX_COM_IF == 1 #ifdef FSFW_OSAL_LINUX
static ReturnValue_t spiSendCallback(SpiComIF *comIf, SpiCookie *cookie, const uint8_t *sendData, static ReturnValue_t spiSendCallback(SpiComIF *comIf, SpiCookie *cookie, const uint8_t *sendData,
size_t sendLen, void *args); size_t sendLen, void *args);
#endif #endif