dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-24 00:26:13 +01:00
Code Releases Activity

More diags

Browse Source
This commit is contained in:
peteGSX 2024-01-18 07:52:58 +10:00
parent 964364e51c
commit 3462beeeac
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
I2CManager_Wire.h
View File

@ -193,9 +193,12 @@ uint8_t I2CManagerClass::read(I2CAddress address, uint8_t readBuffer[], uint8_t
// while (Wire.available() && nBytes < readSize) // while (Wire.available() && nBytes < readSize)
while (nBytes < readSize) while (nBytes < readSize)
if (Wire.available()) { if (Wire.available()) {
uint8_t temp=nBytes; // uint8_t temp=nBytes;
readBuffer[nBytes++] = Wire.read(); char readByte=Wire.read();
DIAG(F("nBytes=%d, readBuffer[nBytes]=%d"), temp, readBuffer[temp]); DIAG(F("nBytes=%d, readByte=%d"),nBytes,readByte);
// readBuffer[nBytes++] = Wire.read();
readBuffer[nBytes++]=readByte;
// DIAG(F("nBytes=%d, readBuffer[nBytes]=%d"), temp, readBuffer[temp]);
} else { } else {
delay(1); delay(1);
} }
@ -236,7 +239,7 @@ void I2CManagerClass::queueRequest(I2CRB *req) {
DIAG(F("NOOOOOOOOOOO")); DIAG(F("NOOOOOOOOOOO"));
return; return;
} }
req->dump(); // req->dump();
switch (req->operation & OPERATION_MASK) { switch (req->operation & OPERATION_MASK) {
case OPERATION_READ: case OPERATION_READ:
read(req->i2cAddress, req->readBuffer, req->readLen, NULL, 0, req); read(req->i2cAddress, req->readBuffer, req->readLen, NULL, 0, req);

6
IO_EXIOExpander.h
View File

@ -260,9 +260,9 @@ private:
} else if (currentMicros - _lastAnalogueRead > _analogueRefresh && _numAnaloguePins>0) { // Delay for analogue read refresh } else if (currentMicros - _lastAnalogueRead > _analogueRefresh && _numAnaloguePins>0) { // Delay for analogue read refresh
// Issue new read for analogue input states // Issue new read for analogue input states
_readCommandBuffer[0] = EXIORDAN; _readCommandBuffer[0] = EXIORDAN;
// DIAG(F("EXIORDAN address=%x, aBuffer=%d, bytes=%d"),_I2CAddress,_analogueInputBuffer,_numAnaloguePins*2); DIAG(F("EXIORDAN address=%x, aBuffer=%d, bytes=%d"),_I2CAddress,_analogueInputBuffer,_numAnaloguePins*2);
// I2CManager.read(_I2CAddress, _analogueInputBuffer, I2CManager.read(_I2CAddress, _analogueInputBuffer,
// _numAnaloguePins * 2, _readCommandBuffer, 1, &_i2crb); _numAnaloguePins * 2, _readCommandBuffer, 1, &_i2crb);
_lastAnalogueRead = currentMicros; _lastAnalogueRead = currentMicros;
_readState = RDS_ANALOGUE; _readState = RDS_ANALOGUE;
} }