Diff: main.cpp

Revision:

5:411f5351220f

Parent:

4:2a5cd0ad8100

Child:

6:122879c1503a

--- a/main.cpp	Tue May 12 14:46:42 2020 +0000
+++ b/main.cpp	Tue May 12 14:57:55 2020 +0000
@@ -238,7 +238,7 @@
         */
 
 
-        PID_Output = 0; // CHANGE LATER - This is for testing purposes
+        //PID_Output = 0; // CHANGE LATER - This is for testing purposes
 
 
         // System input
@@ -256,9 +256,9 @@
         VoltageOut.write(CurrentToVoltage(Sys_input_Amps));
 
         //1LoopCounter,2.1CurrentToVoltage, 2Sys_input_Amps, 3Cuboid_Angle_Degrees, 4GyroZ_RadiansPerSecond, 5Velocity, 6Velocity_Voltage, 7AccX_g, 8AccY_g, 9PID_Input, 10PID_Output, (Loop1_output+Loop2_output), Loop.read())
-        //pc.printf(" %i, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, ", LoopCounter, CurrentToVoltage(Sys_input_Amps), Sys_input_Amps, Cuboid_Angle_Degrees, GyroZ_RadiansPerSecond, Velocity, Velocity_Voltage, AccX_g, AccY_g, PID_Input, PID_Output, (Loop1_output+Loop2_output));
+        pc.printf(" %i, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, %0.5f, ", LoopCounter, CurrentToVoltage(Sys_input_Amps), Sys_input_Amps, Cuboid_Angle_Degrees, GyroZ_RadiansPerSecond, Velocity, Velocity_Voltage, AccX_g, AccY_g, PID_Input, PID_Output, (Loop1_output+Loop2_output));
 
-        // pc.printf("%i; %0.6f, \n\r", LoopCounter, Loop.read());
+        pc.printf("%i; %0.6f, \n\r", LoopCounter, Loop.read());
 
         //