Merge branch 'master' into release/v2.x

213f9769 · Me No Dev · GitHub · 0da8ecbc · 4b930b23 · 213f9769
7 changed file
--- a/boards.txt
+++ b/boards.txt
--- a/variants/deneyapkart/pins_arduino.h
+++ b/variants/deneyapkart/pins_arduino.h
@@ -11,53 +11,56 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)

-#define	LEDR 3
-#define	LEDG 1
-#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 LED_BUILTIN = 4;
+#define BUILTIN_LED LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN
+#define LEDB        LED_BUILTIN
+#define LEDR 3
+#define LEDG 1
+#define LEDB 4
+
+static const uint8_t GPKEY = 0;
 #define KEY_BUILTIN GPKEY
 #define BUILTIN_KEY GPKEY
+#define BOOT GPKEY

 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
+#define TX1 TX
+#define RX1 RX

 static const uint8_t SDA = 4;
 static const uint8_t SCL = 15;

-static const uint8_t SS = 21;
+static const uint8_t SS   = 21;
 static const uint8_t MOSI = 5;
 static const uint8_t MISO = 18;
-static const uint8_t SCK = 19;
+static const uint8_t SCK  = 19;

 static const uint8_t A0 = 36;
 static const uint8_t A1 = 39;
-static const uint8_t A2 = 32;
-static const uint8_t A3 = 33;
-static const uint8_t A4 = 34;
-static const uint8_t A5 = 35;
+static const uint8_t A2 = 34;
+static const uint8_t A3 = 35;
+static const uint8_t A4 = 32;
+static const uint8_t A5 = 33;

-static const uint8_t T0 = 34;
-static const uint8_t T1 = 35;
+static const uint8_t T0 = 32;
+static const uint8_t T1 = 33;
 static const uint8_t T2 = 27;
 static const uint8_t T3 = 14;
 static const uint8_t T4 = 12;
-static const uint8_t T5 = 13;	
-
-static const uint8_t D0 = 23;
-static const uint8_t D1 = 22;
-static const uint8_t D2 = 1;
-static const uint8_t D3 = 3;
-static const uint8_t D4 = 21;
-static const uint8_t D5 = 19;
-static const uint8_t D6 = 18;
-static const uint8_t D7 = 5;
-static const uint8_t D8 = 0;
-static const uint8_t D9 = 2;
+static const uint8_t T5 = 13;
+
+static const uint8_t D0  = 23;
+static const uint8_t D1  = 22;
+static const uint8_t D2  = 1;
+static const uint8_t D3  = 3;
+static const uint8_t D4  = 21;
+static const uint8_t D5  = 19;
+static const uint8_t D6  = 18;
+static const uint8_t D7  = 5;
+static const uint8_t D8  = 0;
+static const uint8_t D9  = 2;
 static const uint8_t D10 = 4;
 static const uint8_t D11 = 15;
 static const uint8_t D12 = 13;

--- a/variants/deneyapkart1A/pins_arduino.h
+++ b/variants/deneyapkart1A/pins_arduino.h
@@ -2,62 +2,64 @@
 #define Pins_Arduino_h

 #include <stdint.h>
-#include "soc/soc_caps.h"

 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
 #define NUM_ANALOG_INPUTS       16

-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13;
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-#define RGB_BUILTIN LED_BUILTIN
-#define RGBLED	LED_BUILTIN
-#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 LED_BUILTIN = 13;
+#define BUILTIN_LED LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN
+#define RGB_BUILTIN LED_BUILTIN
+#define RGBLED      LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t GPKEY = 0;
 #define KEY_BUILTIN GPKEY
 #define BUILTIN_KEY GPKEY
+#define BOOT GPKEY

 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
+#define TX1 TX
+#define RX1 RX

 static const uint8_t SDA = 4;
 static const uint8_t SCL = 15;

-static const uint8_t SS = 21;
+static const uint8_t SS   = 21;
 static const uint8_t MOSI = 5;
 static const uint8_t MISO = 18;
-static const uint8_t SCK = 19;
+static const uint8_t SCK  = 19;

 static const uint8_t A0 = 36;
 static const uint8_t A1 = 39;
-static const uint8_t A2 = 32;
-static const uint8_t A3 = 33;
-static const uint8_t A4 = 34;
-static const uint8_t A5 = 35;
+static const uint8_t A2 = 34;
+static const uint8_t A3 = 35;
+static const uint8_t A4 = 32;
+static const uint8_t A5 = 33;

