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

Clean up

Browse Source
This commit is contained in:
peteGSX 2022-12-29 05:10:37 +10:00
parent 8f32ae712f
commit ffdf023de6
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IO_EXIOExpander.h
View File

@ -18,21 +18,23 @@
*/ */
/* /*
* The IO_EX-IOExpander.h device driver integrates with one or more EX-IOExpander devices. * The IO_EXIOExpander.h device driver integrates with one or more EX-IOExpander devices.
* This device driver will configure the device and all I/O ports on startup, along with * This device driver will configure the device on startup, along with
* interacting with the device for all input/output duties. * interacting with the device for all input/output duties.
* *
* To create EX-IOExpander devices, these are defined in myHal.cpp: * To create EX-IOExpander devices, these are defined in myHal.cpp:
* *
* #include "IO_EX-IOExpander.h" * #include "IO_EXIOExpander.h"
* *
* void halSetup() { * void halSetup() {
* // EXIOExpander::create(vpin, num_vpins, i2c_address, digitalPinCount, analoguePinCount); * // EXIOExpander::create(vpin, num_vpins, i2c_address, digitalPinCount, analoguePinCount);
* EXIOExpander::create(800, 18, 0x65, EXIO_NANO_DIGITAL_PINS, EXIO_NANO_ANALOGUE_PINS); * EXIOExpander::create(800, 18, 0x65, 12, 8);
* } * }
* *
* Note when defining the number of digital and analogue pins, there is no way to sanity check * Note when defining the number of digital and analogue pins, there is no way to sanity check
* this from the device driver, and it is up to the user to define the correct values here. * this from the device driver, and it is up to the user to define the correct values here.
*
* All pins available on the EX-IOExpander device must be accounted for.
* *
* Vpins are allocated to digital pins first, and then analogue pins, so digital pins will * Vpins are allocated to digital pins first, and then analogue pins, so digital pins will
* populate the first part of the specified vpin range, with the analogue pins populating the * populate the first part of the specified vpin range, with the analogue pins populating the
@ -48,11 +50,6 @@
#include "DIAG.h" #include "DIAG.h"
#include "FSH.h" #include "FSH.h"
// Include user defined pin maps in myEX-IOExpander if defined
#if __has_include ("myEX-IOExpander.h")
#include "myEX-IOExpander.h"
#endif
///////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////
/* /*
* IODevice subclass for EX-IOExpander. * IODevice subclass for EX-IOExpander.
@ -79,7 +76,6 @@ private:
// Initialise EX-IOExander device // Initialise EX-IOExander device
uint8_t _check = I2CManager.checkAddress(_i2cAddress); uint8_t _check = I2CManager.checkAddress(_i2cAddress);
if (I2CManager.exists(_i2cAddress)) { if (I2CManager.exists(_i2cAddress)) {
_activity = EXIOINIT; // First thing to do is configure EX-IOExpander device
_digitalOutBuffer[0] = EXIOINIT; _digitalOutBuffer[0] = EXIOINIT;
_digitalOutBuffer[1] = _numDigitalPins; _digitalOutBuffer[1] = _numDigitalPins;
_digitalOutBuffer[2] = _numAnaloguePins; _digitalOutBuffer[2] = _numAnaloguePins;
@ -173,7 +169,6 @@ private:
uint8_t _majorVer = 0; uint8_t _majorVer = 0;
uint8_t _minorVer = 0; uint8_t _minorVer = 0;
uint8_t _patchVer = 0; uint8_t _patchVer = 0;
uint8_t _activity;
I2CRB _i2crb; I2CRB _i2crb;
enum { enum {