Diff: main.cpp

Revision:

25:4461bc76aaab

Parent:

24:2b5e749e26b2

Child:

26:77955c5d16a3

--- a/main.cpp	Wed May 08 05:44:20 2019 +0000
+++ b/main.cpp	Sat May 18 10:47:40 2019 +0000
@@ -574,27 +574,27 @@
                 double higLim = 50.0f;
                 double divide= 100.0f;
                 if (drumSelect==false){
-                    lowLim=-50.0f;
-                    higLim = 50.0f;
-                    divide= 100.0f;
+                    if (pickNumber <= 5) {
+                        lowLim=-500.0f;
+                        higLim= 500.0f;
+                        divide= 25.0f;
+                    } else {
+                        lowLim=-10.0f;
+                        higLim= 130.0f;
+                        divide= 100.0f;
+                    }
                 }else{
-                    lowLim=-500.0f; //pneumatico Alessandria
-                    higLim= 130.0f; //pneumatico Alessandria
-                    divide= 25.0f;  //pneumatico Alessandria
-                }
-                if (pickNumber <= 5) {
-                    lowLim=-500.0f;
-                    higLim= 500.0f;
-                    divide= 25.0f;
-                } else {
-                    lowLim=-10.0f;
-                    higLim= 130.0f;
-                    if (drumSelect==false){
-                        divide= 100.0f;
+                    if (pickNumber <= 5) {
+                        lowLim=-500.0f; 
+                        higLim= 500.0f; 
+                        divide= 25.0f;  
                     }else{
-                        divide= 20.0f; //pneumatico Alessandria
+                        lowLim=-500.0f; //pneumatico Alessandria
+                        higLim= 130.0f; //pneumatico Alessandria
+                        divide= 20.0f;  //pneumatico Alessandria
                     }
                 }
+
                 if (posError>higLim) {
                     posError=higLim;
                     //posError=0.0f;
@@ -1665,8 +1665,11 @@
                 seedWheelZeroPinInput=0;
             }
         #endif
-        TBzeroPinInput = !TBzeroPinInputRev;
-
+        if (drumSelect==true){
+            TBzeroPinInput = TBzeroPinInputRev;
+        }else{
+            TBzeroPinInput = !TBzeroPinInputRev;
+        }
         // se quinconce attivo ed unita' master invia segnale di sincro
         #if defined(speedMaster)
             if (seedWheelZeroPinInput==1) {