Skip to content

Commit 118c13b

Browse files
dok-netdok-net
committed
Merge remote-tracking branch 'origin/master' into ticker_api
2 parents 26155bb + 7d78247 commit 118c13b

File tree

14 files changed

+245
-24
lines changed

14 files changed

+245
-24
lines changed

‎CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -209,3 +209,8 @@ set(COMPONENT_REQUIRES spi_flash mbedtls mdns ethernet)
209209
set(COMPONENT_PRIV_REQUIRES fatfs nvs_flash app_update spiffs bootloader_support openssl bt)
210210

211211
register_component()
212+
213+
set_source_files_properties(libraries/AzureIoT/src/az_iot/iothub_client/src/iothubtransport_mqtt_common.c
214+
PROPERTIES COMPILE_FLAGS
215+
-Wno-maybe-uninitialized
216+
)

‎boards.txt

+115
Original file line numberDiff line numberDiff line change
@@ -1953,6 +1953,121 @@ esp32-poe.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
19531953

19541954
##############################################################
19551955

1956+
esp32-poe-iso.name=OLIMEX ESP32-PoE-ISO
1957+
1958+
esp32-poe-iso.upload.tool=esptool_py
1959+
esp32-poe-iso.upload.maximum_size=1310720
1960+
esp32-poe-iso.upload.maximum_data_size=327680
1961+
esp32-poe-iso.upload.wait_for_upload_port=true
1962+
1963+
esp32-poe-iso.serial.disableDTR=true
1964+
esp32-poe-iso.serial.disableRTS=true
1965+
1966+
esp32-poe-iso.build.mcu=esp32
1967+
esp32-poe-iso.build.core=esp32
1968+
esp32-poe-iso.build.variant=esp32-poe-iso
1969+
esp32-poe-iso.build.board=ESP32_POE_ISO
1970+
1971+
esp32-poe-iso.build.f_cpu=240000000L
1972+
esp32-poe-iso.build.flash_mode=dio
1973+
esp32-poe-iso.build.flash_size=4MB
1974+
esp32-poe-iso.build.boot=dio
1975+
esp32-poe-iso.build.partitions=default
1976+
esp32-poe-iso.build.defines=
1977+
1978+
esp32-poe-iso.menu.FlashFreq.80=80MHz
1979+
esp32-poe-iso.menu.FlashFreq.80.build.flash_freq=80m
1980+
esp32-poe-iso.menu.FlashFreq.40=40MHz
1981+
esp32-poe-iso.menu.FlashFreq.40.build.flash_freq=40m
1982+
1983+
1984+
esp32-poe-iso.menu.UploadSpeed.115200=115200
1985+
esp32-poe-iso.menu.UploadSpeed.115200.upload.speed=115200
1986+
1987+
esp32-poe-iso.menu.PartitionScheme.default=Default
1988+
esp32-poe-iso.menu.PartitionScheme.default.build.partitions=default
1989+
esp32-poe-iso.menu.PartitionScheme.no_ota=No OTA (Large APP)
1990+
esp32-poe-iso.menu.PartitionScheme.no_ota.build.partitions=no_ota
1991+
esp32-poe-iso.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
1992+
esp32-poe-iso.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
1993+
esp32-poe-iso.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
1994+
esp32-poe-iso.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
1995+
1996+
##############################################################
1997+
1998+
esp32-DevKitLipo.name=OLIMEX ESP32-DevKit-LiPo
1999+
2000+
esp32-DevKitLipo.upload.tool=esptool_py
2001+
esp32-DevKitLipo.upload.maximum_size=1310720
2002+
esp32-DevKitLipo.upload.maximum_data_size=327680
2003+
esp32-DevKitLipo.upload.wait_for_upload_port=true
2004+
2005+
esp32-DevKitLipo.serial.disableDTR=true
2006+
esp32-DevKitLipo.serial.disableRTS=true
2007+
2008+
esp32-DevKitLipo.build.mcu=esp32
2009+
esp32-DevKitLipo.build.core=esp32
2010+
esp32-DevKitLipo.build.variant=esp32-devkit-lipo
2011+
esp32-DevKitLipo.build.board=ESP32_DEVKIT_LIPO
2012+
2013+
esp32-DevKitLipo.build.f_cpu=240000000L
2014+
esp32-DevKitLipo.build.flash_size=4MB
2015+
esp32-DevKitLipo.build.flash_freq=40m
2016+
esp32-DevKitLipo.build.flash_mode=dio
2017+
esp32-DevKitLipo.build.boot=dio
2018+
esp32-DevKitLipo.build.partitions=default
2019+
esp32-DevKitLipo.build.defines=
2020+
2021+
esp32-DevKitLipo.menu.PartitionScheme.default=Default
2022+
esp32-DevKitLipo.menu.PartitionScheme.default.build.partitions=default
2023+
esp32-DevKitLipo.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
2024+
esp32-DevKitLipo.menu.PartitionScheme.minimal.build.partitions=minimal
2025+
esp32-DevKitLipo.menu.PartitionScheme.no_ota=No OTA (Large APP)
2026+
esp32-DevKitLipo.menu.PartitionScheme.no_ota.build.partitions=no_ota
2027+
esp32-DevKitLipo.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
2028+
esp32-DevKitLipo.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA)
2029+
esp32-DevKitLipo.menu.PartitionScheme.huge_app.build.partitions=huge_app
2030+
esp32-DevKitLipo.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
2031+
esp32-DevKitLipo.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
2032+
esp32-DevKitLipo.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
2033+
esp32-DevKitLipo.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
2034+
esp32-DevKitLipo.menu.PartitionScheme.fatflash=16M Fat
2035+
esp32-DevKitLipo.menu.PartitionScheme.fatflash.build.partitions=ffat
2036+
2037+
esp32-DevKitLipo.menu.FlashMode.qio=QIO
2038+
esp32-DevKitLipo.menu.FlashMode.qio.build.flash_mode=dio
2039+
esp32-DevKitLipo.menu.FlashMode.qio.build.boot=qio
2040+
esp32-DevKitLipo.menu.FlashMode.dio=DIO
2041+
esp32-DevKitLipo.menu.FlashMode.dio.build.flash_mode=dio
2042+
esp32-DevKitLipo.menu.FlashMode.dio.build.boot=dio
2043+
esp32-DevKitLipo.menu.FlashMode.qout=QOUT
2044+
esp32-DevKitLipo.menu.FlashMode.qout.build.flash_mode=dout
2045+
esp32-DevKitLipo.menu.FlashMode.qout.build.boot=qout
2046+
esp32-DevKitLipo.menu.FlashMode.dout=DOUT
2047+
esp32-DevKitLipo.menu.FlashMode.dout.build.flash_mode=dout
2048+
esp32-DevKitLipo.menu.FlashMode.dout.build.boot=dout
2049+
2050+
esp32-DevKitLipo.menu.FlashFreq.80=80MHz
2051+
esp32-DevKitLipo.menu.FlashFreq.80.build.flash_freq=80m
2052+
esp32-DevKitLipo.menu.FlashFreq.40=40MHz
2053+
esp32-DevKitLipo.menu.FlashFreq.40.build.flash_freq=40m
2054+
2055+
esp32-DevKitLipo.menu.UploadSpeed.921600=921600
2056+
esp32-DevKitLipo.menu.UploadSpeed.921600.upload.speed=921600
2057+
esp32-DevKitLipo.menu.UploadSpeed.115200=115200
2058+
esp32-DevKitLipo.menu.UploadSpeed.115200.upload.speed=115200
2059+
esp32-DevKitLipo.menu.UploadSpeed.256000.windows=256000
2060+
esp32-DevKitLipo.menu.UploadSpeed.256000.upload.speed=256000
2061+
esp32-DevKitLipo.menu.UploadSpeed.230400.windows.upload.speed=256000
2062+
esp32-DevKitLipo.menu.UploadSpeed.230400=230400
2063+
esp32-DevKitLipo.menu.UploadSpeed.230400.upload.speed=230400
2064+
esp32-DevKitLipo.menu.UploadSpeed.460800.linux=460800
2065+
esp32-DevKitLipo.menu.UploadSpeed.460800.macosx=460800
2066+
esp32-DevKitLipo.menu.UploadSpeed.460800.upload.speed=460800
2067+
esp32-DevKitLipo.menu.UploadSpeed.512000.windows=512000
2068+
esp32-DevKitLipo.menu.UploadSpeed.512000.upload.speed=512000
2069+
##############################################################
2070+
19562071
espino32.name=ThaiEasyElec's ESPino32
19572072

