Merge branch 'develop'

LSTS · Sep 23, 2014 · 86dacee · 86dacee
2 parents 035f636 + 07fb42c
commit 86dacee
Show file tree

Hide file tree

Showing 244 changed files with 86,469 additions and 62,304 deletions.
diff --git a/.classpath b/.classpath
@@ -53,6 +53,7 @@
 	<classpathentry kind="src" path="plugins-dev/waveglider"/>
 	<classpathentry kind="src" path="plugins-dev/europa"/>
 	<classpathentry kind="src" path="plugins-dev/alliance"/>
+	<classpathentry kind="src" path="plugins-dev/urready4os"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
 	<classpathentry kind="lib" path="lib/xerces-2.7.1/xml-apis.jar"/>
 	<classpathentry kind="lib" path="lib/xerces-2.7.1/xercesImpl.jar"/>
@@ -141,7 +142,6 @@
 	<classpathentry kind="lib" path="lib/jetty/jetty-6.0.2.jar" sourcepath="lib/jetty/jetty-6.0.2.jar"/>
 	<classpathentry kind="lib" path="dev-utils/junit-3.8.2.jar"/>
 	<classpathentry kind="lib" path="lib/gpsinput-0.5.3.jar"/>
-	<classpathentry kind="lib" path="lib/zxing-bin.jar"/>
 	<classpathentry kind="lib" path="lib/commons-cli-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/commons-email-1.3.2.jar"/>
 	<classpathentry kind="lib" path="lib/miglayout-core-4.2.jar"/>
@@ -216,5 +216,6 @@
 			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/usr/lib/jni"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="lib/zxing-bin.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,11 @@
 Changes
 =======
 
+Neptus 4.2.0-rc1 (23-09-2014)
+----------------
+
+TODO
+
 Neptus 4.1.0 (31-07-2014)
 ------------
  * IMC: Updated IMC and IMCJava to 4667e8e. (no major changes from v5.4.0 except some experimental messages for UAV added).

diff --git a/build.xml b/build.xml
@@ -56,12 +56,12 @@ For simple use the main targets are:
 	<!-- Defines variables used by the other targets                         -->
 	<!-- =================================================================== -->
 	<property name="version.MAJOR" value="4" />
-	<property name="version.MINOR" value="1" />
+	<property name="version.MINOR" value="2" />
 	<property name="version.PATCH" value="0" />
-	<!-- Set this to '.dev' if a developer release; blank "" if maintenance release -->
-	<property name="version.DEVELOPER" value="" />
-	<!-- Set the release number. Use the form 'R1' for release 1. Or leave it blank for a non release -->
-	<property name="release.NAME" value="R14.02" />
+	<!-- Set this to '-dev' if a developer release; blank "" if maintenance release; or '-rcX' for release candidate X (X number) -->
+	<property name="version.DEVELOPER" value="-rc1" />
+	<!-- Set the release number. Use the form 'R14.01' for release 1 of year 2014. Or leave it blank for a non release -->
+	<property name="release.NAME" value="R14.03" />
 	<property name="release.INFO" value="${release.NAME}"/>
 
 	<!-- EITHER the developer release number, or a maintenance release number -->
@@ -1295,7 +1295,6 @@ For simple use the main targets are:
 		<delete dir="tmpjars" failonerror="true" />
 		<mkdir dir="tmpjars" />
 		<script language="javascript">     
-            importPackage(java.io);
 			jarList = project.getProperty("plugin.private.jars.cp");
 			if (!"".equals(jarList)) {
 				if (project.getProperty("os.name").toLowerCase().contains("windows"))
@@ -1304,8 +1303,8 @@ For simple use the main targets are:
 					libs = jarList.split(":");
 	            for (index in libs) {
 	              unzip = project.createTask("unzip");
-	              unzip.setDest(new File("tmpjars"));
-	              unzip.setSrc(new File(libs[index]));    
+	              unzip.setDest(new java.io.File("tmpjars"));
+	              unzip.setSrc(new java.io.File(libs[index]));    
 	        	  unzip.perform();
 	            }
 			}

diff --git a/conf/consoles/lauv.ncon b/conf/consoles/lauv.ncon
@@ -194,6 +194,11 @@
           <comment>Generated by Neptus on Tue Jul 29 15:15:08 WEST 2014</comment>
         </properties>
       </child>
+      <child class="pt.lsts.neptus.console.plugins.PlanExporter" x="0" y="0" width="0" height="0">
+        <properties>
+          <comment>Generated by Neptus on Tue Jul 29 15:15:08 WEST 2014</comment>
+        </properties>
+      </child>
     </subpanel>
   </mainpanel>
   <mainpanel name="console alarm panel"/>

diff --git a/conf/consoles/uav-light.ncon b/conf/consoles/uav-light.ncon
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<console name="UAV Operation Console" width="1366" height="731" resizable="true" mission-file="../../missions/Braganca.nmisz" main-vehicle="form-leader-01">
-  <!-- Data saved on 2014-07-12T10:14:40.0Z with Neptus version 4.1.0dev_R14.02 (compiled on 2014-07-12, gneptus-4.0.0_R14.02-239-g3ceaf09-dirty). -->
+<console name="UAV Operation Console" width="1280" height="999" resizable="true" mission-file="../../missions/Braganca.nmisz" main-vehicle="x8-03">
+  <!-- Data saved on 2014-09-08T13:51:43.0Z with Neptus version @VERSION@ (compiled on @DATE@, g@SCM_REV@). -->
   <mainpanel name="console main panel">
