[Revolution Pi] order of adapters changed

eclipse-4diac · Mar 15, 2024 · 8dd6ae6 · 8dd6ae6
1 parent 499c222
commit 8dd6ae6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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<CIEC_STRING*>(getDI(i))->getStorage(),

diff --git 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<CIEC_STRING*>(getDI(iOffset + i))->getStorage(),
         IOMapper::In, mIndex, CIEC_ANY::e_BOOL, (uint8_t) (i / 8), (uint8_t) (i % 8));