Skip to content
Permalink
Browse files

Parts of PR 6177 from silverailscolo/eb-matrixmast-interval

  • Loading branch information...
bobjacobsen committed Aug 20, 2019
1 parent 51deba3 commit 0f8bdc48ad5a5e05d8e33e90bd955e6ed957ad36
Showing with 90 additions and 107 deletions.
  1. +2 −3 java/src/jmri/implementation/AbstractSensor.java
  2. +9 −9 java/src/jmri/jmrit/beantable/SectionTransitTableBundle.properties
  3. +9 −9 java/src/jmri/jmrit/beantable/SectionTransitTableBundle_ca.properties
  4. +9 −9 java/src/jmri/jmrit/beantable/SectionTransitTableBundle_da.properties
  5. +3 −3 java/src/jmri/jmrit/beantable/SectionTransitTableBundle_de.properties
  6. +9 −9 java/src/jmri/jmrit/beantable/SectionTransitTableBundle_fr.properties
  7. +9 −9 java/src/jmri/jmrit/beantable/SectionTransitTableBundle_it.properties
  8. +1 −1 java/src/jmri/jmrit/beantable/SectionTransitTableBundle_nl.properties
  9. +1 −1 java/src/jmri/jmrit/dispatcher/DispatcherBundle_da.properties
  10. +0 −1 java/src/jmri/jmrix/AbstractMRTrafficController.java
  11. +1 −1 java/src/jmri/jmrix/acela/AcelaTurnoutManager.java
  12. +2 −1 java/src/jmri/jmrix/dccpp/DCCppTurnoutManager.java
  13. +3 −7 java/src/jmri/jmrix/powerline/SerialTrafficController.java
  14. +1 −0 java/src/jmri/jmrix/srcp/parser/SRCPClientVisitor.java
  15. +1 −1 java/src/jmri/jmrix/srcp/swing/packetgen/PacketGenFrame.java
  16. +2 −1 java/src/jmri/jmrix/zimo/Mx1TrafficController.java
  17. +3 −4 java/test/jmri/jmrix/ieee802154/serialdriver/SerialSystemConnectionMemoTest.java
  18. +1 −4 java/test/jmri/jmrix/ieee802154/xbee/XBeeTurnoutManagerTest.java
  19. +1 −1 java/test/jmri/jmrix/loconet/LocoNetSystemConnectionMemoTest.java
  20. +0 −1 java/test/jmri/jmrix/loconet/locomon/LocoMonPaneTest.java
  21. +17 −17 java/test/jmri/jmrix/nce/NceTurnoutManagerTest.java
  22. +3 −9 java/test/jmri/jmrix/powerline/SerialTrafficControlScaffold.java
  23. +1 −3 java/test/jmri/jmrix/qsi/QsiTrafficControlScaffold.java
  24. +1 −1 java/test/jmri/jmrix/qsi/QsiTrafficControllerTest.java
  25. +1 −2 xml/schema/types/signalmasts-2-9-6.xsd
@@ -7,7 +7,7 @@
import org.slf4j.LoggerFactory;

