Merge 6e9a3ebfb4 into 818e05b425

IO_EXIOExpander.h

@@ -1,6 +1,5 @@
 /*
  *  © 2022, Peter Cole. All rights reserved.
- *  © 2024, Harald Barth. All rights reserved.
  *
  *  This file is part of EX-CommandStation
  *
@@ -99,53 +98,34 @@ private:
           _numAnaloguePins = receiveBuffer[2];
 
           // See if we already have suitable buffers assigned
-          if (_numDigitalPins>0) {
+          size_t digitalBytesNeeded = (_numDigitalPins + 7) / 8;
-            size_t digitalBytesNeeded = (_numDigitalPins + 7) / 8;
+          if (_digitalPinBytes < digitalBytesNeeded) {
-            if (_digitalPinBytes < digitalBytesNeeded) {
+            // Not enough space, free any existing buffer and allocate a new one
-              // Not enough space, free any existing buffer and allocate a new one
+            if (_digitalPinBytes > 0) free(_digitalInputStates);
-              if (_digitalPinBytes > 0) free(_digitalInputStates);
+            _digitalInputStates = (byte*) calloc(_digitalPinBytes, 1);
-              if ((_digitalInputStates = (byte*) calloc(digitalBytesNeeded, 1)) != NULL) {
+            _digitalPinBytes = digitalBytesNeeded;
-		_digitalPinBytes = digitalBytesNeeded;
-	      } else {
-		DIAG(F("EX-IOExpander I2C:%s ERROR alloc %d bytes"), _I2CAddress.toString(), digitalBytesNeeded);
-		_deviceState = DEVSTATE_FAILED;
-		_digitalPinBytes = 0;
-		return;
-	      }
-            }
           }
-          if (_numAnaloguePins>0) {
+          size_t analogueBytesNeeded = _numAnaloguePins * 2;
-            size_t analogueBytesNeeded = _numAnaloguePins * 2;
+          if (_analoguePinBytes < analogueBytesNeeded) {
-            if (_analoguePinBytes < analogueBytesNeeded) {
+            // Free any existing buffers and allocate new ones.
-              // Free any existing buffers and allocate new ones.
+            if (_analoguePinBytes > 0) {
-              if (_analoguePinBytes > 0) {
+              free(_analogueInputBuffer);
-                free(_analogueInputBuffer);
+              free(_analogueInputStates);
-                free(_analogueInputStates);
+              free(_analoguePinMap);
-                free(_analoguePinMap);
+            }
-              }
+            _analogueInputStates = (uint8_t*) calloc(analogueBytesNeeded, 1);
-              _analogueInputStates = (uint8_t*) calloc(analogueBytesNeeded, 1);
+            _analogueInputBuffer = (uint8_t*) calloc(analogueBytesNeeded, 1);
-              _analogueInputBuffer = (uint8_t*) calloc(analogueBytesNeeded, 1);
+            _analoguePinMap = (uint8_t*) calloc(_numAnaloguePins, 1);
-              _analoguePinMap = (uint8_t*) calloc(_numAnaloguePins, 1);
+            _analoguePinBytes = analogueBytesNeeded;
-	      if (_analogueInputStates  != NULL &&
+          }
-		  _analogueInputBuffer != NULL &&
+        } else {
-		  _analoguePinMap != NULL) {
+          DIAG(F("EX-IOExpander I2C:%s ERROR configuring device"), _I2CAddress.toString());
-		_analoguePinBytes = analogueBytesNeeded;
+          _deviceState = DEVSTATE_FAILED;
-	      } else {
+          return;
-		DIAG(F("EX-IOExpander I2C:%s ERROR alloc analog pin bytes"), _I2CAddress.toString());
+        }
-		_deviceState = DEVSTATE_FAILED;
-		_analoguePinBytes = 0;
-		return;
-	      }
-	    }
-	  }
-	} else {
-	  DIAG(F("EX-IOExpander I2C:%s ERROR configuring device"), _I2CAddress.toString());
-	  _deviceState = DEVSTATE_FAILED;
-	  return;
-	}
       } 
-      // We now need to retrieve the analogue pin map if there are analogue pins
+      // We now need to retrieve the analogue pin map
-      if (status == I2C_STATUS_OK && _numAnaloguePins>0) {
+      if (status == I2C_STATUS_OK) {
         commandBuffer[0] = EXIOINITA;
         status = I2CManager.read(_I2CAddress, _analoguePinMap, _numAnaloguePins, commandBuffer, 1);
       }
@@ -259,7 +239,7 @@ private:
 
     // If we're not doing anything now, check to see if a new input transfer is due.
     if (_readState == RDS_IDLE) {
-      if (_numDigitalPins>0 && currentMicros - _lastDigitalRead > _digitalRefresh) { // Delay for digital read refresh
+      if (currentMicros - _lastDigitalRead > _digitalRefresh) { // Delay for digital read refresh
         // Issue new read request for digital states.  As the request is non-blocking, the buffer has to
         // be allocated from heap (object state).
         _readCommandBuffer[0] = EXIORDD;
@@ -267,7 +247,7 @@ private:
                                                                 // non-blocking read
         _lastDigitalRead = currentMicros;
         _readState = RDS_DIGITAL;
-      } else if (_numAnaloguePins>0 && currentMicros - _lastAnalogueRead > _analogueRefresh) { // Delay for analogue read refresh
+      } else if (currentMicros - _lastAnalogueRead > _analogueRefresh) { // Delay for analogue read refresh
         // Issue new read for analogue input states
         _readCommandBuffer[0] = EXIORDAN;
         I2CManager.read(_I2CAddress, _analogueInputBuffer,
@@ -382,14 +362,14 @@ private:
   uint8_t _minorVer = 0;
   uint8_t _patchVer = 0;
 
-  uint8_t* _digitalInputStates  = NULL;
+  uint8_t* _digitalInputStates;
-  uint8_t* _analogueInputStates = NULL;
+  uint8_t* _analogueInputStates;
-  uint8_t* _analogueInputBuffer = NULL;  // buffer for I2C input transfers
+  uint8_t* _analogueInputBuffer;  // buffer for I2C input transfers
   uint8_t _readCommandBuffer[1];
 
-  uint8_t _digitalPinBytes = 0;   // Size of allocated memory buffer (may be longer than needed)
+  uint8_t _digitalPinBytes = 0;  // Size of allocated memory buffer (may be longer than needed)
-  uint8_t _analoguePinBytes = 0;  // Size of allocated memory buffer (may be longer than needed)
+  uint8_t _analoguePinBytes = 0;  // Size of allocated memory buffers (may be longer than needed)
-  uint8_t* _analoguePinMap = NULL;
+  uint8_t* _analoguePinMap;
   I2CRB _i2crb;
 
   enum {RDS_IDLE, RDS_DIGITAL, RDS_ANALOGUE};  // Read operation states

version.h

@@ -3,9 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.0.9"
+#define VERSION "5.0.8"
-// 5.0.9  - EX-IOExpander bug fix for memory allocation
-//        - EX-IOExpander bug fix to allow for devices with no analogue or no digital pins
 // 5.0.8  - Bugfix: Do not crash on turnouts without description
 // 5.0.7  - Only flag 2.2.0.0-dev as broken, not 2.2.0.0
 // 5.0.6  - Bugfix lost TURNOUTL description