From f0365c247897d7b342fb59b55e162644f0b5953c Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Tue, 3 Sep 2024 17:17:45 +0800 Subject: [PATCH] =?utf8?q?=E9=87=8D=E5=91=BD=E5=90=8DMMC5603=E4=B8=BACUSTO?= =?utf8?q?M=5FMMC5603=20=E8=A7=A3=E5=86=B3=E4=B8=8EDML=E6=96=B0=E7=89=88?= =?utf8?q?=E6=9C=AC=E5=BA=93=E7=BC=96=E8=AF=91=E5=86=B2=E7=AA=81=E9=97=AE?= =?utf8?q?=E9=A2=98=E3=80=82(=E8=A1=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../drivers/peripheral/mag/mmc5603/MMC5603.c | 24 +++++++++---------- .../peripheral/mag/mmc5603/mmc5603_main.c | 12 +++++----- .../peripheral/mag/service/mag_service.c | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.c b/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.c index 67561fd8c..185d96aa4 100644 --- a/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.c +++ b/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.c @@ -75,7 +75,7 @@ int CUSTOM_MMC5603_Factory_Test_Mode(void) /* Set Cmm_en bit '0', Disable continuous mode */ I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL2, 0x00); - CUSTOM_MMC5603_Delay_Ms(20); + MMC5603_Delay_Ms(20); /* Write reg 0x1B */ /* Set Auto_SR_en bit '0', Disable the function of automatic set/reset */ @@ -89,7 +89,7 @@ int CUSTOM_MMC5603_Factory_Test_Mode(void) /* Write 0x01 to register 0x1B, set Take_meas_M bit '1' */ I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL0, CUSTOM_MMC5603_CMD_TMM); /* Delay 10 ms to finish the TM operation */ - CUSTOM_MMC5603_Delay_Ms(10); + MMC5603_Delay_Ms(10); /* Read register data */ I2C_MultiRead_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_DATA, 6, data_reg); /* Get high 16bits data */ @@ -102,7 +102,7 @@ int CUSTOM_MMC5603_Factory_Test_Mode(void) /* Write 0x01 to register 0x1B, set Take_meas_M bit '1' */ I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS,CUSTOM_MMC5603_REG_CTRL0,CUSTOM_MMC5603_CMD_TMM); /* Delay 10 ms to finish the TM operation */ - CUSTOM_MMC5603_Delay_Ms(10); + MMC5603_Delay_Ms(10); /* Read register data */ I2C_MultiRead_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_DATA, 6, data_reg); /* Get high 16bits data */ @@ -134,7 +134,7 @@ void CUSTOM_MMC5603_SET(void) I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL0, CUSTOM_MMC5603_CMD_SET); /* Delay to finish the SET operation */ - CUSTOM_MMC5603_Delay_Ms(1); + MMC5603_Delay_Ms(1); return; } @@ -148,7 +148,7 @@ void CUSTOM_MMC5603_RESET(void) I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL0, CUSTOM_MMC5603_CMD_RESET); /* Delay to finish the RESET operation */ - CUSTOM_MMC5603_Delay_Ms(1); + MMC5603_Delay_Ms(1); return; } @@ -220,7 +220,7 @@ int CUSTOM_MMC5603_Auto_SelfTest(void) I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL0, CUSTOM_MMC5603_CMD_AUTO_ST_EN); /* Delay 15ms to finish the selftest process */ - CUSTOM_MMC5603_Delay_Ms(15); + MMC5603_Delay_Ms(15); /* Read register 0x18, check Sat_sensor bit */ I2C_Read_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_STATUS1, ®_status); @@ -278,7 +278,7 @@ int CUSTOM_MMC5603_Saturation_Checking(void) /* Do TM_M after selftest operation */ I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS,CUSTOM_MMC5603_REG_CTRL0,CUSTOM_MMC5603_CMD_TMM); - CUSTOM_MMC5603_Delay_Ms(8); + MMC5603_Delay_Ms(8); } return ret; @@ -304,15 +304,15 @@ void CUSTOM_MMC5603_Auto_Switch(uint16_t *mag) /* Disable continuous mode */ I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL2, 0x00); - CUSTOM_MMC5603_Delay_Ms(15);//Delay 15ms to finish the last sampling + MMC5603_Delay_Ms(15);//Delay 15ms to finish the last sampling /* Do SET operation */ I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL0, CUSTOM_MMC5603_CMD_SET); - CUSTOM_MMC5603_Delay_Ms(1);//Delay 1ms to finish the SET operation + MMC5603_Delay_Ms(1);//Delay 1ms to finish the SET operation /* Do TM_M before next data reading */ I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS,CUSTOM_MMC5603_REG_CTRL0,CUSTOM_MMC5603_CMD_TMM); - CUSTOM_MMC5603_Delay_Ms(8);//Delay 8ms to finish the TM_M operation + MMC5603_Delay_Ms(8);//Delay 8ms to finish the TM_M operation } } else if(sensor_state == 2) @@ -349,7 +349,7 @@ void CUSTOM_MMC5603_Disable(void) /* Set Cmm_en bit '0', Disable continuous mode */ I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL2, 0x00); - CUSTOM_MMC5603_Delay_Ms(20); + MMC5603_Delay_Ms(20); return; } @@ -378,7 +378,7 @@ void CUSTOM_MMC5603_Enable(void) /* Work mode setting */ CUSTOM_MMC5603_Continuous_Mode_With_Auto_SR(CUSTOM_MMC5603_CMD_BW00, 50); - CUSTOM_MMC5603_Delay_Ms(20); + MMC5603_Delay_Ms(20); return; } diff --git a/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c b/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c index 14f47f94a..44e3cf1bb 100644 --- a/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c +++ b/code/sdk/drivers/peripheral/mag/mmc5603/mmc5603_main.c @@ -105,7 +105,7 @@ int mmc5603_start(void) InitialAlgorithm(mag_smm, mag_hmm); /* Enable the sensor. */ - MMC5603_Enable(); + CUSTOM_MMC5603_Enable(); return 0; } @@ -164,8 +164,8 @@ extern uint8_t is_xts_test_done(void); float caliMagPara[4] = {0.0f}; /* convert the coordinate system */ acc_coordinate_raw_to_real(A_LAYOUT, acc_raw_data, acc_real_data); - // /* Get the MMC5603 mag raw data, unit is gauss */ - MMC5603_GetData(mag_raw_data); + // /* Get the CUSTOM_MMC5603 mag raw data, unit is gauss */ + CUSTOM_MMC5603_GetData(mag_raw_data); /* Convert the coordinate system */ mag_coordinate_raw_to_real(M_LAYOUT, mag_raw_data, mag_real_data); @@ -200,8 +200,8 @@ extern uint8_t is_xts_test_done(void); // if(GetMagSaturation()) // { // //MEMSIC_Magnetic_Sensor_SET(); //Do SET action - // MMC_LOG("Do SET action MMC5603_SET\r\n"); - // MMC5603_SET(); + // MMC_LOG("Do SET action CUSTOM_MMC5603_SET\r\n"); + // CUSTOM_MMC5603_SET(); // } /* Get corrected mag data */ @@ -440,6 +440,6 @@ int mag_service_get_iAccuracy(void) int mmc5603_stop(void) { - MMC5603_Disable(); + CUSTOM_MMC5603_Disable(); return 0; } diff --git a/code/sdk/drivers/peripheral/mag/service/mag_service.c b/code/sdk/drivers/peripheral/mag/service/mag_service.c index c45867dcc..52696fbad 100644 --- a/code/sdk/drivers/peripheral/mag/service/mag_service.c +++ b/code/sdk/drivers/peripheral/mag/service/mag_service.c @@ -197,7 +197,7 @@ errcode_t uapi_mag_service_init(void) - if(MMC5603_CheckID()!=1) + if(CUSTOM_MMC5603_CheckID()!=1) { //TODO 设置磁力计检测是否存在标识 PRINT("MMC5603 not found!\r\n"); -- 2.17.1