From bcd43c1c1db277d72a59ea0416c93e8144fbf456 Mon Sep 17 00:00:00 2001
From: penglei <1624952103@qq.com>
Date: Sat, 22 Jun 2024 09:06:18 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E6=8C=87=E5=8D=97=E9=92=88?=
 =?utf8?q?=E6=A0=A1=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.h     |  2 --
 .../sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c | 11 ++++++-----
 code/sdk/drivers/peripheral/mag/service/mag_service.c |  3 ---
 code/sdk/drivers/peripheral/mag/service/mag_service.h |  1 -
 code/sdk/drivers/peripheral/utils/custom_utils.c      |  3 ---
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.h b/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.h
index 4ce9511e3..9a751aca2 100644
--- 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);
 
 void MMC5603_GETID(unsigned char *id);
 
-int SavePara_infile(void);
-
 #endif
 
diff --git a/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c b/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c
index 580c26193..0613e2b15 100644
--- 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);
 		}			
 		/* Save the calpara buffer into the system file */
 		/* This function should be create by customer.If customer can not implement this function, should comment it out */	
-		SavePara(saveData);								
+		//SavePara(saveData);
+		SavePara_infile(saveData,4);							
 		MMC_LOG("save para \r\n");	
 	}
 
@@ -271,7 +272,7 @@ int SavePara(float *p)
 
 #define MMC_DATA_PATH "/user/userdata/mmc_para.bin"
 
-int SavePara_infile(void)
+int SavePara_infile(float *p,uint8_t len)
 {	
 	FILE * fp = fopen(MMC_DATA_PATH,"wb");
 	size_t ret = 0;
@@ -281,14 +282,14 @@ int SavePara_infile(void)
         return -1;
     }
 
-	ret = fwrite(g_MagPara,sizeof(float),4,fp);
+	ret = fwrite(p,sizeof(float),len,fp);
 	if(ret != 4)
 	{
 		PRINT("fwrite failed %d\n",ret);
 		return -1;
 	}
-	for(int i = 0; i < 4 ; i++)
-		PRINT("write p[%d] : %f \r\n",i,g_MagPara[i]);
+	for(int i = 0; i < len ; i++)
+		PRINT("write p[%d] : %f \r\n",i,p[i]);
     fclose(fp);
 	return 1;
 }
diff --git a/code/sdk/drivers/peripheral/mag/service/mag_service.c b/code/sdk/drivers/peripheral/mag/service/mag_service.c
index 1d3dcf6f5..d688a08b7 100644
--- 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 04ccfe36a..62bbe0e2d 100644
--- 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 c26ed32ce..4f683e2bf 100644
--- 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();
-- 
2.17.1