diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c
index 2f5fc68..57510ad 100644
--- a/Core/Src/freertos.c
+++ b/Core/Src/freertos.c
@@ -32,7 +32,6 @@ void task_shell_term_main_loop(void const * argument);
#include "frt_protocol.h"
#include "inflash.h"
#include "hp203b.h"
-#include "EC801E.h"
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -55,7 +54,6 @@ void task_shell_term_main_loop(void const * argument);
osThreadId defaultTaskHandle;
osThreadId anemometerHandle;
osThreadId sensorTaskHandle;
-osThreadId Trans_4g_taskHandle;
osThreadId ledTaskHandle;
//osThreadId TermShellHandle;
@@ -67,7 +65,6 @@ osThreadId wind_update_taskHandle;
/* USER CODE BEGIN FunctionPrototypes */
/* USER CODE END FunctionPrototypes */
-void Trans_4g_Task(void const * argument);
void StartDefaultTask(void const * argument);
@@ -118,7 +115,7 @@ void MX_FREERTOS_Init(void) {
/* Create the thread(s) */
/* definition and creation of defaultTask */
- osThreadDef(defaultTask, StartDefaultTask, osPriorityRealtime, 0, 512+128);//通讯
+ osThreadDef(defaultTask, StartDefaultTask, osPriorityRealtime, 0, 512);//通讯
defaultTaskHandle = osThreadCreate(osThread(defaultTask), NULL);
osThreadDef(ledTask, LEDTask, osPriorityIdle, 0, 32);//LED
@@ -131,9 +128,6 @@ void MX_FREERTOS_Init(void) {
osThreadDef(temhum_update_task, tem_hum_update_task, osPriorityAboveNormal, 0, 128);//温湿度，大气压更新
temhum_update_taskHandle = osThreadCreate(osThread(temhum_update_task), NULL);
- osThreadDef(trans_4g_task, Trans_4g_Task, osPriorityRealtime, 0, 256);//4G发送
- Trans_4g_taskHandle = osThreadCreate(osThread(trans_4g_task), NULL);
-
// osThreadDef(sensorTask, SensorTask, osPriorityRealtime, 0, 128);
// sensorTaskHandle = osThreadCreate(osThread(anemometer), NULL);
//osThreadDef(TermShellHandle, task_shell_term_main_loop, osPriorityAboveNormal, 0, 128);
@@ -160,10 +154,6 @@ void StartDefaultTask(void const * argument)
{
read_and_process_uart_data(g_rs485_uart_handle);
read_and_process_uart_data(g_term_uart_handle);
- if(time_get_ok)
- {
- parse_4g_receive_data();
- }
osDelay(200);
}
/* USER CODE END StartDefaultTask */
@@ -211,35 +201,7 @@ void LEDTask(void const * argument)
}
/* USER CODE END Application */
-int trans_4g_flag = 0;
-void Trans_4g_Task(void const * argument)
-{
- /* USER CODE BEGIN StartDefaultTask */
- EC801_start();
- MQTT_Trans_Data();
- int temp_1s = 0;
- /* Infinite loop */
- for(;;)
- {
- osDelay(1000);
- temp_1s++;
- if(temp_1s >= 600)
- {
- temp_1s = 0;
- trans_4g_flag = 1;
-
- }
-
- if(trans_4g_flag == 1)
- {
- MQTT_Trans_Data();
- trans_4g_flag = 0;
- }
-
- }
- /* USER CODE END StartDefaultTask */
-}
-/* USER CODE END Application */
+
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 593b1f0..e1f5552 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -45,7 +45,6 @@
#include "hp203b.h"
#include "inflash.h"
-#include "EC801E.h"
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -235,7 +234,6 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
/* USER CODE BEGIN Callback 1 */
if(htim->Instance == TIM17)
{
- g_time_stamp++;
}
/* USER CODE END Callback 1 */
}
diff --git a/EWARM/micro_climate.ewp b/EWARM/micro_climate.ewp
index 5af3410..5df80b0 100644
--- a/EWARM/micro_climate.ewp
+++ b/EWARM/micro_climate.ewp
@@ -374,7 +374,6 @@
$PROJ_DIR$\..\tools
$PROJ_DIR$\..\App\Inc
$PROJ_DIR$\..\Drivers\HP203B
- $PROJ_DIR$\..\Drivers\EC801E