diff --git a/V1.5/STM32F103_App1/HardWare/SYSINIT/system.c b/V1.5/STM32F103_App1/HardWare/SYSINIT/system.c index 69cca35..f3bf24d 100644 --- a/V1.5/STM32F103_App1/HardWare/SYSINIT/system.c +++ b/V1.5/STM32F103_App1/HardWare/SYSINIT/system.c @@ -95,6 +95,23 @@ void MX_GPIO_Init(void) g.Pin = Relay2_Pin; HAL_GPIO_Init(Relay2_Port, &g); g.Pin = Relay3_Pin; HAL_GPIO_Init(Relay3_Port, &g); g.Pin = Relay4_Pin; HAL_GPIO_Init(Relay4_Port, &g); + + /* CAT_PWR(PC4): 4G 模块开机脚,开漏输出,拉低=模块开机(上电直接拉低即可) */ + HAL_GPIO_WritePin(GPIOC, GPIO_PIN_4, GPIO_PIN_RESET); + g.Mode = GPIO_MODE_OUTPUT_OD; + g.Pin = GPIO_PIN_4; + HAL_GPIO_Init(GPIOC, &g); + + /* ESP_EN(PA6): WiFi 模块使能,高电平有效,推挽输出(上电给高电平) */ + HAL_GPIO_WritePin(GPIOA, GPIO_PIN_6, GPIO_PIN_SET); + g.Mode = GPIO_MODE_OUTPUT_PP; + g.Pin = GPIO_PIN_6; + HAL_GPIO_Init(GPIOA, &g); + + /* BT_RST(PA7): 蓝牙模块复位脚,低电平=正常工作,高电平=复位,推挽输出默认拉低 */ + HAL_GPIO_WritePin(GPIOA, GPIO_PIN_7, GPIO_PIN_RESET); + g.Pin = GPIO_PIN_7; + HAL_GPIO_Init(GPIOA, &g); } void Error_Handler(void) diff --git a/V1.5/STM32F103_App1/MDK-ARM/STM32F103rb_App1.uvoptx b/V1.5/STM32F103_App1/MDK-ARM/STM32F103rb_App1.uvoptx index 8b6b5af..9d1ae9b 100644 --- a/V1.5/STM32F103_App1/MDK-ARM/STM32F103rb_App1.uvoptx +++ b/V1.5/STM32F103_App1/MDK-ARM/STM32F103rb_App1.uvoptx @@ -77,7 +77,7 @@ 0 1 - 255 + 18 0 @@ -924,6 +924,19 @@ 0 0 + + 7 + 50 + 1 + 0 + 0 + 0 + 0 + ..\HardWare\HLW8032\hlw8032.c + hlw8032.c + 0 + 0 + @@ -934,7 +947,7 @@ 0 8 - 50 + 51 5 0 0 diff --git a/V1.5/STM32F103_App1/README.md b/V1.5/STM32F103_App1/README.md index 1f2a8b6..d7ecf9f 100644 --- a/V1.5/STM32F103_App1/README.md +++ b/V1.5/STM32F103_App1/README.md @@ -58,6 +58,10 @@ | UART4 | WiFi ESP-01S | PC10/PC11 | 115200鈫921600-8N1锛堣涓嬫枃 WiFi 娉㈢壒鐜囧悓姝ワ級 | | UART5 | HLW8032 鐢佃兘璁¢噺 | PD2(RX) | 4800-8E1锛屽彧鏀讹紝鑺墖姣 50ms 涓诲姩涓婃姤 | | ESP_RST | WiFi 妯″潡澶嶄綅 | PA5 | 浣庣數骞 500ms 澶嶄綅 | +| CAT_PWR | 4G 妯″潡寮鏈 | PC4 | 寮婕忚緭鍑猴紝鎷変綆=妯″潡寮鏈猴紙涓婄數鍗虫媺浣庯級 | +| ESP_EN | WiFi 妯″潡浣胯兘 | PA6 | 鎺ㄦ尳杈撳嚭锛岄珮鐢靛钩=浣胯兘锛堜笂鐢靛嵆缃珮锛 | +| BT_MODE | 钃濈墮 AT/閫忎紶鍒囨崲 | PB0 | 寮婕忚緭鍑猴紝鎷変綆 1s 杩 AT 妯″紡锛坆le_at.c 鎺у埗锛 | +| BT_RST | 钃濈墮妯″潡澶嶄綅 | PA7 | 鎺ㄦ尳杈撳嚭锛屼綆鐢靛钩=宸ヤ綔锛堥粯璁わ級锛岄珮鐢靛钩=澶嶄綅 | | Relay1 | 鎶曞杺鐢垫満鎺у埗 | PB7 | 楂樼數骞冲惛鍚 | | Relay2~4 | 澶囩敤鎺у埗 | PB8/PC0/PC2 | 楂樼數骞冲惛鍚 | | I2C锛堣蒋浠讹級 | AT24C02 閰嶇疆瀛樺偍 | PA11/PA12 | 椤靛啓鍏 | diff --git a/V1.5/鐗堟湰璇存槑.md b/V1.5/鐗堟湰璇存槑.md index 0a03e84..c49edbd 100644 --- a/V1.5/鐗堟湰璇存槑.md +++ b/V1.5/鐗堟湰璇存槑.md @@ -104,3 +104,10 @@ - 绱鑴夊啿(uint64)鎸佷箙鍖 EEPROM 鍋忕Щ 164锛氭瘡鏀掔害 0.1kWh 鍐欎竴娆 + 鏂數棰勮鏃剁珛鍗冲啓锛堟硶鎷夌數瀹圭画鑸唴锛 - 骞冲彴涓婃姤鏍囪瘑绗 `energy`锛坘Wh 涓や綅灏忔暟锛夛紝MQTT 灏辩华涓旇姱鐗囧湪绾挎椂姣忓垎閽熶竴娆★紝4G/WiFi 鍙岄氶亾 - UART5 甯 ORE 鑷剤锛涚‖浠讹細B0505S 闅旂鐢垫簮 + 鍏夎︼紝鑺墖 TXD 鎺 PD2 + +### 杩藉姞锛氭柊纭欢寮曡剼锛2026-08锛 + +- `CAT_PWR`(PC4)锛4G 妯″潡寮鏈鸿剼锛屽紑婕忚緭鍑猴紝涓婄數鎷変綆=妯″潡寮鏈 +- `ESP_EN`(PA6)锛歐iFi 妯″潡浣胯兘锛屾帹鎸借緭鍑猴紝涓婄數缃珮=妯″潡宸ヤ綔 +- `BT_RST`(PA7)锛氳摑鐗欏浣嶈剼锛屾帹鎸借緭鍑猴紝榛樿鎷変綆=姝e父宸ヤ綔锛堥珮=澶嶄綅锛岄鐣欙級 +- `BT_MODE`(PB0)锛氳摑鐗 AT/閫忎紶鍒囨崲锛屾鍓嶇増鏈凡瀹炵幇锛坆le_at.c 寮婕忔帶鍒讹級