[Jmri-commits] jmri/jmrix/loconet/soundloader Loader.properties, 1.3, 1.4 LoaderEngine.java, 1.3, 1.4

[Bob J. <jac...@us...>]

Update of /cvsroot/jmri/jmri/jmrix/loconet/soundloader
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19731/src/jmri/jmrix/loconet/soundloader

Modified Files:
	Loader.properties LoaderEngine.java 
Log Message:
handle longer erase

Index: LoaderEngine.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/loconet/soundloader/LoaderEngine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LoaderEngine.java	3 Jul 2006 22:06:43 -0000	1.3
--- LoaderEngine.java	30 Mar 2008 23:31:18 -0000	1.4
***************
*** 44,50 ****
              notify(res.getString("EngineEraseFlash"));
              controller.sendLocoNetMessage(getEraseMessage());
!             protectedWait(2500);
                      
              // start
              controller.sendLocoNetMessage(getInitMessage());
              
--- 44,53 ----
              notify(res.getString("EngineEraseFlash"));
              controller.sendLocoNetMessage(getEraseMessage());
!             protectedWait(1000);
!             notify(res.getString("EngineEraseWait"));
!             protectedWait(20000);
                      
              // start
+             notify(res.getString("EngineSendInit"));
              controller.sendLocoNetMessage(getInitMessage());
              

Index: Loader.properties
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/loconet/soundloader/Loader.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Loader.properties	3 Jul 2006 22:06:08 -0000	1.3
--- Loader.properties	30 Mar 2008 23:31:17 -0000	1.4
***************
*** 43,50 ****
  # Group of status and error messages for the LoaderEngine
  EngineEraseFlash = Starting download; erase flash
! EngineDone = Done
  EngineSendSdf = Send SDF data
  EngineSendWav = Send WAV data
  EngineSendWavBlock = Send WAV data block {0}
  
  EngineAbortDelay = Download aborted; PR2 not ready
\ No newline at end of file
--- 43,53 ----
  # Group of status and error messages for the LoaderEngine
  EngineEraseFlash = Starting download; erase flash
! EngineEraseWait = Waiting for flash memory to erase (this will take up to 30 seconds)
! EngineSendInit = Sending initialization message
  EngineSendSdf = Send SDF data
  EngineSendWav = Send WAV data
  EngineSendWavBlock = Send WAV data block {0}
  
+ EngineDone = Done
+ 
  EngineAbortDelay = Download aborted; PR2 not ready
\ No newline at end of file