From 18d06460dd7855b70238a5a79e7f9982f08453fd Mon Sep 17 00:00:00 2001
From: Paul Beuchat <beuchatp@control.ee.ethz.ch>
Date: Tue, 17 Sep 2019 17:05:53 +0200
Subject: [PATCH] Purged the code of all occurances of the terminology teacher.
This was replaced by either master or by System Config GUI
---
.../dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h | 2 +-
dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h | 2 +-
dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp | 2 +-
.../src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp | 2 +-
dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp | 2 +-
dfall_ws/src/dfall_pkg/launch/{teacher.launch => master.launch} | 2 +-
dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp | 2 +-
dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp | 2 +-
dfall_ws/src/dfall_pkg/src/nodes/MocapEmulator.cpp | 2 +-
install/dfall_install_ros_kinetic_ubuntu16.sh | 2 +-
install/dfall_install_ros_melodic_ubuntu18.sh | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
rename dfall_ws/src/dfall_pkg/launch/{teacher.launch => master.launch} (97%)
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h
index abe9d659..bfa475fd 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Teacher's GUI main window header.
+// System Config GUI main window header.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h
index 8aa71328..e633c855 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Teacher's GUI marker object, to represent unlabeled markers.
+// System Config GUI marker object, to represent unlabeled markers.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp
index ed3847f3..7a0dc9cf 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Main file of the project Teacher's GUI.
+// Main file of the project System Config GUI.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp
index f624a864..1c6173bf 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Teacher's GUI main window header.
+// System Config GUI main window header.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp
index 118165ed..5be73fca 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Teacher's GUI marker object, to represent unlabeled markers.
+// System Config GUI marker object, to represent unlabeled markers.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/launch/teacher.launch b/dfall_ws/src/dfall_pkg/launch/master.launch
similarity index 97%
rename from dfall_ws/src/dfall_pkg/launch/teacher.launch
rename to dfall_ws/src/dfall_pkg/launch/master.launch
index a204b952..89abc73b 100755
--- a/dfall_ws/src/dfall_pkg/launch/teacher.launch
+++ b/dfall_ws/src/dfall_pkg/launch/master.launch
@@ -37,7 +37,7 @@
</node>
</group>
- <!-- TEACHER GUI -->
+ <!-- SYSTEM CONFIG GUI -->
<node
pkg="dfall_pkg"
name="SystemConfigGUI"
diff --git a/dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp
index 03dcaa42..05b1a91c 100644
--- a/dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp
+++ b/dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp
@@ -1569,7 +1569,7 @@ void loadCrazyflieContext()
else
{
m_isAvailableContext = false;
- ROS_ERROR("[DEFAULT CONTROLLER] Failed to load context. Waiting for next Save in DB by teacher");
+ ROS_ERROR("[DEFAULT CONTROLLER] Failed to load context. Waiting for next Save in DB by System Config node");
}
}
diff --git a/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp b/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
index 9bd6791a..1f36a2cb 100755
--- a/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
+++ b/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
@@ -1194,7 +1194,7 @@ void loadCrazyflieContext()
}
else
{
- ROS_ERROR("[FLYING AGENT CLIENT] Failed to load context. Waiting for next Save in DB by teacher");
+ ROS_ERROR("[FLYING AGENT CLIENT] Failed to load context. Waiting for next Save in DB by System Config node");
}
}
diff --git a/dfall_ws/src/dfall_pkg/src/nodes/MocapEmulator.cpp b/dfall_ws/src/dfall_pkg/src/nodes/MocapEmulator.cpp
index 0eeda89a..f4dfe8e4 100644
--- a/dfall_ws/src/dfall_pkg/src/nodes/MocapEmulator.cpp
+++ b/dfall_ws/src/dfall_pkg/src/nodes/MocapEmulator.cpp
@@ -286,7 +286,7 @@ int main(int argc, char* argv[])
// from the "MocapEmulatorConfig.yaml" file.
// > This is possible because that YAML file is added
// to the parameter service when launched via the
- // "teacher.launch" file.
+ // "master.launch" file.
fetchMocapEmulatorConfigYamlParameters();
diff --git a/install/dfall_install_ros_kinetic_ubuntu16.sh b/install/dfall_install_ros_kinetic_ubuntu16.sh
index 620f3656..50491079 100755
--- a/install/dfall_install_ros_kinetic_ubuntu16.sh
+++ b/install/dfall_install_ros_kinetic_ubuntu16.sh
@@ -118,7 +118,7 @@ git clone https://gitlab.ethz.ch/D-FaLL/PandS-System/D-FaLL-System.git
# > NOTE: the "man sh" explain that the -c option specifies "sh" to:
# "Read commands from the command_string operand instead of from the standard input.
-# Add the teacher's IP address to the /etc/hosts file
+# Add the dfallmaster's IP address to the /etc/hosts file
sudo sh -c "echo '10.42.0.10 dfallmaster' >> /etc/hosts"
# Add a new file with the default agent ID
diff --git a/install/dfall_install_ros_melodic_ubuntu18.sh b/install/dfall_install_ros_melodic_ubuntu18.sh
index 0516e944..4ff3edc9 100755
--- a/install/dfall_install_ros_melodic_ubuntu18.sh
+++ b/install/dfall_install_ros_melodic_ubuntu18.sh
@@ -118,7 +118,7 @@ git clone https://gitlab.ethz.ch/D-FaLL/PandS-System/D-FaLL-System.git
# > NOTE: the "man sh" explain that the -c option specifies "sh" to:
# "Read commands from the command_string operand instead of from the standard input.
-# Add the teacher's IP address to the /etc/hosts file
+# Add the dfallmaster's IP address to the /etc/hosts file
sudo sh -c "echo '10.42.0.10 dfallmaster' >> /etc/hosts"
# Add a new file with the default agent ID
--
GitLab