GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-11 04:28:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:cjson归档

Browse Source
This commit is contained in:
Zip
2019-01-28 15:54:34 +08:00
parent 0dd80de2ae
commit c75316bc47
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TC1/TC1.mk
View File

@@ -25,7 +25,7 @@
NAME := App_TC1
$(NAME)_SOURCES := main.c\
cJSON.c\
cJSON/cJSON.c\
user_wifi.c\
user_key.c\
user_sntp.c\

0
TC1/cJSON.c → TC1/cJSON/cJSON.c
View File

0
TC1/cJSON.h → TC1/cJSON/cJSON.h
View File

8
TC1/user_function.c
View File

@@ -2,7 +2,7 @@
#include "main.h"
#include "user_key.h"
#include "cJSON.h"
#include "cJSON/cJSON.h"
typedef struct _user_json_context_t
{
@@ -28,9 +28,9 @@ void user_function_cmd_received( uint8_t *pusrdata )
cJSON *p_name = cJSON_GetObjectItem( pJsonRoot, "name" );
if (
(p_idx && cJSON_IsNumber( p_idx ) && p_idx->valueint == 2)
|| (p_description && cJSON_IsString( p_description ) && strcmp( p_description->valuestring, "123" ) == 0)
|| (p_name && cJSON_IsString( p_name ) && strcmp( p_name->valuestring, sys_config->micoSystemConfig.name ) == 0)
(p_idx && cJSON_IsNumber( p_idx ) && p_idx->valueint == 2) //idx
|| (p_description && cJSON_IsString( p_description ) && strcmp( p_description->valuestring, "123" ) == 0) //description mqttid
|| (p_name && cJSON_IsString( p_name ) && strcmp( p_name->valuestring, sys_config->micoSystemConfig.name ) == 0) //name
)
{
cJSON *p_nvalue = cJSON_GetObjectItem( pJsonRoot, "nvalue" );