From 8dd6ae6a2b7e24fdb46dedbdcaffa5d97b62a9bb Mon Sep 17 00:00:00 2001 From: Monika Wenger Date: Fri, 15 Mar 2024 17:20:50 +0100 Subject: [PATCH] [Revolution Pi] order of adapters changed --- src/modules/revolutionPi/fb/IORevPiAIO.cpp | 5 +++-- src/modules/revolutionPi/fb/IORevPiDIO.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/modules/revolutionPi/fb/IORevPiAIO.cpp b/src/modules/revolutionPi/fb/IORevPiAIO.cpp index 1f2a643d..b97a3adf 100644 --- a/src/modules/revolutionPi/fb/IORevPiAIO.cpp +++ b/src/modules/revolutionPi/fb/IORevPiAIO.cpp @@ -33,8 +33,8 @@ const TDataIOID FORTE_IORevPiAIO::scmEOWith[] = {0, scmWithListDelimiter, 0, 1, const TForteInt16 FORTE_IORevPiAIO::scmEOWithIndexes[] = {0, 2}; const CStringDictionary::TStringId FORTE_IORevPiAIO::scmEventOutputNames[] = {g_nStringIdMAPO, g_nStringIdIND}; const SAdapterInstanceDef FORTE_IORevPiAIO::scmAdapterInstances[] = { - {g_nStringIdIORevPiBusAdapter, g_nStringIdBusAdapterIn, false}, - {g_nStringIdIORevPiBusAdapter, g_nStringIdBusAdapterOut, true} + {g_nStringIdIORevPiBusAdapter, g_nStringIdBusAdapterOut, true}, + {g_nStringIdIORevPiBusAdapter, g_nStringIdBusAdapterIn, false} }; const SFBInterfaceSpec FORTE_IORevPiAIO::scmFBInterfaceSpec = { 1, scmEventInputNames, scmEIWith, scmEIWithIndexes, @@ -73,6 +73,7 @@ void FORTE_IORevPiAIO::initHandles() { uint8_t inputOffset = 0; uint8_t outputOffset = 0; + DEVLOG_INFO("[RevPiController AIO initHandles] \n"); for (int i = 1; i < 9; i++) { uint8_t* currentOffset = (i < 7) ? &inputOffset : &outputOffset; RevPiController::HandleDescriptor desc(static_cast(getDI(i))->getStorage(), diff --git a/src/modules/revolutionPi/fb/IORevPiDIO.cpp b/src/modules/revolutionPi/fb/IORevPiDIO.cpp index dd7d1df0..1a1c24c6 100644 --- a/src/modules/revolutionPi/fb/IORevPiDIO.cpp +++ b/src/modules/revolutionPi/fb/IORevPiDIO.cpp @@ -33,8 +33,8 @@ const TDataIOID FORTE_IORevPiDIO::scmEOWith[] = {0, scmWithListDelimiter, 0, 1, const TForteInt16 FORTE_IORevPiDIO::scmEOWithIndexes[] = {0, 2}; const CStringDictionary::TStringId FORTE_IORevPiDIO::scmEventOutputNames[] = {g_nStringIdMAPO, g_nStringIdIND}; const SAdapterInstanceDef FORTE_IORevPiDIO::scmAdapterInstances[] = { - {g_nStringIdIORevPiBusAdapter, g_nStringIdBusAdapterIn, false}, - {g_nStringIdIORevPiBusAdapter, g_nStringIdBusAdapterOut, true} + {g_nStringIdIORevPiBusAdapter, g_nStringIdBusAdapterOut, true}, + {g_nStringIdIORevPiBusAdapter, g_nStringIdBusAdapterIn, false} }; const SFBInterfaceSpec FORTE_IORevPiDIO::scmFBInterfaceSpec = { 1, scmEventInputNames, scmEIWith, scmEIWithIndexes, @@ -277,6 +277,7 @@ void FORTE_IORevPiDIO::initHandles() { int iOffset = 1; int oOffset = iOffset + iCount; + DEVLOG_INFO("[RevPiController DIO initHandles] \n"); for (int i = 0; i < iCount; i++) { RevPiController::HandleDescriptor desc(static_cast(getDI(iOffset + i))->getStorage(), IOMapper::In, mIndex, CIEC_ANY::e_BOOL, (uint8_t) (i / 8), (uint8_t) (i % 8));