Skip to content

Commit f9bfb6f

Browse files
committed
Merge branch 'devel' of https://github.com/DCC-EX/CommandStation-EX into devel
2 parents 59c2998 + 9ac50d6 commit f9bfb6f

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

EXRAIL2.cpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
295295
VPIN id=operand;
296296
int addr=getOperand(progCounter,1);
297297
byte subAddr=getOperand(progCounter,2);
298-
setTurnoutHiddenState(DCCTurnout::create(id,addr,subAddr));
298+
Turnout *t = DCCTurnout::create(id,addr,subAddr);
299+
if (t) setTurnoutHiddenState(t);
299300
break;
300301
}
301302

@@ -305,24 +306,28 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
305306
int activeAngle=getOperand(progCounter,2);
306307
int inactiveAngle=getOperand(progCounter,3);
307308
int profile=getOperand(progCounter,4);
308-
setTurnoutHiddenState(ServoTurnout::create(id,pin,activeAngle,inactiveAngle,profile));
309+
Turnout *t = ServoTurnout::create(id,pin,activeAngle,inactiveAngle,profile);
310+
if (t) setTurnoutHiddenState(t);
309311
break;
310312
}
311313

312314
case OPCODE_PINTURNOUT: {
313315
VPIN id=operand;
314316
VPIN pin=getOperand(progCounter,1);
315-
setTurnoutHiddenState(VpinTurnout::create(id,pin));
317+
Turnout *t = VpinTurnout::create(id,pin);
318+
if (t) setTurnoutHiddenState(t);
316319
break;
317320
}
318321

319322
#ifndef IO_NO_HAL
320323
case OPCODE_DCCTURNTABLE: {
321324
VPIN id=operand;
322325
int home=getOperand(progCounter,1);
323-
setTurntableHiddenState(DCCTurntable::create(id));
324-
Turntable *tto=Turntable::get(id);
325-
tto->addPosition(0,0,home);
326+
Turntable *tto = DCCTurntable::create(id);
327+
if (tto) {
328+
setTurntableHiddenState(tto);
329+
tto->addPosition(0,0,home);
330+
}
326331
break;
327332
}
328333

GITHUB_SHA.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define GITHUB_SHA "devel-202511232011Z"
1+
#define GITHUB_SHA "devel-202511232022Z"

version.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
#include "StringFormatter.h"
55

6-
#define VERSION "5.5.50"
6+
#define VERSION "5.5.51"
7+
// 5.5.51 - Bugfix: EXRAIL failed TURNTABLE create commands (I2C off) can crash CS
8+
// - Bugfix: EXRAIL be extra careful not to deref nullptr
79
// 5.5.50 - Replace the SC power status with something better
810
// - EXRAIL RANDOM_CALL, RANDOM_FOLLOW
911
// 5.5.49 - EXRAIL </> displays wait_while_red state

0 commit comments

Comments
 (0)