Skip to content

Removed ProS2 and added TinyS2 to boards.txt #5037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 15, 2021
Merged

Removed ProS2 and added TinyS2 to boards.txt #5037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eeb2556
Removed ProS2 and added TinyS2 to boards.txt
UnexpectedMaker Apr 10, 2021
1d1803f
Fixed incorrect NUM_OUTPUT_PINS - should be 47 not 45
UnexpectedMaker Apr 13, 2021
9062261
Merge branch 'master' into master
me-no-dev Apr 15, 2021
ffd0ef7
Update esp32-hal-gpio.h
me-no-dev Apr 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cores/esp32/esp32-hal-gpio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 11 additions & 10 deletions variants/um_pros2/pins_arduino.h → variants/um_tinys2/pins_arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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 */