diff --git a/src/main/java/frc4388/robot/Robot.java b/src/main/java/frc4388/robot/Robot.java index 8fc1ca3..2d6f348 100644 --- a/src/main/java/frc4388/robot/Robot.java +++ b/src/main/java/frc4388/robot/Robot.java @@ -74,6 +74,7 @@ public class Robot extends TimedRobot { */ @Override public void autonomousInit() { + m_robotContainer.m_robotSwerveDrive.resetGyro(); m_autonomousCommand = m_robotContainer.getAutonomousCommand(); // schedule the autonomous command (example) @@ -92,6 +93,7 @@ public class Robot extends TimedRobot { @Override public void teleopInit() { + m_robotContainer.m_robotSwerveDrive.resetGyro(); // This makes sure that the autonomous stops running when // teleop starts running. If you want the autonomous to // continue until interrupted by another command, remove @@ -99,6 +101,7 @@ public class Robot extends TimedRobot { if (m_autonomousCommand != null) { m_autonomousCommand.cancel(); } + m_robotContainer.m_robotSwerveDrive.resetGyro(); m_robotTime.startMatchTime(); } diff --git a/src/main/java/frc4388/robot/commands/JoystickInputs.txt b/src/main/java/frc4388/robot/commands/JoystickInputs.txt index 8ca32ac..263ff3f 100644 --- a/src/main/java/frc4388/robot/commands/JoystickInputs.txt +++ b/src/main/java/frc4388/robot/commands/JoystickInputs.txt @@ -1,132 +1,598 @@ -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,-0.1015625,0.0,0.0 -0.0,-0.109375,0.0,0.0 -0.0,-0.1171875,0.0,0.0 -0.0,-0.140625,0.0,0.0 -0.0,-0.140625,0.0,0.0 -0.0,-0.1484375,0.0,0.0 -0.0,-0.1796875,0.0,0.0 -0.0,-0.1796875,0.0,0.0 -0.0,-0.1875,0.0,0.0 -0.0,-0.1953125,0.0,0.0 -0.0,-0.21875,0.0,0.0 -0.0,-0.2265625,0.0,0.0 -0.0,-0.25,0.0,0.0 -0.0,-0.2890625,0.0,0.0 -0.0,-0.3046875,0.0,0.0 -0.0,-0.3125,0.0,0.0 -0.0,-0.3125,0.0,0.0 -0.0,-0.3125,0.0,0.0 -0.0,-0.3359375,0.0,0.0 -0.0,-0.359375,0.0,0.0 -0.0,-0.390625,0.0,0.0 -0.0,-0.3984375,0.0,0.0 -0.0,-0.40625,0.0,0.0 -0.0,-0.4296875,0.0,0.0 -0.0,-0.4453125,0.0,0.0 -0.0,-0.4609375,0.0,0.0 -0.0,-0.46875,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.5,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.4921875,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.484375,0.0,0.0 -0.0,-0.46875,0.0,0.0 -0.0,-0.4296875,0.0,0.0 -0.0,-0.359375,0.0,0.0 -0.0,-0.2734375,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 -0.0,0.0,0.0,0.0 \ No newline at end of file +0.0,0.0,0.0,0.0,0 +0.0,0.0,0.0,0.0,2 +0.0,0.0,0.0,0.0,19 +0.0,0.0,0.0,0.0,31 +0.0,0.0,0.0,0.0,46 +0.0,0.0,0.0,0.0,64 +0.0,0.0,0.0,0.0,84 +0.0,0.0,0.0,0.0,104 +0.0,0.0,0.0,0.0,124 +0.0,0.0,0.0,0.0,144 +0.0,0.0,0.0,0.0,165 +0.0,0.0,0.0,0.0,185 +0.0,0.0,0.0,0.0,204 +0.0,0.0,0.0,0.0,239 +0.0,0.0,0.0,0.0,250 +0.0,0.0,0.0,0.0,267 +0.0,0.0,0.0,0.0,284 +0.0,0.0,0.0,0.0,305 +0.0,0.0,0.0,0.0,325 +-0.046875,-0.140625,0.0,0.0,345 +-0.046875,-0.15625,0.0,0.0,364 +-0.0390625,-0.1640625,0.0,0.0,385 +-0.046875,-0.1640625,0.0,0.0,404 +-0.046875,-0.1640625,0.0,0.0,425 +-0.0390625,-0.1796875,0.0,0.0,444 +-0.0390625,-0.2109375,0.0,0.0,481 +-0.0390625,-0.2109375,0.0,0.0,495 +-0.0390625,-0.2265625,0.0,0.0,512 +-0.0390625,-0.234375,0.0,0.0,524 +-0.03125,-0.25,0.0,0.0,544 +-0.03125,-0.2578125,0.0,0.0,564 +-0.0234375,-0.2890625,0.0,0.0,584 +-0.0234375,-0.3046875,0.0,0.0,604 +-0.015625,-0.3125,0.0,0.0,624 +-0.015625,-0.3125,0.0,0.0,644 +-0.015625,-0.3125,0.0,0.0,665 +-0.015625,-0.3125,0.0,0.0,684 +-0.0078125,-0.3125,0.0,0.0,727 +-0.015625,-0.3125,0.0,0.0,744 +-0.015625,-0.3125,0.0,0.0,757 +-0.015625,-0.3125,0.0,0.0,775 +-0.0078125,-0.3125,0.0,0.0,795 +-0.015625,-0.3125,0.0,0.0,809 +-0.0234375,-0.3125,0.0,0.0,824 +-0.015625,-0.3125,0.0,0.0,844 +-0.0078125,-0.3125,0.0,0.0,864 +-0.0078125,-0.3046875,0.0,0.0,885 +-0.0078125,-0.3203125,0.0,0.0,904 +-0.0078125,-0.3359375,0.0,0.0,924 +-0.0078125,-0.3515625,0.0,0.0,1013 +-0.0078125,-0.3515625,0.0,0.0,1028 +-0.0078125,-0.3515625,0.0,0.0,1040 +-0.0078125,-0.3515625,0.0,0.0,1056 +-0.0078125,-0.359375,0.0,0.0,1074 +-0.0078125,-0.3671875,0.0,0.0,1087 +-0.0078125,-0.3671875,0.0,0.0,1098 +-0.0078125,-0.375,0.0,0.0,1110 +-0.0078125,-0.375,0.0,0.0,1121 +-0.0078125,-0.375,0.0,0.0,1133 +-0.0078125,-0.375,0.0,0.0,1146 +-0.0078125,-0.390625,0.0,0.0,1164 +-0.0078125,-0.3984375,0.0,0.0,1203 +-0.0078125,-0.3984375,0.0,0.0,1216 +-0.0078125,-0.40625,0.0,0.0,1228 +-0.0078125,-0.421875,0.0,0.0,1245 +-0.0078125,-0.421875,0.0,0.0,1264 +-0.0078125,-0.421875,0.0,0.0,1284 +-0.0078125,-0.421875,0.0,0.0,1305 +-0.0078125,-0.421875,0.0,0.0,1324 +-0.0078125,-0.421875,0.0,0.0,1345 +-0.0078125,-0.421875,0.0,0.0,1364 +-0.0078125,-0.421875,0.0,0.0,1384 +-0.0078125,-0.421875,0.0,0.0,1404 +-0.0078125,-0.421875,0.0,0.0,1441 +-0.0078125,-0.421875,0.0,0.0,1456 +-0.0078125,-0.421875,0.0,0.0,1468 +-0.0078125,-0.421875,0.0,0.0,1484 +-0.0078125,-0.421875,0.0,0.0,1505 +-0.0078125,-0.421875,0.0,0.0,1525 +-0.0078125,-0.421875,0.0,0.0,1546 +-0.0078125,-0.421875,0.0,0.0,1564 +-0.015625,-0.421875,0.0,0.0,1584 +-0.015625,-0.421875,0.0,0.0,1604 +-0.015625,-0.421875,0.0,0.0,1624 +-0.015625,-0.421875,0.0,0.0,1644 +-0.015625,-0.421875,0.0,0.0,1685 +-0.015625,-0.421875,0.0,0.0,1700 +-0.015625,-0.421875,0.0,0.0,1716 +-0.015625,-0.421875,0.0,0.0,1730 +-0.015625,-0.421875,0.0,0.0,1744 +-0.015625,-0.421875,0.0,0.0,1764 +-0.015625,-0.421875,0.0,0.0,1785 +-0.015625,-0.421875,0.0,0.0,1805 +-0.015625,-0.421875,0.0,0.0,1825 +-0.015625,-0.4375,0.0,0.0,1845 +-0.0234375,-0.4375,0.0,0.0,1864 +-0.0234375,-0.4375,0.0,0.0,1885 +-0.0234375,-0.4375,0.0,0.0,1925 +-0.0234375,-0.4375,0.0,0.0,1940 +-0.0234375,-0.4375,0.0,0.0,1955 +-0.0234375,-0.4375,0.0,0.0,1967 +-0.0234375,-0.4375,0.0,0.0,1986 +-0.0234375,-0.4375,0.0,0.0,2006 +-0.0234375,-0.4375,0.0,0.0,2024 +-0.0234375,-0.4375,0.0,0.0,2044 +-0.0234375,-0.4375,0.0,0.0,2064 +-0.0234375,-0.4375,0.0,0.0,2085 +-0.0234375,-0.4375,0.0,0.0,2105 +-0.0234375,-0.4375,0.0,0.0,2125 +-0.0234375,-0.4375,0.0,0.0,2174 +-0.0234375,-0.4375,0.0,0.0,2189 +-0.0234375,-0.4375,0.0,0.0,2202 +-0.0234375,-0.4375,0.0,0.0,2218 +-0.0234375,-0.4375,0.0,0.0,2233 +-0.0234375,-0.4375,0.0,0.0,2250 +-0.0234375,-0.4375,0.0,0.0,2264 +-0.015625,-0.4375,0.0,0.0,2284 +-0.015625,-0.4375,0.0,0.0,2304 +-0.015625,-0.4375,0.0,0.0,2324 +-0.015625,-0.4375,0.0,0.0,2344 +-0.015625,-0.4375,0.0,0.0,2364 +-0.015625,-0.4375,0.0,0.0,2407 +-0.015625,-0.4375,0.0,0.0,2423 +-0.015625,-0.4375,0.03125,-0.1015625,2440 +-0.015625,-0.4375,0.03125,-0.1015625,2451 +-0.015625,-0.4296875,0.0703125,-0.203125,2466 +-0.015625,-0.4296875,0.1171875,-0.28125,2484 +-0.015625,-0.4296875,0.1484375,-0.359375,2505 +-0.015625,-0.4296875,0.1875,-0.453125,2524 +-0.015625,-0.4296875,0.1875,-0.453125,2544 +-0.015625,-0.4296875,0.21875,-0.5625,2564 +-0.015625,-0.4296875,0.2421875,-0.6015625,2584 +-0.015625,-0.4296875,0.28125,-0.7109375,2606 +-0.015625,-0.4296875,0.2890625,-0.84375,2644 +-0.015625,-0.4296875,0.28089875327071334,-0.9597374070082707,2661 +-0.015625,-0.4296875,0.28089875327071334,-0.9597374070082707,2672 +-0.015625,-0.4296875,0.2707455769182841,-0.962650940153899,2689 +-0.015625,-0.4296875,0.2707455769182841,-0.962650940153899,2704 +-0.015625,-0.4296875,0.19905992429010463,-0.9799873195820535,2724 +-0.015625,-0.4296875,0.18428853505018536,-0.9828721869343219,2745 +-0.015625,-0.4296875,0.16939121559933262,-0.9855488907597534,2764 +-0.015625,-0.4296875,0.1543768802736096,-0.9880120337511015,2784 +-0.015625,-0.4296875,0.07788766729290965,-0.9969621413492434,2804 +-0.015625,-0.4296875,0.03903273174035336,-0.999237932553046,2825 +-0.015625,-0.4296875,0.023431065349237362,-0.9997254549007941,2845 +-0.015625,-0.4296875,-0.0,-1.0,2885 +-0.015625,-0.4296875,-0.0,-1.0,2900 +-0.015625,-0.4296875,-0.0,-1.0,2913 +-0.015625,-0.4296875,-0.0,-1.0,2930 +-0.015625,-0.4296875,-0.0,-1.0,2944 +-0.015625,-0.4296875,-0.08629110282549445,-0.9962699662105448,2965 +-0.015625,-0.4296875,-0.10957246682398805,-0.9939788098918941,2984 +-0.015625,-0.4296875,-0.14795964550591104,-0.9889933990182973,3004 +-0.015625,-0.4296875,-0.20795087166990847,-0.9781392717664111,3025 +-0.015625,-0.4296875,-0.22261635546060413,-0.974906127933063,3045 +-0.015625,-0.4296875,-0.24433176541606075,-0.9696916976073742,3064 +-0.015625,-0.4296875,-0.2586093438103028,-0.9659819911851382,3084 +-0.015625,-0.4296875,-0.3072217021263233,-0.9516379698932809,3117 +-0.015625,-0.4296875,-0.3535437990815464,-0.9354179718879616,3129 +-0.015625,-0.4296875,-0.3535437990815464,-0.9354179718879616,3144 +-0.015625,-0.421875,-0.43296180587754685,-0.9014122667521522,3164 +-0.015625,-0.4140625,-0.46113272661989396,-0.8873311717955715,3184 +-0.015625,-0.4140625,-0.46113272661989396,-0.8873311717955715,3204 +-0.015625,-0.40625,-0.5034479718548448,-0.8640255433928116,3224 +-0.015625,-0.40625,-0.5034479718548448,-0.8640255433928116,3245 +-0.015625,-0.40625,-0.5424281727058204,-0.8401021827462566,3264 +-0.015625,-0.40625,-0.5470717552428331,-0.8370857152141146,3284 +-0.015625,-0.40625,-0.5695464964539495,-0.8219591160009305,3304 +-0.015625,-0.40625,-0.594924795762871,-0.8037813679020596,3325 +-0.015625,-0.40625,-0.6851738491603396,-0.7283795689246123,3417 +-0.015625,-0.4140625,-0.7305249012857322,-0.6828860582860593,3430 +-0.015625,-0.4140625,-0.7363002262116671,-0.6766549910261859,3442 +-0.015625,-0.4140625,-0.7363002262116671,-0.6766549910261859,3453 +-0.015625,-0.421875,-0.7392885165971433,-0.673388809847324,3468 +-0.0234375,-0.421875,-0.7731493128109427,-0.6342240456652264,3482 +-0.0234375,-0.421875,-0.7731493128109427,-0.6342240456652264,3499 +-0.0234375,-0.421875,-0.7820595514434193,-0.6232037050564748,3513 +-0.0234375,-0.421875,-0.7940055545690287,-0.6079105027169126,3529 +-0.0234375,-0.421875,-0.7940055545690287,-0.6079105027169126,3541 +-0.0234375,-0.421875,-0.7940055545690287,-0.6079105027169126,3552 +-0.0234375,-0.421875,-0.8030011791882969,-0.5959774376788141,3565 +-0.0234375,-0.421875,-0.8210359184762267,-0.5708765370655013,3598 +-0.0234375,-0.421875,-0.8300495997825932,-0.5576895748539298,3614 +-0.0234375,-0.421875,-0.8360479108370626,-0.5486564414868224,3626 +-0.0078125,-0.421875,-0.8420323756982735,-0.5394269906817064,3645 +-0.0078125,-0.421875,-0.8450179582407706,-0.5347379266992377,3664 +-0.0078125,-0.421875,-0.8509727940026032,-0.5252097712984816,3685 +0.0,-0.421875,-0.862799360311186,-0.5055465001823355,3705 +0.0,-0.421875,-0.8744793416769986,-0.48506275983646013,3724 +0.0,-0.421875,-0.8888031674084939,-0.45828913319500464,3744 +0.0,-0.421875,-0.8888031674084939,-0.45828913319500464,3764 +0.0,-0.421875,-0.8972134044289655,-0.4415972224923814,3784 +0.0,-0.421875,-0.8999813238235361,-0.4359284537270253,3804 +0.0,-0.421875,-0.9027301154156147,-0.43020732062775385,3846 +0.0,-0.421875,-0.9135170055402336,-0.4068005415296353,3860 +0.0,-0.421875,-0.9187733502125238,-0.3947854239194439,3875 +0.0,-0.4140625,-0.9264665771223092,-0.3763770469559381,3891 +0.0,-0.4140625,-0.9264665771223092,-0.3763770469559381,3905 +0.0,-0.40625,-0.9363291775690445,-0.3511234415883917,3925 +0.0,-0.40625,-0.9363291775690445,-0.3511234415883917,3944 +0.007874015718698502,-0.3984375,-0.9586468662780967,-0.28459828842630996,3964 +0.023622047156095505,-0.390625,-0.9645897061200785,-0.263754997767209,3984 +0.06299212574958801,-0.3828125,-0.9828721869343219,-0.18428853505018536,4005 +0.07086614519357681,-0.3828125,-0.9902565788380345,-0.1392548313990986,4025 +0.07086614519357681,-0.3828125,-0.9940716917543756,-0.10872659128563483,4044 +0.07874015718698502,-0.3828125,-0.9995120760870788,-0.031234752377721213,4082 +0.07874015718698502,-0.3828125,-0.9995120760870788,-0.031234752377721213,4094 +0.07874015718698502,-0.3828125,-0.9995120760870788,-0.031234752377721213,4110 +0.07874015718698502,-0.3828125,-0.9997254549007941,-0.023431065349237362,4126 +0.07874015718698502,-0.3828125,-0.9997254549007941,-0.023431065349237362,4144 +0.07874015718698502,-0.3828125,-0.9997254549007941,-0.023431065349237362,4164 +0.07874015718698502,-0.3828125,-0.9997254549007941,-0.023431065349237362,4184 +0.07874015718698502,-0.3828125,-0.9997254549007941,-0.023431065349237362,4204 +0.07874015718698502,-0.3828125,-0.9997254549007941,-0.023431065349237362,4224 +0.07874015718698502,-0.3828125,-0.9999694838187878,-0.00781226159233428,4253 +0.07874015718698502,-0.3828125,-1.0,0.0,4265 +0.07874015718698502,-0.3828125,-1.0,0.0,4285 +0.08661417663097382,-0.3828125,-1.0,0.0,4324 +0.08661417663097382,-0.3828125,-1.0,0.0,4337 +0.08661417663097382,-0.3828125,-1.0,0.0,4354 +0.08661417663097382,-0.3828125,-1.0,0.0,4367 +0.09448818862438202,-0.3828125,-0.9997211161517748,0.02361545934868166,4386 +0.09448818862438202,-0.3828125,-0.999504367732367,0.03148045240972986,4404 +0.09448818862438202,-0.3828125,-0.9988858624996851,0.04719145789504938,4424 +0.10236220806837082,-0.3828125,-0.9980218809979032,0.06286751982866029,4445 +0.11811023950576782,-0.3828125,-0.994801803805476,0.10183010922792674,4465 +0.12598425149917603,-0.3828125,-0.9901048130433447,0.14032982287597778,4484 +0.12598425149917603,-0.3828125,-0.9796804960291332,0.20056451755011773,4504 +0.13385826349258423,-0.375,-0.9678596169756838,0.2514910770339234,4525 +0.15748031437397003,-0.359375,-0.9494282307963439,0.31398413107500234,4605 +0.16535432636737823,-0.34375,-0.9378378069653893,0.34707383627457283,4621 +0.16535432636737823,-0.34375,-0.9378378069653893,0.34707383627457283,4634 +0.16535432636737823,-0.34375,-0.9378378069653893,0.34707383627457283,4649 +0.18110236525535583,-0.34375,-0.9354179718879616,0.3535437990815464,4661 +0.20472441613674164,-0.3359375,-0.9279719185115246,0.3726501287455037,4680 +0.20472441613674164,-0.3359375,-0.9279719185115246,0.3726501287455037,4694 +0.23622047901153564,-0.3203125,-0.912324307310268,0.40946838497109816,4710 +0.26771652698516846,-0.3203125,-0.9014122667521522,0.43296180587754685,4721 +0.28346458077430725,-0.3125,-0.893016444170718,0.4500240331812145,4740 +0.28346458077430725,-0.3125,-0.893016444170718,0.4500240331812145,4751 +0.30708661675453186,-0.3125,-0.8786876142186625,0.47739718957982463,4764 +0.32283464074134827,-0.3046875,-0.8728573979584765,0.48797537112968914,4800 +0.32283464074134827,-0.3046875,-0.8640255433928116,0.5034479718548448,4817 +0.32283464074134827,-0.3046875,-0.8580885160559446,0.5135018000094129,4828 +0.32283464074134827,-0.3046875,-0.8521187304508965,0.5233485160146654,4844 +0.32283464074134827,-0.28125,-0.8461215648085673,0.5329899600985946,4864 +0.32283464074134827,-0.28125,-0.8401021827462566,0.5424281727058204,4884 +0.32283464074134827,-0.2734375,-0.8340655321723693,0.5516653768744438,4905 +0.32283464074134827,-0.2734375,-0.8249884705123031,0.5651495585433743,4924 +0.32283464074134827,-0.265625,-0.8158981942547746,0.5781955868145294,4944 +0.32283464074134827,-0.2578125,-0.8128676272595764,0.5824484702987778,4964 +0.32283464074134827,-0.2578125,-0.8068087413186813,0.5908127071515688,4984 +0.32283464074134827,-0.25,-0.781483297246057,0.6239261623985893,5004 +0.32283464074134827,-0.2421875,-0.7697579751547384,0.6383358517940827,5038 +0.3385826647281647,-0.234375,-0.7614733174322016,0.6481962564214621,5050 +0.34645670652389526,-0.21875,-0.7259526750390194,0.6877446572701906,5064 +0.35433071851730347,-0.21875,-0.6974437947486879,0.7166394861899184,5084 +0.36220473051071167,-0.21875,-0.6675450352577801,0.7445694231585723,5104 +0.3700787425041199,-0.2109375,-0.6427352020960505,0.7660884152541071,5124 +0.3700787425041199,-0.203125,-0.60209217677236,0.7984265843955356,5145 +0.3700787425041199,-0.203125,-0.5681906995469479,0.8228969127104258,5165 +0.3779527544975281,-0.203125,-0.5516653768744438,0.8340655321723693,5184 +0.3779527544975281,-0.203125,-0.5470717552428331,0.8370857152141146,5204 +0.3700787425041199,-0.203125,-0.5329899600985946,0.8461215648085673,5224 +0.3779527544975281,-0.203125,-0.5233485160146654,0.8521187304508965,5244 +0.3779527544975281,-0.203125,-0.5135018000094129,0.8580885160559446,5278 +0.3779527544975281,-0.203125,-0.5135018000094129,0.8580885160559446,5294 +0.4015747904777527,-0.171875,-0.5085008816513332,0.8610614689787348,5305 +0.4015747904777527,-0.1640625,-0.5085008816513332,0.8610614689787348,5324 +0.4015747904777527,-0.1640625,-0.5085008816513332,0.8610614689787348,5344 +0.4015747904777527,-0.15625,-0.5034479718548448,0.8640255433928116,5365 +0.4015747904777527,-0.15625,-0.49318540967799457,0.8699242218036859,5384 +0.4015747904777527,-0.15625,-0.49318540967799457,0.8699242218036859,5404 +0.4015747904777527,-0.15625,-0.49318540967799457,0.8699242218036859,5424 +0.4015747904777527,-0.15625,-0.49318540967799457,0.8699242218036859,5445 +0.4094488322734833,-0.15625,-0.49318540967799457,0.8699242218036859,5464 +0.4094488322734833,-0.15625,-0.49318540967799457,0.8699242218036859,5484 +0.4251968562602997,-0.15625,-0.472028758555712,0.8815831504154066,5518 +0.4251968562602997,-0.15625,-0.472028758555712,0.8815831504154066,5534 +0.4330708682537079,-0.15625,-0.472028758555712,0.8815831504154066,5551 +0.4409448802471161,-0.15625,-0.466607297434484,0.8844646007505824,5565 +0.4409448802471161,-0.15625,-0.46113272661989396,0.8873311717955715,5584 +0.4409448802471161,-0.15625,-0.46113272661989396,0.8873311717955715,5605 +0.4409448802471161,-0.15625,-0.46113272661989396,0.8873311717955715,5624 +0.4409448802471161,-0.15625,-0.466607297434484,0.8844646007505824,5644 +0.4488188922405243,-0.15625,-0.45560498552550965,0.8901820584376546,5665 +0.4409448802471161,-0.15625,-0.4500240331812145,0.893016444170718,5685 +0.4409448802471161,-0.15625,-0.4500240331812145,0.893016444170718,5704 +0.4409448802471161,-0.15625,-0.4500240331812145,0.893016444170718,5725 +0.4409448802471161,-0.15625,-0.43296180587754685,0.9014122667521522,5798 +0.4409448802471161,-0.15625,-0.42716801226970363,0.9041722674875349,5815 +0.4803149700164795,-0.15625,-0.415421189526273,0.9096291746050015,5829 +0.4960629940032959,-0.1484375,-0.40946838497109816,0.912324307310268,5844 +0.4960629940032959,-0.1484375,-0.40946838497109816,0.912324307310268,5858 +0.5039370059967041,-0.1328125,-0.3912940791117502,0.920265691880387,5871 +0.5039370059967041,-0.1328125,-0.3535437990815464,0.9354179718879616,5884 +0.5039370059967041,-0.1328125,-0.3535437990815464,0.9354179718879616,5896 +0.5118110179901123,-0.125,-0.3206991089217746,0.9471811239339495,5909 +0.5196850299835205,-0.1171875,-0.3072217021263233,0.9516379698932809,5926 +0.5118110179901123,-0.09375,-0.27271945919792484,0.9620936007347682,5944 +0.5118110179901123,-0.0859375,-0.2586093438103028,0.9659819911851382,5965 +0.5196850299835205,-0.046875,-0.22261635546060413,0.974906127933063,6005 +0.5196850299835205,-0.046875,-0.22261635546060413,0.974906127933063,6018 +0.5196850299835205,-0.0078125,-0.21530182214487537,0.9765475540807507,6031 +0.5275590419769287,0.0,-0.18568977934940398,0.9826084193844309,6044 +0.5275590419769287,0.0,-0.17820357578581228,0.9839936410247528,6065 +0.5275590419769287,0.0,-0.1631390877346237,0.9866030802978037,6084 +0.5275590419769287,0.0,-0.14032982287597778,0.9901048130433447,6104 +0.5275590419769287,0.0,-0.09406919601194683,0.995565661501875,6125 +0.5275590419769287,0.0,-0.055034575740075024,0.998484449289577,6144 +0.5275590419769287,0.015748031437397003,-0.02361545934868166,0.9997211161517748,6164 +0.5275590419769287,0.031496062874794006,-0.0,1.0,6184 +0.5275590419769287,0.05511811003088951,-0.0,1.0,6204 +0.5275590419769287,0.07086614519357681,-0.0,1.0,6233 +0.5275590419769287,0.08661417663097382,-0.0,1.0,6247 +0.5275590419769287,0.11811023950576782,0.023431065349237362,0.9997254549007941,6265 +0.5275590419769287,0.13385826349258423,0.05460590540193252,0.9985079844924803,6285 +0.5275590419769287,0.13385826349258423,0.07013933466922019,0.997537204184465,6304 +0.5275590419769287,0.14173229038715363,0.12403473458920847,0.9922778767136677,6324 +0.5275590419769287,0.14173229038715363,0.1543768802736096,0.9880120337511015,6344 +0.5196850299835205,0.14173229038715363,0.18428853505018536,0.9828721869343219,6365 +0.4881889820098877,0.14960630238056183,0.19169051231966405,0.98145542307668,6384 +0.4645669162273407,0.14960630238056183,0.24253562503633297,0.9701425001453319,6405 +0.4566929042339325,0.14960630238056183,0.28459828842630996,0.9586468662780967,6425 +0.4488188922405243,0.15748031437397003,0.33819872616315155,0.941074716280074,6444 +0.4409448802471161,0.15748031437397003,0.3763770469559381,0.9264665771223092,6479 +0.4409448802471161,0.15748031437397003,0.3763770469559381,0.9264665771223092,6493 +0.4251968562602997,0.15748031437397003,0.4359284537270253,0.8999813238235361,6509 +0.4173228442668915,0.15748031437397003,0.47450986523092026,0.8802501847761999,6527 +0.4094488322734833,0.15748031437397003,0.49026123963255896,0.8715755371245493,6544 +0.4015747904777527,0.16535432636737823,0.5252097712984816,0.8509727940026032,6564 +0.3937007784843445,0.18110236525535583,0.5394269906817064,0.8420323756982735,6585 +0.3937007784843445,0.18110236525535583,0.5531973991682577,0.833050201100435,6604 +0.3700787425041199,0.18110236525535583,0.5576895748539298,0.8300495997825932,6624 +0.3700787425041199,0.18110236525535583,0.5576895748539298,0.8300495997825932,6645 +0.33070865273475647,0.18110236525535583,0.6079105027169126,0.7940055545690287,6664 +0.32283464074134827,0.18110236525535583,0.6117992010161086,0.7910131083844636,6684 +0.29921260476112366,0.18110236525535583,0.6232037050564748,0.7820595514434193,6705 +0.27559053897857666,0.18897637724876404,0.6305926250944657,0.7761140001162655,6725 +0.27559053897857666,0.18897637724876404,0.6342240456652264,0.7731493128109427,6744 +0.27559053897857666,0.18897637724876404,0.6378139711853661,0.7701904557710081,6764 +0.28346458077430725,0.18897637724876404,0.6483387853676998,0.7613519681382164,6784 +0.28346458077430725,0.18897637724876404,0.6610770596337712,0.7503180133956318,6805 +0.28346458077430725,0.18897637724876404,0.6610770596337712,0.7503180133956318,6825 +0.27559053897857666,0.18897637724876404,0.673388809847324,0.7392885165971433,6845 +0.28346458077430725,0.18897637724876404,0.6828860582860593,0.7305249012857322,6864 +0.28346458077430725,0.18897637724876404,0.6828860582860593,0.7305249012857322,6884 +0.28346458077430725,0.18897637724876404,0.6890717737753316,0.7246931009648968,6905 +0.28346458077430725,0.18897637724876404,0.6951319975197523,0.7188821224819818,6924 +0.27559053897857666,0.18897637724876404,0.7283795689246123,0.6851738491603396,7006 +0.27559053897857666,0.18897637724876404,0.7283795689246123,0.6851738491603396,7019 +0.27559053897857666,0.18897637724876404,0.7373074742730845,0.6755573168732946,7035 +0.27559053897857666,0.18897637724876404,0.7519173304971933,0.6592574065552654,7052 +0.27559053897857666,0.18897637724876404,0.7601819876238485,0.6497102013145976,7066 +0.27559053897857666,0.20472441613674164,0.7657444477625389,0.6431449608920561,7083 +0.27559053897857666,0.22047244012355804,0.7742502396090526,0.6328795829107815,7100 +0.27559053897857666,0.22047244012355804,0.7742502396090526,0.6328795829107815,7113 +0.27559053897857666,0.22834645211696625,0.7856739074383975,0.6186408579866678,7126 +0.27559053897857666,0.22834645211696625,0.7947129335869222,0.6069854637383567,7141 +0.27559053897857666,0.22834645211696625,0.7947129335869222,0.6069854637383567,7154 +0.27559053897857666,0.22834645211696625,0.8158981942547746,0.5781955868145294,7170 +0.26771652698516846,0.22834645211696625,0.8219591160009305,0.5695464964539495,7208 +0.26771652698516846,0.23622047901153564,0.8219591160009305,0.5695464964539495,7223 +0.26771652698516846,0.26771652698516846,0.8401021827462566,0.5424281727058204,7240 +0.26771652698516846,0.26771652698516846,0.8401021827462566,0.5424281727058204,7253 +0.25196850299835205,0.27559053897857666,0.8461215648085673,0.5329899600985946,7266 +0.25196850299835205,0.28346458077430725,0.8580885160559446,0.5135018000094129,7287 +0.25196850299835205,0.28346458077430725,0.8728573979584765,0.48797537112968914,7304 +0.22834645211696625,0.28346458077430725,0.8986323918355212,0.4387024325712936,7325 +0.22834645211696625,0.28346458077430725,0.9041722674875349,0.42716801226970363,7344 +0.21259842813014984,0.28346458077430725,0.9096291746050015,0.415421189526273,7364 +0.21259842813014984,0.28346458077430725,0.920265691880387,0.3912940791117502,7384 +0.21259842813014984,0.28346458077430725,0.9254308345456299,0.3789165745545833,7405 +0.21259842813014984,0.29133859276771545,0.932966418843752,0.35996341662711334,7439 +0.21259842813014984,0.29133859276771545,0.932966418843752,0.35996341662711334,7452 +0.22047244012355804,0.29133859276771545,0.9494282307963439,0.31398413107500234,7465 +0.22047244012355804,0.29133859276771545,0.9538094063872763,0.300412410341436,7509 +0.22047244012355804,0.29133859276771545,0.9640596934790533,0.2656857305334137,7533 +0.22047244012355804,0.29133859276771545,0.9678596169756838,0.2514910770339234,7550 +0.22047244012355804,0.29133859276771545,0.9781392717664111,0.20795087166990847,7563 +0.22047244012355804,0.29133859276771545,0.9781392717664111,0.20795087166990847,7579 +0.22047244012355804,0.29133859276771545,0.9811704629340057,0.19314378754148134,7592 +0.22047244012355804,0.29133859276771545,0.9853254218311062,0.17068630025093642,7606 +0.22047244012355804,0.29133859276771545,0.992157222284201,0.12499618501897668,7624 +0.22047244012355804,0.29133859276771545,0.9939788098918941,0.10957246682398805,7644 +0.22047244012355804,0.29133859276771545,0.995565661501875,0.09406919601194683,7679 +0.22047244012355804,0.29133859276771545,0.9969143348043864,0.07849719142445599,7693 +0.22047244012355804,0.29133859276771545,0.998484449289577,0.055034575740075024,7710 +0.22047244012355804,0.29133859276771545,0.999504367732367,0.03148045240972986,7726 +0.22047244012355804,0.29133859276771545,0.9998760228122497,0.01574607904074679,7744 +0.22047244012355804,0.29133859276771545,1.0,0.0,7764 +0.22047244012355804,0.29133859276771545,1.0,0.0,7784 +0.22047244012355804,0.29133859276771545,1.0,0.0,7804 +0.22047244012355804,0.29133859276771545,1.0,0.0,7825 +0.22047244012355804,0.29133859276771545,1.0,0.0,7844 +0.22047244012355804,0.29133859276771545,1.0,0.0,7864 +0.22047244012355804,0.29133859276771545,1.0,0.0,7884 +0.22047244012355804,0.29133859276771545,1.0,0.0,7923 +0.22047244012355804,0.29133859276771545,1.0,0.0,7938 +0.22047244012355804,0.29133859276771545,0.9997254549007941,-0.023431065349237362,7950 +0.22047244012355804,0.29133859276771545,0.9985079844924803,-0.05460590540193252,7967 +0.22047244012355804,0.29133859276771545,0.997537204184465,-0.07013933466922019,7984 +0.22047244012355804,0.29133859276771545,0.9963277012186765,-0.08562191182348002,8004 +0.22047244012355804,0.29133859276771545,0.9956342260592882,-0.09334070869305827,8024 +0.22047244012355804,0.29133859276771545,0.9956342260592882,-0.09334070869305827,8044 +0.22047244012355804,0.30708661675453186,0.9855488907597534,-0.16939121559933262,8064 +0.22047244012355804,0.30708661675453186,0.9855488907597534,-0.16939121559933262,8086 +0.22047244012355804,0.31496062874794006,0.9799873195820535,-0.19905992429010463,8105 +0.22047244012355804,0.33070865273475647,0.9784686026666812,-0.20639572087500307,8124 +0.22047244012355804,0.35433071851730347,0.9701425001453319,-0.24253562503633297,8186 +0.22047244012355804,0.36220473051071167,0.9664851269264961,-0.2567226118398505,8200 +0.22047244012355804,0.36220473051071167,0.9645897061200785,-0.263754997767209,8213 +0.22047244012355804,0.3937007784843445,0.9565833270275276,-0.29145898245369983,8228 +0.22047244012355804,0.4015747904777527,0.9479401182738548,-0.3184486334826231,8243 +0.22047244012355804,0.4015747904777527,0.9479401182738548,-0.3184486334826231,8257 +0.20472441613674164,0.4173228442668915,0.9456865993048666,-0.3250797685110479,8271 +0.20472441613674164,0.4173228442668915,0.9456865993048666,-0.3250797685110479,8285 +0.19685038924217224,0.4566929042339325,0.9387181932794337,-0.3446855865947921,8305 +0.19685038924217224,0.4566929042339325,0.9387181932794337,-0.3446855865947921,8325 +0.18897637724876404,0.4645669162273407,0.9339085898481578,-0.35751188205124795,8344 +0.18110236525535583,0.4724409580230713,0.9289763737447976,-0.37013902391394277,8364 +0.15748031437397003,0.4881889820098877,0.8972134044289655,-0.4415972224923814,8400 +0.15748031437397003,0.4881889820098877,0.8972134044289655,-0.4415972224923814,8416 +0.14960630238056183,0.4960629940032959,0.8888031674084939,-0.45828913319500464,8426 +0.14960630238056183,0.4960629940032959,0.8831157194574106,-0.4691552259617494,8444 +0.15748031437397003,0.5039370059967041,0.8802501847761999,-0.47450986523092026,8464 +0.15748031437397003,0.5039370059967041,0.8773711395523853,-0.4798123419427107,8486 +0.14960630238056183,0.5039370059967041,0.8744793416769986,-0.48506275983646013,8505 +0.11023622006177902,0.5039370059967041,0.8657348311141284,-0.5005029492378555,8524 +0.09448818862438202,0.5039370059967041,0.8598547438407345,-0.5105387541554361,8544 +0.07874015718698502,0.5039370059967041,0.8569016654805386,-0.5154799081406365,8564 +0.07874015718698502,0.5039370059967041,0.8539407961853737,-0.520370172675462,8584 +0.07874015718698502,0.5039370059967041,0.8509727940026032,-0.5252097712984816,8604 +0.07086614519357681,0.5039370059967041,0.8450179582407706,-0.5347379266992377,8625 +0.06299212574958801,0.5039370059967041,0.8360479108370626,-0.5486564414868224,8661 +0.06299212574958801,0.5039370059967041,0.8360479108370626,-0.5486564414868224,8673 +0.06299212574958801,0.5039370059967041,0.8240419241993676,-0.5665288228870652,8689 +0.05511811003088951,0.5039370059967041,0.8240419241993676,-0.5665288228870652,8704 +0.05511811003088951,0.5039370059967041,0.8210359184762267,-0.5708765370655013,8724 +0.031496062874794006,0.5039370059967041,0.8090093109439124,-0.5877958274826863,8745 +0.03937007859349251,0.5039370059967041,0.8030011791882969,-0.5959774376788141,8764 +0.031496062874794006,0.5039370059967041,0.8,-0.6,8784 +0.023622047156095505,0.5039370059967041,0.7970013198156258,-0.6039775626727789,8805 +0.031496062874794006,0.5039370059967041,0.7880243737245634,-0.6156440419723151,8824 +0.031496062874794006,0.5039370059967041,0.7820595514434193,-0.6232037050564748,8844 +0.031496062874794006,0.5039370059967041,0.7707025822937636,-0.6371950483531117,8864 +0.023622047156095505,0.5039370059967041,0.7421026427511382,-0.6702862579687701,8897 +0.023622047156095505,0.5039370059967041,0.7421026427511382,-0.6702862579687701,8909 +0.023622047156095505,0.5039370059967041,0.7393958180127342,-0.6732709887595629,8928 +0.015748031437397003,0.5039370059967041,0.7364081333395653,-0.6765375533932593,8945 +0.0,0.5039370059967041,0.7278467063026898,-0.6857398720537738,8964 +0.0,0.5039370059967041,0.7219882051154242,-0.6919053632356148,8985 +0.0,0.5039370059967041,0.7219882051154242,-0.6919053632356148,9005 +0.0,0.5039370059967041,0.7071067811865476,-0.7071067811865476,9024 +0.0,0.5039370059967041,0.6981759636203039,-0.7159261999835319,9046 +0.0,0.5039370059967041,0.6952251158274647,-0.7187920689063618,9064 +0.0,0.5039370059967041,0.6922875402198978,-0.7216217580258257,9085 +0.0,0.5039370059967041,0.6862789815591375,-0.7273384078062654,9122 +0.0,0.5039370059967041,0.6862789815591375,-0.7273384078062654,9133 +0.0,0.5039370059967041,0.6862789815591375,-0.7273384078062654,9146 +0.0,0.5039370059967041,0.6862789815591375,-0.7273384078062654,9165 +0.0,0.5039370059967041,0.6833580581622772,-0.7300833954725184,9184 +0.0,0.5039370059967041,0.6741303561283304,-0.7386123901927794,9204 +0.0,0.5039370059967041,0.6741303561283304,-0.7386123901927794,9224 +0.0,0.5039370059967041,0.6741303561283304,-0.7386123901927794,9244 +0.0,0.5039370059967041,0.6741303561283304,-0.7386123901927794,9265 +0.0,0.5039370059967041,0.6741303561283304,-0.7386123901927794,9285 +0.0,0.5039370059967041,0.6741303561283304,-0.7386123901927794,9305 +0.0,0.5039370059967041,0.6741303561283304,-0.7386123901927794,9325 +0.0,0.5039370059967041,0.6618153215021395,-0.749666912851981,9345 +0.0,0.5039370059967041,0.6618153215021395,-0.749666912851981,9388 +0.0,0.5039370059967041,0.6618153215021395,-0.749666912851981,9401 +0.0,0.5039370059967041,0.6618153215021395,-0.749666912851981,9414 +0.0,0.4960629940032959,0.658504607868518,-0.7525766947068778,9424 +0.0,0.4960629940032959,0.658504607868518,-0.7525766947068778,9445 +0.0,0.4960629940032959,0.6551552162877278,-0.7554943034669294,9465 +0.0,0.4960629940032959,0.6551552162877278,-0.7554943034669294,9484 +0.0,0.4960629940032959,0.6551552162877278,-0.7554943034669294,9504 +0.0,0.4960629940032959,0.6551552162877278,-0.7554943034669294,9524 +0.0,0.4960629940032959,0.6551552162877278,-0.7554943034669294,9544 +0.0,0.4960629940032959,0.6517667432879864,-0.7584194830987478,9564 +-0.0234375,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9630 +-0.0234375,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9643 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9658 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9670 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9686 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9703 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9719 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9733 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9745 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9764 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9784 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9806 +-0.03125,0.4173228442668915,0.6483387853676998,-0.7613519681382164,9835 +-0.03125,0.4094488322734833,0.6483387853676998,-0.7613519681382164,9850 +-0.03125,0.4094488322734833,0.6483387853676998,-0.7613519681382164,9864 +-0.03125,0.4094488322734833,0.6483387853676998,-0.7613519681382164,9884 +-0.03125,0.4094488322734833,0.6483387853676998,-0.7613519681382164,9905 +-0.03125,0.3937007784843445,0.6483387853676998,-0.7613519681382164,9924 +-0.03125,0.3937007784843445,0.6483387853676998,-0.7613519681382164,9945 +-0.03125,0.3937007784843445,0.6483387853676998,-0.7613519681382164,9964 +-0.03125,0.4015747904777527,0.6483387853676998,-0.7613519681382164,9984 +-0.03125,0.4015747904777527,0.6483387853676998,-0.7613519681382164,10004 +-0.03125,0.3937007784843445,0.6483387853676998,-0.7613519681382164,10024 +-0.03125,0.3937007784843445,0.6483387853676998,-0.7613519681382164,10044 +-0.03125,0.3937007784843445,0.6483387853676998,-0.7613519681382164,10064 +-0.03125,0.3937007784843445,0.6483387853676998,-0.7613519681382164,10094 +-0.03125,0.3779527544975281,0.6483387853676998,-0.7613519681382164,10112 +-0.03125,0.3779527544975281,0.6483387853676998,-0.7613519681382164,10125 +-0.03125,0.3779527544975281,0.6483387853676998,-0.7613519681382164,10145 +-0.03125,0.3779527544975281,0.6483387853676998,-0.7613519681382164,10164 +-0.03125,0.3779527544975281,0.6483387853676998,-0.7613519681382164,10184 +-0.03125,0.3779527544975281,0.6483387853676998,-0.7613519681382164,10204 +-0.03125,0.3779527544975281,0.6483387853676998,-0.7613519681382164,10225 +-0.03125,0.3858267664909363,0.6483387853676998,-0.7613519681382164,10244 +-0.03125,0.3858267664909363,0.6483387853676998,-0.7613519681382164,10265 +-0.03125,0.3858267664909363,0.6483387853676998,-0.7613519681382164,10285 +-0.03125,0.3858267664909363,0.6448709392097829,-0.7642914835078909,10327 +-0.03125,0.3858267664909363,0.6448709392097829,-0.7642914835078909,10339 +-0.03125,0.3858267664909363,0.6448709392097829,-0.7642914835078909,10352 +-0.03125,0.3779527544975281,0.6448709392097829,-0.7642914835078909,10369 +-0.03125,0.3779527544975281,0.6448709392097829,-0.7642914835078909,10385 +-0.03125,0.3779527544975281,0.6448709392097829,-0.7642914835078909,10404 +-0.03125,0.3779527544975281,0.6448709392097829,-0.7642914835078909,10424 +-0.03125,0.3700787425041199,0.6448709392097829,-0.7642914835078909,10445 +-0.03125,0.36220473051071167,0.6378139711853661,-0.7701904557710081,10465 +-0.03125,0.3385826647281647,0.6305926250944657,-0.7761140001162655,10484 +-0.03125,0.31496062874794006,0.6305926250944657,-0.7761140001162655,10504 +-0.03125,0.30708661675453186,0.6156440419723151,-0.7880243737245634,10524 +-0.03125,0.31496062874794006,0.0234375,-0.109375,10580 +-0.0234375,0.25196850299835205,0.0,0.0,10599 +-0.0234375,0.25196850299835205,0.0,0.0,10614 +-0.0234375,0.21259842813014984,0.0,0.0,10627 +-0.0234375,0.10236220806837082,0.0,0.0,10644 +-0.0234375,0.10236220806837082,0.0,0.0,10656 +-0.0234375,0.10236220806837082,0.0,0.0,10667 +0.0,0.0,0.0,0.0,10684 +0.0,0.0,0.0,0.0,10704 +0.0,0.0,0.0,0.0,10724 +0.0,0.0,0.0,0.0,10744 +0.0,0.0,0.0,0.0,10764 +0.0,0.0,0.0,0.0,10843 +0.0,0.0,0.0,0.0,10855 +0.0,0.0,0.0,0.0,10873 +0.0,0.0,0.0,0.0,10885 +0.0,0.0,0.0,0.0,10896 +0.0,0.0,0.0,0.0,10909 +0.0,0.0,0.0,0.0,10922 +0.0,0.0,0.0,0.0,10935 +0.0,0.0,0.0,0.0,10952 +0.0,0.0,0.0,0.0,10965 +0.0,0.0,0.0,0.0,10984 +0.0,0.0,0.0,0.0,11004 +0.0,0.0,0.0,0.0,11035 +0.0,0.0,0.0,0.0,11049 +0.0,0.0,0.0,0.0,11064 +0.0,0.0,0.0,0.0,11084 +0.0,0.0,0.0,0.0,11104 +0.0,0.0,0.0,0.0,11125 +0.0,0.0,0.0,0.0,11145 +0.0,0.0,0.0,0.0,11165 +0.0,0.0,0.0,0.0,11185 +0.0,0.0,0.0,0.0,11204 +0.0,0.0,0.0,0.0,11225 +0.0,0.0,0.0,0.0,11244 +0.0,0.0,0.0,0.0,11284 +0.0,0.0,0.0,0.0,11296 +0.0,0.0,0.0,0.0,11309 +0.0,0.0,0.0,0.0,11325 +0.0,0.0,0.0,0.0,11344 +0.0,0.0,0.0,0.0,11364 +0.0,0.0,0.0,0.0,11384 +0.0,0.0,0.0,0.0,11405 +0.0,0.0,0.0,0.0,11424 +0.0,0.0,0.0,0.0,11444 +0.0,0.0,0.0,0.0,11464 +0.0,0.0,0.0,0.0,11484 +0.0,0.0,0.0,0.0,11526 +0.0,0.0,0.0,0.0,11540 +0.0,0.0,0.0,0.0,11552 +0.0,0.0,0.0,0.0,11566 +0.0,0.0,0.0,0.0,11584 +0.0,0.0,0.0,0.0,11604 +0.0,0.0,0.0,0.0,11625 +0.0,0.0,0.0,0.0,11644 +0.0,0.0,0.0,0.0,11664 +0.0,0.0,0.0,0.0,11684 +0.0,0.0,0.0,0.0,11705 +0.0,0.0,0.0,0.0,11725 +0.0,0.0,0.0,0.0,11789 +0.0,0.0,0.0,0.0,11802 +0.0,0.0,0.0,0.0,11814 +0.0,0.0,0.0,0.0,11829 +0.0,0.0,0.0,0.0,11842 +0.0,0.0,0.0,0.0,11863 +0.0,0.0,0.0,0.0,11879 +0.0,0.0,0.0,0.0,11892 +0.0,0.0,0.0,0.0,11907 \ No newline at end of file diff --git a/src/main/java/frc4388/robot/commands/JoystickPlayback.java b/src/main/java/frc4388/robot/commands/JoystickPlayback.java index 7b3fedc..f43329a 100644 --- a/src/main/java/frc4388/robot/commands/JoystickPlayback.java +++ b/src/main/java/frc4388/robot/commands/JoystickPlayback.java @@ -7,6 +7,7 @@ package frc4388.robot.commands; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.PrintWriter; import java.nio.file.Files; import java.nio.file.Path; import java.sql.Time; @@ -27,28 +28,39 @@ public class JoystickPlayback extends CommandBase { public double rightX = 0d; public double rightY = 0d; - public long timed_offset = 0l; + public long timedOffset = 0; } - private final SwerveDrive m_swerve; - private Scanner m_input; - private final ArrayList m_outputs; - private long m_playback_time; - private int m_last_index; - private boolean m_finished = false; // ! find a better way + private final SwerveDrive swerve; + private Scanner input; + private final ArrayList outputs; + private int counter = 0; + private long startTime = 0; + private long playbackTime = 0; + private int lastIndex; + private boolean m_finished = false; // ! find a better way /** Creates a new JoystickPlayback. */ public JoystickPlayback(SwerveDrive swerve) { // Use addRequirements() here to declare subsystem dependencies. - this.m_swerve = swerve; - m_outputs = new ArrayList<>(); + this.swerve = swerve; + outputs = new ArrayList<>(); + addRequirements(this.swerve); + } + + // Called when the command is initially scheduled. + @Override + public void initialize() { + startTime = System.currentTimeMillis(); + playbackTime = 0; + lastIndex = 0; try { - m_input = new Scanner(new File("/home/lvuser/JoystickInputs.txt")); + input = new Scanner(new File("/home/lvuser/JoystickInputs.txt")); String line = ""; - while (m_input.hasNextLine()) { - line = m_input.nextLine(); + while (input.hasNextLine()) { + line = input.nextLine(); String[] values = line.split(","); @@ -58,20 +70,16 @@ public class JoystickPlayback extends CommandBase { out.rightX = Double.parseDouble(values[2]); out.rightY = Double.parseDouble(values[3]); - out.timed_offset = Long.MAX_VALUE; + out.timedOffset = Long.parseLong(values[4]); - m_outputs.add(out); + outputs.add(out); } + + input.close(); } catch (FileNotFoundException e) { e.printStackTrace(); } - addRequirements(this.m_swerve); - } - - // Called when the command is initially scheduled. - @Override - public void initialize() { System.out.println("STARTING PLAYBACK"); System.out.println("STARTING PLAYBACK"); System.out.println("STARTING PLAYBACK"); @@ -81,34 +89,77 @@ public class JoystickPlayback extends CommandBase { // Called every time the scheduler runs while the command is scheduled. @Override public void execute() { + if (counter == 0) { + startTime = System.currentTimeMillis(); + playbackTime = 0; + } else { + playbackTime = System.currentTimeMillis() - startTime; + } + // skip to reasonable time frame // too tired to write comment: ask daniel thomas; it goes to the thing until it's bigger than the other thing { - int i = m_last_index + 1; - while (i < m_outputs.size() && m_outputs.get(i).timed_offset < m_playback_time) { + int i = lastIndex == 0 ? 1 : lastIndex; + while (i < outputs.size() && outputs.get(i).timedOffset < playbackTime) { i++; } - if (i >= m_outputs.size()) { + if (i >= outputs.size()) { m_finished = true; // ! kind of a hack return; } - m_last_index = i; + lastIndex = i; } - TimedOutput out = m_outputs.get(m_last_index); + TimedOutput lastOut = outputs.get(lastIndex - 1); + TimedOutput out = outputs.get(lastIndex); - this.m_swerve.driveWithInput(new Translation2d(out.leftX, out.leftY), - new Translation2d(-out.rightX, out.rightY), - true); - System.out.println("PLAYING"); + double deltaTime = out.timedOffset - lastOut.timedOffset; + double playbackDelta = playbackTime - lastOut.timedOffset; + + // System.out.println("LastOut.timedOffset: " + lastOut.timedOffset); + // System.out.println("PlaybackTime: " + playbackTime); + // System.out.println("PlaybackDelta: " + playbackDelta); + // System.out.println("DeltaTime: " + deltaTime); + + // // double slopeLX = (out.leftX - lastOut.leftX) / deltaTime; + // // double slopeLY = (out.leftY - lastOut.leftY) / deltaTime; + // // double slopeRX = (out.rightX - lastOut.rightX) / deltaTime; + // // double slopeRY = (out.rightY - lastOut.rightY) / deltaTime; + + double lerpLX = lastOut.leftX + (out.leftX - lastOut.leftX) * (playbackDelta / deltaTime); + double lerpLY = lastOut.leftY + (out.leftY - lastOut.leftY) * (playbackDelta / deltaTime); + double lerpRX = lastOut.rightX + (out.rightX - lastOut.rightX) * (playbackDelta / deltaTime); + double lerpRY = lastOut.rightY + (out.rightY - lastOut.rightY) * (playbackDelta / deltaTime); + + // System.out.println("----------------------------"); + // System.out.println("lerpLX: " + lerpLX); + // System.out.println("lerpLY: " + lerpLY); + // System.out.println("lerpRX: " + lerpRX); + // System.out.println("lerpRY: " + lerpRY); + // System.out.println("----------------------------"); + + // // double lerpLX = slopeLX * playbackTime + (lastOut.leftX - slopeLX * lastOut.timedOffset); + // // double lerpLY = slopeLY * playbackTime + (lastOut.leftY - slopeLY * lastOut.timedOffset); + // // double lerpRX = slopeRX * playbackTime + (lastOut.rightX - slopeRX * lastOut.timedOffset); + // // double lerpRY = slopeRY * playbackTime + (lastOut.rightY - slopeRY * lastOut.timedOffset); + + // this.swerve.driveWithInput(new Translation2d(out.leftX, out.leftY), + // new Translation2d(out.rightX, out.rightY), + // true); + + this.swerve.driveWithInput( new Translation2d(lerpLX, lerpLY), + new Translation2d(lerpRX, lerpRY), + true); + // System.out.println("PLAYING"); + counter++; } // Called once the command ends or is interrupted. @Override public void end(boolean interrupted) { - m_input.close(); - m_swerve.stopModules(); + input.close(); + swerve.stopModules(); } // Returns true when the command should end. diff --git a/src/main/java/frc4388/robot/commands/JoystickRecorder.java b/src/main/java/frc4388/robot/commands/JoystickRecorder.java index 134af83..29614bb 100644 --- a/src/main/java/frc4388/robot/commands/JoystickRecorder.java +++ b/src/main/java/frc4388/robot/commands/JoystickRecorder.java @@ -28,10 +28,9 @@ public class JoystickRecorder extends CommandBase { Supplier rightXSupplier; Supplier rightYSupplier; - // HashMap timedInput; - ArrayList outputs; + ArrayList outputs; - private final long startTime; + private long startTime; /** Creates a new JoystickRecorder. */ @@ -43,9 +42,7 @@ public class JoystickRecorder extends CommandBase { this.rightXSupplier = rightXSupplier; this.rightYSupplier = rightYSupplier; - this.startTime = System.currentTimeMillis(); - // this.timedInput = new HashMap(); - this.outputs = new ArrayList(); + this.outputs = new ArrayList(); addRequirements(this.swerve); } @@ -53,8 +50,10 @@ public class JoystickRecorder extends CommandBase { // Called when the command is initially scheduled. @Override public void initialize() { + this.startTime = System.currentTimeMillis(); + // timedInput.put((long) 0, new double[] {0.0, 0.0, 0.0, 0.0}); - outputs.add(new double[] {0.0, 0.0, 0.0, 0.0}); + outputs.add(new Object[] {(double) 0.0, (double) 0.0, (double) 0.0, (double) 0.0, (long) 0}); System.out.println("STARTING RECORDING"); System.out.println("STARTING RECORDING"); @@ -65,11 +64,10 @@ public class JoystickRecorder extends CommandBase { // Called every time the scheduler runs while the command is scheduled. @Override public void execute() { - double[] inputs = new double[] {leftXSupplier.get(), leftYSupplier.get(), rightXSupplier.get(), rightYSupplier.get()}; - // timedInput.put(System.currentTimeMillis() - startTime, inputs); + Object[] inputs = new Object[] {(double) leftXSupplier.get(), (double) leftYSupplier.get(), (double) rightXSupplier.get(), (double) rightYSupplier.get(), (long) (System.currentTimeMillis() - startTime)}; outputs.add(inputs); - swerve.driveWithInput(new Translation2d(inputs[0], inputs[1]), new Translation2d(-inputs[2], inputs[3]), true); + swerve.driveWithInput(new Translation2d((double) inputs[0], (double) inputs[1]), new Translation2d((double) inputs[2], (double) inputs[3]), true); System.out.println("RECORDING"); } @@ -80,9 +78,11 @@ public class JoystickRecorder extends CommandBase { File output = new File("/home/lvuser/JoystickInputs.txt"); try(PrintWriter writer = new PrintWriter(output)) { - for(double[] input : outputs) { - writer.println(input[0] + "," + input[1] + "," + input[2] + "," + input[3]); + + for(Object[] input : outputs) { + writer.println(input[0] + "," + input[1] + "," + input[2] + "," + input[3] + "," + input[4]); } + writer.close(); } catch(IOException e) { e.printStackTrace();