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

Add read refresh delays

Browse Source
This commit is contained in:
peteGSX 2023-03-14 07:19:20 +10:00
parent 95d0120204
commit df3eb11eb9
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -8,5 +8,6 @@
"string_view": "cpp", "string_view": "cpp",
"initializer_list": "cpp", "initializer_list": "cpp",
"cstdint": "cpp" "cstdint": "cpp"
} },
"cmake.configureOnOpen": false
} }

23
IO_EXIOExpander.h
View File

@ -154,19 +154,24 @@ private:
// Main loop, collect both digital and analogue pin states continuously (faster sensor/input reads) // Main loop, collect both digital and analogue pin states continuously (faster sensor/input reads)
void _loop(unsigned long currentMicros) override { void _loop(unsigned long currentMicros) override {
(void)currentMicros; // remove warning
if (_deviceState == DEVSTATE_FAILED) return; // If device failed, return if (_deviceState == DEVSTATE_FAILED) return; // If device failed, return
uint8_t status = _i2crb.status; uint8_t status = _i2crb.status;
if (status == I2C_STATUS_PENDING) return; // If device busy, return if (status == I2C_STATUS_PENDING) return; // If device busy, return
if (status == I2C_STATUS_OK) { // If device ok, read input data if (status == I2C_STATUS_OK) { // If device ok, read input data
if (_commandFlag) { if (_commandFlag) {
_command1Buffer[0] = EXIORDD; if (currentMicros - _lastDigitalRead > _digitalRefresh) { // Delay 10ms for digital read refresh
I2CManager.read(_i2cAddress, _digitalInputStates, _digitalPinBytes, _command1Buffer, 1, &_i2crb); _lastDigitalRead = currentMicros;
_command1Buffer[0] = EXIORDD;
I2CManager.read(_i2cAddress, _digitalInputStates, _digitalPinBytes, _command1Buffer, 1, &_i2crb);
}
} else { } else {
_command1Buffer[0] = EXIORDAN; if (currentMicros - _lastAnalogueRead > _analogueRefresh) { // Delay 50ms for analogue read refresh
byte _tempAnalogue[_analoguePinBytes]; // Setup temp buffer so reads come from known state _lastAnalogueRead = currentMicros;
I2CManager.read(_i2cAddress, _tempAnalogue, _analoguePinBytes, _command1Buffer, 1, &_i2crb); _command1Buffer[0] = EXIORDAN;
memcpy(_analogueInputStates, _tempAnalogue, _analoguePinBytes); // Copy temp buffer to states byte _tempAnalogue[_analoguePinBytes]; // Setup temp buffer so reads come from known state
I2CManager.read(_i2cAddress, _tempAnalogue, _analoguePinBytes, _command1Buffer, 1, &_i2crb);
memcpy(_analogueInputStates, _tempAnalogue, _analoguePinBytes); // Copy temp buffer to states
}
} }
_commandFlag = !_commandFlag; _commandFlag = !_commandFlag;
// Need to delay here: digital in IO_Base 4000UL, analogue in IO_AnalogueInputs 10000UL (fast) or 1000000UL(slow) // Need to delay here: digital in IO_Base 4000UL, analogue in IO_AnalogueInputs 10000UL (fast) or 1000000UL(slow)
@ -268,6 +273,10 @@ private:
uint8_t* _analoguePinMap; uint8_t* _analoguePinMap;
I2CRB _i2crb; I2CRB _i2crb;
bool _commandFlag = 1; bool _commandFlag = 1;
unsigned long _lastDigitalRead = 0;
unsigned long _lastAnalogueRead = 0;
const unsigned long _digitalRefresh = 10000UL;
const unsigned long _analogueRefresh = 50000UL;
// EX-IOExpander protocol flags // EX-IOExpander protocol flags
enum { enum {