diff --git a/README.md b/README.md index d0e4b1c..caf48d4 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ TC1使用的主控为EMW3031,基于MiCO(MCU based Internet Connectivity Operatin - [x] SNTP网络校时 - [x] MQTT客户端连接服务器 -- [ ] app控制每个接口单独开关 -- [ ] 配置每个接口单独定时开关 +- [x] app控制每个接口单独开关(测试版本) +- [x] 配置每个接口单独定时开关(未测试验证) - [ ] 配置每个接口单独倒计时开关 - [ ] app实时显示功率 - [ ] ~~根据功率自动开关~~ @@ -46,8 +46,19 @@ TC1使用的主控为EMW3031,基于MiCO(MCU based Internet Connectivity Operatin - [x] 掉电保存数据 + - [x] wifi自动连接 + - [x] Easylink + - [x] SNTP自动校时 + - [x] MQTT客户端连接服务器,订阅/发布主题 + - [x] Json 数据处理 + +- [ ] MQTT设置各项配置 + +- [ ] 单独提供一个UDP/TCP端口供配置 + + diff --git a/TC1/user_function.c b/TC1/user_function.c index ed8bba2..f9365f2 100644 --- a/TC1/user_function.c +++ b/TC1/user_function.c @@ -28,25 +28,16 @@ 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 + 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_config->idx++; - sys_config->micoSystemConfig.name[0]++; - err=mico_system_context_update( sys_config ); - os_log("err:%d[%d]",err,kNoErr); + user_relay_set(p_idx->valueint-3,p_nvalue->valueint); } } - 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 ( diff --git a/TC1/user_gpio.c b/TC1/user_gpio.c index c334e2f..1e50b74 100644 --- a/TC1/user_gpio.c +++ b/TC1/user_gpio.c @@ -54,6 +54,7 @@ static void key_short_press( void ) { //os_log("test"); user_led_set(-1); + //user_relay_set(6,-1); } void key_init( void )