HoshinoSuzumi/IntelliChargingPile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev: 暂时禁用指令下发处理

Browse Source
This commit is contained in:
Timothy Yin
2025-05-08 21:20:18 +08:00
parent 41ccefb980
commit d96b2070f2
6 changed files with 163 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
Core/Src/freertos.c
View File

@ -33,6 +33,7 @@
#include "stm32f1xx_hal.h"
#include <string.h>
#include "retarget.h"
#include "tim.h"
#include "timers.h"
/* USER CODE END Includes */
@ -57,6 +58,9 @@
/* Private variables ---------------------------------------------------------*/
/* USER CODE BEGIN Variables */
char ONENET_CONNECTED = 0;
// Flags
char KEY_PRESSED[4] = {0, 0, 0, 0};
/* USER CODE END Variables */
/* Definitions for defaultTask */
osThreadId_t defaultTaskHandle;
@ -114,6 +118,8 @@ void MX_FREERTOS_Init(void) {
OLED_ShowString(0,0,"OneNet online ",12);
HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_RESET);
HAL_TIM_Base_Start_IT(&htim1);
/* USER CODE END Init */
/* USER CODE BEGIN RTOS_MUTEX */
@ -165,16 +171,47 @@ void StartDefaultTask(void *argument)
/* Infinite loop */
for(;;)
{
IM_ReadFlag = 1; //抄读标志
// osDelay(500);
//
// OneNet_SendData();
// osDelay(500);
// ESP8266_Clear();
if (KEY_PRESSED[0] || KEY_PRESSED[1])
{
KEY_PRESSED[0] = 0;
KEY_PRESSED[1] = 0;
HAL_GPIO_TogglePin(RELAY1_GPIO_Port, RELAY1_Pin);
}
if (flag_1s)
{
flag_1s = 0;
IM_ReadFlag = 1;
}
if (flag_2s)
{
flag_2s = 0;
HAL_GPIO_TogglePin(LED0_GPIO_Port, LED0_Pin);
}
if (flag_5s)
{
flag_5s = 0;
OneNet_SendData();
ESP8266_Clear();
}
if (IM_RecvDone)
{
IM_Analyze();
Display_IM1281B();
}
IM_Read();
osDelay(500);
OneNet_SendData();
osDelay(500);
ESP8266_Clear();
Display_IM1281B();
}
/* USER CODE END StartDefaultTask */
}
@ -210,14 +247,14 @@ void startCmdTask(void *argument)
/* Infinite loop */
for(;;)
{
if (ONENET_CONNECTED)
{
uint8_t* dataPtr = ESP8266_GetIPD_soft(0);
if (dataPtr != NULL)
{
OneNet_RevPro(dataPtr);
}
}
// if (ONENET_CONNECTED)
// {
// uint8_t* dataPtr = ESP8266_GetIPD_soft(0);
// if (dataPtr != NULL)
// {
// OneNet_RevPro(dataPtr);
// }
// }
}
/* USER CODE END startCmdTask */
}
@ -228,41 +265,37 @@ void KeyScan(void)
{
if (K1 == GPIO_PIN_RESET)
{
// HAL_Delay(5);
osDelay(5);
if (K1 == GPIO_PIN_RESET)
{
HAL_GPIO_TogglePin(RELAY1_GPIO_Port, RELAY1_Pin);
KEY_PRESSED[0] = 1;
}
while (K1 == GPIO_PIN_RESET);
}
if (K2 == GPIO_PIN_RESET)
{
// HAL_Delay(5);
osDelay(5);
if (K2 == GPIO_PIN_RESET)
{
HAL_GPIO_TogglePin(RELAY1_GPIO_Port, RELAY1_Pin);
KEY_PRESSED[1] = 1;
}
while (K2 == GPIO_PIN_RESET);
}
if (K3 == GPIO_PIN_RESET)
{
// HAL_Delay(5);
osDelay(5);
if (K3 == GPIO_PIN_RESET)
{
HAL_GPIO_TogglePin(RELAY1_GPIO_Port, RELAY1_Pin);
KEY_PRESSED[2] = 1;
}
while (K3 == GPIO_PIN_RESET);
}
if (K4 == GPIO_PIN_RESET)
{
// HAL_Delay(5);
osDelay(5);
if (K4 == GPIO_PIN_RESET)
{
HAL_GPIO_TogglePin(RELAY1_GPIO_Port, RELAY1_Pin);
KEY_PRESSED[3] = 1;
}
while (K4 == GPIO_PIN_RESET);
}