Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 213f976

Browse files
Merge branch 'master' into release/v2.x
2 parents 0da8ecb + 4b930b2 commit 213f976

File tree

7 files changed

+484
-310
lines changed

7 files changed

+484
-310
lines changed

‎boards.txt

Lines changed: 267 additions & 145 deletions
Large diffs are not rendered by default.

‎variants/deneyapkart/pins_arduino.h

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,56 @@
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

14-
#defineLEDR 3
15-
#defineLEDG 1
16-
#defineLEDB 4
17-
18-
#define BUILTIN_LED LEDB
19-
#define LED_BUILTIN LEDB // backward compatibility
20-
//#define RGB_BUILTIN LED_BUILTIN
21-
22-
static const uint8_t GPKEY = 0;
14+
staticconstuint8_tLED_BUILTIN=4;
15+
#defineBUILTIN_LED LED_BUILTIN
16+
#defineLED_BUILTIN LED_BUILTIN
17+
#defineLEDB LED_BUILTIN
18+
#define LEDR 3
19+
#define LEDG 1
20+
#define LEDB 4
21+
22+
static const uint8_t GPKEY = 0;
2323
#define KEY_BUILTIN GPKEY
2424
#define BUILTIN_KEY GPKEY
25+
#define BOOT GPKEY
2526

2627
static const uint8_t TX = 1;
2728
static const uint8_t RX = 3;
29+
#define TX1 TX
30+
#define RX1 RX
2831

2932
static const uint8_t SDA = 4;
3033
static const uint8_t SCL = 15;
3134

32-
static const uint8_t SS = 21;
35+
static const uint8_t SS = 21;
3336
static const uint8_t MOSI = 5;
3437
static const uint8_t MISO = 18;
35-
static const uint8_t SCK = 19;
38+
static const uint8_t SCK = 19;
3639

3740
static const uint8_t A0 = 36;
3841
static const uint8_t A1 = 39;
39-
static const uint8_t A2 = 32;
40-
static const uint8_t A3 = 33;
41-
static const uint8_t A4 = 34;
42-
static const uint8_t A5 = 35;
42+
static const uint8_t A2 = 34;
43+
static const uint8_t A3 = 35;
44+
static const uint8_t A4 = 32;
45+
static const uint8_t A5 = 33;
4346

44-
static const uint8_t T0 = 34;
45-
static const uint8_t T1 = 35;
47+
static const uint8_t T0 = 32;
48+
static const uint8_t T1 = 33;
4649
static const uint8_t T2 = 27;
4750
static const uint8_t T3 = 14;
4851
static const uint8_t T4 = 12;
49-
static const uint8_t T5 = 13;
50-
51-
static const uint8_t D0 = 23;
52-
static const uint8_t D1 = 22;
53-
static const uint8_t D2 = 1;
54-
static const uint8_t D3 = 3;
55-
static const uint8_t D4 = 21;
56-
static const uint8_t D5 = 19;
57-
static const uint8_t D6 = 18;
58-
static const uint8_t D7 = 5;
59-
static const uint8_t D8 = 0;
60-
static const uint8_t D9 = 2;
52+
static const uint8_t T5 = 13;
53+
54+
static const uint8_t D0 = 23;
55+
static const uint8_t D1 = 22;
56+
static const uint8_t D2 = 1;
57+
static const uint8_t D3 = 3;
58+
static const uint8_t D4 = 21;
59+
static const uint8_t D5 = 19;
60+
static const uint8_t D6 = 18;
61+
static const uint8_t D7 = 5;
62+
static const uint8_t D8 = 0;
63+
static const uint8_t D9 = 2;
6164
static const uint8_t D10 = 4;
6265
static const uint8_t D11 = 15;
6366
static const uint8_t D12 = 13;

‎variants/deneyapkart1A/pins_arduino.h

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,64 @@
22
#define Pins_Arduino_h
33

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

