From 58fe81bf0641844f7e331146ca7933e099918383 Mon Sep 17 00:00:00 2001 From: Neil McKechnie Date: Thu, 11 Nov 2021 23:59:50 +0000 Subject: [PATCH 1/4] Update EthernetInterface.h Remove spurious character. --- EthernetInterface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EthernetInterface.h b/EthernetInterface.h index ab21f6a..0ea641c 100644 --- a/EthernetInterface.h +++ b/EthernetInterface.h @@ -23,7 +23,7 @@ #ifndef EthernetInterface_h #define EthernetInterface_h -#include "defines.h") +#include "defines.h" #include "DCCEXParser.h" #include #include From b384d6c14d58624798ea341cbe6836c5eeafafc3 Mon Sep 17 00:00:00 2001 From: Neil McKechnie Date: Fri, 12 Nov 2021 00:05:16 +0000 Subject: [PATCH 2/4] Move call to mySetup into IODevice::begin(). Ensure that HAL devices are created before use by moving the call to mySetup into IODevice::begin(). The need for this became evident when it was noted that RMFT (EX-RAIL) interacts with HAL devices during its initialisation, by enabling pull-ups on digital inputs. Any --- CommandStation-EX.ino | 9 +----- IODevice.cpp | 61 +++++++++++++++++++++++++---------------- mySetup.cpp_example.txt | 42 ---------------------------- 3 files changed, 38 insertions(+), 74 deletions(-) diff --git a/CommandStation-EX.ino b/CommandStation-EX.ino index 026e763..c82274c 100644 --- a/CommandStation-EX.ino +++ b/CommandStation-EX.ino @@ -88,16 +88,9 @@ void setup() // Start RMFT (ignored if no automnation) RMFT::begin(); - // Link to and call mySetup() function (if defined in the build in mySetup.cpp). - // The contents will depend on the user's system hardware configuration. - // The mySetup.cpp file is a standard C++ module so has access to all of the DCC++EX APIs. - extern __attribute__((weak)) void mySetup(); - if (mySetup) { - mySetup(); - } // Invoke any DCC++EX commands in the form "SETUP("xxxx");"" found in optional file mySetup.h. - // This can be used to create turnouts, outputs, sensors etc. throught the normal text commands. + // This can be used to create turnouts, outputs, sensors etc. through the normal text commands. #if __has_include ( "mySetup.h") #define SETUP(cmd) serialParser.parse(F(cmd)) #include "mySetup.h" diff --git a/IODevice.cpp b/IODevice.cpp index 1f9f53f..c7ab7c0 100644 --- a/IODevice.cpp +++ b/IODevice.cpp @@ -28,6 +28,9 @@ #define USE_FAST_IO #endif +// Link to mySetup function. If not defined, the function reference will be NULL. +extern __attribute__((weak)) void mySetup(); + //================================================================================================================== // Static methods //------------------------------------------------------------------------------------------------------------------ @@ -57,6 +60,13 @@ void IODevice::begin() { dev->_begin(); } _initPhase = false; + + // Call user's mySetup() function (if defined in the build in mySetup.cpp). + // The contents will depend on the user's system hardware configuration. + // The mySetup.cpp file is a standard C++ module so has access to all of the DCC++EX APIs. + if (mySetup) { + mySetup(); + } } // Overarching static loop() method for the IODevice subsystem. Works through the @@ -148,6 +158,33 @@ void IODevice::_display() { bool IODevice::configure(VPIN vpin, ConfigTypeEnum configType, int paramCount, int params[]) { IODevice *dev = findDevice(vpin); if (dev) return dev->_configure(vpin, configType, paramCount, params); +#ifdef DIAG_IO + DIAG(F("IODevice::configure(): Vpin ID %d not found!"), (int)vpin); +#endif + return false; +} + +// Read value from virtual pin. +int IODevice::read(VPIN vpin) { + for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) { + if (dev->owns(vpin)) + return dev->_read(vpin); + } +#ifdef DIAG_IO + DIAG(F("IODevice::read(): Vpin %d not found!"), (int)vpin); +#endif + return false; +} + +// Read analogue value from virtual pin. +int IODevice::readAnalogue(VPIN vpin) { + for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) { + if (dev->owns(vpin)) + return dev->_readAnalogue(vpin); + } +#ifdef DIAG_IO + DIAG(F("IODevice::readAnalogue(): Vpin %d not found!"), (int)vpin); +#endif return false; } @@ -258,30 +295,6 @@ bool IODevice::owns(VPIN id) { return (id >= _firstVpin && id < _firstVpin + _nPins); } -// Read value from virtual pin. -int IODevice::read(VPIN vpin) { - for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) { - if (dev->owns(vpin)) - return dev->_read(vpin); - } -#ifdef DIAG_IO - DIAG(F("IODevice::read(): Vpin %d not found!"), (int)vpin); -#endif - return false; -} - -// Read analogue value from virtual pin. -int IODevice::readAnalogue(VPIN vpin) { - for (IODevice *dev = _firstDevice; dev != 0; dev = dev->_nextDevice) { - if (dev->owns(vpin)) - return dev->_readAnalogue(vpin); - } -#ifdef DIAG_IO - DIAG(F("IODevice::readAnalogue(): Vpin %d not found!"), (int)vpin); -#endif - return false; -} - #else // !defined(IO_NO_HAL) diff --git a/mySetup.cpp_example.txt b/mySetup.cpp_example.txt index 0efc771..e93ac53 100644 --- a/mySetup.cpp_example.txt +++ b/mySetup.cpp_example.txt @@ -10,8 +10,6 @@ // #include "IODevice.h" -#include "Turnouts.h" -#include "Sensors.h" #include "IO_HCSR04.h" #include "IO_VL53L0X.h" @@ -139,46 +137,6 @@ void mySetup() { //MCP23017::create(196, 16, 0x22); - //======================================================================= - // Creating a Turnout - //======================================================================= - // Parameters: same as command for Servo turnouts - // ID and VPIN are 100, sonar moves between positions 102 and 490 with slow profile. - // Profile may be Instant, Fast, Medium, Slow or Bounce. - - //ServoTurnout::create(100, 100, 490, 102, PCA9685::Slow); - - - //======================================================================= - // DCC Accessory turnout - //======================================================================= - // Parameters: same as command for DCC Accessory turnouts - // ID=3000 - // Decoder address=23 - // Decoder subaddress = 1 - - //DCCTurnout::create(3000, 23, 1); - - - //======================================================================= - // Creating a Sensor - //======================================================================= - // Parameters: As for the command, - // id = 164, - // Vpin = 164 (configured above as pin 0 of an MCP23017) - // Pullup enable = 1 (enabled) - - //Sensor::create(164, 164, 1); - - - //======================================================================= - // Way of creating lots of identical sensors in a range - //======================================================================= - - //for (int i=165; i<180; i++) - // Sensor::create(i, i, 1); - - //======================================================================= // Play mp3 files from a Micro-SD card, using a DFPlayer MP3 Module. //======================================================================= From ee5db613499e87c5fb843e0e0d1c358ce9258f62 Mon Sep 17 00:00:00 2001 From: Neil McKechnie Date: Fri, 12 Nov 2021 00:06:29 +0000 Subject: [PATCH 3/4] Update version.h to 3.2.0 rc3. --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 617673c..ca3fc4e 100644 --- a/version.h +++ b/version.h @@ -3,7 +3,7 @@ #include "StringFormatter.h" -#define VERSION "3.2.0 rc2" +#define VERSION "3.2.0 rc3" // 3.2.0 Major functional and non-functional changes. // New HAL added for I/O (digital and analogue inputs and outputs, servos etc). // Support for MCP23008, MCP23017 and PCF9584 I2C GPIO Extender modules. From fb97ba11de1a1d689a6e6510cf05635bea234c18 Mon Sep 17 00:00:00 2001 From: Neil McKechnie Date: Fri, 12 Nov 2021 00:09:59 +0000 Subject: [PATCH 4/4] Committing a SHA --- GITHUB_SHA.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h index 55da03c..674c2ef 100644 --- a/GITHUB_SHA.h +++ b/GITHUB_SHA.h @@ -1 +1 @@ -#define GITHUB_SHA "6c75563" +#define GITHUB_SHA "ee5db61"