-static const uint8_t T0 = 34;
-static const uint8_t T1 = 35;
+static const uint8_t T0 = 32;
+static const uint8_t T1 = 33;
 static const uint8_t T2 = 27;
 static const uint8_t T3 = 14;
 static const uint8_t T4 = 12;
-static const uint8_t T5 = 13;	
-
-static const uint8_t D0 = 23;
-static const uint8_t D1 = 22;
-static const uint8_t D2 = 1;
-static const uint8_t D3 = 3;
-static const uint8_t D4 = 21;
-static const uint8_t D5 = 19;
-static const uint8_t D6 = 18;
-static const uint8_t D7 = 5;
-static const uint8_t D8 = 0;
-static const uint8_t D9 = 2;
+static const uint8_t T5 = 13;
+
+static const uint8_t D0  = 23;
+static const uint8_t D1  = 22;
+static const uint8_t D2  = 1;
+static const uint8_t D3  = 3;
+static const uint8_t D4  = 21;
+static const uint8_t D5  = 19;
+static const uint8_t D6  = 18;
+static const uint8_t D7  = 5;
+static const uint8_t D8  = 0;
+static const uint8_t D9  = 2;
 static const uint8_t D10 = 4;
 static const uint8_t D11 = 15;
 static const uint8_t D12 = 13;

--- a/variants/deneyapkart1Av2/pins_arduino.h
+++ b/variants/deneyapkart1Av2/pins_arduino.h
@@ -2,7 +2,6 @@
 #define Pins_Arduino_h

 #include <stdint.h>
-#include "soc/soc_caps.h"

 #define USB_VID            0x303A
 #define USB_PID            0x8147
@@ -14,60 +13,80 @@
 #define NUM_DIGITAL_PINS	48
 #define NUM_ANALOG_INPUTS	20

-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-#define RGB_BUILTIN LED_BUILTIN
-#define RGBLED	LED_BUILTIN
-#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 LED_BUILTIN = 48;
+#define BUILTIN_LED LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN
+#define RGB_BUILTIN LED_BUILTIN
+#define RGBLED      LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t GPKEY = 0;
 #define KEY_BUILTIN GPKEY
 #define BUILTIN_KEY GPKEY

-static const uint8_t TX 	= 43;
-static const uint8_t RX 	= 44;
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+#define TX1 TX
+#define RX1 RX

-static const uint8_t SDA 	= 47;
-static const uint8_t SCL 	= 21;
+static const uint8_t SDA = 47;
+static const uint8_t SCL = 21;

 static const uint8_t SS		= 42;
 static const uint8_t MOSI	= 39;
 static const uint8_t MISO	= 40;
 static const uint8_t SCK	= 41;

-static const uint8_t A0 	= 4;
-static const uint8_t A1 	= 5;
-static const uint8_t A2 	= 6;
-static const uint8_t A3 	= 7;
-static const uint8_t A4 	= 15;
-static const uint8_t A5 	= 16;
-static const uint8_t A6 	= 17;
-static const uint8_t A7 	= 18;
-
-static const uint8_t D0 	= 1;
-static const uint8_t D1 	= 2;
-static const uint8_t D2 	= 43;
-static const uint8_t D3 	= 44;
-static const uint8_t D4 	= 42;
-static const uint8_t D5 	= 41;
-static const uint8_t D6 	= 40;
-static const uint8_t D7 	= 39;
-static const uint8_t D8 	= 38;
-static const uint8_t D9 	= 48;
-static const uint8_t D10 	= 47;
-static const uint8_t D11 	= 21;
-static const uint8_t D12 	= 0;
-static const uint8_t D13 	= 10;
-static const uint8_t D14 	= 3;
-static const uint8_t D15 	= 8;
-
-static const uint8_t PWM0 	= 1;
-static const uint8_t PWM1 	= 2;
+static const uint8_t A0 = 4;
+static const uint8_t A1 = 5;
+static const uint8_t A2 = 6;
+static const uint8_t A3 = 7;
+static const uint8_t A4 = 15;
+static const uint8_t A5 = 16;
+static const uint8_t A6 = 17;
+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 D1  = 2;
+static const uint8_t D2  = 43;
+static const uint8_t D3  = 44;
+static const uint8_t D4  = 42;
+static const uint8_t D5  = 41;
+static const uint8_t D6  = 40;
+static const uint8_t D7  = 39;
+static const uint8_t D8  = 38;
+static const uint8_t D9  = 48;
+static const uint8_t D10 = 47;
+static const uint8_t D11 = 21;
+static const uint8_t D12 = 10;
+static const uint8_t D13 = 3;
+static const uint8_t D14 = 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 = 15;
+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 CAMSC = 5;
@@ -89,4 +108,6 @@ static const uint8_t SDMO = 12;
 static const uint8_t SDCS = 11;
 static const uint8_t SDCK = 13;

