mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-22 23:56:13 +01:00
9dacd24d27
* Add <D SERVO vpin position> command Allow a PWM servo to be driven to any arbitrary position. * Enhancements for HAL drivers Add state change notification for external GPIO module drivers; Allow drivers to be installed statically by declaration (as an alternative to the 'create' call). * Create IO_HCSR04.h HAL driver for HC-SR04 ultrasonic distance sensor (sonar). * Enable servo commands in NO-HAL mode, but return error. Avoid compile errors in RMFT.cpp when compiled with basic HAL by including the Turnout::createServo function as a stub that returns NULL. * Update IO_HCSR04.h Minor changes * Change <D SERVO> Give the <D SERVO> command an optional parameter of the profile. For example, <D SERVO 100 200 3> will slowly move the servo on pin 100 to PWM position corresponding to 200. If omitted, the servo will move immediately (no animation). * IODevice (HAL) changes 1) Put new devices on the end of the chain instead of the beginning. This will give better performance for devices created first (ArduinoPins and extender GPIO devices, typically). 2) Remove unused functions. * Update IO_HCSR04.h Allow thresholds for ON and OFF to be separately configured at creation. * Update IODevice.cpp Fix compile error on IO_NO_HAL minimal HAL version. * Update IO_PCA9685.cpp Remove unnecessary duplicated call to min() function.
347 lines
13 KiB
C++
347 lines
13 KiB
C++
/*
|
|
* © 2020, Chris Harlow. All rights reserved.
|
|
* © 2021, modified by Neil McKechnie. All rights reserved.
|
|
*
|
|
* This file is part of Asbelos DCC API
|
|
*
|
|
* This is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* It is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with CommandStation. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
/**********************************************************************
|
|
|
|
DCC++ BASE STATION supports Sensor inputs that can be connected to any Arduino Pin
|
|
not in use by this program. Sensors can be of any type (infrared, magentic, mechanical...).
|
|
The only requirement is that when "activated" the Sensor must force the specified Arduino
|
|
Pin LOW (i.e. to ground), and when not activated, this Pin should remain HIGH (e.g. 5V),
|
|
or be allowed to float HIGH if use of the Arduino Pin's internal pull-up resistor is specified.
|
|
|
|
To ensure proper voltage levels, some part of the Sensor circuitry
|
|
MUST be tied back to the same ground as used by the Arduino.
|
|
|
|
The Sensor code below utilises "de-bounce" logic to remove spikes generated by
|
|
mechanical switches and transistors. This avoids the need to create smoothing circuitry
|
|
for each sensor. You may need to change the parameters through trial and error for your specific sensors.
|
|
|
|
To have this sketch monitor one or more Arduino pins for sensor triggers, first define/edit/delete
|
|
sensor definitions using the following variation of the "S" command:
|
|
|
|
<S ID PIN PULLUP>: creates a new sensor ID, with specified PIN and PULLUP
|
|
if sensor ID already exists, it is updated with specificed PIN and PULLUP
|
|
returns: <O> if successful and <X> if unsuccessful (e.g. out of memory)
|
|
|
|
<S ID>: deletes definition of sensor ID
|
|
returns: <O> if successful and <X> if unsuccessful (e.g. ID does not exist)
|
|
|
|
<S>: lists all defined sensors
|
|
returns: <Q ID PIN PULLUP> for each defined sensor or <X> if no sensors defined
|
|
|
|
where
|
|
|
|
ID: the numeric ID (0-32767) of the sensor
|
|
PIN: the arduino pin number the sensor is connected to
|
|
PULLUP: 1=use internal pull-up resistor for PIN, 0=don't use internal pull-up resistor for PIN
|
|
|
|
Once all sensors have been properly defined, use the <E> command to store their definitions to EEPROM.
|
|
If you later make edits/additions/deletions to the sensor definitions, you must invoke the <E> command if you want those
|
|
new definitions updated in the EEPROM. You can also clear everything stored in the EEPROM by invoking the <e> command.
|
|
|
|
All sensors defined as per above are repeatedly and sequentially checked within the main loop of this sketch.
|
|
If a Sensor Pin is found to have transitioned from one state to another, one of the following serial messages are generated:
|
|
|
|
<Q ID> - for transition of Sensor ID from HIGH state to LOW state (i.e. the sensor is triggered)
|
|
<q ID> - for transition of Sensor ID from LOW state to HIGH state (i.e. the sensor is no longer triggered)
|
|
|
|
Depending on whether the physical sensor is acting as an "event-trigger" or a "detection-sensor," you may
|
|
decide to ignore the <q ID> return and only react to <Q ID> triggers.
|
|
|
|
**********************************************************************/
|
|
|
|
#include "StringFormatter.h"
|
|
#include "Sensors.h"
|
|
#include "EEStore.h"
|
|
#include "IODevice.h"
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// checks a number of defined sensors per entry and prints _changed_ sensor state
|
|
// to stream unless stream is NULL in which case only internal
|
|
// state is updated. Then advances to next sensor which will
|
|
// be checked at next invocation. Each cycle of reading all sensors will
|
|
// be initiated no more frequently than the time set by 'cycleInterval' microseconds.
|
|
//
|
|
// The list of sensors is divided such that the first part of the list
|
|
// contains sensors that support change notification via callback, and the second
|
|
// part of the list contains sensors that require cyclic polling. The start of the
|
|
// second part of the list is determined from by the 'firstPollSensor' pointer.
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
void Sensor::checkAll(Print *stream){
|
|
uint16_t sensorCount = 0;
|
|
|
|
#ifdef USE_NOTIFY
|
|
// Register the event handler ONCE!
|
|
if (!inputChangeCallbackRegistered)
|
|
IONotifyCallback::add(inputChangeCallback);
|
|
inputChangeCallbackRegistered = true;
|
|
#endif
|
|
|
|
if (firstSensor == NULL) return; // No sensors to be scanned
|
|
if (readingSensor == NULL) {
|
|
// Not currently scanning sensor list
|
|
unsigned long thisTime = micros();
|
|
if (thisTime - lastReadCycle >= cycleInterval) {
|
|
// Required time elapsed since last read cycle started,
|
|
// so initiate new scan through the sensor list
|
|
readingSensor = firstSensor;
|
|
#ifdef USE_NOTIFY
|
|
if (firstSensor == firstPollSensor)
|
|
pollSignalPhase = true;
|
|
else
|
|
pollSignalPhase = false;
|
|
#endif
|
|
lastReadCycle = thisTime;
|
|
}
|
|
}
|
|
|
|
// Loop until either end of list is encountered or we pause for some reason
|
|
bool pause = false;
|
|
while (readingSensor != NULL && !pause) {
|
|
|
|
#ifdef USE_NOTIFY
|
|
// Check if we have reached the start of the polled portion of the sensor list.
|
|
if (readingSensor == firstPollSensor)
|
|
pollSignalPhase = true;
|
|
#endif
|
|
|
|
// Where the sensor is attached to a pin, read pin status. For sources such as LCN,
|
|
// which don't have an input pin to read, the LCN class calls setState() to update inputState when
|
|
// a message is received. The IODevice::read() call returns 1 for active pins (0v) and 0 for inactive (5v).
|
|
// Also, on HAL drivers that support change notifications, the driver calls the notification callback
|
|
// routine when an input signal change is detected, and this updates the inputState directly,
|
|
// so these inputs don't need to be polled here.
|
|
VPIN pin = readingSensor->data.pin;
|
|
#ifdef USE_NOTIFY
|
|
if (pollSignalPhase)
|
|
#endif
|
|
if (pin!=VPIN_NONE) readingSensor->inputState = IODevice::read(pin);
|
|
|
|
// Check if changed since last time, and process changes.
|
|
if (readingSensor->inputState == readingSensor->active) {
|
|
// no change
|
|
readingSensor->latchDelay = minReadCount; // Reset counter
|
|
} else if (readingSensor->latchDelay > 0) {
|
|
// change detected, but first decrement delay
|
|
readingSensor->latchDelay--;
|
|
} else {
|
|
// change validated, act on it.
|
|
readingSensor->active = readingSensor->inputState;
|
|
readingSensor->latchDelay = minReadCount; // Reset counter
|
|
|
|
if (stream != NULL) {
|
|
StringFormatter::send(stream, F("<%c %d>\n"), readingSensor->active ? 'Q' : 'q', readingSensor->data.snum);
|
|
pause = true; // Don't check any more sensors on this entry
|
|
}
|
|
}
|
|
|
|
// Move to next sensor in list.
|
|
readingSensor = readingSensor->nextSensor;
|
|
|
|
// Currently process max of 16 sensors per entry for polled sensors, and
|
|
// 16 per entry for sensors notified by callback.
|
|
// Performance measurements taken during development indicate that, with 64 sensors configured
|
|
// on 8x 8-pin PCF8574 GPIO expanders, all inputs can be read within 1.4ms (400Mhz I2C bus speed), and a
|
|
// full cycle of scanning 64 sensors for changes takes between 1.9 and 3.2 milliseconds.
|
|
sensorCount++;
|
|
#ifdef USE_NOTIFY
|
|
if (pollSignalPhase) {
|
|
#endif
|
|
if (sensorCount >= 16) pause = true;
|
|
#ifdef USE_NOTIFY
|
|
} else
|
|
{
|
|
if (sensorCount >= 16) pause = true;
|
|
}
|
|
#endif
|
|
}
|
|
|
|
} // Sensor::checkAll
|
|
|
|
|
|
#ifdef USE_NOTIFY
|
|
// Callback from HAL (IODevice class) when a digital input change is recognised.
|
|
// Updates the inputState field, which is subsequently scanned for changes in the checkAll
|
|
// method. Ideally the <Q>/<q> message should be sent from here, instead of waiting for
|
|
// the checkAll method, but the output stream is not available at this point.
|
|
void Sensor::inputChangeCallback(VPIN vpin, int state) {
|
|
Sensor *tt;
|
|
// This bit is not ideal since it has, potentially, to look through the entire list of
|
|
// sensors to find the one that has changed. Ideally this should be improved somehow.
|
|
for (tt=firstSensor; tt!=NULL ; tt=tt->nextSensor) {
|
|
if (tt->data.pin == vpin) break;
|
|
}
|
|
if (tt != NULL) { // Sensor found
|
|
tt->inputState = (state != 0);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// prints all sensor states to stream
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
void Sensor::printAll(Print *stream){
|
|
|
|
if (stream != NULL) {
|
|
for(Sensor * tt=firstSensor;tt!=NULL;tt=tt->nextSensor){
|
|
StringFormatter::send(stream, F("<%c %d>\n"), tt->active ? 'Q' : 'q', tt->data.snum);
|
|
}
|
|
} // loop over all sensors
|
|
} // Sensor::printAll
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// Static Function to create/find Sensor object.
|
|
|
|
Sensor *Sensor::create(int snum, VPIN pin, int pullUp){
|
|
Sensor *tt;
|
|
|
|
if (pin > VPIN_MAX && pin != VPIN_NONE) return NULL;
|
|
|
|
remove(snum); // Unlink and free any existing sensor with the same id, before creating the new one.
|
|
|
|
tt = (Sensor *)calloc(1,sizeof(Sensor));
|
|
if (!tt) return tt; // memory allocation failure
|
|
|
|
#ifdef USE_NOTIFY
|
|
if (pin == VPIN_NONE || IODevice::hasCallback(pin)) {
|
|
// Callback available, or no pin to read, so link sensor on to the start of the list
|
|
tt->nextSensor = firstSensor;
|
|
firstSensor = tt;
|
|
if (lastSensor == NULL) lastSensor = tt; // This is only item in list.
|
|
} else {
|
|
// No callback, so add to end of list so it's polled.
|
|
if (lastSensor != NULL) lastSensor->nextSensor = tt;
|
|
lastSensor = tt;
|
|
if (!firstSensor) firstSensor = tt;
|
|
if (!firstPollSensor) firstPollSensor = tt;
|
|
}
|
|
#else
|
|
tt->nextSensor = firstSensor;
|
|
firstSensor = tt;
|
|
#endif
|
|
|
|
tt->data.snum = snum;
|
|
tt->data.pin = pin;
|
|
tt->data.pullUp = pullUp;
|
|
tt->active = 0;
|
|
tt->inputState = 0;
|
|
tt->latchDelay = minReadCount;
|
|
|
|
int params[] = {pullUp};
|
|
if (pin != VPIN_NONE)
|
|
IODevice::configure(pin, IODevice::CONFIGURE_INPUT, 1, params);
|
|
// Generally, internal pull-up resistors are not, on their own, sufficient
|
|
// for external infrared sensors --- each sensor must have its own 1K external pull-up resistor
|
|
|
|
return tt;
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// Object method to directly change the input state, for sensors such as LCN which are updated
|
|
// by means other than by polling an input.
|
|
|
|
void Sensor::setState(int value) {
|
|
// Trigger sensor change to be reported on next checkAll loop.
|
|
inputState = (value != 0);
|
|
latchDelay = 0; // Don't wait for anti-jitter logic
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
Sensor* Sensor::get(int n){
|
|
Sensor *tt;
|
|
for(tt=firstSensor;tt!=NULL && tt->data.snum!=n;tt=tt->nextSensor);
|
|
return tt ;
|
|
}
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
bool Sensor::remove(int n){
|
|
Sensor *tt,*pp=NULL;
|
|
|
|
for(tt=firstSensor;tt!=NULL && tt->data.snum!=n;pp=tt,tt=tt->nextSensor);
|
|
|
|
if (tt==NULL) return false;
|
|
|
|
// Unlink the sensor from the list
|
|
if(tt==firstSensor)
|
|
firstSensor=tt->nextSensor;
|
|
else
|
|
pp->nextSensor=tt->nextSensor;
|
|
#ifdef USE_NOTIFY
|
|
if (tt==lastSensor)
|
|
lastSensor = pp;
|
|
if (tt==firstPollSensor)
|
|
firstPollSensor = tt->nextSensor;
|
|
#endif
|
|
|
|
// Check if the sensor being deleted is the next one to be read. If so,
|
|
// make the following one the next one to be read.
|
|
if (readingSensor==tt) readingSensor=tt->nextSensor;
|
|
|
|
free(tt);
|
|
|
|
return true;
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
void Sensor::load(){
|
|
struct SensorData data;
|
|
Sensor *tt;
|
|
|
|
for(uint16_t i=0;i<EEStore::eeStore->data.nSensors;i++){
|
|
EEPROM.get(EEStore::pointer(),data);
|
|
tt=create(data.snum, data.pin, data.pullUp);
|
|
EEStore::advance(sizeof(tt->data));
|
|
}
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
void Sensor::store(){
|
|
Sensor *tt;
|
|
|
|
tt=firstSensor;
|
|
EEStore::eeStore->data.nSensors=0;
|
|
|
|
while(tt!=NULL){
|
|
EEPROM.put(EEStore::pointer(),tt->data);
|
|
EEStore::advance(sizeof(tt->data));
|
|
tt=tt->nextSensor;
|
|
EEStore::eeStore->data.nSensors++;
|
|
}
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
Sensor *Sensor::firstSensor=NULL;
|
|
Sensor *Sensor::readingSensor=NULL;
|
|
unsigned long Sensor::lastReadCycle=0;
|
|
|
|
#ifdef USE_NOTIFY
|
|
Sensor *Sensor::firstPollSensor = NULL;
|
|
Sensor *Sensor::lastSensor = NULL;
|
|
bool Sensor::pollSignalPhase = false;
|
|
bool Sensor::inputChangeCallbackRegistered = false;
|
|
#endif |