-    <subpanel class="pt.lsts.neptus.console.plugins.containers.MigLayoutContainer" x="0" y="0" width="1362" height="673">
+    <subpanel class="pt.lsts.neptus.console.plugins.containers.MigLayoutContainer" x="0" y="0" width="1278" height="918">
       <properties>
-        <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+        <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         <entry key="XML Definitions">&lt;profiles&gt;
   &lt;profile name="TACO"&gt;
     &lt;container param="w 100%, h 100%" layoutparam="ins 0, fillx, filly"&gt;
@@ -41,143 +41,149 @@
       </properties>
       <child class="pt.lsts.neptus.plugins.ipcam.AirCamDisplay" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.uavs.panels.AutopilotModePanel" x="125" y="0" width="119" height="52">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
-      <child class="pt.lsts.neptus.console.plugins.ChronometerPlugin" x="0" y="617" width="244" height="50">
+      <child class="pt.lsts.neptus.console.plugins.ChronometerPlugin" x="0" y="862" width="244" height="50">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.console.plugins.planning.CommandPlanner" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.position.ContactMarker" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.followref.FollowReferenceInteraction" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.messages.IMCInspector" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.sunfish.IridiumComms" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.map.MapEditor" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
-      <child class="pt.lsts.neptus.console.plugins.planning.MapPanel" x="0" y="0" width="1000" height="673">
+      <child class="pt.lsts.neptus.console.plugins.planning.MapPanel" x="0" y="0" width="916" height="918">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
           <entry key="Toolbar placement">Left</entry>
           <entry key="Interpolate States">true</entry>
         </properties>
       </child>
-      <child class="pt.lsts.neptus.console.plugins.planning.MissionTreePanel" x="0" y="464" width="244" height="147">
+      <child class="pt.lsts.neptus.console.plugins.planning.MissionTreePanel" x="0" y="464" width="244" height="392">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.console.plugins.MyLocationDisplay" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.console.plugins.planning.PathControlLayer" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.console.plugins.planning.PlanControlPanel" x="0" y="0" width="119" height="52">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
           <entry key="Enable beacons button">false</entry>
           <entry key="Enable teleoperation button">false</entry>
           <entry key="Use Calibration on Start Plan">false</entry>
         </properties>
       </child>
       <child class="pt.lsts.neptus.console.plugins.planning.PlanControlStatePanel" x="0" y="373" width="244" height="85">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.console.plugins.planning.PlanEditor" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.console.plugins.planning.PlanStatistics" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
           <entry key="Maximum Top Speed (100%)">20.0</entry>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.rtplot.RealTimePlot" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
           <entry key="Traces Script">roll: ${EstimatedState.phi} * 180 / Math.PI;
 desired_roll: ${DesiredRoll.value} * 180 / Math.PI</entry>
         </properties>
       </child>
+      <child class="pt.lsts.neptus.plugins.sim.SimulationActionsPlugin" x="0" y="0" width="0" height="0">
+        <properties>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
+          <entry key="simulatedHeight">900.0</entry>
+        </properties>
+      </child>
       <child class="pt.lsts.neptus.plugins.uavs.panels.SpeedIndicatorPanel" x="0" y="206" width="244" height="100">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
           <entry key="Maximum Speed">23.0</entry>
           <entry key="Minimum Speed">14.0</entry>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.position.StreamSpeedPanel" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
-      <child class="pt.lsts.neptus.params.SystemConfiguration" x="0" y="0" width="0" height="0">
+      <child class="pt.lsts.neptus.params.SystemConfiguration" x="0" y="0" width="598" height="575">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:43 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.console.plugins.SystemsList" x="0" y="0" width="220" height="250">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:44 CEST 2014</comment>
           <entry key="System Class Filter">ALL</entry>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.trex.TrexMapLayer" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:44 CEST 2014</comment>
         </properties>
       </child>
-      <child class="pt.lsts.neptus.plugins.uavs.panels.UavAltitudePanel" x="0" y="0" width="100" height="673">
+      <child class="pt.lsts.neptus.plugins.uavs.panels.UavAltitudePanel" x="0" y="0" width="100" height="918">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:44 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.plugins.uavs.panels.UavHUDPanel" x="0" y="0" width="244" height="200">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:44 CEST 2014</comment>
         </properties>
       </child>
       <child class="pt.lsts.neptus.console.plugins.VehicleStateMonitor" x="0" y="0" width="0" height="0">
         <properties>
-          <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+          <comment>Generated by Neptus on Mon Sep 08 13:51:44 CEST 2014</comment>
         </properties>
       </child>
     </subpanel>
@@ -186,12 +192,12 @@ desired_roll: ${DesiredRoll.value} * 180 / Math.PI</entry>
   <layers>
     <layer class="pt.lsts.neptus.console.plugins.planning.PlanSimulationLayer" opacity="1.0">
       <properties>
-        <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+        <comment>Generated by Neptus on Mon Sep 08 13:51:44 CEST 2014</comment>
       </properties>
     </layer>
     <layer class="pt.lsts.neptus.plugins.position.painter.SystemInfoPainter" opacity="1.0">
       <properties>
-        <comment>Generated by Neptus on Sat Jul 12 10:14:40 WEST 2014</comment>
+        <comment>Generated by Neptus on Mon Sep 08 13:51:44 CEST 2014</comment>
         <entry key="Display Current">true</entry>
         <entry key="Display Confidence Level">false</entry>
         <entry key="Entity Name">Autopilot</entry>