1.宏命名修复。

include/device/mr_can.h

@@ -6,8 +6,8 @@
  * @date 2023-11-22    MacRsh       First version
  */
 
-#ifndef _CAN_H_
-#define _CAN_H_
+#ifndef _MR_CAN_H_
+#define _MR_CAN_H_
 
 #include "include/mr_api.h"
 
@@ -126,4 +126,4 @@ int mr_can_dev_register(struct mr_can_dev *can_dev, const char *name, int id, in
 }
 #endif /* __cplusplus */
 
-#endif /* _CAN_H_ */
+#endif /* _MR_CAN_H_ */

include/device/mr_pwm.h

@@ -6,8 +6,8 @@
  * @date 2023-12-10    MacRsh       First version
  */
 
-#ifndef _PWM_H_
-#define _PWM_H_
+#ifndef _MR_PWM_H_
+#define _MR_PWM_H_
 
 #include "include/mr_api.h"
 
@@ -104,4 +104,4 @@ int mr_pwm_register(struct mr_pwm *pwm, const char *name, struct mr_drv *drv, st
 }
 #endif /* __cplusplus */
 
-#endif /* _PWM_H_ */
+#endif /* _MR_PWM_H_ */

include/device/mr_soft_i2c.h

@@ -6,8 +6,8 @@
  * @date 2023-12-13    MacRsh       First version
  */
 
-#ifndef _SOFT_I2C_H_
-#define _SOFT_I2C_H_
+#ifndef _MR_SOFT_I2C_H_
+#define _MR_SOFT_I2C_H_
 
 #include "include/mr_api.h"
 
@@ -44,4 +44,4 @@ int mr_soft_i2c_bus_register(struct mr_soft_i2c_bus *soft_i2c_bus, const char *n
 }
 #endif /* __cplusplus */
 
-#endif /* _SOFT_I2C_H_ */
+#endif /* _MR_SOFT_I2C_H_ */

include/device/mr_timer.h

@@ -6,8 +6,8 @@
  * @date 2023-11-15    MacRsh       First version
  */
 
-#ifndef _PWM_H_
-#define _PWM_H_
+#ifndef _MR_TIMER_H_
+#define _MR_TIMER_H_
 
 #include "include/mr_api.h"
 
@@ -110,4 +110,4 @@ int mr_timer_register(struct mr_timer *timer, const char *name, struct mr_drv *d
 }
 #endif /* __cplusplus */
 
-#endif /* _PWM_H_ */
+#endif /* _MR_TIMER_H_ */

include/mr_def.h

@@ -291,8 +291,8 @@ struct mr_dev
 {
     int magic;                                                      /**< Magic number */
 #ifndef MR_CFG_DEV_NAME_MAX
-#define MR_CFG_NAME_MAX                 (8)
-#endif /* MR_CFG_NAME_MAX */
+#define MR_CFG_DEV_NAME_MAX             (8)
+#endif /* MR_CFG_DEV_NAME_MAX */
     char name[MR_CFG_DEV_NAME_MAX];                                     /**< Name */
     int type;                                                       /**< Device type */
     void *parent;                                                   /**< Parent */

include/mr_service.h

@@ -234,7 +234,7 @@ extern "C" {
         }                               \
     } while(0)
 #else
-#define mr_assert(ex)
+#define MR_ASSERT(ex)
 #endif /* MR_USING_ASSERT */
 
 /**