/**
* Abstract class providing the basic logic of the Sensor interface
* Abstract class providing the basic logic of the Sensor interface.
*
* @author Bob Jacobsen Copyright (C) 2001, 2009
*/
@@ -92,7 +92,7 @@ public void setUseDefaultTimerSettings(boolean boo) {
public boolean getUseDefaultTimerSettings() {
return useDefaultTimerSettings;
}

protected Thread thr;
protected Runnable r;

@@ -306,5 +306,4 @@ public PullResistance getPullResistance(){
return PullResistance.PULL_OFF;
}


}
@@ -106,30 +106,30 @@ OnEntry = On Section Entry
HintDelayData = Enter time in milliseconds to wait before action is initiated (0 = no delay)
OnExit = On Section Exit
OnEntryFull = On Entry to this Section
OnEntryDelayedFull = "{0}" ms. after entering this Section
OnEntryDelayedFull = "{0}" mSec after entering this Section
OnExitFull = On Exit from this Section
OnExitDelayedFull = "{0}" ms. after exiting this Section
OnExitDelayedFull = "{0}" mSec after exiting this Section
OnBlockEntry = On Block Entry
HintBlockEntry = Select a Block in this Section.
OnBlockExit = On Block Exit
OnBlockEntryFull = On Entry to Block "{0}"
OnBlockEntryDelayedFull = "{0}" ms. after entering Block "{1}"
OnBlockEntryDelayedFull = "{0}" mSec after entering Block "{1}"
OnBlockExitFull = On Exit from Block "{0}"
OnBlockExitDelayedFull = "{0}" ms. after exiting Block "{1}"
OnBlockExitDelayedFull = "{0}" mSec after exiting Block "{1}"
TrainStop = On Train Stop
TrainStopFull = When train stops moving
TrainStopDelayedFull = "{0}" ms. after train stops moving
TrainStopDelayedFull = "{0}" mSec after train stops moving
TrainStart = On Train Start
TrainStartFull = When train starts moving
TrainStartDelayedFull = "{0}" ms. after train starts moving
TrainStartDelayedFull = "{0}" mSec after train starts moving
OnSensorActive = On Sensor ACTIVE
HintSensorEntry = Select the Sensor to watch
HintSignalEntry = Select a Signal Mast or Head
OnSensorActiveFull = When Sensor "{0}" becomes ACTIVE
OnSensorActiveDelayedFull = "{0}" ms. after Sensor "{1}" becomes ACTIVE
OnSensorActiveDelayedFull = "{0}" mSec after Sensor "{1}" becomes ACTIVE
OnSensorInactive = On Sensor INACTIVE
OnSensorInactiveFull = When Sensor "{0}" becomes INACTIVE
OnSensorInactiveDelayedFull = "{0}" ms. after Sensor "{1}" becomes INACTIVE
OnSensorInactiveDelayedFull = "{0}" mSec after Sensor "{1}" becomes INACTIVE

Pause = Pause Train
PauseFull = Pause for "{0}" fast minutes
@@ -154,7 +154,7 @@ StopBell = Stop Bell
StopBellFull = Stop bell (if sound decoder)
SoundHorn = Sound Horn
HintSoundHornData1 = Enter length of time in milliseconds for single blast of horn
SoundHornFull = Sound horn for {0} ms.
SoundHornFull = Sound horn for {0} mSec
SoundHornPattern = Pattern Sound Horn
HintSoundHornPatternData1 = Enter length of short sound in milliseconds
HintSoundHornPatternData2 = Enter length of long sound in milliseconds
@@ -108,30 +108,30 @@ OnEntry = A l'Entrada d'una Secci\u00f3.
HintDelayData = (Opcional) Entra el temps en mil\u00b7lisegons a esperar abans d'executar l'acci\u00f3
OnExit = A la Sortida d'una Secci\u00f3
OnEntryFull = A l'entrada d'aquesta Secci\u00f3
OnEntryDelayedFull = "{0}" ms. despr\u00e9s d'entrar en aquesta Secci\u00f3
OnEntryDelayedFull = "{0}" ms despr\u00e9s d'entrar en aquesta Secci\u00f3
OnExitFull = A la sortida d'aquesta Secci\u00f3
OnExitDelayedFull = "{0}" ms. despr\u00e9s de sortir d'aquesta secci\u00f3
OnExitDelayedFull = "{0}" ms despr\u00e9s de sortir d'aquesta secci\u00f3
OnBlockEntry = En Entrar al Bloc
HintBlockEntry = Selecciona un Bloc d'aquesta Secci\u00f3.
OnBlockExit = En Sortir del Bloc
OnBlockEntryFull = A l'Entrar al Bloc "{0}"
OnBlockEntryDelayedFull = "{0}" ms. despr\u00e9s d'entrar al Bloc "{1}"
OnBlockEntryDelayedFull = "{0}" ms despr\u00e9s d'entrar al Bloc "{1}"
OnBlockExitFull = A la sortida del Bloc "{0}"
OnBlockExitDelayedFull = "{0}" ms. despr\u00e9s de sortir del Bloc "{1}"
OnBlockExitDelayedFull = "{0}" ms despr\u00e9s de sortir del Bloc "{1}"
TrainStop = A la parada del Tren
TrainStopFull = Quan el tren para de moure's
TrainStopDelayedFull = "{0}" ms. despr\u00e9s que el tren para de moure's
TrainStopDelayedFull = "{0}" ms despr\u00e9s que el tren para de moure's
TrainStart = A l'arrencada del tren
TrainStartFull = Quan el tren comen\u00e7a a moure's
TrainStartDelayedFull = "{0}" ms. despr\u00e9s que el tren comenci a moure's
TrainStartDelayedFull = "{0}" ms despr\u00e9s que el tren comenci a moure's
OnSensorActive = Quan el Sensor est\u00e0 ACTIVAT
HintSensorEntry = Entra el Nom de Sistema o Usuari del Sensor
HintSignalEntry=Entra el nom del M\u00e0stil de Senyals o Senyal
OnSensorActiveFull = Quan el Sensor "{0}" esdevingui ACTIU
OnSensorActiveDelayedFull = "{0}" ms. despr\u00e9s que el Sensor "{1}" esdevingui ACTIU
OnSensorActiveDelayedFull = "{0}" ms despr\u00e9s que el Sensor "{1}" esdevingui ACTIU
OnSensorInactive = Quan el Sensor est\u00e0 INACTIU
OnSensorInactiveFull = Quan el Sensor "{0}" esdevingui INACTIU
OnSensorInactiveDelayedFull = "{0}" ms. despr\u00e9s que el Sensor "{1}" esdevingui INACTIU
OnSensorInactiveDelayedFull = "{0}" ms despr\u00e9s que el Sensor "{1}" esdevingui INACTIU

