Skip to content

Commit 7b6243a

Browse files
committed
Merge branch 'develop'
* develop: Sync-up with iot-core 1.5.5 Sync-up with iot-core 1.5.4 (#502) Sync-up with iot-core 1.5.4 caps_sample:update sample file in apps cpas_sample:update caps sample to include "external/JSON.h" patch: remove patch for emw3xxx config modify style of READEME.md of ota_demo update ota_demo sdkconfig for esp32 v4.x update ota_demo app to apply new code for OTA_DEMO Add light_example for rtl8720c and update README.md Add CONFIG_STDK_IOT_CORE_EASYSETUP_HTTP_USE_SOCKET_API configuration Add emw3080 light & swtich example Readme documents Fix change_switch_state issue Update README for rtl8195 Switch example |Conflicts: | iot-core : Sync with latest iot-core
2 parents 679a1bf + ccffaac commit 7b6243a

File tree

72 files changed

+4744
-1515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4744
-1515
lines changed

apps/capability_sample/caps_button.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_button.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

apps/capability_sample/caps_colorControl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_colorControl.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

apps/capability_sample/caps_dishwasherOperatingState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_dishwasherOperatingState.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

apps/capability_sample/caps_dryerOperatingState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_dryerOperatingState.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

apps/capability_sample/caps_execute.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_execute.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

apps/capability_sample/caps_gasMeter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_gasMeter.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

apps/capability_sample/caps_mediaInputSource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_mediaInputSource.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

apps/capability_sample/caps_mediaPlayback.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_mediaPlayback.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

apps/capability_sample/caps_objectDetection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_objectDetection.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

apps/capability_sample/caps_ovenOperatingState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
****************************************************************************/
1818

1919
#include "caps/iot_caps_helper_ovenOperatingState.h"
20-
#include "JSON.h"
20+
#include "external/JSON.h"
2121

2222
#ifdef __cplusplus
2323
extern "C" {

0 commit comments

Comments
 (0)