From 4c588aee369634daaf4dc629c695348301000213 Mon Sep 17 00:00:00 2001 From: zogodo <742782908@qq.com> Date: Sun, 16 Feb 2020 22:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8F=92=E5=BA=A7=E9=80=9A?= =?UTF-8?q?=E7=94=B5=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TC1/main.h | 2 +- TC1/user_gpio.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/TC1/main.h b/TC1/main.h index fc26572..d7b9686 100644 --- a/TC1/main.h +++ b/TC1/main.h @@ -4,7 +4,7 @@ #include "mico.h" #include "micokit_ext.h" -#define VERSION "v1.0.6" +#define VERSION "v1.0.7" #define TYPE 1 #define TYPE_NAME "zTC1" diff --git a/TC1/user_gpio.c b/TC1/user_gpio.c index 06e7b93..5d59e0c 100644 --- a/TC1/user_gpio.c +++ b/TC1/user_gpio.c @@ -46,15 +46,20 @@ const unsigned char* GetSocketStatus() void SetSocketStatus(char* socket_status) { - int ons[6] = { 0 }; sscanf(socket_status, "%d,%d,%d,%d,%d,%d,", - &ons[0], &ons[1], &ons[2], &ons[3], &ons[4], &ons[5]); + (int*)&user_config->socket_configs[0].on, + (int*)&user_config->socket_configs[1].on, + (int*)&user_config->socket_configs[2].on, + (int*)&user_config->socket_configs[3].on, + (int*)&user_config->socket_configs[4].on, + (int*)&user_config->socket_configs[5].on); int i = 0; for (i = 0; i < SOCKET_NUM; i++) { - UserRelaySet(i, ons[i]); + UserRelaySet(i, user_config->socket_configs[i].on); UserMqttSendSocketState(i); } + mico_system_context_update(sys_config); } /*UserRelaySet