mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2025-04-23 05:21:20 +02:00
Compare commits
No commits in common. "1449dc7bac4d375c630a5bd51515d0008b3913df" and "742b100f65e3f7182e3e52917e84d4ef64e0cb22" have entirely different histories.
1449dc7bac
...
742b100f65
@ -1218,7 +1218,7 @@ int16_t RMFT2::getSignalSlot(int16_t id) {
|
|||||||
if (rag==SIGNAL_AMBER && (amberpin==0)) rag=SIMAMBER; // special case this func only
|
if (rag==SIGNAL_AMBER && (amberpin==0)) rag=SIMAMBER; // special case this func only
|
||||||
|
|
||||||
// Manage invert (HIGH on) pins
|
// Manage invert (HIGH on) pins
|
||||||
bool aHigh=sighandle & ACTIVE_HIGH_SIGNAL_FLAG;
|
bool aHigh=sigid & ACTIVE_HIGH_SIGNAL_FLAG;
|
||||||
|
|
||||||
// set the three pins
|
// set the three pins
|
||||||
if (redpin) {
|
if (redpin) {
|
||||||
|
@ -187,7 +187,6 @@ class LookList {
|
|||||||
static const FSH * getTurntablePositionDescription(int16_t turntableId, uint8_t positionId);
|
static const FSH * getTurntablePositionDescription(int16_t turntableId, uint8_t positionId);
|
||||||
static void startNonRecursiveTask(const FSH* reason, int16_t id,int pc);
|
static void startNonRecursiveTask(const FSH* reason, int16_t id,int pc);
|
||||||
static bool readSensor(uint16_t sensorId);
|
static bool readSensor(uint16_t sensorId);
|
||||||
static bool isSignal(int16_t id,char rag);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static void ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]);
|
static void ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]);
|
||||||
@ -197,6 +196,7 @@ private:
|
|||||||
static bool getFlag(VPIN id,byte mask);
|
static bool getFlag(VPIN id,byte mask);
|
||||||
static int16_t progtrackLocoId;
|
static int16_t progtrackLocoId;
|
||||||
static void doSignal(int16_t id,char rag);
|
static void doSignal(int16_t id,char rag);
|
||||||
|
static bool isSignal(int16_t id,char rag);
|
||||||
static int16_t getSignalSlot(int16_t id);
|
static int16_t getSignalSlot(int16_t id);
|
||||||
static void setTurnoutHiddenState(Turnout * t);
|
static void setTurnoutHiddenState(Turnout * t);
|
||||||
#ifndef IO_NO_HAL
|
#ifndef IO_NO_HAL
|
||||||
|
@ -51,7 +51,6 @@ static void create(I2CAddress i2cAddress) {
|
|||||||
// Start by assuming we will find the clock
|
// Start by assuming we will find the clock
|
||||||
// Check if specified I2C address is responding (blocking operation)
|
// Check if specified I2C address is responding (blocking operation)
|
||||||
// Returns I2C_STATUS_OK (0) if OK, or error code.
|
// Returns I2C_STATUS_OK (0) if OK, or error code.
|
||||||
I2CManager.begin();
|
|
||||||
uint8_t _checkforclock = I2CManager.checkAddress(i2cAddress);
|
uint8_t _checkforclock = I2CManager.checkAddress(i2cAddress);
|
||||||
DIAG(F("Clock check result - %d"), _checkforclock);
|
DIAG(F("Clock check result - %d"), _checkforclock);
|
||||||
// XXXX change thistosave2 bytes
|
// XXXX change thistosave2 bytes
|
||||||
|
@ -3,12 +3,7 @@
|
|||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.2.55"
|
#define VERSION "5.2.51"
|
||||||
// 5.2.55 - Move EXRAIL isSignal() to public to allow use in STEALTH call
|
|
||||||
// 5.2.54 - Bugfix for EXRAIL signal handling for active high
|
|
||||||
// 5.2.53 - Bugfix for EX-Fastclock, call I2CManager.begin() before checking I2C address
|
|
||||||
// 5.2.52 - Bugfix for ADCee() to handle ADC2 and ADC3 channel inputs on F446ZE and others
|
|
||||||
// - Add support for ports G and H on STM32 for ADCee() and MotorDriver pins/shadow regs
|
|
||||||
// 5.2.51 - Bugfix for SIGNAL: Distinguish between sighandle and sigid
|
// 5.2.51 - Bugfix for SIGNAL: Distinguish between sighandle and sigid
|
||||||
// 5.2.50 - EXRAIL ONBUTTON/ONSENSOR observe LATCH
|
// 5.2.50 - EXRAIL ONBUTTON/ONSENSOR observe LATCH
|
||||||
// 5.2.49 - EXRAIL additions:
|
// 5.2.49 - EXRAIL additions:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user