commit 039d01e62a67a87aaa7ba5d47efd9d9f5ee5ac52
author zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周二 12月 03 17:27:54 2019 +0800
committer zongqiang.zhang <zongqiang.zhang@supwisdom.com> 周二 12月 03 17:27:54 2019 +0800
tree 23e62fc5336720be11720da494df498383ebb2e8
parent 511da6b845c37d8bc38bedefd856a1b37ebc810b

修复bug

supwisdom/sp_config.h

diff --git a/supwisdom/sp_config.h b/supwisdom/sp_config.h
index 5039ab6..f895a46 100644
--- a/supwisdom/sp_config.h
+++ b/supwisdom/sp_config.h
@@ -35,7 +35,7 @@
 #define DEV_TYPE "G401201"
 #define DEV_OFFLINE_DEFAULT_HOUR 168
 #define DEV_BLKBITMAP_DONE 1984
-#define DEV_MAX_DEVICENO 99
+#define DEV_MAX_DEVICENO 64
 
 #define PRO_VERSION GIT_VERSION
 #define BUILD_DATE __DATE__ 		// " " __TIME__

supwisdom/sp_data.c

diff --git a/supwisdom/sp_data.c b/supwisdom/sp_data.c
index f2fdac3..3aa77f3 100644
--- a/supwisdom/sp_data.c
+++ b/supwisdom/sp_data.c
@@ -347,11 +347,12 @@
 
 uint16 sp_config_init(sp_pos_t* pos)
 {
-  uint16 ret = 0;
   uint8 crc[2];
   sp_config_t config;
-  MEMCLEAR(&config, sizeof(config));
   disp_hint_info_two(pos,"É豸²ÎÊý³õʼ»¯", "ÇëÉÔµÈ...",0);
+  MEMCLEAR(&config, sizeof(config));
+  config.deviceno = 1;
+  MEMCPY(config.devphyid,"\x40\x12\x01\x00",4);
   sp_protocol_crc((uint8*)&config,sizeof(sp_config_t)-2,config.crc);
   sp_flash_erase(ADDR_CONFIG_PARA);
   sp_flash_write(ADDR_CONFIG_PARA,(uint8*)&config,sizeof(sp_config_t));
@@ -361,6 +362,5 @@
   {
     return RC_CONFPARA_CRC_ERR;
   }
-  ret = sp_flash_erase(ADDR_CONFIG_PARA);
-  return ret;
+  return sp_parse_config(pos, config);
 }