Sloeber#444 and also skip resetting com port if comport does not exist ...

And no com port actions have been specified

Author: jantje

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

@@ -49,14 +49,7 @@ public class Const {
     public static final String ACTION_SIZE = "RECIPE.SIZE";
     public static final String ACTION_AR = "RECIPE.AR";
     public static final String ACTION_C_COMBINE = "RECIPE.C.COMBINE";
-    // public static final String ENV_KEY_RECIPE_C_O_PATTERN = ENV_KEY_BOARD_START + "RECIPE.C.O.PATTERN";
-    // public static final String ENV_KEY_RECIPE_CPP_O_PATTERN = ENV_KEY_BOARD_START + "RECIPE.CPP.O.PATTERN";
-    // public static final String ENV_KEY_RECIPE_S_O_PATTERN = ENV_KEY_BOARD_START + "RECIPE.S.O.PATTERN";
-    // public static final String ENV_KEY_RECIPE_OBJCOPY_HEX_PATTERN = ENV_KEY_BOARD_START + "RECIPE.OBJCOPY.HEX.PATTERN";
-    // public static final String ENV_KEY_RECIPE_OBJCOPY_EEP_PATTERN = ENV_KEY_BOARD_START + "RECIPE.OBJCOPY.EEP.PATTERN";
-    // public static final String ENV_KEY_RECIPE_SIZE_PATTERN = ENV_KEY_BOARD_START + "RECIPE.SIZE.PATTERN";
-    // public static final String ENV_KEY_RECIPE_AR_PATTERN = ENV_KEY_BOARD_START + "RECIPE.AR.PATTERN";
-    // public static final String ENV_KEY_RECIPE_C_COMBINE_PATTERN = ENV_KEY_BOARD_START + "RECIPE.C.COMBINE.PATTERN";
+
 
     // Describers
     public static final String ENV_PROTOCOL = "PROTOCOL";
@@ -109,7 +102,6 @@ public class Const {
     public static final String ENV_KEY_BOARD_START = "A" + DOT;
 
     public static final String ENV_KEY_PROGRAMMERS_START = ENV_KEY_BOARD_START + "PROGRAMMERS.";
-    // public static final String ENV_KEY_BOARD_UPLOAD_PROTOCOL = ENV_KEY_BOARD_START + "UPLOAD.PROTOCOL";
     public static final String WORKSPACE_LIB_FOLDER = LIBRARY_PATH_SUFFIX + "/";
     public static final String ARDUINO_IDE_VERSION = "ArduinoIDEVersion";
     public static final String ENV_KEY_NAME = ENV_KEY_BOARD_START + "NAME";
@@ -131,9 +123,9 @@ public class Const {
     public static final String ENV_KEY_UPLOAD_USE_1200BPS_TOUCH = ENV_KEY_BOARD_START + "UPLOAD.USE_1200BPS_TOUCH";
     public static final String ENV_KEY_UPLOAD_DISABLE_FLUSHING = ENV_KEY_BOARD_START + "UPLOAD.DISABLE_FLUSHING";
     public static final String ENV_KEY_WAIT_FOR_UPLOAD_PORT = ENV_KEY_BOARD_START + "UPLOAD.WAIT_FOR_UPLOAD_PORT";
-    // public static final String ENV_KEY_UPLOAD_TOOL = ENV_KEY_BOARD_START + "UPLOAD.TOOL";
-    // public static final String ENV_KEY_PROGRAM_TOOL = ENV_KEY_BOARD_START + "PROGRAM.TOOL";
-    // public static final String ENV_KEY_UPLOAD_PROTOCOL = ENV_KEY_BOARD_START + "UPLOAD.PROTOCOL";
+    public static final String ENV_KEY_RESET_BEFORE_UPLOAD = ENV_KEY_BOARD_START + "UPLOAD.FORCE_RESET_BEFORE_UPLOAD";
+
+
     public static final String ENV_KEY_BUILD_CORE = ENV_KEY_BOARD_START + "BUILD.CORE";
     public static final String ENV_KEY_BUILD_CORE_PATH = ENV_KEY_BOARD_START + "BUILD.CORE.PATH";
     public static final String ENV_KEY_USE_ARCHIVER = ENV_KEY_BOARD_START + "BUILD.USE_ARCHIVER";
@@ -172,14 +164,7 @@ public class Const {
     public static final String ENV_KEY_GNU_SERIAL_PORTS = "gnu.io.rxtx.SerialPorts";
     public static final String ENV_VALUE_GNU_SERIAL_PORTS_LINUX = "/dev/ttyACM0:/dev/ttyACM1:/dev/ttyACM2:/dev/ttyACM3:/dev/ttyUSB0::/dev/ttyUSB1::/dev/ttyUSB2::/dev/ttyUSB3::/dev/ttyUSB4";
     // scope stuff
-    public static final short SCOPE_START_DATA = (short) 0xCDAB;// This is the
-								// 205 171 or
-								// -85 -51
-								// flag that
-								// indicates
-								// scope data is
-								// following
-    // least significant first 0xCDAB;
+    public static final short SCOPE_START_DATA = (short) 0xCDAB;// This is the 205 171 or -85 -51 flag that indicates scope data is following least significant first 0xCDAB;
     public static final String EXAMPLE_FOLDER_NAME = "examples";
 
     public static final String PRE_PROCESSING_BOARDS_TXT = "pre_processing_boards.txt";

it.baeyens.arduino.core/src/it/baeyens/arduino/communication/ArduinoSerial.java

@@ -151,8 +151,7 @@ public static boolean ToggleDTR(Serial serialPort, long delay) {
     /**
      * reset the arduino
      * 
-     * This method takes into account all the setting to be able to reset all different types of arduino If RXTXDisabled is set the method only return
-     * the parameter Comport
+     * This method takes into account all the setting to be able to reset all different types of arduino If RXTXDisabled is set the method only return the parameter Comport
      * 
      * @param project
      *            The project related to the com port to reset
@@ -161,22 +160,30 @@ public static boolean ToggleDTR(Serial serialPort, long delay) {
      * @return The com port to upload to
      */
     public static String makeArduinoUploadready(MessageConsoleStream console, IProject project, String configName, String comPort) {
-	boolean use_1200bps_touch = Common.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_UPLOAD_USE_1200BPS_TOUCH, Const.FALSE)
-		.equalsIgnoreCase(Const.TRUE);
-	boolean bWaitForUploadPort = Common.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_WAIT_FOR_UPLOAD_PORT, Const.FALSE)
-		.equalsIgnoreCase(Const.TRUE);
+	boolean use_1200bps_touch = Common.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_UPLOAD_USE_1200BPS_TOUCH, Const.FALSE).equalsIgnoreCase(Const.TRUE);
+	boolean bWaitForUploadPort = Common.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_WAIT_FOR_UPLOAD_PORT, Const.FALSE).equalsIgnoreCase(Const.TRUE);
 	String boardName = Common.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_JANTJE_BOARD_NAME, Const.EMPTY_STRING);
-	String uploadProtocol = Common.getBuildEnvironmentVariable(project, configName, Const.get_ENV_KEY_PROTOCOL(Const.ACTION_UPLOAD),
-		Const.EMPTY_STRING);
-	/* Teensy uses halfkay protocol and does not require a reset */
-	if (uploadProtocol.equalsIgnoreCase("halfkay")) { //$NON-NLS-1$
+	String uploadProtocol = Common.getBuildEnvironmentVariable(project, configName, Const.get_ENV_KEY_PROTOCOL(Const.ACTION_UPLOAD), Const.EMPTY_STRING);
+
+	boolean bResetPortForUpload = Common.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_RESET_BEFORE_UPLOAD, Const.TRUE).equalsIgnoreCase(Const.TRUE);
+
+	/*
+	 * Teensy uses halfkay protocol and does not require a reset in boards.txt use Const.ENV_KEY_RESET_BEFORE_UPLOAD=FALSE to disable a reset
+	 */
+	if (!bResetPortForUpload || uploadProtocol.equalsIgnoreCase("halfkay")) { //$NON-NLS-1$
+	    return comPort;
+	}
+	/*
+	 * if the com port can not be found and no specific com port reset method is specified assume it is a network port and do not try to reset
+	 */
+	Vector<String> originalPorts = Serial.list();
+	if (!originalPorts.contains(comPort) && !use_1200bps_touch && !bWaitForUploadPort) {
+	    console.println(Messages.ArduinoSerial_comport_not_found);
 	    return comPort;
 	}
-	/* end of Teensy and halfkay */
 	if (use_1200bps_touch) {
 	    // Get the list of the current com serial ports
 	    console.println(Messages.ArduinoSerial_Using_12000bps_touch);
-	    Vector<String> originalPorts = Serial.list();
 
 	    if (!reset_Arduino_by_baud_rate(comPort, 1200, 300) /* || */) {
 		console.println(Messages.ArduinoSerial_reset_failed);

it.baeyens.arduino.core/src/it/baeyens/arduino/communication/Messages.java

@@ -7,6 +7,7 @@ public class Messages extends NLS {
     public static String ArduinoSerial_23;
     public static String ArduinoSerial_Comport_Appeared_and_disappeared;
     public static String ArduinoSerial_Comport_is_not_behaving_as_expected;
+    public static String ArduinoSerial_comport_not_found;
     public static String ArduinoSerial_Comport_reset_took;
     public static String ArduinoSerial_Continuing_to_use;
     public static String ArduinoSerial_Ending_reset;

it.baeyens.arduino.core/src/it/baeyens/arduino/communication/messages.properties

@@ -1,6 +1,7 @@
 ArduinoSerial_23=Toggling DTR
 ArduinoSerial_Comport_Appeared_and_disappeared=Comport appeared and disappeared with same name
 ArduinoSerial_Comport_is_not_behaving_as_expected=Comport is not behaving as expected
+ArduinoSerial_comport_not_found=Com port not found. Skipping reset
 ArduinoSerial_Comport_reset_took=Comport reset took 
 ArduinoSerial_Continuing_to_use=Continuing to use 
 ArduinoSerial_Ending_reset=Ending reset