76
#define EXTERNAL_NUM_INTERRUPTS 16
87
#define NUM_DIGITAL_PINS 40
98
#define NUM_ANALOG_INPUTS 16
109

11-
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13;
12-
#define BUILTIN_LED LED_BUILTIN // backward compatibility
13-
#define LED_BUILTIN LED_BUILTIN
14-
#define RGB_BUILTIN LED_BUILTIN
15-
#define RGBLED LED_BUILTIN
16-
#define RGB_BRIGHTNESS 64
17-
1810
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
1911
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
2012
#define digitalPinHasPWM(p) (p < 34)
2113

22-
static const uint8_t GPKEY = 0;
14+
static const uint8_t LED_BUILTIN = 13;
15+
#define BUILTIN_LED LED_BUILTIN
16+
#define LED_BUILTIN LED_BUILTIN
17+
#define RGB_BUILTIN LED_BUILTIN
18+
#define RGBLED LED_BUILTIN
19+
#define RGB_BRIGHTNESS 64
20+
21+
static const uint8_t GPKEY = 0;
2322
#define KEY_BUILTIN GPKEY
2423
#define BUILTIN_KEY GPKEY
24+
#define BOOT GPKEY
2525

2626
static const uint8_t TX = 1;
2727
static const uint8_t RX = 3;
28+
#define TX1 TX
29+
#define RX1 RX
2830

2931
static const uint8_t SDA = 4;
3032
static const uint8_t SCL = 15;
3133

32-
static const uint8_t SS = 21;
34+
static const uint8_t SS = 21;
3335
static const uint8_t MOSI = 5;
3436
static const uint8_t MISO = 18;
35-
static const uint8_t SCK = 19;
37+
static const uint8_t SCK = 19;
3638

3739
static const uint8_t A0 = 36;
3840
static const uint8_t A1 = 39;
39-
static const uint8_t A2 = 32;
40-
static const uint8_t A3 = 33;
41-
static const uint8_t A4 = 34;
42-
static const uint8_t A5 = 35;
41+
static const uint8_t A2 = 34;
42+
static const uint8_t A3 = 35;
43+
static const uint8_t A4 = 32;
44+
static const uint8_t A5 = 33;
4345

44-
static const uint8_t T0 = 34;
45-
static const uint8_t T1 = 35;
46+
static const uint8_t T0 = 32;
47+
static const uint8_t T1 = 33;
4648
static const uint8_t T2 = 27;
4749
static const uint8_t T3 = 14;
4850
static const uint8_t T4 = 12;
49-
static const uint8_t T5 = 13;
50-
51-
static const uint8_t D0 = 23;
52-
static const uint8_t D1 = 22;
53-
static const uint8_t D2 = 1;
54-
static const uint8_t D3 = 3;
55-
static const uint8_t D4 = 21;
56-
static const uint8_t D5 = 19;
57-
static const uint8_t D6 = 18;
58-
static const uint8_t D7 = 5;
59-
static const uint8_t D8 = 0;
60-
static const uint8_t D9 = 2;
51+
static const uint8_t T5 = 13;
52+
53+
static const uint8_t D0 = 23;
54+
static const uint8_t D1 = 22;
55+
static const uint8_t D2 = 1;
56+
static const uint8_t D3 = 3;
57+
static const uint8_t D4 = 21;
58+
static const uint8_t D5 = 19;
59+
static const uint8_t D6 = 18;
60+
static const uint8_t D7 = 5;
61+
static const uint8_t D8 = 0;
62+
static const uint8_t D9 = 2;
6163
static const uint8_t D10 = 4;
6264
static const uint8_t D11 = 15;
6365
static const uint8_t D12 = 13;

‎variants/deneyapkart1Av2/pins_arduino.h

Lines changed: 62 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define Pins_Arduino_h
33

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

76
#define USB_VID 0x303A
87
#define USB_PID 0x8147
@@ -14,60 +13,80 @@
1413
#define NUM_DIGITAL_PINS 48
1514
#define NUM_ANALOG_INPUTS 20
1615

