From: penglei <1624952103@qq.com> Date: Tue, 11 Jun 2024 09:53:04 +0000 (+0800) Subject: 解决指南针校准不过的问题 X-Git-Tag: release_V1.2.70_20241020_135402~1018^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F258%2F2;p=mirrors%2FFD230.git 解决指南针校准不过的问题 --- diff --git a/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c b/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c index cda4297ca..28bab83cf 100644 --- a/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c +++ b/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c @@ -262,7 +262,7 @@ int CWM_OS_dbgPrintf(const char * format,...) CWM_OS_dbgOutput(InputBuff); return 0; } -#define CWM_DATA_PATH "/system/cyweedata" +#define CWM_DATA_PATH "/user/userdata/sport/stepcount" void CWM_OS_saveData(int* data, uint32_t len){ FILE * fp = fopen(CWM_DATA_PATH,"wb"); diff --git a/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c b/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c index 81da814d5..3a3751a98 100644 --- a/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c +++ b/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c @@ -86,12 +86,19 @@ int mmc5603_start(void) * If there is no parameter saved, ReadPara() should return -1, else return 1; * If there is no para saved, pass the default value to the algorithm library */ - if(ReadPara(saveData)==1){ - for(i=0;i<4;i++){ + // if(ReadPara(saveData)==1){ + // for(i=0;i<4;i++){ + // mag_hmm[i] = saveData[i]; + // } + // } + + if(ReadPara_infile(saveData,4)==1) + { + for(i=0;i<4;i++) + { mag_hmm[i] = saveData[i]; } - } - + } /* Initial the acc, mag, and calibrated parameters * if already saved the calibrated offset and radius last time, read it out and init the magOffset and magRadius */ @@ -262,6 +269,47 @@ int SavePara(float *p) return 1; } +#define MMC_DATA_PATH "/user/userdata/mmc_para" + +int SavePara_infile(float *p,uint32_t len) +{ + FILE * fp = fopen(MMC_DATA_PATH,"wb"); + int ret = 0; + if(fp==NULL) + { + PRINT("open %s failed\n",MMC_DATA_PATH); + return -1; + } + + ret = fwrite(p,1,len,fp); + if(ret==0) + { + PRINT("fwrite failed %d\n",ret); + return -1; + } + + fclose(fp); + return 1; +} + +int ReadPara_infile(float *p,uint32_t len) +{ + FILE * fp = fopen(MMC_DATA_PATH,"rb"); + if(fp==NULL) + { + PRINT("open %s failed\n",MMC_DATA_PATH); + + return -1; + } + int ret =fread(p,1,len,fp); + if(ret==0) + { + PRINT("fread failed %d\n",ret); + return -1; + } + fclose(fp); + return 1; +} /* Convert the sensor coordinate to right-front-up coordinate system; */ void acc_coordinate_raw_to_real(int layout, float *in, float *out) @@ -388,6 +436,7 @@ int mag_service_get_iAccuracy(void) int mmc5603_stop(void) { + SavePara_infile(saveData,4); MMC5603_Disable(); return 0; }