From e22bf71318fee226942ecfa14014de4461856a54 Mon Sep 17 00:00:00 2001
From: helei <helei@nky.com>
Date: Sun, 23 Aug 2026 07:42:21 +0800
Subject: [PATCH] =?UTF-8?q?V1.5:=20=E7=94=B5=E8=83=BD/=E5=8A=9F=E7=8E=87?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=94=B9=E5=9B=BA=E5=AE=9A=E6=AF=8F3?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=E4=B8=80=E6=AC=A1(=E4=B8=8D=E6=8C=89?=
 =?UTF-8?q?=E5=8A=9F=E7=8E=87=E9=98=88=E5=80=BC=E5=8C=BA=E5=88=86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c | 10 ++++------
 V1.5/STM32F103_App1/Inc/main.h                  | 12 ++++++------
 V1.5/STM32F103_App1/README.md                   |  2 +-
 V1.5/鐗堟湰璇存槑.md                            |  1 +
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c b/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c
index 1b2624a..616ff09 100644
--- a/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c
+++ b/V1.5/STM32F103_App1/HardWare/SYSINIT/app_loop.c
@@ -355,10 +355,9 @@ static void oled_home_refresh(uint32_t up_ms)
     }
 }
 
-/* 电能上报策略：功率 > 10W 时每 30s 上报一次；<=10W 仅首次联网报一次
- * （开关切换随状态大报文带 energy，无需单独发）。串口日志固定 10s 一条 */
-#define ENERGY_REPORT_INTERVAL_MS  30000u
-#define ENERGY_REPORT_POWER_W      10.0f
+/* 电能上报策略：无论功率多少，每 3 分钟上报一次（energy+power 同一条报文）。
+ * 串口日志固定 10s 一条 */
+#define ENERGY_REPORT_INTERVAL_MS  180000u
 
 /*==== sys_task：系统辅助（LED/电量/蓝牙命令/运行时长）====*/
 static void sys_task(void *arg)
