Skip to content

Commit 9c53d73

Browse files
ladyadaladyada
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: libraries/WiFi/src/WiFiScan.cpp
2 parents 27315db + d1b94df commit 9c53d73

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2688
-407
lines changed

Diff for: ‎boards.txt

+81
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,84 @@ nano32.menu.UploadSpeed.460800.macosx=460800
120120
nano32.menu.UploadSpeed.460800.upload.speed=460800
121121
nano32.menu.UploadSpeed.512000.windows=512000
122122
nano32.menu.UploadSpeed.512000.upload.speed=512000
123+
124+
##############################################################
125+
lolin32.name=WEMOS LoLin32
126+
127+
lolin32.upload.tool=esptool
128+
lolin32.upload.maximum_size=1044464
129+
lolin32.upload.maximum_data_size=294912
130+
lolin32.upload.wait_for_upload_port=true
131+
132+
lolin32.serial.disableDTR=true
133+
lolin32.serial.disableRTS=true
134+
135+
lolin32.build.mcu=esp32
136+
lolin32.build.core=esp32
137+
lolin32.build.variant=lolin32
138+
lolin32.build.board=LoLin32
139+
140+
lolin32.build.f_cpu=160000000L
141+
lolin32.build.flash_mode=dio
142+
lolin32.build.flash_size=4MB
143+
144+
lolin32.menu.FlashFreq.80=80MHz
145+
lolin32.menu.FlashFreq.80.build.flash_freq=80m
146+
lolin32.menu.FlashFreq.40=40MHz
147+
lolin32.menu.FlashFreq.40.build.flash_freq=40m
148+
149+
lolin32.menu.UploadSpeed.921600=921600
150+
lolin32.menu.UploadSpeed.921600.upload.speed=921600
151+
lolin32.menu.UploadSpeed.115200=115200
152+
lolin32.menu.UploadSpeed.115200.upload.speed=115200
153+
lolin32.menu.UploadSpeed.256000.windows=256000
154+
lolin32.menu.UploadSpeed.256000.upload.speed=256000
155+
lolin32.menu.UploadSpeed.230400.windows.upload.speed=256000
156+
lolin32.menu.UploadSpeed.230400=230400
157+
lolin32.menu.UploadSpeed.230400.upload.speed=230400
158+
lolin32.menu.UploadSpeed.460800.linux=460800
159+
lolin32.menu.UploadSpeed.460800.macosx=460800
160+
lolin32.menu.UploadSpeed.460800.upload.speed=460800
161+
lolin32.menu.UploadSpeed.512000.windows=512000
162+
lolin32.menu.UploadSpeed.512000.upload.speed=512000
163+
164+
##############################################################
165+
espea32.name=ESPea32
166+
167+
espea32.upload.tool=esptool
168+
espea32.upload.maximum_size=1044464
169+
espea32.upload.maximum_data_size=294912
170+
espea32.upload.wait_for_upload_port=true
171+
172+
espea32.serial.disableDTR=true
173+
espea32.serial.disableRTS=true
174+
175+
espea32.build.mcu=esp32
176+
espea32.build.core=esp32
177+
espea32.build.variant=espea32
178+
espea32.build.board=ESPea32
179+
180+
espea32.build.f_cpu=160000000L
181+
espea32.build.flash_mode=dio
182+
espea32.build.flash_size=4MB
183+
184+
espea32.menu.FlashFreq.80=80MHz
185+
espea32.menu.FlashFreq.80.build.flash_freq=80m
186+
espea32.menu.FlashFreq.40=40MHz
187+
espea32.menu.FlashFreq.40.build.flash_freq=40m
188+
189+
espea32.menu.UploadSpeed.921600=921600
190+
espea32.menu.UploadSpeed.921600.upload.speed=921600
191+
espea32.menu.UploadSpeed.115200=115200
192+
espea32.menu.UploadSpeed.115200.upload.speed=115200
193+
espea32.menu.UploadSpeed.256000.windows=256000
194+
espea32.menu.UploadSpeed.256000.upload.speed=256000
195+
espea32.menu.UploadSpeed.230400.windows.upload.speed=256000
196+
espea32.menu.UploadSpeed.230400=230400
197+
espea32.menu.UploadSpeed.230400.upload.speed=230400
198+
espea32.menu.UploadSpeed.460800.linux=460800
199+
espea32.menu.UploadSpeed.460800.macosx=460800
200+
espea32.menu.UploadSpeed.460800.upload.speed=460800
201+
espea32.menu.UploadSpeed.512000.windows=512000
202+
espea32.menu.UploadSpeed.512000.upload.speed=512000
203+

Diff for: ‎cores/esp32/Arduino.h

