From: hcj <1224667075@qq.com> Date: Sat, 25 Apr 2026 04:05:29 +0000 (+0800) Subject: 修改流控与唤醒的配置区别 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F3368%2Fhead;p=mirrors%2FFD230.git 修改流控与唤醒的配置区别 --- diff --git a/code/sdk/zhihui/4g/cat1Service/Service/cat1_ctl.c b/code/sdk/zhihui/4g/cat1Service/Service/cat1_ctl.c index be6c5a677..902f5e797 100644 --- a/code/sdk/zhihui/4g/cat1Service/Service/cat1_ctl.c +++ b/code/sdk/zhihui/4g/cat1Service/Service/cat1_ctl.c @@ -77,7 +77,11 @@ static ctl_pin_4g_t g_cat1_ctl_pins={ 1, //电路中 控制gpio拉高,reset才拉低 PIN_NONE,//ring_pin 0, + #ifdef SIO_UART_DISABLE_FLOW_CTRL PIN_NONE,//wakemodem_pin + #else + S_MGPIO21,//wakemodem_pin + #endif 0, #else PIN_NONE, //bat_pin @@ -298,18 +302,12 @@ static uint8_t cat1_keepon_wakeup = 0; extern void set_skip_cat1_service_udp_transfer(uint8_t skip); void cat1_api_keep_wakeup(uint8_t keep_wakeup) { -#ifndef SIO_UART_DISABLE_FLOW_CTRL - return; -#endif cat1_keepon_wakeup = keep_wakeup; // set_skip_cat1_service_udp_transfer(keep_wakeup); cat1_api_wakeup_cat1(cat1_keepon_wakeup); } void cat1_api_wakeup_cat1(uint8_t wakeup) { -#ifndef SIO_UART_DISABLE_FLOW_CTRL - return; -#endif pin_t en_pin = g_cat1_ctl_pins.wakemodem_pin; uint8_t en_value = g_cat1_ctl_pins.wakemodem_pin_en_value; uint8_t wake=wakeup; diff --git a/code/sdk/zhihui/4gTest/cat1_porting.c b/code/sdk/zhihui/4gTest/cat1_porting.c index e0840c73e..4eea17fc4 100644 --- a/code/sdk/zhihui/4gTest/cat1_porting.c +++ b/code/sdk/zhihui/4gTest/cat1_porting.c @@ -386,7 +386,11 @@ errcode_t cat1_api_porting_init(void) 1, PIN_NONE,//S_MGPIO22,//ring_pinb 0, + #ifdef SIO_UART_DISABLE_FLOW_CTRL PIN_NONE,//wakemodem_pin + #else + S_MGPIO21,//wakemodem_pin + #endif 0, #else PIN_NONE, //bat_pin