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

feat: before tring to fix cmdHandler

Browse Source
This commit is contained in:
Timothy Yin 2025-05-08 19:33:50 +08:00
parent d43730ce15
commit 6b5c01fe2f
8 changed files with 323 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
.idea/workspace.xml generated
View File

@ -29,23 +29,15 @@
</configurations> </configurations>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="56631632-52f0-4e39-b905-89e46eb6e768" name="Changes" comment="feat: update USART1 baud rate and implement IM1281B communication"> <list default="true" id="56631632-52f0-4e39-b905-89e46eb6e768" name="Changes" comment="break: before freertos">
<change afterPath="$PROJECT_DIR$/Core/Inc/cJSON.h" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Core/Src/cJSON.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.cproject" beforeDir="false" afterPath="$PROJECT_DIR$/.cproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.mxproject" beforeDir="false" afterPath="$PROJECT_DIR$/.mxproject" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Core/Inc/FreeRTOSConfig.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/FreeRTOSConfig.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Core/Inc/esp8266.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/esp8266.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Inc/IM1281B.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/IM1281B.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Inc/main.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/main.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Core/Inc/main.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/main.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Inc/stm32f1xx_hal_conf.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/stm32f1xx_hal_conf.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Inc/stm32f1xx_it.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/stm32f1xx_it.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Src/IM1281B.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/IM1281B.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Src/OneNet.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/OneNet.c" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Core/Src/OneNet.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/OneNet.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Src/esp8266.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/esp8266.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Src/freertos.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/freertos.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Src/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/main.c" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Core/Src/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/main.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Src/stm32f1xx_hal_msp.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/stm32f1xx_hal_msp.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Src/stm32f1xx_it.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/stm32f1xx_it.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Src/usart.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/usart.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/IntelliChargingPile.ioc" beforeDir="false" afterPath="$PROJECT_DIR$/IntelliChargingPile.ioc" afterDir="false" /> <change beforePath="$PROJECT_DIR$/IntelliChargingPile.ioc" beforeDir="false" afterPath="$PROJECT_DIR$/IntelliChargingPile.ioc" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -146,6 +138,70 @@
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" /> <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" /> <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" /> <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
</component> </component>
<component name="ProjectApplicationVersion"> <component name="ProjectApplicationVersion">
<option name="ide" value="CLion" /> <option name="ide" value="CLion" />
@ -202,12 +258,12 @@
</key> </key>
</component> </component>
<component name="RunManager" selected="OpenOCD Download &amp; Run.OCD IntelliChargingPile"> <component name="RunManager" selected="OpenOCD Download &amp; Run.OCD IntelliChargingPile">
<configuration name="IntelliChargingPile.elf" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="IntelliChargingPile" TARGET_NAME="IntelliChargingPile.elf" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="IntelliChargingPile" RUN_TARGET_NAME="IntelliChargingPile.elf"> <configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true">
<method v="2"> <method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" /> <option name="CLION.EXTERNAL.BUILD" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration default="true" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true"> <configuration name="IntelliChargingPile.elf" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="IntelliChargingPile" TARGET_NAME="IntelliChargingPile.elf" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="IntelliChargingPile" RUN_TARGET_NAME="IntelliChargingPile.elf">
<method v="2"> <method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" /> <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method> </method>
@ -249,7 +305,8 @@
<workItem from="1743242201929" duration="16704000" /> <workItem from="1743242201929" duration="16704000" />
<workItem from="1743488783461" duration="3691000" /> <workItem from="1743488783461" duration="3691000" />
<workItem from="1743492489952" duration="8816000" /> <workItem from="1743492489952" duration="8816000" />
<workItem from="1743525779889" duration="5819000" /> <workItem from="1743525779889" duration="15870000" />
<workItem from="1746680992201" duration="17379000" />
</task> </task>
<task id="LOCAL-00001" summary="initial commit: oled, rc522, exti"> <task id="LOCAL-00001" summary="initial commit: oled, rc522, exti">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -307,7 +364,23 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1743259051456</updated> <updated>1743259051456</updated>
</task> </task>
<option name="localTasksCounter" value="8" /> <task id="LOCAL-00008" summary="break: before freertos">
<option name="closed" value="true" />
<created>1743531708835</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1743531708835</updated>
</task>
<task id="LOCAL-00009" summary="break: before freertos">
<option name="closed" value="true" />
<created>1743531723695</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1743531723695</updated>
</task>
<option name="localTasksCounter" value="10" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -326,9 +399,19 @@
<MESSAGE value="feat: add USART2 initialization and EXTI15_10 interrupt handler" /> <MESSAGE value="feat: add USART2 initialization and EXTI15_10 interrupt handler" />
<MESSAGE value="feat: implement OneNet communication and ESP8266 integration&#10;break: switch to c8t6" /> <MESSAGE value="feat: implement OneNet communication and ESP8266 integration&#10;break: switch to c8t6" />
<MESSAGE value="feat: update USART1 baud rate and implement IM1281B communication" /> <MESSAGE value="feat: update USART1 baud rate and implement IM1281B communication" />
<option name="LAST_COMMIT_MESSAGE" value="feat: update USART1 baud rate and implement IM1281B communication" /> <MESSAGE value="break: before freertos" />
<option name="LAST_COMMIT_MESSAGE" value="break: before freertos" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
<url>file://$PROJECT_DIR$/Core/Src/OneNet.c</url>
<line>199</line>
<option name="timeStamp" value="3" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<watches-manager> <watches-manager>
<configuration name="com.jetbrains.cidr.embedded.openocd.conf.type"> <configuration name="com.jetbrains.cidr.embedded.openocd.conf.type">
<watch expression="new_crc.word16" language="C++" /> <watch expression="new_crc.word16" language="C++" />
@ -336,15 +419,15 @@
<watch expression="IM_TxBuf" language="C++" /> <watch expression="IM_TxBuf" language="C++" />
<watch expression="new_crc" /> <watch expression="new_crc" />
</configuration> </configuration>
<inline-watch fileUrl="file://$PROJECT_DIR$/Core/Src/main.c" line="386"> <inline-watch fileUrl="file://$PROJECT_DIR$/Core/Src/main.c" line="307">
<watch expression="@ ALREADY PREPROCESSED @UART2_RxData" /> <watch expression="@ ALREADY PREPROCESSED @UART2_RxData" />
</inline-watch> </inline-watch>
<inline-watch fileUrl="file://$PROJECT_DIR$/Core/Src/IM1281B.c" line="88">
<watch expression="IM_RecvLen" />
</inline-watch>
<inline-watch fileUrl="file://$PROJECT_DIR$/Core/Src/IM1281B.c" line="87"> <inline-watch fileUrl="file://$PROJECT_DIR$/Core/Src/IM1281B.c" line="87">
<watch expression="@ ALREADY PREPROCESSED @new_crc" /> <watch expression="@ ALREADY PREPROCESSED @new_crc" />
</inline-watch> </inline-watch>
<inline-watch fileUrl="file://$PROJECT_DIR$/Core/Src/IM1281B.c" line="88">
<watch expression="IM_RecvLen" />
</inline-watch>
</watches-manager> </watches-manager>
</component> </component>
<component name="XSLT-Support.FileAssociations.UIState"> <component name="XSLT-Support.FileAssociations.UIState">

