Improve error reporting for OpenOCD

Author: ursgraf

rsc/ErrorMsg.txt

@@ -4,6 +4,7 @@ ErrorNr;Description;Solution
 11;file not found;
 
 100;no target connection (build project first)
+101;error message file could not be loaded
 
 200;wrong number format;
 201;missing right parenthesis;
@@ -119,6 +120,8 @@ ErrorNr;Description;Solution
 813;BDI packet wrong, try to reset BDI;
 814;ready bit not set, try to reset BDI;
 815;Connection to target not possible! (port seems to be busy);
+816;Connection to target not possible! (Cannot connect to OpenOCD server);
+817;Connection to target not possible! (Target not answering);
 820;no target image file found;
 821;no pl image file found;
 822;no bin file found;

src/org/deepjava/eclipse/launcher/DeepLaunchDelegate.java

@@ -108,8 +108,6 @@ public final void launch(ILaunchConfiguration configuration, String mode, ILaunc
 						TargetConnection tc = (TargetConnection) m.invoke(cls);
 						Launcher.setTargetConnection(tc);
 						Launcher.openTargetConnection();
-						long time = System.currentTimeMillis();
-						while (System.currentTimeMillis() - time < 100);
 						if (ErrorReporter.reporter.nofErrors == 0) {
 							Launcher.downloadTargetImage();
 							Launcher.startTarget(Launcher.getResetAddr());

src/org/deepjava/launcher/Launcher.java

@@ -483,7 +483,7 @@ public static void downloadTargetImage() {
 								} else if (e.getMessage().equals("target not connected")) {
 									reporter.error(800);
 								} else {
-									reporter.error(801);
+									reporter.error(801, e.getMessage());
 								}
 							}
 						}
@@ -626,7 +626,10 @@ public static void openTargetConnection() {
 			try {
 				if (!tc.isConnected()) tc.openConnection();
 			} catch (TargetConnectionException e) {
-				reporter.error(815);
+				if (dbg) vrb.println(e.getMessage());
+				if (e.getMessage().equals("Cannot connect to OpenOCD server")) reporter.error(816);
+				if (e.getMessage().equals("Target not answering")) reporter.error(817);
+				else reporter.error(815, e.getMessage());
 			}
 		} else reporter.error(803);
 	}

src/org/deepjava/launcher/TestLauncher.java

@@ -32,6 +32,7 @@
 
 /**
  * Launcher for tests only! 
+ * When using OpenOCD -> starts OpenOCD manually!
  */
 @SuppressWarnings("unused")
 public class TestLauncher {
@@ -54,8 +55,6 @@ public static void main(String[] args) {
 					TargetConnection tc = (TargetConnection) m.invoke(cls);
 					Launcher.setTargetConnection(tc);
 					Launcher.openTargetConnection();
-					long time = System.currentTimeMillis();
-					while (System.currentTimeMillis() - time < 100);
 					Launcher.downloadTargetImage();
 					Launcher.startTarget(Launcher.getResetAddr());
 //					Launcher.closeTargetConnection();