Pause = Para el Tren
PauseFull = Para el tren durant"{0}" minuts accelerats
@@ -156,7 +156,7 @@ StopBell = Para la Campana
StopBellFull = Para la Campana (si hi ha decoder de so)
SoundHorn = So Xiulet
HintSoundHornData1 = Entra el temps en mil\u00b7lisegons per una pitada
SoundHornFull = So de Xoiulet durant {0} ms.
SoundHornFull = So de Xoiulet durant {0} ms
SoundHornPattern = Esquema del So del Xiulet
HintSoundHornPatternData1 = Entra temps del so curt en mil\u00b7llisegons
HintSoundHornPatternData2 = Entra temps del so llarg en mil\u00b7llisegons
@@ -100,30 +100,30 @@ OnEntry = On Section Entry
HintDelayData = Enter time in milliseconds to wait before action is initiated (0 = no delay)
OnExit = On Section Exit
OnEntryFull = On Entry to this Section
OnEntryDelayedFull = "{0}" ms. after entering this Section
OnEntryDelayedFull = "{0}" ms after entering this Section
OnExitFull = On Exit from this Section
OnExitDelayedFull = "{0}" ms. after exiting this Section
OnExitDelayedFull = "{0}" ms after exiting this Section
OnBlockEntry = On Block Entry
HintBlockEntry = Select a Block in this Section.
OnBlockExit = On Block Exit
OnBlockEntryFull = On Entry to Block "{0}"
OnBlockEntryDelayedFull = "{0}" ms. after entering Block "{1}"
OnBlockEntryDelayedFull = "{0}" ms after entering Block "{1}"
OnBlockExitFull = On Exit from Block "{0}"
OnBlockExitDelayedFull = "{0}" ms. after exiting Block "{1}"
OnBlockExitDelayedFull = "{0}" ms after exiting Block "{1}"
TrainStop = On Train Stop
TrainStopFull = When train stops moving
TrainStopDelayedFull = "{0}" ms. after train stops moving
TrainStopDelayedFull = "{0}" ms after train stops moving
TrainStart = On Train Start
TrainStartFull = When train starts moving
TrainStartDelayedFull = "{0}" ms. after train starts moving
TrainStartDelayedFull = "{0}" ms after train starts moving
OnSensorActive = On Sensor ACTIVE
HintSensorEntry = Select the Sensor to watch
HintSignalEntry = Select a Signal Mast or Head
OnSensorActiveFull = When Sensor "{0}" becomes ACTIVE
OnSensorActiveDelayedFull = "{0}" ms. after Sensor "{1}" becomes ACTIVE
OnSensorActiveDelayedFull = "{0}" ms after Sensor "{1}" becomes ACTIVE
OnSensorInactive = On Sensor INACTIVE
OnSensorInactiveFull = When Sensor "{0}" becomes INACTIVE
OnSensorInactiveDelayedFull = "{0}" ms. after Sensor "{1}" becomes INACTIVE
OnSensorInactiveDelayedFull = "{0}" ms after Sensor "{1}" becomes INACTIVE