17-
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
18-
#define BUILTIN_LED LED_BUILTIN // backward compatibility
19-
#define LED_BUILTIN LED_BUILTIN
20-
#define RGB_BUILTIN LED_BUILTIN
21-
#define RGBLED LED_BUILTIN
22-
#define RGB_BRIGHTNESS 64
23-
2416
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
2517
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2618
#define digitalPinHasPWM(p) (p < 46)
2719

28-
static const uint8_t GPKEY = 0;
20+
static const uint8_t LED_BUILTIN = 48;
21+
#define BUILTIN_LED LED_BUILTIN
22+
#define LED_BUILTIN LED_BUILTIN
23+
#define RGB_BUILTIN LED_BUILTIN
24+
#define RGBLED LED_BUILTIN
25+
#define RGB_BRIGHTNESS 64
26+
27+
static const uint8_t GPKEY = 0;
2928
#define KEY_BUILTIN GPKEY
3029
#define BUILTIN_KEY GPKEY
3130

32-
static const uint8_t TX = 43;
33-
static const uint8_t RX = 44;
31+
static const uint8_t TX = 43;
32+
static const uint8_t RX = 44;
33+
#define TX1 TX
34+
#define RX1 RX
3435

35-
static const uint8_t SDA = 47;
36-
static const uint8_t SCL = 21;
36+
static const uint8_t SDA = 47;
37+
static const uint8_t SCL = 21;
3738

3839
static const uint8_t SS = 42;
3940
static const uint8_t MOSI = 39;
4041
static const uint8_t MISO = 40;
4142
static const uint8_t SCK = 41;
4243

43-
static const uint8_t A0 = 4;
44-
static const uint8_t A1 = 5;
45-
static const uint8_t A2 = 6;
46-
static const uint8_t A3 = 7;
47-
static const uint8_t A4 = 15;
48-
static const uint8_t A5 = 16;
49-
static const uint8_t A6 = 17;
50-
static const uint8_t A7 = 18;
51-
52-
static const uint8_t D0 = 1;
53-
static const uint8_t D1 = 2;
54-
static const uint8_t D2 = 43;
55-
static const uint8_t D3 = 44;
56-
static const uint8_t D4 = 42;
57-
static const uint8_t D5 = 41;
58-
static const uint8_t D6 = 40;
59-
static const uint8_t D7 = 39;
60-
static const uint8_t D8 = 38;
61-
static const uint8_t D9 = 48;
62-
static const uint8_t D10 = 47;
63-
static const uint8_t D11 = 21;
64-
static const uint8_t D12 = 0;
65-
static const uint8_t D13 = 10;
66-
static const uint8_t D14 = 3;
67-
static const uint8_t D15 = 8;
68-
69-
static const uint8_t PWM0 = 1;
70-
static const uint8_t PWM1 = 2;
44+
static const uint8_t A0 = 4;
45+
static const uint8_t A1 = 5;
46+
static const uint8_t A2 = 6;
47+
static const uint8_t A3 = 7;
48+
static const uint8_t A4 = 15;
49+
static const uint8_t A5 = 16;
50+
static const uint8_t A6 = 17;
51+
static const uint8_t A7 = 18;
52+
static const uint8_t A8 = 9;
53+
54+
static const uint8_t T0 = 4;
55+
static const uint8_t T1 = 5;
56+
static const uint8_t T2 = 6;
57+
static const uint8_t T3 = 7;
58+
static const uint8_t T4 = 8;
59+
static const uint8_t T5 = 3;
60+
static const uint8_t T6 = 10;
61+
static const uint8_t T7 = 1;
62+
static const uint8_t T8 = 2;
63+
64+
static const uint8_t D0 = 1;
65+
static const uint8_t D1 = 2;
66+
static const uint8_t D2 = 43;
67+
static const uint8_t D3 = 44;
68+
static const uint8_t D4 = 42;
69+
static const uint8_t D5 = 41;
70+
static const uint8_t D6 = 40;
71+
static const uint8_t D7 = 39;
72+
static const uint8_t D8 = 38;
73+
static const uint8_t D9 = 48;
74+
static const uint8_t D10 = 47;
75+
static const uint8_t D11 = 21;
76+
static const uint8_t D12 = 10;
77+
static const uint8_t D13 = 3;
78+
static const uint8_t D14 = 8;
79+
static const uint8_t D15 = 0;
80+
static const uint8_t D16 = 13;
81+
static const uint8_t D17 = 12;
82+
static const uint8_t D18 = 11;
83+
static const uint8_t D19 = 14;
84+
85+
static const uint8_t PWM0 = 15;
86+
static const uint8_t PWM1 = 16;
87+
static const uint8_t PWM2 = 17;
88+
static const uint8_t PWM3 = 18;
89+
static const uint8_t PWM4 = 38;
7190

