diff --git a/README.md b/README.md index bd177be..b472c66 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,6 @@ APP端见: [SmartControl_Android_MQTT](https://github.com/a2633063/SmartControl_ - [x] MQTT客户端连接服务器(无MQTT时使用UDP通信,如果你会内网穿透,就可能实现远程控制功能) - [x] app控制每个接口独立开关 - [x] app配置每个接口拥有独立的5组定时开关 -- [ ] ota在线升级(暂时未做) +- [x] ota在线升级 - [ ] app实时显示功率(暂时未测量功率模块的电路.暂时未实现此功能) - [ ] ~~根据功率自动开关~~(可能不会做这个功能) diff --git a/TC1/main.h b/TC1/main.h index a3b12d4..9b8131b 100644 --- a/TC1/main.h +++ b/TC1/main.h @@ -4,7 +4,7 @@ #include "mico.h" #include "MiCOKit_EXT.h" -#define VERSION "v0.2" +#define VERSION "v0.2.1" #define TYPE 1 #define TYPE_NAME "zTC1" diff --git a/TC1/user_function.c b/TC1/user_function.c index 6b0d0ef..88f0155 100644 --- a/TC1/user_function.c +++ b/TC1/user_function.c @@ -206,6 +206,9 @@ void user_function_cmd_received( int udp_flag, uint8_t *pusrdata ) } // + //豸ota + if ( p_ota ) cJSON_AddStringToObject( json_setting_send, "ota", p_ota->valuestring ); + //豸/deviceid if ( p_setting_name ) cJSON_AddStringToObject( json_setting_send, "name", sys_config->micoSystemConfig.name ); //mqtt ip diff --git a/build/TC1@MK3031@moc/binary/TC1@MK3031@moc.all.bin b/build/TC1@MK3031@moc/binary/TC1@MK3031@moc.all.bin index 00fb63b..d4505a8 100644 Binary files a/build/TC1@MK3031@moc/binary/TC1@MK3031@moc.all.bin and b/build/TC1@MK3031@moc/binary/TC1@MK3031@moc.all.bin differ diff --git a/build/TC1@MK3031@moc/binary/TC1@MK3031@moc.ota.bin b/build/TC1@MK3031@moc/binary/TC1@MK3031@moc.ota.bin index ba3fe0e..f80638a 100644 Binary files a/build/TC1@MK3031@moc/binary/TC1@MK3031@moc.ota.bin and b/build/TC1@MK3031@moc/binary/TC1@MK3031@moc.ota.bin differ