Pause = Pause Train
PauseFull = Pause for "{0}" fast minutes
@@ -148,7 +148,7 @@ StopBell = Stop Bell
StopBellFull = Stop bell (if sound decoder)
SoundHorn = Sound Horn
HintSoundHornData1 = Enter length of time in milliseconds for single blast of horn
SoundHornFull = Sound horn for {0} ms.
SoundHornFull = Sound horn for {0} ms
SoundHornPattern = Pattern Sound Horn
HintSoundHornPatternData1 = Enter length of short sound in milliseconds
HintSoundHornPatternData2 = Enter length of long sound in milliseconds
@@ -81,9 +81,9 @@ OnEntry = Beim Eintritt in Sektion
HintDelayData = Gebe Verz\u00f6gerungszeit ein nach der die Aktivit\u00e4t gestartet werden soll (0 = keine Pause)
OnExit = Bei Verlassen von Sektion
OnEntryFull = Beim Eintritt in Sektion
OnEntryDelayedFull = "{0}" ms. nach Eintritt in diese Sektion
OnEntryDelayedFull = "{0}" ms nach Eintritt in diese Sektion
OnExitFull = Bei Verlassen von Sektion
OnExitDelayedFull = "{0}" ms. nach Verlassen dieser Sektion
OnExitDelayedFull = "{0}" ms nach Verlassen dieser Sektion
OnBlockEntry = Beim Eintritt in Block
HintBlockEntry = W\u00e4hle einen Block in dieser Sektion.
OnBlockExit = Bei Verlassen von Block
@@ -128,7 +128,7 @@ StopBell = Schalte Glocke aus
StopBellFull = Schalte Glocke aus (Sounddecoder vorausgesetzt)
SoundHorn = Bet\u00e4tige Horn
HintSoundHornData1 = Gebe Zeit in Millisekunden ein f\u00fcr einen einzelnen Hornstoss
SoundHornFull = Bet\u00e4tige Horn f\u00fcr {0} ms.
SoundHornFull = Bet\u00e4tige Horn f\u00fcr {0} ms
SoundHornPattern = Hornsignal
HintSoundHornPatternData1 = L\u00e4nge eines kurzen Hornstosses in Millisekunden
HintSoundHornPatternData2 = L\u00e4nge eines langen Hornstosses in Millisekunden
@@ -103,29 +103,29 @@ OnEntry = Sur Entr\u00e9e Section
HintDelayData = (Facultatif) Entrez le temps en millisecondes \u00e0 attendre avant que l'action soit lanc\u00e9e
OnExit = Sur Sortie Section
OnEntryFull =A l'entr\u00e9e de cette section
OnEntryDelayedFull = "{0}" ms. apr\u00e8s \u00eatre entr\u00e9 dans cette Section
OnEntryDelayedFull = "{0}" ms apr\u00e8s \u00eatre entr\u00e9 dans cette Section
OnExitFull =A la sortie de cette section
OnExitDelayedFull = "{0}" ms. apr\u00e8s la sortie de cette Section
OnExitDelayedFull = "{0}" ms apr\u00e8s la sortie de cette Section
OnBlockEntry = Sur le Canton d'entr\u00e9e
HintBlockEntry = s\u00e9lectionner un Canton dans cette Section.
OnBlockExit = Sur le Canton Sortie
OnBlockEntryFull = Sur Entr\u00e9e Canton "{0}"
OnBlockEntryDelayedFull = "{0}" ms. apr\u00e8s \u00eatre \u00eatre entr\u00e9 Canton "{1}"
OnBlockEntryDelayedFull = "{0}" ms apr\u00e8s \u00eatre \u00eatre entr\u00e9 Canton "{1}"
OnBlockExitFull = \u00e0 la Sortie du Canton "{0}"
OnBlockExitDelayedFull = "{0}" ms. apr\u00e8s la Sortie du Canton "{1}"
OnBlockExitDelayedFull = "{0}" ms apr\u00e8s la Sortie du Canton "{1}"
TrainStop = Sur arr\u00eat de train
TrainStopFull = Quand le train arr\u00eate de bouger
TrainStopDelayedFull = "{0}" ms. alors que le train s'immobilise
TrainStopDelayedFull = "{0}" ms alors que le train s'immobilise
TrainStart = D\u00e9part du Train
TrainStartFull = Lorsque le train se met en mouvement
TrainStartDelayedFull = "{0}" ms. alors que le train se met en mouvement
TrainStartDelayedFull = "{0}" ms alors que le train se met en mouvement
OnSensorActive = Sur Capteur ACTIF
HintSensorEntry = Entrer le nom syst\u00e8me ou nom utilisateur du Capteur
OnSensorActiveFull = lorsque le Capteur "{0}" devient ACTIF
OnSensorActiveDelayedFull = "{0}" ms. apr\u00e8s que le Capteur "{1}" soit devenu ACTIF
OnSensorActiveDelayedFull = "{0}" ms apr\u00e8s que le Capteur "{1}" soit devenu ACTIF
OnSensorInactive = sur le capteur INACTIF
OnSensorInactiveFull = lorsque le capteur "{0}" devient INACTIF
OnSensorInactiveDelayedFull = "{0}" ms. apr\u00e8s que le Capteur "{1}" soit devenu INACTIF
OnSensorInactiveDelayedFull = "{0}" ms apr\u00e8s que le Capteur "{1}" soit devenu INACTIF

