From ce449e019191b25094df961d8f88c86c385ab62d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pinto=20=28Porto=29?= Date: Thu, 15 Oct 2015 11:59:41 +0100 Subject: [PATCH] Updated imc to latest version. --- src-generated/pt/lsts/imc/ImcStringDefs.java | 45 ++++++++++-------- src-generated/pt/lsts/imc/LblBeacon.java | 50 +++++++++++++++++++- 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/src-generated/pt/lsts/imc/ImcStringDefs.java b/src-generated/pt/lsts/imc/ImcStringDefs.java index 60dd9dc5..8f66ce1c 100644 --- a/src-generated/pt/lsts/imc/ImcStringDefs.java +++ b/src-generated/pt/lsts/imc/ImcStringDefs.java @@ -31,9 +31,9 @@ public class ImcStringDefs { - public static final String IMC_SHA = "fc65a93734197d85c6e6227d7f5f1a752236ab5f"; - public static final String IMC_BRANCH = "2015-09-27 fc65a93 (HEAD, tag: imc-5.4.6, origin/master, origin/HEAD, master)"; - public static final String IMC_COMMIT = "Jose Braga (eejbraga@gmail.com), Sun Sep 27 11:30:39 WEST 2015, Merge remote-tracking branch 'origin/feature/lbl-cleanup'"; + public static final String IMC_SHA = "e82d9629e7cd6b213dd36b2b9b70c5822124104e"; + public static final String IMC_BRANCH = "2015-10-13 e82d962 (HEAD, origin/master, origin/HEAD, master)"; + public static final String IMC_COMMIT = "Ricardo Martins (rasm@oceanscan-mst.com), Tue Oct 13 19:09:26 WEST 2015, Fixing commit a0694c7ebbeb4c6bfb93a333ced08fcc032663a6, the fields were from LblBeacon."; public static java.util.Map IMC_ADDRESSES = new java.util.LinkedHashMap(); @@ -55,12 +55,6 @@ public class ImcStringDefs { IMC_ADDRESSES.put("lauv-xplore-1", 30); IMC_ADDRESSES.put("lauv-xplore-2", 31); IMC_ADDRESSES.put("lauv-simulator-1", 209); - IMC_ADDRESSES.put("lauv-dolphin-1", 257); - IMC_ADDRESSES.put("lauv-lupis-1", 258); - IMC_ADDRESSES.put("lauv-dolphin-2", 259); - IMC_ADDRESSES.put("lauv-dolphin-3", 260); - IMC_ADDRESSES.put("lauv-oceaneco-1", 261); - IMC_ADDRESSES.put("lauv-oceaneco-2", 262); IMC_ADDRESSES.put("rov-ies", 1025); IMC_ADDRESSES.put("adamastor", 1026); IMC_ADDRESSES.put("swordfish", 2049); @@ -132,11 +126,8 @@ public class ImcStringDefs { IMC_ADDRESSES.put("ccu-lsts-0-108", 16492); IMC_ADDRESSES.put("europtus", 24575); IMC_ADDRESSES.put("doam", 24576); - IMC_ADDRESSES.put("lauv-dolphin-1-doam", 24577); IMC_ADDRESSES.put("lauv-seacon-1-aux", 24578); IMC_ADDRESSES.put("lauv-noptilus-3-aux", 24579); - IMC_ADDRESSES.put("lauv-dolphin-2-aux", 24580); - IMC_ADDRESSES.put("lauv-dolphin-3-aux", 24581); IMC_ADDRESSES.put("star", 32768); IMC_ADDRESSES.put("benthos-mgateway", 32784); IMC_ADDRESSES.put("manta-1", 32786); @@ -145,11 +136,8 @@ public class ImcStringDefs { IMC_ADDRESSES.put("manta-4", 32789); IMC_ADDRESSES.put("manta-5", 32790); IMC_ADDRESSES.put("manta-9", 32794); - IMC_ADDRESSES.put("manta-10", 32795); IMC_ADDRESSES.put("manta-11", 32796); IMC_ADDRESSES.put("manta-12", 32797); - IMC_ADDRESSES.put("manta-13", 32798); - IMC_ADDRESSES.put("manta-14", 32799); IMC_ADDRESSES.put("manta-15", 32800); IMC_ADDRESSES.put("manta-16", 32801); IMC_ADDRESSES.put("manta-21", 32806); @@ -216,7 +204,7 @@ public static String getDefinitions() { sb.append(" xsi:noNamespaceSchemaLocation=\"IMC.xsd\"\n"); sb.append(" name=\"IMC\"\n"); sb.append(" long-name=\"Inter Module Communication\"\n"); - sb.append(" version=\"5.4.5\">\n"); + sb.append(" version=\"5.4.6\">\n"); sb.append("\n"); sb.append(" \n"); sb.append(" This document describes the communications protocol associated\n"); @@ -1794,6 +1782,21 @@ public static String getDefinitions() { sb.append(" The beacon's depth.\n"); sb.append(" \n"); sb.append(" \n"); + sb.append(" \n"); + sb.append(" \n"); + sb.append(" Interrogation channel.\n"); + sb.append(" \n"); + sb.append(" \n"); + sb.append(" \n"); + sb.append(" \n"); + sb.append(" Reply channel.\n"); + sb.append(" \n"); + sb.append(" \n"); + sb.append(" \n"); + sb.append(" \n"); + sb.append(" Transponder delay.\n"); + sb.append(" \n"); + sb.append(" \n"); sb.append(" \n"); sb.append("\n"); sb.append(" \n"); @@ -8338,19 +8341,19 @@ public static String getDefinitions() { sb.append(" :ref:`ParametersXml` message.\n"); sb.append(" \n"); sb.append(" \n"); - sb.append(" \n"); + sb.append("\n"); sb.append(" \n"); - sb.append(" \n"); + sb.append("\n"); sb.append(" \n"); sb.append(" \t\n"); sb.append(" \n"); - sb.append(" \n"); + sb.append("\n"); sb.append(" \n"); sb.append(" \t\n"); sb.append(" \n"); - sb.append(" \n"); + sb.append("\n"); sb.append(" \n"); - sb.append(" \n"); + sb.append("\n"); sb.append("\n"); return sb.toString(); } diff --git a/src-generated/pt/lsts/imc/LblBeacon.java b/src-generated/pt/lsts/imc/LblBeacon.java index 3256f63a..be0bebb0 100644 --- a/src-generated/pt/lsts/imc/LblBeacon.java +++ b/src-generated/pt/lsts/imc/LblBeacon.java @@ -80,13 +80,16 @@ else if (msg.getMgid()!=m.getMgid()) return m; } - public LblBeacon(String beacon, double lat, double lon, float depth) { + public LblBeacon(String beacon, double lat, double lon, float depth, short query_channel, short reply_channel, short transponder_delay) { super(ID_STATIC); if (beacon != null) setBeacon(beacon); setLat(lat); setLon(lon); setDepth(depth); + setQueryChannel(query_channel); + setReplyChannel(reply_channel); + setTransponderDelay(transponder_delay); } /** @@ -149,4 +152,49 @@ public LblBeacon setDepth(double depth) { return this; } + /** + * @return Interrogation channel - uint8_t + */ + public short getQueryChannel() { + return (short) getInteger("query_channel"); + } + + /** + * @param query_channel Interrogation channel + */ + public LblBeacon setQueryChannel(short query_channel) { + values.put("query_channel", query_channel); + return this; + } + + /** + * @return Reply channel - uint8_t + */ + public short getReplyChannel() { + return (short) getInteger("reply_channel"); + } + + /** + * @param reply_channel Reply channel + */ + public LblBeacon setReplyChannel(short reply_channel) { + values.put("reply_channel", reply_channel); + return this; + } + + /** + * @return Transponder delay (ms) - uint8_t + */ + public short getTransponderDelay() { + return (short) getInteger("transponder_delay"); + } + + /** + * @param transponder_delay Transponder delay (ms) + */ + public LblBeacon setTransponderDelay(short transponder_delay) { + values.put("transponder_delay", transponder_delay); + return this; + } + }