Skip to content

Commit df5b7d9

Browse files
me-no-devme-no-dev
committed
Merge branch 'master' into me-no-dev
2 parents 71bb5bb + 35e54f2 commit df5b7d9

File tree

7 files changed

+276
-16
lines changed

7 files changed

+276
-16
lines changed

‎README.md

+57-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ Not everything is working yet, you can not get it through package manager, but y
66

77
The framework can also be downloaded as component in an IDF project and be used like that.
88

9-
Things that "should" work:
9+
Things that work:
10+
1011
- pinMode
1112
- digitalRead/digitalWrite
1213
- attachInterrupt/detachInterrupt
14+
- analogRead/touchRead/touchAttachInterrupt
15+
- ledcWrite/sdWrite/dacWrite
1316
- Serial (global Serial is attached to pins 1 and 3 by default, there are another 2 serials that you can attach to any pin)
1417
- SPI (global SPI is attached to VSPI pins by default and HSPI can be attached to any pins)
1518
- Wire (global Wire is attached to pins 21 and 22 by default and there is another I2C bus that you can attach to any pins)
@@ -56,4 +59,57 @@ You can try WiFiClient but you need to disconnect the client yourself to be sure
5659
```
5760
- Restart Arduino IDE
5861

62+
#### Instructions for using as esp-idf component
63+
- Download and install [esp-idf](https://github.com/espressif/esp-idf)
64+
- Create blank idf project (from one of the examples)
65+
- in the project folder, create a folder called components and clone this repository inside
66+
67+
```bash
68+
mkdir -p components && \
69+
cd components && \
70+
git clone https://github.com/espressif/arduino-esp32.git arduino && \
71+
cd.. && \
72+
make menuconfig
73+
```
74+
- ```make menuconfig``` has some Arduino options
75+
- "Autostart Arduino setup and loop on boot"
76+
- If you enable this options, your main.cpp should be formated like any other sketch
77+
78+
```arduino
79+
//file: main.cpp
80+
#include "Arduino.h"
81+
82+
void setup(){
83+
Serial.begin(115200);
84+
}
85+
86+
void loop(){
87+
Serial.println("loop");
88+
delay(1000);
89+
}
90+
```
91+
- Else you need to implement ```app_main()``` and call ```initArduino();``` in it.
92+
93+
Keep in mind that setup() and loop() will not be called in this case
94+
95+
```arduino
96+
//file: main.cpp
97+
#include "Arduino.h"
98+
extern "C" void initArduino();
99+
100+
extern "C" void app_main()
101+
{
102+
initArduino();
103+
pinMode(4, OUPUT);
104+
digitalWrite(4, HIGH);
105+
//do your own thing
106+
}
107+
```
108+
- "Disable mutex locks for HAL"
109+
- If enabled, there will be no protection on the drivers from concurently accessing them from another thread/interrupt/core
110+
- "Autoconnect WiFi on boot"
111+
- If enabled, WiFi will start with the last known configuration
112+
- Else it will wait for WiFi.begin
113+
- ```make flash monitor``` will build, upload and open serial monitor to your board
114+
59115
![Pin Functions](doc/esp32_pinmap.png)

‎variants/esp32/pins_arduino.h

+36-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33

44
#define EXTERNAL_NUM_INTERRUPTS 16
55
#define NUM_DIGITAL_PINS 40
6-
#define NUM_ANALOG_INPUTS 18
6+
#define NUM_ANALOG_INPUTS 16
77

88
#define analogInputToDigitalPin(p)
99
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1010
#define digitalPinHasPWM(p) (p < 34)
1111

12+
static const uint8_t TX = 1;
13+
static const uint8_t RX = 3;
14+
1215
static const uint8_t SDA = 21;
1316
static const uint8_t SCL = 22;
1417

@@ -17,4 +20,35 @@ static const uint8_t MOSI = 23;
1720
static const uint8_t MISO = 19;
1821
static const uint8_t SCK = 18;
1922

20-
#endif /* Pins_Arduino_h */
23+
static const uint8_t A0 = 36;
24+
static const uint8_t A3 = 39;
25+
static const uint8_t A4 = 32;
26+
static const uint8_t A5 = 33;
27+
static const uint8_t A6 = 34;
28+
static const uint8_t A7 = 35;
29+
static const uint8_t A10 = 4;
30+
static const uint8_t A11 = 0;
31+
static const uint8_t A12 = 2;
32+
static const uint8_t A13 = 15;
33+
static const uint8_t A14 = 13;
34+
static const uint8_t A15 = 12;
35+
static const uint8_t A16 = 14;
36+
static const uint8_t A17 = 27;
37+
static const uint8_t A18 = 25;
38+
static const uint8_t A19 = 26;
39+
40+
static const uint8_t T0 = 4;
41+
static const uint8_t T1 = 0;
42+
static const uint8_t T2 = 2;
43+
static const uint8_t T3 = 15;
44+
static const uint8_t T4 = 13;
45+
static const uint8_t T5 = 12;
46+
static const uint8_t T6 = 14;
47+
static const uint8_t T7 = 27;
48+
static const uint8_t T8 = 33;
49+
static const uint8_t T9 = 32;
50+
51+
static const uint8_t DAC1 = 25;
52+
static const uint8_t DAC2 = 26;
53+
54+
#endif /* Pins_Arduino_h */

‎variants/espea32/pins_arduino.h

+36-2
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,54 @@
33

44
#define EXTERNAL_NUM_INTERRUPTS 16
55
#define NUM_DIGITAL_PINS 40
6-
#define NUM_ANALOG_INPUTS 18
6+
#define NUM_ANALOG_INPUTS 16
77

88
#define analogInputToDigitalPin(p)
99
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1010
#define digitalPinHasPWM(p) (p < 34)
1111

1212
#define LED_BUILTIN 5
1313

14+
static const uint8_t TX = 1;
15+
static const uint8_t RX = 3;
16+
1417
static const uint8_t SDA = 21;
1518
static const uint8_t SCL = 22;
1619

17-
static const uint8_t SS = 5;
20+
static const uint8_t SS = 2;
1821
static const uint8_t MOSI = 23;
1922
static const uint8_t MISO = 19;
2023
static const uint8_t SCK = 18;
2124

25+
static const uint8_t A0 = 36;
26+
static const uint8_t A3 = 39;
27+
static const uint8_t A4 = 32;
28+
static const uint8_t A5 = 33;
29+
static const uint8_t A6 = 34;
30+
static const uint8_t A7 = 35;
31+
static const uint8_t A10 = 4;
32+
static const uint8_t A11 = 0;
33+
static const uint8_t A12 = 2;
34+
static const uint8_t A13 = 15;
35+
static const uint8_t A14 = 13;
36+
static const uint8_t A15 = 12;
37+
static const uint8_t A16 = 14;
38+
static const uint8_t A17 = 27;
39+
static const uint8_t A18 = 25;
40+
static const uint8_t A19 = 26;
41+
42+
static const uint8_t T0 = 4;
43+
static const uint8_t T1 = 0;
44+
static const uint8_t T2 = 2;
45+
static const uint8_t T3 = 15;
46+
static const uint8_t T4 = 13;
47+
static const uint8_t T5 = 12;
48+
static const uint8_t T6 = 14;
49+
static const uint8_t T7 = 27;
50+
static const uint8_t T8 = 33;
51+
static const uint8_t T9 = 32;
52+
53+
static const uint8_t DAC1 = 25;
54+
static const uint8_t DAC2 = 26;
55+
2256
#endif /* Pins_Arduino_h */

‎variants/lolin32/pins_arduino.h

+37-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define EXTERNAL_NUM_INTERRUPTS 16
55
#define NUM_DIGITAL_PINS 40
6-
#define NUM_ANALOG_INPUTS 18
6+
#define NUM_ANALOG_INPUTS 16
77

88
#define analogInputToDigitalPin(p)
99
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
@@ -12,12 +12,46 @@
1212
#define LED_BUILTIN 2
1313
#define KEY_BUILTIN 0
1414

15+
static const uint8_t TX = 1;
16+
static const uint8_t RX = 3;
17+
1518
static const uint8_t SDA = 21;
1619
static const uint8_t SCL = 22;
1720

18-
static const uint8_t SS = 5;
21+
static const uint8_t SS = 2;
1922
static const uint8_t MOSI = 23;
2023
static const uint8_t MISO = 19;
2124
static const uint8_t SCK = 18;
2225

23-
#endif /* Pins_Arduino_h */
26+
static const uint8_t A0 = 36;
27+
static const uint8_t A3 = 39;
28+
static const uint8_t A4 = 32;
29+
static const uint8_t A5 = 33;
30+
static const uint8_t A6 = 34;
31+
static const uint8_t A7 = 35;
32+
static const uint8_t A10 = 4;
33+
static const uint8_t A11 = 0;
34+
static const uint8_t A12 = 2;
35+
static const uint8_t A13 = 15;
36+
static const uint8_t A14 = 13;
37+
static const uint8_t A15 = 12;
38+
static const uint8_t A16 = 14;
39+
static const uint8_t A17 = 27;
40+
static const uint8_t A18 = 25;
41+
static const uint8_t A19 = 26;
42+
43+
static const uint8_t T0 = 4;
44+
static const uint8_t T1 = 0;
45+
static const uint8_t T2 = 2;
46+
static const uint8_t T3 = 15;
47+
static const uint8_t T4 = 13;
48+
static const uint8_t T5 = 12;
49+
static const uint8_t T6 = 14;
50+
static const uint8_t T7 = 27;
51+
static const uint8_t T8 = 33;
52+
static const uint8_t T9 = 32;
53+
54+
static const uint8_t DAC1 = 25;
55+
static const uint8_t DAC2 = 26;
56+
57+
#endif /* Pins_Arduino_h */

‎variants/nano32/pins_arduino.h

+36-2
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,54 @@
33

44
#define EXTERNAL_NUM_INTERRUPTS 16
55
#define NUM_DIGITAL_PINS 38
6-
#define NUM_ANALOG_INPUTS 18
6+
#define NUM_ANALOG_INPUTS 16
77

88
#define analogInputToDigitalPin(p)
99
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1010
#define digitalPinHasPWM(p) (p < 34)
1111

1212
#define LED_BUILTIN 16
1313

14+
static const uint8_t TX = 1;
15+
static const uint8_t RX = 3;
16+
1417
static const uint8_t SDA = 21;
1518
static const uint8_t SCL = 22;
1619

17-
static const uint8_t SS = 5;
20+
static const uint8_t SS = 2;
1821
static const uint8_t MOSI = 23;
1922
static const uint8_t MISO = 19;
2023
static const uint8_t SCK = 18;
2124

25+
static const uint8_t A0 = 36;
26+
static const uint8_t A3 = 39;
27+
static const uint8_t A4 = 32;
28+
static const uint8_t A5 = 33;
29+
static const uint8_t A6 = 34;
30+
static const uint8_t A7 = 35;
31+
static const uint8_t A10 = 4;
32+
static const uint8_t A11 = 0;
33+
static const uint8_t A12 = 2;
34+
static const uint8_t A13 = 15;
35+
static const uint8_t A14 = 13;
36+
static const uint8_t A15 = 12;
37+
static const uint8_t A16 = 14;
38+
static const uint8_t A17 = 27;
39+
static const uint8_t A18 = 25;
40+
static const uint8_t A19 = 26;
41+
42+
static const uint8_t T0 = 4;
43+
static const uint8_t T1 = 0;
44+
static const uint8_t T2 = 2;
45+
static const uint8_t T3 = 15;
46+
static const uint8_t T4 = 13;
47+
static const uint8_t T5 = 12;
48+
static const uint8_t T6 = 14;
49+
static const uint8_t T7 = 27;
50+
static const uint8_t T8 = 33;
51+
static const uint8_t T9 = 32;
52+
53+
static const uint8_t DAC1 = 25;
54+
static const uint8_t DAC2 = 26;
55+
2256
#endif /* Pins_Arduino_h */

‎variants/node32s/pins_arduino.h

+36-2
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,52 @@
33

44
#define EXTERNAL_NUM_INTERRUPTS 16
55
#define NUM_DIGITAL_PINS 40
6-
#define NUM_ANALOG_INPUTS 18
6+
#define NUM_ANALOG_INPUTS 16
77

88
#define analogInputToDigitalPin(p)
99
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1010
#define digitalPinHasPWM(p) (p < 34)
1111

12+
static const uint8_t TX = 1;
13+
static const uint8_t RX = 3;
14+
1215
static const uint8_t SDA = 21;
1316
static const uint8_t SCL = 22;
1417

15-
static const uint8_t SS = 5;
18+
static const uint8_t SS = 2;
1619
static const uint8_t MOSI = 23;
1720
static const uint8_t MISO = 19;
1821
static const uint8_t SCK = 18;
1922

23+
static const uint8_t A0 = 36;
24+
static const uint8_t A3 = 39;
25+
static const uint8_t A4 = 32;
26+
static const uint8_t A5 = 33;
27+
static const uint8_t A6 = 34;
28+
static const uint8_t A7 = 35;
29+
static const uint8_t A10 = 4;
30+
static const uint8_t A11 = 0;
31+
static const uint8_t A12 = 2;
32+
static const uint8_t A13 = 15;
33+
static const uint8_t A14 = 13;
34+
static const uint8_t A15 = 12;
35+
static const uint8_t A16 = 14;
36+
static const uint8_t A17 = 27;
37+
static const uint8_t A18 = 25;
38+
static const uint8_t A19 = 26;
39+
40+
static const uint8_t T0 = 4;
41+
static const uint8_t T1 = 0;
42+
static const uint8_t T2 = 2;
43+
static const uint8_t T3 = 15;
44+
static const uint8_t T4 = 13;
45+
static const uint8_t T5 = 12;
46+
static const uint8_t T6 = 14;
47+
static const uint8_t T7 = 27;
48+
static const uint8_t T8 = 33;
49+
static const uint8_t T9 = 32;
50+
51+
static const uint8_t DAC1 = 25;
52+
static const uint8_t DAC2 = 26;
53+
2054
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)