Pause = Train en Pause
PauseFull = Pause pour "{0}" minutes rapides
@@ -150,7 +150,7 @@ StopBell = Arr\u00eat de Cloche
StopBellFull = Arr\u00eat Cloche (si d\u00e9codeur de son)
SoundHorn = Son Corne
HintSoundHornData1 = Entrez dur\u00e9e en millisecondes pour un seul coups de corne
SoundHornFull = Son corne pour {0} ms.
SoundHornFull = Son corne pour {0} ms
SoundHornPattern = Mod\u00e8le Son Corne
HintSoundHornPatternData1 = Entrer la longueur de son court en millisecondes
HintSoundHornPatternData2 = Entrer la longueur de son long en millisecondes
@@ -103,29 +103,29 @@ OnEntry = Ingresso Sezione
HintDelayData = (opzionale) Inserisci il tempo di attesa in millisecondi prima che l'azione venga avviata
OnExit = Uscita Sezione
OnEntryFull = Al momento dell'ingresso in questa sezione
OnEntryDelayedFull = "{0}" ms. dopo l'ingresso in questa sezione
OnEntryDelayedFull = "{0}" ms dopo l'ingresso in questa sezione
OnExitFull = In uscita da questa sezione
OnExitDelayedFull = "{0}" ms. dopo l'uscita da questa sezione
OnExitDelayedFull = "{0}" ms dopo l'uscita da questa sezione
OnBlockEntry = All'ingresso del Blocco
HintBlockEntry = Selezionare un blocco in questa sezione.
OnBlockExit = All'uscita dal Blocco
OnBlockEntryFull = All'ingresso del Blocco "{0}"
OnBlockEntryDelayedFull = "{0}" ms. dopo l'ingresso del blocco "{1}"
OnBlockEntryDelayedFull = "{0}" ms dopo l'ingresso del blocco "{1}"
OnBlockExitFull = All'uscita dal Blocco "{0}"
OnBlockExitDelayedFull = "{0}" ms. dopo l'uscita dal blocco"{1}"
OnBlockExitDelayedFull = "{0}" ms dopo l'uscita dal blocco"{1}"
TrainStop = Alla fermata del treno
TrainStopFull = Quando il treno si ferma
TrainStopDelayedFull = "{0}" ms. dopo che il treno si \u00e8 fermato
TrainStopDelayedFull = "{0}" ms dopo che il treno si \u00e8 fermato
TrainStart = Su partenza del Treno
TrainStartFull = Quando il treno inizia a muoversi
TrainStartDelayedFull = "{0}" ms. dopo che il treno inizia a muoversi
TrainStartDelayedFull = "{0}" ms dopo che il treno inizia a muoversi
OnSensorActive = A Sensore ATTIVO
HintSensorEntry = Immettere il nome del sistema o il nome utente per il sensore
OnSensorActiveFull = Quando il sensore "{0}" diventa ATTIVO
OnSensorActiveDelayedFull = "{0}" ms. dopo che il Sensore "{1}" diventa ATTIVO
OnSensorActiveDelayedFull = "{0}" ms dopo che il Sensore "{1}" diventa ATTIVO
OnSensorInactive = A Sensore INATTIVO
OnSensorInactiveFull = Quando il sensore "{0}" diventa INATTIVO
OnSensorInactiveDelayedFull = "{0}" ms. dopo che il Sensore "{1}" diventa INATTIVO
OnSensorInactiveDelayedFull = "{0}" ms dopo che il Sensore "{1}" diventa INATTIVO

