Merge pull request #395 from SuperOok/master

Fix for #394, adding config parameter for RST/DTR flags in serial connection

Author: jantje

it.baeyens.arduino.common/src/it/baeyens/arduino/arduino/Serial.java

@@ -98,6 +98,9 @@ public static Vector<String> list() {
 
     int stopbits;
     boolean monitor = false;
+    
+    // whether to pull DTR to GND during reset or not
+    boolean dtr = true;
 
     String PortName;
 
@@ -106,12 +109,17 @@ public static Vector<String> list() {
     private List<MessageConsumer> fConsumers;
 
     public Serial(String iname, int irate) {
-	this(iname, irate, 'N', 8, 1.0f);
+    	this(iname, irate, 'N', 8, 1.0f, true);
+        }
+    
+    public Serial(String iname, int irate, boolean dtr) {
+	this(iname, irate, 'N', 8, 1.0f, dtr);
     }
 
-    public Serial(String iname, int irate, char iparity, int idatabits, float istopbits) {
+    public Serial(String iname, int irate, char iparity, int idatabits, float istopbits, boolean dtr) {
 	this.PortName = iname;
 	this.rate = irate;
+	this.dtr = dtr;
 
 	this.parity = SerialPort.PARITY_NONE;
 	if (iparity == 'E')
@@ -154,7 +162,7 @@ public void connect(int maxTries) {
 		try {
 		    this.port = new SerialPort(this.PortName);
 		    this.port.openPort();
-		    this.port.setParams(this.rate, this.databits, this.stopbits, this.parity);
+		    this.port.setParams(this.rate, this.databits, this.stopbits, this.parity, this.dtr, this.dtr);
 
 		    int eventMask = SerialPort.MASK_RXCHAR | SerialPort.MASK_BREAK;
 		    this.port.addEventListener(this, eventMask);
@@ -236,14 +244,13 @@ public void registerService() {
     }
 
     public void reset() {
-	setDTR(false);
+    setDTR(false);
 	setRTS(false);
 
 	try {
 	    Thread.sleep(100);
 	} catch (InterruptedException e) {// JABA is not going to add code
 	}
-
 	setDTR(true);
 	setRTS(true);
 

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/Messages.java

@@ -6,6 +6,7 @@ public class Messages extends NLS {
     private static final String BUNDLE_NAME = "it.baeyens.arduino.monitor.views.messages"; //$NON-NLS-1$
     public static String OpenSerialDialogBox_Select_the_baut_rate;
     public static String OpenSerialDialogBox_Serial_port_to_connect_to;
+    public static String OpenSerialDialogBox_Dtr;
     public static String ScopeListener_buffer_overflow;
     public static String ScopeView_channel;
     public static String ScopeView_connected_to;

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/OpenSerialDialogBox.java

@@ -7,6 +7,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
@@ -23,16 +24,19 @@ protected void okPressed() {
 	// deleted after he close
 	this.SelectedRate = Integer.parseInt(this.BaudRates.getCombo().getText());
 	this.SelectedPort = this.SerialPorts.getCombo().getText();
+	this.SelectedDtr = this.DtrCheckbox.getSelection();
 	InstancePreferences.setGlobalValue(Const.KEY_SERIAlRATE, this.BaudRates.getCombo().getText());
 	InstancePreferences.setGlobalValue(Const.KEY_SERIAlPORT, this.SelectedPort);
 	super.okPressed();
     }
 
     private ComboViewer SerialPorts;
     private ComboViewer BaudRates;
+    private Button DtrCheckbox;
     // private ComboViewer LineEndings;
     private String SelectedPort;
     private int SelectedRate;
+    private boolean SelectedDtr;
 
     protected OpenSerialDialogBox(Shell parentShell) {
 	super(parentShell);
@@ -78,6 +82,11 @@ protected Control createDialogArea(Composite parent) {
 
 	this.BaudRates.getCombo().setText(InstancePreferences.getGlobalString(Const.KEY_SERIAlRATE, Const.EMPTY_STRING));
 	this.SerialPorts.getCombo().setText(InstancePreferences.getGlobalString(Const.KEY_SERIAlPORT, Const.EMPTY_STRING));
+	
+	this.DtrCheckbox = new Button(parent, SWT.CHECK);
+	this.DtrCheckbox.setText(Messages.OpenSerialDialogBox_Dtr);
+	this.DtrCheckbox.setSelection(true);
+	
 	return parent;
 
     }
@@ -90,4 +99,8 @@ public int GetBaudRate() {
 	return this.SelectedRate;
     }
 
+	public boolean GetDtr() {
+	return this.SelectedDtr;
+	}
+
 }

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/SerialMonitor.java

@@ -409,7 +409,7 @@ public void run() {
 		OpenSerialDialogBox comportSelector = new OpenSerialDialogBox(SerialMonitor.this.myparent.getShell());
 		comportSelector.create();
 		if (comportSelector.open() == Window.OK) {
-		    connectSerial(comportSelector.GetComPort(), comportSelector.GetBaudRate());
+		    connectSerial(comportSelector.GetComPort(), comportSelector.GetBaudRate(), comportSelector.GetDtr());
 
 		}
 	    }
@@ -495,24 +495,28 @@ void SerialPortsUpdated() {
      *            the bautrate to connect to the com port
      */
     public void connectSerial(String ComPort, int BaudRate) {
-	if (this.mySerialConnections.size() < myMaxSerialPorts) {
-	    int colorindex = this.mySerialConnections.size();
-	    Serial newSerial = new Serial(ComPort, BaudRate);
-	    if (newSerial.IsConnected()) {
-		newSerial.registerService();
-		SerialListener theListener = new SerialListener(this, colorindex);
-		newSerial.addListener(theListener);
-		theListener.event(System.getProperty("line.separator") + Messages.SerialMonitor_connectedt_to + ComPort //$NON-NLS-1$
-			+ Messages.SerialMonitor_at + BaudRate + System.getProperty("line.separator")); //$NON-NLS-1$
-		this.mySerialConnections.put(newSerial, theListener);
-		SerialPortsUpdated();
-		return;
-	    }
-	} else {
-	    Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, Messages.SerialMonitor_no_more_serial_ports_supported, null));
-	}
-
+    	connectSerial(ComPort, BaudRate, true);
     }
+    
+    public void connectSerial(String ComPort, int BaudRate, boolean dtr) {
+    	if (this.mySerialConnections.size() < myMaxSerialPorts) {
+    	    int colorindex = this.mySerialConnections.size();
+    	    Serial newSerial = new Serial(ComPort, BaudRate, dtr);
+    	    if (newSerial.IsConnected()) {
+    		newSerial.registerService();
+    		SerialListener theListener = new SerialListener(this, colorindex);
+    		newSerial.addListener(theListener);
+    		theListener.event(System.getProperty("line.separator") + Messages.SerialMonitor_connectedt_to + ComPort //$NON-NLS-1$
+    			+ Messages.SerialMonitor_at + BaudRate + System.getProperty("line.separator")); //$NON-NLS-1$
+    		this.mySerialConnections.put(newSerial, theListener);
+    		SerialPortsUpdated();
+    		return;
+    	    }
+    	} else {
+    	    Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, Messages.SerialMonitor_no_more_serial_ports_supported, null));
+    	}
+
+        }
 
     public void disConnectSerialPort(String comPort) {
 	Serial newSerial = GetSerial(comPort);

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/messages.properties

@@ -1,5 +1,6 @@
 OpenSerialDialogBox_Select_the_baut_rate=Select the baudrate:
 OpenSerialDialogBox_Serial_port_to_connect_to=Serial port to connect to:
+OpenSerialDialogBox_Dtr=Set DTR and RST
 ScopeListener_buffer_overflow=buffer overflow in ScopeListener 
 ScopeView_channel=Channel 
 ScopeView_connected_to=connected to: