From 69094afd6979219b431696e6f28356508d8ab77a Mon Sep 17 00:00:00 2001 From: SnickerSun Date: Mon, 16 Dec 2024 15:01:06 +0800 Subject: [PATCH] =?utf8?q?=E5=9C=A822=E4=B8=8A=E8=B0=83=E6=B5=8Bgnss?= =?utf8?q?=E5=BC=80=E5=85=B3=E7=94=B5=EF=BC=8C=E5=A4=96=E6=8E=A5pc?= =?utf8?q?=E4=B8=8B=E8=BD=BD=E6=88=90=E5=8A=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/ConnectPhonePresenter.cpp | 3 ++- code/sdk/zhihui/gnss/gnss_ctl.c | 22 ++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/code/sdk/application/wearable/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp index 07a5c69f3..c8acdcffe 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp @@ -47,7 +47,8 @@ bool ConnectPhonePresenter::OnClick(UIView& view, const ClickEvent& event) if (strcmp(view.GetViewId(), CANCEL_BUTTON) == 0) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CANCEL_BUTTON OnClick"); #ifdef GPS_CAT1_RESET_TEST - gps_on(NULL,0); + char *input="1"; + gps_on((uint8_t*)input,1); #endif NativeAbility::GetInstance().ChangeSlice(VIEW_SETTING); } else if (strcmp(view.GetViewId(), CONFIRM_BUTTON) == 0) { diff --git a/code/sdk/zhihui/gnss/gnss_ctl.c b/code/sdk/zhihui/gnss/gnss_ctl.c index 57704d5f6..69ae57961 100644 --- a/code/sdk/zhihui/gnss/gnss_ctl.c +++ b/code/sdk/zhihui/gnss/gnss_ctl.c @@ -70,8 +70,9 @@ S_AGPIO_L28 GPS_1V8 #elif defined (BOARD_L22) || defined (BOARD_W9) - // ret=uapi_gpio_set_dir(S_AGPIO_L16,GPIO_DIRECTION_OUTPUT); - // PRINT("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + ret=uapi_gpio_set_dir(S_AGPIO_L16,GPIO_DIRECTION_OUTPUT); + PRINT("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + ret=uapi_gpio_set_dir(S_AGPIO_L32,GPIO_DIRECTION_OUTPUT); PRINT("set_dir S_AGPIO_L32,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_AGPIO_L20,GPIO_DIRECTION_OUTPUT); @@ -90,9 +91,18 @@ S_AGPIO_L28 GPS_1V8 ret=uapi_gpio_set_val(S_AGPIO_R9, GPIO_LEVEL_HIGH); // gps V3.3 sw en PRINT("GPS_BAT_ON set_value S_AGPIO_R9 GPIO_LEVEL_HIGH ret %d\n",ret); + ret=uapi_gpio_set_val(S_AGPIO_L32, GPIO_LEVEL_LOW); //gps reset + PRINT("GPS_PWREN set_value S_AGPIO_L32 GPIO_LEVEL_LOW ret %d\n",ret); + + osDelay(1000); + ret=uapi_gpio_set_val(S_AGPIO_L32, GPIO_LEVEL_HIGH); //gps reset PRINT("GPS_PWREN set_value S_AGPIO_L32 GPIO_LEVEL_HIGH ret %d\n",ret); + // ret=uapi_gpio_set_val(S_AGPIO_L16, GPIO_LEVEL_HIGH); // crystal sw + // PRINT("SWITCH uart to GPS set_value S_AGPIO_L16 GPIO_LEVEL_HIGH ret %d\n",ret); + + #endif return ERRCODE_SUCC; } @@ -125,8 +135,8 @@ S_AGPIO_L28 GPS_1V8 #elif defined (BOARD_L22) || defined (BOARD_W9) - // ret=uapi_gpio_set_dir(S_AGPIO_L16,GPIO_DIRECTION_OUTPUT); - // PRINT("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + ret=uapi_gpio_set_dir(S_AGPIO_L16,GPIO_DIRECTION_OUTPUT); + PRINT("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_AGPIO_L32,GPIO_DIRECTION_OUTPUT); PRINT("set_dir S_AGPIO_L32,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_AGPIO_L20,GPIO_DIRECTION_OUTPUT); @@ -148,7 +158,9 @@ S_AGPIO_L28 GPS_1V8 ret=uapi_gpio_set_val(S_AGPIO_L32, GPIO_LEVEL_LOW); //gps reset PRINT("GPS_PWRON set_value S_AGPIO_L32 GPIO_LEVEL_LOW ret %d\n",ret); - + ret=uapi_gpio_set_val(S_AGPIO_L16, GPIO_LEVEL_LOW); // crystal sw + PRINT("SWITCH uart to download set_value S_AGPIO_L16 GPIO_LEVEL_LOW ret %d\n",ret); + #endif return ERRCODE_SUCC; } -- 2.17.1