fixed imports; added more documentation on additional Expedition UDP values

Change-Id: I797ed3d26eeced2f827a0e340876f5297cb9875c

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/sensordata/BravoExtendedSensorDataMetadata.java

@@ -25,12 +25,13 @@ public enum BravoExtendedSensorDataMetadata implements ColumnMetadata {
     RIDE_HEIGHT_PORT_HULL("RideHeightPort"), //
     RIDE_HEIGHT_STBD_HULL("RideHeightStbd"), //
     HEEL("Heel"), //
-    PITCH("PitchRate"),
+    PITCH("PitchRate"), //
     DB_RAKE_PORT("DaggerBoardRakeAnglePort"), //
     DB_RAKE_STBD("DaggerBoardRakeAngleStbd"), //
     RUDDER_RAKE_PORT("RudderRakeAnglePort"), //
     RUDDER_RAKE_STBD("RudderRakeAngleStbd"), //
-    MAST_ROTATION("MastRotation");
+    MAST_ROTATION("MastRotation"), //
+    ;
 
     private final String columnName;
     

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/sensordata/BravoSensorDataMetadata.java

@@ -14,13 +14,11 @@ import java.util.Objects;
  * The current implementation only stores a subset of the information available during the import.
  */
 public enum BravoSensorDataMetadata implements ColumnMetadata {
-
     RIDE_HEIGHT_PORT_HULL("RideHeightPortHull"), //
     RIDE_HEIGHT_STBD_HULL("RideHeightStbdHull"), //
     HEEL("Heel"), //
     PITCH("ImuSensor_Pitch");
 
-
     private String columnName;
     
     private BravoSensorDataMetadata(String columnName) {

java/com.sap.sailing.expeditionconnector.test/resources/UsrChannels.h

@@ -225,11 +225,11 @@ enum ExChannels
 	ExLeadStbd,       // #170
 	ExBackstay,
 	
-	ExUser0,				// user channels must be consecutive
-	ExUser1,
-	ExUser2,
-	ExUser3,
-	ExUser4,
+	ExUser0,		// #172: RakeDeg (Rake in degrees)		// user channels must be consecutive
+	ExUser1,		// #173: DflectrPP (Deflector percentage)
+	ExUser2,		// #174: TG Heel (Target Heel)
+	ExUser3,		// #175: ForestayPres (Forestay Pressure)
+	ExUser4,		// #176: DflectrMM (Deflector in mm)
 	ExUser5,
 	ExUser6,
 	ExUser7,

java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java

@@ -31,7 +31,9 @@ import java.util.function.Consumer;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.Timeout;
 
 import com.sap.sailing.declination.Declination;
 import com.sap.sailing.declination.DeclinationService;

java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionMessage.java

@@ -172,6 +172,31 @@ public interface ExpeditionMessage extends UDPMessage {
      */
     final int ID_TACK_ANGLE = 152;
     
+    /**
+     * variable ID for rake in degrees
+     */
+    final int ID_RAKE_DEG = 172;
+    
+    /**
+     * variable ID for deflector percentage
+     */
+    final int ID_DFLCTR_PP = 173;
+    
+    /**
+     * variable ID for target heel angle
+     */
+    final int ID_TG_HEEL = 174;
+    
+    /**
+     * variable ID for forestay pressure
+     */
+    final int ID_FORESTAY_PRES = 175;
+    
+    /**
+     * variable ID for deflector in millimeters
+     */
+    final int ID_DFLECTR_MM = 176;
+    
     /**
      * variable ID for target boat speed (P?), presumably in knots
      */