Skip to content

Commit 4f7fb13

Browse files
authored
Merge branch 'master' into idf-master
2 parents a819990 + 5eda278 commit 4f7fb13

27 files changed

+2463
-920
lines changed

Diff for: CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ set(LIBRARY_SRCS
5555
libraries/FS/src/vfs_api.cpp
5656
libraries/HTTPClient/src/HTTPClient.cpp
5757
libraries/HTTPUpdate/src/HTTPUpdate.cpp
58-
libraries/LITTLEFS/src/LITTLEFS.cpp
58+
libraries/LittleFS/src/LittleFS.cpp
5959
libraries/NetBIOS/src/NetBIOS.cpp
6060
libraries/Preferences/src/Preferences.cpp
6161
libraries/RainMaker/src/RMaker.cpp
@@ -140,7 +140,7 @@ set(includedirs
140140
libraries/FS/src
141141
libraries/HTTPClient/src
142142
libraries/HTTPUpdate/src
143-
libraries/LITTLEFS/src
143+
libraries/LittleFS/src
144144
libraries/NetBIOS/src
145145
libraries/Preferences/src
146146
libraries/RainMaker/src

Diff for: cores/esp32/stdlib_noniso.c

+5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
#include <stdint.h>
2929
#include <math.h>
3030
#include "stdlib_noniso.h"
31+
#include "esp_system.h"
3132

33+
#if !CONFIG_DSP_ANSI && !CONFIG_DSP_OPTIMIZED
3234
void reverse(char* begin, char* end) {
3335
char *is = begin;
3436
char *ie = end - 1;
@@ -40,6 +42,9 @@ void reverse(char* begin, char* end) {
4042
--ie;
4143
}
4244
}
45+
#else
46+
void reverse(char* begin, char* end);
47+
#endif
4348

4449
char* ltoa(long value, char* result, int base) {
4550
if(base < 2 || base > 16) {

Diff for: libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino

-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//Disable Example for now
2-
#if 0
31
#include "esp_camera.h"
42
#include <WiFi.h>
53

@@ -112,7 +110,3 @@ void loop() {
112110
// put your main code here, to run repeatedly:
113111
delay(10000);
114112
}
115-
#else
116-
void setup(){}
117-
void loop(){}
118-
#endif

0 commit comments

Comments
 (0)