mohr/obsw
1
0
Fork 0
forked from ROMEO/obsw
Code Pull Requests 1 Actions Releases 4 Activity

zedboard working

Browse Source
This commit is contained in:
Ulrich Mohr
2023-09-15 17:37:58 +02:00
parent fb8f4a68e7
commit 5a61af053b
13 changed files with 149 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
bsp_z7/objects/ObjectFactory.cpp
View File

@ -3,16 +3,11 @@
#include <fsfw/objectmanager/frameworkObjects.h>
#include <fsfw/storagemanager/PoolManager.h>
#include <fsfw/tmtc/TmManager.h>
#include <fsfw/tmtc/UdpTmTcBridge.h>
#include <mission/controllers/SteeringController.h>
#include <mission/devicehandlers/RoboclawHandler.h>
#include <mission/devicehandlers/ServoHandler.h>
#include <mission/controller/PrintController.h>
#include "fsfw/events/EventManager.h"
#include "fsfw/health/HealthTable.h"
#include "fsfw/internalerror/InternalErrorReporter.h"
#include "objects/communication/SerialTCPCookie.h"
#include "objects/communication/ServoCommInterface.h"
#include "systemObjects.h"
namespace objects {
@ -29,32 +24,26 @@ enum commonObjects : object_id_t {
};
}
namespace ObjectFactory {
uint16_t listeningPort = 0;
socklen_t defaultDestinationLen = 0;
const sockaddr *defaultDestination = nullptr;
const char *simString = nullptr;
} // namespace ObjectFactory
void Factory::setStaticFrameworkObjectIds() {
// MonitoringReportContent<float>::timeStamperId = objects::TIME_STAMPER;
// MonitoringReportContent<double>::timeStamperId = objects::TIME_STAMPER;
// MonitoringReportContent<uint32_t>::timeStamperId = objects::TIME_STAMPER;
// MonitoringReportContent<int32_t>::timeStamperId = objects::TIME_STAMPER;
// MonitoringReportContent<int16_t>::timeStamperId = objects::TIME_STAMPER;
// MonitoringReportContent<uint16_t>::timeStamperId = objects::TIME_STAMPER;
// void Factory::setStaticFrameworkObjectIds() {
// // MonitoringReportContent<float>::timeStamperId = objects::TIME_STAMPER;
// // MonitoringReportContent<double>::timeStamperId = objects::TIME_STAMPER;
// // MonitoringReportContent<uint32_t>::timeStamperId = objects::TIME_STAMPER;
// // MonitoringReportContent<int32_t>::timeStamperId = objects::TIME_STAMPER;
// // MonitoringReportContent<int16_t>::timeStamperId = objects::TIME_STAMPER;
// // MonitoringReportContent<uint16_t>::timeStamperId = objects::TIME_STAMPER;
// PusServiceBase::PUS_DISTRIBUTOR = objects::PUS_DISTRIBUTOR;
// PusServiceBase::PACKET_DESTINATION = objects::PUS_TM_FUNNEL;
// // PusServiceBase::PUS_DISTRIBUTOR = objects::PUS_DISTRIBUTOR;
// // PusServiceBase::PACKET_DESTINATION = objects::PUS_TM_FUNNEL;
// CommandingServiceBase::defaultPacketSource = objects::PUS_DISTRIBUTOR;
// CommandingServiceBase::defaultPacketDestination = objects::PUS_TM_FUNNEL;
// // CommandingServiceBase::defaultPacketSource = objects::PUS_DISTRIBUTOR;
// // CommandingServiceBase::defaultPacketDestination = objects::PUS_TM_FUNNEL;
// VerificationReporter::DEFAULT_RECEIVER = objects::PUS_SERVICE_1_VERIFICATION;
}
// // VerificationReporter::DEFAULT_RECEIVER = objects::PUS_SERVICE_1_VERIFICATION;
// }
void ObjectFactory::produce(void *args) {
Factory::setStaticFrameworkObjectIds();
//Factory::setStaticFrameworkObjectIds();
@ -69,4 +58,6 @@ void ObjectFactory::produce(void *args) {
new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
new TmManager(objects::TM_MANAGER);
new PrintController(123);
}