mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-22 23:56:13 +01:00
Merge branch 'devel' of https://github.com/DCC-EX/CommandStation-EX into devel
This commit is contained in:
commit
168368864c
|
@ -129,7 +129,6 @@ private:
|
|||
status = I2CManager.read(_I2CAddress, _analoguePinMap, _numAnaloguePins, commandBuffer, 1);
|
||||
}
|
||||
if (status == I2C_STATUS_OK) {
|
||||
DIAG(F("Map: %d %d %d %d %d %d"), _analoguePinMap[0], _analoguePinMap[1], _analoguePinMap[2], _analoguePinMap[3], _analoguePinMap[4], _analoguePinMap[5]);
|
||||
// Attempt to get version, if we don't get it, we don't care, don't go offline
|
||||
uint8_t versionBuffer[3];
|
||||
commandBuffer[0] = EXIOVER;
|
||||
|
@ -223,7 +222,7 @@ private:
|
|||
// Here we need to copy the values from input buffer to the analogue value array. We need to
|
||||
// do this to avoid tearing of the values (i.e. one byte of a two-byte value being changed
|
||||
// while the value is being read).
|
||||
memcpy(_analogueInputStates, _analogueInputBuffer, _analoguePinBytes); // Copy I2C input buffer to states
|
||||
memcpy(_analogueInputStates, _analogueInputBuffer, sizeof(_analogueInputBuffer)); // Copy I2C input buffer to states
|
||||
|
||||
} else if (_readState == RDS_DIGITAL) {
|
||||
// Read of digital states was in progress, so process received values
|
||||
|
|
|
@ -4,7 +4,8 @@
|
|||
#include "StringFormatter.h"
|
||||
|
||||
|
||||
#define VERSION "4.2.32"
|
||||
#define VERSION "4.2.33"
|
||||
// 4.2.33 - Fix EX-IOExpander non-working analogue inputs
|
||||
// 4.2.32 - Fix LCD/Display bugfixes from 4.2.29
|
||||
// 4.2.31 - Removes EXRAIL statup from top of file. (BREAKING CHANGE !!)
|
||||
// Just add AUTOSTART to the top of your myAutomation.h to restore this function.
|
||||
|
|
Loading…
Reference in New Issue
Block a user