Pause = Pausa Treno
PauseFull = Pausa per "{0}" minuti (fast clock)
@@ -150,7 +150,7 @@ StopBell = Ferma Campana
StopBellFull = Ferma Campana(se decoder sonoro)
SoundHorn = Suona Tromba
HintSoundHornData1 = Inserisci intervallo di tempo in millisecondi per singolo colpo di Tromba
SoundHornFull = Suona Tromba per {0} ms.
SoundHornFull = Suona Tromba per {0} ms
SoundHornPattern = Motivo del suono della tromba
HintSoundHornPatternData1 = Inserisci lunghezza di suono corto in millisecondi
HintSoundHornPatternData2 = Inserire la lunghezza del suono lungo in millisecondi
@@ -152,7 +152,7 @@ StopBell = Stop Bel
StopBellFull = Stop bel (met sound decoder)
SoundHorn = Blaas hoorn
HintSoundHornData1 = Stel duur van hoornsignaal (millisecondes)
SoundHornFull = Blaas hoorn {0} ms.
SoundHornFull = Blaas hoorn {0} ms
SoundHornPattern = Patroonhoorn
HintSoundHornPatternData1 = Stel lengte van kort hoornsingnaal in (millisecondes)
HintSoundHornPatternData2 = Stel lengte van lang hoornsingnaal in (millisecondes)
@@ -289,6 +289,6 @@ trustKnownTurnouts = Trust Known State of Turnouts
trustKnownTurnoutsHint = Trust the current known state of turnouts, and do not repeat command.
#ms = milliseconds
minThrottleInterval = Minimum Throttle Interval
minThrottleIntervalHint = Minimum interval (in milliseconds) between throttle commands. Choose a value from 20 to 1,000 ms
minThrottleIntervalHint = Minimum interval (in milliseconds) between throttle commands. Choose a value from 20 to 1,000 ms.
fullRampTime = Time to Fully Ramp
fullRampTimeHint = Time (in ms) for {0} loco to change from 0% to 100%. Choose a value from 1,000 ms to 20,000 ms.
@@ -92,7 +92,6 @@
@enduml
*/


abstract public class AbstractMRTrafficController {

private Thread shutdownHook = null; // retain shutdown hook for
@@ -17,7 +17,7 @@
* to establish Acela support.
*/
public class AcelaTurnoutManager extends AbstractTurnoutManager {

public AcelaTurnoutManager(AcelaSystemConnectionMemo memo) {
super(memo);
}
@@ -39,7 +39,7 @@ public DCCppTurnoutManager(DCCppSystemConnectionMemo memo) {
public DCCppSystemConnectionMemo getMemo() {
return (DCCppSystemConnectionMemo) memo;
}

// DCCpp-specific methods

/** {@inheritDoc} */
@@ -171,6 +171,7 @@ public String validateSystemNameFormat(String systemName, Locale locale) {

/**
* Get the bit address from the system name.
*
* @param systemName a valid LocoNet-based Turnout System Name
* @return the turnout number extracted from the system name
*/
@@ -39,7 +39,6 @@ public SerialTrafficController() {
// use poll delay just to spread out startup
setAllowUnexpectedReply(true);
mWaitBeforePoll = 1000; // can take a long time to send

}

/**
@@ -49,6 +48,7 @@ public SerialTrafficController() {
* <p>
* This is a default, null implementation, which must be overridden in an
* adapter-specific subclass.
*
* @param s sequence to send
* @param l listener for reply
*/
@@ -62,6 +62,7 @@ public void sendX10Sequence(X10Sequence s, SerialListener l) {
* <p>
* This is a default, null implementation, which must be overridden in an
* adapter-specific subclass.
*
* @param s sequence to send
* @param l listener for reply
*/
@@ -82,6 +83,7 @@ public int getNumberOfIntensitySteps() {
* <p>
* This is a default, null implementation, which must be overridden in an
* adapter-specific subclass.
*
* @param length message size
* @return null
*/
@@ -142,7 +144,6 @@ public SerialSensorManager getSensorManager() {
@Override
protected AbstractMRMessage pollMessage() {
return null;

}

@Override
@@ -194,7 +195,6 @@ public SerialSystemConnectionMemo getAdapterMemo() {
int remainingBytes = 0; // count of bytes _left_

/**
* <p>
* This is a default, null implementation, which must be overridden in an
* adapter-specific subclass.
*/
@@ -204,7 +204,6 @@ protected boolean endOfMessage(AbstractMRReply msg) {
}

/**
* <p>
* This is a default, null implementation, which must be overridden in an
* adapter-specific subclass.
*/
@@ -216,6 +215,3 @@ protected AbstractMRReply newReply() {
private final static Logger log = LoggerFactory.getLogger(SerialTrafficController.class);

}



0 comments on commit 0f8bdc4

Please sign in to comment.
You can’t perform that action at this time.