重命名MMC5603为CUSTOM_MMC5603 解决与DML新版本库编译冲突问题。(补)

diff --git a/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.c b/code/sdk/drivers/peripheral/mag/mmc5603/MMC5603.c
index 67561fd..185d96a 100644 (file)
--- 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 */       \r
        I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL2, 0x00);\r
        \r
-       CUSTOM_MMC5603_Delay_Ms(20);\r
+       MMC5603_Delay_Ms(20);\r
        \r
        /* Write reg 0x1B */\r
        /* Set Auto_SR_en bit '0', Disable the function of automatic set/reset */\r
@@ -89,7 +89,7 @@ int CUSTOM_MMC5603_Factory_Test_Mode(void)
        /* Write 0x01 to register 0x1B, set Take_meas_M bit '1' */\r
        I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL0, CUSTOM_MMC5603_CMD_TMM);        \r
        /* Delay 10 ms to finish the TM operation */\r
-       CUSTOM_MMC5603_Delay_Ms(10);            \r
+       MMC5603_Delay_Ms(10);           \r
        /* Read register data */\r
        I2C_MultiRead_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_DATA, 6, data_reg);\r
        /* Get high 16bits data */\r
@@ -102,7 +102,7 @@ int CUSTOM_MMC5603_Factory_Test_Mode(void)
        /* Write 0x01 to register 0x1B, set Take_meas_M bit '1' */\r
        I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS,CUSTOM_MMC5603_REG_CTRL0,CUSTOM_MMC5603_CMD_TMM);  \r
        /* Delay 10 ms to finish the TM operation */\r
-       CUSTOM_MMC5603_Delay_Ms(10);            \r
+       MMC5603_Delay_Ms(10);           \r
        /* Read register data */\r
        I2C_MultiRead_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_DATA, 6, data_reg);\r
        /* Get high 16bits data */\r
@@ -134,7 +134,7 @@ void CUSTOM_MMC5603_SET(void)
        I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL0, CUSTOM_MMC5603_CMD_SET);        \r
        \r
        /* Delay to finish the SET operation */\r
-       CUSTOM_MMC5603_Delay_Ms(1);\r
+       MMC5603_Delay_Ms(1);\r
        \r
        return; \r
 }\r
@@ -148,7 +148,7 @@ void CUSTOM_MMC5603_RESET(void)
        I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL0, CUSTOM_MMC5603_CMD_RESET);\r
        \r
        /* Delay to finish the RESET operation */\r
-       CUSTOM_MMC5603_Delay_Ms(1);\r
+       MMC5603_Delay_Ms(1);\r
        \r
        return; \r
 }\r
@@ -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);\r
        \r
        /* Delay 15ms to finish the selftest process */\r
-       CUSTOM_MMC5603_Delay_Ms(15);\r
+       MMC5603_Delay_Ms(15);\r
        \r
        /* Read register 0x18, check Sat_sensor bit */\r
        I2C_Read_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_STATUS1, &reg_status);  \r
@@ -278,7 +278,7 @@ int CUSTOM_MMC5603_Saturation_Checking(void)
                \r
                /* Do TM_M after selftest operation */\r
                I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS,CUSTOM_MMC5603_REG_CTRL0,CUSTOM_MMC5603_CMD_TMM);  \r
-               CUSTOM_MMC5603_Delay_Ms(8);\r
+               MMC5603_Delay_Ms(8);\r
        }\r
 \r
        return ret;\r
@@ -304,15 +304,15 @@ void CUSTOM_MMC5603_Auto_Switch(uint16_t *mag)
                        \r
                        /* Disable continuous mode */   \r
                        I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL2, 0x00);\r
-                       CUSTOM_MMC5603_Delay_Ms(15);//Delay 15ms to finish the last sampling\r
+                       MMC5603_Delay_Ms(15);//Delay 15ms to finish the last sampling\r
                        \r
                        /* Do SET operation */\r
                        I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL0, CUSTOM_MMC5603_CMD_SET);        \r
-                       CUSTOM_MMC5603_Delay_Ms(1);//Delay 1ms to finish the SET operation\r
+                       MMC5603_Delay_Ms(1);//Delay 1ms to finish the SET operation\r
                        \r
                        /* Do TM_M before next data reading */\r
                        I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS,CUSTOM_MMC5603_REG_CTRL0,CUSTOM_MMC5603_CMD_TMM);  \r
-                       CUSTOM_MMC5603_Delay_Ms(8);//Delay 8ms to finish the TM_M operation                     \r
+                       MMC5603_Delay_Ms(8);//Delay 8ms to finish the TM_M operation                    \r
                }       \r
        }\r
        else if(sensor_state == 2)\r
@@ -349,7 +349,7 @@ void CUSTOM_MMC5603_Disable(void)
        /* Set Cmm_en bit '0', Disable continuous mode */       \r
        I2C_Write_Reg(CUSTOM_MMC5603_7BITI2C_ADDRESS, CUSTOM_MMC5603_REG_CTRL2, 0x00);\r
        \r
-       CUSTOM_MMC5603_Delay_Ms(20);\r
+       MMC5603_Delay_Ms(20);\r
        \r
        return;\r
 }\r
@@ -378,7 +378,7 @@ void CUSTOM_MMC5603_Enable(void)
        /* Work mode setting */\r
        CUSTOM_MMC5603_Continuous_Mode_With_Auto_SR(CUSTOM_MMC5603_CMD_BW00, 50);\r
        \r
-       CUSTOM_MMC5603_Delay_Ms(20);\r
+       MMC5603_Delay_Ms(20);\r
        \r
        return;\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 14f47f9..44e3cf1 100644 (file)
--- 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);     \r
        \r
                /* Enable the sensor. */\r
-       MMC5603_Enable();       \r
+       CUSTOM_MMC5603_Enable();        \r
        return 0;\r
 }\r
 \r
@@ -164,8 +164,8 @@ extern uint8_t is_xts_test_done(void);
        float caliMagPara[4] = {0.0f};  \r
        /* convert the coordinate system */             \r
        acc_coordinate_raw_to_real(A_LAYOUT, acc_raw_data, acc_real_data);                              \r
-       // /* Get the MMC5603 mag raw data, unit is gauss */\r
-       MMC5603_GetData(mag_raw_data);\r
+       // /* Get the CUSTOM_MMC5603 mag raw data, unit is gauss */\r
+       CUSTOM_MMC5603_GetData(mag_raw_data);\r
 \r
        /* Convert the coordinate system */             \r
        mag_coordinate_raw_to_real(M_LAYOUT, mag_raw_data, mag_real_data);              \r
@@ -200,8 +200,8 @@ extern uint8_t is_xts_test_done(void);
        // if(GetMagSaturation())  \r
        // {\r
        //      //MEMSIC_Magnetic_Sensor_SET(); //Do SET action\r
-       //      MMC_LOG("Do SET action MMC5603_SET\r\n");\r
-       //      MMC5603_SET();\r
+       //      MMC_LOG("Do SET action CUSTOM_MMC5603_SET\r\n");\r
+       //      CUSTOM_MMC5603_SET();\r
        // }\r
        \r
        /* Get corrected mag data */\r
@@ -440,6 +440,6 @@ int mag_service_get_iAccuracy(void)
 \r
 int mmc5603_stop(void)\r
 {\r
-       MMC5603_Disable();\r
+       CUSTOM_MMC5603_Disable();\r
        return 0;\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 c45867d..52696fb 100644 (file)
--- 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");