From 94499150bc0f0995f25aca249572c64e2bf943a4 Mon Sep 17 00:00:00 2001 From: NeoZng Date: Mon, 12 Dec 2022 22:29:51 +0800 Subject: [PATCH] add compatibility under LINUX --- .vscode/settings.json | 2 +- application/robot_def.h | 2 +- bsp/bsp_buzzer.h | 2 +- bsp/bsp_can.h | 2 +- bsp/bsp_led.h | 2 +- bsp/bsp_usart.h | 2 +- modules/daemon/daemon.h | 2 +- modules/led_light/led_task.c | 2 +- modules/master_machine/seasky_protocol.h | 2 +- modules/message_center/message_center.h | 2 +- modules/motor/HT04.h | 2 +- modules/motor/LK9025.h | 2 +- modules/motor/motor_def.h | 2 +- modules/referee/crc.h | 2 +- modules/remote/remote_control.h | 2 +- modules/vofa/vofa.h | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f8f50e8..b157594 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { "files.associations": { "memory.h": "c", - "stdint-gcc.h": "c", + "stdint.h": "c", "led_task.h": "c", "stdinf.h": "c", "usart.h": "c", diff --git a/application/robot_def.h b/application/robot_def.h index 19fddcc..5d97123 100644 --- a/application/robot_def.h +++ b/application/robot_def.h @@ -14,7 +14,7 @@ #include "ins_task.h" #include "master_process.h" -#include "stdint-gcc.h" +#include "stdint.h" /* 开发板类型定义,烧录时注意不要弄错对应功能;修改定义后需要重新编译,只能存在一个定义! */ #define ONE_BOARD // 单板控制整车 diff --git a/bsp/bsp_buzzer.h b/bsp/bsp_buzzer.h index 58a1588..cc09a68 100644 --- a/bsp/bsp_buzzer.h +++ b/bsp/bsp_buzzer.h @@ -1,7 +1,7 @@ #ifndef BSP_BUZZER_H #define BSP_BUZZER_H -#include +#include void BuzzerInit(); extern void BuzzerOn(uint16_t psc, uint16_t pwm, uint8_t level); diff --git a/bsp/bsp_can.h b/bsp/bsp_can.h index c820d25..977c6c1 100644 --- a/bsp/bsp_can.h +++ b/bsp/bsp_can.h @@ -1,7 +1,7 @@ #ifndef BSP_CAN_H #define BSP_CAN_H -#include +#include #include "can.h" #define MX_REGISTER_DEVICE_CNT 12 // maximum number of device can be registered to CAN service diff --git a/bsp/bsp_led.h b/bsp/bsp_led.h index 1a69320..0766227 100644 --- a/bsp/bsp_led.h +++ b/bsp/bsp_led.h @@ -1,7 +1,7 @@ #ifndef BSP_LED_H #define BSP_LED_H -#include +#include void LEDInit(); extern void FlowRGBShow(uint32_t aRGB); diff --git a/bsp/bsp_usart.h b/bsp/bsp_usart.h index 18abeec..ef8a465 100644 --- a/bsp/bsp_usart.h +++ b/bsp/bsp_usart.h @@ -1,7 +1,7 @@ #ifndef BSP_RC_H #define BSP_RC_H -#include +#include #include "main.h" #define DEVICE_USART_CNT 3 // C板至多分配3个串口 diff --git a/modules/daemon/daemon.h b/modules/daemon/daemon.h index 689b266..7167885 100644 --- a/modules/daemon/daemon.h +++ b/modules/daemon/daemon.h @@ -1,7 +1,7 @@ #ifndef MONITOR_H #define MONITOR_H -#include "stdint-gcc.h" +#include "stdint.h" #define DAEMON_MX_CNT 64 diff --git a/modules/led_light/led_task.c b/modules/led_light/led_task.c index 76a9fdc..e680c4f 100644 --- a/modules/led_light/led_task.c +++ b/modules/led_light/led_task.c @@ -12,7 +12,7 @@ #include "led_task.h" -#include +#include #include "bsp_led.h" #include "main.h" diff --git a/modules/master_machine/seasky_protocol.h b/modules/master_machine/seasky_protocol.h index 7035007..5c24c43 100644 --- a/modules/master_machine/seasky_protocol.h +++ b/modules/master_machine/seasky_protocol.h @@ -2,7 +2,7 @@ #define __SEASKY_PROTOCOL_H #include -#include +#include #define PROTOCOL_CMD_ID 0XA5 #define OFFSET_BYTE 8 // 出数据段外，其他部分所占字节数 diff --git a/modules/message_center/message_center.h b/modules/message_center/message_center.h index c6212bd..d50c201 100644 --- a/modules/message_center/message_center.h +++ b/modules/message_center/message_center.h @@ -13,7 +13,7 @@ #ifndef PUBSUB_H #define PUBSUB_H -#include "stdint-gcc.h" +#include "stdint.h" #define MAX_EVENT_NAME_LEN 32 //最大的事件名长度,每个事件都有字符串来命名 diff --git a/modules/motor/HT04.h b/modules/motor/HT04.h index 1e8bce4..e372ef1 100644 --- a/modules/motor/HT04.h +++ b/modules/motor/HT04.h @@ -1,7 +1,7 @@ #ifndef HT04_H #define HT04_H -#include +#include #include "bsp_can.h" #include "controller.h" #include "motor_def.h" diff --git a/modules/motor/LK9025.h b/modules/motor/LK9025.h index 7c9360c..f95a158 100644 --- a/modules/motor/LK9025.h +++ b/modules/motor/LK9025.h @@ -1,7 +1,7 @@ #ifndef LK9025_H #define LK9025_H -#include +#include "stdint.h" #include "bsp_can.h" #include "controller.h" #include "motor_def.h" diff --git a/modules/motor/motor_def.h b/modules/motor/motor_def.h index 2cf2cce..05bf1c6 100644 --- a/modules/motor/motor_def.h +++ b/modules/motor/motor_def.h @@ -13,7 +13,7 @@ #define MOTOR_DEF_H #include "controller.h" -#include +#include #define LIMIT_MIN_MAX(x, min, max) (x) = (((x) <= (min)) ? (min) : (((x) >= (max)) ? (max) : (x))) diff --git a/modules/referee/crc.h b/modules/referee/crc.h index e97535a..cf6f6b4 100644 --- a/modules/referee/crc.h +++ b/modules/referee/crc.h @@ -1,7 +1,7 @@ #ifndef __CRC_H_ #define __CRC_H_ -#include +#include #define TRUE 1 #define FALSE 0 diff --git a/modules/remote/remote_control.h b/modules/remote/remote_control.h index f655316..62f079a 100644 --- a/modules/remote/remote_control.h +++ b/modules/remote/remote_control.h @@ -13,7 +13,7 @@ #ifndef REMOTE_CONTROL_H #define REMOTE_CONTROL_H -#include +#include #include "main.h" #include "usart.h" diff --git a/modules/vofa/vofa.h b/modules/vofa/vofa.h index 66334d0..a6c9dd3 100644 --- a/modules/vofa/vofa.h +++ b/modules/vofa/vofa.h @@ -7,7 +7,7 @@ */ #ifndef VOFA_H #define VOFA_H -#include +#include #include "bsp_usart.h" #include "usart.h"