Diff: mecanum2017.cpp

Revision:

4:d4c2e7addc77

Parent:

3:063d7878f0d1

Child:

5:2b7b26c66fda

--- a/mecanum2017.cpp	Fri Aug 18 07:16:50 2017 +0000
+++ b/mecanum2017.cpp	Sat Aug 19 00:21:07 2017 +0000
@@ -2,14 +2,13 @@
 #include "T_motor.h"
 #include "mecanum2017.h"
 
-mecanum2017::mecanum2017(I2C& i2c_, short para1_, char addr1, short para2_, char addr2,
-        short para3_, char addr3, short para4_, char addr4, int phase) //paraはモーターの回転方向を±1で表すよ いつもは全部+1だよ
-    : m1(i2c_, addr1), m2(i2c_, addr2), m3(i2c_, addr3), m4(i2c_, addr4)
+mecanum2017::mecanum2017(I2C& i2c_, short para[], char addr[], int phase) //paraはモーターの回転方向を±1で表すよ いつもは全部+1だよ
+    : m1(i2c_, addr[0]), m2(i2c_, addr[1]), m3(i2c_, addr[2]), m4(i2c_, addr[3])
 {
-    para1 = para1_;
-    para2 = para2_;
-    para3 = para3_;
-    para4 = para4_;
+    para1 = para[0];
+    para2 = para[1];
+    para3 = para[2];
+    para4 = para[3];
     oldangle = 0.0;
     alpha = PI / 4;
     beta = phase * (PI / 2); //phaseは初期角度の指定 左に90°で-1, 右に90°で+1