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:优化log信息

Browse Source
This commit is contained in:
Zip
2019-01-29 13:50:20 +08:00
parent 96c3cf245b
commit 8b3cb142d8
2 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
TC1/main.c
View File

@@ -51,20 +51,6 @@ int application_start( void )
err = mico_system_init( sys_config );
require_noerr( err, exit );
os_log( "idx:%d",user_config->idx );
for ( i = 0; i < PLUG_NUM; i++ )
{
os_log("plug_%d:",i);
os_log("\tname:%s:",user_config->plug[i].name);
os_log("\tidx:%d:",user_config->plug[i].idx);
for ( j = 0; j < PLUG_TIME_TASK_NUM; j++ )
{
os_log("\t\ton:%d\t %02d:%02d repeat:0x%X",user_config->plug[i].task[j].on,
user_config->plug[i].task[j].hour,user_config->plug[i].task[j].minute,
user_config->plug[i].task[j].repeat);
}
}
for ( i = 0; i < Relay_NUM; i++ )
{
MicoGpioInitialize( Relay[i], OUTPUT_PUSH_PULL );
@@ -87,6 +73,21 @@ int application_start( void )
err = mico_system_context_restore( sys_config );
require_noerr( err, exit );
}
os_log( "idx:%d",user_config->idx );
for ( i = 0; i < PLUG_NUM; i++ )
{
os_log("plug_%d:",i);
os_log("\tname:%s:",user_config->plug[i].name);
os_log("\tidx:%d:",user_config->plug[i].idx);
for ( j = 0; j < PLUG_TIME_TASK_NUM; j++ )
{
os_log("\t\ton:%d\t %02d:%02d repeat:0x%X",user_config->plug[i].task[j].on,
user_config->plug[i].task[j].hour,user_config->plug[i].task[j].minute,
user_config->plug[i].task[j].repeat);
}
}
wifi_init( );
key_init( );

39
TC1/user_function.c
View File

@@ -1,4 +1,4 @@
#define os_log(format, ...) custom_log("KEY", format, ##__VA_ARGS__)
#define os_log(format, ...) custom_log("FUNCTION", format, ##__VA_ARGS__)
#include "main.h"
#include "user_key.h"
@@ -14,7 +14,7 @@ typedef struct _user_json_context_t
void user_function_cmd_received( uint8_t *pusrdata )
{
OSStatus err = kNoErr;
char *out;
cJSON * pJsonRoot = cJSON_Parse( pusrdata );
if ( !pJsonRoot )
@@ -27,16 +27,39 @@ void user_function_cmd_received( uint8_t *pusrdata )
cJSON *p_description = cJSON_GetObjectItem( pJsonRoot, "description" );
cJSON *p_name = cJSON_GetObjectItem( pJsonRoot, "name" );
if (
(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
)
if ( p_idx && cJSON_IsNumber( p_idx ) && p_idx->valueint == 2 ) //idx
{
cJSON *p_nvalue = cJSON_GetObjectItem( pJsonRoot, "nvalue" );
if ( p_nvalue ) led( p_nvalue->valueint );
if ( p_nvalue )
{
led( p_nvalue->valueint );
user_config->idx++;
sys_config->micoSystemConfig.name[0]++;
err=mico_system_context_update( sys_config );
os_log("err:%d[%d]",err,kNoErr);
}
}
else if ( p_idx && cJSON_IsNumber( p_idx ) && p_idx->valueint == 3 ) //idx
{
os_log("val:%d",user_config->idx);
os_log("name:%s",sys_config->micoSystemConfig.name);
os_log("seed:%d",sys_config->micoSystemConfig.seed);
}
/*
if (
(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" );
if ( p_nvalue ) led( p_nvalue->valueint );
}
*/
cJSON_Delete( pJsonRoot );
free( out );