fix(variants/Pins_Arduino.h): Correct pin assignments and remove macro conflict

Author: bekirr12

variants/twinaiot/pins_arduino.h

@@ -8,59 +8,48 @@
 #define USB_PID 0x1001
 
 
-#define PIN_RGB_LED 15
+#define RGB_PIN 15
 
 static const uint8_t LED_BUILTIN = 35;
 #define BUILTIN_LED LED_BUILTIN  // backward compatibility
 #define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
 // RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
-#define RGB_BUILTIN    PIN_RGB_LED
+#define RGB_BUILTIN    RGB_PIN
 
 static const uint8_t TX = 39;
 static const uint8_t RX = 40;
 
-static const uint8_t SDA = 34;
-static const uint8_t SCL = 47;
+static const uint8_t SDA = 5;
+static const uint8_t SCL = 6;
 
 static const uint8_t SS = 1;
 static const uint8_t MOSI = 2;
 static const uint8_t MISO = 3;
 static const uint8_t SCK = 4;
 
-static const uint8_t A0 = 1;
-static const uint8_t A1 = 2;
-static const uint8_t A2 = 3;
-static const uint8_t A3 = 4;
-static const uint8_t A4 = 5;
-static const uint8_t A5 = 6;
-static const uint8_t A6 = 7;
-static const uint8_t A7 = 8;
-static const uint8_t A8 = 9;
-static const uint8_t A9 = 10;
-static const uint8_t A10 = 11;
-static const uint8_t A11 = 12;
-static const uint8_t A12 = 13;
-static const uint8_t A13 = 14;
-static const uint8_t A14 = 15;
-static const uint8_t A15 = 16;
-static const uint8_t A16 = 17;
-static const uint8_t A17 = 18;
-static const uint8_t A18 = 19;
-static const uint8_t A19 = 20;
-
-static const uint8_t T1 = 1;
-static const uint8_t T2 = 2;
-static const uint8_t T3 = 3;
-static const uint8_t T4 = 4;
-static const uint8_t T5 = 5;
-static const uint8_t T6 = 6;
-static const uint8_t T7 = 7;
-static const uint8_t T8 = 8;
-static const uint8_t T9 = 9;
-static const uint8_t T10 = 10;
-static const uint8_t T11 = 11;
-static const uint8_t T12 = 12;
-static const uint8_t T13 = 13;
-static const uint8_t T14 = 14;
+static const uint8_t D6_motor_pin = 35;
+static const uint8_t D9_motor_pin = 36;
+static const uint8_t D10_motor_pin = 10;
+
+static const uint8_t TOUCH_PIN = 13;
+
+static const uint8_t TRIG_PIN = 5; // GPIO connected to HC-SR04 TRIG
+static const uint8_t ECHO_PIN = 6; // GPIO connected to HC-SR04 ECHO
+
+static const uint8_t latchPin = 34;
+static const uint8_t clockPin = 47;
+static const uint8_t dataPin = 48;
+
+static const uint8_t D_IN_4 = 8;
+static const uint8_t D_IN_8 = 11;
+static const uint8_t D_IN_12 = 9;
+
+static const uint8_t AN_IN_4 = 17;
+static const uint8_t AN_IN_8 = 16;
+static const uint8_t AN_IN_12 = 7;
+
+static const uint8_t S1pin = 37;
+static const uint8_t S2pin = 38;
+static const uint8_t S3pin = 14;
 
 #endif /* Pins_Arduino_h */