优化指南针校准

diff --git a/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.h b/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.h
index 4ce9511..9a751ac 100644 (file)
--- a/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.h
+++ b/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.h
@@ -125,7 +125,5 @@ void MMC5603_GetData(float *mag_out);
 \r
 void MMC5603_GETID(unsigned char *id);\r
 \r
-int SavePara_infile(void);\r
-\r
 #endif\r
 \r

diff --git a/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c b/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c
index 580c261..0613e2b 100644 (file)
--- a/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c
+++ b/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c
@@ -216,7 +216,8 @@ extern uint8_t is_xts_test_done(void);
                }                       \r
                /* Save the calpara buffer into the system file */\r
                /* This function should be create by customer.If customer can not implement this function, should comment it out */     \r
-               SavePara(saveData);                                                             \r
+               //SavePara(saveData);\r
+               SavePara_infile(saveData,4);                                                    \r
                MMC_LOG("save para \r\n");      \r
        }\r
 \r
@@ -271,7 +272,7 @@ int SavePara(float *p)
 \r
 #define MMC_DATA_PATH "/user/userdata/mmc_para.bin"\r
 \r
-int SavePara_infile(void)\r
+int SavePara_infile(float *p,uint8_t len)\r
 {      \r
        FILE * fp = fopen(MMC_DATA_PATH,"wb");\r
        size_t ret = 0;\r
@@ -281,14 +282,14 @@ int SavePara_infile(void)
         return -1;\r
     }\r
 \r
-       ret = fwrite(g_MagPara,sizeof(float),4,fp);\r
+       ret = fwrite(p,sizeof(float),len,fp);\r
        if(ret != 4)\r
        {\r
                PRINT("fwrite failed %d\n",ret);\r
                return -1;\r
        }\r
-       for(int i = 0; i < 4 ; i++)\r
-               PRINT("write p[%d] : %f \r\n",i,g_MagPara[i]);\r
+       for(int i = 0; i < len ; i++)\r
+               PRINT("write p[%d] : %f \r\n",i,p[i]);\r
     fclose(fp);\r
        return 1;\r
 }\r

diff --git a/code/sdk/drivers/peripheral/mag/service/mag_service.c b/code/sdk/drivers/peripheral/mag/service/mag_service.c
index 1d3dcf6..d688a08 100644 (file)
--- a/code/sdk/drivers/peripheral/mag/service/mag_service.c
+++ b/code/sdk/drivers/peripheral/mag/service/mag_service.c
@@ -173,9 +173,6 @@ static void mag_service_check_task(void const *arg)
             LOS_Mdelay(20);
 
             // uapi_pm_remove_sleep_veto(PM_ID_SCREEN);
-        }else if (mail.comm.app == MAG_SERVICE_CMD_SAVE_CHECK){
-            if(SavePara_infile() != 1)
-                PRINT("mag save data failed !!! \r\n");
         }
 
 

diff --git a/code/sdk/drivers/peripheral/mag/service/mag_service.h b/code/sdk/drivers/peripheral/mag/service/mag_service.h
index 04ccfe3..62bbe0e 100644 (file)
--- a/code/sdk/drivers/peripheral/mag/service/mag_service.h
+++ b/code/sdk/drivers/peripheral/mag/service/mag_service.h
@@ -22,7 +22,6 @@ extern "C" {
 
 #define MAG_SERVICE_CMD_START_CHECK 0x12
 #define MAG_SERVICE_CMD_STOP_CHECK 0x13
-#define MAG_SERVICE_CMD_SAVE_CHECK 0x14
 
 errcode_t uapi_mag_service_init(void);
 void uapi_mag_service_deinit(void);

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index c26ed32..4f683e2 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -148,9 +148,6 @@ void shutdown_reboot_prejobs_task(void)
     //保存步数
     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SAVE_DATA,NULL);
 
-    //保存磁力计数据
-    do_mag_service_check_msg(MAG_SERVICE_CMD_SAVE_CHECK);
-
     addressbookTowrite();
     
     dial_file_save();