Diff: myRos.h

Revision:

4:cf1a4e503974

Parent:

3:a45557a0dcb8

--- a/myRos.h	Tue Dec 11 17:51:47 2018 +0000
+++ b/myRos.h	Wed Dec 12 03:35:52 2018 +0000
@@ -12,10 +12,8 @@
 #include <geometry_msgs/PointStamped.h>
 #include <std_msgs/Empty.h>
 
-#define COURT_RED   false
-#define COURT_BLUE  true
-
 void ack_from_pc_cb(const std_msgs::Empty&);
+void drift_sub_cb(const geometry_msgs::Point& drift);
 
 class My_Ros : public Odom_Abstract
 {
@@ -23,12 +21,12 @@
     
     private:
         ros::NodeHandle nh_;
-        bool court_color_;
         
     public:
         //Constructor
-        My_Ros(Odom *odom) : court_color_(COURT_RED){
-            set_instance(odom);
+        My_Ros(Odom *odom) : Odom_Abstract(odom){
+//            set_instance(odom);
+            set_court_color(COURT_RED);
             
             //ROS node initialize
             nh_.getHardware()->setBaud(115200);
@@ -38,9 +36,6 @@
         }
                 
         //Setter
-        void set_court_color(bool court_color){
-            court_color_ = court_color;   
-        }
         template<typename SubscriberT>
         void set_subscliber(SubscriberT& s){
             nh_.subscribe(s);