From a801f801d0327ef40070fc3df274b2d9e4744465 Mon Sep 17 00:00:00 2001
From: "406798106@qq.com" <406798106@qq.com>
Date: Mon, 25 Dec 2023 09:33:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?docs(changelog):=20=E5=8F=91=E5=B8=83=20v2.?=
=?UTF-8?q?8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74a34fc..d470e11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## 2.8.0
+`2023-12-25 09:33`
+#### 其它变更
+- chore: 增强嵌入式代码的健壮性和可维护性 ([44a4a55](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/44a4a554fd9a0f36e5f7eb9e3e04af9ef0c8b845)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([4f5521f](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/4f5521f14869a3d78efa7755f868d0b860347001)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([022fb52](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/022fb5252faa1c1074f80a8c80dd0ffecc6c8594)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([f77a3d6](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/f77a3d69990a2e5b4ee7d6b9e2e9eb93e0349ed2)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([4977108](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/49771087b43ed3ae079ded4d636b855139e275aa)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([9992ac8](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/9992ac8dc082d7caaf9dbe808cb1036d4a8cd0c2)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([6a7fb5a](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/6a7fb5a2bcf6ff22a1463818d852b54c363d5a04)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([7aacc93](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/7aacc93ae2958cd422c34c129dbe79400fcd84d7)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([02ab07d](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/02ab07d56df1817b344ce6de078a46a605ea4fb2)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([e0cb39c](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/e0cb39ccd315cfa7037077ef2dfc35c21e1b69b2)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([6ba52c6](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/6ba52c645d3aa319591fe785285bd14a464b97db)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([2cb4868](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/2cb48688ff09387acc30cb6c20a942f152234326)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([b0f60a7](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/b0f60a71b5c51a6ba2f7b6081c14dbf193bc850b)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([897f211](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/897f2111facffd685a6acd50f3999f5708f8340b)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([45c8aea](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/45c8aea109e1b97ed2d38b59b5acc35b75d235b1)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([7161e54](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/7161e54fa94c749bb4ea54416857800f2c157e53)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([945340f](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/945340faca332318ce395de631c7af3ccb13f557)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([1468a85](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/1468a858934b4a06c60a31017650dcb38a8001ef)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([7630187](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/7630187ef7750aa014b046e4d47814e99448a039)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([bf28cbf](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/bf28cbfc08a35eb34fa616e7fd7054a86856209f)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([e75554e](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/e75554e131d345633c33254389c31f5e4b1892cb)) @406798106
+- chore: 增强嵌入式代码的健壮性和可维护性 ([361b8f9](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/361b8f9bf57c76778927f3d7b8be8c2a208949b0)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([f81b4a0](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/f81b4a0b7b1228a0aff4d0d73f4b0d496edf9882)) @406798106
+
## 2.7.10
`2023-12-23 09:58`
#### 其它变更
From 429a78930bfc58b2a613210851ba5c93696360b0 Mon Sep 17 00:00:00 2001
From: panweiji <406798106@qq.com>
Date: Mon, 25 Dec 2023 10:52:47 +0800
Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=E5=A2=9E=E5=BC=BA=E5=B5=8C?=
=?UTF-8?q?=E5=85=A5=E5=BC=8F=E4=BB=A3=E7=A0=81=E7=9A=84=E5=81=A5=E5=A3=AE?=
=?UTF-8?q?=E6=80=A7=E5=92=8C=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
projects-demo/esp32-c3-demo/README.md | 1 +
projects/athena-common-embedded/README.md | 2 +-
projects/car-lock/README.md | 1 +
projects/parking-space-gate/README.md | 3 ++-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/projects-demo/esp32-c3-demo/README.md b/projects-demo/esp32-c3-demo/README.md
index 96f71f2..8e91c46 100644
--- a/projects-demo/esp32-c3-demo/README.md
+++ b/projects-demo/esp32-c3-demo/README.md
@@ -38,4 +38,5 @@ https://github.com/platformio/platform-espressif32
获取自定义多环境变量宏定义
#define XSTR(x) #x
#define STR(x) XSTR(x)
+
const char *env_app_version = STR(ENV_APP_VERSION);
\ No newline at end of file
diff --git a/projects/athena-common-embedded/README.md b/projects/athena-common-embedded/README.md
index eda0839..4e9e8fb 100644
--- a/projects/athena-common-embedded/README.md
+++ b/projects/athena-common-embedded/README.md
@@ -1 +1 @@
-### Embedded嵌入式业务通用包
+### Embedded嵌入式业务通用包 与几个项目具体业务相关 不具备所有项目通用的功能模块
diff --git a/projects/car-lock/README.md b/projects/car-lock/README.md
index 54812e1..306c789 100644
--- a/projects/car-lock/README.md
+++ b/projects/car-lock/README.md
@@ -39,4 +39,5 @@ https://github.com/platformio/platform-espressif32
获取自定义多环境变量宏定义
#define XSTR(x) #x
#define STR(x) XSTR(x)
+
const char *env_app_version = STR(ENV_APP_VERSION);
\ No newline at end of file
diff --git a/projects/parking-space-gate/README.md b/projects/parking-space-gate/README.md
index abfca25..7c80640 100644
--- a/projects/parking-space-gate/README.md
+++ b/projects/parking-space-gate/README.md
@@ -1,4 +1,4 @@
-### 车位道闸嵌入式控制
+### 车位道闸嵌入式控制
### PlatformIO新一代嵌入式平台开发esp32单片机和Arduino框架
@@ -39,4 +39,5 @@ https://github.com/platformio/platform-espressif32
获取自定义多环境变量宏定义
#define XSTR(x) #x
#define STR(x) XSTR(x)
+
const char *env_app_version = STR(ENV_APP_VERSION);
\ No newline at end of file
From d64cdae268458f46704f32f5c795a9a81d1fde87 Mon Sep 17 00:00:00 2001
From: "406798106@qq.com" <406798106@qq.com>
Date: Mon, 25 Dec 2023 15:18:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?docs(changelog):=20=E5=8F=91=E5=B8=83=20v2.?=
=?UTF-8?q?8.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d470e11..8b3946e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.8.1
+`2023-12-25 15:18`
+#### 其它变更
+- chore: 增强嵌入式代码的健壮性和可维护性 ([429a789](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/429a78930bfc58b2a613210851ba5c93696360b0)) @406798106
+- chore: 增强嵌入式代码的健壮性和可维护性 ([44a4a55](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/44a4a554fd9a0f36e5f7eb9e3e04af9ef0c8b845)) @406798106
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([4f5521f](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/4f5521f14869a3d78efa7755f868d0b860347001)) @406798106
+
## 2.8.0
`2023-12-25 09:33`
#### 其它变更
From f351ad4eb1d68bb6e220acc850ceefd48876f2b2 Mon Sep 17 00:00:00 2001
From: panweiji <406798106@qq.com>
Date: Tue, 26 Dec 2023 14:38:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=E5=A2=9E=E5=BC=BA=E5=B5=8C?=
=?UTF-8?q?=E5=85=A5=E5=BC=8F=E4=BB=A3=E7=A0=81=E7=9A=84=E5=81=A5=E5=A3=AE?=
=?UTF-8?q?=E6=80=A7=E5=92=8C=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../athena-common/mqtt/at_mqtt/at_mqtt.cpp | 2 ++
packages/athena-common/mqtt/mqtt.cpp | 1 +
.../esp32-c3-demo/lib/LibDemo/README.md | 1 +
.../esp32-c3-demo/lib/LibDemo/docs/README.md | 1 +
.../lib/LibDemo/examples/README.md | 1 +
.../esp32-c3-demo/lib/LibDemo/library.json | 10 +++++++++
.../esp32-c3-demo/lib/LibDemo/src/LibDemo.cpp | 21 +++++++++++++++++++
.../esp32-c3-demo/lib/LibDemo/src/LibDemo.h | 8 +++++++
projects-demo/esp32-c3-demo/src/main.cpp | 5 +++++
9 files changed, 50 insertions(+)
create mode 100644 projects-demo/esp32-c3-demo/lib/LibDemo/README.md
create mode 100644 projects-demo/esp32-c3-demo/lib/LibDemo/docs/README.md
create mode 100644 projects-demo/esp32-c3-demo/lib/LibDemo/examples/README.md
create mode 100644 projects-demo/esp32-c3-demo/lib/LibDemo/library.json
create mode 100644 projects-demo/esp32-c3-demo/lib/LibDemo/src/LibDemo.cpp
create mode 100644 projects-demo/esp32-c3-demo/lib/LibDemo/src/LibDemo.h
diff --git a/packages/athena-common/mqtt/at_mqtt/at_mqtt.cpp b/packages/athena-common/mqtt/at_mqtt/at_mqtt.cpp
index 334eb51..27b1cd2 100644
--- a/packages/athena-common/mqtt/at_mqtt/at_mqtt.cpp
+++ b/packages/athena-common/mqtt/at_mqtt/at_mqtt.cpp
@@ -437,6 +437,8 @@ void do_at_mqtt_subscribe(DynamicJsonDocument json, String topic) {
if (command == "heartbeat") { // 心跳指令
do_at_mqtt_heart_beat();
}
+
+ // 应该抽离出业务指令 单独维护代码 保证代码的通用性和易维护性
if (command == "raise") { // 电机升起指令
set_motor_up();
}
diff --git a/packages/athena-common/mqtt/mqtt.cpp b/packages/athena-common/mqtt/mqtt.cpp
index 6d31829..34a4428 100644
--- a/packages/athena-common/mqtt/mqtt.cpp
+++ b/packages/athena-common/mqtt/mqtt.cpp
@@ -257,6 +257,7 @@ void do_mqtt_subscribe(DynamicJsonDocument json, char *topic) {
if (command == "heartbeat") { // 心跳指令
do_mqtt_heart_beat();
}
+ // 应该抽离出业务指令 单独维护代码 保证代码的通用性和易维护性
if (command == "raise") {
set_motor_up();
}
diff --git a/projects-demo/esp32-c3-demo/lib/LibDemo/README.md b/projects-demo/esp32-c3-demo/lib/LibDemo/README.md
new file mode 100644
index 0000000..c505007
--- /dev/null
+++ b/projects-demo/esp32-c3-demo/lib/LibDemo/README.md
@@ -0,0 +1 @@
+### PlatformIO自定义库 用于项目应用示例
diff --git a/projects-demo/esp32-c3-demo/lib/LibDemo/docs/README.md b/projects-demo/esp32-c3-demo/lib/LibDemo/docs/README.md
new file mode 100644
index 0000000..5732378
--- /dev/null
+++ b/projects-demo/esp32-c3-demo/lib/LibDemo/docs/README.md
@@ -0,0 +1 @@
+### PlatformIO库文档
diff --git a/projects-demo/esp32-c3-demo/lib/LibDemo/examples/README.md b/projects-demo/esp32-c3-demo/lib/LibDemo/examples/README.md
new file mode 100644
index 0000000..5787aea
--- /dev/null
+++ b/projects-demo/esp32-c3-demo/lib/LibDemo/examples/README.md
@@ -0,0 +1 @@
+### PlatformIO库文示例
\ No newline at end of file
diff --git a/projects-demo/esp32-c3-demo/lib/LibDemo/library.json b/projects-demo/esp32-c3-demo/lib/LibDemo/library.json
new file mode 100644
index 0000000..b0c66a1
--- /dev/null
+++ b/projects-demo/esp32-c3-demo/lib/LibDemo/library.json
@@ -0,0 +1,10 @@
+{
+ "name": "lib_demo",
+ "version": "1.0.0",
+ "description": "PlatformIO自定义库 用于项目应用示例",
+ "authors": {
+ "name": "潘维吉",
+ "email": "406798106@qq.com",
+ "url": "https://github.com/DreamPWJ"
+ }
+}
\ No newline at end of file
diff --git a/projects-demo/esp32-c3-demo/lib/LibDemo/src/LibDemo.cpp b/projects-demo/esp32-c3-demo/lib/LibDemo/src/LibDemo.cpp
new file mode 100644
index 0000000..efce754
--- /dev/null
+++ b/projects-demo/esp32-c3-demo/lib/LibDemo/src/LibDemo.cpp
@@ -0,0 +1,21 @@
+#include "LibDemo.h"
+#include
+
+using namespace std;
+
+
+/**
+* @author 潘维吉
+* @date 2023/12/25 15:51
+* @description PlatformIO自定义库 用于项目应用示例
+*/
+
+
+/**
+ * 初始化示例
+ */
+void init_demo() {
+
+ Serial.println("PlatformIO自定义库 用于项目应用示例测试");
+
+}
\ No newline at end of file
diff --git a/projects-demo/esp32-c3-demo/lib/LibDemo/src/LibDemo.h b/projects-demo/esp32-c3-demo/lib/LibDemo/src/LibDemo.h
new file mode 100644
index 0000000..a2d424e
--- /dev/null
+++ b/projects-demo/esp32-c3-demo/lib/LibDemo/src/LibDemo.h
@@ -0,0 +1,8 @@
+#ifndef ESP32_C3_DEMO_LIBDEMO_H
+#define ESP32_C3_DEMO_LIBDEMO_H
+
+#include
+
+void init_demo();
+
+#endif
diff --git a/projects-demo/esp32-c3-demo/src/main.cpp b/projects-demo/esp32-c3-demo/src/main.cpp
index 43a38c4..125cf54 100644
--- a/projects-demo/esp32-c3-demo/src/main.cpp
+++ b/projects-demo/esp32-c3-demo/src/main.cpp
@@ -2,6 +2,7 @@
#include
#include
#include
+#include
#include
// #include
@@ -28,6 +29,10 @@ void setup() {
Serial.begin(115200);
Serial.println("ESP32 C3 MCU");
+
+ // PlatformIO自定义库 用于项目应用示例
+ init_demo();
+
String project_name = STR(PROJECT_NAME);
Serial.println(project_name);
String projectName = "esp32-c3-demo";