dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-01-11 21:31:02 +01:00
Code Releases Activity

Digital inputs optimised

Browse Source
This commit is contained in:
peteGSX 2023-01-23 11:49:23 +10:00
parent f2aeb4069f
commit 7f4e3d9cea
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IO_EXIOExpander.h
View File

@ -66,6 +66,8 @@ private:
_i2cAddress = i2cAddress; _i2cAddress = i2cAddress;
_numDigitalPins = numDigitalPins; _numDigitalPins = numDigitalPins;
_numAnaloguePins = numAnaloguePins; _numAnaloguePins = numAnaloguePins;
_digitalBytes = (numDigitalPins+7)/8;
_digitalPinStates=(byte*) calloc(_digitalBytes,1);
addDevice(this); addDevice(this);
} }
@ -125,6 +127,11 @@ private:
return false; return false;
} }
void _loop(unsigned long currentMicros) override {
_commandBuffer[0] = EXIORDD;
I2CManager.read(_i2cAddress, _digitalPinStates, _digitalBytes, _commandBuffer, 1);
}
int _readAnalogue(VPIN vpin) override { int _readAnalogue(VPIN vpin) override {
if (vpin < _firstVpin + _numDigitalPins) return false; if (vpin < _firstVpin + _numDigitalPins) return false;
int pin = vpin - _firstVpin; int pin = vpin - _firstVpin;
@ -137,11 +144,9 @@ private:
int _read(VPIN vpin) override { int _read(VPIN vpin) override {
if (vpin >= _firstVpin + _numDigitalPins) return false; if (vpin >= _firstVpin + _numDigitalPins) return false;
int pin = vpin - _firstVpin; int pin = vpin - _firstVpin;
_digitalOutBuffer[0] = EXIORDD; uint8_t pinByte = pin / 8;
_digitalOutBuffer[1] = pin; bool value = _digitalPinStates[pinByte] >> (pin - pinByte * 8);
_digitalOutBuffer[2] = 0x00; // Don't need to use this for reading return value;
I2CManager.read(_i2cAddress, _digitalInBuffer, 1, _digitalOutBuffer, 3);
return _digitalInBuffer[0];
} }
void _write(VPIN vpin, int value) override { void _write(VPIN vpin, int value) override {
@ -182,6 +187,9 @@ private:
uint8_t _majorVer = 0; uint8_t _majorVer = 0;
uint8_t _minorVer = 0; uint8_t _minorVer = 0;
uint8_t _patchVer = 0; uint8_t _patchVer = 0;
byte* _digitalPinStates;
uint8_t _digitalBytes = 0;
byte _commandBuffer[1];
enum { enum {
EXIOINIT = 0xE0, // Flag to initialise setup procedure EXIOINIT = 0xE0, // Flag to initialise setup procedure