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

me-no-dev · web-flow · commit a8e99baeab17 · 2020-11-12T21:29:57.000+02:00
diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h
@@ -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
diff --git a/cores/esp32/pgmspace.h b/cores/esp32/pgmspace.h
@@ -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)
diff --git a/libraries/BLE/src/BLEHIDDevice.cpp b/libraries/BLE/src/BLEHIDDevice.cpp
@@ -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
diff --git a/libraries/SD/src/sd_diskio.cpp b/libraries/SD/src/sd_diskio.cpp
@@ -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;
 }
 
diff --git a/libraries/WiFi/src/WiFiProv.cpp b/libraries/WiFi/src/WiFiProv.cpp
@@ -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, };
 
diff --git a/variants/Microduino-esp32/pins_arduino.h b/variants/Microduino-esp32/pins_arduino.h
@@ -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
diff --git a/variants/S_ODI_Ultra_v1/pins_arduino.h b/variants/S_ODI_Ultra_v1/pins_arduino.h
@@ -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;
diff --git a/variants/alksesp32/pins_arduino.h b/variants/alksesp32/pins_arduino.h
@@ -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;
diff --git a/variants/d1_mini32/pins_arduino.h b/variants/d1_mini32/pins_arduino.h
@@ -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
diff --git a/variants/d32/pins_arduino.h b/variants/d32/pins_arduino.h
@@ -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 */
diff --git a/variants/d32_pro/pins_arduino.h b/variants/d32_pro/pins_arduino.h
@@ -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
 
 
diff --git a/variants/doitESP32devkitV1/pins_arduino.h b/variants/doitESP32devkitV1/pins_arduino.h
@@ -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;
diff --git a/variants/esp32-gateway/pins_arduino.h b/variants/esp32-gateway/pins_arduino.h
@@ -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;
 
diff --git a/variants/esp320/pins_arduino.h b/variants/esp320/pins_arduino.h
@@ -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;
diff --git a/variants/esp32thing/pins_arduino.h b/variants/esp32thing/pins_arduino.h
@@ -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;
 
diff --git a/variants/esp32thing_plus/pins_arduino.h b/variants/esp32thing_plus/pins_arduino.h
@@ -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;
diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h
@@ -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;
 
diff --git a/variants/espectro32/pins_arduino.h b/variants/espectro32/pins_arduino.h
@@ -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;
diff --git a/variants/espino32/pins_arduino.h b/variants/espino32/pins_arduino.h
@@ -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;
 
diff --git a/variants/feather_esp32/pins_arduino.h b/variants/feather_esp32/pins_arduino.h
@@ -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;
diff --git a/variants/firebeetle32/pins_arduino.h b/variants/firebeetle32/pins_arduino.h
@@ -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
 
 
 
diff --git a/variants/gpy/pins_arduino.h b/variants/gpy/pins_arduino.h
@@ -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
 
diff --git a/variants/healthypi4/pins_arduino.h b/variants/healthypi4/pins_arduino.h
@@ -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;
 
diff --git a/variants/heltec_wifi_kit_32/pins_arduino.h b/variants/heltec_wifi_kit_32/pins_arduino.h
@@ -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;
 
diff --git a/variants/heltec_wifi_lora_32/pins_arduino.h b/variants/heltec_wifi_lora_32/pins_arduino.h
@@ -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;
 
diff --git a/variants/heltec_wifi_lora_32_V2/pins_arduino.h b/variants/heltec_wifi_lora_32_V2/pins_arduino.h
@@ -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;
 
diff --git a/variants/heltec_wireless_stick/pins_arduino.h b/variants/heltec_wireless_stick/pins_arduino.h
@@ -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;
 
diff --git a/variants/honeylemon/pins_arduino.h b/variants/honeylemon/pins_arduino.h
@@ -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;
 
diff --git a/variants/hornbill32dev/pins_arduino.h b/variants/hornbill32dev/pins_arduino.h
@@ -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;
 
diff --git a/variants/imbrios-logsens-v1p1/pins_arduino.h b/variants/imbrios-logsens-v1p1/pins_arduino.h
@@ -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;
diff --git a/variants/intorobot-fig/pins_arduino.h b/variants/intorobot-fig/pins_arduino.h
@@ -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;
diff --git a/variants/lolin32/pins_arduino.h b/variants/lolin32/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 5;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 
 
 
diff --git a/variants/lopy/pins_arduino.h b/variants/lopy/pins_arduino.h
@@ -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
 
diff --git a/variants/lopy4/pins_arduino.h b/variants/lopy4/pins_arduino.h
@@ -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
 
diff --git a/variants/metro_esp-32/pins_arduino.h b/variants/metro_esp-32/pins_arduino.h
@@ -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;
 
