diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c
index 7186cab..71b41f8 100644
--- a/Core/Src/freertos.c
+++ b/Core/Src/freertos.c
@@ -198,43 +198,10 @@ void start_led_toggle_task(void const *argument)
/* Infinite loop */
for (;;)
{
- if (ec11_data.confirm_key_flag == 0)
- {
- HAL_GPIO_TogglePin(LED2_Y_GPIO_Port, LED2_Y_Pin);
- }
- else if (ec11_data.confirm_key_flag == 1)
- {
- ec11_data.confirm_key_flag_last++;
- if (ec11_data.confirm_key_flag_last > 3)
- {
- current_buff[0] = (float)uart_lcd_state.current_value[0];
- current_buff[1] = (float)uart_lcd_state.current_value[1];
- ec11_data.confirm_key_flag_last = 0;
- ec11_data.confirm_key_flag = 0;
- }
- }
- else if (ec11_data.confirm_key_flag == 2)
- {
- ec11_data.confirm_key_flag_last = 0;
+ HAL_GPIO_TogglePin(LED3_G_GPIO_Port, LED3_G_Pin);
- if (uart_lcd_state.key_state[0] == 1)
- {
- uart_lcd_state.key_state[0] = 0;
- uart_lcd_state.key_state[1] = 1;
- uart_lcd_state.key_state[2] = 0;
- }
- else if (uart_lcd_state.key_state[0] == 0)
- {
- uart_lcd_state.key_state[0] = 1;
- uart_lcd_state.key_state[1] = 0;
- uart_lcd_state.key_state[2] = 1;
- }
-
- ec11_data.confirm_key_flag = 0;
- uart_lcd_channel_switch(uart_lcd_state.key_state[0]);
- }
-
- vTaskDelay(400);
+ uart_lcd_ecll_control_current_out();
+ vTaskDelay(500);
}
/* USER CODE END start_led_toggle_task */
}
@@ -358,56 +325,8 @@ void start_ec11_task(void const *argument)
/* Infinite loop */
for (;;)
{
- 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)
- {
- uart_lcd_state.current_value[0] += 1;
- if (uart_lcd_state.current_value[0] > 20)
- {
- uart_lcd_state.current_value[0] = 20;
- }
- }
- else if (uart_lcd_state.key_state[0] == 1)
- {
- uart_lcd_state.current_value[1] += 1;
- if (uart_lcd_state.current_value[1] > 20)
- {
- uart_lcd_state.current_value[1] = 20;
- }
- }
- // current_buff[0] = (float)uart_lcd_state.current_value[0];
- }
- if ((ec11_data.direction == 1) && (ec11_data.encode_num < ec11_data.encode_num_last))
- {
- if (uart_lcd_state.key_state[0] == 0)
- {
- if (uart_lcd_state.current_value[0] < 2)
- {
- uart_lcd_state.current_value[0] = 0;
- }
- else
- {
- uart_lcd_state.current_value[0] -= 1;
- }
- }
- else if (uart_lcd_state.key_state[0] == 1)
- {
- if (uart_lcd_state.current_value[1] < 2)
- {
- uart_lcd_state.current_value[1] = 0;
- }
- else
- {
- uart_lcd_state.current_value[1] -= 1;
- }
- }
- // current_buff[1] = (float)uart_lcd_state.current_value[1];
- }
- uart_lcd_current_out(uart_lcd_state.key_state[0]);
- ec11_data.encode_num_last = ec11_data.encode_num;
+
+ uart_lcd_ec11_control_current();
vTaskDelay(100);
}
/* USER CODE END start_ec11_task */
diff --git a/Core/Src/main.c b/Core/Src/main.c
index e6d5254..c185c44 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -126,7 +126,7 @@ int main(void)
MX_TIM1_Init();
MX_USART1_UART_Init();
/* USER CODE BEGIN 2 */
- /*閰濈疆鍧勪覆鍧ｇ殑DMA鎺ユ敹*/
+ /*酝置坄串坣的DMA接收*/
// 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));
@@ -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(&huart1, usb_uart1.rx_data_temp, ARRAY_LEN(usb_uart1.rx_data_temp));
// end
- hart_ht1200m_reset(); // 鍒濆鍖朒T1200M妯″潡
- HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1); // PWM杈撳嚭锛岀敤浜庨┍鍔℉T1200M妯″潡
- HAL_TIM_Encoder_Start(&htim1, TIM_CHANNEL_ALL); // 鏃嬭浆缂栫牆鍣ㄨ緭锟�??
+ hart_ht1200m_reset(); // 初?化HT1200M模块
+ HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1); // PWM输出，用于驱动HT1200M模块
+ HAL_TIM_Encoder_Start(&htim1, TIM_CHANNEL_ALL); // 旋转编砝器输???
/* USER CODE END 2 */
/* Call init function for freertos objects (in freertos.c) */
@@ -213,7 +213,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地址?处理
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)
@@ -294,6 +294,25 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
HART2_RTS_RECEIVE;
}
}
+
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+ if (GPIO_Pin == EC11_KEY_Pin)
+ {
+ if (ec11_data.confirm_key_flag == 0)
+ {
+ ec11_data.confirm_key_flag = 1;
+ }
+ else if (ec11_data.confirm_key_flag == 1)
+ {
+ ec11_data.confirm_key_flag = 2;
+ }
+ else if (ec11_data.confirm_key_flag == 2)
+ {
+ ec11_data.confirm_key_flag = 3;
+ }
+ }
+}
/* USER CODE END 4 */
/**
@@ -330,7 +349,7 @@ void Error_Handler(void)
// while (1)
// {
// }
- // TODO 这里暂时注释，导致原因为DMA发送太快，导致发送失败
+ // TODO ʱעͣԭΪDMA̫죬·ʧ
/* USER CODE END Error_Handler_Debug */
}
diff --git a/Core/Src/stm32f4xx_it.c b/Core/Src/stm32f4xx_it.c
index cce27ae..26127e5 100644
--- a/Core/Src/stm32f4xx_it.c
+++ b/Core/Src/stm32f4xx_it.c
@@ -92,8 +92,8 @@ extern TIM_HandleTypeDef htim4;
/* Cortex-M4 Processor Interruption and Exception Handlers */
/******************************************************************************/
/**
- * @brief This function handles Non maskable interrupt.
- */
+ * @brief This function handles Non maskable interrupt.
+ */
void NMI_Handler(void)
{
/* USER CODE BEGIN NonMaskableInt_IRQn 0 */
@@ -107,8 +107,8 @@ void NMI_Handler(void)
}
/**
- * @brief This function handles Hard fault interrupt.
- */
+ * @brief This function handles Hard fault interrupt.
+ */
void HardFault_Handler(void)
{
/* USER CODE BEGIN HardFault_IRQn 0 */
@@ -122,8 +122,8 @@ void HardFault_Handler(void)
}
/**
- * @brief This function handles Memory management fault.
- */
+ * @brief This function handles Memory management fault.
+ */
void MemManage_Handler(void)
{
/* USER CODE BEGIN MemoryManagement_IRQn 0 */
@@ -137,8 +137,8 @@ void MemManage_Handler(void)
}
/**
- * @brief This function handles Pre-fetch fault, memory access fault.
- */
+ * @brief This function handles Pre-fetch fault, memory access fault.
+ */
void BusFault_Handler(void)
{
/* USER CODE BEGIN BusFault_IRQn 0 */
@@ -152,8 +152,8 @@ void BusFault_Handler(void)
}
/**
- * @brief This function handles Undefined instruction or illegal state.
- */
+ * @brief This function handles Undefined instruction or illegal state.
+ */
void UsageFault_Handler(void)
{
/* USER CODE BEGIN UsageFault_IRQn 0 */
@@ -167,8 +167,8 @@ void UsageFault_Handler(void)
}
/**
- * @brief This function handles Debug monitor.
- */
+ * @brief This function handles Debug monitor.
+ */
void DebugMon_Handler(void)
{
/* USER CODE BEGIN DebugMonitor_IRQn 0 */
@@ -187,8 +187,8 @@ void DebugMon_Handler(void)
/******************************************************************************/
/**
- * @brief This function handles EXTI line1 interrupt.
- */
+ * @brief This function handles EXTI line1 interrupt.
+ */
void EXTI1_IRQHandler(void)
{
/* USER CODE BEGIN EXTI1_IRQn 0 */
@@ -201,8 +201,8 @@ void EXTI1_IRQHandler(void)
}
/**
- * @brief This function handles EXTI line3 interrupt.
- */
+ * @brief This function handles EXTI line3 interrupt.
+ */
void EXTI3_IRQHandler(void)
{
/* USER CODE BEGIN EXTI3_IRQn 0 */
@@ -215,8 +215,8 @@ void EXTI3_IRQHandler(void)
}
/**
- * @brief This function handles DMA1 stream0 global interrupt.
- */
+ * @brief This function handles DMA1 stream0 global interrupt.
+ */
void DMA1_Stream0_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream0_IRQn 0 */
@@ -229,8 +229,8 @@ void DMA1_Stream0_IRQHandler(void)
}
/**
- * @brief This function handles DMA1 stream1 global interrupt.
- */
+ * @brief This function handles DMA1 stream1 global interrupt.
+ */
void DMA1_Stream1_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream1_IRQn 0 */
@@ -243,8 +243,8 @@ void DMA1_Stream1_IRQHandler(void)
}
/**
- * @brief This function handles DMA1 stream2 global interrupt.
- */
+ * @brief This function handles DMA1 stream2 global interrupt.
+ */
void DMA1_Stream2_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream2_IRQn 0 */
@@ -257,8 +257,8 @@ void DMA1_Stream2_IRQHandler(void)
}
/**
- * @brief This function handles DMA1 stream3 global interrupt.
- */
+ * @brief This function handles DMA1 stream3 global interrupt.
+ */
void DMA1_Stream3_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream3_IRQn 0 */
@@ -271,8 +271,8 @@ void DMA1_Stream3_IRQHandler(void)
}
/**
- * @brief This function handles DMA1 stream4 global interrupt.
- */
+ * @brief This function handles DMA1 stream4 global interrupt.
+ */
void DMA1_Stream4_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream4_IRQn 0 */
@@ -285,8 +285,8 @@ void DMA1_Stream4_IRQHandler(void)
}
/**
- * @brief This function handles DMA1 stream5 global interrupt.
- */
+ * @brief This function handles DMA1 stream5 global interrupt.
+ */
void DMA1_Stream5_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream5_IRQn 0 */
@@ -299,8 +299,8 @@ void DMA1_Stream5_IRQHandler(void)
}
/**
- * @brief This function handles DMA1 stream6 global interrupt.
- */
+ * @brief This function handles DMA1 stream6 global interrupt.
+ */
void DMA1_Stream6_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream6_IRQn 0 */
@@ -313,8 +313,8 @@ void DMA1_Stream6_IRQHandler(void)
}
/**
- * @brief This function handles EXTI line[9:5] interrupts.
- */
+ * @brief This function handles EXTI line[9:5] interrupts.
+ */
void EXTI9_5_IRQHandler(void)
{
/* USER CODE BEGIN EXTI9_5_IRQn 0 */
@@ -322,20 +322,13 @@ void EXTI9_5_IRQHandler(void)
/* USER CODE END EXTI9_5_IRQn 0 */
HAL_GPIO_EXTI_IRQHandler(EC11_KEY_Pin);
/* USER CODE BEGIN EXTI9_5_IRQn 1 */
- if (ec11_data.confirm_key_flag == 1)
- {
- ec11_data.confirm_key_flag = 2;
- }
- else if (ec11_data.confirm_key_flag == 0)
- {
- ec11_data.confirm_key_flag = 1;
- }
+
/* USER CODE END EXTI9_5_IRQn 1 */
}
/**
- * @brief This function handles TIM4 global interrupt.
- */
+ * @brief This function handles TIM4 global interrupt.
+ */
void TIM4_IRQHandler(void)
{
/* USER CODE BEGIN TIM4_IRQn 0 */
@@ -348,8 +341,8 @@ void TIM4_IRQHandler(void)
}
/**
- * @brief This function handles USART1 global interrupt.
- */
+ * @brief This function handles USART1 global interrupt.
+ */
void USART1_IRQHandler(void)
{
/* USER CODE BEGIN USART1_IRQn 0 */
@@ -362,8 +355,8 @@ void USART1_IRQHandler(void)
}
/**
- * @brief This function handles USART2 global interrupt.
- */
+ * @brief This function handles USART2 global interrupt.
+ */
void USART2_IRQHandler(void)
{
/* USER CODE BEGIN USART2_IRQn 0 */
@@ -375,8 +368,8 @@ void USART2_IRQHandler(void)
}
/**
- * @brief This function handles USART3 global interrupt.
- */
+ * @brief This function handles USART3 global interrupt.
+ */
void USART3_IRQHandler(void)
{
/* USER CODE BEGIN USART3_IRQn 0 */
@@ -389,8 +382,8 @@ void USART3_IRQHandler(void)
}
/**
- * @brief This function handles DMA1 stream7 global interrupt.
- */
+ * @brief This function handles DMA1 stream7 global interrupt.
+ */
void DMA1_Stream7_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Stream7_IRQn 0 */
@@ -403,8 +396,8 @@ void DMA1_Stream7_IRQHandler(void)
}
/**
- * @brief This function handles UART4 global interrupt.
- */
+ * @brief This function handles UART4 global interrupt.
+ */
void UART4_IRQHandler(void)
{
/* USER CODE BEGIN UART4_IRQn 0 */
@@ -416,8 +409,8 @@ void UART4_IRQHandler(void)
}
/**
- * @brief This function handles UART5 global interrupt.
- */
+ * @brief This function handles UART5 global interrupt.
+ */
void UART5_IRQHandler(void)
{
/* USER CODE BEGIN UART5_IRQn 0 */
@@ -428,8 +421,8 @@ void UART5_IRQHandler(void)
}
/**
- * @brief This function handles DMA2 stream1 global interrupt.
- */
+ * @brief This function handles DMA2 stream1 global interrupt.
+ */
void DMA2_Stream1_IRQHandler(void)
{
/* USER CODE BEGIN DMA2_Stream1_IRQn 0 */
@@ -442,8 +435,8 @@ void DMA2_Stream1_IRQHandler(void)
}
/**
- * @brief This function handles DMA2 stream2 global interrupt.
- */
+ * @brief This function handles DMA2 stream2 global interrupt.
+ */
void DMA2_Stream2_IRQHandler(void)
{
/* USER CODE BEGIN DMA2_Stream2_IRQn 0 */
@@ -456,8 +449,8 @@ void DMA2_Stream2_IRQHandler(void)
}
/**
- * @brief This function handles Ethernet global interrupt.
- */
+ * @brief This function handles Ethernet global interrupt.
+ */
void ETH_IRQHandler(void)
{
/* USER CODE BEGIN ETH_IRQn 0 */
@@ -470,8 +463,8 @@ void ETH_IRQHandler(void)
}
/**
- * @brief This function handles DMA2 stream6 global interrupt.
- */
+ * @brief This function handles DMA2 stream6 global interrupt.
+ */
void DMA2_Stream6_IRQHandler(void)
{
/* USER CODE BEGIN DMA2_Stream6_IRQn 0 */
@@ -484,8 +477,8 @@ void DMA2_Stream6_IRQHandler(void)
}
/**
- * @brief This function handles DMA2 stream7 global interrupt.
- */
+ * @brief This function handles DMA2 stream7 global interrupt.
+ */
void DMA2_Stream7_IRQHandler(void)
{
/* USER CODE BEGIN DMA2_Stream7_IRQn 0 */
@@ -498,8 +491,8 @@ void DMA2_Stream7_IRQHandler(void)
}
/**
- * @brief This function handles USART6 global interrupt.
- */
+ * @brief This function handles USART6 global interrupt.
+ */
void USART6_IRQHandler(void)
{
/* USER CODE BEGIN USART6_IRQn 0 */
diff --git a/LCD/signal generator/780.jpg b/LCD/signal generator/780.jpg
new file mode 100644
index 0000000..154cfd3
Binary files /dev/null and b/LCD/signal generator/780.jpg differ
diff --git a/LCD/signal generator/current_out.tft b/LCD/signal generator/current_out.tft
new file mode 100644
index 0000000..3f377d4
--- /dev/null
+++ b/LCD/signal generator/current_out.tft
@@ -0,0 +1 @@
+