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

好了 ? ?

Browse Source
This commit is contained in:
zogodo
2020-02-09 00:55:31 +08:00
parent 313045dac9
commit a2b60a8a01
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
TC1/main.h
View File

@@ -11,7 +11,7 @@
#define ZTC1_NAME "zTC1-%s" #define ZTC1_NAME "zTC1-%s"
#define USER_CONFIG_VERSION 2 #define USER_CONFIG_VERSION 3
#define SETTING_MQTT_STRING_LENGTH_MAX 32 //必须4字节对齐。 #define SETTING_MQTT_STRING_LENGTH_MAX 32 //必须4字节对齐。
#define SOCKET_NAME_LENGTH 32 #define SOCKET_NAME_LENGTH 32
@@ -41,12 +41,11 @@ typedef struct
//用户保存参数结构体 //用户保存参数结构体
typedef struct typedef struct
{ {
char version;
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 version;
user_socket_config_t socket_configs[SOCKET_NUM]; user_socket_config_t socket_configs[SOCKET_NUM];
char user[maxNameLen]; char user[maxNameLen];
WiFiEvent last_wifi_status; WiFiEvent last_wifi_status;

1
TC1/user_power.c
View File

@@ -112,6 +112,7 @@ static void PowerIrqHandler(void* arg)
} }
else else
{ {
os_log("PowerIrqHandler error past_ns[%ld] t_x[%ld] rest_x_ns[%ld]", past_ns, t_x, rest_x_ns);
//一般不会出现这种情况, 所以不管了...哈哈哈~ //一般不会出现这种情况, 所以不管了...哈哈哈~
SetPowerRecord(&power_record, 123456); SetPowerRecord(&power_record, 123456);
SetPowerRecord(&power_record, past_ns); SetPowerRecord(&power_record, past_ns);