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

代码对齐

Browse Source
This commit is contained in:
zogodo
2019-09-25 17:25:26 +08:00
parent 3f2605cd78
commit 4a94a8c4ee
2 changed files with 31 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
TC1/main.c
View File

@@ -11,9 +11,7 @@
#define os_log(format, ...) custom_log("TC1", format, ##__VA_ARGS__) #define os_log(format, ...) custom_log("TC1", format, ##__VA_ARGS__)
char rtc_init = 0; //sntp校时成功标志位
char rtc_init = 0; //sntp校时成功标志位
uint32_t total_time = 0; uint32_t total_time = 0;
char strMac[16] = { 0 }; char strMac[16] = { 0 };
uint32_t power = 0; uint32_t power = 0;
@@ -27,26 +25,23 @@ mico_gpio_t Relay[Relay_NUM] = { Relay_0, Relay_1, Relay_2, Relay_3, Relay_4, Re
/* MICO system callback: Restore default configuration provided by application */ /* MICO system callback: Restore default configuration provided by application */
void appRestoreDefault_callback(void * const user_config_data, uint32_t size) void appRestoreDefault_callback(void * const user_config_data, uint32_t size)
{ {
int i, j;
UNUSED_PARAMETER(size); UNUSED_PARAMETER(size);
mico_system_context_get()->micoSystemConfig.name[0] = 1; //在下次重启时使用默认名称 mico_system_context_get()->micoSystemConfig.name[0] = 1; //在下次重启时使用默认名称
mico_system_context_get()->micoSystemConfig.name[1] = 0; mico_system_context_get()->micoSystemConfig.name[1] = 0;
user_config_t* userConfigDefault = user_config_data; user_config_t* userConfigDefault = user_config_data;
userConfigDefault->user[0] = 0; userConfigDefault->user[0] = 0;
userConfigDefault->mqtt_ip[0] = 0; userConfigDefault->mqtt_ip[0] = 0;
userConfigDefault->mqtt_port = 0; userConfigDefault->mqtt_port = 0;
userConfigDefault->mqtt_user[0] = 0; userConfigDefault->mqtt_user[0] = 0;
userConfigDefault->mqtt_password[0] = 0; userConfigDefault->mqtt_password[0] = 0;
userConfigDefault->version = USER_CONFIG_VERSION; userConfigDefault->version = USER_CONFIG_VERSION;
int i, j;
for (i = 0; i < PLUG_NUM; i++) for (i = 0; i < PLUG_NUM; i++)
{ {
userConfigDefault->plug[i].on = 1; userConfigDefault->plug[i].on = 1;
//插座名称 插口1-6 //插座名称 插口1-6
userConfigDefault->plug[i].name[0] = 0xe6; userConfigDefault->plug[i].name[0] = 0xe6;
userConfigDefault->plug[i].name[1] = 0x8f; userConfigDefault->plug[i].name[1] = 0x8f;
@@ -68,7 +63,6 @@ void appRestoreDefault_callback(void * const user_config_data, uint32_t size)
} }
} }
// mico_system_context_update(sys_config); // mico_system_context_update(sys_config);
} }
int application_start(void) int application_start(void)
@@ -125,7 +119,6 @@ int application_start(void)
os_log("result:%s",strMac); os_log("result:%s",strMac);
os_log("result:%s",para.mac); os_log("result:%s",para.mac);
unsigned char mac1, mac2; unsigned char mac1, mac2;
mac1 = strtohex(strMac[8], strMac[9]); mac1 = strtohex(strMac[8], strMac[9]);
mac2 = strtohex(strMac[10], strMac[11]); mac2 = strtohex(strMac[10], strMac[11]);
@@ -185,9 +178,9 @@ int application_start(void)
user_mqtt_hass_power(); user_mqtt_hass_power();
} }
mico_thread_msleep(1000); mico_thread_msleep(1000);
} }
exit:
exit:
os_log("application_start ERROR!"); os_log("application_start ERROR!");
return 0; return 0;
} }

