eive/eive-obsw
13
4
Fork 0
Code Issues4 Pull Requests1 Releases121 Wiki Activity

Merge remote-tracking branch 'origin/develop' into petri_dev

Browse Source
This commit is contained in:
Robin Müller
2022-07-14 17:31:08 +02:00
parent b4bb46726c 269c93a9f3
commit 2c3c05e2d4
120 changed files with 3850 additions and 1048 deletions
CHANGELOG.mdCMakeLists.txt
bsp_hosted
InitMission.cppObjectFactory.cpp
comIF
CMakeLists.txt
fsfwconfig
CMakeLists.txtFSFWConfig.h.in
objects
systemObjectList.htranslateObjects.cpp
pollingsequence
CMakeLists.txtDummyPst.cppDummyPst.h
main.cpp
bsp_q7s
boardconfig
busConf.h
core
InitMission.cppObjectFactory.cpp
fmObjectFactory.cpp
bsp_te0720_1cfa
InitMission.cppInitMission.hOBSWConfig.h.inObjectFactory.cppObjectFactory.h
boardconfig
busConf.h
common/config
OBSWVersion.h
dummies
AcuDummy.cppAcuDummy.hBpxDummy.cppBpxDummy.hCMakeLists.txtComCookieDummy.cppComCookieDummy.hComIFDummy.cppComIFDummy.hCoreControllerDummy.cppCoreControllerDummy.hGyroAdisDummy.cppGyroAdisDummy.hGyroL3GD20Dummy.cppGyroL3GD20Dummy.hImtqDummy.cppImtqDummy.hMgmLIS3MDLDummy.cppMgmLIS3MDLDummy.hP60DockDummy.cppP60DockDummy.hPduDummy.cppPduDummy.hPlPcduDummy.cppPlPcduDummy.hRwDummy.cppRwDummy.hStarTrackerDummy.cppStarTrackerDummy.hSusDummy.cppSusDummy.hSyrlinksDummy.cppSyrlinksDummy.hTemperatureSensorsDummy.cppTemperatureSensorsDummy.h
fsfw
generators
bsp_q7s_events.csvbsp_q7s_objects.csvbsp_q7s_returnvalues.csv
deps
fsfwgen
events
event_parser.pytranslateEvents.cpp
fsfwgengen.py
objects
objects.pytranslateObjects.cpp
returnvalues
returnvalues_parser.py
linux
ObjectFactory.cppObjectFactory.h
devices
devicedefinitions
PlocMPSoCDefinitions.h
ploc
PlocMPSoCHandler.cppPlocMemoryDumper.cppPlocSupervisorHandler.cppPlocSupervisorHandler.h
fsfwconfig
events
translateEvents.cpp
objects
systemObjectList.htranslateObjects.cpp
obc
PdecHandler.cppPdecHandler.h
misc/eclipse/host
eive-linux-host-debug-cmake.launcheive-unittest.launch
mission
controller
CMakeLists.txtThermalController.cppThermalController.h
controllerdefinitions
ThermalControllerDefinitions.h
core
GenericFactory.cpp
devices
ACUHandler.cppGomspaceDeviceHandler.cppHeaterHandler.hIMTQHandler.cppMax31865EiveHandler.cppP60DockHandler.cppRadiationSensorHandler.cppRwHandler.cppSusHandler.cppSyrlinksHkHandler.cppSyrlinksHkHandler.hTmp1075Handler.cpp
devicedefinitions
GomSpacePackets.hGomspaceDefinitions.hIMTQHandlerDefinitions.hSusDefinitions.hSyrlinksDefinitions.h
max1227.cppmax1227.h
tmtc
CCSDSHandler.cppCCSDSHandler.hCMakeLists.txtTmFunnel.cppTmFunnel.h
scripts
auto-formatter.shq7s-port-local.sh
tmtc
unittest
controller
testThermalController.cpp
mocks
HouseKeepingMock.cppHouseKeepingMock.h

51
bsp_hosted/ObjectFactory.cpp

@@ -2,8 +2,9 @@
#include <fsfw/tmtcservices/CommandingServiceBase.h>
#include <fsfw/tmtcservices/PusServiceBase.h>
#include <mission/controller/ThermalController.h>
#include <mission/core/GenericFactory.h>
#include <mission/utility/TmFunnel.h>
#include <mission/tmtc/TmFunnel.h>
#include <objects/systemObjectList.h>
#include <tmtc/apid.h>
#include <tmtc/pusIds.h>
@@ -25,7 +26,24 @@
#include <test/testtasks/TestTask.h>
#endif
#include <mission/utility/GlobalConfigHandler.h>
#include "mission/utility/GlobalConfigHandler.h"
#include <dummies/AcuDummy.h>
#include <dummies/BpxDummy.h>
#include <dummies/ComCookieDummy.h>
#include <dummies/ComIFDummy.h>
#include <dummies/CoreControllerDummy.h>
#include <dummies/GyroAdisDummy.h>
#include <dummies/GyroL3GD20Dummy.h>
#include <dummies/ImtqDummy.h>
#include <dummies/MgmLIS3MDLDummy.h>
#include <dummies/P60DockDummy.h>
#include <dummies/PduDummy.h>
#include <dummies/PlPcduDummy.h>
#include <dummies/RwDummy.h>
#include <dummies/StarTrackerDummy.h>
#include <dummies/SusDummy.h>
#include <dummies/SyrlinksDummy.h>
#include <dummies/TemperatureSensorsDummy.h>
void Factory::setStaticFrameworkObjectIds() {
PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR;
@@ -46,5 +64,32 @@ void ObjectFactory::produce(void* args) {
Factory::setStaticFrameworkObjectIds();
ObjectFactory::produceGenericObjects();
new ComIFDummy(objects::DUMMY_COM_IF);
ComCookieDummy* comCookieDummy = new ComCookieDummy();
new BpxDummy(objects::BPX_BATT_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new CoreControllerDummy(objects::CORE_CONTROLLER);
new RwDummy(objects::RW1, objects::DUMMY_COM_IF, comCookieDummy);
new RwDummy(objects::RW2, objects::DUMMY_COM_IF, comCookieDummy);
new RwDummy(objects::RW3, objects::DUMMY_COM_IF, comCookieDummy);
new RwDummy(objects::RW4, objects::DUMMY_COM_IF, comCookieDummy);
new StarTrackerDummy(objects::STAR_TRACKER, objects::DUMMY_COM_IF, comCookieDummy);
new SyrlinksDummy(objects::SYRLINKS_HK_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new ImtqDummy(objects::IMTQ_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new AcuDummy(objects::ACU_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new PduDummy(objects::PDU1_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new PduDummy(objects::PDU2_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new P60DockDummy(objects::P60DOCK_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new GyroAdisDummy(objects::GYRO_0_ADIS_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new GyroL3GD20Dummy(objects::GYRO_1_L3G_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new GyroAdisDummy(objects::GYRO_2_ADIS_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new GyroL3GD20Dummy(objects::GYRO_3_L3G_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new MgmLIS3MDLDummy(objects::MGM_0_LIS3_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new MgmLIS3MDLDummy(objects::MGM_2_LIS3_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new PlPcduDummy(objects::PLPCDU_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
new TemperatureSensorsDummy();
new SusDummy();
new ThermalController(objects::THERMAL_CONTROLLER, objects::NO_OBJECT);
new TestTask(objects::TEST_TASK);
}
}