Diff: main.cpp

Revision:

5:72bdc69d610d

Parent:

4:1643fea75703

Child:

7:dc3cb1a5764b

--- a/main.cpp	Fri Jun 29 13:07:46 2018 +0000
+++ b/main.cpp	Fri Jun 29 14:05:20 2018 +0000
@@ -146,16 +146,6 @@
 
 //***************************************************
 void writelog(){
-    pc.printf("\nMotorSpeedCorrected %f",MotorSpeedCorrected);
-    pc.printf(" - WantedMotorSpeed %d",WantedMotorSpeed);
-    pc.printf(" - ReadMotorSpeed %d",ReadMotorSpeed);
-    pc.printf(" - ElapsedW %d",ElapsedW);
-    pc.printf(" - TempReadW %d",TempReadW);
-    pc.printf(" - ElapsedM %d",ElapsedM);
-    pc.printf(" - TempReadM %d",TempReadM);
-    pc.printf(" - Plus %d",PercentPlus);
-    pc.printf(" - Minus %d",PercentMinus);
-    pc.printf(" - Security %d",SecurityStop);
 }
 
 //***************************************************
@@ -188,9 +178,18 @@
         MotorPwmPin.write(MotorSpeedCorrected);
         DC_brake=0;
         DC_prepare();
-        
-        writelog();
-        
+#if defined(logActive)
+        pc.printf("\nMotorSpeedCorrected %f",MotorSpeedCorrected);
+        pc.printf(" - WantedMotorSpeed %d",WantedMotorSpeed);
+        pc.printf(" - ReadMotorSpeed %d",ReadMotorSpeed);
+        pc.printf(" - ElapsedW %d",ElapsedW);
+        pc.printf(" - TempReadW %d",TempReadW);
+        pc.printf(" - ElapsedM %d",ElapsedM);
+        pc.printf(" - TempReadM %d",TempReadM);
+        pc.printf(" - Plus %d",PercentPlus);
+        pc.printf(" - Minus %d",PercentMinus);
+        pc.printf(" - Security %d",SecurityStop);
+#endif
     }else{
         OffTheMotor();
     }
@@ -282,8 +281,9 @@
     MSToMotorNewCheck.attach(&CheckMotorCorrection, 0.1);  //check motor correction every xx seconds
     ReadWheelArray.clear();
     ReadMotorArray.clear();
-    pc.printf("\n\n                         Hello World\n\n");
-
+#if defined(logActive)
+    pc.printf("\n\n                         Salute, Capo!\n\n");
+#endif
     WheelSensorPin.rise(&ReadWheelInterrupt);  //interrupt for wheel sensor, trigs when changes from 0 to 1
     MotorSensorPin.rise(&ReadMotorInterrupt);  //interrupt for motor sensor, trigs when changes from 0 to 1