diff --git a/DivaBot/DivaBot.jar b/DivaBot/DivaBot.jar index 6573ef4..604b4c9 100644 Binary files a/DivaBot/DivaBot.jar and b/DivaBot/DivaBot.jar differ diff --git a/DivaBot/calibration_data.txt b/DivaBot/calibration_data.txt index f4dbc02..d05e0e1 100644 --- a/DivaBot/calibration_data.txt +++ b/DivaBot/calibration_data.txt @@ -1,4 +1,4 @@ -555 -318 -1630 -918 +589 +378 +1501 +888 diff --git a/DivaBot/rectangle0.png b/DivaBot/rectangle0.png index 11ed267..2a9f897 100644 Binary files a/DivaBot/rectangle0.png and b/DivaBot/rectangle0.png differ diff --git a/DivaBot/rectangle1.png b/DivaBot/rectangle1.png index e5d206c..476b6b3 100644 Binary files a/DivaBot/rectangle1.png and b/DivaBot/rectangle1.png differ diff --git a/DivaBot/rectangle2.png b/DivaBot/rectangle2.png index c20d3c7..93c7d88 100644 Binary files a/DivaBot/rectangle2.png and b/DivaBot/rectangle2.png differ diff --git a/DivaBot/rectangle3.png b/DivaBot/rectangle3.png index 481e3ec..39b6f95 100644 Binary files a/DivaBot/rectangle3.png and b/DivaBot/rectangle3.png differ diff --git a/DivaBot/rectangle4.png b/DivaBot/rectangle4.png index dc2176b..3880c3a 100644 Binary files a/DivaBot/rectangle4.png and b/DivaBot/rectangle4.png differ diff --git a/DivaBot/src/sig/MyRobot.java b/DivaBot/src/sig/MyRobot.java index 59b619b..9fa5ac2 100644 --- a/DivaBot/src/sig/MyRobot.java +++ b/DivaBot/src/sig/MyRobot.java @@ -636,6 +636,10 @@ public class MyRobot{ RunTest("test25.png",175,75,13,10,32,50.84f,"E","SD",26,122670,false); RunTest("test26.png",29,24,6,7,35,3.12f,"EXEX","HS",26,28100,true); RunTest("test27.png",45,35,8,6,22,7.00f,"EX","HS",27,69780,true); + RunTest("test28.png",463,139,10,2,50,72.96f,"EXEX","HS",99,479170,false); + RunTest("test29.png",354,112,4,3,43,67.73f,"EXEX","HS",55,331060,true); + RunTest("test30.png",390,90,8,9,22,74.95f,"N","HS",82,326560,false); + RunTest("test31.png",329,69,8,1,34,72.15f,"EX","HS",40,358760,false); RunTest("testimage.png",371,40,3,4,3,97.63f,"EX","HS",233,523750,false); RunTest("testimage2.png",942,71,1,0,3,97.02f,"EXEX","",714,951020,false); RunTest("testimage3.png",546,52,0,0,0,101.77f,"EX","",598,567430,false); diff --git a/DivaBot/typeface3.png b/DivaBot/typeface3.png index 8a12119..e1b4171 100644 Binary files a/DivaBot/typeface3.png and b/DivaBot/typeface3.png differ