Diff: HOSOKIkikou.cpp

Revision:

4:c10e0d2844b9

Parent:

3:4f901bdb470f

Child:

6:c4428d7f6078

--- a/HOSOKIkikou.cpp	Tue Oct 11 09:23:21 2022 +0000
+++ b/HOSOKIkikou.cpp	Tue Oct 11 09:33:23 2022 +0000
@@ -4,11 +4,11 @@
 
 
 
-HOSOKIkikou::HOSOKIkikou(ikarashiMDC *ik1, ikarashiMDC *ik2, ikarashiMDC *ik3, ikarashiMDC *ik4, uint8_t *b1, uint8_t *b2, uint8_t *b3, uint8_t *b4, int *env1, int *env2, int *env3) : pc(USBTX,USBRX,115200){
-    init(ik1, ik2, ik3, ik4, b1, b2, b3, b4, env1, env2, env3);
+HOSOKIkikou::HOSOKIkikou(ikarashiMDC *ik1, ikarashiMDC *ik2, ikarashiMDC *ik3, ikarashiMDC *ik4, uint8_t *b1, uint8_t *b2, uint8_t *b3, uint8_t *b4, int *env1, int *env2) : pc(USBTX,USBRX,115200){
+    init(ik1, ik2, ik3, ik4, b1, b2, b3, b4, env1, env2);
 }
 
-void HOSOKIkikou::init(ikarashiMDC *ik1, ikarashiMDC *ik2, ikarashiMDC *ik3, ikarashiMDC *ik4, uint8_t *b1, uint8_t *b2, uint8_t *b3, uint8_t *b4, int *env1, int *env2, int *env3){
+void HOSOKIkikou::init(ikarashiMDC *ik1, ikarashiMDC *ik2, ikarashiMDC *ik3, ikarashiMDC *ik4, uint8_t *b1, uint8_t *b2, uint8_t *b3, uint8_t *b4, int *env1, int *env2){
     ik[0] = ik1; //射出右
     ik[1] = ik2; //射出左
     ik[2] = ik3; //将校
@@ -17,9 +17,8 @@
     button[1] = b2; //上
     button[2] = b3; //下
     button[3] = b4; //装填
-    encoder[0] = env1; //射出
-    encoder[1] = env2; //将校
-    encoder[2] = env3; //装填
+    encoder[0] = env1; //将校
+    encoder[1] = env2; //装填
     for(int i=0; i<4; i++){
          mspeed[i] = 0;
          if(i < 2) buff[i] = 0;