Diff: main.cpp

Branch:

mpu????????

Revision:

69:073116d31a56

Parent:

68:ae3c3500074c

Child:

70:7da315abec17

Child:

76:cc4de3500d59

--- a/main.cpp	Fri Sep 29 08:13:16 2017 +0000
+++ b/main.cpp	Fri Sep 29 09:04:53 2017 +0000
@@ -46,8 +46,8 @@
 PwmOut drugServo(p22);
 PwmOut eruronServo(p23);
 DigitalOut led1(LED1);
-AnalogIn eruronAna(p20);
-AnalogIn drugAna(p19);
+AnalogIn setDeg10(p20);
+AnalogIn setDeg1(p19);
 DigitalIn IsRPin(p11,PullDown);
 DigitalIn InSetModePin(p12,PullDown);
 DigitalIn EDstatePin(p14,PullDown);
@@ -324,10 +324,10 @@
 {
     led2 =  1;
     if(EDstatePin) {
-        eruronTrim = eruronAna.read();
+        eruronTrim = (int)(setDeg10.read()*9)/10.0 + setDeg1.read()/10;
         eruronServo.pulsewidth(calcPulse(eruronTrim));
     } else {
-        drugTrim = drugAna.read();
+        drugTrim = (int)(setDeg10.read()*9)/10.0 + setDeg1.read()/10;
         drugServo.pulsewidth(calcPulse(drugTrim));
     }
     //pc.printf("eruronTrim:%f    drugTrim:%f\n\r",eruronTrim,drugTrim);
@@ -338,8 +338,8 @@
 void setMaxDeg()
 {
     led4 = 1;
-    float eruronTemp = eruronAna.read();
-    float drugTemp = drugAna.read();
+    float eruronTemp = (int)(setDeg10.read()*9)/10.0 + setDeg1.read()/10;
+    float drugTemp = (int)(setDeg10.read()*9)/10.0 + setDeg1.read()/10;
     if(EDstatePin) {
         eruronMoveDeg = eruronTemp-eruronTrim;
         eruronServo.pulsewidth(calcPulse(eruronTemp));