From 46d785d93f29509090056493a917e76e88b3169a Mon Sep 17 00:00:00 2001 From: Carter Frost Date: Tue, 26 Apr 2022 15:13:27 -0600 Subject: [PATCH 1/7] launch/rover_gui.launch: add joy to ignored topics to stop gui crosstalk --- launch/rover_gui.launch | 1 + 1 file changed, 1 insertion(+) diff --git a/launch/rover_gui.launch b/launch/rover_gui.launch index f75ed393..6eb0c6ed 100644 --- a/launch/rover_gui.launch +++ b/launch/rover_gui.launch @@ -31,6 +31,7 @@ - /rosout_agg - /tf - /tf_static + - /joy From 1259b6b98cd6f6c68010f9a3455fa98f87b9019e Mon Sep 17 00:00:00 2001 From: Carter Frost Date: Tue, 26 Apr 2022 15:55:13 -0600 Subject: [PATCH 2/7] src/swarmie/launch/swarmie.xml: +joy to ignored topics to stop crosstalk --- src/swarmie/launch/swarmie.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/swarmie/launch/swarmie.xml b/src/swarmie/launch/swarmie.xml index 4e32879a..bc086445 100644 --- a/src/swarmie/launch/swarmie.xml +++ b/src/swarmie/launch/swarmie.xml @@ -130,6 +130,8 @@ - /tf - /tf_static + - /joy + - /joy/set_feedback From 102f5ae0460d7b506a219ccfd35478ad1c6a48ab Mon Sep 17 00:00:00 2001 From: Carter Frost Date: Tue, 26 Apr 2022 16:28:24 -0600 Subject: [PATCH 3/7] src/rqt_rover_gui/launch/rover_gui.launch:+anonymous to node name --- src/rqt_rover_gui/launch/rover_gui.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rqt_rover_gui/launch/rover_gui.launch b/src/rqt_rover_gui/launch/rover_gui.launch index 572a5115..c8c2ee39 100644 --- a/src/rqt_rover_gui/launch/rover_gui.launch +++ b/src/rqt_rover_gui/launch/rover_gui.launch @@ -1,4 +1,4 @@ - + From 291ac58445b0996f11dca18fa8b07db237760694 Mon Sep 17 00:00:00 2001 From: Carter Frost Date: Tue, 26 Apr 2022 16:48:13 -0600 Subject: [PATCH 4/7] src/rqt_rover_gui/src/rover_gui_plugin.cpp: added uniq name for joy_node --- src/rqt_rover_gui/src/rover_gui_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rqt_rover_gui/src/rover_gui_plugin.cpp b/src/rqt_rover_gui/src/rover_gui_plugin.cpp index 4a23821d..ed91667c 100644 --- a/src/rqt_rover_gui/src/rover_gui_plugin.cpp +++ b/src/rqt_rover_gui/src/rover_gui_plugin.cpp @@ -2332,7 +2332,7 @@ QString RoverGUIPlugin::startROSJoyNode() if (!joy_process) { - QString argument = "rosrun joy joy_node"; + QString argument = "rosrun joy joy_node __name:=joy_node$HOSTNAME"; joy_process = new QProcess(); From 6df42571634160c7e736923158993e1cc1e4f746 Mon Sep 17 00:00:00 2001 From: Carter Frost Date: Tue, 26 Apr 2022 17:00:13 -0600 Subject: [PATCH 5/7] src/rqt_rover_gui/src/rover_gui_plugin.cpp: remove joy_node rosrun call --- src/rqt_rover_gui/src/rover_gui_plugin.cpp | 53 ---------------------- 1 file changed, 53 deletions(-) diff --git a/src/rqt_rover_gui/src/rover_gui_plugin.cpp b/src/rqt_rover_gui/src/rover_gui_plugin.cpp index ed91667c..26b0f9ee 100644 --- a/src/rqt_rover_gui/src/rover_gui_plugin.cpp +++ b/src/rqt_rover_gui/src/rover_gui_plugin.cpp @@ -66,7 +66,6 @@ namespace rqt_rover_gui max_info_log_length = 10000; max_diag_log_length = 10000; - joy_process = NULL; joystickGripperInterface = NULL; obstacle_call_count = 0; @@ -263,9 +262,6 @@ namespace rqt_rover_gui ui.all_autonomous_button->setStyleSheet("color: grey; border:2px solid grey; border-radius:12px; padding: 5px;"); ui.all_stop_button->setStyleSheet("color: grey; border:2px solid grey; border-radius:12px; padding: 5px;"); - //QString return_msg = startROSJoyNode(); - //displayLogMessage(return_msg); - info_log_subscriber = nh.subscribe("/infoLog", 10, &RoverGUIPlugin::infoLogMessageEventHandler, this); diag_log_subscriber = nh.subscribe("/diagsLog", 10, &RoverGUIPlugin::diagLogMessageEventHandler, this); @@ -279,7 +275,6 @@ namespace rqt_rover_gui ui.map_frame->clear(); clearSimulationButtonEventHandler(); rover_poll_timer->stop(); - stopROSJoyNode(); ros::shutdown(); } @@ -1452,9 +1447,6 @@ void RoverGUIPlugin::autonomousRadioButtonEventHandler(bool marked) control_mode_publishers[selected_rover_name].publish(control_mode_msg); emit sendInfoLogMessage(QString::fromStdString(selected_rover_name)+" changed to autonomous control"); - QString return_msg = stopROSJoyNode(); - emit sendInfoLogMessage(return_msg); - //Enable all stop button ui.all_stop_button->setEnabled(true); ui.all_stop_button->setStyleSheet("color: white; border:2px solid white; border-radius:12px; padding: 5px;"); @@ -1498,9 +1490,6 @@ void RoverGUIPlugin::joystickRadioButtonEventHandler(bool marked) control_mode_publishers[selected_rover_name].publish(control_mode_msg); emit sendInfoLogMessage(QString::fromStdString(selected_rover_name)+" changed to joystick control");\ - QString return_msg = startROSJoyNode(); - emit sendInfoLogMessage(return_msg); - //Enable all autonomous button ui.all_autonomous_button->setEnabled(true); ui.all_autonomous_button->setStyleSheet("color: white; border:2px solid white; border-radius:12px; padding: 5px;"); @@ -2327,48 +2316,6 @@ void RoverGUIPlugin::visualizeSimulationButtonEventHandler() } -QString RoverGUIPlugin::startROSJoyNode() -{ - if (!joy_process) - { - - QString argument = "rosrun joy joy_node __name:=joy_node$HOSTNAME"; - - joy_process = new QProcess(); - - joy_process->start("sh", QStringList() << "-c" << argument); - - // joy_process->waitForStarted(); - - return "Started the joystick node."; - - } - else - { - return "The joystick node is already running."; - } -} - -QString RoverGUIPlugin::stopROSJoyNode() -{ - //return "Do nothing for debug"; - - if (joy_process) - { - joy_process->terminate(); - joy_process->waitForFinished(); - delete joy_process; - joy_process = NULL; - - return "Stopped the running joystick node."; - - } - else - { - return "Tried to stop the joystick node but it isn't running."; - } -} - QString RoverGUIPlugin::addUniformTargets() { QString number_of_tags = ui.number_of_tags_combobox->currentText(); From 1c0c2959812146d68444d8c0e65eb7df52bc9a64 Mon Sep 17 00:00:00 2001 From: Carter Frost Date: Tue, 26 Apr 2022 17:00:46 -0600 Subject: [PATCH 6/7] launch/rover_gui.launch: start joy_node --- launch/rover_gui.launch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/launch/rover_gui.launch b/launch/rover_gui.launch index 6eb0c6ed..6d045431 100644 --- a/launch/rover_gui.launch +++ b/launch/rover_gui.launch @@ -15,7 +15,9 @@ - + + + From 2358cce80cdd0dd089ffffe226690573ed9bbd97 Mon Sep 17 00:00:00 2001 From: Carter Frost Date: Mon, 9 May 2022 13:29:30 -0700 Subject: [PATCH 7/7] Delete CNN_9010_wAug_160.h5 --- classifiers/CNN_9010_wAug_160.h5 | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 classifiers/CNN_9010_wAug_160.h5 diff --git a/classifiers/CNN_9010_wAug_160.h5 b/classifiers/CNN_9010_wAug_160.h5 deleted file mode 100644 index 47662b73..00000000 --- a/classifiers/CNN_9010_wAug_160.h5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcb2b50327a60c26a526e7132e1540703c7884602f5f9f9629f8008292c6375c -size 248723000