Diff: main.cpp

Revision:

18:1c3254a32fd1

Parent:

17:72d3522165ac

Child:

19:6f22b5687587

--- a/main.cpp	Mon Oct 19 14:21:46 2015 +0000
+++ b/main.cpp	Mon Oct 19 15:06:03 2015 +0000
@@ -88,15 +88,16 @@
 //////////////////////////////// POSITION AND ANGLE SHIZZLE
 float desired_position=0;
 float desired_angle[]= {0,0};
-float mm_per_sec_emg=50;// move the pod 50 mm per sec if muscle is flexed
-float fieldwidth=473;
-float safetymarginfield=75; //adjustable, tweak for maximum but safe range
+float mm_per_sec_emg=0.050;// move the pod 50 mm per sec if muscle is flexed
+float fieldwidth=0.473;
+float safetymarginfield=0.075; //adjustable, tweak for maximum but safe range
 float maxdisplacement=((fieldwidth/2)-safetymarginfield); //so the pod doesn't hit the edges of the playfield
 float rad_per_sec_emg=0.25*PIE;// THIS ONE IS NOT NESSECARY FOR ACTUAL PROGRAM
 
 angleandposition anglepos;
-float y_start=255;
-float y_punch=473;
+float y_start=0.255;
+float y_punch=0.473;
+
 //////////////////////GO FLAGS AND ACTIVATION FUNCTIONS
 volatile bool scopedata_go=false,
               control_go=false,