Diff: Global.h

Revision:

33:d939479e7b13

Parent:

32:13aba70baa4b

Child:

34:770a6bbb4d63

diff -r 13aba70baa4b -r d939479e7b13 Global.h
--- a/Global.h	Thu Feb 16 07:08:54 2017 +0000
+++ b/Global.h	Wed Mar 01 08:05:52 2017 +0000
@@ -35,12 +35,12 @@
     static double yawdegree;
     static int    inttrimyaw;
     static double airspeed;
-    static double cadence;
-    static double ultsonic;
+    static float cadence;
+    static float ultsonic;
     static double atmpress;
     //static int    selector;
-    static double cadencevolt;
-    static double ultsonicvolt;
+    static float cadencevolt;
+    static float ultsonicvolt;
     static double servovolt;
     static double miconvolt;
     
@@ -129,12 +129,12 @@
     static double getyawdegree();
     static int    getinttrimyaw();
     static double getairspeed();
-    static double getcadence();
-    static double getultsonic();
+    static float getcadence();
+    static float getultsonic();
     static double getatmpress();
     //static int    getselector();
-    static double getcadencevolt();
-    static double getultsonicvolt();
+    static float getcadencevolt();
+    static float getultsonicvolt();
     static double getservovolt();
     static double getmiconvolt();
 
@@ -163,12 +163,12 @@
     static void setyawdegree(double _yawdegree);
     static void setinttrimyaw(int _inttrimyaw);    
     static void setairspeed(double _airspeed);
-    static void setcadence(double _cadence);
-    static void setultsonic(double _ultsonic);
+    static void setcadence(float _cadence); //floatにかえる
+    static void setultsonic(float _ultsonic);
     static void setatmpress(double _atmpress);
     //static void setselector(int _selector);   
-    static void setcadencevolt(double _cadencevolt);
-    static void setultsonicvolt(double _ultsonicvolt);
+    static void setcadencevolt(float _cadencevolt);//floatにかえる
+    static void setultsonicvolt(float _ultsonicvolt);
     static void setservovolt(double _servovolt);
     static void setmiconvolt(double _miconvolt);
 };