From ec7aeb4903407f77c264669e4e030e81dd4b7ca7 Mon Sep 17 00:00:00 2001
From: Unexpected Maker <seon@unexpectedmaker.com>
Date: Thu, 15 Apr 2021 21:31:41 +1000
Subject: [PATCH] Removed ProS2 and added TinyS2 to boards.txt (#5037)

---
 boards.txt                                    |  1 +
 cores/esp32/esp32-hal-gpio.h                  |  2 +-
 .../{um_pros2 => um_tinys2}/pins_arduino.h    | 21 ++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)
 rename variants/{um_pros2 => um_tinys2}/pins_arduino.h (83%)

diff --git a/boards.txt b/boards.txt
index 21ec79e5..3bbc4404 100644
--- a/boards.txt
+++ b/boards.txt
@@ -961,6 +961,7 @@ feathers2.menu.DebugLevel.verbose=Verbose
 feathers2.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
+
 pros2.name=UM ProS2
 pros2.vid.0=0x239A
 pros2.pid.0=0x80A9
diff --git a/cores/esp32/esp32-hal-gpio.h b/cores/esp32/esp32-hal-gpio.h
index f3a61ff9..d7618392 100644
--- a/cores/esp32/esp32-hal-gpio.h
+++ b/cores/esp32/esp32-hal-gpio.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "soc/soc_caps.h"
 
 #if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)
-#define NUM_OUPUT_PINS  45
+#define NUM_OUPUT_PINS  46
 #define PIN_DAC1        17
 #define PIN_DAC2        18
 #else
diff --git a/variants/um_pros2/pins_arduino.h b/variants/um_tinys2/pins_arduino.h
similarity index 83%
rename from variants/um_pros2/pins_arduino.h
rename to variants/um_tinys2/pins_arduino.h
index a793a6b3..c79f3940 100644
--- a/variants/um_pros2/pins_arduino.h
+++ b/variants/um_tinys2/pins_arduino.h
@@ -3,10 +3,10 @@
 
 #include <stdint.h>
 
-#define USB_VID 0x239A
-#define USB_PID 0x80A9
+#define USB_VID 0x303A
+#define USB_PID 0x8001
 #define USB_MANUFACTURER "Unexpected Maker"
-#define USB_PRODUCT "ProS2"
+#define USB_PRODUCT "TinyS2"
 #define USB_SERIAL ""
 
 #define EXTERNAL_NUM_INTERRUPTS 46
@@ -23,12 +23,12 @@ static const uint8_t RX = 44;
 static const uint8_t SDA = 8;
 static const uint8_t SCL = 9;
 
-static const uint8_t SS    = 34;
+static const uint8_t SS    = 14;
 static const uint8_t MOSI  = 35;
-static const uint8_t MISO  = 37;
+static const uint8_t MISO  = 36;
 static const uint8_t SDO  = 35;
-static const uint8_t SDI  = 37;
-static const uint8_t SCK   = 36;
+static const uint8_t SDI  = 36;
+static const uint8_t SCK   = 37;
 
 static const uint8_t A0 = 1;
 static const uint8_t A1 = 2;
@@ -69,9 +69,10 @@ static const uint8_t T14 = 14;
 static const uint8_t DAC1 = 17;
 static const uint8_t DAC2 = 18;
 
-static const uint8_t LDO_2_POWER = 21;
+static const uint8_t VBAT_SENSE = 3;
+static const uint8_t VBUS_SENSE = 21;
 
-static const uint8_t APA_DATA = 40;
-static const uint8_t APA_CLK = 45;
+static const uint8_t RGB_DATA = 1;
+static const uint8_t RGB_PWR = 2;
 
 #endif /* Pins_Arduino_h */