diff --git a/missions/auv150/alpha_shoreside.moos b/missions/auv150/alpha_shoreside.moos index bedef73..43b8295 100644 --- a/missions/auv150/alpha_shoreside.moos +++ b/missions/auv150/alpha_shoreside.moos @@ -39,7 +39,7 @@ ProcessConfig = pShare output = src_name=MOOS_MANUAL_OVERIDE, route=192.168.1.200:8082 output = src_name=PZ, route=192.168.1.200:8082 output = src_name=LED, route=192.168.1.200:8082 - //output = src_name = *, route=192.168.1.200:8082 + output = src_name = MOOS_MANUAL_OVERIDE*, route=192.168.1.200:8082 } //------------------------------------------ @@ -95,8 +95,8 @@ ProcessConfig = pMarineViewer BUTTON_Four = LED # LED=on - cmd = label=MANUAL_FALSE, var=MOOS_MANUAL_OVERIDE, sval=false, receivers=auv150 - cmd = label=MANUAL_TRUE, var=MOOS_MANUAL_OVERIDE, sval=true, receivers=auv150 + //cmd = label=MANUAL_FALSE, var=MOOS_MANUAL_OVERIDE, sval=false, receivers=auv150 + //cmd = label=MANUAL_TRUE, var=MOOS_MANUAL_OVERIDE, sval=true, receivers=auv150 } //------------------------------------------ diff --git a/src/pAUV150/AUV150.cpp b/src/pAUV150/AUV150.cpp index 72b5bce..dfb6e3c 100644 --- a/src/pAUV150/AUV150.cpp +++ b/src/pAUV150/AUV150.cpp @@ -177,7 +177,7 @@ bool AUV150::OnNewMail(MOOSMSG_LIST &NewMail) bool mdbl = msg.IsDouble(); bool mstr = msg.IsString(); #endif - if((key == "MOOS_MANUAL_OVERIDE") || (key == "MOOS_MANUAL_OVERRIDE")) + if((key == "MOOS_MANUAL_OVERIDE") || (key == "MOOS_MANUAL_OVERRIDE") || (key == "MOOS_MANUAL_OVERRID_AUV150")) { string sval = msg.GetString(); m_debug.push_back(m_overrived); @@ -327,6 +327,8 @@ void AUV150::registerVariables() Register("DESIRED_DEPTH", 0); Register("MOOS_MANUAL_OVERIDE", 0); Register("MOOS_MANUAL_OVERRIDE", 0); + Register("MOOS_MANUAL_OVERIDE*", 0); + Register("MOOS_MANUAL_OVERRIDE*", 0); Register("PZ", 0); Register("LED", 0); } @@ -590,15 +592,15 @@ bool AUV150::buildReport() m_debug_str.clear(); // =============== Navigation Info =============== printTable( - {"Connect", "Fre","Cont" ,"ip","OLat", "OLon","Gap"}, + {"Connect", "Fre","Cont" ,"ip"}, { (isConnected() ? "Yes" : "No"), doubleToString(getRealReadFreq(), 4) + " Hz", ulintToString(getCounter()), m_serverHost, - doubleToString(m_OriginLatitude, 5) + "deg", - doubleToString(m_OriginLongitude, 5) + "deg", - doubleToString(m_controlGap, 5) + "s" + // doubleToString(m_OriginLatitude, 5) + "deg", + // doubleToString(m_OriginLongitude, 5) + "deg", + // doubleToString(m_controlGap, 5) + "s" } ); m_msgs << "Fault Codes: ";