SW_C->SW_L

Author: aoki-rt

pico_halfV2_STEP2_SWITCH/pico_halfV2_STEP2_SWITCH.ino

@@ -17,10 +17,10 @@
 #define LED2 15
 #define LED3 16
 
-#define SW_C 13
+#define SW_L 13
 #define SW_R 14
 
-int g_state_r, g_state_c;
+int g_state_r, g_state_l;
 
 void setup()
 {
@@ -30,27 +30,27 @@ void setup()
   pinMode(LED2, OUTPUT);
   pinMode(LED3, OUTPUT);
 
-  pinMode(SW_C, INPUT);
+  pinMode(SW_L, INPUT);
   pinMode(SW_R, INPUT);
 
-  g_state_r = g_state_c  = 0;
+  g_state_r = g_state_l  = 0;
 }
 
 void loop()
 {
   // put your main code here, to run repeatedly:
-  while ( digitalRead(SW_C) && digitalRead(SW_R)) {
+  while ( digitalRead(SW_L) && digitalRead(SW_R)) {
     continue;
   }
   if (digitalRead(SW_R) == 0) {
     digitalWrite(LED3, (++g_state_r) & 0x01);
   }
-  if (digitalRead(SW_C) == 0) {
-    digitalWrite(LED2, (++g_state_c) & 0x01);
-    digitalWrite(LED1, (g_state_c)&0x01);
+  if (digitalRead(SW_L) == 0) {
+    digitalWrite(LED2, (++g_state_l) & 0x01);
+    digitalWrite(LED1, (g_state_l)&0x01);
   }
   delay(30);
-  while (!(digitalRead(SW_C) && digitalRead(SW_R))) {
+  while (!(digitalRead(SW_L) && digitalRead(SW_R))) {
     continue;
   }
   delay(30);

pico_halfV2_STEP3_Buzzer/pico_halfV2_STEP3_Buzzer.ino

@@ -17,7 +17,7 @@
 #define LED2 15
 #define LED3 16
 
-#define SW_C 13
+#define SW_L 13
 #define SW_R 14
 
 #define BUZZER 40
@@ -87,7 +87,7 @@ void setup()
   pinMode(LED2, OUTPUT);
   pinMode(LED3, OUTPUT);
 
-  pinMode(SW_C, INPUT);
+  pinMode(SW_L, INPUT);
   pinMode(SW_R, INPUT);
 
   ledcSetup(0, 440, 10);
@@ -101,7 +101,7 @@ void setup()
 void loop()
 {
   // put your main code here, to run repeatedly:
-  while ( digitalRead(SW_C) & digitalRead(SW_R)) {
+  while ( digitalRead(SW_L) & digitalRead(SW_R)) {
     continue;
   }
   if (digitalRead(SW_R) == 0) {
@@ -115,7 +115,7 @@ void loop()
     }
     setLED(g_mode);
   }
-  if (digitalRead(SW_C) == 0) {
+  if (digitalRead(SW_L) == 0) {
     ledcWriteTone(0, INC_FREQ);
     delay(80);
     ledcWriteTone(0, DEC_FREQ);
@@ -124,7 +124,7 @@ void loop()
     delay(300);
     execByMode(g_mode);
   }
-  while (!(digitalRead(SW_C) & digitalRead(SW_R))) {
+  while (!(digitalRead(SW_L) & digitalRead(SW_R))) {
     continue;
   }
   delay(30);

pico_halfV2_STEP5_Straight/pico_halfV2_STEP5_Straight.ino

@@ -17,7 +17,7 @@
 #define LED2 15
 #define LED3 16
 
-#define SW_C 13
+#define SW_L 13
 #define SW_R 14
 
 #define MOTOR_EN 12
@@ -97,7 +97,7 @@ void setup()
   pinMode(LED2, OUTPUT);
   pinMode(LED3, OUTPUT);
 
-  pinMode(SW_C, INPUT);
+  pinMode(SW_L, INPUT);
   pinMode(SW_R, INPUT);
 
   //motor disable
@@ -132,7 +132,7 @@ void setup()
 void loop()
 {
   // put your main code here, to run repeatedly:
-  while (digitalRead(SW_C) & digitalRead(SW_R)) {
+  while (digitalRead(SW_L) & digitalRead(SW_R)) {
     continue;
   }
   digitalWrite(MOTOR_EN, HIGH);

pico_halfV2_STEP6_rotate/pico_halfV2_STEP6_rotate.ino

@@ -17,7 +17,7 @@
 #define LED2 15
 #define LED3 16
 
-#define SW_C 13
+#define SW_L 13
 #define SW_R 14
 
 #define MOTOR_EN 12
@@ -106,7 +106,7 @@ void setup()
   pinMode(LED2, OUTPUT);
   pinMode(LED3, OUTPUT);
 
-  pinMode(SW_C, INPUT);
+  pinMode(SW_L, INPUT);
   pinMode(SW_R, INPUT);
 
   //motor disable
@@ -141,7 +141,7 @@ void setup()
 void loop()
 {
   // put your main code here, to run repeatedly:
-  while (digitalRead(SW_C) & digitalRead(SW_R)) {
+  while (digitalRead(SW_L) & digitalRead(SW_R)) {
     continue;
   }
   digitalWrite(MOTOR_EN, HIGH);

pico_halfV2_STEP7_P_control/pico_halfV2_STEP7_P_control.ino

@@ -17,7 +17,7 @@
 #define LED2 15
 #define LED3 16
 
-#define SW_C 13
+#define SW_L 13
 #define SW_R 14
 
 #define MOTOR_EN 12
@@ -159,7 +159,7 @@ void setup()
   pinMode(LED2, OUTPUT);
   pinMode(LED3, OUTPUT);
 
-  pinMode(SW_C, INPUT);
+  pinMode(SW_L, INPUT);
   pinMode(SW_R, INPUT);
 
   //motor disable
@@ -220,7 +220,7 @@ void setup()
 void loop()
 {
   // put your main code here, to run repeatedly:
-  while (digitalRead(SW_C) & digitalRead(SW_R)) {
+  while (digitalRead(SW_L) & digitalRead(SW_R)) {
     continue;
   }
 

pico_halfV2_STEP8_micromouse/adjust.ino

@@ -147,9 +147,6 @@ void adjustMenu(void)
         mode = incButton(mode, 7, 1);
         break;
       case SW_LM:
-        mode = decButton(mode, 1, 7);
-        break;
-      case SW_CM:
         okButton();
         if (execByModeAdjust(mode) == 1) {
           return;

pico_halfV2_STEP8_micromouse/device.h

@@ -9,7 +9,7 @@
 #define BLED0 18
 #define BLED1 17
 
-#define SW_C 13
+#define SW_L 13
 #define SW_R 14
 
 #define SLED_F 2
@@ -30,7 +30,7 @@
 #define PWM_L 46
 
 #define SW_LM 1
-#define SW_CM 2
+//#define SW_CM 2
 #define SW_RM 4
 
 #define BUZZER_CH 0

pico_halfV2_STEP8_micromouse/device.ino

@@ -107,7 +107,7 @@ void initAll(void)
   pinMode(BLED0, OUTPUT);
   pinMode(BLED1, OUTPUT);
 
-  pinMode(SW_C, INPUT);
+  pinMode(SW_L, INPUT);
   pinMode(SW_R, INPUT);
 
   ledcSetup(0, 440, 10);
@@ -247,11 +247,11 @@ unsigned char getSW(void)
     } while (digitalRead(SW_R) == LOW);
     ret |= SW_RM;
   }
-  if (digitalRead(SW_C) == LOW) {
+  if (digitalRead(SW_L) == LOW) {
     do {
       delay(20);
-    } while (digitalRead(SW_C) == LOW);
-    ret |= SW_CM;
+    } while (digitalRead(SW_L) == LOW);
+    ret |= SW_LM;
   }
   return ret;
 }

pico_halfV2_STEP8_micromouse/pico_halfV2_STEP8_micromouse.ino

@@ -48,7 +48,7 @@ void loop()
     case SW_RM:
       g_mode = incButton(g_mode, 15, 1);
       break;
-    case SW_CM:
+    case SW_LM:
       okButton();
       execByMode(g_mode);
       break;