19582073
espino32.upload.tool=esptool_py

‎cores/esp32/WMath.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,12 @@ long random(long howsmall, long howbig)
6565
return random(diff) + howsmall;
6666
}
6767

68-
long map(long x, long in_min, long in_max, long out_min, long out_max)
69-
{
70-
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
68+
long map(long x, long in_min, long in_max, long out_min, long out_max) {
69+
long divisor = (in_max - in_min);
70+
if(divisor == 0){
71+
return -1; //AVR returns -1, SAM returns 0
72+
}
73+
return (x - in_min) * (out_max - out_min) / divisor + out_min;
7174
}
7275

7376
unsigned int makeWord(unsigned int w)

‎libraries/AsyncUDP/library.json

-17
This file was deleted.

‎libraries/BLE/src/BLECharacteristic.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,9 @@ void BLECharacteristic::setValue(uint8_t* data, size_t length) {
628628
log_e("Size %d too large, must be no bigger than %d", length, ESP_GATT_MAX_ATTR_LEN);
629629
return;
630630
}
631+
m_semaphoreSetValue.take();
631632
m_value.setValue(data, length);
633+
m_semaphoreSetValue.give();
632634
log_v("<< setValue");
633635
} // setValue
634636

‎libraries/BLE/src/BLECharacteristic.h

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ class BLECharacteristic {
117117
void setHandle(uint16_t handle);
118118
FreeRTOS::Semaphore m_semaphoreCreateEvt = FreeRTOS::Semaphore("CreateEvt");
119119
FreeRTOS::Semaphore m_semaphoreConfEvt = FreeRTOS::Semaphore("ConfEvt");
120+
FreeRTOS::Semaphore m_semaphoreSetValue = FreeRTOS::Semaphore("SetValue");
120121
}; // BLECharacteristic
121122

