|
@@ -67,8 +67,6 @@ uint8_t RandomTimer= 3*60;
|
|
|
uint8_t workMode = 0; // 0: 接收蓝牙数据 1: 使用lora发生数据 2:等待间隔时间
|
|
uint8_t workMode = 0; // 0: 接收蓝牙数据 1: 使用lora发生数据 2:等待间隔时间
|
|
|
uint8_t receiveBlDataCount = 0;
|
|
uint8_t receiveBlDataCount = 0;
|
|
|
|
|
|
|
|
-uint8_t newLoraDataFlag = 0; //接收lora数据成功标志位。1:有新数据来。0.表示等待接收数据。后续可以改成队列类型。
|
|
|
|
|
-
|
|
|
|
|
/* USER CODE END PV */
|
|
/* USER CODE END PV */
|
|
|
|
|
|
|
|
/* Private function prototypes -----------------------------------------------*/
|
|
/* Private function prototypes -----------------------------------------------*/
|
|
@@ -138,6 +136,7 @@ void Device_Info_Init_Fun() {
|
|
|
deviceInfo.target_addr_H = 0xFF;
|
|
deviceInfo.target_addr_H = 0xFF;
|
|
|
deviceInfo.target_addr_L = 0xFF;
|
|
deviceInfo.target_addr_L = 0xFF;
|
|
|
deviceInfo.sendBlDataFlag = 0;
|
|
deviceInfo.sendBlDataFlag = 0;
|
|
|
|
|
+ deviceInfo.newLoraDataFlag = 0;
|
|
|
}
|
|
}
|
|
|
/* USER CODE END 0 */
|
|
/* USER CODE END 0 */
|
|
|
|
|
|
|
@@ -222,7 +221,7 @@ int main(void)
|
|
|
srand(HAL_GetTick());
|
|
srand(HAL_GetTick());
|
|
|
|
|
|
|
|
// HAL_TIM_Base_Start(&htim4);
|
|
// HAL_TIM_Base_Start(&htim4);
|
|
|
- HAL_TIM_Base_Start_IT(&htim4); // 启动计数 + 使能中断
|
|
|
|
|
|
|
+ // HAL_TIM_Base_Start_IT(&htim4); // 启动计数 + 使能中断
|
|
|
/* USER CODE END 2 */
|
|
/* USER CODE END 2 */
|
|
|
|
|
|
|
|
/* Infinite loop */
|
|
/* Infinite loop */
|
|
@@ -310,9 +309,10 @@ int main(void)
|
|
|
// HAL_UART_Transmit(&huart2, (uint8_t *)end_msg, strlen(end_msg), HAL_MAX_DELAY);
|
|
// HAL_UART_Transmit(&huart2, (uint8_t *)end_msg, strlen(end_msg), HAL_MAX_DELAY);
|
|
|
// HAL_Delay(1000);
|
|
// HAL_Delay(1000);
|
|
|
// }
|
|
// }
|
|
|
- if (newLoraDataFlag == 1) {
|
|
|
|
|
|
|
+ if (deviceInfo.newLoraDataFlag == 1) {
|
|
|
|
|
+ printf("loraDeviceAddress: 0x%02X 0x%02X\r\n", deviceInfo.loraDeviceAddress_H,deviceInfo.loraDeviceAddress_L);
|
|
|
E52_Analyze_Data();
|
|
E52_Analyze_Data();
|
|
|
- newLoraDataFlag = 0;//重置状态
|
|
|
|
|
|
|
+ deviceInfo.newLoraDataFlag = 0;//重置状态
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
/* USER CODE END 3 */
|
|
/* USER CODE END 3 */
|