2
Core/Inc/FreeRTOSConfig.h
View File

@ -64,7 +64,7 @@
#define configTICK_RATE_HZ ((TickType_t)1000) #define configTICK_RATE_HZ ((TickType_t)1000)
#define configMAX_PRIORITIES ( 56 ) #define configMAX_PRIORITIES ( 56 )
#define configMINIMAL_STACK_SIZE ((uint16_t)128) #define configMINIMAL_STACK_SIZE ((uint16_t)128)
#define configTOTAL_HEAP_SIZE ((size_t)3600) #define configTOTAL_HEAP_SIZE ((size_t)8192)
#define configMAX_TASK_NAME_LEN ( 16 ) #define configMAX_TASK_NAME_LEN ( 16 )
#define configUSE_TRACE_FACILITY 1 #define configUSE_TRACE_FACILITY 1
#define configUSE_16_BIT_TICKS 0 #define configUSE_16_BIT_TICKS 0

5
Core/Inc/esp8266.h
View File

@ -5,14 +5,15 @@
#define REV_OK 0 //接收完成标志 #define REV_OK 0 //接收完成标志
#define REV_WAIT 1 //接收未完成标志 #define REV_WAIT 1 //接收未完成标志
void ESP8266_Init(int isSmartConfig);
void ESP8266_Init(void); void ESP8266_SmartConfig(void);
void ESP8266_Clear(void); void ESP8266_Clear(void);
void ESP8266_SendData(unsigned char* data, unsigned short len); void ESP8266_SendData(unsigned char* data, unsigned short len);
unsigned char* ESP8266_GetIPD(unsigned short timeOut); unsigned char* ESP8266_GetIPD(unsigned short timeOut);
unsigned char* ESP8266_GetIPD_soft(unsigned short timeOut);
#endif #endif

