wxsmart-test
/
positioner_testing_project
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

编码器备份

This commit is contained in:
王绪洁 2025-03-18 13:25:13 +08:00
parent cd1850ef7e
commit dd006921d7
10 changed files with 3111 additions and 3092 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Core/Inc/main.h
View File

@ -23,8 +23,7 @@
#define __MAIN_H
#ifdef __cplusplus
extern "C"
{
extern "C" {
#endif
/* Includes ------------------------------------------------------------------*/
@ -37,10 +36,10 @@ extern "C"
#include "tcpserverc.h"
#include "leds.h"
#include <string.h>
/* USER CODE END Includes */
/* USER CODE END Includes */
/* Exported types ------------------------------------------------------------*/
/* USER CODE BEGIN ET */
/* Exported types ------------------------------------------------------------*/
/* USER CODE BEGIN ET */
extern uint8_t tcp_echo_flags_hart1;
extern uint8_t tcp_echo_flags_hart2;
extern uint8_t tcp_echo_flags_ble1;
@ -74,20 +73,20 @@ extern "C"
#define LOCAL_PORT 5001
/* USER CODE END ET */
/* USER CODE END ET */
/* Exported constants --------------------------------------------------------*/
/* USER CODE BEGIN EC */
/* Exported constants --------------------------------------------------------*/
/* USER CODE BEGIN EC */
/* USER CODE END EC */
/* USER CODE END EC */
/* Exported macro ------------------------------------------------------------*/
/* USER CODE BEGIN EM */
/* Exported macro ------------------------------------------------------------*/
/* USER CODE BEGIN EM */
/* USER CODE END EM */
/* USER CODE END EM */
/* Exported functions prototypes ---------------------------------------------*/
void Error_Handler(void);
/* Exported functions prototypes ---------------------------------------------*/
void Error_Handler(void);
/* USER CODE BEGIN EFP */
#define ENCODE_TIM8 1
@ -191,7 +190,7 @@ extern "C"
/* USER CODE BEGIN Private defines */
#define TRUE 0
#define FAIL -1
/* USER CODE END Private defines */
/* USER CODE END Private defines */
#ifdef __cplusplus
}

30
Core/Inc/tim.h
View File

@ -22,24 +22,23 @@
#define __TIM_H__
#ifdef __cplusplus
extern "C"
{
extern "C" {
#endif
/* Includes ------------------------------------------------------------------*/
#include "main.h"
/* USER CODE BEGIN Includes */
/* USER CODE BEGIN Includes */
/* USER CODE END Includes */
/* USER CODE END Includes */
extern TIM_HandleTypeDef htim1;
extern TIM_HandleTypeDef htim1;
extern TIM_HandleTypeDef htim2;
extern TIM_HandleTypeDef htim2;
extern TIM_HandleTypeDef htim3;
extern TIM_HandleTypeDef htim3;
extern TIM_HandleTypeDef htim8;
extern TIM_HandleTypeDef htim8;
/* USER CODE BEGIN Private defines */
#define IS_TIM_IT_FLAG(TIMx) (LL_TIM_IsActiveFlag_UPDATE(TIMx) == 1)
@ -87,21 +86,22 @@ extern "C"
} \
} \
} while (__LINE__ == -1)
/* USER CODE END Private defines */
/* USER CODE END Private defines */
void MX_TIM1_Init(void);
void MX_TIM2_Init(void);
void MX_TIM3_Init(void);
void MX_TIM8_Init(void);
void MX_TIM1_Init(void);
void MX_TIM2_Init(void);
void MX_TIM3_Init(void);
void MX_TIM8_Init(void);
void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim);
/* USER CODE BEGIN Prototypes */
/* USER CODE END Prototypes */
/* USER CODE END Prototypes */
#ifdef __cplusplus
}
#endif
#endif /* __TIM_H__ */

54
Core/Src/freertos.c
View File

@ -70,20 +70,22 @@ extern uint8_t send_data_flag_cmd;
ec11_t ec11_data = {0};
uint8_t di_state_last[DI_MAX] = {0};
uint8_t di_state_now[DI_MAX] = {0};
int encode_direction = 0;
int encode_num = 0;
/* USER CODE END FunctionPrototypes */
void start_tcp_task(void const * argument);
void start_led_toggle_task(void const * argument);
void start_dac_task(void const * argument);
void start_adc_task(void const * argument);
void start_gpio_di_do_task(void const * argument);
void start_ec11_task(void const * argument);
void start_tcp_task(void const *argument);
void start_led_toggle_task(void const *argument);
void start_dac_task(void const *argument);
void start_adc_task(void const *argument);
void start_gpio_di_do_task(void const *argument);
void start_ec11_task(void const *argument);
extern void MX_LWIP_Init(void);
void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */
/* GetIdleTaskMemory prototype (linked to static allocation support) */
void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize );
void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize);
/* USER CODE BEGIN GET_IDLE_TASK_MEMORY */
static StaticTask_t xIdleTaskTCBBuffer;
@ -103,7 +105,8 @@ void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer, StackTyp
* @param None
* @retval None
*/
void MX_FREERTOS_Init(void) {
void MX_FREERTOS_Init(void)
{
/* USER CODE BEGIN Init */
/* USER CODE END Init */
@ -152,7 +155,6 @@ void MX_FREERTOS_Init(void) {
/* USER CODE BEGIN RTOS_THREADS */
/* add threads, ... */
/* USER CODE END RTOS_THREADS */
}
/* USER CODE BEGIN Header_start_tcp_task */
@ -162,7 +164,7 @@ void MX_FREERTOS_Init(void) {
* @retval None
*/
/* USER CODE END Header_start_tcp_task */
void start_tcp_task(void const * argument)
void start_tcp_task(void const *argument)
{
/* init code for LWIP */
MX_LWIP_Init();
@ -185,14 +187,14 @@ void start_tcp_task(void const * argument)
* @retval None
*/
/* USER CODE END Header_start_led_toggle_task */
void start_led_toggle_task(void const * argument)
void start_led_toggle_task(void const *argument)
{
/* USER CODE BEGIN start_led_toggle_task */
/* Infinite loop */
for (;;)
{
HAL_GPIO_TogglePin(LED3_G_GPIO_Port, LED3_G_Pin);
// 旋转编ç <EFBFBD>器确认按键状æ€<EFBFBD>，并切æ<EFBFBD>¢ï¿½?�é<C2BD>“和确认电æµ<C3A6>�?�输ï¿???
// 旋转编码器确认按键状态，并切换<EFBFBD>?<3F>道和确认电流<E794B5>?<3F>输<EFBFBD>?????
// if (uart_lcd_state.page_num == 0)
{
if (ec11_data.confirm_key_flag == 0)
@ -259,14 +261,14 @@ void start_led_toggle_task(void const * argument)
* @retval None
*/
/* USER CODE END Header_start_dac_task */
void start_dac_task(void const * argument)
void start_dac_task(void const *argument)
{
/* USER CODE BEGIN start_dac_task */
dac161s997_init();
/* Infinite loop */
for (;;)
{
osThreadSuspend(adc_taskHandle); // æš‚å<EFBFBD>œADC任务，防止DAC采集时产生干ï¿???,因为ADCå’ŒDAC采用的是å<C2AF>Œä¸€è·¯SPI，但是时åº<C3A5>ä¸<C3A4>ï¿???
osThreadSuspend(adc_taskHandle); // 暂停ADC任务，防止DAC采集时产生干<EFBFBD>?????,因为ADC和DAC采用的是同一路SPI，但是时序不<E5BA8F>?????
dac161s997_output(DAC161S997_1, current_buff[0]);
dac161s997_output(DAC161S997_2, current_buff[1]);
osThreadResume(adc_taskHandle);
@ -282,14 +284,14 @@ void start_dac_task(void const * argument)
* @retval None
*/
/* USER CODE END Header_start_adc_task */
void start_adc_task(void const * argument)
void start_adc_task(void const *argument)
{
/* USER CODE BEGIN start_adc_task */
ad7124_setup();
/* Infinite loop */
for (;;)
{
osThreadSuspend(dac_taskHandle); // æš‚å<EFBFBD>œDAC任务，防止ADC采集时产生干ï¿???,因为ADCå’ŒDAC采用的是å<C2AF>Œä¸€è·¯SPI，但是时åº<C3A5>ä¸<C3A4>ï¿???
osThreadSuspend(dac_taskHandle); // 暂停DAC任务，防止ADC采集时产生干<EFBFBD>?????,因为ADC和DAC采用的是同一路SPI，但是时序不<E5BA8F>?????
uint8_t ch = 0;
for (ch = STOP_NC_ADC; ch < AD7124_CHANNEL_EN_MAX; ch++)
{
@ -319,7 +321,7 @@ void start_adc_task(void const * argument)
* @retval None
*/
/* USER CODE END Header_start_gpio_di_do_task */
void start_gpio_di_do_task(void const * argument)
void start_gpio_di_do_task(void const *argument)
{
/* USER CODE BEGIN start_gpio_di_do_task */
/* Infinite loop */
@ -329,11 +331,11 @@ void start_gpio_di_do_task(void const * argument)
uint8_t di_ch = 0;
uint8_t tx_data_len = 7 + DI_MAX;
uint8_t tx_data[32] = {0};
tx_data[0] = FRAME_HEAD; // 甯уã<C692>”
tx_data[1] = COM_OK; // é<>˜è®¹ï¿????锟界ï¿???
tx_data[2] = DEVICE_NUM; // ç’<C3A7>惧锟??
tx_data[3] = SEND_STATE_CMD; // é<>›æˆ’护锟??
tx_data[4] = DI_MAX; // é<><C3A9>版åµ<C3A5>闀垮害
tx_data[0] = FRAME_HEAD;
tx_data[1] = COM_OK;
tx_data[2] = DEVICE_NUM;
tx_data[3] = SEND_STATE_CMD;
tx_data[4] = DI_MAX;
for (di_ch = 0; di_ch < DI_MAX; di_ch++)
{
di_state_now[di_ch] = gpio_di_test(di_ch);
@ -367,18 +369,20 @@ void start_gpio_di_do_task(void const * argument)
* @retval None
*/
/* USER CODE END Header_start_ec11_task */
void start_ec11_task(void const * argument)
void start_ec11_task(void const *argument)
{
/* USER CODE BEGIN start_ec11_task */
/* Infinite loop */
for (;;)
{
// 旋转编ç <C3A7>器调节电æµ<C3A6>�?�画é<C2BB>¢æ˜¾ï¿???
encode_direction = __HAL_TIM_IS_TIM_COUNTING_DOWN(&htim8);
encode_num = (short)__HAL_TIM_GET_COUNTER(&htim8);
// 旋转编码器调节电流<E794B5>?<3F>画面显<E99DA2>?????
if (uart_lcd_state.page_num == 0)
{
ec11_data.direction = __HAL_TIM_IS_TIM_COUNTING_DOWN(&htim1);
ec11_data.encode_num = (short)__HAL_TIM_GET_COUNTER(&htim1);
if ((ec11_data.direction == 0) && (ec11_data.encode_num > ec11_data.encode_num_last))
{
if (uart_lcd_state.key_state[0] == 0)

9
Core/Src/main.c
View File

@ -195,7 +195,8 @@ void SystemClock_Config(void)
/** Initializes the CPU, AHB and APB buses clocks
*/
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
@ -219,7 +220,7 @@ void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
memcpy(usb_uart1.rx_data, usb_uart1.rx_data_temp, Size);
HAL_UARTEx_ReceiveToIdle_DMA(&huart1, usb_uart1.rx_data_temp, ARRAY_LEN(usb_uart1.rx_data_temp));
// dma_usart_send(&huart4, usb_uart1.rx_data_temp, usb_uart1.rx_num);
// ip地址更新
// IP address assignment
IP4_ADDR(&ipaddr, usb_uart1.rx_data_temp[0], usb_uart1.rx_data_temp[1], usb_uart1.rx_data_temp[2], usb_uart1.rx_data_temp[3]);
gnetif.ip_addr = ipaddr;
if (flash_write_data(FLASH_USER_START_ADDR, usb_uart1.rx_data_temp, Size) == HAL_OK) // 写入flash戝功，更新ip地址显示
@ -234,7 +235,6 @@ void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
memset(lcd_uart4.rx_data, 0, ARRAY_LEN(lcd_uart4.rx_data));
memcpy(lcd_uart4.rx_data, lcd_uart4.rx_data_temp, Size);
HAL_UARTEx_ReceiveToIdle_DMA(&huart4, lcd_uart4.rx_data_temp, ARRAY_LEN(lcd_uart4.rx_data_temp));
// dma_usart_send(&huart4, lcd_uart4.rx_data_temp, lcd_uart4.rx_num);
}
#if (BLE2_USART6 == 1)
if (huart == &huart6)
@ -340,8 +340,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
/* USER CODE BEGIN Callback 0 */
/* USER CODE END Callback 0 */
if (htim->Instance == TIM4)
{
if (htim->Instance == TIM4) {
HAL_IncTick();
}
/* USER CODE BEGIN Callback 1 */

4
Core/Src/tim.c
View File

@ -44,7 +44,7 @@ void MX_TIM1_Init(void)
/* USER CODE END TIM1_Init 1 */
htim1.Instance = TIM1;
htim1.Init.Prescaler = 2;
htim1.Init.Prescaler = 0;
htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
htim1.Init.Period = 65535;
htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
@ -197,7 +197,7 @@ void MX_TIM8_Init(void)
/* USER CODE END TIM8_Init 1 */
htim8.Instance = TIM8;
htim8.Init.Prescaler = 2;
htim8.Init.Prescaler = 0;
htim8.Init.CounterMode = TIM_COUNTERMODE_UP;
htim8.Init.Period = 65535;
htim8.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;

65
Core/Src/usart.c
View File

@ -66,6 +66,7 @@ void MX_UART4_Init(void)
/* USER CODE BEGIN UART4_Init 2 */
//__HAL_UART_ENABLE_IT(&huart4, UART_IT_IDLE); // 使能IDLE中断
/* USER CODE END UART4_Init 2 */
}
/* UART5 init function */
void MX_UART5_Init(void)
@ -94,6 +95,7 @@ void MX_UART5_Init(void)
// __HAL_UART_ENABLE_IT(&huart5, UART_IT_RXNE); // 接收中断
// __HAL_UART_ENABLE_IT(&huart5, UART_IT_IDLE); // 空闲中断
/* USER CODE END UART5_Init 2 */
}
/* USART1 init function */
@ -122,6 +124,7 @@ void MX_USART1_UART_Init(void)
/* USER CODE BEGIN USART1_Init 2 */
/* USER CODE END USART1_Init 2 */
}
/* USART2 init function */
@ -151,6 +154,7 @@ void MX_USART2_UART_Init(void)
// __HAL_UART_ENABLE_IT(&huart2, UART_IT_RXNE); // 接收中断
// __HAL_UART_ENABLE_IT(&huart2, UART_IT_IDLE); // 使能IDLE中断
/* USER CODE END USART2_Init 2 */
}
/* USART3 init function */
@ -179,13 +183,14 @@ void MX_USART3_UART_Init(void)
/* USER CODE BEGIN USART3_Init 2 */
/* USER CODE END USART3_Init 2 */
}
void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
if (uartHandle->Instance == UART4)
if(uartHandle->Instance==UART4)
{
/* USER CODE BEGIN UART4_MspInit 0 */
@ -198,7 +203,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
PC10 ------> UART4_TX
PC11 ------> UART4_RX
*/
GPIO_InitStruct.Pin = LCD_TX_Pin | LCD_RX_Pin;
GPIO_InitStruct.Pin = LCD_TX_Pin|LCD_RX_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
@ -222,7 +227,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmarx, hdma_uart4_rx);
__HAL_LINKDMA(uartHandle,hdmarx,hdma_uart4_rx);
/* UART4_TX Init */
hdma_uart4_tx.Instance = DMA1_Stream4;
@ -240,7 +245,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmatx, hdma_uart4_tx);
__HAL_LINKDMA(uartHandle,hdmatx,hdma_uart4_tx);
/* UART4 interrupt Init */
HAL_NVIC_SetPriority(UART4_IRQn, 5, 0);
@ -249,7 +254,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
/* USER CODE END UART4_MspInit 1 */
}
else if (uartHandle->Instance == UART5)
else if(uartHandle->Instance==UART5)
{
/* USER CODE BEGIN UART5_MspInit 0 */
@ -294,7 +299,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmatx, hdma_uart5_tx);
__HAL_LINKDMA(uartHandle,hdmatx,hdma_uart5_tx);
/* UART5_RX Init */
hdma_uart5_rx.Instance = DMA1_Stream0;
@ -312,7 +317,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmarx, hdma_uart5_rx);
__HAL_LINKDMA(uartHandle,hdmarx,hdma_uart5_rx);
/* UART5 interrupt Init */
HAL_NVIC_SetPriority(UART5_IRQn, 5, 0);
@ -321,7 +326,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
/* USER CODE END UART5_MspInit 1 */
}
else if (uartHandle->Instance == USART1)
else if(uartHandle->Instance==USART1)
{
/* USER CODE BEGIN USART1_MspInit 0 */
@ -334,7 +339,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
PA9 ------> USART1_TX
PA10 ------> USART1_RX
*/
GPIO_InitStruct.Pin = USB_TX_Pin | USB_RX_Pin;
GPIO_InitStruct.Pin = USB_TX_Pin|USB_RX_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
@ -358,7 +363,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmarx, hdma_usart1_rx);
__HAL_LINKDMA(uartHandle,hdmarx,hdma_usart1_rx);
/* USART1_TX Init */
hdma_usart1_tx.Instance = DMA2_Stream7;
@ -376,7 +381,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmatx, hdma_usart1_tx);
__HAL_LINKDMA(uartHandle,hdmatx,hdma_usart1_tx);
/* USART1 interrupt Init */
HAL_NVIC_SetPriority(USART1_IRQn, 5, 0);
@ -385,7 +390,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
/* USER CODE END USART1_MspInit 1 */
}
else if (uartHandle->Instance == USART2)
else if(uartHandle->Instance==USART2)
{
/* USER CODE BEGIN USART2_MspInit 0 */
@ -398,7 +403,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
PD5 ------> USART2_TX
PD6 ------> USART2_RX
*/
GPIO_InitStruct.Pin = HART2_TX_Pin | HART2_RX_Pin;
GPIO_InitStruct.Pin = HART2_TX_Pin|HART2_RX_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
@ -422,7 +427,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmarx, hdma_usart2_rx);
__HAL_LINKDMA(uartHandle,hdmarx,hdma_usart2_rx);
/* USART2_TX Init */
hdma_usart2_tx.Instance = DMA1_Stream6;
@ -440,7 +445,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmatx, hdma_usart2_tx);
__HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx);
/* USART2 interrupt Init */
HAL_NVIC_SetPriority(USART2_IRQn, 5, 0);
@ -449,7 +454,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
/* USER CODE END USART2_MspInit 1 */
}
else if (uartHandle->Instance == USART3)
else if(uartHandle->Instance==USART3)
{
/* USER CODE BEGIN USART3_MspInit 0 */
@ -462,7 +467,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
PD8 ------> USART3_TX
PD9 ------> USART3_RX
*/
GPIO_InitStruct.Pin = BLE2_TX_Pin | BLE2_RX_Pin;
GPIO_InitStruct.Pin = BLE2_TX_Pin|BLE2_RX_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
@ -486,7 +491,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmarx, hdma_usart3_rx);
__HAL_LINKDMA(uartHandle,hdmarx,hdma_usart3_rx);
/* USART3_TX Init */
hdma_usart3_tx.Instance = DMA1_Stream3;
@ -504,7 +509,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
Error_Handler();
}
__HAL_LINKDMA(uartHandle, hdmatx, hdma_usart3_tx);
__HAL_LINKDMA(uartHandle,hdmatx,hdma_usart3_tx);
/* USART3 interrupt Init */
HAL_NVIC_SetPriority(USART3_IRQn, 5, 0);
@ -515,10 +520,10 @@ void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle)
}
}
void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
{
if (uartHandle->Instance == UART4)
if(uartHandle->Instance==UART4)
{
/* USER CODE BEGIN UART4_MspDeInit 0 */
@ -530,7 +535,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
PC10 ------> UART4_TX
PC11 ------> UART4_RX
*/
HAL_GPIO_DeInit(GPIOC, LCD_TX_Pin | LCD_RX_Pin);
HAL_GPIO_DeInit(GPIOC, LCD_TX_Pin|LCD_RX_Pin);
/* UART4 DMA DeInit */
HAL_DMA_DeInit(uartHandle->hdmarx);
@ -542,7 +547,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
/* USER CODE END UART4_MspDeInit 1 */
}
else if (uartHandle->Instance == UART5)
else if(uartHandle->Instance==UART5)
{
/* USER CODE BEGIN UART5_MspDeInit 0 */
@ -568,7 +573,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
/* USER CODE END UART5_MspDeInit 1 */
}
else if (uartHandle->Instance == USART1)
else if(uartHandle->Instance==USART1)
{
/* USER CODE BEGIN USART1_MspDeInit 0 */
@ -580,7 +585,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
PA9 ------> USART1_TX
PA10 ------> USART1_RX
*/
HAL_GPIO_DeInit(GPIOA, USB_TX_Pin | USB_RX_Pin);
HAL_GPIO_DeInit(GPIOA, USB_TX_Pin|USB_RX_Pin);
/* USART1 DMA DeInit */
HAL_DMA_DeInit(uartHandle->hdmarx);
@ -592,7 +597,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
/* USER CODE END USART1_MspDeInit 1 */
}
else if (uartHandle->Instance == USART2)
else if(uartHandle->Instance==USART2)
{
/* USER CODE BEGIN USART2_MspDeInit 0 */
@ -604,7 +609,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
PD5 ------> USART2_TX
PD6 ------> USART2_RX
*/
HAL_GPIO_DeInit(GPIOD, HART2_TX_Pin | HART2_RX_Pin);
HAL_GPIO_DeInit(GPIOD, HART2_TX_Pin|HART2_RX_Pin);
/* USART2 DMA DeInit */
HAL_DMA_DeInit(uartHandle->hdmarx);
@ -616,7 +621,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
/* USER CODE END USART2_MspDeInit 1 */
}
else if (uartHandle->Instance == USART3)
else if(uartHandle->Instance==USART3)
{
/* USER CODE BEGIN USART3_MspDeInit 0 */
@ -628,7 +633,7 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
PD8 ------> USART3_TX
PD9 ------> USART3_RX
*/
HAL_GPIO_DeInit(GPIOD, BLE2_TX_Pin | BLE2_RX_Pin);
HAL_GPIO_DeInit(GPIOD, BLE2_TX_Pin|BLE2_RX_Pin);
/* USART3 DMA DeInit */
HAL_DMA_DeInit(uartHandle->hdmarx);

14
MDK-ARM/semi-finished_product_testing.uvoptx
View File

@ -293,7 +293,7 @@
<Ww>
<count>28</count>
<WinNumber>1</WinNumber>
<ItemText>ec11_data</ItemText>
<ItemText>ec11_data,0x0A</ItemText>
</Ww>
<Ww>
<count>29</count>
@ -310,6 +310,16 @@
<WinNumber>1</WinNumber>
<ItemText>huart-&gt;pTxBuffPtr</ItemText>
</Ww>
<Ww>
<count>32</count>
<WinNumber>1</WinNumber>
<ItemText>encode_direction,0x0A</ItemText>
</Ww>
<Ww>
<count>33</count>
<WinNumber>1</WinNumber>
<ItemText>encode_num,0x0A</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
@ -327,7 +337,7 @@
<periodic>1</periodic>
<aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>1</aSer1>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
<aPa>0</aPa>
<viewmode>1</viewmode>

5748
MDK-ARM/semi-finished_product_testing/semi-finished_product_testing.hex
View File

File diff suppressed because it is too large Load Diff

4
semi-finished_product_testing.ioc
View File

@ -669,7 +669,7 @@ SPI1.Mode=SPI_MODE_MASTER
SPI1.VirtualType=VM_MASTER
TIM1.EncoderMode=TIM_ENCODERMODE_TI12
TIM1.IPParameters=EncoderMode,Prescaler
TIM1.Prescaler=2
TIM1.Prescaler=0
TIM2.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
TIM2.IPParameters=Channel-PWM Generation1 CH1,Period,Pulse-PWM Generation1 CH1
TIM2.Period=119
@ -681,7 +681,7 @@ TIM3.Prescaler=54
TIM3.Pulse-PWM\ Generation3\ CH3=92
TIM8.EncoderMode=TIM_ENCODERMODE_TI12
TIM8.IPParameters=Prescaler,EncoderMode
TIM8.Prescaler=2
TIM8.Prescaler=0
UART4.IPParameters=VirtualMode
UART4.VirtualMode=Asynchronous
UART5.BaudRate=1200