+static const uint8_t BAT = 9;
+
 #endif /* Pins_Arduino_h */
--- a/variants/deneyapkartg/pins_arduino.h
+++ b/variants/deneyapkartg/pins_arduino.h
@@ -2,7 +2,6 @@
 #define Pins_Arduino_h

 #include <stdint.h>
-#include "soc/soc_caps.h"

 #define USB_VID            0x303A
 #define USB_PID            0x814A
@@ -14,31 +13,34 @@
 #define NUM_DIGITAL_PINS        22
 #define NUM_ANALOG_INPUTS       6

-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+10;
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-#define RGB_BUILTIN LED_BUILTIN
-#define RGBLED	LED_BUILTIN
-#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 LED_BUILTIN = 10;
+#define BUILTIN_LED LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN
+#define RGB_BUILTIN LED_BUILTIN
+#define RGBLED      LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t GPKEY = 9;
 #define KEY_BUILTIN GPKEY
 #define BUILTIN_KEY GPKEY
+#define BT GPKEY

 static const uint8_t TX = 21;
 static const uint8_t RX = 20;
+#define TX1 TX
+#define RX1 RX

 static const uint8_t SDA = 8;
 static const uint8_t SCL = 2;

-static const uint8_t SS    = 7;
-static const uint8_t MOSI  = 6;
-static const uint8_t MISO  = 5;
-static const uint8_t SCK   = 4;
+static const uint8_t SS   = 7;
+static const uint8_t MOSI = 6;
+static const uint8_t MISO = 5;
+static const uint8_t SCK  = 4;

 static const uint8_t A0 = 0;
 static const uint8_t A1 = 1;
@@ -47,8 +49,8 @@ static const uint8_t A3 = 4;
 static const uint8_t A4 = 5;
 static const uint8_t A5 = 6;

-static const uint8_t D0 = 21;
-static const uint8_t D1 = 20;
+static const uint8_t D0 = 20;
+static const uint8_t D1 = 21;
 static const uint8_t D2 = 9;
 static const uint8_t D3 = 10;
 static const uint8_t D4 = 8;

--- a/variants/deneyapmini/pins_arduino.h
+++ b/variants/deneyapmini/pins_arduino.h
@@ -17,28 +17,31 @@
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)

-#define	LEDR 34
-#define	LEDG 33
-#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 LED_BUILTIN = 35;
+#define BUILTIN_LED LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN
+#define LEDB        LED_BUILTIN
+#define LEDR 34
+#define LEDG 33
+#define LEDB 35
+
+static const uint8_t GPKEY = 0;
 #define KEY_BUILTIN GPKEY
 #define BUILTIN_KEY GPKEY
+#define BT GPKEY

 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
+#define TX1 TX
+#define RX1 RX

 static const uint8_t SDA = 36;
 static const uint8_t SCL = 37;

-static const uint8_t SS    = 21;
-static const uint8_t MOSI  = 40;
-static const uint8_t MISO  = 39;
-static const uint8_t SCK   = 38;
+static const uint8_t SS   = 21;
+static const uint8_t MOSI = 40;
+static const uint8_t MISO = 39;
+static const uint8_t SCK  = 38;

 static const uint8_t A0 = 8;
 static const uint8_t A1 = 9;
@@ -49,22 +52,22 @@ static const uint8_t A5 = 13;
 static const uint8_t A6 = 16;

 static const uint8_t T0 = 8;
-static const uint8_t T1 = 9; 
+static const uint8_t T1 = 9;
 static const uint8_t T2 = 10;
 static const uint8_t T3 = 11;
 static const uint8_t T4 = 12;
 static const uint8_t T5 = 13;

