jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into idf-release/v3.3

Browse Source
This commit is contained in:
Me No Dev 2020-11-12 21:29:57 +02:00 committed by GitHub
commit a8e99baeab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp32/Arduino.h
View File

@ -88,7 +88,7 @@
#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
#define bitSet(value, bit) ((value) |= (1UL << (bit)))
#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
#define bitWrite(value, bit, bitvalue) ((bitvalue) ? bitSet(value, bit) : bitClear(value, bit))
// avr-libc defines _NOP() since 1.6.2
#ifndef _NOP

2
cores/esp32/pgmspace.h
View File

@ -53,6 +53,8 @@ typedef unsigned long prog_uint32_t;
*(void * const *)(_addr); \
})
#define pgm_get_far_address(x) ((uint32_t)(&(x)))
#define pgm_read_byte_near(addr) pgm_read_byte(addr)
#define pgm_read_word_near(addr) pgm_read_word(addr)
#define pgm_read_dword_near(addr) pgm_read_dword(addr)

1
libraries/BLE/src/BLEHIDDevice.cpp
View File

@ -194,6 +194,7 @@ BLECharacteristic* BLEHIDDevice::protocolMode() {
void BLEHIDDevice::setBatteryLevel(uint8_t level) {
m_batteryLevelCharacteristic->setValue(&level, 1);
m_batteryLevelCharacteristic->notify();
}
/*
* @brief Returns battery level characteristic

3
libraries/SD/src/sd_diskio.cpp
View File

@ -607,8 +607,9 @@ DRESULT ff_sd_write(uint8_t pdrv, const uint8_t* buffer, DWORD sector, UINT coun
if (count > 1) {
res = sdWriteSectors(pdrv, (const char*)buffer, sector, count) ? RES_OK : RES_ERROR;
} else {
res = sdWriteSector(pdrv, (const char*)buffer, sector) ? RES_OK : RES_ERROR;
}
res = sdWriteSector(pdrv, (const char*)buffer, sector) ? RES_OK : RES_ERROR;
return res;
}

5
libraries/WiFi/src/WiFiProv.cpp
View File

@ -33,9 +33,10 @@
#undef IPADDR_NONE
#include "WiFi.h"
wifi_prov_mgr_config_t config;
scheme_t prov_scheme;
extern esp_err_t postToSysQueue(system_prov_event_t *);
static wifi_prov_mgr_config_t config;
static scheme_t prov_scheme;
static const uint8_t custom_service_uuid[16] = { 0xb4, 0xdf, 0x5a, 0x1c, 0x3f, 0x6b, 0xf4, 0xbf,
0xea, 0x4a, 0x82, 0x03, 0x04, 0x90, 0x1a, 0x02, };

1
variants/Microduino-esp32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = -1;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
#define MTDO 15
#define MTDI 12

1
variants/S_ODI_Ultra_v1/pins_arduino.h
View File

@ -14,6 +14,7 @@
static const uint8_t LED_BUILTIN = 2;
static const uint8_t LED_BUILTINB = 4;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
#define BUILTIN_LED2 LED_BUILTINB
static const uint8_t TX = 1;

1
variants/alksesp32/pins_arduino.h
View File

@ -15,6 +15,7 @@
static const uint8_t LED_BUILTIN = 23;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/d1_mini32/pins_arduino.h
View File

@ -6,6 +6,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t _VBAT = 35; // battery voltage
#define PIN_WIRE_SDA SDA // backward compatibility

1
variants/d32/pins_arduino.h
View File

@ -6,6 +6,7 @@
static const uint8_t LED_BUILTIN = 5;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t _VBAT = 35; // battery voltage
#endif /* Pins_Arduino_h */

1
variants/d32_pro/pins_arduino.h
View File

@ -6,6 +6,7 @@
static const uint8_t LED_BUILTIN = 5;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t _VBAT = 35; // battery voltage

1
variants/doitESP32devkitV1/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/esp32-gateway/pins_arduino.h
View File

@ -18,6 +18,7 @@
static const uint8_t LED_BUILTIN = 33;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 34;

1
variants/esp320/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 5;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/esp32thing/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 5;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/esp32thing_plus/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 13;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 17;
static const uint8_t RX = 16;

1
variants/espea32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 5;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/espectro32/pins_arduino.h
View File

@ -17,6 +17,7 @@
static const uint8_t LED_BUILTIN = 15;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/espino32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 16;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t BUILTIN_KEY = 0;

1
variants/feather_esp32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 13;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 17;
static const uint8_t RX = 16;

1
variants/firebeetle32/pins_arduino.h
View File

@ -15,6 +15,7 @@ typedef unsigned char uint8_t;
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN

1
variants/gpy/pins_arduino.h
View File

@ -24,6 +24,7 @@
static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
#define ANT_SELECT 21 // GPIO21 - WiFi external / internal antenna switch

1
variants/healthypi4/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 15;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 17;

1
variants/heltec_wifi_kit_32/pins_arduino.h
View File

@ -17,6 +17,7 @@
static const uint8_t LED_BUILTIN = 25;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/heltec_wifi_lora_32/pins_arduino.h
View File

@ -17,6 +17,7 @@
static const uint8_t LED_BUILTIN = 25;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/heltec_wifi_lora_32_V2/pins_arduino.h
View File

@ -17,6 +17,7 @@
static const uint8_t LED_BUILTIN = 25;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/heltec_wireless_stick/pins_arduino.h
View File

@ -17,6 +17,7 @@
static const uint8_t LED_BUILTIN = 25;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/honeylemon/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t BUILTIN_KEY = 0;

1
variants/hornbill32dev/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 13;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/imbrios-logsens-v1p1/pins_arduino.h
View File

@ -23,6 +23,7 @@
/* LED_BUILTIN is kept for compatibility reason; mapped to LED2 on the LogSens V1.1 Board */
static const uint8_t LED_BUILTIN = 33;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
/* UART0: Serial Port for Programming and Debugging on the LogSens V1.1 Board */
static const uint8_t TX = 1;

1
variants/intorobot-fig/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 4;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t RGB_R_BUILTIN = 27;
static const uint8_t RGB_G_BUILTIN = 21;

1
variants/lolin32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 5;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN

1
variants/lopy/pins_arduino.h
View File

@ -24,6 +24,7 @@
static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
#define ANT_SELECT 16 // GPIO16 - External Antenna Switch

1
variants/lopy4/pins_arduino.h
View File

@ -24,6 +24,7 @@
static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
#define ANT_SELECT 21 // GPIO21 - External Antenna Switch

1
variants/metro_esp-32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/mgbot-iotik32a/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 4;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/mgbot-iotik32b/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 18;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
// IR receiver
static const uint8_t IR = 27;

1
variants/mhetesp32devkit/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/mhetesp32minikit/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/nano32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 16;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t BUILTIN_KEY = 0;

1
variants/node32s/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/nodemcu-32s/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/odroid_esp32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/onehorse32dev/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 5;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/openkb/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 16;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/oroca_edubot/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 13;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 17;
static const uint8_t RX = 16;

1
variants/piranha_esp-32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/pocket_32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 16;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN

1
variants/tbeam/pins_arduino.h
View File

@ -26,6 +26,7 @@ static const uint8_t KEY_BUILTIN = 39;
static const uint8_t LED_BUILTIN = 14;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/ttgo-lora32-v1/pins_arduino.h
View File

@ -26,6 +26,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/ttgo-lora32-v2/pins_arduino.h
View File

@ -32,6 +32,7 @@
static const uint8_t LED_BUILTIN = 22;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/ttgo-lora32-v21new/pins_arduino.h
View File

@ -40,6 +40,7 @@
static const uint8_t LED_BUILTIN = 25 ;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/ttgo-t1/pins_arduino.h
View File

@ -16,6 +16,7 @@ static const uint8_t RX = 3;
static const uint8_t LED_BUILTIN = 22;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t SDA = 21;
// Despite the many diagrams from TTGO showing SCL on pin 22, due to the on-board LED

1
variants/turta_iot_node/pins_arduino.h
View File

@ -14,6 +14,7 @@
// LED
static const uint8_t LED_BUILTIN = 13;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
// UART
static const uint8_t TX = 10;

1
variants/vintlabsdevkitv1/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;

1
variants/widora-air/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 25;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/wifiduino32/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 2;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t KEY_BUILTIN = 0;

1
variants/wipy3/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 0; // ->2812 RGB !!!
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
#define ANT_SELECT 21 // GPIO21 - External Antenna Switch

1
variants/xinabox/pins_arduino.h
View File

@ -13,6 +13,7 @@
static const uint8_t LED_BUILTIN = 27;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN
static const uint8_t TX = 1;
static const uint8_t RX = 3;