feat: before tring to fix cmdHandler
This commit is contained in:
@ -25,8 +25,15 @@
|
||||
|
||||
/* Private includes ----------------------------------------------------------*/
|
||||
/* USER CODE BEGIN Includes */
|
||||
#include <stdio.h>
|
||||
|
||||
#include "esp8266.h"
|
||||
#include "OneNet.h"
|
||||
#include "oled.h"
|
||||
#include "stm32f1xx_hal.h"
|
||||
#include <string.h>
|
||||
#include "retarget.h"
|
||||
#include "timers.h"
|
||||
/* USER CODE END Includes */
|
||||
|
||||
/* Private typedef -----------------------------------------------------------*/
|
||||
@ -36,7 +43,10 @@
|
||||
|
||||
/* Private define ------------------------------------------------------------*/
|
||||
/* USER CODE BEGIN PD */
|
||||
|
||||
#define K1 HAL_GPIO_ReadPin(KEY1_GPIO_Port, KEY1_Pin)
|
||||
#define K2 HAL_GPIO_ReadPin(KEY2_GPIO_Port, KEY2_Pin)
|
||||
#define K3 HAL_GPIO_ReadPin(KEY3_GPIO_Port, KEY3_Pin)
|
||||
#define K4 HAL_GPIO_ReadPin(KEY4_GPIO_Port, KEY4_Pin)
|
||||
/* USER CODE END PD */
|
||||
|
||||
/* Private macro -------------------------------------------------------------*/
|
||||
@ -46,13 +56,13 @@
|
||||
|
||||
/* Private variables ---------------------------------------------------------*/
|
||||
/* USER CODE BEGIN Variables */
|
||||
|
||||
char ONENET_CONNECTED = 0;
|
||||
/* USER CODE END Variables */
|
||||
/* Definitions for defaultTask */
|
||||
osThreadId_t defaultTaskHandle;
|
||||
const osThreadAttr_t defaultTask_attributes = {
|
||||
.name = "defaultTask",
|
||||
.stack_size = 128 * 4,
|
||||
.stack_size = 256 * 4,
|
||||
.priority = (osPriority_t) osPriorityNormal,
|
||||
};
|
||||
/* Definitions for keyScanTask */
|
||||
@ -62,22 +72,23 @@ const osThreadAttr_t keyScanTask_attributes = {
|
||||
.stack_size = 128 * 4,
|
||||
.priority = (osPriority_t) osPriorityNormal,
|
||||
};
|
||||
/* Definitions for dataHandler */
|
||||
osThreadId_t dataHandlerHandle;
|
||||
const osThreadAttr_t dataHandler_attributes = {
|
||||
.name = "dataHandler",
|
||||
.stack_size = 128 * 4,
|
||||
/* Definitions for cmdTask */
|
||||
osThreadId_t cmdTaskHandle;
|
||||
const osThreadAttr_t cmdTask_attributes = {
|
||||
.name = "cmdTask",
|
||||
.stack_size = 256 * 4,
|
||||
.priority = (osPriority_t) osPriorityNormal,
|
||||
};
|
||||
|
||||
/* Private function prototypes -----------------------------------------------*/
|
||||
/* USER CODE BEGIN FunctionPrototypes */
|
||||
|
||||
void KeyScan(void);
|
||||
void Display_IM1281B(void);
|
||||
/* USER CODE END FunctionPrototypes */
|
||||
|
||||
void StartDefaultTask(void *argument);
|
||||
void startKeyScanTask(void *argument);
|
||||
void startDataHandler(void *argument);
|
||||
void startCmdTask(void *argument);
|
||||
|
||||
void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */
|
||||
|
||||
@ -88,7 +99,21 @@ void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */
|
||||
*/
|
||||
void MX_FREERTOS_Init(void) {
|
||||
/* USER CODE BEGIN Init */
|
||||
OLED_ShowString(0,0,"initializing...",12);
|
||||
|
||||
int const isSmartConfigMode = !HAL_GPIO_ReadPin(KEY1_GPIO_Port, KEY1_Pin);
|
||||
|
||||
if (isSmartConfigMode) OLED_ShowString(0,0,"smartConfigMode",12);
|
||||
ESP8266_Init(isSmartConfigMode);
|
||||
|
||||
OLED_ShowString(0, 0, "connectOneNet", 12);
|
||||
|
||||
while (OneNet_DevLink()) {}
|
||||
OneNET_Subscribe();
|
||||
ONENET_CONNECTED = 1;
|
||||
|
||||
OLED_ShowString(0,0,"OneNet online ",12);
|
||||
HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_RESET);
|
||||
/* USER CODE END Init */
|
||||
|
||||
/* USER CODE BEGIN RTOS_MUTEX */
|
||||
@ -114,8 +139,8 @@ void MX_FREERTOS_Init(void) {
|
||||
/* creation of keyScanTask */
|
||||
keyScanTaskHandle = osThreadNew(startKeyScanTask, NULL, &keyScanTask_attributes);
|
||||
|
||||
/* creation of dataHandler */
|
||||
dataHandlerHandle = osThreadNew(startDataHandler, NULL, &dataHandler_attributes);
|
||||
/* creation of cmdTask */
|
||||
cmdTaskHandle = osThreadNew(startCmdTask, NULL, &cmdTask_attributes);
|
||||
|
||||
/* USER CODE BEGIN RTOS_THREADS */
|
||||
/* add threads, ... */
|
||||
@ -140,7 +165,16 @@ void StartDefaultTask(void *argument)
|
||||
/* Infinite loop */
|
||||
for(;;)
|
||||
{
|
||||
osDelay(1);
|
||||
IM_ReadFlag = 1; //抄读标志
|
||||
IM_Read();
|
||||
|
||||
osDelay(500);
|
||||
|
||||
OneNet_SendData();
|
||||
osDelay(500);
|
||||
ESP8266_Clear();
|
||||
|
||||
Display_IM1281B();
|
||||
}
|
||||
/* USER CODE END StartDefaultTask */
|
||||
}
|
||||
@ -163,36 +197,97 @@ void startKeyScanTask(void *argument)
|
||||
/* USER CODE END startKeyScanTask */
|
||||
}
|
||||
|
||||
/* USER CODE BEGIN Header_startDataHandler */
|
||||
/* USER CODE BEGIN Header_startCmdTask */
|
||||
/**
|
||||
* @brief Function implementing the dataHandler thread.
|
||||
* @brief Function implementing the cmdTask thread.
|
||||
* @param argument: Not used
|
||||
* @retval None
|
||||
*/
|
||||
/* USER CODE END Header_startDataHandler */
|
||||
void startDataHandler(void *argument)
|
||||
/* USER CODE END Header_startCmdTask */
|
||||
void startCmdTask(void *argument)
|
||||
{
|
||||
/* USER CODE BEGIN startDataHandler */
|
||||
/* USER CODE BEGIN startCmdTask */
|
||||
/* Infinite loop */
|
||||
for(;;)
|
||||
{
|
||||
HAL_GPIO_TogglePin(LED0_GPIO_Port, LED0_Pin);
|
||||
IM_ReadFlag = 1; //抄读标志
|
||||
IM_Read();
|
||||
|
||||
osDelay(500);
|
||||
|
||||
// OneNet_SendData();
|
||||
// osDelay(500);
|
||||
// ESP8266_Clear();
|
||||
|
||||
Display_IM1281B();
|
||||
if (ONENET_CONNECTED)
|
||||
{
|
||||
uint8_t* dataPtr = ESP8266_GetIPD_soft(0);
|
||||
if (dataPtr != NULL)
|
||||
{
|
||||
OneNet_RevPro(dataPtr);
|
||||
}
|
||||
}
|
||||
}
|
||||
/* USER CODE END startDataHandler */
|
||||
/* USER CODE END startCmdTask */
|
||||
}
|
||||
|
||||
/* Private application code --------------------------------------------------*/
|
||||
/* USER CODE BEGIN Application */
|
||||
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);
|
||||
}
|
||||
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);
|
||||
}
|
||||
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);
|
||||
}
|
||||
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);
|
||||
}
|
||||
while (K4 == GPIO_PIN_RESET);
|
||||
}
|
||||
}
|
||||
|
||||
void Display_IM1281B(void)
|
||||
{
|
||||
OLED_ShowString(0, 0, "Volt:", 12);
|
||||
OLED_ShowString(0, 2, "Curr:", 12);
|
||||
OLED_ShowString(0, 4, "Pwr: ", 12);
|
||||
OLED_ShowString(0, 6, "Eng: ", 12);
|
||||
|
||||
char buffer[16];
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "%.2fV", IM_Volt * 0.0001);
|
||||
OLED_ShowString(40, 0, buffer, 12);
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "%.2fA", IM_Curr * 0.0001);
|
||||
OLED_ShowString(40, 2, buffer, 12);
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "%.2fW", IM_Power * 0.0001);
|
||||
OLED_ShowString(40, 4, buffer, 12);
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "%.3fKWh", IM_Energy * 0.0001);
|
||||
OLED_ShowString(40, 6, buffer, 12);
|
||||
}
|
||||
/* USER CODE END Application */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user