删减多余注释和代码

Core/Inc/main.h

@@ -74,7 +74,6 @@ extern uint8_t rx_buf[25];
 extern uint8_t rx_buf_uart2[25];
 extern uint8_t rx_buf_uart2_DMA[25];
 extern  uint8_t loraSendNextDataFlag;
-// extern uint8_t loraDataErrorCount;
 extern uint8_t totalData[50][25];
 extern  RTC_HandleTypeDef hrtc;
 extern uint8_t workMode;  // 0: 接收蓝牙数据 1: 使用lora发生数据。

Core/Src/E52.c

@@ -181,48 +181,38 @@ void E52_Heartbeat_Fun1() {
     heartbeat_structure.target_addr_L = deviceInfo.target_addr_L;
     heartbeat_structure.frame_tail_H = 0xFF;
     heartbeat_structure.frame_tail_L = 0xEE;
-
-    // printf("heartbeat size = %d\n", sizeof(heartbeat_structure));
-
     HAL_UART_Transmit(&huart2, (uint8_t *)&heartbeat_structure, sizeof(heartbeat_structure), HAL_MAX_DELAY);
     // TODO: command:08
 }
 
 void E52_Analyze_Data() {
-
-    if (rx_buf_uart2[0] == 0x55 && rx_buf_uart2[1] == 0xBB) {
-        // 根据接收到的第三个字节（命令字节）进行分支处理
-        switch (rx_buf_uart2[2]) {
-            case REQUEST_BLUETOOTH_DATA:
-                E52_Request_Command_Fun();
-                deviceInfo.commandFromCloud = COMBINE_CMD_STEP(REQUEST_BLUETOOTH_DATA, REQUEST_BLUETOOTH_DATA_SCAN);
-                break;
-            case CONFIGURE_E52:
-                E52_Configuration_Fun();
-                deviceInfo.commandFromCloud = COMBINE_CMD_STEP(CONFIGURE_E52, CONFIGURE_E52_SET_BROADCAST_TYPE);
-                break;
-            case E52_ENTER_SLEEP:
-                // deviceInfo.commandFromCloud = COMBINE_CMD_STEP(E52_ENTER_SLEEP, STEP_EXECUTE);
-                E52_Send_Sleep_Fun();
-                break;
-            case E52_HEARTBEAT:
-                E52_Heartbeat_Fun1();
-                deviceInfo.commandFromCloud = COMBINE_CMD_STEP(E52_HEARTBEAT, HEARTBEAT_SEND);
-                break;
-            case IS_ONLINE:
-                deviceInfo.isOnline = TRUE;
-                deviceInfo.commandFromCloud = COMBINE_CMD_STEP(IDLE, STEP_INIT);
-                break;
-            default:
-                deviceInfo.commandFromCloud = COMBINE_CMD_STEP(IDLE, STEP_INIT);
-                break;
-        }
-    }else {
-        //有效数据。
-        deviceInfo.commandFromCloud = COMBINE_CMD_STEP(IDLE, STEP_INIT);
+    // 根据接收到的第三个字节（命令字节）进行分支处理
+    switch (rx_buf_uart2[2]) {
+        case REQUEST_BLUETOOTH_DATA:
+            E52_Request_Command_Fun();
+            deviceInfo.commandFromCloud = COMBINE_CMD_STEP(REQUEST_BLUETOOTH_DATA, REQUEST_BLUETOOTH_DATA_SCAN);
+            break;
+        case CONFIGURE_E52:
+            E52_Configuration_Fun();
+            deviceInfo.commandFromCloud = COMBINE_CMD_STEP(CONFIGURE_E52, CONFIGURE_E52_SET_BROADCAST_TYPE);
+            break;
+        case E52_ENTER_SLEEP:
+            // deviceInfo.commandFromCloud = COMBINE_CMD_STEP(E52_ENTER_SLEEP, STEP_EXECUTE);
+            // E52_Send_Sleep_Fun();
+            deviceInfo.commandFromCloud = COMBINE_CMD_STEP(IDLE, STEP_INIT);
+            break;
+        case E52_HEARTBEAT:
+            E52_Heartbeat_Fun1();
+            deviceInfo.commandFromCloud = COMBINE_CMD_STEP(E52_HEARTBEAT, HEARTBEAT_SEND);
+            break;
+        case IS_ONLINE:
+            deviceInfo.isOnline = TRUE;
+            deviceInfo.commandFromCloud = COMBINE_CMD_STEP(IDLE, STEP_INIT);
+            break;
+        default:
+            deviceInfo.commandFromCloud = COMBINE_CMD_STEP(IDLE, STEP_INIT);
+            break;
     }
-    // memcpy(rx_buf_uart2 ,rx_buf_uart2, sizeof(rx_buf_uart2));
-    // memset(rx_buf_uart2, 0, sizeof(rx_buf_uart2));
 }
 
 

Core/Src/main.c

@@ -245,12 +245,8 @@ int main(void)
 
   // 启动 USART2 DMA 接收
   HAL_UART_Receive_DMA(&huart3, rx_buf, sizeof(rx_buf));
-  // // HAL_UART_Receive_IT(&huart2, uart2_rx_byte, 7);
-  // // 使能 USART2 空闲中断
   __HAL_UART_ENABLE_IT(&huart3, UART_IT_IDLE);
   HAL_UART_Receive_DMA(&huart2, rx_buf_uart2_DMA, sizeof(rx_buf_uart2_DMA));
-  // HAL_UART_Receive_IT(&huart2, uart2_rx_byte, 7);
-  // 使能 USART2 空闲中断
   __HAL_UART_ENABLE_IT(&huart2, UART_IT_IDLE);
   printf("开始初始化1\r\n");
   HAL_Delay(4000);
@@ -281,10 +277,7 @@ int main(void)
   HAL_UART_Transmit(&huart2, (uint8_t *)lora_msg4, strlen(lora_msg4), HAL_MAX_DELAY);
   HAL_Delay(2000);
 
-  // uint16_t count = 0;
-  // uint16_t randomTime = 0;
   srand(HAL_GetTick());
-  // HAL_TIM_Base_Start(&htim4);
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -303,7 +296,6 @@ int main(void)
     RTC_GetDateTime(&hrtc, &now);
     GPIO_PinState sosState = HAL_GPIO_ReadPin(SOS_KEY_GPIO_Port, SOS_KEY_Pin);//高为未按压，低为按下,优先级最高
     GPIO_PinState powerState = HAL_GPIO_ReadPin(JUGE_PIN_GPIO_Port, JUGE_PIN_Pin);
-    // printf("SOS_KEY_Pin pin state = %d\r\n", sosState);
 
     if (powerState == GPIO_PIN_RESET) {
       powerOff();
@@ -349,7 +341,6 @@ int main(void)
       HAL_Delay(2000);
 
       continue;
-      // HAL_Delay(000);
     }
 
     // 命令为IDLE，且步骤为STEP_INIT 说明有新数据。