+102-9
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
extern "C" {
2525
#endif
2626

27-
#include "freertos/FreeRTOS.h"
28-
#include "freertos/task.h"
29-
#include "freertos/semphr.h"
30-
#include "esp32-hal.h"
31-
#include "pins_arduino.h"
32-
3327
#include <stdbool.h>
3428
#include <stdint.h>
3529
#include <stdarg.h>
@@ -41,14 +35,94 @@ extern "C" {
4135
#include <math.h>
4236
#include "stdlib_noniso.h"
4337

44-
typedef bool boolean;
45-
typedef uint8_t byte;
38+
#include "freertos/FreeRTOS.h"
39+
#include "freertos/task.h"
40+
#include "freertos/semphr.h"
41+
#include "esp32-hal.h"
42+
#include "soc/gpio_reg.h"
4643

44+
#include "stdlib_noniso.h"
4745
#include "binary.h"
4846

47+
#define PI 3.1415926535897932384626433832795
48+
#define HALF_PI 1.5707963267948966192313216916398
49+
#define TWO_PI 6.283185307179586476925286766559
50+
#define DEG_TO_RAD 0.017453292519943295769236907684886
51+
#define RAD_TO_DEG 57.295779513082320876798154814105
52+
#define EULER 2.718281828459045235360287471352
53+
54+
#define SERIAL 0x0
55+
#define DISPLAY 0x1
56+
57+
#define LSBFIRST 0
58+
#define MSBFIRST 1
59+
60+
//Interrupt Modes
61+
#define RISING 0x01
62+
#define FALLING 0x02
63+
#define CHANGE 0x03
64+
#define ONLOW 0x04
65+
#define ONHIGH 0x05
66+
#define ONLOW_WE 0x0C
67+
#define ONHIGH_WE 0x0D
68+
69+
#define DEFAULT 1
70+
#define EXTERNAL 0
71+
72+
#ifndef __STRINGIFY
73+
#define __STRINGIFY(a) #a
74+
#endif
75+
76+
// undefine stdlib's abs if encountered
77+
#ifdef abs
78+
#undef abs
79+
#endif
80+
81+
#define abs(x) ((x)>0?(x):-(x))
82+
#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
83+
#define round(x) ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
84+
#define radians(deg) ((deg)*DEG_TO_RAD)
85+
#define degrees(rad) ((rad)*RAD_TO_DEG)
86+
#define sq(x) ((x)*(x))
87+
88+
#define sei()
89+
#define cli()
90+
#define interrupts() sei()
91+
#define noInterrupts() cli()
92+
93+
#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
94+
#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
95+
#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
96+
97+
#define lowByte(w) ((uint8_t) ((w) & 0xff))
98+
#define highByte(w) ((uint8_t) ((w) >> 8))
99+
100+
#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
101+
#define bitSet(value, bit) ((value) |= (1UL << (bit)))
102+
#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
103+
#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
104+
105+
#define bit(b) (1UL << (b))
106+
#define _BV(b) (1UL << (b))
107+
108+
#define digitalPinToPort(pin) (((pin)>31)?1:0)
109+
#define digitalPinToBitMask(pin) (1UL << (pin))
110+
#define digitalPinToTimer(pin) (0)
111+
#define portOutputRegister(port) ((volatile uint32_t*)((port)?GPIO_OUT1_REG:GPIO_OUT_REG))
112+
#define portInputRegister(port) ((volatile uint32_t*)((port)?GPIO_IN1_REG:GPIO_IN_REG))
113+
#define portModeRegister(port) ((volatile uint32_t*)((port)?GPIO_ENABLE1_REG:GPIO_ENABLE_REG))
114+
115+
#define NOT_A_PIN -1
116+
#define NOT_A_PORT -1
117+
#define NOT_AN_INTERRUPT -1
118+
#define NOT_ON_TIMER 0
119+
120+
typedef bool boolean;
121+
typedef uint8_t byte;
122+
typedef unsigned int word;
123+
49124
#ifdef __cplusplus
50125
}
51-
#endif
52126

53127

54128
#ifndef _GLIBCXX_VECTOR
@@ -69,4 +143,23 @@ typedef uint8_t byte;
69143
#include "HardwareSerial.h"
70144
#include "Esp.h"
71145

146+
#endif /* __cplusplus */
147+
148+
#ifndef _GLIBCXX_VECTOR
149+
// arduino is not compatible with std::vector
150+
#define min(a,b) ((a)<(b)?(a):(b))
151+
#define max(a,b) ((a)>(b)?(a):(b))
152+
#endif
153+
154+
#define _min(a,b) ((a)<(b)?(a):(b))
155+
#define _max(a,b) ((a)>(b)?(a):(b))
156+
157+
// WMath prototypes
158+
long random(long);
159+
long random(long, long);
160+
void randomSeed(unsigned long);
161+
long map(long, long, long, long, long);
162+
163+
#include "pins_arduino.h"
164+
72165
#endif /* _ESP32_CORE_ARDUINO_H_ */

0 commit comments

Comments
 (0)