Merge pull request #8 from DreamPWJ/develop

Develop
DreamPWJ · Dec 13, 2023 · 4623fd3 · 4623fd3
2 parents dea4bc3 + 2b8dc08
commit 4623fd3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.7.2
+`2023-12-13 12:15`<br><br>
+#### 其它变更 
+- chore: 增强嵌入式C++代码的健壮性和可维护性 ([8d5ae7a](https://git.pengbocloud.com/lanneng_develop/embedded-monorepo/commit/8d5ae7a4a8b9621df39ea7eeef3d87d13d669c85)) @406798106 
+
 ## 2.7.1
 `2023-11-06 16:54`<br><br>
 #### 其它变更 

diff --git a/projects-demo/esp32-c3-demo/.env b/projects-demo/esp32-c3-demo/.env
@@ -1,9 +1,3 @@
-; 使用方式示例
-; 获取自定义多环境变量宏定义
-; define XSTR(x) #x
-; define STR(x) XSTR(x)
-; const char *env_app_version = STR(ENV_APP_VERSION);
-
 ENV_APP_VERSION=2.0.0
 ENV_NB_PIN_TX=18
 ENV_NB_PIN_RX=19
diff --git a/projects/car-lock/.env b/projects/car-lock/.env
@@ -1,9 +1,3 @@
-; 使用方式示例
-; 获取自定义多环境变量宏定义
-; define XSTR(x) #x
-; define STR(x) XSTR(x)
-; const char *env_app_version = STR(ENV_APP_VERSION);
-
 ENV_APP_VERSION=2.0.0
 ENV_NB_PIN_TX=18
 ENV_NB_PIN_RX=19
diff --git a/projects/car-lock/README.md b/projects/car-lock/README.md
@@ -9,11 +9,13 @@ https://docs.platformio.org/en/latest/integration/ide/clion.html
 
 #### MinGW 是最小的C、C++编译环境 gcc、g++。 验证命令 gcc -v
 
-https://www.mingw-w64.org/ 与 https://sourceforge.net/projects/mingw-w64/files/  下载x86_64-posix-seh 并bin所在目录添加环境变量到Path中
+https://www.mingw-w64.org/ 与 https://sourceforge.net/projects/mingw-w64/files/  下载x86_64-posix-seh
+并bin所在目录添加环境变量到Path中
 
 #### PlatformIO安装
 
-curl -fsSL https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py -o get-platformio.py
+curl -fsSL https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py -o
+get-platformio.py
 python3 get-platformio.py
 Windows用户, 把C:\Users\用户名\.platformio\penv\Scripts; 加到Path环境变量里才能生效 注意用户名不能有特殊符号
 初始化项目命令 pio -c clion init --ide clion 并且自动生成CMakeListsPrivate.txt文件和下载项目依赖
@@ -30,3 +32,10 @@ https://registry.platformio.org/search?t=library
 #### Espressif 32: development platform for PlatformIO 代码示例
 
 https://github.com/platformio/platform-espressif32
+
+#### .env文件使用方式示例
+
+获取自定义多环境变量宏定义
+define XSTR(x) #x
+define STR(x) XSTR(x)
+const char *env_app_version = STR(ENV_APP_VERSION);
diff --git a/projects/car-lock/platformio.ini b/projects/car-lock/platformio.ini
@@ -70,6 +70,6 @@ build_flags =
     ${env.build_flags}
     -D ENV_NAME=juxian
     -D FIRMWARE_UPDATE_JSON_URL="archive-artifacts-pipeline.oss-cn-shanghai.aliyuncs.com/iot/car-lock/juxian/prod/car-lockota.json"
-    -D MQTT_BROKER=jxybkj.cn
+    -D MQTT_BROKER=www.jxybkj.cn
     -D MQTT_USERNAME=admin
     -D MQTT_PASSWORD=emqx@2022