Diff: bot/controller/controller.h

Revision:

22:bb6afe7332c3

Parent:

21:b2c1d73b0ee9

--- a/bot/controller/controller.h	Mon Sep 04 18:35:33 2017 +0900
+++ b/bot/controller/controller.h	Tue Sep 05 12:00:34 2017 +0900
@@ -33,13 +33,13 @@
 
 #include "FEP.h"
 
-#define M_PI 3.141592653589793
-#define ADDR 203
-#define FEP_SUCCESS 0
-#define DATA_SIZE 6
-#define STICK_DIVIDE 255.0
-#define STICK_NEWTRAL 0.1
-#define STICK_NORM_MAX 1.0
+// const double M_PI =     3.141592653589793;
+const int ADDR =        203;
+const bool FEP_SUCCESS =0;
+const int DATA_SIZE =   6;
+const float STICK_DIVIDE =  255.0;
+const float STICK_NEWTRAL = 0.1;
+const float STICK_NORM_MAX =1.0;
 
 /**
 * @brief FEPを使ったコントローラのクラス
@@ -71,35 +71,35 @@
      * @param  number button number
      * @return        status
      */
-    bool getButton1(int number);
+    bool getButton1(int number) const;
 
     /**
      * ボタン2の状態を取得
      * @param  number button number
      * @return        status
      */
-    bool getButton2(int number);
+    bool getButton2(int number) const;
 
     /**
      * スティックの値を取得
      * @param  number sticknumber(x, y, x, y)
      * @return        stick value
      */
-    float getStick(int number);
+    float getStick(int number) const;
 
     /**
      * スチィックの角度を取得
      * @param  number left...0 right...1
      * @return        radian
      */
-    float getRadian(int number);
+    float getRadian(int number) const;
 
     /**
      * スティックの距離を取得
      * @param  number left..0 right..1
      * @return        norm
      */
-    float getNorm(int number);
+    float getNorm(int number) const;
 
 private :
     void setStick();