[Jmri-commits] jmri/jmrix/nce NceClockControl.java, 1.14, 1.15 NceConnectionStatus.java, 1.10, 1.11

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/jmri/jmri/jmrix/nce
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13345/src/jmri/jmrix/nce

Modified Files:
	NceClockControl.java NceConnectionStatus.java 
	NceAIUChecker.java NceMessage.java NceTurnoutManager.java 
	NceSensorManager.java NceTrafficController.java 
	NceTurnoutMonitor.java 
Log Message:
Fix bugs reported by Hudson find bugs

Index: NceAIUChecker.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/NceAIUChecker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NceAIUChecker.java	5 Apr 2009 15:43:16 -0000	1.6
--- NceAIUChecker.java	7 Sep 2010 22:51:59 -0000	1.7
***************
*** 22,28 ****
  	private static final int MEM_AIU = 0xDC15; 	// NCE CS AIU memory address 
  	private static final int REPLY_LEN = 1; 	// number of bytes read
! 	private static boolean EXPECT_REPLY = false; // flag 

! 	public NceMessage NceAiuPoll() {

  		if (NceMessage.getCommandOptions() <= NceMessage.OPTION_1999)
--- 22,28 ----
  	private static final int MEM_AIU = 0xDC15; 	// NCE CS AIU memory address 
  	private static final int REPLY_LEN = 1; 	// number of bytes read
! 	private boolean EXPECT_REPLY = false; 		// flag 

! 	public NceMessage nceAiuPoll() {

  		if (NceMessage.getCommandOptions() <= NceMessage.OPTION_1999)

Index: NceConnectionStatus.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/NceConnectionStatus.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NceConnectionStatus.java	3 Sep 2010 00:52:38 -0000	1.10
--- NceConnectionStatus.java	7 Sep 2010 22:51:59 -0000	1.11
***************
*** 49,56 ****
  	private static final int ERROR7_STATE = 22;

! 	private static int epromState = INIT_STATE;	//Eprom state
! 	private static boolean epromChecked = false;

! 	public static boolean nceEpromMarch2007 = false; // flag to allow JMRI to be bug for bug compatible

  	// Our current knowledge of NCE Command Station EPROMs
--- 49,56 ----
  	private static final int ERROR7_STATE = 22;

! 	private int epromState = INIT_STATE;	//Eprom state
! 	private boolean epromChecked = false;

! 	protected static boolean nceEpromMarch2007 = false; // flag to allow JMRI to be bug for bug compatible

  	// Our current knowledge of NCE Command Station EPROMs
***************
*** 92,96 ****
  	private static final int mm_USB_SB161 = 5; 	// Future use, SB3 1.61, not currently used

! 	public NceMessage NceEpromPoll() {

  		if (NceMessage.getCommandOptions() <= NceMessage.OPTION_1999)
--- 92,96 ----
  	private static final int mm_USB_SB161 = 5; 	// Future use, SB3 1.61, not currently used

! 	public NceMessage nceEpromPoll() {

  		if (NceMessage.getCommandOptions() <= NceMessage.OPTION_1999)

Index: NceMessage.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/NceMessage.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** NceMessage.java	23 Jun 2009 01:38:13 -0000	1.42
--- NceMessage.java	7 Sep 2010 22:51:59 -0000	1.43
***************
*** 2,5 ****
--- 2,6 ----

  package jmri.jmrix.nce;
+ import java.util.Arrays;

  /**
***************
*** 50,57 ****
  	// some constants

!     static protected int NCE_PAGED_CV_TIMEOUT=20000;
!     static protected int NCE_DIRECT_CV_TIMEOUT=10000;			
!     static protected int SHORT_TIMEOUT=10000;					// worst case is when loading the first panel
!     static protected boolean ncsProgMode = false;				// Do not use exit program mode unless active

      public NceMessage() {
--- 51,58 ----
  	// some constants

!     protected static final int NCE_PAGED_CV_TIMEOUT=20000;
!     protected static final int NCE_DIRECT_CV_TIMEOUT=10000;			
!     protected static final int SHORT_TIMEOUT=10000;				// worst case is when loading the first panel
!     protected static boolean ncsProgMode = false;				// Do not use exit program mode unless active

      public NceMessage() {
***************
*** 364,369 ****
  		if (getCommandOptions() >= OPTION_1999) {
              if (bytes.length<3 || bytes.length>6)
!                 log.error("Send of NCE track packet too short or long:"+(bytes.length)+
!                     " packet:"+bytes);
              NceMessage m = new NceMessage(2+bytes.length);
              m.setBinary(true);
--- 365,370 ----
  		if (getCommandOptions() >= OPTION_1999) {
              if (bytes.length<3 || bytes.length>6)
!                 log.error("Send of NCE track packet too short or long:"+Integer.toString(bytes.length)+
!                     " packet:"+Arrays.toString(bytes));
              NceMessage m = new NceMessage(2+bytes.length);
              m.setBinary(true);
***************
*** 438,443 ****
          if (getCommandOptions() >= OPTION_1999) {
              if (bytes.length<3 || bytes.length>6)
!                 log.error("Queue of NCE track packet too long:"+(bytes.length)+
!                     " packet:"+bytes);
              NceMessage m = new NceMessage(1+bytes.length);
              m.setBinary(true);
--- 439,444 ----
          if (getCommandOptions() >= OPTION_1999) {
              if (bytes.length<3 || bytes.length>6)
!                 log.error("Queue of NCE track packet too long:"+Integer.toString(bytes.length)+
!                     " packet :"+Arrays.toString(bytes));
              NceMessage m = new NceMessage(1+bytes.length);
              m.setBinary(true);

Index: NceTurnoutManager.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/NceTurnoutManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** NceTurnoutManager.java	6 Mar 2010 06:01:11 -0000	1.14
--- NceTurnoutManager.java	7 Sep 2010 22:51:59 -0000	1.15
***************
*** 16,20 ****

      public NceTurnoutManager() {
-         _instance = this;
      }

--- 16,19 ----

Index: NceClockControl.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/NceClockControl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** NceClockControl.java	28 Feb 2010 17:54:17 -0000	1.14
--- NceClockControl.java	7 Sep 2010 22:51:59 -0000	1.15
***************
*** 207,238 ****
          // unhandled reply, nothing to do about it
          if (log.isDebugEnabled()) {
! 	        String txt = "NceReply(len " + r.getNumDataElements() + ")";
  	        if (waiting > 0) {
! 	        	txt = txt + " waiting: " + waiting;
  	        }
  	        if (waitingForCmdRead) {
! 	            txt = txt + " waitingForCmdRead: " + waitingForCmdRead;
  	        }
  	        if (waitingForCmdTime) {
! 	        	txt = txt + " waitingForCmdTime: " + waitingForCmdTime;
  	        }
  	        if (waitingForCmd1224) {
! 	        	txt = txt + " waitingForCmd1224: " + waitingForCmd1224;
  	        }
  	        if (waitingForCmdRatio) {
! 	        	txt = txt + " waitingForCmdRatio: " + waitingForCmdRatio;
  	        }
  	        if (waitingForCmdStop) {
! 	        	txt = txt + " waitingForCmdStop: " + waitingForCmdStop;
  	        }
  	        if (waitingForCmdStart) {
! 	        	txt = txt + " waitingForCmdStart: " + waitingForCmdStart;
  	        }
! 	        log.debug(txt);
! 	        txt = rb.getString("LogReplyUnexpected") + ":";
  	        for (int i = 0; i < r.getNumDataElements(); i++) {
! 	            txt = txt + " " + r.getElement(i);
  	        }
! 	        log.debug(txt);
          }
          return;
--- 207,240 ----
          // unhandled reply, nothing to do about it
          if (log.isDebugEnabled()) {
!         	StringBuffer buf = new StringBuffer();
!         	buf.append("NceReply(len " + r.getNumDataElements() + ")");
  	        if (waiting > 0) {
! 	        	buf.append(" waiting: " + waiting);
  	        }
  	        if (waitingForCmdRead) {
! 	        	buf.append(" waitingForCmdRead: " + waitingForCmdRead);
  	        }
  	        if (waitingForCmdTime) {
! 	        	buf.append(" waitingForCmdTime: " + waitingForCmdTime);
  	        }
  	        if (waitingForCmd1224) {
! 	        	buf.append(" waitingForCmd1224: " + waitingForCmd1224);
  	        }
  	        if (waitingForCmdRatio) {
! 	        	buf.append(" waitingForCmdRatio: " + waitingForCmdRatio);
  	        }
  	        if (waitingForCmdStop) {
! 	        	buf.append(" waitingForCmdStop: " + waitingForCmdStop);
  	        }
  	        if (waitingForCmdStart) {
! 	        	buf.append(" waitingForCmdStart: " + waitingForCmdStart);
  	        }
! 	        log.debug(buf.toString());
! 	        buf = new StringBuffer();
! 	        buf.append(rb.getString("LogReplyUnexpected") + ":");
  	        for (int i = 0; i < r.getNumDataElements(); i++) {
! 	        	buf.append(" " + r.getElement(i));
  	        }
! 	        log.debug(buf.toString());
          }
          return;

Index: NceSensorManager.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/NceSensorManager.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** NceSensorManager.java	24 Mar 2010 19:29:24 -0000	1.27
--- NceSensorManager.java	7 Sep 2010 22:51:59 -0000	1.28
***************
*** 23,27 ****
      public NceSensorManager() {
          super();
-         mInstance = this;
          for (int i=MINAIU; i<=MAXAIU; i++)
              aiuArray[i] = null;
--- 23,26 ----
***************
*** 36,40 ****

      static public NceSensorManager instance() {
!         if (mInstance == null) new NceSensorManager();
          return mInstance;
      }
--- 35,40 ----

      static public NceSensorManager instance() {
!         if (mInstance == null) 
!         	mInstance = new NceSensorManager();
          return mInstance;
      }
***************
*** 194,205 ****
      	    			delay = longCycleInterval;
      	    		}
!     				if (awaitingReply) {
!     					log.warn("timeout awaiting poll response for AIU "+aiuNo);
!     					// slow down the poll since we're not getting responses
!     					// this lets NceConnectionStatus to do its thing
!     					delay = pollTimeout;
!     				}
!    
!     	    		synchronized (this) {
      	    			try {
      	    				awaitingDelay = true;
--- 194,204 ----
      	    			delay = longCycleInterval;
      	    		}
!     	    		synchronized (this){
!     	    			if (awaitingReply) {
!     	    				log.warn("timeout awaiting poll response for AIU "+aiuNo);
!     	    				// slow down the poll since we're not getting responses
!     	    				// this lets NceConnectionStatus to do its thing
!     	    				delay = pollTimeout;
!     	    			}
      	    			try {
      	    				awaitingDelay = true;

Index: NceTurnoutMonitor.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/NceTurnoutMonitor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** NceTurnoutMonitor.java	30 Aug 2010 02:06:39 -0000	1.29
--- NceTurnoutMonitor.java	7 Sep 2010 22:51:59 -0000	1.30
***************
*** 159,163 ****
  						+ currentBlock + ": " + r.toString());
  			}
! 			// Copy recieve data into buffer and process later
  			for (int i = 0; i < REPLY_LEN; i++){
  				dataBuffer[i + currentBlock * BLOCK_LEN] = (byte)r.getElement(i);
--- 159,163 ----
  						+ currentBlock + ": " + r.toString());
  			}
! 			// Copy receive data into buffer and process later
  			for (int i = 0; i < REPLY_LEN; i++){
  				dataBuffer[i + currentBlock * BLOCK_LEN] = (byte)r.getElement(i);

Index: NceTrafficController.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/nce/NceTrafficController.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** NceTrafficController.java	5 Apr 2009 15:43:16 -0000	1.29
--- NceTrafficController.java	7 Sep 2010 22:51:59 -0000	1.30
***************
*** 85,89 ****
  		// Keep checking the state of the communication link by polling
  		// the command station using the EPROM checker
! 		NceMessage m = pollEprom.NceEpromPoll();
  		if (m != null){
  			expectReplyEprom = true;
--- 85,89 ----
  		// Keep checking the state of the communication link by polling
  		// the command station using the EPROM checker
! 		NceMessage m = pollEprom.nceEpromPoll();
  		if (m != null){
  			expectReplyEprom = true;
***************
*** 98,102 ****
  			// No, do it this time
  			pollAiuStatus = new NceAIUChecker();
! 			return pollAiuStatus.NceAiuPoll();
  		}

--- 98,102 ----
  			// No, do it this time
  			pollAiuStatus = new NceAIUChecker();
! 			return pollAiuStatus.nceAiuPoll();
  		}

***************
*** 166,170 ****
      }

!     static protected NceTrafficController self = null;
      protected void setInstance() { self = this; }

--- 166,170 ----
      }

!     protected static NceTrafficController self = null;
      protected void setInstance() { self = this; }

[Jmri-commits] jmri/jmrix/nce NceClockControl.java, 1.14, 1.15 NceConnectionStatus.java, 1.10, 1.11

Java applications to control a model railroad layout.

[Jmri-commits] jmri/jmrix/nce NceClockControl.java, 1.14, 1.15 NceConnectionStatus.java, 1.10, 1.11 NceAIUChecker.java, 1.6, 1.7 NceMessage.java, 1.42, 1.43 NceTurnoutManager.java, 1.14, 1.15 NceSensorManager.java, 1.27, 1.28 NceTrafficController.java, 1.29, 1.30 NceTurnoutMonitor.java, 1.29, 1.30