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

deleted polling sequence file

Browse Source
This commit is contained in:
Martin Zietz
2021-03-22 12:47:45 +01:00
parent 5439305b8c 682cdb3ce9
commit 862a546637
55 changed files with 1039 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bsp_q7s/ObjectFactory.cpp
View File

@ -8,7 +8,10 @@
#include <bsp_q7s/devices/HeaterHandler.h>
#include <bsp_q7s/devices/SolarArrayDeploymentHandler.h>
<<<<<<< HEAD
#include <bsp_q7s/gpio/gpioCallbacks.h>
=======
>>>>>>> develop
#include <mission/core/GenericFactory.h>
#include <mission/devices/PDU1Handler.h>
@ -17,10 +20,13 @@
#include <mission/devices/PCDUHandler.h>
#include <mission/devices/P60DockHandler.h>
#include <mission/devices/Tmp1075Handler.h>
<<<<<<< HEAD
#include <mission/devices/Max31865PT1000Handler.h>
#include <mission/devices/devicedefinitions/Max31865Definitions.h>
#include <mission/devices/SyrlinksHkHandler.h>
=======
>>>>>>> develop
#include <mission/devices/devicedefinitions/GomSpacePackets.h>
#include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
#include <mission/devices/devicedefinitions/SyrlinksDefinitions.h>
@ -44,6 +50,13 @@
#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
#include <fsfw/osal/linux/TcUnixUdpPollingTask.h>
#include <fsfw/datapoollocal/LocalDataPoolManager.h>
#include <fsfw/tmtcservices/CommandingServiceBase.h>
#include <fsfw/tmtcservices/PusServiceBase.h>
#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
#include <fsfw/osal/linux/TcUnixUdpPollingTask.h>
#if TEST_LIBGPIOD == 1
#include <linux/boardtest/LibgpiodTest.h>
#endif
@ -114,11 +127,18 @@ void ObjectFactory::produce(){
* Setting PCDU devices to mode normal immediately after start up because PCDU is always
* running.
*/
<<<<<<< HEAD
/** For now this needs to be commented out because there is no PCDU connected to the OBC */
// p60dockhandler->setModeNormal();
// pdu1handler->setModeNormal();
// pdu2handler->setModeNormal();
// acuhandler->setModeNormal();
=======
//p60dockhandler->setModeNormal();
//pdu1handler->setModeNormal();
//pdu2handler->setModeNormal();
//acuhandler->setModeNormal();
>>>>>>> develop
#endif
/* Temperature sensors */
Tmp1075Handler* tmp1075Handler_1 = new Tmp1075Handler(