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

add:udp接收,准备在家udp发送队列

Browse Source
This commit is contained in:
Zip
2019-03-13 09:53:30 +08:00
parent d80378e821
commit b9f22d9f24
11 changed files with 168 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
TC1/user_function.c
View File

@@ -1,4 +1,3 @@
#define os_log(format, ...) custom_log("FUNCTION", format, ##__VA_ARGS__)
#include "main.h"
@@ -13,32 +12,67 @@ typedef struct _user_json_context_t
int8_t val;
} user_json_context_t;
void user_function_cmd_received( uint8_t *pusrdata )
void user_function_cmd_received(struct sockaddr *addr, uint8_t *pusrdata )
{
OSStatus err = kNoErr;
char *out;
cJSON * pJsonRoot = cJSON_Parse( pusrdata );
if ( !pJsonRoot )
{
os_log( "this is not a json data:\r\n%s\r\n", pusrdata );
return;
}
// //<2F><><EFBFBD><EFBFBD>device report
// os_printf( "start json:device report\r\n" );
// cJSON *p_cmd = cJSON_GetObjectItem( pJsonRoot, "cmd" );
// if ( p_cmd && cJSON_IsString( p_cmd ) && os_strcmp( p_cmd->valuestring, "device report" ) == 0 )
// {
//
// cJSON *pRoot = cJSON_CreateObject( );
// cJSON_AddStringToObject( pRoot, "name", mqtt_device_id );
// cJSON_AddStringToObject( pRoot, "mac", strMac );
// cJSON_AddNumberToObject( pRoot, "type", TYPE );
// cJSON_AddStringToObject( pRoot, "type_name", TYPE_NAME );
// char *s = cJSON_Print( pRoot );
// os_printf( "pRoot: %s\r\n", s );
//
// if ( addr )
// {
// if ( addr && pesp_conn->type == ESPCONN_UDP )
// {
// pesp_conn->type = ESPCONN_UDP;
// pesp_conn->proto.udp->remote_port = 10181; //<2F><>ȡ<EFBFBD>˿<EFBFBD>
// pesp_conn->proto.udp->remote_ip[0] = 255; //<2F><>ȡIP<49><50>ַ
// pesp_conn->proto.udp->remote_ip[1] = 255;
// pesp_conn->proto.udp->remote_ip[2] = 255;
// pesp_conn->proto.udp->remote_ip[3] = 255;
// }
// espconn_send( pesp_conn, s, os_strlen( s ) ); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// } else
// {
// user_mqtt_send( "domoticz/in", s );
// }
// cJSON_free( (void *) s );
// cJSON_Delete( pRoot );
// // cJSON_Delete(p_cmd);
// }
//<2F><><EFBFBD><EFBFBD>idx<64>ֶ<EFBFBD>int<6E><74><EFBFBD><EFBFBD> description<6F>ֶ<EFBFBD>string<6E><67><EFBFBD><EFBFBD> name<6D>ֶ<EFBFBD>string<6E><67><EFBFBD><EFBFBD>
cJSON *p_idx = cJSON_GetObjectItem( pJsonRoot, "idx" );
cJSON *p_description = cJSON_GetObjectItem( pJsonRoot, "description" );
cJSON *p_name = cJSON_GetObjectItem( pJsonRoot, "name" );
if ( p_idx && cJSON_IsNumber( p_idx ) && (p_idx->valueint>=3 &&p_idx->valueint<=9) ) //idx
if ( p_idx && cJSON_IsNumber( p_idx ) && (p_idx->valueint >= 3 && p_idx->valueint <= 9) ) //idx
{
cJSON *p_nvalue = cJSON_GetObjectItem( pJsonRoot, "nvalue" );
if ( p_nvalue )
{
user_led_set( p_nvalue->valueint );
user_relay_set(p_idx->valueint-3,p_nvalue->valueint);
user_relay_set( p_idx->valueint - 3, p_nvalue->valueint );
}
}
/*
if (
(p_idx && cJSON_IsNumber( p_idx ) && p_idx->valueint == 2) //idx