Skip to content

GitLab

A
arduino-esp32
Unverified Commit 213f9769 authored by Me No Dev's avatar Me No Dev Committed by GitHub
Browse files
Options

Merge branch 'master' into release/v2.x

parents 0da8ecbc 4b930b23
Expand all Show whitespace changes
Inline Side-by-side
Showing with 484 additions and 310 deletions
boards.txt
View file @ 213f9769
This diff is collapsed.
variants/deneyapkart/pins_arduino.h
View file @ 213f9769
...@@ -11,20 +11,23 @@ ...@@ -11,20 +11,23 @@
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
#define digitalPinHasPWM(p) (p < 34) #define digitalPinHasPWM(p) (p < 34)
static const uint8_t LED_BUILTIN = 4;
#define BUILTIN_LED LED_BUILTIN
#define LED_BUILTIN LED_BUILTIN
#define LEDB LED_BUILTIN
#define LEDR 3 #define LEDR 3
#define LEDG 1 #define LEDG 1
#define LEDB 4 #define LEDB 4
#define BUILTIN_LED LEDB
#define LED_BUILTIN LEDB // backward compatibility
//#define RGB_BUILTIN LED_BUILTIN
static const uint8_t GPKEY = 0; static const uint8_t GPKEY = 0;
#define KEY_BUILTIN GPKEY #define KEY_BUILTIN GPKEY
#define BUILTIN_KEY GPKEY #define BUILTIN_KEY GPKEY
#define BOOT GPKEY
static const uint8_t TX = 1; static const uint8_t TX = 1;
static const uint8_t RX = 3; static const uint8_t RX = 3;
#define TX1 TX
#define RX1 RX
static const uint8_t SDA = 4; static const uint8_t SDA = 4;
static const uint8_t SCL = 15; static const uint8_t SCL = 15;
...@@ -36,13 +39,13 @@ static const uint8_t SCK = 19; ...@@ -36,13 +39,13 @@ static const uint8_t SCK = 19;
static const uint8_t A0 = 36; static const uint8_t A0 = 36;
static const uint8_t A1 = 39; static const uint8_t A1 = 39;
static const uint8_t A2 = 32; static const uint8_t A2 = 34;
static const uint8_t A3 = 33; static const uint8_t A3 = 35;
static const uint8_t A4 = 34; static const uint8_t A4 = 32;
static const uint8_t A5 = 35; static const uint8_t A5 = 33;
static const uint8_t T0 = 34; static const uint8_t T0 = 32;
static const uint8_t T1 = 35; static const uint8_t T1 = 33;
static const uint8_t T2 = 27; static const uint8_t T2 = 27;
static const uint8_t T3 = 14; static const uint8_t T3 = 14;
static const uint8_t T4 = 12; static const uint8_t T4 = 12;
......
variants/deneyapkart1A/pins_arduino.h
View file @ 213f9769
...@@ -2,29 +2,31 @@ ...@@ -2,29 +2,31 @@
#define Pins_Arduino_h #define Pins_Arduino_h
#include <stdint.h> #include <stdint.h>
#include "soc/soc_caps.h"
#define EXTERNAL_NUM_INTERRUPTS 16 #define EXTERNAL_NUM_INTERRUPTS 16
#define NUM_DIGITAL_PINS 40 #define NUM_DIGITAL_PINS 40
#define NUM_ANALOG_INPUTS 16 #define NUM_ANALOG_INPUTS 16
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13; #define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
#define BUILTIN_LED LED_BUILTIN // backward compatibility #define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
#define digitalPinHasPWM(p) (p < 34)
static const uint8_t LED_BUILTIN = 13;
#define BUILTIN_LED LED_BUILTIN
#define LED_BUILTIN LED_BUILTIN #define LED_BUILTIN LED_BUILTIN
#define RGB_BUILTIN LED_BUILTIN #define RGB_BUILTIN LED_BUILTIN
#define RGBLED LED_BUILTIN #define RGBLED LED_BUILTIN
#define RGB_BRIGHTNESS 64 #define RGB_BRIGHTNESS 64
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
#define digitalPinHasPWM(p) (p < 34)
static const uint8_t GPKEY = 0; static const uint8_t GPKEY = 0;
#define KEY_BUILTIN GPKEY #define KEY_BUILTIN GPKEY
#define BUILTIN_KEY GPKEY #define BUILTIN_KEY GPKEY
#define BOOT GPKEY
static const uint8_t TX = 1; static const uint8_t TX = 1;
static const uint8_t RX = 3; static const uint8_t RX = 3;
#define TX1 TX
#define RX1 RX
static const uint8_t SDA = 4; static const uint8_t SDA = 4;
static const uint8_t SCL = 15; static const uint8_t SCL = 15;
...@@ -36,13 +38,13 @@ static const uint8_t SCK = 19; ...@@ -36,13 +38,13 @@ static const uint8_t SCK = 19;
static const uint8_t A0 = 36; static const uint8_t A0 = 36;
static const uint8_t A1 = 39; static const uint8_t A1 = 39;
static const uint8_t A2 = 32; static const uint8_t A2 = 34;
static const uint8_t A3 = 33; static const uint8_t A3 = 35;
static const uint8_t A4 = 34; static const uint8_t A4 = 32;
static const uint8_t A5 = 35; static const uint8_t A5 = 33;
static const uint8_t T0 = 34; static const uint8_t T0 = 32;
static const uint8_t T1 = 35; static const uint8_t T1 = 33;
static const uint8_t T2 = 27; static const uint8_t T2 = 27;
static const uint8_t T3 = 14; static const uint8_t T3 = 14;
static const uint8_t T4 = 12; static const uint8_t T4 = 12;
......
variants/deneyapkart1Av2/pins_arduino.h
View file @ 213f9769
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define Pins_Arduino_h #define Pins_Arduino_h
#include <stdint.h> #include <stdint.h>
#include "soc/soc_caps.h"
#define USB_VID 0x303A #define USB_VID 0x303A
#define USB_PID 0x8147 #define USB_PID 0x8147
...@@ -14,23 +13,25 @@ ...@@ -14,23 +13,25 @@
#define NUM_DIGITAL_PINS 48 #define NUM_DIGITAL_PINS 48
#define NUM_ANALOG_INPUTS 20 #define NUM_ANALOG_INPUTS 20
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48; #define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
#define BUILTIN_LED LED_BUILTIN // backward compatibility #define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
#define digitalPinHasPWM(p) (p < 46)
static const uint8_t LED_BUILTIN = 48;
#define BUILTIN_LED LED_BUILTIN
#define LED_BUILTIN LED_BUILTIN #define LED_BUILTIN LED_BUILTIN
#define RGB_BUILTIN LED_BUILTIN #define RGB_BUILTIN LED_BUILTIN
#define RGBLED LED_BUILTIN #define RGBLED LED_BUILTIN
#define RGB_BRIGHTNESS 64 #define RGB_BRIGHTNESS 64
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
#define digitalPinHasPWM(p) (p < 46)
static const uint8_t GPKEY = 0; static const uint8_t GPKEY = 0;
#define KEY_BUILTIN GPKEY #define KEY_BUILTIN GPKEY
#define BUILTIN_KEY GPKEY #define BUILTIN_KEY GPKEY
static const uint8_t TX = 43; static const uint8_t TX = 43;
static const uint8_t RX = 44; static const uint8_t RX = 44;
#define TX1 TX
#define RX1 RX
static const uint8_t SDA = 47; static const uint8_t SDA = 47;
static const uint8_t SCL = 21; static const uint8_t SCL = 21;
...@@ -48,6 +49,17 @@ static const uint8_t A4 = 15; ...@@ -48,6 +49,17 @@ static const uint8_t A4 = 15;
static const uint8_t A5 = 16; static const uint8_t A5 = 16;
static const uint8_t A6 = 17; static const uint8_t A6 = 17;
static const uint8_t A7 = 18; static const uint8_t A7 = 18;
static const uint8_t A8 = 9;
static const uint8_t T0 = 4;
static const uint8_t T1 = 5;
static const uint8_t T2 = 6;
static const uint8_t T3 = 7;
static const uint8_t T4 = 8;
static const uint8_t T5 = 3;
static const uint8_t T6 = 10;
static const uint8_t T7 = 1;
static const uint8_t T8 = 2;
static const uint8_t D0 = 1; static const uint8_t D0 = 1;
static const uint8_t D1 = 2; static const uint8_t D1 = 2;
...@@ -61,13 +73,20 @@ static const uint8_t D8 = 38; ...@@ -61,13 +73,20 @@ static const uint8_t D8 = 38;
static const uint8_t D9 = 48; static const uint8_t D9 = 48;
static const uint8_t D10 = 47; static const uint8_t D10 = 47;
static const uint8_t D11 = 21; static const uint8_t D11 = 21;
static const uint8_t D12 = 0; static const uint8_t D12 = 10;
static const uint8_t D13 = 10; static const uint8_t D13 = 3;
static const uint8_t D14 = 3; static const uint8_t D14 = 8;
static const uint8_t D15 = 8; static const uint8_t D15 = 0;
static const uint8_t D16 = 13;
static const uint8_t D17 = 12;
static const uint8_t D18 = 11;
static const uint8_t D19 = 14;
static const uint8_t PWM0 = 1; static const uint8_t PWM0 = 15;
static const uint8_t PWM1 = 2; static const uint8_t PWM1 = 16;
static const uint8_t PWM2 = 17;
static const uint8_t PWM3 = 18;
static const uint8_t PWM4 = 38;
static const uint8_t CAMSD = 4; static const uint8_t CAMSD = 4;
static const uint8_t CAMSC = 5; static const uint8_t CAMSC = 5;
...@@ -89,4 +108,6 @@ static const uint8_t SDMO = 12; ...@@ -89,4 +108,6 @@ static const uint8_t SDMO = 12;
static const uint8_t SDCS = 11; static const uint8_t SDCS = 11;
static const uint8_t SDCK = 13; static const uint8_t SDCK = 13;
static const uint8_t BAT = 9;
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */
variants/deneyapkartg/pins_arduino.h
View file @ 213f9769
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define Pins_Arduino_h #define Pins_Arduino_h
#include <stdint.h> #include <stdint.h>
#include "soc/soc_caps.h"
#define USB_VID 0x303A #define USB_VID 0x303A
#define USB_PID 0x814A #define USB_PID 0x814A
...@@ -14,23 +13,26 @@ ...@@ -14,23 +13,26 @@
#define NUM_DIGITAL_PINS 22 #define NUM_DIGITAL_PINS 22
#define NUM_ANALOG_INPUTS 6 #define NUM_ANALOG_INPUTS 6
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+10; #define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
#define BUILTIN_LED LED_BUILTIN // backward compatibility #define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):-1)
#define digitalPinHasPWM(p) (p < EXTERNAL_NUM_INTERRUPTS)
static const uint8_t LED_BUILTIN = 10;
#define BUILTIN_LED LED_BUILTIN
#define LED_BUILTIN LED_BUILTIN #define LED_BUILTIN LED_BUILTIN
#define RGB_BUILTIN LED_BUILTIN #define RGB_BUILTIN LED_BUILTIN
#define RGBLED LED_BUILTIN #define RGBLED LED_BUILTIN
#define RGB_BRIGHTNESS 64 #define RGB_BRIGHTNESS 64
#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
#define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):-1)
#define digitalPinHasPWM(p) (p < EXTERNAL_NUM_INTERRUPTS)
static const uint8_t GPKEY = 9; static const uint8_t GPKEY = 9;
#define KEY_BUILTIN GPKEY #define KEY_BUILTIN GPKEY
#define BUILTIN_KEY GPKEY #define BUILTIN_KEY GPKEY
#define BT GPKEY
static const uint8_t TX = 21; static const uint8_t TX = 21;
static const uint8_t RX = 20; static const uint8_t RX = 20;
#define TX1 TX
#define RX1 RX
static const uint8_t SDA = 8; static const uint8_t SDA = 8;
static const uint8_t SCL = 2; static const uint8_t SCL = 2;
...@@ -47,8 +49,8 @@ static const uint8_t A3 = 4; ...@@ -47,8 +49,8 @@ static const uint8_t A3 = 4;
static const uint8_t A4 = 5; static const uint8_t A4 = 5;
static const uint8_t A5 = 6; static const uint8_t A5 = 6;
static const uint8_t D0 = 21; static const uint8_t D0 = 20;
static const uint8_t D1 = 20; static const uint8_t D1 = 21;
static const uint8_t D2 = 9; static const uint8_t D2 = 9;
static const uint8_t D3 = 10; static const uint8_t D3 = 10;
static const uint8_t D4 = 8; static const uint8_t D4 = 8;
......
variants/deneyapmini/pins_arduino.h
View file @ 213f9769
...@@ -17,20 +17,23 @@ ...@@ -17,20 +17,23 @@
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1) #define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
#define digitalPinHasPWM(p) (p < 46) #define digitalPinHasPWM(p) (p < 46)
static const uint8_t LED_BUILTIN = 35;
#define BUILTIN_LED LED_BUILTIN
#define LED_BUILTIN LED_BUILTIN
#define LEDB LED_BUILTIN
#define LEDR 34 #define LEDR 34
#define LEDG 33 #define LEDG 33
#define LEDB 35 #define LEDB 35
#define BUILTIN_LED LEDB
#define LED_BUILTIN LEDB // backward compatibility
//#define RGB_BUILTIN LED_BUILTIN
static const uint8_t GPKEY = 0; static const uint8_t GPKEY = 0;
#define KEY_BUILTIN GPKEY #define KEY_BUILTIN GPKEY
#define BUILTIN_KEY GPKEY #define BUILTIN_KEY GPKEY
#define BT GPKEY
static const uint8_t TX = 43; static const uint8_t TX = 43;
static const uint8_t RX = 44; static const uint8_t RX = 44;
#define TX1 TX
#define RX1 RX
static const uint8_t SDA = 36; static const uint8_t SDA = 36;
static const uint8_t SCL = 37; static const uint8_t SCL = 37;
...@@ -76,7 +79,17 @@ static const uint8_t D16 = 34; ...@@ -76,7 +79,17 @@ static const uint8_t D16 = 34;
static const uint8_t PWM0 = 42; static const uint8_t PWM0 = 42;
static const uint8_t PWM1 = 41; static const uint8_t PWM1 = 41;
static const uint8_t DAC1 = 17; static const uint8_t DAC0 = 17;
static const uint8_t DAC2 = 18; static const uint8_t DAC1 = 18;
#define SD SDA
#define SC SCL
#define MO MOSI
#define MI MISO
#define MC SCK
#define DA0 DAC0
#define DA1 DAC1
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */
variants/deneyapminiv2/pins_arduino.h
View file @ 213f9769
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define Pins_Arduino_h #define Pins_Arduino_h
#include <stdint.h> #include <stdint.h>
#include "soc/soc_caps.h"
#define USB_VID 0x303A #define USB_VID 0x303A
#define USB_PID 0x8144 #define USB_PID 0x8144
...@@ -14,23 +13,25 @@ ...@@ -14,23 +13,25 @@
#define NUM_DIGITAL_PINS 48 #define NUM_DIGITAL_PINS 48
#define NUM_ANALOG_INPUTS 20 #define NUM_ANALOG_INPUTS 20
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+33; #define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
#define BUILTIN_LED LED_BUILTIN // backward compatibility #define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
#define digitalPinHasPWM(p) (p < 46)
static const uint8_t LED_BUILTIN = 33;
#define BUILTIN_LED LED_BUILTIN
#define LED_BUILTIN LED_BUILTIN #define LED_BUILTIN LED_BUILTIN
#define RGB_BUILTIN LED_BUILTIN #define RGB_BUILTIN LED_BUILTIN
#define RGBLED LED_BUILTIN #define RGBLED LED_BUILTIN
#define RGB_BRIGHTNESS 64 #define RGB_BRIGHTNESS 64
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
#define digitalPinHasPWM(p) (p < 46)
static const uint8_t GPKEY = 0; static const uint8_t GPKEY = 0;
#define KEY_BUILTIN GPKEY #define KEY_BUILTIN GPKEY
#define BUILTIN_KEY GPKEY #define BUILTIN_KEY GPKEY
static const uint8_t TX = 43; static const uint8_t TX = 43;
static const uint8_t RX = 44; static const uint8_t RX = 44;
#define TX1 TX
#define RX1 RX
static const uint8_t SDA = 36; static const uint8_t SDA = 36;
static const uint8_t SCL = 37; static const uint8_t SCL = 37;
...@@ -76,7 +77,17 @@ static const uint8_t D14 = 33; ...@@ -76,7 +77,17 @@ static const uint8_t D14 = 33;
static const uint8_t PWM0 = 42; static const uint8_t PWM0 = 42;
static const uint8_t PWM1 = 41; static const uint8_t PWM1 = 41;
static const uint8_t DAC1 = 17; static const uint8_t DAC0 = 17;
static const uint8_t DAC2 = 18; static const uint8_t DAC1 = 18;
#define SD SDA
#define SC SCL
#define MO MOSI
#define MI MISO
#define MC SCK
#define DA0 DAC0
#define DA1 DAC1
#endif /* Pins_Arduino_h */ #endif /* Pins_Arduino_h */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment