diff --git a/.gitignore b/.gitignore index 8e918c7..757e1ef 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ MDK-ARM/startup_stm32f103xb.lst MDK-ARM/RTE MDK-ARM/CAR.uvguix.Admin MDK-ARM/car.uvguix.Administrator +MDK-ARM/CAR.uvguix.lenovo build/ cmake/ diff --git a/Core/Inc/stm32f1xx_hal_conf.h b/Core/Inc/stm32f1xx_hal_conf.h index ff0bae5..8dc8f19 100644 --- a/Core/Inc/stm32f1xx_hal_conf.h +++ b/Core/Inc/stm32f1xx_hal_conf.h @@ -154,7 +154,7 @@ #define USE_HAL_SPI_REGISTER_CALLBACKS 0U /* SPI register callback disabled */ #define USE_HAL_TIM_REGISTER_CALLBACKS 1U /* TIM register callback enabled */ #define USE_HAL_UART_REGISTER_CALLBACKS 0U /* UART register callback disabled */ -#define USE_HAL_USART_REGISTER_CALLBACKS 0U /* USART register callback disabled */ +#define USE_HAL_USART_REGISTER_CALLBACKS 1U /* USART register callback enabled */ #define USE_HAL_WWDG_REGISTER_CALLBACKS 0U /* WWDG register callback disabled */ /* ########################## Assert Selection ############################## */ diff --git a/Core/Inc/syscalls.h b/Core/Inc/syscalls.h index 5327636..5a1d735 100644 --- a/Core/Inc/syscalls.h +++ b/Core/Inc/syscalls.h @@ -7,32 +7,37 @@ #include #include #include +#include #include #define HUART1 (&huart1) #define HUART2 (&huart2) -extern UART_HandleTypeDef huart2; +extern UART_HandleTypeDef huart1; extern int __io_putchar(int ch) __attribute__((weak)); extern int __io_getchar(void) __attribute__((weak)); -__attribute__((weak)) int _read(int file, char *ptr, int len) { +__attribute__((weak)) int _read(int file, char *ptr, int len) +{ (void)file; int DataIdx; - for (DataIdx = 0; DataIdx < len; DataIdx++) { + for (DataIdx = 0; DataIdx < len; DataIdx++) + { *ptr++ = __io_getchar(); } return len; } -__attribute__((weak)) int _write(int file, char *ptr, int len) { +__attribute__((weak)) int _write(int file, char *ptr, int len) +{ (void)file; int DataIdx; - for (DataIdx = 0; DataIdx < len; DataIdx++) { + for (DataIdx = 0; DataIdx < len; DataIdx++) + { __io_putchar(*ptr++); } return len; @@ -48,7 +53,7 @@ __attribute__((weak)) int _write(int file, char *ptr, int len) { #endif /* __GNUC__ */ /** - * @brief 重定向 C 标准库 printf 函数到串口 huart2 + * @brief 重定向 C 标准库 printf 函数到串口 huart1 * @author Suroy * @param ch * @param f @@ -56,27 +61,30 @@ __attribute__((weak)) int _write(int file, char *ptr, int len) { * * @usage printf("USART1_Target:\r\n"); */ -PUTCHAR_PROTOTYPE { - HAL_UART_Transmit(&huart2, (uint8_t *)&ch, 1, HAL_MAX_DELAY); // 阻塞式无限等待 +PUTCHAR_PROTOTYPE +{ + HAL_UART_Transmit(&huart1, (uint8_t *)&ch, 1, HAL_MAX_DELAY); // 阻塞式无限等待 return ch; } /** * @brief 重定向 c库函数 getchar,scanf到 DEBUG_USARTx - * 重定向 C 标准库 scanf 函数到串口 huart2 + * 重定向 C 标准库 scanf 函数到串口 huart1 * 注意以 空格 为结束 * @param f * @return int * * @usage scanf("%c", &RecData); */ -GETCHAR_PROTOTYPE { +GETCHAR_PROTOTYPE +{ uint8_t ch = 0; - HAL_UART_Receive(&huart2, (uint8_t *)&ch, 1, HAL_MAX_DELAY); + HAL_UART_Receive(&huart1, (uint8_t *)&ch, 1, HAL_MAX_DELAY); return ch; } -void delay_us(uint16_t us) { +void delay_us(uint16_t us) +{ uint32_t delay = (HAL_RCC_GetHCLKFreq() / 4000000 * us); while (delay--); } @@ -88,15 +96,14 @@ void delay_us(uint16_t us) { * * @usage my_printf(HUART1, "USART1_Target:\r\n"); */ -void my_printf(UART_HandleTypeDef *huart, const char *buf, ...) { - const char *p = buf; +void my_printf(UART_HandleTypeDef *huart, const char *buf, ...) +{ char str[255] = {0}; va_list v; va_start(v, buf); vsprintf(str, buf, v); - HAL_UART_Transmit(huart, str, strlen(str), 0xff); + HAL_UART_Transmit(huart, (const uint8_t *)str, strlen(str), 0xff); va_end(v); } - #endif diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index ccab9ed..d22c305 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -45,6 +45,7 @@ void MX_GPIO_Init(void) GPIO_InitTypeDef GPIO_InitStruct = {0}; /* GPIO Ports Clock Enable */ + __HAL_RCC_GPIOC_CLK_ENABLE(); __HAL_RCC_GPIOD_CLK_ENABLE(); __HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOB_CLK_ENABLE(); @@ -58,6 +59,12 @@ void MX_GPIO_Init(void) /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(GPIOB, R_FORWARD_Pin|R_BACKWARD_Pin|L_BACKWARD_Pin|L_FORWARD_Pin, GPIO_PIN_RESET); + /*Configure GPIO pins : PCPin PCPin PCPin */ + GPIO_InitStruct.Pin = LineSeek_L2_Pin|LineSeek_L1_Pin|LineSeek_R1_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_INPUT; + GPIO_InitStruct.Pull = GPIO_PULLUP; + HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); + /*Configure GPIO pins : PAPin PAPin */ GPIO_InitStruct.Pin = FM_K2_POWERC_Pin|FAN_GS_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; @@ -65,6 +72,12 @@ void MX_GPIO_Init(void) GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + /*Configure GPIO pin : PtPin */ + GPIO_InitStruct.Pin = LineSeek_R2_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_INPUT; + GPIO_InitStruct.Pull = GPIO_PULLUP; + HAL_GPIO_Init(LineSeek_R2_GPIO_Port, &GPIO_InitStruct); + /*Configure GPIO pin : PtPin */ GPIO_InitStruct.Pin = Echo_Pin; GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING; diff --git a/Core/Src/usart.c b/Core/Src/usart.c index d31b386..24060a9 100644 --- a/Core/Src/usart.c +++ b/Core/Src/usart.c @@ -41,7 +41,7 @@ void MX_USART1_UART_Init(void) /* USER CODE END USART1_Init 1 */ huart1.Instance = USART1; - huart1.Init.BaudRate = 115200; + huart1.Init.BaudRate = 9600; huart1.Init.WordLength = UART_WORDLENGTH_8B; huart1.Init.StopBits = UART_STOPBITS_1; huart1.Init.Parity = UART_PARITY_NONE; @@ -70,7 +70,7 @@ void MX_USART2_UART_Init(void) /* USER CODE END USART2_Init 1 */ huart2.Instance = USART2; - huart2.Init.BaudRate = 115200; + huart2.Init.BaudRate = 9600; huart2.Init.WordLength = UART_WORDLENGTH_8B; huart2.Init.StopBits = UART_STOPBITS_1; huart2.Init.Parity = UART_PARITY_NONE; diff --git a/MDK-ARM/CAR.uvguix.lenovo b/MDK-ARM/CAR.uvguix.lenovo index 71b589d..0550102 100644 --- a/MDK-ARM/CAR.uvguix.lenovo +++ b/MDK-ARM/CAR.uvguix.lenovo @@ -6,7 +6,7 @@
### uVision Project, (C) Keil Software
- + D:\OneDrive\OneDrive - my.swjtu.edu.cn\Data\program code\Projects\Car\MDK-ARM @@ -15,7 +15,7 @@ 38003 Registers - 115 57 + 115 114 346 @@ -93,8 +93,8 @@ 2 3 - -1 - -1 + -32000 + -32000 -1 @@ -110,8 +110,8 @@ 0 - 60 - 010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000000000000 + 533 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000010000000100000061443A5C4F6E6544726976655C4F6E654472697665202D206D792E73776A74752E6564752E636E5C446174615C70726F6772616D20636F64655C50726F6A656374735C4361725C436F72655C5372635C73797374656D5F73746D3332663178782E63000000001273797374656D5F73746D3332663178782E6300000000C5D4F200FFFFFFFF55443A5C4F6E6544726976655C4F6E654472697665202D206D792E73776A74752E6564752E636E5C446174615C70726F6772616D20636F64655C50726F6A656374735C4361725C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF5A443A5C4F6E6544726976655C4F6E654472697665202D206D792E73776A74752E6564752E636E5C446174615C70726F6772616D20636F64655C50726F6A656374735C4361725C557365725C5372635C626C7565746F6F74682E63000000000B626C7565746F6F74682E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F300000066000000B705000020020000 @@ -134,7 +134,7 @@ 16 - 22000000390000003E020000AD000000 + BA0000006600000039040000DA000000 @@ -150,7 +150,7 @@ 0 16 - 0300000066000000B3000000AF020000 + 0300000066000000EC000000F0010000 16 @@ -170,7 +170,7 @@ 0 16 - 0300000066000000B3000000AF020000 + 0300000066000000EC000000F0010000 16 @@ -190,7 +190,7 @@ 0 16 - 00000000C00100003904000034020000 + 03000000C3010000360400001B020000 16 @@ -210,7 +210,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -230,7 +230,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -250,7 +250,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -270,7 +270,7 @@ 0 16 - 860300006600000036040000E0000000 + 860300006600000036040000A3010000 16 @@ -330,7 +330,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -350,7 +350,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -370,7 +370,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -390,7 +390,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -410,7 +410,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -430,7 +430,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -450,7 +450,7 @@ 0 16 - 0300000066000000B3000000AF020000 + 0300000066000000EC000000F0010000 16 @@ -470,7 +470,7 @@ 0 16 - 0300000066000000B3000000AF020000 + 0300000066000000EC000000F0010000 16 @@ -490,7 +490,7 @@ 0 16 - 00000000E0020000B705000040030000 + 0000000021020000B705000040030000 16 @@ -530,7 +530,7 @@ 0 16 - 03000000E30200003604000027030000 + 0300000024020000B405000027030000 16 @@ -550,7 +550,7 @@ 0 16 - BA0000006300000039040000C3000000 + BD0000006600000036040000AA000000 16 @@ -610,7 +610,7 @@ 0 16 - 830300006300000039040000BC010000 + 860300006600000036040000A3010000 16 @@ -630,7 +630,7 @@ 0 16 - 00000000C00100003904000020020000 + 03000000C3010000360400001B020000 16 @@ -690,7 +690,7 @@ 0 16 - BA0000006300000039040000C3000000 + BD0000006600000036040000AA000000 16 @@ -730,7 +730,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -750,7 +750,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -770,7 +770,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -790,7 +790,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -810,7 +810,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -830,7 +830,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -850,7 +850,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -870,7 +870,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -890,7 +890,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -910,7 +910,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -930,7 +930,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -950,7 +950,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -970,7 +970,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -990,7 +990,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1010,7 +1010,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1030,7 +1030,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1050,7 +1050,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1070,7 +1070,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1090,7 +1090,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1110,7 +1110,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1130,7 +1130,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1150,7 +1150,7 @@ 0 16 - 0300000066000000B30000001B020000 + 0300000066000000EC000000F0010000 16 @@ -1170,7 +1170,7 @@ 0 16 - 00000000E00200003904000040030000 + 0300000024020000B405000027030000 16 @@ -1190,7 +1190,7 @@ 0 16 - 03000000E30200003604000027030000 + 0300000024020000B405000027030000 16 @@ -1210,7 +1210,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -1230,7 +1230,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -1250,7 +1250,7 @@ 0 16 - 03000000E30200003604000027030000 + 0300000024020000B405000027030000 16 @@ -1270,7 +1270,7 @@ 0 16 - 03000000E30200003604000027030000 + 0300000024020000B405000027030000 16 @@ -1310,7 +1310,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1330,7 +1330,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1350,7 +1350,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1370,7 +1370,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1390,7 +1390,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1410,7 +1410,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1430,7 +1430,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1450,7 +1450,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1470,7 +1470,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1490,7 +1490,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1510,7 +1510,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1530,7 +1530,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1550,7 +1550,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1570,7 +1570,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1590,7 +1590,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1610,7 +1610,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1630,7 +1630,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1650,7 +1650,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1670,7 +1670,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1690,7 +1690,7 @@ 0 16 - 8603000066000000360400002B010000 + 860300006600000036040000A3010000 16 @@ -1704,7 +1704,7 @@ 0 0 0 - 32767 + 966 0 8192 0 @@ -1744,7 +1744,7 @@ 0 0 0 - 32767 + 476 0 8192 1 @@ -1764,7 +1764,7 @@ 0 0 0 - 32767 + 612 0 8192 2 @@ -1790,7 +1790,7 @@ 0 16 - 03000000C30100003604000007020000 + 03000000C3010000360400001B020000 16 @@ -1799,14 +1799,14 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFBA000000C300000039040000C7000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E65002000000000000022000000390000003E020000AD000000BA0000004F00000039040000C30000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF7F0300004F00000083030000BC010000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000002200000039000000D8000000E3000000830300004F00000039040000BC01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFB60000004F000000BA000000C8020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000002200000039000000D8000000E3000000000000004F000000B6000000C80200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000A801000039040000AC01000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000002200000039000000D8000000E300000000000000AC010000390400003402000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF1D020000AC010000210200003402000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000C8020000B7050000CC020000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000022000000390000003E020000AD00000000000000CC020000B7050000400300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFBA000000C300000039040000C7000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000BA0000006600000039040000DA000000BA0000004F00000039040000C30000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF7F0300004F00000083030000BC010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000830300006600000039040000D3010000830300004F00000039040000BC01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFEF0000004F000000F300000009020000010000000200001004000000010000004CFFFFFFF8040000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000EF00000020020000000000004F000000EF000000090200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000A801000039040000AC01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000000000000C3010000390400004B02000000000000AC010000390400003402000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF1D020000AC010000210200003402000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000009020000B70500000D020000010000000100001004000000010000008CFDFFFF72000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000010000000000000024020000B705000057030000000000000D020000B7050000400300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File 2580 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000400020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000004000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000004000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000400000000000000000000000000000000000001000000010000009600000002002050000000001348414C5F54494D5F4D7370506F7374496E6974960000000000000001001348414C5F54494D5F4D7370506F7374496E697400000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000004001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001348414C5F54494D5F4D7370506F7374496E6974960000000000000001001348414C5F54494D5F4D7370506F7374496E697400000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 966 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000034341529600000000000000010003434152000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000034341529600000000000000010003434152000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1857,4 +1857,40 @@ + + 1 + 0 + + 100 + 1 + + ../Core/Src/system_stm32f1xx.c + 0 + 1 + 1 + 1 + + 0 + + + ../Core/Src/main.c + 9 + 104 + 125 + 1 + + 0 + + + ..\User\Src\bluetooth.c + 25 + 17 + 28 + 1 + + 0 + + + + diff --git a/MDK-ARM/CAR.uvoptx b/MDK-ARM/CAR.uvoptx index bfd2666..283f72d 100644 --- a/MDK-ARM/CAR.uvoptx +++ b/MDK-ARM/CAR.uvoptx @@ -78,33 +78,6 @@ 1 18 - - - 0 - Quick Start Guide (MCBSTM32E) - E:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Boards\Keil\MCBSTM32E\Documentation\STM32E_QSG.pdf - - - 1 - Base Board Schematics (MCBSTM32E) - E:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Boards\Keil\MCBSTM32E\Documentation\mcbstm32e-base-board-schematics.pdf - - - 2 - Display Board Schematics (MCBSTM32E) - E:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Boards\Keil\MCBSTM32E\Documentation\mcbstm32e-display-board-schematics.pdf - - - 3 - User Manual (MCBSTM32E) - E:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Boards\Keil\MCBSTM32E\Documentation\mcbstm32e.chm - - - 4 - MCBSTM32E Evaluation Board Web Page (MCBSTM32E) - http://www.keil.com/mcbstm32e/ - - 0 1 @@ -127,7 +100,10 @@ 1 0 0 - 2 + 1 + 0 + 0 + 3 @@ -190,7 +166,7 @@ 0 0 1 - ..\Core\Src\hcsr04.c + D:\OneDrive\OneDrive - my.swjtu.edu.cn\Data\program code\Projects\Car\Core\Src\hcsr04.c \\car\../Core/Src/hcsr04.c\39 @@ -222,7 +198,7 @@ 0 0 1 - ..\Core\Src\hcsr04.c + D:\OneDrive\OneDrive - my.swjtu.edu.cn\Data\program code\Projects\Car\Core\Src\hcsr04.c \\car\../Core/Src/hcsr04.c\45 @@ -238,10 +214,42 @@ 0 0 1 - ..\Core\Src\hcsr04.c + D:\OneDrive\OneDrive - my.swjtu.edu.cn\Data\program code\Projects\Car\Core\Src\hcsr04.c \\car\../Core/Src/hcsr04.c\32 + + 4 + 0 + 99 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ../Core/Src/main.c + + +
+ + 5 + 0 + 97 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ../Core/Src/main.c + + +
@@ -295,11 +303,19 @@ 0 - - - 0 + 0 + 0 + + + + + + + + 1 + 0 0 2 10000000 @@ -340,66 +356,6 @@ 0 0 0 - ..\Core\Src\bluetooth.c - bluetooth.c - 0 - 0 - - - 2 - 3 - 1 - 0 - 0 - 0 - ..\Core\Src\control.c - control.c - 0 - 0 - - - 2 - 4 - 1 - 0 - 0 - 0 - ..\Core\Src\hcsr04.c - hcsr04.c - 0 - 0 - - - 2 - 5 - 1 - 0 - 0 - 0 - ..\Core\Src\led.c - led.c - 0 - 0 - - - 2 - 6 - 1 - 0 - 0 - 0 - ..\Core\Src\motor.c - motor.c - 0 - 0 - - - 2 - 7 - 1 - 0 - 0 - 0 ../Core/Src/main.c main.c 0 @@ -407,7 +363,7 @@ 2 - 8 + 3 1 0 0 @@ -419,7 +375,7 @@ 2 - 9 + 4 1 0 0 @@ -431,7 +387,7 @@ 2 - 10 + 5 1 0 0 @@ -443,7 +399,7 @@ 2 - 11 + 6 1 0 0 @@ -455,7 +411,7 @@ 2 - 12 + 7 1 0 0 @@ -467,7 +423,7 @@ 2 - 13 + 8 1 0 0 @@ -479,7 +435,7 @@ 2 - 14 + 9 1 0 0 @@ -499,7 +455,7 @@ 0 3 - 15 + 10 1 0 0 @@ -511,7 +467,7 @@ 3 - 16 + 11 1 0 0 @@ -523,7 +479,7 @@ 3 - 17 + 12 1 0 0 @@ -535,7 +491,7 @@ 3 - 18 + 13 1 0 0 @@ -547,7 +503,7 @@ 3 - 19 + 14 1 0 0 @@ -559,7 +515,7 @@ 3 - 20 + 15 1 0 0 @@ -571,7 +527,7 @@ 3 - 21 + 16 1 0 0 @@ -583,7 +539,7 @@ 3 - 22 + 17 1 0 0 @@ -595,7 +551,7 @@ 3 - 23 + 18 1 0 0 @@ -607,7 +563,7 @@ 3 - 24 + 19 1 0 0 @@ -619,7 +575,7 @@ 3 - 25 + 20 1 0 0 @@ -631,7 +587,7 @@ 3 - 26 + 21 1 0 0 @@ -643,7 +599,7 @@ 3 - 27 + 22 1 0 0 @@ -655,7 +611,7 @@ 3 - 28 + 23 1 0 0 @@ -667,7 +623,7 @@ 3 - 29 + 24 1 0 0 @@ -687,7 +643,7 @@ 0 4 - 30 + 25 1 0 0 @@ -699,6 +655,74 @@ + + Application/User/Service + 1 + 0 + 0 + 0 + + 5 + 26 + 1 + 0 + 0 + 0 + ..\User\Src\bluetooth.c + bluetooth.c + 0 + 0 + + + 5 + 27 + 1 + 0 + 0 + 0 + ..\User\Src\control.c + control.c + 0 + 0 + + + 5 + 28 + 1 + 0 + 0 + 0 + ..\User\Src\hcsr04.c + hcsr04.c + 0 + 0 + + + 5 + 29 + 1 + 0 + 0 + 0 + ..\User\Src\led.c + led.c + 0 + 0 + + + 5 + 30 + 1 + 0 + 0 + 0 + ..\User\Src\motor.c + motor.c + 0 + 0 + + + ::CMSIS 0 diff --git a/MDK-ARM/CAR.uvprojx b/MDK-ARM/CAR.uvprojx index 8f084c3..8f96e6a 100644 --- a/MDK-ARM/CAR.uvprojx +++ b/MDK-ARM/CAR.uvprojx @@ -10,7 +10,8 @@ CAR 0x4 ARM-ADS - 5060300::V5.06 update 3 (build 300)::ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC + 0 STM32F103C8 @@ -183,6 +184,8 @@ 0 0 0 + 0 + 0 0 0 8 @@ -323,6 +326,7 @@ 0 0 1 + 0 0 5 3 @@ -335,7 +339,7 @@ USE_HAL_DRIVER,STM32F103xB - ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include + ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../User/Inc @@ -348,7 +352,7 @@ 0 0 0 - 0 + 4 @@ -389,31 +393,6 @@ Application/User/Core - - bluetooth.c - 1 - ..\Core\Src\bluetooth.c - - - control.c - 1 - ..\Core\Src\control.c - - - hcsr04.c - 1 - ..\Core\Src\hcsr04.c - - - led.c - 1 - ..\Core\Src\led.c - - - motor.c - 1 - ..\Core\Src\motor.c - main.c 1 @@ -461,6 +440,7 @@ 2 2 2 + 2 2 0 0 @@ -596,6 +576,36 @@ + + Application/User/Service + + + bluetooth.c + 1 + ..\User\Src\bluetooth.c + + + control.c + 1 + ..\User\Src\control.c + + + hcsr04.c + 1 + ..\User\Src\hcsr04.c + + + led.c + 1 + ..\User\Src\led.c + + + motor.c + 1 + ..\User\Src\motor.c + + + ::CMSIS @@ -624,4 +634,5 @@ + diff --git a/Core/Inc/bluetooth.h b/User/Inc/bluetooth.h similarity index 100% rename from Core/Inc/bluetooth.h rename to User/Inc/bluetooth.h diff --git a/Core/Inc/control.h b/User/Inc/control.h similarity index 100% rename from Core/Inc/control.h rename to User/Inc/control.h diff --git a/Core/Inc/hcsr04.h b/User/Inc/hcsr04.h similarity index 91% rename from Core/Inc/hcsr04.h rename to User/Inc/hcsr04.h index 3c7b8c0..4ebc588 100644 --- a/Core/Inc/hcsr04.h +++ b/User/Inc/hcsr04.h @@ -10,6 +10,6 @@ void HC_SR04_Init(void); uint32_t sonar_mm(void); // 测距完毕回调,执行完自定义任务后将sonor_state置0 - void Sonar_CP_Callback(); + void Sonar_CP_Callback(void); #endif diff --git a/Core/Inc/led.h b/User/Inc/led.h similarity index 100% rename from Core/Inc/led.h rename to User/Inc/led.h diff --git a/Core/Inc/motor.h b/User/Inc/motor.h similarity index 100% rename from Core/Inc/motor.h rename to User/Inc/motor.h diff --git a/Core/Src/bluetooth.c b/User/Src/bluetooth.c similarity index 64% rename from Core/Src/bluetooth.c rename to User/Src/bluetooth.c index 0cd2f27..7b7a470 100644 --- a/Core/Src/bluetooth.c +++ b/User/Src/bluetooth.c @@ -1,9 +1,11 @@ #include "bluetooth.h" -#include "usart.h" -#include "control.h" + #include #include +#include "control.h" +#include "usart.h" + #define BUFFER_SIZE 100 #define MESSAGE_SIZE 19 #define CMD_NUM 9 @@ -38,27 +40,27 @@ void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size) static uint16_t num[6]; switch (rxBuffer[5]) { - // 机械手 - case 'S': - break; - // 舵机云台 - case 'P': - break; - // 七彩灯 - case 'C': - sscanf(rxBuffer + 5, "%*3s%hu,%*3s%hu,%*3s%hu", num, num + 1, num + 2); - CONTROL_RGB(num[0], num[1], num[2]); - break; + // 机械手 + case 'S': + break; + // 舵机云台 + case 'P': + break; + // 七彩灯 + case 'C': + sscanf(rxBuffer + 5, "%*3s%hu,%*3s%hu,%*3s%hu", num, num + 1, num + 2); + CONTROL_RGB(num[0], num[1], num[2]); + break; - // 模式选择 - case 'M': - sscanf(rxBuffer + 5, "%*4s%c%c", num, num + 1); - CONTROL_Mode(num[0] - '0', num[1] - '0'); - break; + // 模式选择 + case 'M': + sscanf(rxBuffer + 5, "%*4s%c%c", num, num + 1); + CONTROL_Mode(num[0] - '0', num[1] - '0'); + break; } } memcpy(txBuffer, rxBuffer, Size); - printf("%s", txBuffer); + printf("%s", txBuffer); HAL_UART_Transmit_IT(&huart2, txBuffer, Size); BLUETOOTH_Init(); } diff --git a/Core/Src/control.c b/User/Src/control.c similarity index 100% rename from Core/Src/control.c rename to User/Src/control.c diff --git a/Core/Src/hcsr04.c b/User/Src/hcsr04.c similarity index 64% rename from Core/Src/hcsr04.c rename to User/Src/hcsr04.c index c971bd8..0c6610b 100644 --- a/Core/Src/hcsr04.c +++ b/User/Src/hcsr04.c @@ -11,7 +11,8 @@ uint32_t sonor_distance; // 测量出的距离,单位mm void HCSR04_HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef* htim); // 初始化超声波测距 -void HC_SR04_Init(void) { +void HC_SR04_Init(void) +{ // 禁用JTAG __HAL_RCC_AFIO_CLK_ENABLE(); __HAL_AFIO_REMAP_SWJ_NOJTAG(); @@ -21,40 +22,50 @@ void HC_SR04_Init(void) { } // 启动测距,单位:mm -uint32_t sonar_mm(void) { +uint32_t sonar_mm(void) +{ sonor_state = 1; HAL_GPIO_WritePin(Trig_GPIO_Port, Trig_Pin, GPIO_PIN_SET); // 输出高电平 delay_us(15); // 延时15微秒 HAL_GPIO_WritePin(Trig_GPIO_Port, Trig_Pin, GPIO_PIN_RESET); // 输出低电平 - if (time_end / 100 < 38) { // 判断是否小于38毫秒,大于38毫秒的就是超时,直接调到下面返回0 - sonor_distance = (time_end * 346) / 2; // 计算距离,25°C空气中的音速为346m/s - sonor_distance = sonor_distance / 100; // 因为上面的time_end的单位是10微秒,所以要得出单位为毫米的距离结果,还得除以100 + if (time_end / 100 < 38) + { // 判断是否小于38毫秒,大于38毫秒的就是超时,直接调到下面返回0 + sonor_distance = (time_end * 346) / 2; // 计算距离,25°C空气中的音速为346m/s + sonor_distance = sonor_distance / 100; // 因为上面的time_end的单位是10微秒,所以要得出单位为毫米的距离结果,还得除以100 } return sonor_distance; } -void HCSR04_HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef* htim) { - if (htim == &htim2) { // 每10us自增一 +void HCSR04_HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef* htim) +{ + if (htim == &htim2) + { // 每10us自增一 time++; } } -void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) { - if (GPIO_Pin == Echo_Pin) { - if (HAL_GPIO_ReadPin(Echo_GPIO_Port, Echo_Pin)) { +void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) +{ + if (GPIO_Pin == Echo_Pin) + { + if (HAL_GPIO_ReadPin(Echo_GPIO_Port, Echo_Pin)) + { HAL_TIM_Base_Start_IT(&htim2); time = 0; - } else { + } + else + { time_end = time; HAL_TIM_Base_Stop_IT(&htim2); sonor_state = 2; Sonar_CP_Callback(); + sonor_state = 0; } } } -// 测距完毕回调,执行完自定义任务后将sonor_state置0 -__attribute__((weak)) void Sonar_CP_Callback() { +// 测距完毕回调,执行完自定义任务后将sonor_state置0void +__attribute__((weak)) void Sonar_CP_Callback(void) +{ printf("distance = %d (mm)\n", sonor_distance); - sonor_state = 0; } diff --git a/Core/Src/led.c b/User/Src/led.c similarity index 100% rename from Core/Src/led.c rename to User/Src/led.c diff --git a/Core/Src/motor.c b/User/Src/motor.c similarity index 100% rename from Core/Src/motor.c rename to User/Src/motor.c