yei

Dependencies:   interface mbed enc_1multi calPID motorout KondoServoLibrary

Fork of cat18_operate by Catch the GIANT Caplico!

Revision:
32:21229c96144a
Parent:
30:af136b83b202
Child:
33:3902febe8c45
--- a/workinfo/workinfo.cpp	Tue Sep 04 23:09:52 2018 +0000
+++ b/workinfo/workinfo.cpp	Wed Sep 05 00:52:43 2018 +0000
@@ -29,7 +29,7 @@
 //////////////////////////////変更出来るパラメータ
 //priority 取る順番を決める
 const int kWorkAreaPriority[kWorkAreaNum] = {
-    100, 101, 103,
+    102, 101, 100,
     104, 105, 106,
 };
 const int kCommonAreaPriority[kCommonAreaNum] = {
@@ -39,13 +39,13 @@
 };
 //workareaの補正値
 const int kWorkAreaCorrect[kWorkAreaNum][3] = {
-    {0,20,10},{0,20,10},{0,20,10},
+    {30,30,10},{0,20,10},{30,20,10},
     {0,0,100},{0,0,0},{0,0,0},
 };
 const int kCommonAreaCorrect[kCommonAreaNum][3] = {
-    {20,20,0},{0,50,0},{0,50,0},{0,50,0},{0,50,0},{0,50,0},
+    {60,30,0},{0,50,0},{30,50+20,0},{0,50,0},{0,50,0},{0,50,0},
     {0,50,0},{0,50,0},{0,50,0},{0,50,0},{0,50,0},
-    {0,50,0},{0,50,0},{0,50,0},{80,50,0},{0,50,0},{0,30,0},
+    {10,50,20},{0,50,20},{30,50,20},{80,50,0},{0,50,0},{0,30,0},
 };
 const int kBoxCorrect[kBoxNum][3] = {
     {100,-80,0},{80,-80,0},{-30,-120,0},
@@ -62,7 +62,7 @@
 
 const int kPitchWorkAreaDegree = -90;
 const int kPitchCommonAreaDegree = -5;
-const int kPitchBoxDegree = 0;
+const int kPitchBoxDegree = 45;
 //////////////////////////////
 //配列のスタート番号
 const int kWorkStart = 0;