dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-25 05:31:24 +01:00
Code Releases Activity

More analogue inputs

Browse Source
This commit is contained in:
peteGSX 2023-01-23 20:12:28 +10:00
parent 878549d538
commit 459904e5dd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IO_EXIOExpander.h
View File

@ -67,9 +67,9 @@ private:
_numDigitalPins = numDigitalPins; _numDigitalPins = numDigitalPins;
_numAnaloguePins = numAnaloguePins; _numAnaloguePins = numAnaloguePins;
_digitalPinBytes = (numDigitalPins+7)/8; _digitalPinBytes = (numDigitalPins+7)/8;
_analoguePinBytes = (numAnaloguePins+7)/8; _analoguePinBytes = numAnaloguePins * 2;
_digitalInputStates=(byte*) calloc(_digitalPinBytes,1); _digitalInputStates=(byte*) calloc(_digitalPinBytes,1);
_analogueInputStates=(byte*) calloc(_analoguePinBytes,2); _analogueInputStates=(byte*) calloc(_analoguePinBytes,1);
addDevice(this); addDevice(this);
} }
@ -130,7 +130,6 @@ private:
int pin = vpin - _firstVpin; int pin = vpin - _firstVpin;
_analogueOutBuffer[0] = EXIOENAN; _analogueOutBuffer[0] = EXIOENAN;
_analogueOutBuffer[1] = pin; _analogueOutBuffer[1] = pin;
DIAG(F("Enable Vpin %d/pin %d"), vpin, pin);
I2CManager.write(_i2cAddress, _analogueOutBuffer, 2); I2CManager.write(_i2cAddress, _analogueOutBuffer, 2);
return true; return true;
} }
@ -140,7 +139,6 @@ private:
I2CManager.read(_i2cAddress, _digitalInputStates, _digitalPinBytes, _commandBuffer, 1); I2CManager.read(_i2cAddress, _digitalInputStates, _digitalPinBytes, _commandBuffer, 1);
_commandBuffer[0] = EXIORDAN; _commandBuffer[0] = EXIORDAN;
I2CManager.read(_i2cAddress, _analogueInputStates, _analoguePinBytes, _commandBuffer, 1); I2CManager.read(_i2cAddress, _analogueInputStates, _analoguePinBytes, _commandBuffer, 1);
delayUntil(currentMicros + 500000);
} }
int _readAnalogue(VPIN vpin) override { int _readAnalogue(VPIN vpin) override {
@ -150,9 +148,10 @@ private:
// _analogueOutBuffer[1] = pin; // _analogueOutBuffer[1] = pin;
// I2CManager.read(_i2cAddress, _analogueInBuffer, 2, _analogueOutBuffer, 2); // I2CManager.read(_i2cAddress, _analogueInBuffer, 2, _analogueOutBuffer, 2);
// return (_analogueInBuffer[1] << 8) + _analogueInBuffer[0]; // return (_analogueInBuffer[1] << 8) + _analogueInBuffer[0];
uint8_t _pinLSBByte = (pin / 4) * 2; uint8_t _pinLSBByte = pin * 2;
uint8_t _pinMSBByte = _pinLSBByte + 1; uint8_t _pinMSBByte = _pinLSBByte + 1;
return (_pinMSBByte << 8) + _pinLSBByte; // DIAG(F("Vpin %d LSB %d MSB %d"), vpin, _analogueInputStates[_pinLSBByte], _analogueInputStates[_pinMSBByte]);
return (_analogueInputStates[_pinMSBByte] << 8) + _analogueInputStates[_pinLSBByte];
} }
int _read(VPIN vpin) override { int _read(VPIN vpin) override {