Skip to content

Commit c1c4f33

Browse files
committed
Merge branch 'bugfix/cjson_update_171' into 'master'
Update cJSON to v1.7.1 See merge request idf/esp-idf!1903
2 parents 475ffe7 + 11bf72a commit c1c4f33

File tree

9 files changed

+9
-4558
lines changed

9 files changed

+9
-4558
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@
3333
[submodule "components/spiffs/spiffs"]
3434
path = components/spiffs/spiffs
3535
url = https://github.com/pellepl/spiffs.git
36+
37+
[submodule "components/json/cJSON"]
38+
path = components/json/cJSON
39+
url = https://github.com/DaveGamble/cJSON.git

components/json/LICENSE

Lines changed: 0 additions & 20 deletions
This file was deleted.

components/json/cJSON

Submodule cJSON added at 7cc52f6

components/json/component.mk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#
22
# Component Makefile
33
#
4-
COMPONENT_ADD_INCLUDEDIRS := include port/include
5-
6-
COMPONENT_SRCDIRS := library port
7-
4+
COMPONENT_ADD_INCLUDEDIRS := cJSON
5+
COMPONENT_SRCDIRS := cJSON
6+
COMPONENT_SUBMODULES := cJSON

components/json/include/cJSON.h

Lines changed: 0 additions & 263 deletions
This file was deleted.

0 commit comments

Comments
 (0)