3
Core/Inc/main.h
View File

@ -53,8 +53,7 @@ extern "C" {
void Error_Handler(void); void Error_Handler(void);
/* USER CODE BEGIN EFP */ /* USER CODE BEGIN EFP */
void KeyScan(void);
void Display_IM1281B(void);
/* USER CODE END EFP */ /* USER CODE END EFP */
/* Private defines -----------------------------------------------------------*/ /* Private defines -----------------------------------------------------------*/

119
Core/Src/esp8266.c
View File

@ -12,12 +12,13 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "cmsis_os.h"
#include "cmsis_os2.h"
#define ESP8266_WIFI_INFO "AT+CWJAP=\"Redmi K20 Pro Premium\",\"11223344\"\r\n"
// #define ESP8266_WIFI_INFO "AT+CWJAP=\"Timo\",\"11223344\"\r\n"
#define ESP8266_ONENET_INFO "AT+CIPSTART=\"TCP\",\"183.230.40.96\",1883\r\n" #define ESP8266_ONENET_INFO "AT+CIPSTART=\"TCP\",\"183.230.40.96\",1883\r\n"
unsigned char esp8266_buf[128]; unsigned char esp8266_buf[128];
unsigned short esp8266_cnt = 0, esp8266_cntPre = 0; unsigned short esp8266_cnt = 0, esp8266_cntPre = 0;
@ -172,67 +173,83 @@ unsigned char* ESP8266_GetIPD(unsigned short timeOut)
} }
} }
HAL_Delay(5); //延时等待 HAL_Delay(5);
} }
while (timeOut--); while (timeOut--);
return NULL; //超时还未找到，返回空指针 return NULL; //超时还未找到，返回空指针
} }
//========================================================== unsigned char* ESP8266_GetIPD_soft(unsigned short timeOut)
// 函数名称： ESP8266_Init
//
// 函数功能： 初始化ESP8266
//
// 入口参数： 无
//
// 返回参数： 无
//
// 说明：
//==========================================================
void ESP8266_Init(void)
{ {
// GPIO_InitTypeDef GPIO_Initure; char* ptrIPD = NULL;
//
// RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB, ENABLE);
// //ESP8266复位引脚 do
// GPIO_Initure.GPIO_Mode = GPIO_Mode_Out_PP; {
// GPIO_Initure.GPIO_Pin = GPIO_Pin_5; //GPIOB5-复位 if (ESP8266_WaitRecive() == REV_OK) //如果接收完成
// GPIO_Initure.GPIO_Speed = GPIO_Speed_50MHz; {
// GPIO_Init(GPIOB, &GPIO_Initure); ptrIPD = strstr((char*)esp8266_buf, "IPD,"); //搜索“IPD”头
// if (ptrIPD == NULL) //如果没找到，可能是IPD头的延迟，还是需要等待一会，但不会超过设定的时间
// GPIO_WriteBit(GPIOB, GPIO_Pin_5, Bit_RESET); {
// HAL_Delay(250); //printf("\"IPD\" not found\r\n");
// GPIO_WriteBit(GPIOB, GPIO_Pin_5, Bit_SET); }
// HAL_Delay(500); else
{
ptrIPD = strchr(ptrIPD, ':'); //找到':'
if (ptrIPD != NULL)
{
ptrIPD++;
return (unsigned char*)(ptrIPD);
}
else
return NULL;
}
}
// HAL_GPIO_WritePin(ESP_RST_GPIO_Port,ESP_RST_Pin,GPIO_PIN_RESET); osDelay(5);
// HAL_Delay(250); }
// HAL_GPIO_WritePin(ESP_RST_GPIO_Port,ESP_RST_Pin,GPIO_PIN_SET); while (timeOut--);
// HAL_Delay(500);
ESP8266_Clear(); return NULL; //超时还未找到，返回空指针
// printf("1. AT\r\n");
while (ESP8266_SendCmd("AT\r\n", "OK"))
HAL_Delay(1000);
// printf("2. CWMODE\r\n");
while (ESP8266_SendCmd("AT+CWMODE=1\r\n", "OK"))
HAL_Delay(1000);
// printf("3. CWJAP\r\n");
while (ESP8266_SendCmd(ESP8266_WIFI_INFO, "GOT IP"))
HAL_Delay(1000);
// printf("4. CIPSTART\r\n");
while (ESP8266_SendCmd(ESP8266_ONENET_INFO, "CONNECT"))
HAL_Delay(1000);
// printf("5. ESP8266 Init OK\r\n");
} }
void ESP8266_Init(const int isSmartConfig)
{
ESP8266_Clear();
// reset ESP8266
while (ESP8266_SendCmd("AT+RST\r\n", "ready")) HAL_Delay(500);
// make sure ESP is up
while (ESP8266_SendCmd("AT\r\n", "OK")) HAL_Delay(500);
// set auto connect to AP
while (ESP8266_SendCmd("AT+CWAUTOCONN=1\r\n", "OK")) HAL_Delay(500);
// set CWMODE
while (ESP8266_SendCmd("AT+CWMODE=1\r\n", "OK")) HAL_Delay(500);
if (isSmartConfig)
{
ESP8266_SmartConfig();
}
else
{
// connect to built-in AP
// while (ESP8266_SendCmd(ESP8266_WIFI_INFO, "GOT IP")) HAL_Delay(1000);
// wait until WiFi is up
while (ESP8266_SendCmd("AT\r\n", "GOT IP")) HAL_Delay(1000);
}
// connect to OneNet via TCP
while (ESP8266_SendCmd(ESP8266_ONENET_INFO, "CONNECT")) HAL_Delay(1000);
}
void ESP8266_SmartConfig(void)
{
// start smart config
while (ESP8266_SendCmd("AT+CWSTARTSMART=1\r\n", "OK")) HAL_Delay(500);
// wait for smart config to finish
while (ESP8266_SendCmd("AT\r\n", "smartconfig connected wifi")) HAL_Delay(500);
// stop smart config
while (ESP8266_SendCmd("AT+CWSTOPSMART\r\n", "OK")) HAL_Delay(500);
}
//========================================================== //==========================================================
// 函数名称： ESP8266_IRQHandler // 函数名称： ESP8266_IRQHandler

