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

Make IODevice::read function return type consistent with underlying _read calls.

Browse Source 
IODevice::read() now returns int, instead of bool.  This is consistent with the IODevice::_read() return and also allows for future devices that return a non-boolean value.
This commit is contained in:
Neil McKechnie 2021-08-12 12:01:10 +01:00
parent 2a79f67308
commit ec503e7d3e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IODevice.cpp
View File

@ -261,7 +261,7 @@ bool IODevice::owns(VPIN id) {
// } // }
// Read value from virtual pin. // Read value from virtual pin.
bool IODevice::read(VPIN vpin) { int IODevice::read(VPIN vpin) {
for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) { for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) {
if (dev->owns(vpin)) if (dev->owns(vpin))
return dev->_read(vpin); return dev->_read(vpin);
@ -302,7 +302,7 @@ bool IODevice::hasCallback(VPIN vpin) {
(void)vpin; // Avoid compiler warnings (void)vpin; // Avoid compiler warnings
return false; return false;
} }
bool IODevice::read(VPIN vpin) { int IODevice::read(VPIN vpin) {
pinMode(vpin, INPUT_PULLUP); pinMode(vpin, INPUT_PULLUP);
return !digitalRead(vpin); // Return inverted state (5v=0, 0v=1) return !digitalRead(vpin); // Return inverted state (5v=0, 0v=1)
} }

4
IODevice.h
View File

@ -102,7 +102,7 @@ public:
static bool hasCallback(VPIN vpin); static bool hasCallback(VPIN vpin);
// read invokes the IODevice instance's _read method. // read invokes the IODevice instance's _read method.
static bool read(VPIN vpin); static int read(VPIN vpin);
// loop invokes the IODevice instance's _loop method. // loop invokes the IODevice instance's _loop method.
static void loop(); static void loop();
@ -348,4 +348,4 @@ private:
// #include "IO_MCP23017.h" // #include "IO_MCP23017.h"
// #include "IO_PCF8574.h" // #include "IO_PCF8574.h"
#endif // iodevice_h #endif // iodevice_h