111备份
This commit is contained in:
parent
7557a66d79
commit
0565ff757c
|
@ -126,7 +126,7 @@ int main(void)
|
||||||
MX_TIM1_Init();
|
MX_TIM1_Init();
|
||||||
MX_USART1_UART_Init();
|
MX_USART1_UART_Init();
|
||||||
/* USER CODE BEGIN 2 */
|
/* USER CODE BEGIN 2 */
|
||||||
/*闂佹澘绉堕悿鍡涘触閸曨亣顩柛娆欑悼濞堟厪MA闁规亽鍎查弫锟<E5BCAB>*/
|
// 串口DMA接收中断
|
||||||
// start
|
// start
|
||||||
HAL_UARTEx_ReceiveToIdle_DMA(&huart4, lcd_uart4.rx_data_temp, ARRAY_LEN(lcd_uart4.rx_data_temp));
|
HAL_UARTEx_ReceiveToIdle_DMA(&huart4, lcd_uart4.rx_data_temp, ARRAY_LEN(lcd_uart4.rx_data_temp));
|
||||||
HAL_UARTEx_ReceiveToIdle_DMA(&huart6, ble1_uart6.rx_data_temp, ARRAY_LEN(ble1_uart6.rx_data_temp));
|
HAL_UARTEx_ReceiveToIdle_DMA(&huart6, ble1_uart6.rx_data_temp, ARRAY_LEN(ble1_uart6.rx_data_temp));
|
||||||
|
@ -135,9 +135,9 @@ int main(void)
|
||||||
HAL_UARTEx_ReceiveToIdle_DMA(&huart2, hart2_uart2.rx_data_temp, ARRAY_LEN(hart2_uart2.rx_data_temp));
|
HAL_UARTEx_ReceiveToIdle_DMA(&huart2, hart2_uart2.rx_data_temp, ARRAY_LEN(hart2_uart2.rx_data_temp));
|
||||||
HAL_UARTEx_ReceiveToIdle_DMA(&huart1, usb_uart1.rx_data_temp, ARRAY_LEN(usb_uart1.rx_data_temp));
|
HAL_UARTEx_ReceiveToIdle_DMA(&huart1, usb_uart1.rx_data_temp, ARRAY_LEN(usb_uart1.rx_data_temp));
|
||||||
// end
|
// end
|
||||||
hart_ht1200m_reset(); // 闁告帗绻傞~鎰板礌閺堟壍1200M婵☆垪鈧櫕鍋<EFBFBD>
|
hart_ht1200m_reset(); // HART模块复位
|
||||||
HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1); // PWM閺夊牊鎸搁崵顓㈡晬<EFBFBD>?<3F>€鈧弫銈嗙鎼淬劉鏀抽柛鏂哄墻T1200M婵☆垪鈧櫕鍋<E6AB95>
|
HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1); // HART时钟信号
|
||||||
HAL_TIM_Encoder_Start(&htim1, TIM_CHANNEL_ALL); // 闁哄啫顑堝ù鍡欑磽閺嶎偆鍨抽柛锝冨<EFBFBD>?缁额參宕<E58F83>??
|
HAL_TIM_Encoder_Start(&htim1, TIM_CHANNEL_ALL); // 旋转编码器信号采集
|
||||||
/* USER CODE END 2 */
|
/* USER CODE END 2 */
|
||||||
|
|
||||||
/* Call init function for freertos objects (in freertos.c) */
|
/* Call init function for freertos objects (in freertos.c) */
|
||||||
|
@ -213,10 +213,10 @@ void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
|
||||||
memcpy(usb_uart1.rx_data, usb_uart1.rx_data_temp, 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));
|
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);
|
// dma_usart_send(&huart4, usb_uart1.rx_data_temp, usb_uart1.rx_num);
|
||||||
// ip闁革附婢樺鍐╃┍椤旇姤鏆璺哄閹<EFBFBD>?
|
// ip地址更新
|
||||||
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]);
|
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;
|
gnetif.ip_addr = ipaddr;
|
||||||
if (flash_write_data(FLASH_USER_START_ADDR, usb_uart1.rx_data_temp, Size) == HAL_OK)
|
if (flash_write_data(FLASH_USER_START_ADDR, usb_uart1.rx_data_temp, Size) == HAL_OK) // 写入flash成功,更新ip地址显示
|
||||||
{
|
{
|
||||||
uart_lcd_draw_ipaddr();
|
uart_lcd_draw_ipaddr();
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue