1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-30 03:26:13 +01:00

Refactor usage of delay() into an Helper IO class that schedules pin bouncing back

This commit is contained in:
Sergei Kotlyachkov 2023-11-09 21:16:17 -05:00
parent faf9f76c42
commit a30311caed
2 changed files with 131 additions and 3 deletions

115
IO_ScheduledPin.h Normal file
View File

@ -0,0 +1,115 @@
/*
* © 2023, Sergei Kotlyachkov. All rights reserved.
*
* This file is part of DCC++EX 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/>.
*/
#ifndef IO_SCHEDULED_PIN_H
#define IO_SCHEDULED_PIN_H
#include "IODevice.h"
#include <Arduino.h>
#include "defines.h"
/**
* Bounces back single Arduino Pin to specified state after set period of time.
*
* It will establish itself as owner of the pin over ArduinoPins class that typically responds to it and
* activates itself during loop() phase. It restores scheduled state and does not try again until
* another write()
*
* Example usage:
* Create: ScheduledPin::create(5, LOW, 20000);
*
* Then, when neeeded, just call:
* IODevice::write(5, HIGH); // this will call fastWriteDigital(5, HIGH)
*
* In 20 milliseconds, it will also call fastWriteDigital(5, LOW)
*
* In edge case where write() is called twice before responding in the loop,
* the schedule will restart and double the bounce back time.
*/
class ScheduledPin : public IODevice {
private:
int _scheduledValue;
uint32_t _durationMicros;
public:
// Static function to handle create calls.
static void create(VPIN pin, int scheduledValue, uint32_t durationMicros) {
new ScheduledPin(pin, scheduledValue, durationMicros);
}
protected:
// Constructor.
ScheduledPin(VPIN pin, int scheduledValue, uint32_t durationMicros) : IODevice(pin, 1) {
_scheduledValue = scheduledValue;
_durationMicros = durationMicros;
// Typically returned device will be ArduinoPins
IODevice* controlledDevice = IODevice::findDevice(pin);
if (controlledDevice != NULL) {
addDevice(this, controlledDevice);
}
else {
DIAG(F("ScheduledPin Controlled device not found for pin:%d"), pin);
_deviceState = DEVSTATE_FAILED;
}
}
// Device-specific initialisation
void _begin() override {
#ifdef DIAG_IO
_display();
#endif
pinMode(_firstVpin, OUTPUT);
ArduinoPins::fastWriteDigital(_firstVpin, _scheduledValue);
}
void _write(VPIN vpin, int value) override {
if (_deviceState == DEVSTATE_FAILED) return;
if (vpin != _firstVpin) {
#ifdef DIAG_IO
DIAG(F("ScheduledPin Error VPIN:%u not equal to %u"), vpin, _firstVpin);
#endif
return;
}
#ifdef DIAG_IO
DIAG(F("ScheduledPin Write VPIN:%u Value:%d"), vpin, value);
#endif
unsigned long currentMicros = micros();
delayUntil(currentMicros + _durationMicros);
ArduinoPins::fastWriteDigital(_firstVpin, value);
}
void _loop(unsigned long currentMicros) {
if (_deviceState == DEVSTATE_FAILED) return;
#ifdef DIAG_IO
DIAG(F("ScheduledPin Write VPIN:%u Value:%d"), _firstVpin, _scheduledValue);
#endif
ArduinoPins::fastWriteDigital(_firstVpin, _scheduledValue);
delayUntil(currentMicros + 0x7fffffff); // Largest time in the future! Effectively disable _loop calls.
}
// Display information about the device, and perhaps its current condition (e.g. active, disabled etc).
void _display() {
DIAG(F("ScheduledPin Configured:%u value=%d duration=%ld"), (int)_firstVpin,
(int)_firstVpin, _scheduledValue, _durationMicros);
}
};
#endif // IO_SCHEDULED_PIN_H

View File

@ -36,6 +36,10 @@
#include "LCN.h" #include "LCN.h"
#ifdef EESTOREDEBUG #ifdef EESTOREDEBUG
#include "DIAG.h" #include "DIAG.h"
#endif
#ifndef IO_NO_HAL
#include "IO_ScheduledPin.h"
#endif #endif
/* /*
@ -493,6 +497,14 @@
_hbridgeTurnoutData.pin1 = pin1; _hbridgeTurnoutData.pin1 = pin1;
_hbridgeTurnoutData.pin2 = pin2; _hbridgeTurnoutData.pin2 = pin2;
_hbridgeTurnoutData.millisDelay = millisDelay; _hbridgeTurnoutData.millisDelay = millisDelay;
#ifndef IO_NO_HAL
// HARD LIMIT to maximum 0.5 second to avoid burning the coil
// Also note 1000x multiplier because ScheduledPin works with microSeconds.
ScheduledPin::create(pin1, LOW, 1000*min(millisDelay, 500));
ScheduledPin::create(pin2, LOW, 1000*min(millisDelay, 500));
#else
DIAG(F("H-Brdige Turnout %d will be disabled because HAL is off"), id);
#endif
} }
// Create function // Create function
@ -545,10 +557,11 @@
void HBridgeTurnout::turnUpDown(VPIN pin) { void HBridgeTurnout::turnUpDown(VPIN pin) {
// HBridge turnouts require very small, prescribed time to keep pin1 or pin2 in HIGH state. // HBridge turnouts require very small, prescribed time to keep pin1 or pin2 in HIGH state.
// Otherwise internal coil of the turnout will burn. // Otherwise internal coil of the turnout will burn.
// If HAL is disabled (and therefore SchedulePin class), we can not turn this on,
// otherwise coil will burn and device will be lost.
#ifndef IO_NO_HAL
IODevice::write(pin, HIGH); IODevice::write(pin, HIGH);
// HARD LIMIT to maximum 0.5 second to avoid burning the coil #endif
delay(min(_hbridgeTurnoutData.millisDelay, 500));
IODevice::write(pin, LOW);
} }
bool HBridgeTurnout::setClosedInternal(bool close) { bool HBridgeTurnout::setClosedInternal(bool close) {