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

utf-8

Browse Source
This commit is contained in:
zogodo
2019-09-25 17:10:21 +08:00
parent 21a07a4d97
commit 3f2605cd78
8 changed files with 91 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
TC1/main.c
View File

@@ -13,7 +13,7 @@
char rtc_init = 0; //sntpУʱ<EFBFBD>ɹ<EFBFBD><EFBFBD><EFBFBD>־λ
char rtc_init = 0; //sntp校时成功标志位
uint32_t total_time = 0;
char strMac[16] = { 0 };
uint32_t power = 0;
@@ -31,7 +31,7 @@ void appRestoreDefault_callback(void * const user_config_data, uint32_t size)
UNUSED_PARAMETER(size);
mico_system_context_get()->micoSystemConfig.name[0] = 1; //<EFBFBD><EFBFBD><EFBFBD>´<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱʹ<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mico_system_context_get()->micoSystemConfig.name[0] = 1; //在下次重启时使用默认名称
mico_system_context_get()->micoSystemConfig.name[1] = 0;
user_config_t* userConfigDefault = user_config_data;
@@ -47,7 +47,7 @@ void appRestoreDefault_callback(void * const user_config_data, uint32_t size)
{
userConfigDefault->plug[i].on = 1;
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>1-6
//插座名称 插口1-6
userConfigDefault->plug[i].name[0] = 0xe6;
userConfigDefault->plug[i].name[1] = 0x8f;
userConfigDefault->plug[i].name[2] = 0x92;
@@ -57,7 +57,7 @@ void appRestoreDefault_callback(void * const user_config_data, uint32_t size)
userConfigDefault->plug[i].name[6] = i + '1';
userConfigDefault->plug[i].name[7] = 0;
// sprintf(userConfigDefault->plug[i].name, "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>%d", i);//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>쳣
// sprintf(userConfigDefault->plug[i].name, "插座%d", i);//编码异常
for (j = 0; j < PLUG_TIME_TASK_NUM; j++)
{
userConfigDefault->plug[i].task[j].hour = 0;
@@ -97,9 +97,9 @@ int application_start(void)
MicoGpioInitialize((mico_gpio_t) Button, INPUT_PULL_UP);
if (!MicoGpioInputGet(Button))
{ //<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>ť״̬
{ //开机时按钮状态
os_log("wifi_start_easylink");
wifi_status = WIFI_STATE_NOEASYLINK; //wifi_init<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>easylink
wifi_status = WIFI_STATE_NOEASYLINK; //wifi_init中启动easylink
}
MicoGpioInitialize((mico_gpio_t) Led, OUTPUT_PUSH_PULL);
@@ -120,7 +120,7 @@ int application_start(void)
if (sys_config->micoSystemConfig.name[0] == 1)
{
IPStatusTypedef para;
os_log("micoWlanGetIPStatus:%d", micoWlanGetIPStatus(&para, Station)); //mac<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>0??!!!
os_log("micoWlanGetIPStatus:%d", micoWlanGetIPStatus(&para, Station)); //mac读出来全部是0??!!!
strcpy(strMac, para.mac);
os_log("result:%s",strMac);
os_log("result:%s",para.mac);
@@ -153,7 +153,7 @@ int application_start(void)
// }
// }
//sys_config = mico_system_context_init(sizeof(user_config_t)); //<EFBFBD><EFBFBD>ȡFlash<EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//sys_config = mico_system_context_init(sizeof(user_config_t)); //获取Flash中的配置
ap_init();
wifi_init();
user_udp_init();
@@ -169,7 +169,7 @@ int application_start(void)
while (1)
{
main_num++;
//<EFBFBD><EFBFBD><EFBFBD>͹<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//发送功率数据
if (power_last != power || main_num>4)
{
power_last = power;