add dependency information

README.md

@@ -1,4 +1,7 @@
 Arduino Pro Micro でコントローラー自作するときのスケッチ
 =======================================================
 
-[SwitchControlLibrary](https://github.com/celclow/SwitchControlLibrary) を利用している。
+## 依存ライブラリ
+- [SwitchControlLibrary](https://github.com/celclow/SwitchControlLibrary) をフォークし[一部改変したもの](https://git.sirrow.work/sirrow/SwitchControlLibrary)
+- ArduinoSTL
+- MsTimer2

connect_switch.ino

@@ -1,11 +1,11 @@
 #include <MsTimer2.h>
 #include <SwitchControlLibrary.h>
 
-#define tableSize 40
+#define RapidFireTableSize 40
 
 int loopCount = 0;
 int state = 0;
-int table[tableSize];
+int rapidFireTable[RapidFireTableSize];
 int index = 0;
 
 int val = 1;
@@ -13,58 +13,125 @@ int prevVal = 1;
 
 struct arrow {
   int pinNumber;
-  int state;
+  int current;
+  int prev;
+  struct arrow *older;
+  struct arrow *newer;
+  Hat arrowSymbol;
+};
+
+struct ButtonInfo {
+  int pinNumber;
+  bool prev;
+  bool current;
+  Button buttonSymbol;
 };
 
 struct arrow arrowTable[4];
+struct arrow oldestXArrow;
+struct arrow newestXArrow;
+struct arrow oldestYArrow;
+struct arrow newestYArrow;
+
+
+
+#define ButtonInfoTableSize 9
+struct ButtonInfo buttonInfoTable[ButtonInfoTableSize];
+
+Hat last = Hat::CENTER;
 
 void perms() {
   if(val == 0){
-	  if (table[index] == 1){
+	  if (rapidFireTable[index] == 1){
 	    SwitchControlLibrary().PressButtonA();
 	  }
-	  if (table[index] == 2){
+	  if (rapidFireTable[index] == 2){
 	    SwitchControlLibrary().ReleaseButtonA();
 	  }
   }
-	index = (index + 1) % 40;
+	index = (index + 1) % RapidFireTableSize;
 }
-/*
-void button() {
-  if (state == 0) {
-    SwitchControlLibrary().PressButtonA();
-    state = 1;
-  }
-  else {
-    SwitchControlLibrary().ReleaseButtonA();
-    state = 0;
-  }
+
+
+void setupButton(ButtonInfo *but, int pinNumber, Button buttonSymbol) {
+  but->pinNumber = pinNumber;
+  but->buttonSymbol = buttonSymbol;
+  pinMode(pinNumber, INPUT_PULLUP);
+  but->prev = 1;
+  but->current = 1;
 }
-*/
 
 void setup()
 {
-  table[0] = 1;
-  table[tableSize/2] = 2;
+  rapidFireTable[0] = 1;
+  rapidFireTable[RapidFireTableSize/2] = 2;
   SwitchControlLibrary();
-  MsTimer2::set(1, perms);
-  MsTimer2::start();
+
+  //MsTimer2::set(1, perms);
+  //MsTimer2::start();
+
+  setupButton(&(buttonInfoTable[0]), 3, Button::B);
+  setupButton(&(buttonInfoTable[1]), 4, Button::X);
+  setupButton(&(buttonInfoTable[2]), 5, Button::Y);
+  setupButton(&(buttonInfoTable[3]), 16, Button::L);
+  setupButton(&(buttonInfoTable[4]), 10, Button::R);
+  setupButton(&(buttonInfoTable[5]), 15, Button::PLUS);
+  setupButton(&(buttonInfoTable[6]), 18, Button::HOME);
+  setupButton(&(buttonInfoTable[7]), 19, Button::CAPTURE);
+  setupButton(&(buttonInfoTable[8]), 14, Button::MINUS);
 
   pinMode(2, INPUT_PULLUP);
 
-  arrowTable[0].pinNumber = 10;
+  arrowTable[0].pinNumber = 6;
+  arrowTable[0].arrowSymbol = Hat::TOP;
   arrowTable[1].pinNumber = 7;
+  arrowTable[1].arrowSymbol = Hat::LEFT;
   arrowTable[2].pinNumber = 8;
+  arrowTable[2].arrowSymbol = Hat::BOTTOM;
   arrowTable[3].pinNumber = 9;
+  arrowTable[3].arrowSymbol = Hat::RIGHT;
+
+
   
   for (int i=0; i<4; i++){
     pinMode(arrowTable[i].pinNumber, INPUT_PULLUP);
-    arrowTable[i].state = 1;
+    arrowTable[i].older = NULL;
+    arrowTable[i].newer = NULL;
   }
 
+  oldestXArrow.older = NULL;
+  oldestXArrow.newer = &newestXArrow;
+  oldestXArrow.arrowSymbol = Hat::CENTER;
+  newestXArrow.older = &oldestXArrow;
+  newestXArrow.newer = NULL;
+
+  oldestYArrow.older = NULL;
+  oldestYArrow.newer = &newestYArrow;
+  oldestYArrow.arrowSymbol = Hat::CENTER;
+  newestYArrow.older = &oldestYArrow;
+  newestYArrow.newer = NULL;
 
 }
 
+void handleButtonInput(ButtonInfo *but){
+    but->current = digitalRead(but->pinNumber);
+
+  if(but->prev == 1 && but->current ==0 ){
+    SwitchControlLibrary().PressButton(but->buttonSymbol);
+  }
+  else if(but->prev == 0 && but->current ==1 ) {
+    SwitchControlLibrary().ReleaseButton(but->buttonSymbol);
+  }
+
+  but->prev = but->current;
+}
+
+void moveHat(Hat dir){
+  if(last != dir){
+    SwitchControlLibrary().MoveHat(static_cast<uint8_t>(dir));
+    last = dir;
+  }
+}
 
 void loop()
 {
@@ -73,29 +140,76 @@ void loop()
     SwitchControlLibrary().PressButtonA();
     index = 1;
   }
-  else if(val == 1){
+  else if(prevVal == 0 && val == 1){
     SwitchControlLibrary().ReleaseButtonA();
   }
   prevVal = val;
 
-  for (int i=0; i<4; i++){
-    arrowTable[i].state = digitalRead(arrowTable[i].pinNumber);
+
+  for(int i=0; i<ButtonInfoTableSize; i++){
+    handleButtonInput(&(buttonInfoTable[i]));
   }
 
-  if(arrowTable[0].state == 0){
-    SwitchControlLibrary().MoveHat(static_cast<uint8_t>(Hat::TOP));
-  } 
-  else if(arrowTable[2].state == 0){
-    SwitchControlLibrary().MoveHat(static_cast<uint8_t>(Hat::BOTTOM));
+
+  for (int i=0; i<4; i++){
+    arrowTable[i].current = digitalRead(arrowTable[i].pinNumber);
   }
-  else if(arrowTable[1].state == 0){
-    SwitchControlLibrary().MoveHat(static_cast<uint8_t>(Hat::LEFT));
-  }
-  else if(arrowTable[3].state == 0){
-    SwitchControlLibrary().MoveHat(static_cast<uint8_t>(Hat::RIGHT));
+  
+  if(arrowTable[1].current == 0){
+    if(arrowTable[3].current == 0){
+      if(arrowTable[0].current == 0){
+        moveHat(Hat::TOP);
+      }
+      else{
+        if(arrowTable[2].current == 0){
+          moveHat(Hat::BOTTOM); 
+        }
+        else{
+          moveHat(Hat::CENTER);
+        }
+      }
+    }
+    else{
+      if(arrowTable[0].current == 0){
+        moveHat(Hat::TOP_LEFT);
+      }
+      else{
+        if(arrowTable[2].current == 0){
+          moveHat(Hat::BOTTOM_LEFT); 
+        }
+        else{
+          moveHat(Hat::LEFT);
+        }
+      }
+    }
   }
   else{
-    SwitchControlLibrary().MoveHat(static_cast<uint8_t>(Hat::CENTER));
+    if(arrowTable[3].current == 0){
+      if(arrowTable[0].current == 0){
+        moveHat(Hat::TOP_RIGHT);
+      }
+      else{
+        if(arrowTable[2].current == 0){
+          moveHat(Hat::BOTTOM_RIGHT); 
+        }
+        else{
+          moveHat(Hat::RIGHT);
+        }
+      }
+    }
+    else{
+      if(arrowTable[0].current == 0){
+        moveHat(Hat::TOP);
+      }
+      else{
+        if(arrowTable[2].current == 0){
+          moveHat(Hat::BOTTOM); 
+        }
+        else{
+          moveHat(Hat::CENTER);
+        }
+      }
+    }
   }
 
 }