feat: 完成状态机，完成刷卡、数据上报、命令处理
This commit is contained in:
@ -34,6 +34,7 @@
|
||||
#include <string.h>
|
||||
#include "retarget.h"
|
||||
#include "tim.h"
|
||||
#include "rc522.h"
|
||||
#include "timers.h"
|
||||
/* USER CODE END Includes */
|
||||
|
||||
@ -57,16 +58,18 @@
|
||||
|
||||
/* Private variables ---------------------------------------------------------*/
|
||||
/* USER CODE BEGIN Variables */
|
||||
char ONENET_CONNECTED = 0;
|
||||
|
||||
// Flags
|
||||
char KEY_PRESSED[4] = {0, 0, 0, 0};
|
||||
|
||||
RC522_Handle rc522Handle;
|
||||
|
||||
char ONENET_CONNECTED = 0;
|
||||
/* USER CODE END Variables */
|
||||
/* Definitions for defaultTask */
|
||||
osThreadId_t defaultTaskHandle;
|
||||
const osThreadAttr_t defaultTask_attributes = {
|
||||
.name = "defaultTask",
|
||||
.stack_size = 256 * 4,
|
||||
.stack_size = 1024 * 4,
|
||||
.priority = (osPriority_t) osPriorityNormal,
|
||||
};
|
||||
/* Definitions for keyScanTask */
|
||||
@ -76,13 +79,6 @@ const osThreadAttr_t keyScanTask_attributes = {
|
||||
.stack_size = 128 * 4,
|
||||
.priority = (osPriority_t) osPriorityNormal,
|
||||
};
|
||||
/* 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 */
|
||||
@ -92,7 +88,6 @@ void Display_IM1281B(void);
|
||||
|
||||
void StartDefaultTask(void *argument);
|
||||
void startKeyScanTask(void *argument);
|
||||
void startCmdTask(void *argument);
|
||||
|
||||
void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */
|
||||
|
||||
@ -103,20 +98,47 @@ void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */
|
||||
*/
|
||||
void MX_FREERTOS_Init(void) {
|
||||
/* USER CODE BEGIN Init */
|
||||
// Peripheral initialization
|
||||
MFRC_Init();
|
||||
PCD_Init();
|
||||
RC522_InitStateMachine(&rc522Handle);
|
||||
|
||||
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);
|
||||
if (isSmartConfigMode)
|
||||
{
|
||||
// 等待配网
|
||||
OLED_ShowChinese(0, 0, 2);
|
||||
OLED_ShowChinese(16, 0, 3);
|
||||
OLED_ShowChinese(32, 0, 4);
|
||||
OLED_ShowChinese(48, 0, 5);
|
||||
OLED_ShowString(48 + 16, 0, " ", 12);
|
||||
OLED_ShowString(48 + 16, 1, "... ", 12);
|
||||
}
|
||||
ESP8266_Init(isSmartConfigMode);
|
||||
|
||||
OLED_ShowString(0, 0, "connectOneNet", 12);
|
||||
// 连接服务器
|
||||
OLED_ShowChinese(0, 0, 6);
|
||||
OLED_ShowChinese(16, 0, 7);
|
||||
OLED_ShowChinese(32, 0, 8);
|
||||
OLED_ShowChinese(48, 0, 9);
|
||||
OLED_ShowChinese(64, 0, 10);
|
||||
OLED_ShowString(64 + 16, 1, "... ", 12);
|
||||
|
||||
while (OneNet_DevLink()) {}
|
||||
OneNET_Subscribe();
|
||||
ONENET_CONNECTED = 1;
|
||||
|
||||
OLED_ShowString(0,0,"OneNet online ",12);
|
||||
// 设备上线
|
||||
OLED_ShowChinese(0, 0, 11);
|
||||
OLED_ShowChinese(16, 0, 12);
|
||||
OLED_ShowChinese(32, 0, 15);
|
||||
OLED_ShowChinese(48, 0, 16);
|
||||
OLED_ShowString(48 + 16, 0, " ", 16);
|
||||
OLED_ShowString(48 + 16, 1, " ", 16);
|
||||
|
||||
HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_RESET);
|
||||
|
||||
HAL_TIM_Base_Start_IT(&htim1);
|
||||
@ -145,9 +167,6 @@ void MX_FREERTOS_Init(void) {
|
||||
/* creation of keyScanTask */
|
||||
keyScanTaskHandle = osThreadNew(startKeyScanTask, NULL, &keyScanTask_attributes);
|
||||
|
||||
/* creation of cmdTask */
|
||||
cmdTaskHandle = osThreadNew(startCmdTask, NULL, &cmdTask_attributes);
|
||||
|
||||
/* USER CODE BEGIN RTOS_THREADS */
|
||||
/* add threads, ... */
|
||||
/* USER CODE END RTOS_THREADS */
|
||||
@ -168,24 +187,30 @@ void MX_FREERTOS_Init(void) {
|
||||
void StartDefaultTask(void *argument)
|
||||
{
|
||||
/* USER CODE BEGIN StartDefaultTask */
|
||||
OLED_Clear();
|
||||
|
||||
// 在线
|
||||
OLED_ShowChinese(96, 0, 13);
|
||||
OLED_ShowChinese(112, 0, 16);
|
||||
// 输出
|
||||
OLED_ShowChinese(0, 0, 29);
|
||||
OLED_ShowChinese(16, 0, 30);
|
||||
/* Infinite loop */
|
||||
for(;;)
|
||||
{
|
||||
|
||||
// osDelay(500);
|
||||
//
|
||||
// OneNet_SendData();
|
||||
// osDelay(500);
|
||||
// ESP8266_Clear();
|
||||
|
||||
if (KEY_PRESSED[0] || KEY_PRESSED[1])
|
||||
/* Keys handler */
|
||||
if (KEY_PRESSED[0])
|
||||
{
|
||||
KEY_PRESSED[0] = 0;
|
||||
KEY_PRESSED[1] = 0;
|
||||
HAL_GPIO_TogglePin(RELAY1_GPIO_Port, RELAY1_Pin);
|
||||
}
|
||||
// Output state
|
||||
if (HAL_GPIO_ReadPin(RELAY1_GPIO_Port, RELAY1_Pin) == GPIO_PIN_RESET)
|
||||
OLED_ShowString(16 + 16, 0, ":ON ", 16);
|
||||
else
|
||||
OLED_ShowString(16 + 16, 0, ":OFF", 16);
|
||||
|
||||
|
||||
/* Flags handler */
|
||||
if (flag_1s)
|
||||
{
|
||||
flag_1s = 0;
|
||||
@ -211,7 +236,22 @@ void StartDefaultTask(void *argument)
|
||||
Display_IM1281B();
|
||||
}
|
||||
|
||||
/* State machines */
|
||||
if (rc522Handle.state == RC522_STATE_IDLE)
|
||||
{
|
||||
rc522Handle.state = RC522_STATE_REQUEST;
|
||||
snprintf(IC_CARD_ID, sizeof(IC_CARD_ID), "%02X-%02X-%02X-%02X", rc522Handle.cardID[0], rc522Handle.cardID[1], rc522Handle.cardID[2], rc522Handle.cardID[3]);
|
||||
}
|
||||
|
||||
IM_Read();
|
||||
RC522_ProcessStateMachine(&rc522Handle);
|
||||
|
||||
/* Remote command handler */
|
||||
uint8_t* dataPtr = ESP8266_GetIPD_soft(0);
|
||||
if (dataPtr != NULL)
|
||||
{
|
||||
OneNet_RevPro(dataPtr);
|
||||
}
|
||||
}
|
||||
/* USER CODE END StartDefaultTask */
|
||||
}
|
||||
@ -234,31 +274,6 @@ void startKeyScanTask(void *argument)
|
||||
/* USER CODE END startKeyScanTask */
|
||||
}
|
||||
|
||||
/* USER CODE BEGIN Header_startCmdTask */
|
||||
/**
|
||||
* @brief Function implementing the cmdTask thread.
|
||||
* @param argument: Not used
|
||||
* @retval None
|
||||
*/
|
||||
/* USER CODE END Header_startCmdTask */
|
||||
void startCmdTask(void *argument)
|
||||
{
|
||||
/* USER CODE BEGIN startCmdTask */
|
||||
/* Infinite loop */
|
||||
for(;;)
|
||||
{
|
||||
// if (ONENET_CONNECTED)
|
||||
// {
|
||||
// uint8_t* dataPtr = ESP8266_GetIPD_soft(0);
|
||||
// if (dataPtr != NULL)
|
||||
// {
|
||||
// OneNet_RevPro(dataPtr);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
/* USER CODE END startCmdTask */
|
||||
}
|
||||
|
||||
/* Private application code --------------------------------------------------*/
|
||||
/* USER CODE BEGIN Application */
|
||||
void KeyScan(void)
|
||||
@ -303,24 +318,23 @@ void KeyScan(void)
|
||||
|
||||
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);
|
||||
OLED_ShowString(0, 5, "V:", 12);
|
||||
OLED_ShowString(64, 5, "A:", 12);
|
||||
OLED_ShowString(0, 7, "P:", 12);
|
||||
|
||||
char buffer[16];
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "%.2fV", IM_Volt * 0.0001);
|
||||
OLED_ShowString(40, 0, buffer, 12);
|
||||
snprintf(buffer, sizeof(buffer), "%.2fV ", IM_Volt * 0.0001);
|
||||
OLED_ShowString(16, 5, buffer, 12);
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "%.2fA", IM_Curr * 0.0001);
|
||||
OLED_ShowString(40, 2, buffer, 12);
|
||||
snprintf(buffer, sizeof(buffer), "%.2fA ", IM_Curr * 0.0001);
|
||||
OLED_ShowString(80, 5, buffer, 12);
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "%.2fW", IM_Power * 0.0001);
|
||||
OLED_ShowString(40, 4, buffer, 12);
|
||||
snprintf(buffer, sizeof(buffer), "%.2fW ", IM_Power * 0.0001);
|
||||
OLED_ShowString(16, 7, buffer, 12);
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "%.3fKWh", IM_Energy * 0.0001);
|
||||
OLED_ShowString(40, 6, buffer, 12);
|
||||
snprintf(buffer, sizeof(buffer), "%.3fkWh", IM_Energy * 0.0001);
|
||||
OLED_ShowString(64, 7, buffer, 12);
|
||||
}
|
||||
/* USER CODE END Application */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user