155
Core/Src/freertos.c
View File

@ -25,8 +25,15 @@
/* Private includes ----------------------------------------------------------*/ /* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */ /* USER CODE BEGIN Includes */
#include <stdio.h>
#include "esp8266.h" #include "esp8266.h"
#include "OneNet.h" #include "OneNet.h"
#include "oled.h"
#include "stm32f1xx_hal.h"
#include <string.h>
#include "retarget.h"
#include "timers.h"
/* USER CODE END Includes */ /* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/ /* Private typedef -----------------------------------------------------------*/
@ -36,7 +43,10 @@
/* Private define ------------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/
/* USER CODE BEGIN PD */ /* 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 */ /* USER CODE END PD */
/* Private macro -------------------------------------------------------------*/ /* Private macro -------------------------------------------------------------*/
@ -46,13 +56,13 @@
/* Private variables ---------------------------------------------------------*/ /* Private variables ---------------------------------------------------------*/
/* USER CODE BEGIN Variables */ /* USER CODE BEGIN Variables */
char ONENET_CONNECTED = 0;
/* USER CODE END Variables */ /* USER CODE END Variables */
/* Definitions for defaultTask */ /* Definitions for defaultTask */
osThreadId_t defaultTaskHandle; osThreadId_t defaultTaskHandle;
const osThreadAttr_t defaultTask_attributes = { const osThreadAttr_t defaultTask_attributes = {
.name = "defaultTask", .name = "defaultTask",
.stack_size = 128 * 4, .stack_size = 256 * 4,
.priority = (osPriority_t) osPriorityNormal, .priority = (osPriority_t) osPriorityNormal,
}; };
/* Definitions for keyScanTask */ /* Definitions for keyScanTask */
@ -62,22 +72,23 @@ const osThreadAttr_t keyScanTask_attributes = {
.stack_size = 128 * 4, .stack_size = 128 * 4,
.priority = (osPriority_t) osPriorityNormal, .priority = (osPriority_t) osPriorityNormal,
}; };
/* Definitions for dataHandler */ /* Definitions for cmdTask */
osThreadId_t dataHandlerHandle; osThreadId_t cmdTaskHandle;
const osThreadAttr_t dataHandler_attributes = { const osThreadAttr_t cmdTask_attributes = {
.name = "dataHandler", .name = "cmdTask",
.stack_size = 128 * 4, .stack_size = 256 * 4,
.priority = (osPriority_t) osPriorityNormal, .priority = (osPriority_t) osPriorityNormal,
}; };
/* Private function prototypes -----------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/
/* USER CODE BEGIN FunctionPrototypes */ /* USER CODE BEGIN FunctionPrototypes */
void KeyScan(void);
void Display_IM1281B(void);
/* USER CODE END FunctionPrototypes */ /* USER CODE END FunctionPrototypes */
void StartDefaultTask(void *argument); void StartDefaultTask(void *argument);
void startKeyScanTask(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) */ 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) { void MX_FREERTOS_Init(void) {
/* USER CODE BEGIN Init */ /* 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 END Init */
/* USER CODE BEGIN RTOS_MUTEX */ /* USER CODE BEGIN RTOS_MUTEX */
@ -114,8 +139,8 @@ void MX_FREERTOS_Init(void) {
/* creation of keyScanTask */ /* creation of keyScanTask */
keyScanTaskHandle = osThreadNew(startKeyScanTask, NULL, &keyScanTask_attributes); keyScanTaskHandle = osThreadNew(startKeyScanTask, NULL, &keyScanTask_attributes);
/* creation of dataHandler */ /* creation of cmdTask */
dataHandlerHandle = osThreadNew(startDataHandler, NULL, &dataHandler_attributes); cmdTaskHandle = osThreadNew(startCmdTask, NULL, &cmdTask_attributes);
/* USER CODE BEGIN RTOS_THREADS */ /* USER CODE BEGIN RTOS_THREADS */
/* add threads, ... */ /* add threads, ... */
@ -140,7 +165,16 @@ void StartDefaultTask(void *argument)
/* Infinite loop */ /* Infinite loop */
for(;;) for(;;)
{ {
osDelay(1); IM_ReadFlag = 1; //抄读标志
IM_Read();
osDelay(500);
OneNet_SendData();
osDelay(500);
ESP8266_Clear();
Display_IM1281B();
} }
/* USER CODE END StartDefaultTask */ /* USER CODE END StartDefaultTask */
} }
@ -163,36 +197,97 @@ void startKeyScanTask(void *argument)
/* USER CODE END startKeyScanTask */ /* 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 * @param argument: Not used
* @retval None * @retval None
*/ */
/* USER CODE END Header_startDataHandler */ /* USER CODE END Header_startCmdTask */
void startDataHandler(void *argument) void startCmdTask(void *argument)
{ {
/* USER CODE BEGIN startDataHandler */ /* USER CODE BEGIN startCmdTask */
/* Infinite loop */ /* Infinite loop */
for(;;) for(;;)
{ {
HAL_GPIO_TogglePin(LED0_GPIO_Port, LED0_Pin); if (ONENET_CONNECTED)
IM_ReadFlag = 1; //抄读标志 {
IM_Read(); uint8_t* dataPtr = ESP8266_GetIPD_soft(0);
if (dataPtr != NULL)
osDelay(500); {
OneNet_RevPro(dataPtr);
// OneNet_SendData(); }
// osDelay(500); }
// ESP8266_Clear();
Display_IM1281B();
} }
/* USER CODE END startDataHandler */ /* USER CODE END startCmdTask */
} }
/* Private application code --------------------------------------------------*/ /* Private application code --------------------------------------------------*/
/* USER CODE BEGIN Application */ /* 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 */ /* USER CODE END Application */

111
Core/Src/main.c
View File

@ -44,10 +44,7 @@
/* Private define ------------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/
/* USER CODE BEGIN PD */ /* 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 */ /* USER CODE END PD */
/* Private macro -------------------------------------------------------------*/ /* Private macro -------------------------------------------------------------*/
@ -60,8 +57,6 @@
/* USER CODE BEGIN PV */ /* USER CODE BEGIN PV */
extern unsigned short esp8266_cnt; extern unsigned short esp8266_cnt;
extern unsigned char esp8266_buf[128]; extern unsigned char esp8266_buf[128];
char ONENET_CONNECTED = 0;
uint8_t* dataPtr;
uint8_t* UART1_RxData[40]; uint8_t* UART1_RxData[40];
uint8_t UART2_RxData; uint8_t UART2_RxData;
@ -86,72 +81,7 @@ void MX_FREERTOS_Init(void);
/* Private user code ---------------------------------------------------------*/ /* Private user code ---------------------------------------------------------*/
/* USER CODE BEGIN 0 */ /* USER CODE BEGIN 0 */
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 0 */ /* USER CODE END 0 */
/** /**
@ -192,31 +122,22 @@ int main(void)
/* USER CODE BEGIN 2 */ /* USER CODE BEGIN 2 */
// Retarget uart // Retarget uart
RetargetInit(&huart1); // RetargetInit(&huart1);
// Init OLED // Init OLED
OLED_Init(); OLED_Init();
OLED_Clear(); OLED_Clear();
OLED_ShowString(0,0,"initializing...",12);
// HAL_TIM_Base_Start_IT(&htim1); // HAL_TIM_Base_Start_IT(&htim1);
// HAL_TIM_Base_Start_IT(&htim3); // HAL_TIM_Base_Start_IT(&htim3);
HAL_UARTEx_ReceiveToIdle_IT(&huart1, (uint8_t*)UART1_RxData, 40);
HAL_UART_Receive_IT(&huart2, &UART2_RxData, 1);
ESP8266_Init();
while (OneNet_DevLink()) {}
OneNET_Subscribe();
ONENET_CONNECTED = 1;
// Init RC522 // Init RC522
MFRC_Init(); MFRC_Init();
PCD_Reset(); PCD_Reset();
OLED_ShowString(0,0,"OneNet online ",12); HAL_UARTEx_ReceiveToIdle_IT(&huart1, (uint8_t*)UART1_RxData, 40);
HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_RESET); HAL_UART_Receive_IT(&huart2, &UART2_RxData, 1);
/* USER CODE END 2 */ /* USER CODE END 2 */
/* Init scheduler */ /* Init scheduler */
@ -404,17 +325,17 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
// if(htim->Instance == TIM1){ // if(htim->Instance == TIM1){
// KeyScan(); // KeyScan();
// } // }
if (htim->Instance == TIM3) // if (htim->Instance == TIM3)
{ // {
if (ONENET_CONNECTED) // if (ONENET_CONNECTED)
{ // {
dataPtr = ESP8266_GetIPD(0); // dataPtr = ESP8266_GetIPD(0);
if (dataPtr != NULL) // if (dataPtr != NULL)
{ // {
OneNet_RevPro(dataPtr); // OneNet_RevPro(dataPtr);
} // }
} // }
} // }
/* USER CODE END Callback 0 */ /* USER CODE END Callback 0 */
if (htim->Instance == TIM4) if (htim->Instance == TIM4)
{ {

5
IntelliChargingPile.ioc
View File

@ -4,8 +4,8 @@ CAD.pinconfig=Dual
CAD.provider= CAD.provider=
FREERTOS.FootprintOK=true FREERTOS.FootprintOK=true
FREERTOS.IPParameters=Tasks01,configUSE_NEWLIB_REENTRANT,FootprintOK,configTOTAL_HEAP_SIZE FREERTOS.IPParameters=Tasks01,configUSE_NEWLIB_REENTRANT,FootprintOK,configTOTAL_HEAP_SIZE
FREERTOS.Tasks01=defaultTask,24,128,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL;keyScanTask,24,128,startKeyScanTask,Default,NULL,Dynamic,NULL,NULL;dataHandler,24,128,startDataHandler,Default,NULL,Dynamic,NULL,NULL FREERTOS.Tasks01=defaultTask,24,256,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL;keyScanTask,24,128,startKeyScanTask,Default,NULL,Dynamic,NULL,NULL;cmdTask,24,256,startCmdTask,Default,NULL,Dynamic,NULL,NULL
FREERTOS.configTOTAL_HEAP_SIZE=3600 FREERTOS.configTOTAL_HEAP_SIZE=8192
FREERTOS.configUSE_NEWLIB_REENTRANT=1 FREERTOS.configUSE_NEWLIB_REENTRANT=1
File.Version=6 File.Version=6
GPIO.groupedBy=Group By Peripherals GPIO.groupedBy=Group By Peripherals
@ -236,3 +236,4 @@ VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT
VP_TIM3_VS_ClockSourceINT.Mode=Internal VP_TIM3_VS_ClockSourceINT.Mode=Internal
VP_TIM3_VS_ClockSourceINT.Signal=TIM3_VS_ClockSourceINT VP_TIM3_VS_ClockSourceINT.Signal=TIM3_VS_ClockSourceINT
board=custom board=custom
rtos.0.ip=FREERTOS