diff --git a/variants/mgbot-iotik32a/pins_arduino.h b/variants/mgbot-iotik32a/pins_arduino.h
@@ -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;
diff --git a/variants/mgbot-iotik32b/pins_arduino.h b/variants/mgbot-iotik32b/pins_arduino.h
@@ -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;
diff --git a/variants/mhetesp32devkit/pins_arduino.h b/variants/mhetesp32devkit/pins_arduino.h
@@ -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;
diff --git a/variants/mhetesp32minikit/pins_arduino.h b/variants/mhetesp32minikit/pins_arduino.h
@@ -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;
diff --git a/variants/nano32/pins_arduino.h b/variants/nano32/pins_arduino.h
@@ -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;
 
diff --git a/variants/node32s/pins_arduino.h b/variants/node32s/pins_arduino.h
@@ -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;
 
diff --git a/variants/nodemcu-32s/pins_arduino.h b/variants/nodemcu-32s/pins_arduino.h
@@ -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;
 
diff --git a/variants/odroid_esp32/pins_arduino.h b/variants/odroid_esp32/pins_arduino.h
@@ -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;
diff --git a/variants/onehorse32dev/pins_arduino.h b/variants/onehorse32dev/pins_arduino.h
@@ -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;
 
diff --git a/variants/openkb/pins_arduino.h b/variants/openkb/pins_arduino.h
@@ -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;
diff --git a/variants/oroca_edubot/pins_arduino.h b/variants/oroca_edubot/pins_arduino.h
@@ -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;
diff --git a/variants/piranha_esp-32/pins_arduino.h b/variants/piranha_esp-32/pins_arduino.h
@@ -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;
 
diff --git a/variants/pocket_32/pins_arduino.h b/variants/pocket_32/pins_arduino.h
@@ -13,6 +13,7 @@
 
 static const uint8_t LED_BUILTIN = 16;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
 
 
 
diff --git a/variants/tbeam/pins_arduino.h b/variants/tbeam/pins_arduino.h
diff --git a/variants/ttgo-lora32-v1/pins_arduino.h b/variants/ttgo-lora32-v1/pins_arduino.h
diff --git a/variants/ttgo-lora32-v2/pins_arduino.h b/variants/ttgo-lora32-v2/pins_arduino.h
diff --git a/variants/ttgo-lora32-v21new/pins_arduino.h b/variants/ttgo-lora32-v21new/pins_arduino.h
diff --git a/variants/ttgo-t1/pins_arduino.h b/variants/ttgo-t1/pins_arduino.h
diff --git a/variants/turta_iot_node/pins_arduino.h b/variants/turta_iot_node/pins_arduino.h
diff --git a/variants/vintlabsdevkitv1/pins_arduino.h b/variants/vintlabsdevkitv1/pins_arduino.h
diff --git a/variants/widora-air/pins_arduino.h b/variants/widora-air/pins_arduino.h
diff --git a/variants/wifiduino32/pins_arduino.h b/variants/wifiduino32/pins_arduino.h
diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h
diff --git a/variants/xinabox/pins_arduino.h b/variants/xinabox/pins_arduino.h

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ BLECharacteristic* BLEHIDDevice::protocolMode() {`
`194`	`194`
`195`	`195`	`void BLEHIDDevice::setBatteryLevel(uint8_t level) {`
`196`	`196`	`m_batteryLevelCharacteristic->setValue(&level, 1);`
	`197`	`+ m_batteryLevelCharacteristic->notify();`
`197`	`198`	`}`
`198`	`199`	`/*`
`199`	`200`	`* @brief Returns battery level characteristic`
Original file line number	Diff line number	Diff line change
`@@ -607,8 +607,9 @@ DRESULT ff_sd_write(uint8_t pdrv, const uint8_t* buffer, DWORD sector, UINT coun`
`607`	`607`
`608`	`608`	`if (count > 1) {`
`609`	`609`	`res = sdWriteSectors(pdrv, (const char*)buffer, sector, count) ? RES_OK : RES_ERROR;`
	`610`	`+ } else {`
	`611`	`+ res = sdWriteSector(pdrv, (const char*)buffer, sector) ? RES_OK : RES_ERROR;`
`610`	`612`	`}`
`611`		`- res = sdWriteSector(pdrv, (const char*)buffer, sector) ? RES_OK : RES_ERROR;`
`612`	`613`	`return res;`
`613`	`614`	`}`
`614`	`615`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ typedef unsigned char uint8_t;`
`15`	`15`
`16`	`16`	`static const uint8_t LED_BUILTIN = 2;`
`17`	`17`	`#define BUILTIN_LED LED_BUILTIN // backward compatibility`
	`18`	`+#define LED_BUILTIN LED_BUILTIN`
`18`	`19`
`19`	`20`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`static const uint8_t LED_BUILTIN = 5;`
`15`	`15`	`#define BUILTIN_LED LED_BUILTIN // backward compatibility`
	`16`	`+#define LED_BUILTIN LED_BUILTIN`
`16`	`17`
`17`	`18`
`18`	`19`