-static const uint8_t D0 = 44;
-static const uint8_t D1 = 43;
-static const uint8_t D2 = 42;
-static const uint8_t D3 = 41;
-static const uint8_t D4 = 40;
-static const uint8_t D5 = 39;
-static const uint8_t D6 = 38;
-static const uint8_t D7 = 37;
-static const uint8_t D8 = 36;
-static const uint8_t D9 = 26;
+static const uint8_t D0  = 44;
+static const uint8_t D1  = 43;
+static const uint8_t D2  = 42;
+static const uint8_t D3  = 41;
+static const uint8_t D4  = 40;
+static const uint8_t D5  = 39;
+static const uint8_t D6  = 38;
+static const uint8_t D7  = 37;
+static const uint8_t D8  = 36;
+static const uint8_t D9  = 26;
 static const uint8_t D10 = 21;
 static const uint8_t D11 = 18;
 static const uint8_t D12 = 17;
@@ -76,7 +79,17 @@ static const uint8_t D16 = 34;
 static const uint8_t PWM0 = 42;
 static const uint8_t PWM1 = 41;

-static const uint8_t DAC1 = 17;
-static const uint8_t DAC2 = 18;
+static const uint8_t DAC0 = 17;
+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 */
--- a/variants/deneyapminiv2/pins_arduino.h
+++ b/variants/deneyapminiv2/pins_arduino.h
@@ -2,7 +2,6 @@
 #define Pins_Arduino_h

 #include <stdint.h>
-#include "soc/soc_caps.h"

 #define USB_VID            0x303A
 #define USB_PID            0x8144
@@ -14,31 +13,33 @@
 #define NUM_DIGITAL_PINS        48
 #define NUM_ANALOG_INPUTS       20

-static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+33;
-#define BUILTIN_LED  LED_BUILTIN // backward compatibility
-#define LED_BUILTIN LED_BUILTIN
-#define RGB_BUILTIN LED_BUILTIN
-#define RGBLED	LED_BUILTIN
-#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 LED_BUILTIN = 33;
+#define BUILTIN_LED LED_BUILTIN
+#define LED_BUILTIN LED_BUILTIN
+#define RGB_BUILTIN LED_BUILTIN
+#define RGBLED      LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t GPKEY = 0;
 #define KEY_BUILTIN GPKEY
 #define BUILTIN_KEY GPKEY

 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
+#define TX1 TX
+#define RX1 RX

 static const uint8_t SDA = 36;
 static const uint8_t SCL = 37;

-static const uint8_t SS    = 21;
-static const uint8_t MOSI  = 40;
-static const uint8_t MISO  = 39;
-static const uint8_t SCK   = 38;
+static const uint8_t SS   = 21;
+static const uint8_t MOSI = 40;
+static const uint8_t MISO = 39;
+static const uint8_t SCK  = 38;

 static const uint8_t A0 = 7;
 static const uint8_t A1 = 8;
@@ -57,16 +58,16 @@ static const uint8_t T4 = 11;
 static const uint8_t T5 = 12;
 static const uint8_t T6 = 13;

-static const uint8_t D0 = 44;
-static const uint8_t D1 = 43;
-static const uint8_t D2 = 42;
-static const uint8_t D3 = 41;
-static const uint8_t D4 = 40;
-static const uint8_t D5 = 39;
-static const uint8_t D6 = 38;
-static const uint8_t D7 = 37;
-static const uint8_t D8 = 36;
-static const uint8_t D9 = 26;
+static const uint8_t D0  = 44;
+static const uint8_t D1  = 43;
+static const uint8_t D2  = 42;
+static const uint8_t D3  = 41;
+static const uint8_t D4  = 40;
+static const uint8_t D5  = 39;
+static const uint8_t D6  = 38;
+static const uint8_t D7  = 37;
+static const uint8_t D8  = 36;
+static const uint8_t D9  = 26;
 static const uint8_t D10 = 21;
 static const uint8_t D11 = 18;
 static const uint8_t D12 = 17;
@@ -76,7 +77,17 @@ static const uint8_t D14 = 33;
 static const uint8_t PWM0 = 42;
 static const uint8_t PWM1 = 41;

-static const uint8_t DAC1 = 17;
-static const uint8_t DAC2 = 18;
+static const uint8_t DAC0 = 17;
+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 */