@@ -426,8 +425,7 @@ static void sys_task(void *arg)
             if (!energy_first_reported) {
                 report = 1;
                 energy_first_reported = 1;
-            } else if (pw > ENERGY_REPORT_POWER_W &&
-                       (HAL_GetTick() - energy_report_tick) >= ENERGY_REPORT_INTERVAL_MS) {
+            } else if ((HAL_GetTick() - energy_report_tick) >= ENERGY_REPORT_INTERVAL_MS) {
                 report = 1;
             }
             if (report) {
diff --git a/V1.5/STM32F103_App1/Inc/main.h b/V1.5/STM32F103_App1/Inc/main.h
index 5ec4b9d..0f3c5d3 100644
--- a/V1.5/STM32F103_App1/Inc/main.h
+++ b/V1.5/STM32F103_App1/Inc/main.h
@@ -54,14 +54,14 @@ extern UART_HandleTypeDef huart3;
 //#define MQTT_PASSWORD    "b612c2839c135934"
 
 ////RTOS版-投料机-无蠕变磅秤-01
-#define MQTT_CLIENT_ID   "46c080c385c3652e"
-#define MQTT_USERNAME    "766990788193702677"
-#define MQTT_PASSWORD    "6ae9622b7034326b"
+//#define MQTT_CLIENT_ID   "46c080c385c3652e"
+//#define MQTT_USERNAME    "766990788193702677"
+//#define MQTT_PASSWORD    "6ae9622b7034326b"
 
 //RTOS版-投料机-无蠕变磅秤-03
-//#define MQTT_CLIENT_ID   "5791a8579d459290"
-//#define MQTT_USERNAME    "766990788193702677"
-//#define MQTT_PASSWORD    "5f6cd7748ec9db35"
+#define MQTT_CLIENT_ID   "5791a8579d459290"
+#define MQTT_USERNAME    "766990788193702677"
+#define MQTT_PASSWORD    "5f6cd7748ec9db35"
 
 #define MQTT_SERVER_IP   "58.17.14.95"
 #define MQTT_SERVER_PORT 1880
diff --git a/V1.5/STM32F103_App1/README.md b/V1.5/STM32F103_App1/README.md
index e5fa4b3..9af7725 100644
--- a/V1.5/STM32F103_App1/README.md
+++ b/V1.5/STM32F103_App1/README.md
@@ -117,7 +117,7 @@
 - **闃插櫔澹板亣鍚屾**锛氳姹傝繛缁� 3 甯т笖闂撮殧 20~150ms 鎵嶈瀹氬湪绾匡紙PD2 鎮┖鏃剁數纾佸共鎵板伓鍙戜篃鑳藉噾鍑烘牎楠屽拰姝ｇ‘鐨勫亣甯э紝浣嗕笉鍙兘杩炵画鍗″湪 50ms 鑺傚涓婏級
 - **婊ゆ尝涓庨浂婕�**锛氱數鍘�/鐢垫祦/鍔熺巼缁� EMA 婊戝姩骞冲潎锛堢郴鏁� 1/8锛岀害 0.4s 鍝嶅簲锛夊帇绌鸿浇璺冲彉锛涚數娴佸啀鍑忛浂鐐瑰亸绉� `HLW_I_ZERO_A`(0.02A) 閽充綅鍒� 0锛涘姛鐜囨鍖� `HLW_P_DEAD_W`(2W) 浠ヤ笅鏄剧ず 0銆佽秴鍑哄啀鍑� `HLW_P_ZERO_W`(0.5W)鈥斺�斿畯閮藉湪 main.h
 - **鎸佷箙鍖�**锛氱疮璁¤剦鍐叉暟锛坲int64锛夊瓨 EEPROM 鍋忕Щ 164~171锛涙瘡鏀掔害 0.1kWh 鍐欎竴娆★紙闄愬埗鎿﹀啓锛夛紝鎵�鏈夎鍒掑唴澶嶄綅锛坄reset_log_mark` 瑕嗙洊鐨勫浣嶇偣锛夊浣嶅墠鍐欎竴娆★紝鏂數棰勮锛堟硶鎷夌數瀹圭画鑸唴锛夊啀鍐欎竴娆♀�斺�旈櫎绐佺劧姝绘満澶栧熀鏈笉涓㈢數閲�
-- **涓婃姤绛栫暐**锛氬姛鐜� >10W 鏃舵瘡 30s 涓婃姤涓�娆� `{"energy":%.2f}`锛涒墹10W 鏃朵粎棣栨鑱旂綉鎶ヤ竴娆★紙鐪佹祦閲忥級锛涚户鐢靛櫒寮�鍏冲垏鎹㈤殢鐘舵�佸ぇ鎶ユ枃鎼哄甫 energy銆備覆鍙ｇ數鑳芥棩蹇楀浐瀹� 10s 涓�鏉°�傞槇鍊煎畯 `ENERGY_REPORT_POWER_W`銆侀棿闅斿畯 `ENERGY_REPORT_INTERVAL_MS` 鍦� app_loop.c
+- **涓婃姤绛栫暐**锛氭棤璁哄姛鐜囧灏戯紝姣� 3 鍒嗛挓涓婃姤涓�娆� `{"energy":%.2f,"power":%.1f}`锛涚户鐢靛櫒寮�鍏冲垏鎹㈤殢鐘舵�佸ぇ鎶ユ枃鎼哄甫 energy銆備覆鍙ｇ數鑳芥棩蹇楀浐瀹� 10s 涓�鏉°�傞棿闅斿畯 `ENERGY_REPORT_INTERVAL_MS` 鍦� app_loop.c
 - **璋冭瘯鏃ュ織**锛氳姱鐗囧湪绾挎椂姣� 10s 鎵撳嵃涓�鏉★紙`鐢佃兘: x.xxkWh  鐢靛帇: xxx.xV  鐢垫祦: x.xxA  鍔熺巼: xxxx.xW`锛夛紝涓庝笂鎶ヨ妭濂忔棤鍏�
 
 ## OLED 灞忓箷鏄剧ず锛�128x64 + GB2312 瀛楀簱 IC锛�
diff --git a/V1.5/鐗堟湰璇存槑.md b/V1.5/鐗堟湰璇存槑.md
index 5a07a78..d8299cb 100644
--- a/V1.5/鐗堟湰璇存槑.md
+++ b/V1.5/鐗堟湰璇存槑.md
@@ -208,3 +208,4 @@
 - 鏂數鏃跺簭鏀逛负锛氬厛鍙戞帀鐢垫秷鎭�(绛塐K) 鈫� 灞忓箷鏄剧ず"鍙戠敓鎺夌數浜嬩欢!"浜� 3 绉� 鈫� 鐔勫睆澶嶄綅
 - 钃濈墮璁剧疆娴佺▼寮�澶村厛纭浣嶆ā鍧楋紙BT_RST/PA7 鎷夐珮 100ms锛夛紝闃叉ā鍧楃姸鎬佸紓甯告椂 PC5 杩涗笉浜� AT 妯″紡
 - OLED 鏂板澶嶄綅鑴� PB14锛氬垵濮嬪寲鍓嶇粰 10ms 浣庤剦鍐茬‖浠跺浣嶅睆骞曪紝闃叉涓婄數鏃跺簭寮傚父鑺卞睆
+- 鐢佃兘/鍔熺巼涓婃姤鏀逛负鍥哄畾姣� 3 鍒嗛挓涓�娆★紙涓嶅啀鎸夊姛鐜囬槇鍊煎尯鍒嗭級