Diff: Global.cpp

Revision:

10:0a4bf8c82493

Parent:

9:d1fc0805ec7d

Child:

12:8e39bb45c61c

diff -r d1fc0805ec7d -r 0a4bf8c82493 Global.cpp
--- a/Global.cpp	Wed Oct 14 13:44:32 2015 +0000
+++ b/Global.cpp	Thu Nov 26 08:14:41 2015 +0000
@@ -34,14 +34,16 @@
 double Global::pitch;
 double Global::pitchdegree;//controllerの生データ
 double Global::trimpitch;
-double Global::inttrimpitch;
+int    Global::inttrimpitch;
 double Global::yaw;
 double Global::yawdegree;//controllerの生データ
 double Global::trimyaw;
-double Global::inttrimyaw;
+int    Global::inttrimyaw;
 double Global::airspeed;
 double Global::cadence;
 double Global::altitude;
+double Global::ultsonic;
+double Global::atmpress;
 
 //----------------どこからでも使えるled,スイッチ,タイマーの一括管理-----------------------------
 Timer Global::timer;
@@ -171,24 +173,30 @@
 double Global::getpitch(){return pitch;}
 double Global::getpitchdegree(){return pitchdegree;}
 double Global::gettrimpitch(){return trimpitch;}
-double Global::getinttrimpitch(){return inttrimpitch;}
+int    Global::getinttrimpitch(){return inttrimpitch;}
 double Global::getyaw(){return yaw;}
 double Global::getyawdegree(){return yawdegree;}
 double Global::gettrimyaw(){return trimyaw;}
-double Global::getinttrimyaw(){return inttrimyaw;}
+int    Global::getinttrimyaw(){return inttrimyaw;}
 double Global::getairspeed(){return airspeed;}
 double Global::getcadence(){return cadence;}
 double Global::getaltitude(){return altitude;}
+double Global::getultsonic(){return ultsonic;}
+double Global::getatmpress(){return atmpress;}
+
 
 void Global::setpitch(double _pitch){pitch = _pitch;}
 void Global::setpitchdegree(double _pitchdegree){pitchdegree = _pitchdegree;}
 void Global::settrimpitch(double _trimpitch){trimpitch = _trimpitch;}
-void Global::setinttrimpitch(double _inttrimpitch){inttrimpitch = _inttrimpitch;}
+void Global::setinttrimpitch(int _inttrimpitch){inttrimpitch = _inttrimpitch;}
 void Global::setyaw(double _yaw){yaw = _yaw;}
 void Global::setyawdegree(double _yawdegree){yawdegree = _yawdegree;}
 void Global::settrimyaw(double _trimyaw){trimyaw = _trimyaw;}
-void Global::setinttrimyaw(double _inttrimyaw){inttrimyaw = _inttrimyaw;}
+void Global::setinttrimyaw(int _inttrimyaw){inttrimyaw = _inttrimyaw;}
 void Global::setairspeed(double _airspeed){airspeed = _airspeed;}
 void Global::setcadence(double _cadence){cadence = _cadence;}
 void Global::setaltitude(double _altitude){altitude = _altitude;}
+void Global::setultsonic(double _ultsonic){ultsonic = _ultsonic;}
+void Global::setatmpress(double _atmpress){atmpress = _atmpress;}
 
+