diff --git a/README.md b/README.md
index 625ce35..0b99a42 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,10 @@ One way to think of this project is as a generator for the equivalent of the MOO
`init.sh` installs the Ubuntu packages needed to build IvPico:
-- [openocean-messages](https://github.com/openocean-software/openocean-messages), for the `Navigation` and `ControlSetpoint` messages, and MOOS-IvP's helm libraries built without MOOS ([GobySoft's `ivp-without-moos`](https://github.com/GobySoft/moos-ivp/tree/ivp-without-moos)), for the IvP solver and behaviors. Both come from [Open Ocean Software](https://github.com/openocean-software/openocean-build)'s continuous builds (apt.oceansoft.org), added if apt doesn't already have them.
-- Goby3, for the Goby app, adding [packages.gobysoft.org](http://packages.gobysoft.org)'s continuous builds if apt doesn't already have it. `init.sh --no-goby` leaves Goby3 out, and `build.sh` then skips the Goby app.
+- [openocean-messages](https://github.com/openocean-software/openocean-messages), for the `Navigation` and `ControlSetpoint` messages, and MOOS-IvP's helm libraries built without MOOS ([GobySoft's `ivp-without-moos`](https://github.com/GobySoft/moos-ivp/tree/ivp-without-moos)), for the IvP solver and behaviors.
+- Goby3, for the Goby app. `init.sh --no-goby` leaves Goby3 out, and `build.sh` then skips the Goby app.
+
+All of these come from [Open Ocean Software](https://github.com/openocean-software/openocean-build)'s continuous builds, with its releases for what they depend on (DCCL, MOOS, ...), at apt.oceansoft.org. `init.sh` adds both if apt can't install the packages already.
`build.sh` then builds IvPico in `build/` and installs it into `build/usr`.
diff --git a/init.sh b/init.sh
index d426ef8..aeca427 100755
--- a/init.sh
+++ b/init.sh
@@ -40,45 +40,43 @@ apt_install "${packages[@]}"
. /etc/os-release
-# openocean-messages and MOOS-IvP's helm libraries (built without MOOS), from Open Ocean
-# Software's continuous builds (apt.oceansoft.org) if apt doesn't have them yet
-oo_policy=$(apt-cache policy libivp-helm-dev)
-if ! grep -q "Candidate: [^(]" <<< "${oo_policy}"; then
- apt_install curl gpg
- keyring=/usr/share/keyrings/openocean-continuous.asc
- fingerprint=DAF08DD7788E6C84C6F8E8D3E59E1A81FECDB228
- key=$(curl -fsSL https://raw.githubusercontent.com/openocean-software/openocean-build/main/keys/continuous.asc)
+packages=(libopenocean-messages-dev libivp-helm-dev)
+if ${goby}; then
+ # libgoby3-dev only recommends libais-dev and dccl5-compiler, but goby's CMake package
+ # links libais.so, and goby_add_app() runs protoc-gen-dccl. MOOS-IvP's apps
+ # (pMarineViewer for the Goby launches) need libmoos-ivp but don't depend on it
+ packages+=(libgoby3-dev goby3-apps libais-dev dccl5-compiler
+ libgoby3-moos-dev goby3-moos moos10-mit-db moos-ivp-apps moos-ivp-gui libmoos-ivp)
+fi
+
+# Adds an apt.oceansoft.org channel to openocean_sources, checking its key's fingerprint
+openocean_sources=""
+add_openocean() {
+ local channel=$1 fingerprint=$2 key
+ local keyring=/usr/share/keyrings/openocean-${channel}.asc
+ key=$(curl -fsSL "https://raw.githubusercontent.com/openocean-software/openocean-build/main/keys/${channel}.asc")
if ! gpg --show-keys --with-colons <<< "${key}" | grep -q "^fpr:*${fingerprint}:"; then
- echo "The Open Ocean Software continuous key's fingerprint isn't ${fingerprint}" >&2
+ echo "The Open Ocean Software ${channel} key's fingerprint isn't ${fingerprint}" >&2
exit 1
fi
$SUDO tee "${keyring}" <<< "${key}" > /dev/null
- printf "Types: deb\nURIs: https://apt.oceansoft.org/continuous/%s-%s\nSuites: %s\nComponents: main\nSigned-By: %s\n" \
- "${ID}" "${VERSION_CODENAME}" "${VERSION_CODENAME}" "${keyring}" |
- $SUDO tee /etc/apt/sources.list.d/openocean.sources > /dev/null
- $SUDO apt-get update
-fi
-apt_install libopenocean-messages-dev libivp-helm-dev
+ openocean_sources+="Types: deb
+URIs: https://apt.oceansoft.org/${channel}/${ID}-${VERSION_CODENAME}
+Suites: ${VERSION_CODENAME}
+Components: main
+Signed-By: ${keyring}
-if ${goby}; then
- # Goby3, for src/bin/goby. If apt doesn't have it yet, add packages.gobysoft.org's
- # continuous builds, which have 'goby test' (newer than 3.6.1)
- goby_policy=$(apt-cache policy libgoby3-dev)
- if ! grep -q "Candidate: [^(]" <<< "${goby_policy}"; then
- apt_install curl gpg
- keyring=/usr/share/keyrings/gobysoft-archive-keyring.gpg
- if [ ! -f "${keyring}" ]; then
- curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x19478082E2F8D3FE" |
- gpg --dearmor | $SUDO tee "${keyring}" > /dev/null
- fi
- echo "deb [signed-by=${keyring}] http://packages.gobysoft.org/${ID}/continuous/ ${VERSION_CODENAME}/" |
- $SUDO tee /etc/apt/sources.list.d/gobysoft_continuous.list > /dev/null
- $SUDO apt-get update
- fi
- # libgoby3-dev only recommends these, but goby's CMake package links libais.so,
- # and goby_add_app() runs protoc-gen-dccl
- apt_install libgoby3-dev goby3-apps libais-dev dccl5-compiler
- # pMarineViewer for the Goby launches (viewer.launch), through goby_moos_gateway;
- # MOOS-IvP's apps need libmoos-ivp but don't depend on it
- apt_install libgoby3-moos-dev goby3-moos moosdb10 moos-ivp-apps moos-ivp-gui libmoos-ivp
+"
+}
+
+# If apt can't install them yet, add Open Ocean Software's continuous builds (for
+# openocean-messages, MOOS-IvP's helm libraries built without MOOS, and Goby3 with
+# 'goby test') and its releases, which have what those depend on (DCCL, MOOS, ...)
+if ! apt-get -s install "${packages[@]}" > /dev/null 2>&1; then
+ apt_install curl gpg
+ add_openocean continuous DAF08DD7788E6C84C6F8E8D3E59E1A81FECDB228
+ add_openocean release EAD278F6A25644C2C559DBB6D28A2EAB14D2A9E5
+ $SUDO tee /etc/apt/sources.list.d/openocean.sources <<< "${openocean_sources}" > /dev/null
+ $SUDO apt-get update
fi
+apt_install "${packages[@]}"
diff --git a/src/bin/goby/moos_gateway/CMakeLists.txt b/src/bin/goby/moos_gateway/CMakeLists.txt
index e6da492..5495c0c 100644
--- a/src/bin/goby/moos_gateway/CMakeLists.txt
+++ b/src/bin/goby/moos_gateway/CMakeLists.txt
@@ -3,6 +3,6 @@ goby_add_library(TARGET ivpico_moos_gateway_plugin
PROTOS moos_gateway_config.proto
PROTOC_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/proto
PROTO_IMPORT_DIRS ${PROJECT_SOURCE_DIR}/src/lib ${openocean_messages_PROTO_DIR}
- LINK_LIBRARIES goby_moos ivpico_helm)
+ LINK_LIBRARIES goby_moos ivpico_helm IVP::contacts IVP::geometry IVP::mbutil)
target_include_directories(ivpico_moos_gateway_plugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
install(TARGETS ivpico_moos_gateway_plugin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/bin/goby/moos_gateway/moos_gateway.cpp b/src/bin/goby/moos_gateway/moos_gateway.cpp
index c578c3f..bc60353 100644
--- a/src/bin/goby/moos_gateway/moos_gateway.cpp
+++ b/src/bin/goby/moos_gateway/moos_gateway.cpp
@@ -16,8 +16,9 @@
// along with IvPico. If not, see .
// goby_moos_gateway plugin that gives a MOOS community what pHelmIvP and its
-// navigation would post (NAV_*, the helm's postings, IVPHELM_*), so MOOS-IvP
-// tools such as pNodeReporter and pMarineViewer work with goby_helm_ivp.
+// navigation would post (NAV_*, the helm's postings, VIEW_*, NODE_MESSAGE_LOCAL,
+// IVPHELM_*), so MOOS-IvP tools such as pNodeReporter and pMarineViewer work
+// with goby_helm_ivp.
#include
@@ -28,6 +29,7 @@
#include
#include "groups.h"
+#include "helm/conversions.h"
#include "helm/status_strings.h"
#include "interface/ivp.pb.h"
#include "moos_gateway_config.pb.h"
@@ -53,6 +55,15 @@ class MOOSGatewayTranslation : public ::goby::moos::Translator
[this](const ivp::interface::Posting& posting) { post(posting); });
goby().interprocess().subscribe([this](const ivp::interface::Status& status)
{ post(status); });
+ goby().interprocess().subscribe(
+ [this](const ivp::interface::Visualization& vis)
+ {
+ const auto [var, spec] = helm::view_posting(vis);
+ moos().comms().Notify(var, spec);
+ });
+ goby().interprocess().subscribe(
+ [this](const ivp::interface::OffboardMessage& msg)
+ { moos().comms().Notify("NODE_MESSAGE_LOCAL", helm::node_message_spec(msg)); });
for (const auto& var : cfg_.to_helm())
moos().add_trigger(var, [this](const CMOOSMsg& msg) { to_helm(msg); });
diff --git a/src/lib/helm/conversions.cpp b/src/lib/helm/conversions.cpp
index c4c6b5a..c8c853f 100644
--- a/src/lib/helm/conversions.cpp
+++ b/src/lib/helm/conversions.cpp
@@ -20,6 +20,12 @@
#include
#include "MBUtils.h"
+#include "NodeMessage.h"
+#include "NodeMessageUtils.h"
+#include "XYFormatUtilsPoint.h"
+#include "XYFormatUtilsPoly.h"
+#include "XYFormatUtilsSegl.h"
+#include "XYFormatUtilsSeglr.h"
namespace ivpico
{
@@ -29,6 +35,66 @@ namespace
{
constexpr double degrees(double radians) { return radians * 180.0 / M_PI; }
constexpr double radians(double degrees) { return degrees * M_PI / 180.0; }
+
+void set_object_fields(ivp::interface::Visualization& v, const XYObject& object)
+{
+ v.set_label(object.get_label());
+ v.set_active(object.active());
+ v.set_id(object.get_id());
+ v.set_message(object.get_msg());
+ if (object.duration_set())
+ v.set_duration(object.get_duration());
+ if (object.color_set("vertex"))
+ v.set_vertex_color(object.get_color_str("vertex"));
+ if (object.color_set("edge"))
+ v.set_edge_color(object.get_color_str("edge"));
+ if (object.color_set("label"))
+ v.set_label_color(object.get_color_str("label"));
+ if (object.color_set("fill"))
+ v.set_fill_color(object.get_color_str("fill"));
+ if (object.vertex_size_set())
+ v.set_vertex_size(object.get_vertex_size());
+ if (object.edge_size_set())
+ v.set_edge_size(object.get_edge_size());
+ if (object.transparency_set())
+ v.set_transparency(object.get_transparency());
+}
+
+void get_object_fields(const ivp::interface::Visualization& v, XYObject& object)
+{
+ object.set_label(v.label());
+ object.set_active(v.active());
+ object.set_id(v.id());
+ object.set_msg(v.message());
+ if (v.time() != 0)
+ object.set_time(static_cast(v.time()) * 1e-6);
+ if (v.has_duration())
+ object.set_duration(v.duration());
+ if (!v.vertex_color().empty())
+ object.set_color("vertex", v.vertex_color());
+ if (!v.edge_color().empty())
+ object.set_color("edge", v.edge_color());
+ if (!v.label_color().empty())
+ object.set_color("label", v.label_color());
+ if (!v.fill_color().empty())
+ object.set_color("fill", v.fill_color());
+ if (v.has_vertex_size())
+ object.set_vertex_size(v.vertex_size());
+ if (v.has_edge_size())
+ object.set_edge_size(v.edge_size());
+ if (v.has_transparency())
+ object.set_transparency(v.transparency());
+}
+
+template void add_vertices(Shape& shape, const XYSegList& segl)
+{
+ for (unsigned i = 0; i < segl.size(); ++i)
+ {
+ auto& vertex = *shape.add_vertex();
+ vertex.set_x(segl.get_vx(i));
+ vertex.set_y(segl.get_vy(i));
+ }
+}
} // namespace
double heading_degrees(double radians)
@@ -128,5 +194,136 @@ void set_desired(openocean::ControlSetpoint& desired, const std::string& domain_
}
}
+std::optional visualization(const std::string& var,
+ const std::string& spec)
+{
+ ivp::interface::Visualization v;
+ if (var == "VIEW_POINT")
+ {
+ const XYPoint point = string2Point(spec);
+ if (!point.valid())
+ return std::nullopt;
+ set_object_fields(v, point);
+ v.mutable_point()->set_x(point.x());
+ v.mutable_point()->set_y(point.y());
+ if (point.z() != 0)
+ v.mutable_point()->set_z(point.z());
+ }
+ else if (var == "VIEW_SEGLIST")
+ {
+ const XYSegList segl = string2SegList(spec);
+ if (!segl.valid())
+ return std::nullopt;
+ set_object_fields(v, segl);
+ add_vertices(*v.mutable_seglist(), segl);
+ }
+ else if (var == "VIEW_POLYGON")
+ {
+ const XYPolygon poly = string2Poly(spec);
+ if (!poly.valid())
+ return std::nullopt;
+ set_object_fields(v, poly);
+ add_vertices(*v.mutable_polygon(), poly);
+ }
+ else if (var == "VIEW_SEGLR")
+ {
+ const XYSeglr seglr = string2Seglr(spec);
+ if (!seglr.valid())
+ return std::nullopt;
+ set_object_fields(v, seglr);
+ auto& out = *v.mutable_seglr();
+ for (unsigned i = 0; i < seglr.size(); ++i)
+ {
+ auto& vertex = *out.add_vertex();
+ vertex.set_x(seglr.getVX(i));
+ vertex.set_y(seglr.getVY(i));
+ }
+ out.set_ray_angle(seglr.getRayAngle());
+ out.set_ray_length(seglr.getRayLen());
+ out.set_head_size(seglr.getHeadSize());
+ }
+ else
+ return std::nullopt;
+ return v;
+}
+
+std::optional offboard_message(const std::string& spec)
+{
+ const NodeMessage msg = string2NodeMessage(spec);
+ if (!msg.valid())
+ return std::nullopt;
+
+ ivp::interface::OffboardMessage out;
+ out.set_source_node(msg.getSourceNode());
+ out.set_destination_node(msg.getDestNode());
+ out.set_destination_group(msg.getDestGroup());
+ out.set_key(msg.getVarName());
+ if (tokStringParse(spec, "double_val", ',', '=').empty())
+ out.set_sval(msg.getStringVal());
+ else
+ out.set_dval(msg.getDoubleVal());
+ out.set_source_app(msg.getSourceApp());
+ out.set_source_behavior(msg.getSourceBehavior());
+ out.set_color(msg.getColor());
+ out.set_message_id(msg.getMessageID());
+ out.set_ack_requested(msg.getAckRequested());
+ return out;
+}
+
+std::pair view_posting(const ivp::interface::Visualization& vis)
+{
+ if (vis.has_point())
+ {
+ XYPoint point(vis.point().x(), vis.point().y(), vis.point().z());
+ get_object_fields(vis, point);
+ return {"VIEW_POINT", point.get_spec()};
+ }
+ if (vis.has_polygon())
+ {
+ XYPolygon poly;
+ for (const auto& v : vis.polygon().vertex()) poly.add_vertex(v.x(), v.y(), false);
+ poly.determine_convexity();
+ get_object_fields(vis, poly);
+ return {"VIEW_POLYGON", poly.get_spec()};
+ }
+ if (vis.has_seglr())
+ {
+ XYSeglr seglr;
+ for (const auto& v : vis.seglr().vertex()) seglr.addVertex(v.x(), v.y());
+ seglr.setRayAngle(vis.seglr().ray_angle());
+ if (vis.seglr().has_ray_length())
+ seglr.setRayLen(vis.seglr().ray_length());
+ if (vis.seglr().has_head_size())
+ seglr.setHeadSize(vis.seglr().head_size());
+ get_object_fields(vis, seglr);
+ return {"VIEW_SEGLR", seglr.get_spec()};
+ }
+ XYSegList segl;
+ for (const auto& v : vis.seglist().vertex()) segl.add_vertex(v.x(), v.y());
+ get_object_fields(vis, segl);
+ return {"VIEW_SEGLIST", segl.get_spec()};
+}
+
+std::string node_message_spec(const ivp::interface::OffboardMessage& msg)
+{
+ NodeMessage out;
+ out.setSourceNode(msg.source_node());
+ out.setDestNode(msg.destination_node());
+ out.setDestGroup(msg.destination_group());
+ out.setVarName(msg.key());
+ if (msg.value_case() == ivp::interface::OffboardMessage::kDval)
+ out.setDoubleVal(msg.dval());
+ else
+ out.setStringVal(msg.sval());
+ out.setSourceApp(msg.source_app());
+ out.setSourceBehavior(msg.source_behavior());
+ if (!msg.color().empty())
+ out.setColor(msg.color());
+ out.setMessageID(msg.message_id());
+ if (msg.ack_requested())
+ out.setAckRequested();
+ return out.getSpec();
+}
+
} // namespace helm
} // namespace ivpico
diff --git a/src/lib/helm/conversions.h b/src/lib/helm/conversions.h
index 990b8f3..3fc4e62 100644
--- a/src/lib/helm/conversions.h
+++ b/src/lib/helm/conversions.h
@@ -20,6 +20,7 @@
#include
#include
+#include
#include "NodeRecord.h"
@@ -44,6 +45,20 @@ std::string able_filter_string(const ivp::interface::Command::AbleFilter& filter
// Sets the setpoint field for the decision on a helm domain variable
void set_desired(openocean::ControlSetpoint& desired, const std::string& domain_var, double value);
+// A VIEW_POINT, VIEW_SEGLIST, VIEW_POLYGON or VIEW_SEGLR posting as a
+// Visualization, or nothing for another variable or a spec that doesn't parse
+std::optional visualization(const std::string& var,
+ const std::string& spec);
+
+// A NODE_MESSAGE_LOCAL posting as an OffboardMessage, or nothing if it doesn't parse
+std::optional offboard_message(const std::string& spec);
+
+// The variable (VIEW_POINT, etc.) and spec that pHelmIvP would post for a Visualization
+std::pair view_posting(const ivp::interface::Visualization& vis);
+
+// The NODE_MESSAGE_LOCAL spec for an OffboardMessage
+std::string node_message_spec(const ivp::interface::OffboardMessage& msg);
+
} // namespace helm
} // namespace ivpico
diff --git a/src/lib/helm/helm.cpp b/src/lib/helm/helm.cpp
index e9dd4ff..1e3b157 100644
--- a/src/lib/helm/helm.cpp
+++ b/src/lib/helm/helm.cpp
@@ -158,7 +158,11 @@ class Helm::Impl
private:
void configure();
+ void build_behaviors();
void start(double time);
+ void restart(const std::string& type);
+ void update_configuration();
+ bool skewed(const std::string& var, double msg_time);
// mail
void apply_pending(double time);
@@ -219,6 +223,9 @@ class Helm::Impl
bool park_on_allstop_{true};
double nav_grace_{5};
double defer_window_{1};
+ double ok_skew_{60};
+ bool restart_post_pending_{false};
+ std::string configuration_;
bool started_{false};
double curr_time_{0};
@@ -268,20 +275,6 @@ void Helm::Impl::configure()
if (cfg_.has_defer_window())
defer_window_ = cfg_.defer_window();
- for (const auto& d : cfg_.domain())
- {
- unsigned points = d.points();
- const double range = d.high() - d.low();
- if (d.resolution_case() == HelmConfig::Domain::kDelta && d.delta() > 0 && range > 0 &&
- d.delta() <= range)
- points = static_cast(range / d.delta() + 1);
- if (d.high() < d.low() || (range == 0 && points != 1) ||
- !domain_.addDomain(d.name().c_str(), d.low(), d.high(), points))
- config_warnings_.push_back("Bad domain: " + d.ShortDebugString());
- if (d.optional())
- optional_vars_.insert(d.name());
- }
-
if (geodesy_)
ledger_.setGeodesy(geodesy_->to_local, geodesy_->to_global);
double contact_max_age = cfg_.has_contact_max_age() ? cfg_.contact_max_age() : 45;
@@ -312,6 +305,35 @@ void Helm::Impl::configure()
if (!cfg_.has_seed_random() || cfg_.seed_random())
srand(static_cast(time(nullptr) * 31 + getpid()));
+ if (cfg_.has_ok_skew())
+ ok_skew_ = cfg_.ok_skew();
+
+ build_behaviors();
+}
+
+// The behaviors and the domain, at startup and on each restart
+void Helm::Impl::build_behaviors()
+{
+ delete bhv_set_;
+ bhv_set_ = nullptr;
+ engine_.reset();
+ domain_ = IvPDomain();
+ optional_vars_.clear();
+
+ for (const auto& d : cfg_.domain())
+ {
+ unsigned points = d.points();
+ const double range = d.high() - d.low();
+ if (d.resolution_case() == HelmConfig::Domain::kDelta && d.delta() > 0 && range > 0 &&
+ d.delta() <= range)
+ points = static_cast(range / d.delta() + 1);
+ if (d.high() < d.low() || (range == 0 && points != 1) ||
+ !domain_.addDomain(d.name().c_str(), d.low(), d.high(), points))
+ config_warnings_.push_back("Bad domain: " + d.ShortDebugString());
+ if (d.optional())
+ optional_vars_.insert(d.name());
+ }
+
if (!config_warnings_.empty())
return;
@@ -366,6 +388,90 @@ void Helm::Impl::start(double time)
notify("IVPHELM_MODESET", bhv_set_->getModeSetDefinition());
if (!cfg_.helm_alias().empty())
notify("IVPHELM_ALIAS", cfg_.helm_alias());
+ update_configuration();
+}
+
+// HelmIvP's RESTART_HELM: type1 rebuilds the behaviors, type2 also posts the
+// "initialize" variables again. Unlike pHelmIvP, the behavior files are kept.
+void Helm::Impl::restart(const std::string& type)
+{
+ if (type != "type1" && type != "type2")
+ return;
+
+ outgoing_strings_.clear();
+ outgoing_doubles_.clear();
+ init_vars_done_ = false;
+ config_warnings_.clear();
+ build_behaviors();
+ if (!config_warnings_.empty())
+ {
+ status_ = Status::MALCONFIG;
+ has_control_ = false;
+ return;
+ }
+
+ if (type == "type2")
+ post_initial_variables(false);
+ register_variables();
+ notify("IVPHELM_DOMAIN", domainToString(domain_));
+ notify("IVPHELM_MODESET", bhv_set_->getModeSetDefinition());
+ if (!cfg_.helm_alias().empty())
+ notify("IVPHELM_ALIAS", cfg_.helm_alias());
+ restart_post_pending_ = true;
+ add_behavior_event(BehaviorEvent::WARNING, "", "The helm has been restarted");
+ update_configuration();
+}
+
+// IVPHELM_DOMAIN, IVPHELM_MODESET, IVPHELM_STATEVARS, IVPHELM_UPDATEVARS and
+// IVPHELM_REGISTER as one Configuration, output when any of them changes
+void Helm::Impl::update_configuration()
+{
+ if (!bhv_set_)
+ return;
+
+ ivp::interface::Configuration c;
+ c.set_alias(cfg_.helm_alias());
+ for (unsigned i = 0; i < domain_.size(); ++i)
+ {
+ auto& d = *c.add_domain();
+ d.set_name(domain_.getVarName(i));
+ d.set_low(domain_.getVarLow(i));
+ d.set_high(domain_.getVarHigh(i));
+ d.set_points(domain_.getVarPoints(i));
+ d.set_optional_decision(optional_vars_.count(d.name()) > 0);
+ }
+ c.set_mode_set(bhv_set_->getModeSetDefinition());
+ for (const auto& var : parseString(bhv_set_->getStateSpaceVars(), ','))
+ if (!var.empty())
+ c.add_state_variable(var);
+ for (auto pair : parseString(bhv_set_->getUpdateVarSummary(), ','))
+ {
+ if (pair.empty())
+ continue;
+ auto& u = *c.add_update_variable();
+ u.set_behavior(biteStringX(pair, '='));
+ u.set_variable(pair);
+ }
+ for (const auto& var : registered_) c.add_subscription(var);
+
+ const std::string serialized = c.SerializeAsString();
+ if (serialized == configuration_)
+ return;
+ configuration_ = serialized;
+ c.set_time(micros(curr_time_));
+ output_.configuration = c;
+}
+
+// HelmIvP::OnNewMail ignores mail more than ok_skew from the helm's clock
+bool Helm::Impl::skewed(const std::string& var, double msg_time)
+{
+ const double skew = std::fabs(curr_time_ - msg_time);
+ if (ok_skew_ < 0 || skew <= ok_skew_ || var == "HELM_MAP_CLEAR")
+ return false;
+ const std::string msg = "Helm ignores " + var + " due to skew: " + doubleToString(skew, 2);
+ add_behavior_event(BehaviorEvent::WARNING, "", msg);
+ notify("IVPHELM_SKEW", msg + " curr_time: " + doubleToString(curr_time_, 3));
+ return true;
}
const Output& Helm::Impl::iterate(double time)
@@ -439,6 +545,12 @@ const Output& Helm::Impl::iterate(double time)
if (time - start_time_ < 1)
return output_;
+ if (restart_post_pending_)
+ {
+ notify("IVPHELM_RESTARTED", "true");
+ restart_post_pending_ = false;
+ }
+
update_plat_model();
report_ = engine_->determineNextDecision(bhv_set_, time);
iteration_ = report_.getIteration();
@@ -457,6 +569,10 @@ const Output& Helm::Impl::iterate(double time)
post_life_events();
post_decisions();
+ if (bhv_set_->refreshMapUpdateVars())
+ notify("IVPHELM_UPDATEVARS", bhv_set_->getUpdateVarSummary());
+ update_configuration();
+
fill_status();
info_buffer_.clearDeltaVectors();
return output_;
@@ -467,9 +583,16 @@ void Helm::Impl::apply_pending(double time)
for (const auto& input : pending_)
{
if (const auto* nav = std::get_if(&input))
- apply(*nav, time);
+ {
+ // a contact's time is when it was reported, which the ledger ages itself
+ if (!nav->self() || nav->nav().time() == 0 ||
+ !skewed("NAV", seconds(nav->nav().time(), time)))
+ apply(*nav, time);
+ }
else if (const auto* var = std::get_if(&input))
{
+ if (var->time() != 0 && skewed(var->key(), seconds(var->time(), time)))
+ continue;
Value value;
value.is_string = var->value_case() == Variable::kSval;
value.d = var->dval();
@@ -559,6 +682,11 @@ void Helm::Impl::apply(const Command& command, double time)
apply_variable("BHV_ABLE_FILTER",
Value{true, 0, able_filter_string(command.able_filter())}, time);
break;
+ case Command::kRestart:
+ restart(command.restart().type() == Command::Restart::REBUILD_AND_REINITIALIZE ? "type2"
+ : command.restart().type() == Command::Restart::REBUILD_BEHAVIORS ? "type1"
+ : "");
+ break;
case Command::kCommsPolicy:
comms_policy_ = tolower(Command::CommsPolicy_Name(command.comms_policy()));
break;
@@ -593,11 +721,10 @@ void Helm::Impl::apply_variable(const std::string& var, const Value& value, doub
set_manual_override(true);
store();
}
+ else if (var == "RESTART_HELM")
+ restart(sval);
// Status is always complete, so there's nothing to rejournal
- else if (var == "IVPHELM_STATE" || var == "DB_CLIENTS" || var == "RESTART_HELM" ||
- var == "IVPHELM_REJOURNAL")
- {
- }
+ else if (var == "IVPHELM_STATE" || var == "DB_CLIENTS" || var == "IVPHELM_REJOURNAL") {}
else if (var == "BHV_ABLE_FILTER")
engine_->addAbleFilterMsg(sval);
else if (var == "NODE_REPORT_LOCAL")
@@ -875,13 +1002,28 @@ void Helm::Impl::post_behavior_messages()
if (auto kind = behavior_event_kind(var, key))
add_behavior_event(*kind, bhv,
value.is_string ? value.s : doubleToStringX(value.d));
+ else if (auto vis = value.is_string ? visualization(var, value.s) : std::nullopt)
+ {
+ vis->set_time(micros(curr_time_));
+ vis->set_behavior(bhv);
+ vis->set_iteration(iteration_);
+ output_.visualizations.push_back(*vis);
+ }
+ else if (auto msg = var == "NODE_MESSAGE_LOCAL" && value.is_string
+ ? offboard_message(value.s)
+ : std::nullopt)
+ {
+ msg->set_time(micros(curr_time_));
+ output_.offboard_messages.push_back(*msg);
+ }
else
add_posting(Posting::BEHAVIOR, bhv, var, value);
notify(var, value);
}
}
- bhv_set_->updateStateSpaceVars();
+ if (bhv_set_->updateStateSpaceVars())
+ notify("IVPHELM_STATEVARS", bhv_set_->getStateSpaceVars());
bhv_set_->removeCompletedBehaviors();
}
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index e627d9b..cc162a6 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -3,11 +3,12 @@ target_link_libraries(check_helm_libs PRIVATE IVP::helmivp IVP::ivpbuild IVP::iv
add_test(NAME helm_libs COMMAND check_helm_libs)
add_executable(test_helm helm/test_helm.cpp)
-target_link_libraries(test_helm PRIVATE ivpico_helm)
+target_link_libraries(test_helm PRIVATE ivpico_helm IVP::contacts IVP::geometry IVP::mbutil)
add_test(NAME helm COMMAND test_helm)
add_executable(replay missions/replay.cpp)
-target_link_libraries(replay PRIVATE ivpico_helm)
+# conversions.h includes MOOS-IvP headers
+target_link_libraries(replay PRIVATE ivpico_helm IVP::contacts IVP::geometry IVP::mbutil)
file(GLOB fixtures LIST_DIRECTORIES true ${CMAKE_CURRENT_SOURCE_DIR}/missions/fixtures/*)
foreach(fixture ${fixtures})
if(IS_DIRECTORY ${fixture})
diff --git a/src/test/helm/test_helm.cpp b/src/test/helm/test_helm.cpp
index a20c255..d93abb3 100644
--- a/src/test/helm/test_helm.cpp
+++ b/src/test/helm/test_helm.cpp
@@ -26,13 +26,16 @@
//
// Prints one line per failed check and exits non-zero if there were any.
+#include
#include
#include
#include
#include
#include
+#include
#include
+#include "helm/conversions.h"
#include "helm/helm.h"
using ivp::interface::Command;
@@ -452,6 +455,272 @@ Behavior = BHV_AvoidCollision
check(able_filter, scenario, "no BHV_ABLE_FILTER from XYZ_DISABLE_TARGET");
}
+// Behaviors' VIEW_* and NODE_MESSAGE_LOCAL posts come out typed. A waypoint
+// behavior draws its track point (VIEW_POINT) and its path (VIEW_SEGLIST), and
+// a timer's endflag posts a NODE_MESSAGE_LOCAL. Checks:
+// - a Visualization with a point and one with a seglist of the 3 waypoints,
+// each from waypt;
+// - an OffboardMessage to all, with key FOO and sval "bar";
+// - no VIEW_POINT, VIEW_SEGLIST or NODE_MESSAGE_LOCAL Posting.
+void typed_outputs()
+{
+ const std::string scenario = "typed_outputs";
+ auto cfg = config(write_bhv(scenario, R"(
+Behavior = BHV_Waypoint
+{
+ name = waypt
+ speed = 2
+ points = 0,40:40,40:40,0
+}
+Behavior = BHV_Timer
+{
+ name = timer
+ duration = 2
+ endflag = NODE_MESSAGE_LOCAL = src_node=alpha,dest_node=all,var_name=FOO,string_val=bar
+}
+)"));
+ cfg.set_start_in_drive(true);
+ Helm helm(cfg);
+ check(helm.config_warnings().empty(), scenario, "config warnings");
+
+ Vehicle vehicle;
+ double t = t0;
+ bool point = false, seglist = false, offboard = false, view_posting = false;
+ for (int i = 0; i < 40; ++i)
+ {
+ helm.handle(vehicle.navigation(t));
+ const Output& out = helm.iterate(t);
+ for (const auto& v : out.visualizations)
+ {
+ if (v.behavior() != "waypt")
+ continue;
+ point = point || v.has_point();
+ seglist = seglist || (v.has_seglist() && v.seglist().vertex_size() == 3);
+ }
+ for (const auto& m : out.offboard_messages)
+ offboard = offboard ||
+ (m.destination_node() == "all" && m.key() == "FOO" && m.sval() == "bar");
+ for (const auto& p : out.postings)
+ view_posting = view_posting || p.key() == "VIEW_POINT" || p.key() == "VIEW_SEGLIST" ||
+ p.key() == "NODE_MESSAGE_LOCAL";
+ if (out.solution)
+ vehicle.follow(*out.solution);
+ t += dt;
+ }
+ check(point, scenario, "no point Visualization from waypt");
+ check(seglist, scenario, "no seglist Visualization of the 3 waypoints");
+ check(offboard, scenario, "no OffboardMessage FOO=bar to all");
+ check(!view_posting, scenario, "a VIEW_* or NODE_MESSAGE_LOCAL Posting");
+}
+
+// The Configuration output: on the first iteration, with the course and speed
+// domains, and the subscriptions (e.g. MOOS_MANUAL_OVERRIDE); then only when
+// something changes. The spawn template's updates variable (SPAWN_CH) is a
+// subscription too.
+void configuration()
+{
+ const std::string scenario = "configuration";
+ auto cfg = config(write_bhv(scenario, R"(
+Behavior = BHV_ConstantHeading
+{
+ name = ch_
+ templating = spawn
+ updates = SPAWN_CH
+ duration = no-time-limit
+ heading = 0
+}
+)"));
+ Helm helm(cfg);
+ Vehicle vehicle;
+ double t = t0;
+ int count = 0;
+ std::optional first;
+ for (int i = 0; i < 10; ++i)
+ {
+ helm.handle(vehicle.navigation(t));
+ const Output& out = helm.iterate(t);
+ if (out.configuration)
+ {
+ ++count;
+ if (!first)
+ first = *out.configuration;
+ }
+ t += dt;
+ }
+ check(first.has_value(), scenario, "no Configuration");
+ if (!first)
+ return;
+ check(count == 1, scenario, std::to_string(count) + " Configurations, unchanged");
+ check(first->domain_size() == 2 && first->domain(0).name() == "course" &&
+ first->domain(0).points() == 360,
+ scenario, "domains: " + first->ShortDebugString());
+ auto subscribed = [&](const std::string& var)
+ {
+ return std::find(first->subscription().begin(), first->subscription().end(), var) !=
+ first->subscription().end();
+ };
+ check(subscribed("MOOS_MANUAL_OVERRIDE"), scenario, "not subscribed to MOOS_MANUAL_OVERRIDE");
+ check(subscribed("SPAWN_CH"), scenario, "not subscribed to SPAWN_CH");
+}
+
+// RESTART_HELM rebuilds the behaviors from the same files, read again.
+// The behavior file asks for course 90; it's rewritten to ask for 180, and:
+// - with RESTART_HELM = type1, the course becomes 180, and the "initialize"
+// variable isn't posted again;
+// - with Command.restart REBUILD_AND_REINITIALIZE (type2), it is.
+void restart(bool reinitialize)
+{
+ const std::string scenario =
+ std::string("restart (") + (reinitialize ? "type2" : "type1") + ")";
+ const std::string name = std::string("restart_") + (reinitialize ? "2" : "1");
+ auto bhv = [](int heading)
+ {
+ return "initialize FOO = 1\nBehavior = BHV_ConstantHeading\n{\n name = ch\n heading = " +
+ std::to_string(heading) + "\n duration = no-time-limit\n}\n";
+ };
+ auto cfg = config(write_bhv(name, bhv(90)));
+ cfg.mutable_domain(1)->set_optional(true);
+ cfg.set_start_in_drive(true);
+ Helm helm(cfg);
+
+ Vehicle vehicle;
+ double t = t0;
+ bool course_90 = false, course_180 = false;
+ int initializes = 0;
+ for (int i = 0; i < 30; ++i)
+ {
+ helm.handle(vehicle.navigation(t));
+ if (i == 10)
+ {
+ write_bhv(name, bhv(180));
+ if (reinitialize)
+ {
+ Command c;
+ c.mutable_restart()->set_type(Command::Restart::REBUILD_AND_REINITIALIZE);
+ helm.handle(c);
+ }
+ else
+ helm.handle(variable("RESTART_HELM", "type1"));
+ }
+ const Output& out = helm.iterate(t);
+ for (const auto& p : out.postings)
+ if (p.origin() == Posting::INITIALIZE && p.key() == "FOO")
+ ++initializes;
+ if (out.solution && out.solution->allstop() == ivp::interface::CLEAR)
+ {
+ const double course = desired_course(*out.solution);
+ if (i < 10 && std::fabs(course - 90) < 1)
+ course_90 = true;
+ if (i > 10 && std::fabs(course - 180) < 1)
+ course_180 = true;
+ }
+ t += dt;
+ }
+ check(course_90, scenario, "never course 90 before the restart");
+ check(course_180, scenario, "never course 180 after the restart");
+ check(initializes == (reinitialize ? 2 : 1), scenario,
+ "FOO initialized " + std::to_string(initializes) + " times");
+}
+
+// Inputs more than ok_skew (here 10 s) from the helm's clock are ignored, with
+// a warning; others go in. DEPLOY is set with a timestamp 30 s old, then with
+// a current one: only the second turns MODE to ACTIVE.
+void ok_skew()
+{
+ const std::string scenario = "ok_skew";
+ auto cfg = config(write_bhv(scenario, R"(
+initialize DEPLOY = false
+set MODE = ACTIVE {
+ DEPLOY = true
+} INACTIVE
+Behavior = BHV_ConstantHeading
+{
+ name = ch
+ heading = 90
+ duration = no-time-limit
+}
+)"));
+ cfg.mutable_domain(1)->set_optional(true);
+ cfg.set_start_in_drive(true);
+ cfg.set_ok_skew(10);
+ Helm helm(cfg);
+
+ Vehicle vehicle;
+ double t = t0;
+ bool warned = false, active_early = false, active = false;
+ for (int i = 0; i < 30; ++i)
+ {
+ helm.handle(vehicle.navigation(t));
+ Variable deploy = variable("DEPLOY", "true");
+ if (i == 10)
+ {
+ deploy.set_time(static_cast((t - 30) * 1e6));
+ helm.handle(deploy);
+ }
+ if (i == 20)
+ {
+ deploy.set_time(static_cast(t * 1e6));
+ helm.handle(deploy);
+ }
+ const Output& out = helm.iterate(t);
+ for (const auto& e : out.behavior_events)
+ warned = warned || e.text().find("Helm ignores DEPLOY due to skew") == 0;
+ if (mode(out) == "ACTIVE")
+ {
+ if (i < 20)
+ active_early = true;
+ active = true;
+ }
+ t += dt;
+ }
+ check(warned, scenario, "no skew warning for the old DEPLOY");
+ check(!active_early, scenario, "acted on the old DEPLOY");
+ check(active, scenario, "never ACTIVE after the current DEPLOY");
+}
+
+// The VIEW_* and NODE_MESSAGE_LOCAL conversions go both ways: each spec, as
+// pHelmIvP's behaviors post them, parses to a Visualization (or
+// OffboardMessage) that converts back to a spec parsing to the same message.
+void conversion_round_trip()
+{
+ const std::string scenario = "conversion_round_trip";
+ using ivpico::helm::visualization;
+ for (const auto& [var, spec] : std::vector>{
+ {"VIEW_POINT", "x=22.77,y=-27.59,label=alpha's trackpt,label_color=yellow,"
+ "vertex_color=yellow,vertex_size=4"},
+ {"VIEW_SEGLIST", "pts={23.8,-80.1:103.2,-70.1},label=abe_avdcol_ben,"
+ "label_color=white,edge_color=white,duration=100"},
+ {"VIEW_SEGLIST", "pts={0,0:9,0:0,9},label=abe_avdcol_ben,active=false"},
+ {"VIEW_POLYGON", "pts={0,-55:14.1,-60.9:20,-75:14.1,-89.1:0,-95},label=abe_LOITER,"
+ "edge_color=orange,vertex_color=white,edge_size=1"},
+ {"VIEW_SEGLR", "pts={151.6,-113.7:151.6,-113.6},ray=11,label=ben_seglr,"
+ "vertex_color=lime_green,vertex_size=2,ray_len=20,head_size=1"}})
+ {
+ const auto first = visualization(var, spec);
+ check(first.has_value(), scenario, "doesn't parse: " + spec);
+ if (!first)
+ continue;
+ const auto [back_var, back_spec] = ivpico::helm::view_posting(*first);
+ const auto second = visualization(back_var, back_spec);
+ check(back_var == var && second && second->ShortDebugString() == first->ShortDebugString(),
+ scenario, spec + " came back as " + back_var + " " + back_spec);
+ }
+
+ const std::string msg_spec =
+ "src_node=henry,dest_node=gilda,var_name=MOVE_ON,string_val=true,src_app=pHelmIvP,"
+ "src_bhv=ping";
+ const auto msg = ivpico::helm::offboard_message(msg_spec);
+ check(msg && msg->key() == "MOVE_ON" && msg->sval() == "true" &&
+ msg->destination_node() == "gilda" && msg->source_behavior() == "ping",
+ scenario, "NODE_MESSAGE_LOCAL: " + (msg ? msg->ShortDebugString() : "no parse"));
+ if (msg)
+ {
+ const auto again = ivpico::helm::offboard_message(ivpico::helm::node_message_spec(*msg));
+ check(again && again->ShortDebugString() == msg->ShortDebugString(), scenario,
+ "NODE_MESSAGE_LOCAL came back as " + ivpico::helm::node_message_spec(*msg));
+ }
+}
+
// Allstop reasons and park-on-allstop:
// - no speed decision with a required speed domain gives
// MISSING_DECISION_VARIABLES. pHelmIvP gives a missing decision an
@@ -588,6 +857,12 @@ int main()
spawn();
contact_alert(true);
contact_alert(false);
+ typed_outputs();
+ conversion_round_trip();
+ configuration();
+ restart(false);
+ restart(true);
+ ok_skew();
allstop();
malconfig();
deferred_initialize();
diff --git a/src/test/missions/fixtures/m11_kahuna.gilda/m11_kahuna.gilda.alog.xz b/src/test/missions/fixtures/m11_kahuna.gilda/m11_kahuna.gilda.alog.xz
new file mode 100644
index 0000000..766c40a
Binary files /dev/null and b/src/test/missions/fixtures/m11_kahuna.gilda/m11_kahuna.gilda.alog.xz differ
diff --git a/src/test/missions/fixtures/m11_kahuna.gilda/m11_kahuna.gilda.moos b/src/test/missions/fixtures/m11_kahuna.gilda/m11_kahuna.gilda.moos
new file mode 100644
index 0000000..cddcda4
--- /dev/null
+++ b/src/test/missions/fixtures/m11_kahuna.gilda/m11_kahuna.gilda.moos
@@ -0,0 +1,366 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% LOG FILE: ./LOG_GILDA_13_11_2026_____05_07_01/LOG_GILDA_13_11_2026_____05_07_01._moos
+%% FILE OPENED ON Thu Jan 1 00:00:00 1970
+%% LOGSTART 7178185687.310444
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ServerHost = localhost
+ServerPort = 9002
+
+// Community name IS the vehicle name
+Community = gilda
+
+//---- Next Line was commented and replaced with a command line overload ---- //
+//MOOSTimeWarp = 4 (default)
+MOOSTimeWarp = 4
+LatOrigin = 43.825300
+LongOrigin = -70.330400
+
+
+//--------------------------------------------------------
+// uTimerScript Configuration Block
+
+ProcessConfig = uTimerScript
+{
+ AppTick = 4
+ CommsTick = 4
+
+ PAUSED = false
+ RESET_MAX = unlimited
+ RESET_TIME = 100
+
+ RANDVAR = varname=S, min=1, max=3, key=at_reset
+
+// EVENT = var=NODE_MESSAGE_LOCAL, val="src_node=gilda,dest_node=all,var_name=GILDA_UPDATES,string_val=speed=$[S]", time=0:5
+ EVENT = var=GILDA_UPDATES, val="speed=$[S]", time=0:5
+}
+
+
+
+
+
+
+//------------------------------------------------------------
+ProcessConfig = ANTLER
+{
+ Run = uTimerScript @ NewConsole = false ~ uTimerScript_record
+ MSBetweenLaunches = 100
+
+ Run = MOOSDB @ NewConsole = false
+ Run = pLogger @ NewConsole = false
+ Run = uSimMarineV22 @ NewConsole = false
+ Run = pNodeReporter @ NewConsole = false
+ Run = pMarinePIDV22 @ NewConsole = false
+ Run = pHelmIvP @ NewConsole = false
+ Run = uProcessWatch @ NewConsole = false
+
+ Run = pShare @ NewConsole = false
+ Run = pHostInfo @ NewConsole = false
+ Run = uFldNodeBroker @ NewConsole = false
+ Run = uFldMessageHandler @ NewConsole = false
+ Run = uTimerScript @ NewConsole = false
+}
+
+//---------------------------------------------------------
+// pShare Config Block (Created from Plugin)
+
+ProcessConfig = pShare
+{
+ AppTick = 2
+ CommsTick = 2
+
+ input = route = localhost:9302
+
+ // =======================================================
+ // Usage Info below
+ // =======================================================
+
+ // Simple forward of X to A on channel 8
+ // output = src_name = X,dest_name=A, route=multicast_8
+
+ // Simple forward of Y to B on a udp address
+
+ //output = src_name=Y, dest_name=B, route=localhost:9300
+
+ // Simple forward of Z to Z on a named address (no renaming)
+ // output = src_name = Z, route = oceanai.mit.edu:9020
+
+ // Setting up an input
+ // input = route = multicast_9
+
+ //input = route = localhost:9302 & multicast_9
+
+
+ // Setting up lots of inputs at once
+ // input = route = "localhost:9069 & multicast_19 & multicast_65"
+}
+
+
+//--------------------------------------------------
+// pHostInfo configuration block from plugin
+
+ProcessConfig = pHostInfo
+{
+ AppTick = 1
+ CommsTick = 1
+
+ DEFAULT_HOSTIP = localhost
+}
+
+
+//--------------------------------------------------
+// pLogger Configuration Block (Created from Plugin)
+
+ProcessConfig = pLogger
+{
+ Log = AIS_REPORT @ 0 NOSYNC
+ Log = AIS_REPORT_LOCAL @ 0 NOSYNC
+ Log = APPCAST @ 0 NOSYNC
+ Log = AVD_DEBUG @ 0 NOSYNC
+ Log = AVOIDING @ 0 NOSYNC
+ Log = BCM_ALERT_REQUEST @ 0 NOSYNC
+ Log = BHV_ABLE_FILTER @ 0 NOSYNC
+ Log = BHV_IPF @ 0 NOSYNC
+ Log = BHV_SETTINGS @ 0 NOSYNC
+ Log = BHV_STATUS @ 0 NOSYNC
+ Log = BHV_WARNING @ 0 NOSYNC
+ Log = CONTACT_INFO @ 0 NOSYNC
+ Log = CONTACT_RESOLVED @ 0 NOSYNC
+ Log = CYCLE_INDEX @ 0 NOSYNC
+ Log = DB_CLIENTS @ 0 NOSYNC
+ Log = DEPLOY @ 0 NOSYNC
+ Log = DESIRED_HEADING @ 0 NOSYNC
+ Log = DESIRED_SPEED @ 0 NOSYNC
+ Log = GILDA_UPDATES @ 0 NOSYNC
+ Log = HELM_MAP_CLEAR @ 0 NOSYNC
+ Log = IVPHELM_ALLSTOP @ 0 NOSYNC
+ Log = IVPHELM_BHV_ACTIVE @ 0 NOSYNC
+ Log = IVPHELM_BHV_ACTIVE_CNT @ 0 NOSYNC
+ Log = IVPHELM_BHV_CNT @ 0 NOSYNC
+ Log = IVPHELM_BHV_CNT_EVER @ 0 NOSYNC
+ Log = IVPHELM_BHV_DISABLED_CNT @ 0 NOSYNC
+ Log = IVPHELM_BHV_IDLE @ 0 NOSYNC
+ Log = IVPHELM_BHV_IDLE_CNT @ 0 NOSYNC
+ Log = IVPHELM_BHV_RUNNING @ 0 NOSYNC
+ Log = IVPHELM_BHV_RUNNING_CNT @ 0 NOSYNC
+ Log = IVPHELM_COMPLETED_COUNT @ 0 NOSYNC
+ Log = IVPHELM_COMPLETED_PENDING @ 0 NOSYNC
+ Log = IVPHELM_CONTACT_SUMMARY @ 0 NOSYNC
+ Log = IVPHELM_CPU @ 0 NOSYNC
+ Log = IVPHELM_CREATE_CPU @ 0 NOSYNC
+ Log = IVPHELM_DOMAIN @ 0 NOSYNC
+ Log = IVPHELM_IPF_CNT @ 0 NOSYNC
+ Log = IVPHELM_ITER @ 0 NOSYNC
+ Log = IVPHELM_LEDGER_SUMMARY @ 0 NOSYNC
+ Log = IVPHELM_LIFE_EVENT @ 0 NOSYNC
+ Log = IVPHELM_LOOP_CPU @ 0 NOSYNC
+ Log = IVPHELM_MODESET @ 0 NOSYNC
+ Log = IVPHELM_REGISTER @ 0 NOSYNC
+ Log = IVPHELM_REJOURNAL @ 0 NOSYNC
+ Log = IVPHELM_STATE @ 0 NOSYNC
+ Log = IVPHELM_STATEVARS @ 0 NOSYNC
+ Log = IVPHELM_SUMMARY @ 0 NOSYNC
+ Log = IVPHELM_TOTAL_PCS_CACHED @ 0 NOSYNC
+ Log = IVPHELM_TOTAL_PCS_FORMED @ 0 NOSYNC
+ Log = IVPHELM_UPDATEVARS @ 0 NOSYNC
+ Log = IVPHELM_UPDATE_RESULT @ 0 NOSYNC
+ Log = LOITER @ 0 NOSYNC
+ Log = LOITER_ACQUIRE @ 0 NOSYNC
+ Log = LOITER_DIST_TO_POLY @ 0 NOSYNC
+ Log = LOITER_DIST_TO_VERT @ 0 NOSYNC
+ Log = LOITER_ETA_TO_POLY @ 0 NOSYNC
+ Log = LOITER_INDEX @ 0 NOSYNC
+ Log = LOITER_MODE @ 0 NOSYNC
+ Log = LOITER_REPORT @ 0 NOSYNC
+ Log = MODE @ 0 NOSYNC
+ Log = MOOS_DEBUG @ 0 NOSYNC
+ Log = MOOS_MANUAL_OVERIDE @ 0 NOSYNC
+ Log = MOOS_MANUAL_OVERRIDE @ 0 NOSYNC
+ Log = NAV_DEPTH @ 0 NOSYNC
+ Log = NAV_HEADING @ 0 NOSYNC
+ Log = NAV_SPEED @ 0 NOSYNC
+ Log = NAV_X @ 0 NOSYNC
+ Log = NAV_Y @ 0 NOSYNC
+ Log = NODE_REPORT @ 0 NOSYNC
+ Log = NODE_REPORT_LOCAL @ 0 NOSYNC
+ Log = PATROL @ 0 NOSYNC
+ Log = PHELMIVP_PID @ 0 NOSYNC
+ Log = PHELMIVP_STATUS @ 0 NOSYNC
+ Log = PLOGGER_CMD @ 0 NOSYNC
+ Log = RESTART_HELM @ 0 NOSYNC
+ Log = RETURN @ 0 NOSYNC
+ Log = RETURN_UPDATES @ 0 NOSYNC
+ Log = STATION_KEEP @ 0 NOSYNC
+ Log = TRAIL @ 0 NOSYNC
+ Log = TRAILING_ALLOWED @ 0 NOSYNC
+ Log = TRAIL_DISTANCE @ 0 NOSYNC
+ Log = TRAIL_INFO @ 0 NOSYNC
+ Log = TURN_RATE @ 0 NOSYNC
+ Log = UP_LOITER @ 0 NOSYNC
+ Log = VIEW_POINT @ 0 NOSYNC
+ Log = VIEW_POLYGON @ 0 NOSYNC
+ Log = VIEW_SEGLIST @ 0 NOSYNC
+ Log = WPT_INDEX @ 0 NOSYNC
+ Log = WPT_ODO @ 0 NOSYNC
+ Log = WPT_STAT @ 0 NOSYNC
+ AppTick = 10
+ CommsTick = 10
+
+ File = LOG_GILDA
+ PATH = ./
+ SyncLog = true @ 0.2
+ AsyncLog = true
+ FileTimeStamp = true
+
+ Log = IVPHELM_LIFE_EVENT @ 0 nosync
+
+ // Log it all!!!!!
+ LogAuxSrc = true
+ WildCardLogging = true
+}
+
+//---------------------------------------
+ProcessConfig = uProcessWatch
+{
+ AppTick = 2
+ CommsTick = 2
+
+ watch_all = true
+
+ nowatch = uXMS*
+ nowatch = uPokeDB*
+ nowatch = uQueryDB*
+}
+
+
+//--------------------------------------------------
+// uFldNodeBroker config block
+
+ProcessConfig = uFldNodeBroker
+{
+ AppTick = 1
+ CommsTick = 1
+
+ try_shore_host = pshare_route=localhost:9300
+
+ bridge = src=VIEW_POLYGON
+ bridge = src=VIEW_POINT
+ bridge = src=VIEW_SEGLIST
+ bridge = src=VIEW_CIRCLE
+ bridge = src=APPCAST
+ bridge = src=NODE_REPORT_LOCAL, alias=NODE_REPORT
+ bridge = src=NODE_MESSAGE_LOCAL, alias=NODE_MESSAGE
+}
+
+ //---------------------------------------
+ProcessConfig = pMarinePIDV22
+{
+ AppTick = 10
+ CommsTick = 10
+
+ VERBOSE = true
+ DEPTH_CONTROL = false
+ ACTIVE_START = true
+
+ // Yaw PID controller
+ YAW_PID_KP = 0.4
+ YAW_PID_KD = 0.1
+ YAW_PID_KI = 0.0
+ YAW_PID_INTEGRAL_LIMIT = 0.07
+
+ // Speed PID controller
+ SPEED_PID_KP = 1.0
+ SPEED_PID_KD = 0.0
+ SPEED_PID_KI = 0.0
+ SPEED_PID_INTEGRAL_LIMIT = 0.07
+
+ // Maximums
+ MAXRUDDER = 100
+ MAXTHRUST = 100
+
+ // A non-zero SPEED_FACTOR overrides use of SPEED_PID
+ // Will set DESIRED_THRUST = DESIRED_SPEED * SPEED_FACTOR
+ SPEED_FACTOR = 20
+}
+
+
+//------------------------------------------
+ProcessConfig = uSimMarineV22
+{
+ AppTick = 10
+ CommsTick = 10
+
+ start_pos = 80,-125
+ prefix = NAV
+}
+
+
+//---------------------------------------
+ProcessConfig = pHelmIvP
+{
+ AppTick = 4
+ CommsTick = 4
+
+ behaviors = targ_gilda.bhv
+ verbose = false
+ domain = course:0:359:360
+ domain = speed:0:5:26
+}
+
+//--------------------------------------------------
+// uFldMessageHandler config block
+
+ProcessConfig = uFldMessageHandler
+{
+ AppTick = 3
+ CommsTick = 3
+
+ strict_addressing = true
+}
+
+//---------------------------------------
+ProcessConfig = pNodeReporter
+{
+ AppTick = 2
+ CommsTick = 2
+
+ platform_type = kayak
+}
+
+//---------------------------------------
+// pBasicContactMgr Config Block
+
+ProcessConfig = pContactMgrV20
+{
+ AppTick = 2
+ CommsTick = 2
+
+ contact_max_age = 3600
+ display_radii = false
+
+ decay = 30,60
+ alert_verbose = false
+
+ //default_alert_range = 20
+ //default_cpa_range = 28
+ //default_alert_range_color = gray70
+ //default_cpa_range_color = gray30
+
+ //alert = id=avd, var=CONTACT_INFO, val="name=$[VNAME] # contact=$[VNAME]"
+ //alert = id=avd, alert_range=50, cpa_range=60, alert_range_color=yellow
+ //alert = id=avd, cpa_range_color=pink
+
+ alert = id=trail, var=TRAIL_INFO, val="name=$[VNAME] # contact=$[VNAME]"
+ //alert = id=trail, alert_range=140, cpa_range=185, alert_range_color=green
+ alert = id=trail, alert_range=140, cpa_range=185
+ //alert = id=trail, cpa_range_color=white
+}
+
+
+ProcessConfig = uTimerScript_record
+{
+ condition = (IVPHELM_STATE = PARK) or (IVPHELM_STATE = DRIVE)
+ event = var=DEPLOY, val=true, time=5
+ event = var=MOOS_MANUAL_OVERRIDE, val=false, time=5
+}
+
+
diff --git a/src/test/missions/fixtures/m11_kahuna.gilda/targ_gilda.bhv b/src/test/missions/fixtures/m11_kahuna.gilda/targ_gilda.bhv
new file mode 100644
index 0000000..87032ed
--- /dev/null
+++ b/src/test/missions/fixtures/m11_kahuna.gilda/targ_gilda.bhv
@@ -0,0 +1,65 @@
+initialize LOITER = true
+
+//-----------------------------------------------
+// Helm Behavior File
+
+set MODE = ACTIVE {
+ DEPLOY = true
+} INACTIVE
+
+set MODE = STATION-KEEPING {
+ MODE = ACTIVE
+ STATION_KEEP = true
+}
+
+set MODE = RETURNING {
+ MODE = ACTIVE
+ RETURN = true
+}
+
+set MODE = TRANSIT {
+ MODE = ACTIVE
+ LOITER = true
+}
+
+//----------------------------------------------
+Behavior = BHV_Loiter
+{
+ name = bhv_loiter
+ pwt = 100
+ condition = MODE==LOITERING
+
+ speed = 2.5
+ clockwise = true
+ radius = 8
+ nm_radius = 20
+ acquire_dist = 12
+ polygon = label,A : 40,-270:60,-290:100,-290:120,-270:120,-180:100,-160:60,-160:40,-180
+}
+
+//----------------------------------------------
+Behavior = BHV_Waypoint
+{
+ name = bhv_waypoint
+ pwt = 100
+ condition = MODE==RETURNING
+
+ speed = 2.5
+ points = 0,0
+}
+
+
+//----------------------------------------------
+Behavior = BHV_Waypoint
+{
+ name = bhv_transit
+ pwt = 100
+ condition = MODE==TRANSIT
+ updates = GILDA_UPDATES
+
+ speed = 1.0
+ points = -100,-100:200,-100
+ repeat = forever
+}
+
+
diff --git a/src/test/missions/fixtures/m11_kahuna.henry/m11_kahuna.henry.alog.xz b/src/test/missions/fixtures/m11_kahuna.henry/m11_kahuna.henry.alog.xz
new file mode 100644
index 0000000..4533946
Binary files /dev/null and b/src/test/missions/fixtures/m11_kahuna.henry/m11_kahuna.henry.alog.xz differ
diff --git a/src/test/missions/fixtures/m11_kahuna.henry/m11_kahuna.henry.moos b/src/test/missions/fixtures/m11_kahuna.henry/m11_kahuna.henry.moos
new file mode 100644
index 0000000..2d48c9a
--- /dev/null
+++ b/src/test/missions/fixtures/m11_kahuna.henry/m11_kahuna.henry.moos
@@ -0,0 +1,367 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% LOG FILE: ./LOG_HENRY_13_11_2026_____05_07_01/LOG_HENRY_13_11_2026_____05_07_01._moos
+%% FILE OPENED ON Thu Jan 1 00:00:00 1970
+%% LOGSTART 7178185687.312224
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ServerHost = localhost
+ServerPort = 9001
+
+// Community name IS the vehicle name
+Community = henry
+
+//---- Next Line was commented and replaced with a command line overload ---- //
+//MOOSTimeWarp = 4 (default)
+MOOSTimeWarp = 4
+LatOrigin = 43.825300
+LongOrigin = -70.330400
+
+
+//--------------------------------------------------------
+// uTimerScript Configuration Block
+
+ProcessConfig = uTimerScript
+{
+ AppTick = 4
+ CommsTick = 4
+
+ PAUSED = false
+ RESET_MAX = unlimited
+ RESET_TIME = 100
+
+ RANDVAR = varname=S, min=1, max=3, key=at_reset
+
+// EVENT = var=NODE_MESSAGE_LOCAL, val="src_node=gilda,dest_node=all,var_name=GILDA_UPDATES,string_val=speed=$[S]", time=0:5
+ EVENT = var=GILDA_UPDATES, val="speed=$[S]", time=0:5
+}
+
+
+
+
+
+
+//------------------------------------------------------------
+ProcessConfig = ANTLER
+{
+ Run = uTimerScript @ NewConsole = false ~ uTimerScript_record
+ MSBetweenLaunches = 100
+
+ Run = MOOSDB @ NewConsole = false
+ Run = pLogger @ NewConsole = false
+ Run = uSimMarineV22 @ NewConsole = false
+ Run = pNodeReporter @ NewConsole = false
+ Run = pMarinePIDV22 @ NewConsole = false
+ Run = pHelmIvP @ NewConsole = false
+ Run = uProcessWatch @ NewConsole = false
+
+ Run = pShare @ NewConsole = false
+ Run = pHostInfo @ NewConsole = false
+ Run = uFldNodeBroker @ NewConsole = false
+ Run = uFldMessageHandler @ NewConsole = false
+ Run = uTimerScript @ NewConsole = false
+ Run = pContactMgrV20 @ NewConsole = false
+}
+
+//---------------------------------------------------------
+// pShare Config Block (Created from Plugin)
+
+ProcessConfig = pShare
+{
+ AppTick = 2
+ CommsTick = 2
+
+ input = route = localhost:9301
+
+ // =======================================================
+ // Usage Info below
+ // =======================================================
+
+ // Simple forward of X to A on channel 8
+ // output = src_name = X,dest_name=A, route=multicast_8
+
+ // Simple forward of Y to B on a udp address
+
+ //output = src_name=Y, dest_name=B, route=localhost:9300
+
+ // Simple forward of Z to Z on a named address (no renaming)
+ // output = src_name = Z, route = oceanai.mit.edu:9020
+
+ // Setting up an input
+ // input = route = multicast_9
+
+ //input = route = localhost:9301 & multicast_9
+
+
+ // Setting up lots of inputs at once
+ // input = route = "localhost:9069 & multicast_19 & multicast_65"
+}
+
+
+//--------------------------------------------------
+// pHostInfo configuration block from plugin
+
+ProcessConfig = pHostInfo
+{
+ AppTick = 1
+ CommsTick = 1
+
+ DEFAULT_HOSTIP = localhost
+}
+
+
+//--------------------------------------------------
+// pLogger Configuration Block (Created from Plugin)
+
+ProcessConfig = pLogger
+{
+ Log = AIS_REPORT @ 0 NOSYNC
+ Log = AIS_REPORT_LOCAL @ 0 NOSYNC
+ Log = APPCAST @ 0 NOSYNC
+ Log = AVD_DEBUG @ 0 NOSYNC
+ Log = AVOIDING @ 0 NOSYNC
+ Log = BCM_ALERT_REQUEST @ 0 NOSYNC
+ Log = BHV_ABLE_FILTER @ 0 NOSYNC
+ Log = BHV_IPF @ 0 NOSYNC
+ Log = BHV_SETTINGS @ 0 NOSYNC
+ Log = BHV_STATUS @ 0 NOSYNC
+ Log = BHV_WARNING @ 0 NOSYNC
+ Log = CONTACT_INFO @ 0 NOSYNC
+ Log = CONTACT_RESOLVED @ 0 NOSYNC
+ Log = CYCLE_INDEX @ 0 NOSYNC
+ Log = DB_CLIENTS @ 0 NOSYNC
+ Log = DEPLOY @ 0 NOSYNC
+ Log = DESIRED_HEADING @ 0 NOSYNC
+ Log = DESIRED_SPEED @ 0 NOSYNC
+ Log = GILDA_UPDATES @ 0 NOSYNC
+ Log = HELM_MAP_CLEAR @ 0 NOSYNC
+ Log = IVPHELM_ALLSTOP @ 0 NOSYNC
+ Log = IVPHELM_BHV_ACTIVE @ 0 NOSYNC
+ Log = IVPHELM_BHV_ACTIVE_CNT @ 0 NOSYNC
+ Log = IVPHELM_BHV_CNT @ 0 NOSYNC
+ Log = IVPHELM_BHV_CNT_EVER @ 0 NOSYNC
+ Log = IVPHELM_BHV_DISABLED_CNT @ 0 NOSYNC
+ Log = IVPHELM_BHV_IDLE @ 0 NOSYNC
+ Log = IVPHELM_BHV_IDLE_CNT @ 0 NOSYNC
+ Log = IVPHELM_BHV_RUNNING @ 0 NOSYNC
+ Log = IVPHELM_BHV_RUNNING_CNT @ 0 NOSYNC
+ Log = IVPHELM_COMPLETED_COUNT @ 0 NOSYNC
+ Log = IVPHELM_COMPLETED_PENDING @ 0 NOSYNC
+ Log = IVPHELM_CONTACT_SUMMARY @ 0 NOSYNC
+ Log = IVPHELM_CPU @ 0 NOSYNC
+ Log = IVPHELM_CREATE_CPU @ 0 NOSYNC
+ Log = IVPHELM_DOMAIN @ 0 NOSYNC
+ Log = IVPHELM_IPF_CNT @ 0 NOSYNC
+ Log = IVPHELM_ITER @ 0 NOSYNC
+ Log = IVPHELM_LEDGER_SUMMARY @ 0 NOSYNC
+ Log = IVPHELM_LIFE_EVENT @ 0 NOSYNC
+ Log = IVPHELM_LOOP_CPU @ 0 NOSYNC
+ Log = IVPHELM_MODESET @ 0 NOSYNC
+ Log = IVPHELM_REGISTER @ 0 NOSYNC
+ Log = IVPHELM_REJOURNAL @ 0 NOSYNC
+ Log = IVPHELM_STATE @ 0 NOSYNC
+ Log = IVPHELM_STATEVARS @ 0 NOSYNC
+ Log = IVPHELM_SUMMARY @ 0 NOSYNC
+ Log = IVPHELM_TOTAL_PCS_CACHED @ 0 NOSYNC
+ Log = IVPHELM_TOTAL_PCS_FORMED @ 0 NOSYNC
+ Log = IVPHELM_UPDATEVARS @ 0 NOSYNC
+ Log = IVPHELM_UPDATE_RESULT @ 0 NOSYNC
+ Log = LOITER @ 0 NOSYNC
+ Log = LOITER_ACQUIRE @ 0 NOSYNC
+ Log = LOITER_DIST_TO_POLY @ 0 NOSYNC
+ Log = LOITER_DIST_TO_VERT @ 0 NOSYNC
+ Log = LOITER_ETA_TO_POLY @ 0 NOSYNC
+ Log = LOITER_INDEX @ 0 NOSYNC
+ Log = LOITER_MODE @ 0 NOSYNC
+ Log = LOITER_REPORT @ 0 NOSYNC
+ Log = MODE @ 0 NOSYNC
+ Log = MOOS_DEBUG @ 0 NOSYNC
+ Log = MOOS_MANUAL_OVERIDE @ 0 NOSYNC
+ Log = MOOS_MANUAL_OVERRIDE @ 0 NOSYNC
+ Log = NAV_DEPTH @ 0 NOSYNC
+ Log = NAV_HEADING @ 0 NOSYNC
+ Log = NAV_SPEED @ 0 NOSYNC
+ Log = NAV_X @ 0 NOSYNC
+ Log = NAV_Y @ 0 NOSYNC
+ Log = NODE_REPORT @ 0 NOSYNC
+ Log = NODE_REPORT_LOCAL @ 0 NOSYNC
+ Log = PATROL @ 0 NOSYNC
+ Log = PHELMIVP_PID @ 0 NOSYNC
+ Log = PHELMIVP_STATUS @ 0 NOSYNC
+ Log = PLOGGER_CMD @ 0 NOSYNC
+ Log = RESTART_HELM @ 0 NOSYNC
+ Log = RETURN @ 0 NOSYNC
+ Log = RETURN_UPDATES @ 0 NOSYNC
+ Log = STATION_KEEP @ 0 NOSYNC
+ Log = TRAIL @ 0 NOSYNC
+ Log = TRAILING_ALLOWED @ 0 NOSYNC
+ Log = TRAIL_DISTANCE @ 0 NOSYNC
+ Log = TRAIL_INFO @ 0 NOSYNC
+ Log = TURN_RATE @ 0 NOSYNC
+ Log = UP_LOITER @ 0 NOSYNC
+ Log = VIEW_POINT @ 0 NOSYNC
+ Log = VIEW_POLYGON @ 0 NOSYNC
+ Log = VIEW_SEGLIST @ 0 NOSYNC
+ Log = WPT_INDEX @ 0 NOSYNC
+ Log = WPT_ODO @ 0 NOSYNC
+ Log = WPT_STAT @ 0 NOSYNC
+ AppTick = 10
+ CommsTick = 10
+
+ File = LOG_HENRY
+ PATH = ./
+ SyncLog = true @ 0.2
+ AsyncLog = true
+ FileTimeStamp = true
+
+ Log = IVPHELM_LIFE_EVENT @ 0 nosync
+
+ // Log it all!!!!!
+ LogAuxSrc = true
+ WildCardLogging = true
+}
+
+//---------------------------------------
+ProcessConfig = uProcessWatch
+{
+ AppTick = 2
+ CommsTick = 2
+
+ watch_all = true
+
+ nowatch = uXMS*
+ nowatch = uPokeDB*
+ nowatch = uQueryDB*
+}
+
+
+//--------------------------------------------------
+// uFldNodeBroker config block
+
+ProcessConfig = uFldNodeBroker
+{
+ AppTick = 1
+ CommsTick = 1
+
+ try_shore_host = pshare_route=localhost:9300
+
+ bridge = src=VIEW_POLYGON
+ bridge = src=VIEW_POINT
+ bridge = src=VIEW_SEGLIST
+ bridge = src=VIEW_CIRCLE
+ bridge = src=APPCAST
+ bridge = src=NODE_REPORT_LOCAL, alias=NODE_REPORT
+ bridge = src=NODE_MESSAGE_LOCAL, alias=NODE_MESSAGE
+}
+
+ //---------------------------------------
+ProcessConfig = pMarinePIDV22
+{
+ AppTick = 10
+ CommsTick = 10
+
+ VERBOSE = true
+ DEPTH_CONTROL = false
+ ACTIVE_START = true
+
+ // Yaw PID controller
+ YAW_PID_KP = 0.4
+ YAW_PID_KD = 0.1
+ YAW_PID_KI = 0.0
+ YAW_PID_INTEGRAL_LIMIT = 0.07
+
+ // Speed PID controller
+ SPEED_PID_KP = 1.0
+ SPEED_PID_KD = 0.0
+ SPEED_PID_KI = 0.0
+ SPEED_PID_INTEGRAL_LIMIT = 0.07
+
+ // Maximums
+ MAXRUDDER = 100
+ MAXTHRUST = 100
+
+ // A non-zero SPEED_FACTOR overrides use of SPEED_PID
+ // Will set DESIRED_THRUST = DESIRED_SPEED * SPEED_FACTOR
+ SPEED_FACTOR = 20
+}
+
+
+//------------------------------------------
+ProcessConfig = uSimMarineV22
+{
+ AppTick = 10
+ CommsTick = 10
+
+ start_pos = 0,0
+ prefix = NAV
+}
+
+
+//---------------------------------------
+ProcessConfig = pHelmIvP
+{
+ AppTick = 4
+ CommsTick = 4
+
+ behaviors = targ_henry.bhv
+ verbose = false
+ domain = course:0:359:360
+ domain = speed:0:5:26
+}
+
+//--------------------------------------------------
+// uFldMessageHandler config block
+
+ProcessConfig = uFldMessageHandler
+{
+ AppTick = 3
+ CommsTick = 3
+
+ strict_addressing = true
+}
+
+//---------------------------------------
+ProcessConfig = pNodeReporter
+{
+ AppTick = 2
+ CommsTick = 2
+
+ platform_type = kayak
+}
+
+//---------------------------------------
+// pBasicContactMgr Config Block
+
+ProcessConfig = pContactMgrV20
+{
+ AppTick = 2
+ CommsTick = 2
+
+ contact_max_age = 3600
+ display_radii = false
+
+ decay = 30,60
+ alert_verbose = false
+
+ //default_alert_range = 20
+ //default_cpa_range = 28
+ //default_alert_range_color = gray70
+ //default_cpa_range_color = gray30
+
+ //alert = id=avd, var=CONTACT_INFO, val="name=$[VNAME] # contact=$[VNAME]"
+ //alert = id=avd, alert_range=50, cpa_range=60, alert_range_color=yellow
+ //alert = id=avd, cpa_range_color=pink
+
+ alert = id=trail, var=TRAIL_INFO, val="name=$[VNAME] # contact=$[VNAME]"
+ //alert = id=trail, alert_range=140, cpa_range=185, alert_range_color=green
+ alert = id=trail, alert_range=140, cpa_range=185
+ //alert = id=trail, cpa_range_color=white
+}
+
+
+ProcessConfig = uTimerScript_record
+{
+ condition = (IVPHELM_STATE = PARK) or (IVPHELM_STATE = DRIVE)
+ event = var=DEPLOY, val=true, time=5
+ event = var=MOOS_MANUAL_OVERRIDE, val=false, time=5
+}
+
+
diff --git a/src/test/missions/fixtures/m11_kahuna.henry/targ_henry.bhv b/src/test/missions/fixtures/m11_kahuna.henry/targ_henry.bhv
new file mode 100644
index 0000000..a13f4d5
--- /dev/null
+++ b/src/test/missions/fixtures/m11_kahuna.henry/targ_henry.bhv
@@ -0,0 +1,139 @@
+initialize PATROL = true
+initialize TRAILING_ALLOWED = false
+initialize TRAIL = false
+
+//-----------------------------------------------
+// Helm Behavior File
+
+set MODE = ACTIVE {
+ DEPLOY = true
+} INACTIVE
+
+set MODE = STATION-KEEPING {
+ MODE = ACTIVE
+ STATION_KEEP = true
+}
+
+set MODE = RETURNING {
+ MODE = ACTIVE
+ RETURN = true
+}
+
+set MODE = PATROLLING {
+ MODE = ACTIVE
+ PATROL = true
+ TRAIL != true
+}
+
+set MODE = TRAILING {
+ MODE = ACTIVE
+ PATROL = true
+ TRAILING_ALLOWED = true
+ TRAIL = true
+}
+
+//----------------------------------------------
+Behavior = BHV_Loiter
+{
+ name = loiter
+ pwt = 100
+ condition = MODE == PATROLLING
+ updates = UP_LOITER
+
+ speed = 1.3
+ clockwise = false
+ radius = 8.0
+ nm_radius = 15.0
+ polygon = radial:: x=110, y=-50, radius=20, pts=8, snap=1, label=HENRY_LOITER
+ visual_hints = nextpt_color=white, nextpt_lcolor=khaki
+ visual_hints = edge_color=blue, vertex_color=blue
+ visual_hints = edge_size=1, vertex_size=2
+}
+
+
+//----------------------------------------------
+Behavior = BHV_Waypoint
+{
+ name = waypt_return
+ pwt = 100
+ updates = RETURN_UPDATES
+ condition = MODE == RETURNING
+ endflag = STATION_KEEP = true
+
+ speed = 1.3
+ radius = 3.0
+ nm_radius = 15.0
+ points = 80,-125
+ repeat = 10
+ lead = 8
+}
+
+//----------------------------------------------
+Behavior = BHV_StationKeep
+{
+ name = station-keep
+ pwt = 100
+ condition = MODE == STATION-KEEPING
+
+ center_activate = true
+ inner_radius = 5
+ outer_radius = 10
+ outer_speed = 1.0
+
+ transit_speed = 1.3
+ swing_time = 7
+ hibernation_radius = 25
+ visual_hints = vertex_size=0, edge_color=blue
+}
+
+
+//----------------------------------------------
+Behavior = BHV_AvoidCollision
+{
+ name = avd_collision
+ pwt = 400
+ condition = MODE == ACTIVE
+ condition = MODE != STATION-KEEPING
+ updates = CONTACT_INFO
+ endflag = CONTACT_RESOLVED = $[CONTACT],avd
+ templating = spawn
+
+ contact = to-be-set
+ pwt_outer_dist = 50
+ pwt_inner_dist = 20
+ completed_dist = 145
+ min_util_cpa_dist = 8
+ max_util_cpa_dist = 25
+// active_grade = linear
+ on_no_contact_ok = true
+ extrapolate = true
+ decay = 30,60
+ bearing_line_config = white:0, green:0.65, yellow:0.8, red:1.0
+}
+
+//----------------------------------------------
+Behavior = BHV_Trail
+{
+ name = trail_contact
+ pwt = 100
+ condition = (MODE == TRAILING) or (MODE == PATROLLING)
+ condition = TRAILING_ALLOWED = true
+ runflag = TRAIL = true
+ idleflag = TRAIL = false
+ updates = TRAIL_INFO
+ templating = spawn
+
+ contact = to-be-set
+ pwt_outer_dist = 325
+ nm_radius = 18
+ radius = 8
+ trail_angle = 045
+ trail_range = 40
+
+ trail_angle_type = relative
+ on_no_contact_ok = true
+ extrapolate = true
+ decay = 30,60
+ bearing_line_config = white:0, green:0.65, yellow:0.8, red:1.0
+}
+
diff --git a/src/test/missions/missions.txt b/src/test/missions/missions.txt
index 2f803ce..19ae9c2 100644
--- a/src/test/missions/missions.txt
+++ b/src/test/missions/missions.txt
@@ -25,5 +25,6 @@ m2_berta launch.sh 4 600 DEPLOY=true MOOS_MANUAL_OVERRIDE=fals
berta_cmgr launch.sh 4 600 DEPLOY=true MOOS_MANUAL_OVERRIDE=false
m15_pursuit launch.sh 4 600 DEPLOY=true MOOS_MANUAL_OVERRIDE=false
m34_bo_alpha launch.sh 4 600 DEPLOY=true MOOS_MANUAL_OVERRIDE=false
+m11_kahuna launch.sh 4 600 DEPLOY=true MOOS_MANUAL_OVERRIDE=false
# ufld_convoy is left out: its pHelmIvP looks for behaviors in a directory on
# its author's machine, and is MALCONFIG anywhere else
diff --git a/src/test/missions/replay.cpp b/src/test/missions/replay.cpp
index c55ed71..48440c5 100644
--- a/src/test/missions/replay.cpp
+++ b/src/test/missions/replay.cpp
@@ -45,7 +45,9 @@
// - IVPHELM_STATE and IVPHELM_ALLSTOP against Status;
// - mode variables against MODE postings;
// - initialize posts against INITIALIZE postings;
-// - each behavior's posts against its postings and behavior events;
+// - each behavior's posts against its postings and behavior events, with
+// VIEW_POINT, VIEW_SEGLIST, VIEW_POLYGON, VIEW_SEGLR and NODE_MESSAGE_LOCAL
+// parsed on both sides (against Visualization and OffboardMessage);
// - IVPHELM_LIFE_EVENT against life events;
// - IVPHELM_BHV_ACTIVE against the ACTIVE behaviors in Status.
// DESIRED_* are compared iteration by iteration: within one step of the
@@ -80,6 +82,7 @@
#include
#include
+#include "helm/conversions.h"
#include "helm/helm.h"
#include "helm/status_strings.h"
@@ -184,13 +187,17 @@ bool is_contact_manager(const std::string& source)
// pContactMgrV20's block of the .moos file
void read_contact_manager(const std::vector& lines, HelmConfig::ContactManager& cm)
{
- // in reverse, as MOOS's mission reader hands them over
+ // in reverse, as MOOS's mission reader hands them over, and without white
+ // space, since pContactMgrV20 turns off the reader's verbatim quoting
for (auto it = lines.rbegin(); it != lines.rend(); ++it)
{
const std::string& line = *it;
const auto eq = line.find('=');
const std::string key = lower(trim(line.substr(0, eq)));
- const std::string value = eq == std::string::npos ? "" : trim(line.substr(eq + 1));
+ std::string value = eq == std::string::npos ? "" : line.substr(eq + 1);
+ value.erase(std::remove_if(value.begin(), value.end(),
+ [](unsigned char c) { return std::isspace(c); }),
+ value.end());
const bool truth = lower(value) == "true";
if (key == "alert")
cm.add_alert(value);
@@ -430,6 +437,27 @@ bool same_value(const std::string& a, const std::string& b)
return true;
}
+// A Visualization or OffboardMessage without what the comparison leaves out
+std::string canonical(google::protobuf::Message& msg)
+{
+ const auto* desc = msg.GetDescriptor();
+ for (const char* field : {"time", "behavior", "iteration"})
+ if (const auto* f = desc->FindFieldByName(field))
+ msg.GetReflection()->ClearField(&msg, f);
+ return msg.ShortDebugString();
+}
+
+// A behavior's posting as the comparison sees it
+std::string parsed(const std::string& var, const std::string& value)
+{
+ if (auto vis = ivpico::helm::visualization(var, value))
+ return canonical(*vis);
+ if (var == "NODE_MESSAGE_LOCAL")
+ if (auto msg = ivpico::helm::offboard_message(value))
+ return canonical(*msg);
+ return value;
+}
+
std::string number(double d)
{
std::ostringstream os;
@@ -681,7 +709,7 @@ int main(int argc, char* argv[])
else if (a == "HELM_VAR_INIT")
add_change(moos, "initialize " + e.var, k, e.value);
else if (a.find(':') != std::string::npos && e.var != "BHV_IPF")
- add_change(moos, a.substr(a.find(':') + 1) + " " + e.var, k, e.value);
+ add_change(moos, a.substr(a.find(':') + 1) + " " + e.var, k, parsed(e.var, e.value));
}
// IvPico's side
@@ -766,6 +794,20 @@ int main(int argc, char* argv[])
if (!e.behavior().empty())
add_change(ivpico, e.behavior() + " " + behavior_event_var(e.kind()), tick,
e.text());
+ for (auto v : out.visualizations)
+ {
+ const std::string var = v.has_point() ? "VIEW_POINT"
+ : v.has_seglist() ? "VIEW_SEGLIST"
+ : v.has_polygon() ? "VIEW_POLYGON"
+ : "VIEW_SEGLR";
+ const std::string behavior = v.behavior();
+ add_change(ivpico, behavior + " " + var, tick, canonical(v));
+ }
+ for (auto m : out.offboard_messages)
+ {
+ const std::string behavior = m.source_behavior();
+ add_change(ivpico, behavior + " NODE_MESSAGE_LOCAL", tick, canonical(m));
+ }
for (const auto& e : out.life_events)
{
const std::string type = lower(ivp::interface::LifeEvent::Type_Name(e.type()));