122123

‎libraries/BLE/src/BLERemoteCharacteristic.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ BLERemoteCharacteristic::BLERemoteCharacteristic(
3939
m_charProp = charProp;
4040
m_pRemoteService = pRemoteService;
4141
m_notifyCallback = nullptr;
42+
m_rawData = nullptr;
4243

4344
retrieveDescriptors(); // Get the descriptors for this characteristic
4445
log_v("<< BLERemoteCharacteristic");

‎libraries/HTTPClient/src/HTTPClient.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,8 @@ int HTTPClient::handleHeaderResponse()
10801080
return HTTPC_ERROR_NOT_CONNECTED;
10811081
}
10821082

1083+
_canReuse = !_useHTTP10;
1084+
10831085
String transferEncoding;
10841086
_returnCode = -1;
10851087
_size = -1;
@@ -1098,6 +1100,7 @@ int HTTPClient::handleHeaderResponse()
10981100

10991101
if(headerLine.startsWith("HTTP/1.")) {
11001102
_returnCode = headerLine.substring(9, headerLine.indexOf(' ', 9)).toInt();
1103+
_canReuse = (_returnCode != '0');
11011104
} else if(headerLine.indexOf(':')) {
11021105
String headerName = headerLine.substring(0, headerLine.indexOf(':'));
11031106
String headerValue = headerLine.substring(headerLine.indexOf(':') + 1);

‎libraries/HTTPClient/src/HTTPClient.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ class HTTPClient
217217
String _host;
218218
uint16_t _port = 0;
219219
int32_t _connectTimeout = -1;
220-
bool _reuse = false;
220+
bool _reuse = true;
221221
uint16_t _tcpTimeout = HTTPCLIENT_DEFAULT_TCP_TIMEOUT;
222222
bool _useHTTP10 = false;
223223
bool _secure = false;

‎variants/esp32-devkit-lipo/pins_arduino.h

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define EXTERNAL_NUM_INTERRUPTS 16
7+
#define NUM_DIGITAL_PINS 40
8+
#define NUM_ANALOG_INPUTS 16
9+
10+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
11+
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
12+
#define digitalPinHasPWM(p) (p < 34)
13+
14+
static const uint8_t TX = 1;
15+
static const uint8_t RX = 3;
16+
17+
#define TX1 33 // Ext1 pin 8
18+
#define RX1 25 // Ext1 pin 9
19+
20+
#define TX2 19 // Ext2 pin 8
21+
#define RX2 18 // Ext2 pin 9
22+
23+
static const uint8_t SDA = 21;
24+
static const uint8_t SCL = 22;
25+
26+
static const uint8_t SS = 5;
27+
static const uint8_t MOSI = 23;
28+
static const uint8_t MISO = 19;
29+
static const uint8_t SCK = 18;
30+
31+
static const uint8_t A0 = 36;
32+
static const uint8_t A3 = 39;
33+
static const uint8_t A4 = 32;
34+
static const uint8_t A5 = 33;
35+
static const uint8_t A6 = 34;
36+
static const uint8_t A7 = 35;
37+
static const uint8_t A10 = 4;
38+
static const uint8_t A11 = 0;
39+
static const uint8_t A12 = 2;
40+
static const uint8_t A13 = 15;
41+
static const uint8_t A14 = 13;
42+
static const uint8_t A15 = 12;
43+
static const uint8_t A16 = 14;
44+
static const uint8_t A17 = 27;
45+
static const uint8_t A18 = 25;
46+
static const uint8_t A19 = 26;
47+
48+
static const uint8_t T0 = 4;
49+
static const uint8_t T1 = 0;
50+
static const uint8_t T2 = 2;
51+
static const uint8_t T3 = 15;
52+
static const uint8_t T4 = 13;
53+
static const uint8_t T5 = 12;
54+
static const uint8_t T6 = 14;
55+
static const uint8_t T7 = 27;
56+
static const uint8_t T8 = 33;
57+
static const uint8_t T9 = 32;
58+
59+
static const uint8_t DAC1 = 25;
60+
static const uint8_t DAC2 = 26;
61+
62+
#endif /* Pins_Arduino_h */

‎variants/esp32-evb/pins_arduino.h

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ static const uint8_t KEY_BUILTIN = 34;
1717
static const uint8_t TX = 1;
1818
static const uint8_t RX = 3;
1919

20+
#define TX1 4
21+
#define RX1 36
22+
2023
static const uint8_t SDA = 13;
2124
static const uint8_t SCL = 16;
2225

‎variants/esp32-gateway/pins_arduino.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ static const uint8_t LED_BUILTIN = 33;
2121

2222
static const uint8_t KEY_BUILTIN = 34;
2323

24-
// See https://github.com/OLIMEX/ESP32-GATEWAY/blob/master/SOFTWARE/MOD-RTC/main/main.c for more info about IIC on the GATEWAY
25-
static const uint8_t SCL = 16; // This is pin 11
26-
static const uint8_t SDA = 17; // This is pin 12
24+
static const uint8_t SCL = 16; // This is extention pin 11
25+
static const uint8_t SDA = 32; // This is extention pin 13
2726

2827
static const uint8_t SS = 5;
2928
static const uint8_t MOSI = 23;

‎variants/esp32-poe-iso/pins_arduino.h

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define EXTERNAL_NUM_INTERRUPTS 16
7+
#define NUM_DIGITAL_PINS 40
8+
#define NUM_ANALOG_INPUTS 16
9+
10+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
11+
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
12+
#define digitalPinHasPWM(p) (p < 34)
13+
14+
#define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT
15+
#define ETH_PHY_POWER 12
16+
17+
static const uint8_t KEY_BUILTIN = 34;
18+
19+
static const uint8_t TX = 1;
20+
static const uint8_t RX = 3;
21+
22+
#define TX1 4
23+
#define RX1 36
24+
25+
#define TX2 33 // ext2 pin 5
26+
#define RX2 35 // ext2 pin 3
27+
28+
static const uint8_t SDA = 13;
29+
static const uint8_t SCL = 16;
30+
31+
static const uint8_t SS = 5;
32+
static const uint8_t MOSI = 2;
33+
static const uint8_t MISO = 15;
34+
static const uint8_t SCK = 14;
35+
36+
#define BOARD_HAS_1BIT_SDMMC
37+
38+
#endif /* Pins_Arduino_h */

‎variants/esp32-poe/pins_arduino.h

+6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ static const uint8_t KEY_BUILTIN = 34;
1919
static const uint8_t TX = 1;
2020
static const uint8_t RX = 3;
2121

22+
#define TX1 4
23+
#define RX1 36
24+
25+
#define TX2 33 // ext2 pin 5
26+
#define RX2 35 // ext2 pin 3
27+
2228
static const uint8_t SDA = 13;
2329
static const uint8_t SCL = 16;
2430

0 commit comments

Comments
 (0)