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

p60dock, acu and pdu handler completed

Browse Source
This commit is contained in:
Jakob Meier 2020-12-21 10:26:28 +01:00
parent c9fbd2c048
commit f573d15830
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fsfwconfig/devices/addresses.h
View File

@ -24,6 +24,7 @@ namespace addresses {
/* Addresses of devices supporting the CSP protocol */ /* Addresses of devices supporting the CSP protocol */
enum cspAddresses: uint8_t { enum cspAddresses: uint8_t {
P60DOCK = 4, P60DOCK = 4,
ACU = 2,
PDU1 = 3, PDU1 = 3,
/* PDU2 occupies X4 slot of P60Dock */ /* PDU2 occupies X4 slot of P60Dock */
PDU2 = 6 PDU2 = 6

3
fsfwconfig/objects/systemObjectList.h
View File

@ -36,7 +36,8 @@ namespace objects {
/* 0x44 ('D') for device handlers */ /* 0x44 ('D') for device handlers */
P60DOCK_HANDLER = 0x44000001, P60DOCK_HANDLER = 0x44000001,
PDU1_HANDLER = 0x44000002, PDU1_HANDLER = 0x44000002,
PDU2_HANDLER = 0x44000003 PDU2_HANDLER = 0x44000003,
ACU_HANDLER = 0x44000004
}; };
} }

8
fsfwconfig/pollingsequence/PollingSequenceFactory.cpp
View File

@ -38,6 +38,8 @@ ReturnValue_t pst::gomspacePstInit(FixedTimeslotTaskIF *thisSequence){
length * 0, DeviceHandlerIF::SEND_WRITE); length * 0, DeviceHandlerIF::SEND_WRITE);
thisSequence->addSlot(objects::PDU2_HANDLER, thisSequence->addSlot(objects::PDU2_HANDLER,
length * 0, DeviceHandlerIF::SEND_WRITE); length * 0, DeviceHandlerIF::SEND_WRITE);
thisSequence->addSlot(objects::ACU_HANDLER,
length * 0, DeviceHandlerIF::SEND_WRITE);
thisSequence->addSlot(objects::P60DOCK_HANDLER, thisSequence->addSlot(objects::P60DOCK_HANDLER,
length * 0.25, DeviceHandlerIF::GET_WRITE); length * 0.25, DeviceHandlerIF::GET_WRITE);
@ -45,6 +47,8 @@ ReturnValue_t pst::gomspacePstInit(FixedTimeslotTaskIF *thisSequence){
length * 0.25, DeviceHandlerIF::GET_WRITE); length * 0.25, DeviceHandlerIF::GET_WRITE);
thisSequence->addSlot(objects::PDU2_HANDLER, thisSequence->addSlot(objects::PDU2_HANDLER,
length * 0.25, DeviceHandlerIF::GET_WRITE); length * 0.25, DeviceHandlerIF::GET_WRITE);
thisSequence->addSlot(objects::ACU_HANDLER,
length * 0.25, DeviceHandlerIF::GET_WRITE);
thisSequence->addSlot(objects::P60DOCK_HANDLER, thisSequence->addSlot(objects::P60DOCK_HANDLER,
length * 0.5, DeviceHandlerIF::SEND_READ); length * 0.5, DeviceHandlerIF::SEND_READ);
@ -52,6 +56,8 @@ ReturnValue_t pst::gomspacePstInit(FixedTimeslotTaskIF *thisSequence){
length * 0.5, DeviceHandlerIF::SEND_READ); length * 0.5, DeviceHandlerIF::SEND_READ);
thisSequence->addSlot(objects::PDU2_HANDLER, thisSequence->addSlot(objects::PDU2_HANDLER,
length * 0.5, DeviceHandlerIF::SEND_READ); length * 0.5, DeviceHandlerIF::SEND_READ);
thisSequence->addSlot(objects::ACU_HANDLER,
length * 0.5, DeviceHandlerIF::SEND_READ);
thisSequence->addSlot(objects::P60DOCK_HANDLER, thisSequence->addSlot(objects::P60DOCK_HANDLER,
length * 0.75, DeviceHandlerIF::GET_READ); length * 0.75, DeviceHandlerIF::GET_READ);
@ -59,6 +65,8 @@ ReturnValue_t pst::gomspacePstInit(FixedTimeslotTaskIF *thisSequence){
length * 0.75, DeviceHandlerIF::GET_READ); length * 0.75, DeviceHandlerIF::GET_READ);
thisSequence->addSlot(objects::PDU2_HANDLER, thisSequence->addSlot(objects::PDU2_HANDLER,
length * 0.75, DeviceHandlerIF::GET_READ); length * 0.75, DeviceHandlerIF::GET_READ);
thisSequence->addSlot(objects::ACU_HANDLER,
length * 0.75, DeviceHandlerIF::GET_READ);
if (thisSequence->checkSequence() == HasReturnvaluesIF::RETURN_OK) { if (thisSequence->checkSequence() == HasReturnvaluesIF::RETURN_OK) {
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;

5
mission/core/GenericFactory.cpp
View File

@ -92,6 +92,8 @@ void ObjectFactory::produceGenericObjects() {
addresses::PDU1); addresses::PDU1);
CspCookie* pdu2CspCookie = new CspCookie(PDU::MAX_REPLY_LENGTH, CspCookie* pdu2CspCookie = new CspCookie(PDU::MAX_REPLY_LENGTH,
addresses::PDU2); addresses::PDU2);
CspCookie* acuCspCookie = new CspCookie(ACU::MAX_REPLY_LENGTH,
addresses::ACU);
/* Communication interfaces */ /* Communication interfaces */
new CspComIF(objects::CSP_COM_IF); new CspComIF(objects::CSP_COM_IF);
@ -106,6 +108,9 @@ void ObjectFactory::produceGenericObjects() {
new GomspaceDeviceHandler(objects::PDU2_HANDLER, objects::CSP_COM_IF, new GomspaceDeviceHandler(objects::PDU2_HANDLER, objects::CSP_COM_IF,
pdu2CspCookie, PDU::MAX_CONFIGTABLE_ADDRESS, pdu2CspCookie, PDU::MAX_CONFIGTABLE_ADDRESS,
PDU::MAX_HKTABLE_ADDRESS); PDU::MAX_HKTABLE_ADDRESS);
new GomspaceDeviceHandler(objects::ACU_HANDLER, objects::CSP_COM_IF,
acuCspCookie, ACU::MAX_CONFIGTABLE_ADDRESS,
ACU::MAX_HKTABLE_ADDRESS);
/* Test Device Handler */ /* Test Device Handler */
#if ADD_TEST_CODE == 1 #if ADD_TEST_CODE == 1