diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c
index 0465362..5344c94 100644
--- a/Core/Src/freertos.c
+++ b/Core/Src/freertos.c
@@ -179,7 +179,6 @@ void start_tcp_task(void const *argument)
/* Infinite loop */
for (;;)
{
- // uart_lcd_draw_ipaddr();
osThreadTerminate(NULL);
}
/* USER CODE END start_tcp_task */
@@ -201,7 +200,7 @@ void start_led_toggle_task(void const *argument)
HAL_GPIO_TogglePin(LED3_G_GPIO_Port, LED3_G_Pin);
uart_lcd_ecll_control_current_out();
- vTaskDelay(500);
+ vTaskDelay(300);
}
/* USER CODE END start_led_toggle_task */
}
@@ -220,10 +219,10 @@ void start_dac_task(void const *argument)
/* Infinite loop */
for (;;)
{
- osThreadSuspend(adc_taskHandle);
+ osThreadSuspend(adc_taskHandle); // Suspend ADC task to prevent conflicts with ADC task.
dac161s997_output(DAC161S997_1, current_buff[0]);
dac161s997_output(DAC161S997_2, current_buff[1]);
- osThreadResume(adc_taskHandle);
+ osThreadResume(adc_taskHandle); // Resume ADC task.
vTaskDelay(100);
}
/* USER CODE END start_dac_task */
@@ -243,13 +242,13 @@ void start_adc_task(void const *argument)
/* Infinite loop */
for (;;)
{
- osThreadSuspend(dac_taskHandle);
+ osThreadSuspend(dac_taskHandle); // Suspend DAC task to prevent conflicts with DAC task.
uint8_t ch = 0;
for (ch = STOP_NC_ADC; ch < AD7124_CHANNEL_EN_MAX; ch++)
{
ad7124_get_analog(ch);
}
- osThreadResume(dac_taskHandle);
+ osThreadResume(dac_taskHandle); // Resume DAC task.
vTaskDelay(10);
}
/* USER CODE END start_adc_task */
@@ -286,7 +285,6 @@ void start_ec11_task(void const *argument)
/* Infinite loop */
for (;;)
{
-
uart_lcd_ec11_control_current();
vTaskDelay(100);
}
@@ -307,7 +305,8 @@ void start_lcd_task(void const *argument)
/* Infinite loop */
for (;;)
{
- vTaskDelay(10);
+ uart_lcd_makecurve_test();
+ vTaskDelay(300);
}
/* USER CODE END start_lcd_task */
}
diff --git a/Core/Src/main.c b/Core/Src/main.c
index c185c44..ad3dc7f 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -126,18 +126,18 @@ int main(void)
MX_TIM1_Init();
MX_USART1_UART_Init();
/* USER CODE BEGIN 2 */
- /*酝置坄串坣的DMA接收*/
+ /*Configure serial port DMA reception*/
// start
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(&huart3, ble2_uart3.rx_data_temp, ARRAY_LEN(ble2_uart3.rx_data_temp));
- HAL_UARTEx_ReceiveToIdle_DMA(&huart5, hart1_uart5.rx_data_temp, ARRAY_LEN(hart1_uart5.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(&huart6, ble1_uart6.rx_data_temp, ARRAY_LEN(ble1_uart6.rx_data_temp));
+ // HAL_UARTEx_ReceiveToIdle_DMA(&huart3, ble2_uart3.rx_data_temp, ARRAY_LEN(ble2_uart3.rx_data_temp));
+ // HAL_UARTEx_ReceiveToIdle_DMA(&huart5, hart1_uart5.rx_data_temp, ARRAY_LEN(hart1_uart5.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));
// end
- hart_ht1200m_reset(); // 初?化HT1200M模块
- HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1); // PWM输出，用于驱动HT1200M模块
- HAL_TIM_Encoder_Start(&htim1, TIM_CHANNEL_ALL); // 旋转编砝器输???
+ hart_ht1200m_reset(); // Reset HT1200M
+ HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1); // PWM output, used to drive the HT1200M module
+ HAL_TIM_Encoder_Start(&htim1, TIM_CHANNEL_ALL); // rotary encoder
/* USER CODE END 2 */
/* Call init function for freertos objects (in freertos.c) */
@@ -212,13 +212,11 @@ void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
memset(usb_uart1.rx_data, 0, ARRAY_LEN(usb_uart1.rx_data));
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地址?处理
+ // UART receives IP address
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)
{
- // uart_lcd_draw_ipaddr();
}
}
if (huart == &huart4)
@@ -228,7 +226,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 (huart == &huart6)
{
@@ -291,7 +288,7 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
}
if (huart == &huart4)
{
- HART2_RTS_RECEIVE;
+ uart_lcd_state.lcd_flag = 0; // Reset the LCD flag after sending data
}
}
@@ -349,7 +346,6 @@ void Error_Handler(void)
// while (1)
// {
// }
- // TODO ʱעͣԭΪDMA̫죬·ʧ
/* USER CODE END Error_Handler_Debug */
}
diff --git a/Core/Src/usart.c b/Core/Src/usart.c
index 7c51af2..40146f5 100644
--- a/Core/Src/usart.c
+++ b/Core/Src/usart.c
@@ -21,6 +21,7 @@
#include "usart.h"
/* USER CODE BEGIN 0 */
+#include "uart_lcd.h"
/* USER CODE END 0 */
UART_HandleTypeDef huart4;
@@ -772,8 +773,12 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef *uartHandle)
*/
void dma_usart_send(UART_HandleTypeDef *huart, uint8_t *buf, uint8_t len)
{
-
- if (HAL_UART_Transmit_DMA(huart, buf, len) != HAL_OK) // ĺ¤ććŻĺŚĺé?ćŁĺ¸¸ďźĺŚćĺşç°ĺźĺ¸¸ĺčżĺ
Ľĺźĺ¸¸ä¸ćĺ˝ć?
+ while (uart_lcd_state.lcd_flag != 0)
+ {
+ }
+
+ uart_lcd_state.lcd_flag = 1; // 设置标志位，表示正在发送数据
+ if (HAL_UART_Transmit_DMA(huart, buf, len) != HAL_OK)
{
Error_Handler();
}
diff --git a/LCD/signal generator/dciot_build/private/bin/screen.bin b/LCD/signal generator/dciot_build/private/bin/screen.bin
index c242ece..cb7029c 100644
Binary files a/LCD/signal generator/dciot_build/private/bin/screen.bin and b/LCD/signal generator/dciot_build/private/bin/screen.bin differ
diff --git a/LCD/signal generator/monitoring.tft b/LCD/signal generator/monitoring.tft
index 6c7adf5..044c55b 100644
--- a/LCD/signal generator/monitoring.tft
+++ b/LCD/signal generator/monitoring.tft
@@ -1,2 +1 @@
-