Diff: main.cpp

Revision:

38:79af1c65dd6f

Parent:

37:0a225902cf48

Child:

39:6814c75dfa5c

--- a/main.cpp	Wed Apr 22 08:50:26 2020 +0000
+++ b/main.cpp	Mon Apr 27 15:01:00 2020 +0000
@@ -234,7 +234,8 @@
                 TBperiod=5.2f*TBrpm;   //prova dopo test con contagiri
             }
         #endif
-    #else
+    #endif
+    #if defined(oldStepperDriver)
         TBfrequency = (TBrpm*K_TBfrequency);                                // 130Hz a 0,29Mts                                                            1397,00 a 1,25mt/s con 15 becchi e 15 celle
         TBperiod=1000000.0f/TBfrequency;                                    //                                                                              715uS
     #endif
@@ -849,7 +850,6 @@
             pc.printf("15\n");
         #endif
     #endif
-    TBmotorRst=1;
 }
 //****************************************
 void controllaCorrente(){
@@ -2363,7 +2363,12 @@
                 if ((speedCorrectionMachine>0.0f)&&(speedCorrectionMachine<tabSpeed[0])) {
                     dutyTeorico = tabComan[0];
                 }
-                for (int ii = 0; ii<tabeling; ii++) { // era ii<16
+                #if defined(oldStepperDriver)
+                    for (int ii = 0; ii<16; ii++) { // era ii<16
+                #endif
+                #if defined(runner)
+                    for (int ii = 0; ii<tabeling; ii++) { // era ii<16
+                #endif
                     if ((speedCorrectionMachine>=tabSpeed[ii])&&(speedCorrectionMachine<tabSpeed[ii+1])) {
                         // esegue l'interpolazione dei valori stimati di duty in base alla velocità
                         deltaV=tabSpeed[ii+1]-tabSpeed[ii];
@@ -2380,12 +2385,16 @@
                         #endif
                     }
                 }
-                //if (tractorSpeed_MtS_timed > tabSpeed[16]) {
-                //    dutyTeorico=tractorSpeed_MtS_timed/maxWorkSpeed;
-                //}
-                if (speedCorrectionMachine > tabSpeed[tabeling]) {
-                    dutyTeorico=speedCorrectionMachine/maxWorkSpeed;
-                }
+                #if defined(oldStepperDriver)
+                    if (tractorSpeed_MtS_timed > tabSpeed[16]) {
+                        dutyTeorico=tractorSpeed_MtS_timed/maxWorkSpeed;
+                    }
+                #endif
+                #if defined(runner)
+                    if (speedCorrectionMachine > tabSpeed[tabeling]) {
+                        dutyTeorico=speedCorrectionMachine/maxWorkSpeed;
+                    }
+                #endif
                 #if !defined(speedMaster)
                     quinCalc();
                 #endif