Diff: Global.cpp

Revision:

31:cef6ee7af014

Parent:

26:a53c3208ac35

Child:

32:13aba70baa4b

--- a/Global.cpp	Thu Dec 29 11:36:49 2016 +0000
+++ b/Global.cpp	Mon Feb 13 06:08:05 2017 +0000
@@ -42,6 +42,8 @@
 double Global::ultsonic;
 double Global::atmpress;
 int    Global::selector;
+double Global::cadencevolt;
+double Global::ultsonicvolt;
 double Global::servovolt;
 double Global::miconvolt;
 
@@ -56,6 +58,8 @@
 int Global::ultsonictime;
 int Global::atmpresstime;
 int Global::selectortime;
+int Global::cadencevolttime;
+int Global::ultsonicvolttime;
 int Global::servovolttime;
 int Global::miconvolttime;
 
@@ -193,6 +197,8 @@
 double Global::getultsonic(){return ultsonic;}
 double Global::getatmpress(){return atmpress;}
 int    Global::getselector(){return selector;}
+double Global::getcadencevolt(){return cadencevolt;}
+double Global::getultsonicvolt(){return ultsonicvolt;}
 double Global::getservovolt(){return servovolt;}
 double Global::getmiconvolt(){return miconvolt;}
 
@@ -207,6 +213,8 @@
 int Global::getultsonictime(){return ultsonictime;}
 int Global::getatmpresstime(){return atmpresstime;}
 int Global::getselectortime(){return selectortime;}
+int Global::getcadencevolttime(){return cadencevolttime;}
+int Global::getultsonicvolttime(){return ultsonicvolttime;}
 int Global::getservovolttime(){return servovolttime;}
 int Global::getmiconvolttime(){return miconvolttime;}
 
@@ -256,6 +264,14 @@
     selector = _selector;
     selectortime = timer.read_ms();
 }
+void Global::setcadencevolt(double _cadencevolt){
+    cadencevolt = _cadencevolt;
+    cadencevolttime = timer.read_ms();
+}
+void Global::setultsonicvolt(double _ultsonicvolt){
+    ultsonicvolt = _ultsonicvolt;
+    ultsonicvolttime = timer.read_ms();
+}
 void Global::setservovolt(double _servovolt){
     servovolt = _servovolt;
     servovolttime = timer.read_ms();