diff --git a/V1.5/STM32F103_App1/HardWare/HLW8032/hlw8032.c b/V1.5/STM32F103_App1/HardWare/HLW8032/hlw8032.c index 660d0da..c3f1b8b 100644 --- a/V1.5/STM32F103_App1/HardWare/HLW8032/hlw8032.c +++ b/V1.5/STM32F103_App1/HardWare/HLW8032/hlw8032.c @@ -119,17 +119,6 @@ static void hlw8032_parse(const uint8_t *f) if (!s_synced) { s_synced = 1; log_info("> 电能: HLW8032 在线, 功率参数=%lu", (unsigned long)s_power_par); - /* 电能底数:平台会过滤 0 值,首次(累计不足 1 度)把底数补足 1.00 kWh 并落盘。 - * 之后累计只会增加,此逻辑只生效一次 */ - { - uint64_t one_kwh = (uint64_t)(3.6e12 / - ((double)s_power_par * HLW_U_COEF * HLW_I_COEF)); - if (s_total_pulses < one_kwh) { - s_total_pulses = one_kwh; - hlw8032_save(); - log_info("> 电能: 底数已初始化为 1.00 kWh"); - } - } } s_last_frame_tick = HAL_GetTick(); } diff --git a/V1.5/STM32F103_App1/Inc/main.h b/V1.5/STM32F103_App1/Inc/main.h index bd9a271..d402c09 100644 --- a/V1.5/STM32F103_App1/Inc/main.h +++ b/V1.5/STM32F103_App1/Inc/main.h @@ -75,7 +75,7 @@ extern UART_HandleTypeDef huart3; /*===== 蓝牙发射功率(AT+RFPOWER) ===== * 1~18 共 18 级,出厂默认 8。多台设备同场所时调小(如 1~3), * 缩短可搜索距离,避免互相认错设备。模块内保存,改宏后下次开机自动重设一次 */ -#define BLE_TX_POWER 1 +#define BLE_TX_POWER 3 /*===== HLW8032 电量计量系数(UART5 PD2 接收,只上报累计电量) ===== * 电压通道: ZMPT107-1(2mA:2mA),初级 220V 串 100K,次级并 49.9R diff --git a/V1.5/STM32F103_App1/README.md b/V1.5/STM32F103_App1/README.md index 265e87d..d84481f 100644 --- a/V1.5/STM32F103_App1/README.md +++ b/V1.5/STM32F103_App1/README.md @@ -116,7 +116,6 @@ - **绯绘暟瀹**锛歚main.h` 鐨 `HLW_U_COEF`锛=100K/49.9/1000=2.004锛夈乣HLW_I_COEF`锛=1/(0.002脳1000)=0.5锛夆斺旀敼鐢甸樆/浜掓劅鍣ㄥ彧鍔ㄨ繖涓や釜瀹 - **闃插櫔澹板亣鍚屾**锛氳姹傝繛缁 3 甯т笖闂撮殧 20~150ms 鎵嶈瀹氬湪绾匡紙PD2 鎮┖鏃剁數纾佸共鎵板伓鍙戜篃鑳藉噾鍑烘牎楠屽拰姝g‘鐨勫亣甯э紝浣嗕笉鍙兘杩炵画鍗″湪 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 -- **搴曟暟 1kWh**锛氶娆★紙EEPROM 绌虹櫧鎴栫疮璁′笉瓒 1 搴︼級鍚屾鍒伴甯ф椂琛ヨ冻 1.00kWh 骞惰惤鐩橈紙骞冲彴杩囨护 0 鍊硷紝淇濊瘉鏈夋暟鎹樉绀猴級锛屽彧鐢熸晥涓娆 - **鎸佷箙鍖**锛氱疮璁¤剦鍐叉暟锛坲int64锛夊瓨 EEPROM 鍋忕Щ 164~171锛涙瘡鏀掔害 0.1kWh 鍐欎竴娆★紙闄愬埗鎿﹀啓锛夛紝鎵鏈夎鍒掑唴澶嶄綅锛坄reset_log_mark` 瑕嗙洊鐨勫浣嶇偣锛夊浣嶅墠鍐欎竴娆★紝鏂數棰勮锛堟硶鎷夌數瀹圭画鑸唴锛夊啀鍐欎竴娆♀斺旈櫎绐佺劧姝绘満澶栧熀鏈笉涓㈢數閲 - **涓婃姤绛栫暐**锛氬姛鐜 >10W 鏃舵瘡 30s 涓婃姤涓娆 `{"energy":%.2f}`锛涒墹10W 鏃朵粎棣栨鑱旂綉鎶ヤ竴娆★紙鐪佹祦閲忥級锛涚户鐢靛櫒寮鍏冲垏鎹㈤殢鐘舵佸ぇ鎶ユ枃鎼哄甫 energy銆備覆鍙g數鑳芥棩蹇楀浐瀹 10s 涓鏉°傞槇鍊煎畯 `ENERGY_REPORT_POWER_W`銆侀棿闅斿畯 `ENERGY_REPORT_INTERVAL_MS` 鍦 app_loop.c - **璋冭瘯鏃ュ織**锛氳姱鐗囧湪绾挎椂姣 10s 鎵撳嵃涓鏉★紙`鐢佃兘: x.xxkWh 鐢靛帇: xxx.xV 鐢垫祦: x.xxA 鍔熺巼: xxxx.xW`锛夛紝涓庝笂鎶ヨ妭濂忔棤鍏 diff --git a/V1.5/鐗堟湰璇存槑.md b/V1.5/鐗堟湰璇存槑.md index 533b94f..347dbfb 100644 --- a/V1.5/鐗堟湰璇存槑.md +++ b/V1.5/鐗堟湰璇存槑.md @@ -174,3 +174,4 @@ 鍔熺巼鍊煎苟鍏 EEPROM 缂撳瓨鍒ゆ柇锛堝亸绉 158锛夛紝鏀瑰畯鍚庝笅娆″紑鏈鸿嚜鍔ㄩ噸璁句竴娆 - 鏂數娑堟伅鍙戦佸姞鍥猴細pow:0 鏀圭瓑妯$粍鍥 OK锛垀1.5s/娆★紝鏈澶 3 娆★級+ OK 鍚庣暀 800ms 绌哄彛鏃堕棿锛 3 娆¢兘澶辫触涔熺収甯稿啓璁板綍澶嶄綅锛堜笉鍥犲彂閫佸け璐ヤ涪鏂數璁板綍锛 +- 鍘绘帀鐢佃兘搴曟暟 1kWh 鏈哄埗锛堢敤鎴风‘璁ゅ钩鍙板彲姝e父鏄剧ず灏忔暟鍊硷級