From: <adr...@us...> - 2010-12-07 12:17:04
|
Revision: 3916 http://reprap.svn.sourceforge.net/reprap/?rev=3916&view=rev Author: adrian-bowyer Date: 2010-12-07 12:16:58 +0000 (Tue, 07 Dec 2010) Log Message: ----------- David Johnson's fix for the rxtx problem included (a 1s delay after setting the baud rate). Sending of M115 at the start switched off for now - causes things to hang. Modified Paths: -------------- trunk/software/host/src/org/reprap/comms/GCodeReaderAndWriter.java trunk/software/host/src/org/reprap/machines/GCodeRepRap.java Modified: trunk/software/host/src/org/reprap/comms/GCodeReaderAndWriter.java =================================================================== --- trunk/software/host/src/org/reprap/comms/GCodeReaderAndWriter.java 2010-12-07 02:11:32 UTC (rev 3915) +++ trunk/software/host/src/org/reprap/comms/GCodeReaderAndWriter.java 2010-12-07 12:16:58 UTC (rev 3916) @@ -845,14 +845,10 @@ Debug.d("An unsupported comms operation was encountered.\n" + e.toString()); return; } + + // Wait for baud rate change to take effect + try {Thread.sleep(1000);} catch (Exception e) {} -/* - port.setSerialPortParams(baudRate, - SerialPort.DATABITS_8, - SerialPort.STOPBITS_1, - SerialPort.PARITY_NONE); -*/ - // End of workround try { port.setFlowControlMode(SerialPort.FLOWCONTROL_NONE); Modified: trunk/software/host/src/org/reprap/machines/GCodeRepRap.java =================================================================== --- trunk/software/host/src/org/reprap/machines/GCodeRepRap.java 2010-12-07 02:11:32 UTC (rev 3915) +++ trunk/software/host/src/org/reprap/machines/GCodeRepRap.java 2010-12-07 12:16:58 UTC (rev 3916) @@ -43,10 +43,10 @@ gcode = new GCodeReaderAndWriter(); gcode.queue("M110 ; Reset the line numbers"); - gcode.queue("M115 ; Get the firmware version numbers etc"); - String FirmwareConfig = gcode.lastResponse(); - FirmwareConfig = FirmwareConfig.replace('\\','\n'); //make it easier to read for humans if it has "continuations" - Debug.d("Firmware configuration string: " + FirmwareConfig); + //gcode.queue("M115 ; Get the firmware version numbers etc"); + //String FirmwareConfig = gcode.lastResponse(); + //FirmwareConfig = FirmwareConfig.replace('\\','\n'); //make it easier to read for humans if it has "continuations" + //Debug.d("Firmware configuration string: " + FirmwareConfig); loadExtruders(); forceSelection = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |