Diff: Global.cpp

Revision:

33:d939479e7b13

Parent:

32:13aba70baa4b

Child:

34:770a6bbb4d63

--- a/Global.cpp	Thu Feb 16 07:08:54 2017 +0000
+++ b/Global.cpp	Wed Mar 01 08:05:52 2017 +0000
@@ -38,12 +38,12 @@
 double Global::yawdegree;//controllerの生データ
 int    Global::inttrimyaw;
 double Global::airspeed;
-double Global::cadence;
-double Global::ultsonic;
+float Global::cadence;
+float Global::ultsonic;
 double Global::atmpress;
 //int    Global::selector;
-double Global::cadencevolt;
-double Global::ultsonicvolt;
+float Global::cadencevolt;
+float Global::ultsonicvolt;
 double Global::servovolt;
 double Global::miconvolt;
 
@@ -193,12 +193,12 @@
 double Global::getyawdegree(){return yawdegree;}
 int    Global::getinttrimyaw(){return inttrimyaw;}
 double Global::getairspeed(){return airspeed;}
-double Global::getcadence(){return cadence;}
-double Global::getultsonic(){return ultsonic;}
+float Global::getcadence(){return cadence;}
+float Global::getultsonic(){return ultsonic;}
 double Global::getatmpress(){return atmpress;}
 //int    Global::getselector(){return selector;}
-double Global::getcadencevolt(){return cadencevolt;}
-double Global::getultsonicvolt(){return ultsonicvolt;}
+float Global::getcadencevolt(){return cadencevolt;}
+float Global::getultsonicvolt(){return ultsonicvolt;}
 double Global::getservovolt(){return servovolt;}
 double Global::getmiconvolt(){return miconvolt;}
 
@@ -248,11 +248,11 @@
     airspeed = _airspeed;
     airspeedtime = timer.read_ms();
 }
-void Global::setcadence(double _cadence){
+void Global::setcadence(float _cadence){
     cadence = _cadence;
     cadencetime = timer.read_ms();
 }
-void Global::setultsonic(double _ultsonic){
+void Global::setultsonic(float _ultsonic){
     ultsonic = _ultsonic;
     ultsonictime = timer.read_ms();
 }
@@ -264,11 +264,11 @@
     selector = _selector;
     selectortime = timer.read_ms();
 }*/
-void Global::setcadencevolt(double _cadencevolt){
+void Global::setcadencevolt(float _cadencevolt){
     cadencevolt = _cadencevolt;
     cadencevolttime = timer.read_ms();
 }
-void Global::setultsonicvolt(double _ultsonicvolt){
+void Global::setultsonicvolt(float _ultsonicvolt){
     ultsonicvolt = _ultsonicvolt;
     ultsonicvolttime = timer.read_ms();
 }