修复雷鸟EG810 ring与wake 引脚配置错误问题

diff --git a/cat1modem/src/LeiNiao/cat1Service.py b/cat1modem/src/LeiNiao/cat1Service.py
index aca9d61..62dc373 100644 (file)
--- a/cat1modem/src/LeiNiao/cat1Service.py
+++ b/cat1modem/src/LeiNiao/cat1Service.py
@@ -136,8 +136,8 @@ set_version_to_json_config(CURRENT_APP_TYPE,PROJECT_VERSION)
 
 # audio.set_qdai_cfg(1,0,0,1,0,0,1,1)
 
-# GPIO21 - 引脚 86   KP_MKOUT1   唤醒主控
-# GPIO22 - 引脚 87   KP_MKIN     被主控唤醒
+#GPIO[53]      PD MAIN_RTS  WAKEUP CAT1  被主控唤醒
+#GPIO[31]      PD MAIN_RI  RINGING  唤醒主控
 
 # GPIOn - GPIO号，int类型，点此查看GPIO引脚编号与物理引脚的映射关系。
 
@@ -149,7 +149,7 @@ set_version_to_json_config(CURRENT_APP_TYPE,PROJECT_VERSION)
 # PULL_PD - 下拉模式
 
 # level - 引脚电平，int类型，0 - 设置引脚为低电平, 1- 设置引脚为高电平。
-# recvDataPin = Pin(Pin.GPIO22, Pin.IN, Pin.PULL_PU, 0)
+# recvDataPin = Pin(Pin.GPIO53, Pin.IN, Pin.PULL_PU, 0)
 def ExtIntfun(args):
         # clog.info('### interrupt  {} ###'.format(args)) # args[0]:gpio号 args[1]:上升沿或下降沿
         if args[1] == 0:
@@ -161,12 +161,12 @@ def ExtIntfun(args):
             pm.wakelock_unlock(lpm_fd)
             # pm.autosleep(1)
         # clog.info("recvDataPin={}".format(recvDataPin.read()))
-extint = ExtInt(ExtInt.GPIO22, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_DISABLE, ExtIntfun)
+extint = ExtInt(ExtInt.GPIO30, ExtInt.IRQ_RISING_FALLING, ExtInt.PULL_DISABLE, ExtIntfun)
 extint.enable()
 
 
 # 创建gpio对象
-gpioWakeBT = Pin(Pin.GPIO21, Pin.OUT, Pin.PULL_DISABLE, 1)
+gpioWakeBT = Pin(Pin.GPIO31, Pin.OUT, Pin.PULL_DISABLE, 1)
 # 设置输入输出模式
 gpioWakeBT.set_dir(Pin.OUT)
 

diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_leiniao.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_leiniao.h
index 7ab99de..e21c46d 100644 (file)
--- a/code/sdk/drivers/boards/brandy_evb/board_config/board_leiniao.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_leiniao.h
@@ -103,8 +103,8 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     { HAL_PIO_FUNC_I2C3_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },   // S_MGPIO18  I2C3 SDA
     { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_DISABLE },    // S_MGPIO19 uart1 tx
     { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE },      // S_MGPIO20 uart1 rx
-    { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },     // S_MGPIO21 uart1 rts
-    { HAL_PIO_FUNC_UART1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },     // S_MGPIO22 uart1 cts
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },     // S_MGPIO21 uart1 rts
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },     // S_MGPIO22 uart1 cts
     { HAL_PIO_FUNC_SPI2_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_MGPIO23 NC
     { HAL_PIO_FUNC_SPI2_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_MGPIO24 NC
     { HAL_PIO_FUNC_SPI2_M1, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_MGPIO25 NC

diff --git a/code/sdk/zhihui/4gTest/cat1_porting.c b/code/sdk/zhihui/4gTest/cat1_porting.c
index be0a4a9..ac7913f 100644 (file)
--- a/code/sdk/zhihui/4gTest/cat1_porting.c
+++ b/code/sdk/zhihui/4gTest/cat1_porting.c
@@ -356,9 +356,9 @@ errcode_t cat1_api_porting_init(void)
         1,
         S_AGPIO_L24,//reset_pin
         1,
-        PIN_NONE,//ring_pin
-        0,
-        PIN_NONE,//wakemodem_pin
+        S_MGPIO21,//ring_pin
+        2,
+        S_MGPIO22,//wakemodem_pin
         0,
         #else
         PIN_NONE, //bat_pin