Merge branch 'master' of https://fsstud.is.uni-due.de:8090/sfmabock/crs

include/er1driver/crsinputhelper.hpp

@@ -23,8 +23,8 @@ public:
      */
     bool init();
 
-    Key getKeyDown();
-    bool isKeyUp();
+    Key getKeyPressed();
+    bool isKeyReleased();
     void checkKeys();
 
 private:

src/er1_control_node/main.cpp

@@ -56,14 +56,14 @@ int main(int argc, char** argv) {
         helper.checkKeys();
 
         // Stop the robot on any keyup
-        if (helper.isKeyUp()) {
+        if (helper.isKeyReleased()) {
             crs::ER1ControlMsg msg;
             msg.er1command = crs::ER1ControlMsg::ER1CommandStop;
             publisher.publish(msg);
         }
 
         // Send command if keydown
-        auto key = helper.getKeyDown();
+        auto key = helper.getKeyPressed();
         if (key == Key::None) {
 
         } else if (key == Key::Left) {

src/er1_control_node_student/main.cpp

@@ -57,7 +57,7 @@ int main(int argc, char** argv) {
         helper.checkKeys();
 
         // Stop the robot on any keyup
-        if (helper.isKeyUp()) {
+        if (helper.isKeyReleased()) {
             crs::ER1ControlMsg msg;
             msg.er1command = crs::ER1ControlMsg::ER1CommandStop;
             publisher.publish(msg);

src/er1driver/crsinputhelper.cpp

@@ -24,7 +24,7 @@ bool CRSInputHelper::init() {
 }
 
 
-Key CRSInputHelper::getKeyDown() {
+Key CRSInputHelper::getKeyPressed() {
     if (hasNewKeyDown) {
         hasNewKeyDown = false;
         return static_cast<Key>(currentDown);
@@ -33,7 +33,7 @@ Key CRSInputHelper::getKeyDown() {
     }
 }
 
-bool CRSInputHelper::isKeyUp() {
+bool CRSInputHelper::isKeyReleased() {
     if (hasNewKeyUp) {
         hasNewKeyUp = false;
         return true;