57
TC1/main.h
View File

@@ -12,34 +12,34 @@
#define ZTC1_NAME "zTC1_%02X%02X" #define ZTC1_NAME "zTC1_%02X%02X"
#define USER_CONFIG_VERSION 2 #define USER_CONFIG_VERSION 2
#define SETTING_MQTT_STRING_LENGTH_MAX 32 //必须 4 字节对齐。 #define SETTING_MQTT_STRING_LENGTH_MAX 32 //必须4字节对齐。
#define PLUG_NAME_LENGTH 32 #define PLUG_NAME_LENGTH 32
#define PLUG_NUM 6 //插座数量 #define PLUG_NUM 6 //插座数量
#define PLUG_TIME_TASK_NUM 5 //每个插座最多5组定时任务 #define PLUG_TIME_TASK_NUM 5 //每个插座最多5组定时任务
#define Led MICO_GPIO_5 #define Led MICO_GPIO_5
#define Button MICO_GPIO_23 #define Button MICO_GPIO_23
#define POWER MICO_GPIO_15 #define POWER MICO_GPIO_15
#define Relay_ON 1 #define Relay_ON 1
#define Relay_OFF 0 #define Relay_OFF 0
#define Relay_0 MICO_GPIO_6 #define Relay_0 MICO_GPIO_6
#define Relay_1 MICO_GPIO_8 #define Relay_1 MICO_GPIO_8
#define Relay_2 MICO_GPIO_10 #define Relay_2 MICO_GPIO_10
#define Relay_3 MICO_GPIO_7 #define Relay_3 MICO_GPIO_7
#define Relay_4 MICO_GPIO_9 #define Relay_4 MICO_GPIO_9
#define Relay_5 MICO_GPIO_18 #define Relay_5 MICO_GPIO_18
#define Relay_NUM PLUG_NUM #define Relay_NUM PLUG_NUM
typedef struct typedef struct
{ {
char hour; //小时 char hour; //小时
char minute; //分钟 char minute; //分钟
char repeat; //bit7:一次 bit6-0:周日-周一 char repeat; //bit7:一次 bit6-0:周日-周一
char action; //动作 char action; //动作
char on; //开关 char on; //开关
} user_plug_task_config_t; } user_plug_task_config_t;
typedef struct typedef struct
@@ -47,33 +47,28 @@ typedef struct
char name[PLUG_NAME_LENGTH]; char name[PLUG_NAME_LENGTH];
char on; //记录当前开关 char on; //记录当前开关
user_plug_task_config_t task[PLUG_TIME_TASK_NUM]; user_plug_task_config_t task[PLUG_TIME_TASK_NUM];
} user_plug_config_t; } user_plug_config_t;
//用户保存参数结构体 //用户保存参数结构体
typedef struct typedef struct
{ {
char mqtt_ip[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service ip char mqtt_ip[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service ip
int mqtt_port; //mqtt service port int mqtt_port; //mqtt service port
char mqtt_user[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service user char mqtt_user[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service user
char mqtt_password[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service user char mqtt_password[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service user
// char mqtt_device_id[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service user device name // char mqtt_device_id[SETTING_MQTT_STRING_LENGTH_MAX]; //mqtt service user device name
char version; char version;
user_plug_config_t plug[PLUG_NUM]; user_plug_config_t plug[PLUG_NUM];
char user[maxNameLen]; char user[maxNameLen];
} user_config_t; } user_config_t;
extern char rtc_init; extern char rtc_init;
extern uint32_t total_time; extern uint32_t total_time;
extern char strMac[16]; extern char strMac[16];
extern uint32_t power; extern uint32_t power;
extern system_config_t * sys_config; extern system_config_t * sys_config;
extern user_config_t * user_config; extern user_config_t * user_config;
extern char socket_status[32]; extern char socket_status[32];
extern mico_gpio_t Relay[Relay_NUM]; extern mico_gpio_t Relay[Relay_NUM];
#endif #endif