mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-23 16:16:13 +01:00
Compare commits
No commits in common. "274affce45d1c0d5e5527fdd524f607ffa058af8" and "3fa2edb0dac4cbae560af447cc0982e481f6d67c" have entirely different histories.
274affce45
...
3fa2edb0da
|
@ -1 +1 @@
|
||||||
#define GITHUB_SHA "devel-202402241957Z"
|
#define GITHUB_SHA "devel-202402201404Z"
|
||||||
|
|
|
@ -83,7 +83,6 @@ void EXTurntable::_loop(unsigned long currentMicros) {
|
||||||
// Read returns status as obtained in our loop.
|
// Read returns status as obtained in our loop.
|
||||||
// Return false if our status value is invalid.
|
// Return false if our status value is invalid.
|
||||||
int EXTurntable::_read(VPIN vpin) {
|
int EXTurntable::_read(VPIN vpin) {
|
||||||
(void)vpin; // surpress warning
|
|
||||||
if (_deviceState == DEVSTATE_FAILED) return 0;
|
if (_deviceState == DEVSTATE_FAILED) return 0;
|
||||||
if (_stepperStatus > 1) {
|
if (_stepperStatus > 1) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -128,8 +127,6 @@ void EXTurntable::_writeAnalogue(VPIN vpin, int value, uint8_t activity, uint16_
|
||||||
vpin, value, activity, duration);
|
vpin, value, activity, duration);
|
||||||
DIAG(F("I2CManager write I2C Address:%d stepsMSB:%d stepsLSB:%d activity:%d"),
|
DIAG(F("I2CManager write I2C Address:%d stepsMSB:%d stepsLSB:%d activity:%d"),
|
||||||
_I2CAddress.toString(), stepsMSB, stepsLSB, activity);
|
_I2CAddress.toString(), stepsMSB, stepsLSB, activity);
|
||||||
#else
|
|
||||||
(void)duration;
|
|
||||||
#endif
|
#endif
|
||||||
if (activity < 4) _stepperStatus = 1; // Tell the device driver Turntable-EX is busy
|
if (activity < 4) _stepperStatus = 1; // Tell the device driver Turntable-EX is busy
|
||||||
_previousStatus = _stepperStatus;
|
_previousStatus = _stepperStatus;
|
||||||
|
|
|
@ -219,7 +219,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
|
||||||
if (mode & TRACK_MODE_BOOST) {
|
if (mode & TRACK_MODE_BOOST) {
|
||||||
//DIAG(F("Track=%c mode boost pin %d"),trackToSet+'A', p.pin);
|
//DIAG(F("Track=%c mode boost pin %d"),trackToSet+'A', p.pin);
|
||||||
pinMode(BOOSTER_INPUT, INPUT);
|
pinMode(BOOSTER_INPUT, INPUT);
|
||||||
gpio_matrix_in(BOOSTER_INPUT, SIG_IN_FUNC228_IDX, false); //pads 224 to 228 available as loopback
|
gpio_matrix_in(26, SIG_IN_FUNC228_IDX, false); //pads 224 to 228 available as loopback
|
||||||
gpio_matrix_out(p.pin, SIG_IN_FUNC228_IDX, false, false);
|
gpio_matrix_out(p.pin, SIG_IN_FUNC228_IDX, false, false);
|
||||||
if (p.invpin != UNUSED_PIN) {
|
if (p.invpin != UNUSED_PIN) {
|
||||||
gpio_matrix_out(p.invpin, SIG_IN_FUNC228_IDX, true /*inverted*/, false);
|
gpio_matrix_out(p.invpin, SIG_IN_FUNC228_IDX, true /*inverted*/, false);
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.2.37"
|
#define VERSION "5.2.36"
|
||||||
// 5.2.37 - Bugfix ESP32: Use BOOSTER_INPUT define
|
|
||||||
// 5.2.36 - Variable frequency for DC mode
|
// 5.2.36 - Variable frequency for DC mode
|
||||||
// 5.2.35 - Bugfix: Make DCC Extended Accessories follow RCN-213
|
// 5.2.35 - Bugfix: Make DCC Extended Accessories follow RCN-213
|
||||||
// 5.2.34 - <A address aspect> Command fopr DCC Extended Accessories
|
// 5.2.34 - <A address aspect> Command fopr DCC Extended Accessories
|
||||||
|
|
Loading…
Reference in New Issue
Block a user