7291
static const uint8_t CAMSD = 4;
7392
static const uint8_t CAMSC = 5;
@@ -89,4 +108,6 @@ static const uint8_t SDMO = 12;
89108
static const uint8_t SDCS = 11;
90109
static const uint8_t SDCK = 13;
91110

111+
static const uint8_t BAT = 9;
112+
92113
#endif /* Pins_Arduino_h */

‎variants/deneyapkartg/pins_arduino.h

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define Pins_Arduino_h
33

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

76
#define USB_VID 0x303A
87
#define USB_PID 0x814A
@@ -14,31 +13,34 @@
1413
#define NUM_DIGITAL_PINS 22
1514
#define NUM_ANALOG_INPUTS 6
1615

17-
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+10;
18-
#define BUILTIN_LED LED_BUILTIN // backward compatibility
19-
#define LED_BUILTIN LED_BUILTIN
20-
#define RGB_BUILTIN LED_BUILTIN
21-
#define RGBLED LED_BUILTIN
22-
#define RGB_BRIGHTNESS 64
23-
2416
#define analogInputToDigitalPin(p) (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
2517
#define digitalPinToInterrupt(p) (((p)<NUM_DIGITAL_PINS)?(p):-1)
2618
#define digitalPinHasPWM(p) (p < EXTERNAL_NUM_INTERRUPTS)
2719

28-
static const uint8_t GPKEY = 9;
20+
static const uint8_t LED_BUILTIN = 10;
21+
#define BUILTIN_LED LED_BUILTIN
22+
#define LED_BUILTIN LED_BUILTIN
23+
#define RGB_BUILTIN LED_BUILTIN
24+
#define RGBLED LED_BUILTIN
25+
#define RGB_BRIGHTNESS 64
26+
27+
static const uint8_t GPKEY = 9;
2928
#define KEY_BUILTIN GPKEY
3029
#define BUILTIN_KEY GPKEY
30+
#define BT GPKEY
3131

3232
static const uint8_t TX = 21;
3333
static const uint8_t RX = 20;
34+
#define TX1 TX
35+
#define RX1 RX
3436

3537
static const uint8_t SDA = 8;
3638
static const uint8_t SCL = 2;
3739

38-
static const uint8_t SS = 7;
39-
static const uint8_t MOSI = 6;
40-
static const uint8_t MISO = 5;
41-
static const uint8_t SCK = 4;
40+
static const uint8_t SS = 7;
41+
static const uint8_t MOSI = 6;
42+
static const uint8_t MISO = 5;
43+
static const uint8_t SCK = 4;
4244

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

50-
static const uint8_t D0 = 21;
51-
static const uint8_t D1 = 20;
52+
static const uint8_t D0 = 20;
53+
static const uint8_t D1 = 21;
5254
static const uint8_t D2 = 9;
5355
static const uint8_t D3 = 10;
5456
static const uint8_t D4 = 8;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /