1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-27 01:56:14 +01:00

Merge branch 'ServoSignal' into TrackManager

This commit is contained in:
Asbelos 2022-04-29 20:53:48 +01:00
commit 228553013b
2 changed files with 2 additions and 2 deletions

View File

@ -450,7 +450,7 @@ RMFT2::RMFT2(int progCtr) {
invert=false; invert=false;
timeoutFlag=false; timeoutFlag=false;
stackDepth=0; stackDepth=0;
onTurnoutId=0; // Not handling an ONTHROW/ONCLOSE onTurnoutId=-1; // Not handling an ONTHROW/ONCLOSE
// chain into ring of RMFTs // chain into ring of RMFTs
if (loopTask==NULL) { if (loopTask==NULL) {

View File

@ -155,7 +155,7 @@ void PCA9685::_writeAnalogue(VPIN vpin, int value, uint8_t profile, uint16_t dur
// Servo pin not configured, so configure now using defaults // Servo pin not configured, so configure now using defaults
s = _servoData[pin] = (struct ServoData *) calloc(sizeof(struct ServoData), 1); s = _servoData[pin] = (struct ServoData *) calloc(sizeof(struct ServoData), 1);
if (s == NULL) return; // Check for memory allocation failure if (s == NULL) return; // Check for memory allocation failure
s->activePosition = 0; s->activePosition = 4095;
s->inactivePosition = 0; s->inactivePosition = 0;
s->currentPosition = value; s->currentPosition = value;
s->profile = Instant; // Use instant profile (but not this time) s->profile = Instant; // Use instant profile (but not this time)