From 6286fa39f63c68d6391f24d2caf281d65cb3262a Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Fri, 13 Jun 2025 17:01:33 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0n9=E7=BC=96=E8=AF=91=E9=80=89?= =?utf8?q?=E9=A1=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0GPS,=E8=A1=80=E5=8E=8B?= =?utf8?q?=E6=9C=8D=E5=8A=A1=EF=BC=8C=E4=BC=98=E5=8C=96=E5=8E=9F=E5=83=8F?= =?utf8?q?=E5=BF=83=E7=8E=87=E8=AE=A1=E7=AE=97(=E8=A1=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../gnss/sample/gnss_sample/gnss_sample.c | 58 +++++++++---------- .../drivers/peripheral/gnss/src/gnss_ctl.c | 50 ++++++++-------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/code/sdk/drivers/peripheral/gnss/sample/gnss_sample/gnss_sample.c b/code/sdk/drivers/peripheral/gnss/sample/gnss_sample/gnss_sample.c index 799aa7741..13ac8a529 100644 --- a/code/sdk/drivers/peripheral/gnss/sample/gnss_sample/gnss_sample.c +++ b/code/sdk/drivers/peripheral/gnss/sample/gnss_sample/gnss_sample.c @@ -10,7 +10,7 @@ #include "tiot_service_interface.h" #include "pm_definition.h" #include "gnss_ctl.h" -#include "cywee_hal.h" +// #include "cywee_hal.h" #define COLDSTART_FIXMODEGPS_NMEAALL_SAMPLE 0 #define AUTOSTART_FIXMODEALL_NMEADEF_SAMPLE 1 @@ -116,39 +116,39 @@ int32_t CfgColdStartFixModeGpsNmeaAll(tiot_handle handle) // 配置启动模式：冷启动模式。 int32_t ret = tiot_service_write(handle, cfgColdStartCmd, sizeof(cfgColdStartCmd)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: cfgColdStartCmd error: %d\n", ret); + printf("\nerror: cfgColdStartCmd error: %d\n", ret); return 0; } // 配置使能的GNSS星座：GPS。 ret = tiot_service_write(handle, cfgFixModeAllCmd, sizeof(cfgFixModeAllCmd)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: cfgFixModeAllCmd error: %d\n", ret); + printf("\nerror: cfgFixModeAllCmd error: %d\n", ret); return 0; } // 配置上报NMEA类型：PNT/ZDA/VTG/RMC/GSV/GSA/GLL/GGA。 ret = tiot_service_write(handle, cfgNmeaAllCmd, sizeof(cfgNmeaAllCmd)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: cfgNmeaAllCmd error: %d\n", ret); + printf("\nerror: cfgNmeaAllCmd error: %d\n", ret); return 0; } ret = tiot_service_write(handle, CFG_TRK_LPW_DISABLE, sizeof(CFG_TRK_LPW_DISABLE)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: CFG_TRK_LPW_DISABLE error: %d\n", ret); + printf("\nerror: CFG_TRK_LPW_DISABLE error: %d\n", ret); return 0; } ret = tiot_service_write(handle, CFG_ACQ_LPW_DISABLE, sizeof(CFG_ACQ_LPW_DISABLE)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: CFG_ACQ_LPW_DISABLE error: %d\n", ret); + printf("\nerror: CFG_ACQ_LPW_DISABLE error: %d\n", ret); return 0; } ret = tiot_service_write(handle, CFG_ANTIJAM_ENABLE, sizeof(CFG_ANTIJAM_ENABLE)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: CFG_ANTIJAM_ENABLE error: %d\n", ret); + printf("\nerror: CFG_ANTIJAM_ENABLE error: %d\n", ret); return 0; } return 1; @@ -162,33 +162,33 @@ int32_t CfgAutoStartFixModeAllNmeaDefault(tiot_handle handle) // 配置启动模式：自动模式。 int32_t ret = tiot_service_write(handle, cfgAutoStartCmd, sizeof(cfgAutoStartCmd)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: cfgAutoStartCmd error: %d\n", ret); + printf("\nerror: cfgAutoStartCmd error: %d\n", ret); return 0; } // 配置使能的GNSS星座：QZSS/GAL/BDS/GLO/GPS。 ret = tiot_service_write(handle, cfgFixModeAllCmd, sizeof(cfgFixModeAllCmd)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: cfgFixModeAllCmd error: %d\n", ret); + printf("\nerror: cfgFixModeAllCmd error: %d\n", ret); return 0; } // 配置上报NMEA类型：RMC/GGA。 ret = tiot_service_write(handle, cfgNmeaDefaultCmd, sizeof(cfgNmeaDefaultCmd)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: cfgNmeaDefaultCmd error: %d\n", ret); + printf("\nerror: cfgNmeaDefaultCmd error: %d\n", ret); return 0; } ret = tiot_service_write(handle, CFG_TRK_LPW_DISABLE, sizeof(CFG_TRK_LPW_DISABLE)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: CFG_TRK_LPW_DISABLE error: %d\n", ret); + printf("\nerror: CFG_TRK_LPW_DISABLE error: %d\n", ret); return 0; } ret = tiot_service_write(handle, CFG_ACQ_LPW_DISABLE, sizeof(CFG_ACQ_LPW_DISABLE)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: CFG_ACQ_LPW_DISABLE error: %d\n", ret); + printf("\nerror: CFG_ACQ_LPW_DISABLE error: %d\n", ret); return 0; } return 1; @@ -200,7 +200,7 @@ static int32_t QryVersion(tiot_handle handle) // 查询版本号 int32_t ret = tiot_service_write(handle, qryVersion, sizeof(qryVersion)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: QryVersion error: %d\n", ret); + printf("\nerror: QryVersion error: %d\n", ret); return 0; } return 1; @@ -217,10 +217,10 @@ static int32_t StartGnss(tiot_handle handle) // 启动GNSS int32_t ret = tiot_service_write(handle, startCmd, sizeof(startCmd)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: start gnss error: %d\n", ret); + printf("\nerror: start gnss error: %d\n", ret); return 0; } - CWM_OS_dbgPrintf("\nstart gnss\n"); + printf("\nstart gnss\n"); return 1; } @@ -229,10 +229,10 @@ static int32_t StopGnss(tiot_handle handle) // 停止GNSS int32_t ret = tiot_service_write(handle, stopCmd, sizeof(stopCmd)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: stop gnss error: %d\n", ret); + printf("\nerror: stop gnss error: %d\n", ret); return 0; } - CWM_OS_dbgPrintf("\nstop gnss\n"); + printf("\nstop gnss\n"); return 1; } @@ -243,7 +243,7 @@ static void ListenGnssData(tiot_handle handle) for (;;) { // 写日志条件 if (i >= LISTEN_DATA_MAX_LINES) { - CWM_OS_dbgPrintf("\ncnt enough\n"); + printf("\ncnt enough\n"); break; } if (g_gnss_stopflag == 1) @@ -257,7 +257,7 @@ static void ListenGnssData(tiot_handle handle) if (type[0] == MSG_TYPE_ASCII) { g_gnssServiceBuff[ret] = '\0'; char* pbuf=(char *)&g_gnssServiceBuff[MSG_CONTENT_IDX]; - CWM_OS_dbgPrintf("%s\n", pbuf); + printf("%s\n", pbuf); if (g_is_gnss_logon) fprintf(g_gnssLogFp, "%s\n", pbuf); for (int index=0;index < ret ;index++) @@ -265,7 +265,7 @@ static void ListenGnssData(tiot_handle handle) if (decode_nmea(pbuf[index])==1) { // dump_location_data(&g_global_gpsData); - CWM_OS_dbgPrintf("decode_nmea done\r\n"); + printf("decode_nmea done\r\n"); } } } @@ -301,10 +301,10 @@ int GnssLogEnable(bool enable) void GnssServerStart(void) { - CWM_OS_dbgPrintf("\nenter gnss samples\n"); + printf("\nenter gnss samples\n"); if(g_is_gnss_poweron == 1) { - CWM_OS_dbgPrintf("gnss already on\r\n"); + printf("gnss already on\r\n"); return ; } uapi_pm_add_sleep_veto(PM_ID_SYS); @@ -317,7 +317,7 @@ void GnssServerStart(void) // Step1: init int32_t ret = tiot_service_init(); if (ret != 0) { - CWM_OS_dbgPrintf("\ntiot service init fail\n"); + printf("\ntiot service init fail\n"); g_is_gnss_poweron = 0; g_gnss_stopflag = 1; } @@ -327,21 +327,21 @@ void GnssServerStart(void) { g_gnssLogFp = fopen("/user/log/gnss.log", "w"); if (g_gnssLogFp == NULL) { - CWM_OS_dbgPrintf("\nerror: open log file error\n"); + printf("\nerror: open log file error\n"); return; } } - CWM_OS_dbgPrintf("\nbefore open tiot service\n"); + printf("\nbefore open tiot service\n"); // Step2: power on gnss tiot_handle handle = tiot_service_open("gn71", NULL); if (handle == 0) { - CWM_OS_dbgPrintf("\nopen tiot service fail\n"); + printf("\nopen tiot service fail\n"); g_is_gnss_poweron = 0; g_gnss_stopflag = 1; return; } - CWM_OS_dbgPrintf("\nopen tiot service success\n"); + printf("\nopen tiot service success\n"); int32_t cfgRet; // ---- loop ---------- @@ -355,7 +355,7 @@ void GnssServerStart(void) if (cfgRet == 0) { continue; } - CWM_OS_dbgPrintf("\ncfg sample id:%u\n", g_gnssSamplesCfg[i].sampleId); + printf("\ncfg sample id:%u\n", g_gnssSamplesCfg[i].sampleId); QryVersion(handle); // Step4: start gnss @@ -387,5 +387,5 @@ void GnssServerStart(void) #endif uapi_pm_remove_sleep_veto(PM_ID_SYS); g_is_gnss_poweron=0; - CWM_OS_dbgPrintf("\nfinish gnss samples\n"); + printf("\nfinish gnss samples\n"); } \ No newline at end of file diff --git a/code/sdk/drivers/peripheral/gnss/src/gnss_ctl.c b/code/sdk/drivers/peripheral/gnss/src/gnss_ctl.c index ed33383ef..e73a5bf0e 100644 --- a/code/sdk/drivers/peripheral/gnss/src/gnss_ctl.c +++ b/code/sdk/drivers/peripheral/gnss/src/gnss_ctl.c @@ -31,7 +31,7 @@ #include "gpio.h" #include "uart_gnss.h" #include "gnss_sample.h" -#include "cywee_hal.h" +// #include "cywee_hal.h" errcode_t gnss_power_on(void) { @@ -40,36 +40,36 @@ errcode_t gnss_power_on(void) #if defined (BOARD_W9) || defined(BOARD_N9) ret=uapi_gpio_set_dir(S_AGPIO_L16,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_AGPIO_L32,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_AGPIO_L32,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_AGPIO_L32,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_AGPIO_L20,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_AGPIO_L20,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_AGPIO_L20,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_AGPIO_R9,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_AGPIO_R9,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_AGPIO_R9,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_HGPIO0,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_HGPIO0,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_HGPIO0,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_val(S_HGPIO0, GPIO_LEVEL_HIGH); // crystal sw - CWM_OS_dbgPrintf("GPS_CRYSTAL set_value S_HGPIO0 GPIO_LEVEL_HIGH ret %d\n",ret); + PRINT("GPS_CRYSTAL set_value S_HGPIO0 GPIO_LEVEL_HIGH ret %d\n",ret); ret=uapi_gpio_set_val(S_AGPIO_L20, GPIO_LEVEL_HIGH); // gps V1.8 sw en - CWM_OS_dbgPrintf("GPS_1V8 set_value S_AGPIO_L20 GPIO_LEVEL_HIGH ret %d\n",ret); + PRINT("GPS_1V8 set_value S_AGPIO_L20 GPIO_LEVEL_HIGH ret %d\n",ret); ret=uapi_gpio_set_val(S_AGPIO_R9, GPIO_LEVEL_HIGH); // gps V3.3 sw en - CWM_OS_dbgPrintf("GPS_BAT_ON set_value S_AGPIO_R9 GPIO_LEVEL_HIGH ret %d\n",ret); + 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 - CWM_OS_dbgPrintf("GPS_PWREN set_value S_AGPIO_L32 GPIO_LEVEL_LOW ret %d\n",ret); + 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 - CWM_OS_dbgPrintf("GPS_PWREN set_value S_AGPIO_L32 GPIO_LEVEL_HIGH ret %d\n",ret); + 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 - // CWM_OS_dbgPrintf("SWITCH uart to GPS set_value S_AGPIO_L16 GPIO_LEVEL_HIGH ret %d\n",ret); + // PRINT("SWITCH uart to GPS set_value S_AGPIO_L16 GPIO_LEVEL_HIGH ret %d\n",ret); #endif @@ -83,30 +83,30 @@ errcode_t gnss_power_off(void) #if defined (BOARD_W9) || defined(BOARD_N9) ret=uapi_gpio_set_dir(S_AGPIO_L16,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_AGPIO_L32,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_AGPIO_L32,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_AGPIO_L32,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_AGPIO_L20,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_AGPIO_L20,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_AGPIO_L20,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_AGPIO_R9,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_AGPIO_R9,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_AGPIO_R9,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_dir(S_HGPIO0,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_HGPIO0,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_HGPIO0,GPIO_DIRECTION_OUTPUT ret %d\n",ret); ret=uapi_gpio_set_val(S_HGPIO0, GPIO_LEVEL_HIGH); // crystal sw - CWM_OS_dbgPrintf("GPS_CRYSTAL set_value S_HGPIO0 GPIO_LEVEL_HIGH ret %d\n",ret); + PRINT("GPS_CRYSTAL set_value S_HGPIO0 GPIO_LEVEL_HIGH ret %d\n",ret); ret=uapi_gpio_set_val(S_AGPIO_L20, GPIO_LEVEL_HIGH); // gps V1.8 sw en - CWM_OS_dbgPrintf("GPS_1V8 set_value S_AGPIO_L20 GPIO_LEVEL_HIGH ret %d\n",ret); + PRINT("GPS_1V8 set_value S_AGPIO_L20 GPIO_LEVEL_HIGH ret %d\n",ret); ret=uapi_gpio_set_val(S_AGPIO_R9, GPIO_LEVEL_HIGH); // gps V3.3 sw en - CWM_OS_dbgPrintf("GPS_BAT_ON set_value S_AGPIO_R9 GPIO_LEVEL_HIGH ret %d\n",ret); + 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 - CWM_OS_dbgPrintf("GPS_PWRON set_value S_AGPIO_L32 GPIO_LEVEL_LOW ret %d\n",ret); + 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 - // CWM_OS_dbgPrintf("SWITCH uart to download set_value S_AGPIO_L16 GPIO_LEVEL_LOW ret %d\n",ret); + // PRINT("SWITCH uart to download set_value S_AGPIO_L16 GPIO_LEVEL_LOW ret %d\n",ret); #endif return ERRCODE_SUCC; @@ -144,15 +144,15 @@ errcode_t download_gnss_switch(DOWNLOAD_GPS_SWITCH_T download_gps_switch) { errcode_t ret=ERRCODE_SUCC; ret=uapi_gpio_set_dir(S_AGPIO_L16,GPIO_DIRECTION_OUTPUT); - CWM_OS_dbgPrintf("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); + PRINT("set_dir S_AGPIO_L16,GPIO_DIRECTION_OUTPUT ret %d\n",ret); if (download_gps_switch == SWITCH_TO_GNSS) { ret=uapi_gpio_set_val(S_AGPIO_L16, GPIO_LEVEL_HIGH); // crystal sw - CWM_OS_dbgPrintf("SWITCH uart to GNSS set_value S_AGPIO_L16 GPIO_LEVEL_HIGH ret %d\n",ret); + PRINT("SWITCH uart to GNSS set_value S_AGPIO_L16 GPIO_LEVEL_HIGH ret %d\n",ret); }else{ ret=uapi_gpio_set_val(S_AGPIO_L16, GPIO_LEVEL_LOW); // crystal sw - CWM_OS_dbgPrintf("SWITCH uart to download set_value S_AGPIO_L16 GPIO_LEVEL_LOW ret %d\n",ret); + PRINT("SWITCH uart to download set_value S_AGPIO_L16 GPIO_LEVEL_LOW ret %d\n",ret); } return ret; } \ No newline at end of file -- 2.17.1