From 43f8ca0382d4307b99dd660bd157a8585d241567 Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Wed, 23 Jul 2025 17:50:20 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96pgnss=E4=BF=A1=E6=81=AF?= =?utf8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../gnss/sample/pgnss_sample/pgnss_encode.c | 114 +++++++++--------- .../gnss/sample/pgnss_sample/pgnss_sample.c | 51 ++++---- .../ppg/pah8009/sensor/pah800x_main.c | 3 +- 3 files changed, 83 insertions(+), 85 deletions(-) diff --git a/code/sdk/drivers/peripheral/gnss/sample/pgnss_sample/pgnss_encode.c b/code/sdk/drivers/peripheral/gnss/sample/pgnss_sample/pgnss_encode.c index a205bc4b1..5d677d42a 100644 --- a/code/sdk/drivers/peripheral/gnss/sample/pgnss_sample/pgnss_encode.c +++ b/code/sdk/drivers/peripheral/gnss/sample/pgnss_sample/pgnss_encode.c @@ -11,7 +11,7 @@ #include "securec.h" #include "tiot_service_interface.h" #include "gnss_datatypes.h" -#include "cywee_hal.h" + #define GNSS_ENCODE_BUFF_MAX_LEN 9300 #define FILE_PATH_LEN 1024 @@ -69,12 +69,12 @@ int32_t CheckIfLeapYear(uint16_t year) int32_t Utc2UnixTime(GnssUtcTime utcTime, uint32_t *unixTime) { if (unixTime == NULL) { - CWM_OS_dbgPrintf("\nerror: [Utc2UnixTime] null pointer!\n"); + printf("\nerror: [Utc2UnixTime] null pointer!\n"); return 0; } if (utcTime.month > 12 || utcTime.valid == 0) { - CWM_OS_dbgPrintf("\nerror: [Utc2UnixTime] utcTime invalid!\n"); + printf("\nerror: [Utc2UnixTime] utcTime invalid!\n"); return 0; } @@ -115,7 +115,7 @@ int32_t PgnssInjectUtcTime(tiot_handle handle, GnssUtcTime *utcTime, uint32_t* t { uint8_t *buff = (uint8_t *)malloc(GNSS_ENCODE_BUFF_MAX_LEN); if (buff == NULL) { - CWM_OS_dbgPrintf("\nerror: malloc failed in PgnssINjectUtcTime\r\n"); + printf("\nerror: malloc failed in PgnssINjectUtcTime\r\n"); return 0; } memset_s(buff, GNSS_ENCODE_BUFF_MAX_LEN, 0, GNSS_ENCODE_BUFF_MAX_LEN); @@ -125,7 +125,7 @@ int32_t PgnssInjectUtcTime(tiot_handle handle, GnssUtcTime *utcTime, uint32_t* t hdr->sequence = 0; errno_t copyRet = memcpy_s(hdr->data, (GNSS_ENCODE_BUFF_MAX_LEN - sizeof(GnssMsg)), utcTime, sizeof(GnssUtcTime)); if (copyRet != EOK) { - CWM_OS_dbgPrintf("\nmemcpy UtcTime failed! Errno is %d\r\n", copyRet); + printf("\nmemcpy UtcTime failed! Errno is %d\r\n", copyRet); free(buff); return 0; } @@ -133,12 +133,12 @@ int32_t PgnssInjectUtcTime(tiot_handle handle, GnssUtcTime *utcTime, uint32_t* t hdr->checkSum = CalcChecksum(hdr->data, hdr->dataLength); int32_t ret = tiot_service_write(handle, buff, (sizeof(GnssMsg) + hdr->dataLength)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: PgnssInjectUtcTime error: %d\r\n", ret); + printf("\nerror: PgnssInjectUtcTime error: %d\r\n", ret); free(buff); return 0; } if (Utc2UnixTime((*utcTime), ts) == 0) { - CWM_OS_dbgPrintf("\nerror: Utc2UnixTime error\r\n"); + printf("\nerror: Utc2UnixTime error\r\n"); free(buff); return 0; } @@ -151,7 +151,7 @@ static uint16_t FillGnssMessageData(uint8_t *inBuff, uint32_t inLen, uint8_t *ou { errno_t ret = memcpy_s(outBuff, outLen, inBuff, inLen); if (ret != EOK) { - CWM_OS_dbgPrintf("memcpy XgnssData failed! Errno is %d \r\n", ret); + printf("memcpy XgnssData failed! Errno is %d \r\n", ret); return 0; } @@ -178,12 +178,12 @@ static void ListenAck(tiot_handle handle) // 二进制消息类型 if (type[0] == 0) { g_ackBuff[ret] = '\0'; - CWM_OS_dbgPrintf("%s\r\n", (char *)&g_ackBuff[MSG_CONTENT_IDX]); + printf("%s\r\n", (char *)&g_ackBuff[MSG_CONTENT_IDX]); } i++; } if (i >= 1) { - CWM_OS_dbgPrintf("\r\ncnt enough\r\n"); + printf("\r\ncnt enough\r\n"); break; } } @@ -195,7 +195,7 @@ static int32_t EncodeAndInjectCmd(tiot_handle handle, GnssCmdType cmdType, uint8 int32_t len = 0; uint8_t *buff = (uint8_t *)malloc(GNSS_ENCODE_BUFF_MAX_LEN); if (buff == NULL) { - CWM_OS_dbgPrintf("\r\nerror: malloc failed in EncodeAndInjectCmd\r\n"); + printf("\r\nerror: malloc failed in EncodeAndInjectCmd\r\n"); return 0; } memset_s(buff, GNSS_ENCODE_BUFF_MAX_LEN, 0, GNSS_ENCODE_BUFF_MAX_LEN); @@ -207,7 +207,7 @@ static int32_t EncodeAndInjectCmd(tiot_handle handle, GnssCmdType cmdType, uint8 int32_t retLen = EncodeGnssMsg(inBuff, inLen, buff + len, (GNSS_ENCODE_BUFF_MAX_LEN - len)); if (retLen != 1) { - CWM_OS_dbgPrintf("\nerror: Encode Cmd failed: %d\r\n", cmdType); + printf("\nerror: Encode Cmd failed: %d\r\n", cmdType); free(buff); return retLen; } @@ -216,12 +216,12 @@ static int32_t EncodeAndInjectCmd(tiot_handle handle, GnssCmdType cmdType, uint8 gnssHdr->checkSum = CalcChecksum(gnssHdr->data, gnssHdr->dataLength); int32_t ret = tiot_service_write(handle, buff, (sizeof(GnssMsg) + gnssHdr->dataLength)); if (ret < 0) { - CWM_OS_dbgPrintf("\r\nerror: Inject Cmd failed: %d\r\n", cmdType); + printf("\r\nerror: Inject Cmd failed: %d\r\n", cmdType); free(buff); return 0; } ListenAck(handle); - CWM_OS_dbgPrintf("\r\nInject Cmd SUCCESS: %x\r\n", cmdType); + printf("\r\nInject Cmd SUCCESS: %x\r\n", cmdType); free(buff); return 1; } @@ -230,7 +230,7 @@ void PgnssSendFileContent(tiot_handle handle, const char *fileName, GnssCmdType { FILE *fp = fopen(fileName, "rb"); if (fp == NULL) { - CWM_OS_dbgPrintf("\r\nerror: open file failed: %s\r\n", fileName); + printf("\r\nerror: open file failed: %s\r\n", fileName); return; } fseek(fp, 0, SEEK_END); @@ -238,19 +238,19 @@ void PgnssSendFileContent(tiot_handle handle, const char *fileName, GnssCmdType fseek(fp, 0, SEEK_SET); if (len < 0 || len > PGNSS_FILE_MAX_SIZE) { fclose(fp); - CWM_OS_dbgPrintf("\r\nerror: get file len failed: %s\r\n", fileName); + printf("\r\nerror: get file len failed: %s\r\n", fileName); return; } uint8_t *buff = (uint8_t *)malloc(len); if (buff == NULL) { fclose(fp); - CWM_OS_dbgPrintf("\r\nerror: malloc file len failed: %s\r\n", fileName); + printf("\r\nerror: malloc file len failed: %s\r\n", fileName); return; } int32_t dataSize = fread(buff, len, 1, fp); if (dataSize < 0) { fclose(fp); - CWM_OS_dbgPrintf("\r\nerror: read file failed: %s\r\n", fileName); + printf("\r\nerror: read file failed: %s\r\n", fileName); free(buff); return; } @@ -273,7 +273,7 @@ int32_t GetEphFileName(int32_t ts, const char *prefix, char *fileName) int32_t interval = (strcmp(prefix, "GLO") == 0) ? GLO_EPH_VALID_TIME : OTHER_EPH_VALID_TIME; DIR *dir = opendir("/user/userdata/gnss/"); if (dir == NULL) { - CWM_OS_dbgPrintf("Failed to open /user/xgnss directory.\r\n"); + printf("Failed to open /user/xgnss directory.\r\n"); return 0; } int32_t time, ret; @@ -293,14 +293,14 @@ int32_t GetEphFileName(int32_t ts, const char *prefix, char *fileName) } else { - CWM_OS_dbgPrintf("time:%d,ts:%d,interval:%d\r\n",time,ts,interval); + printf("time:%d,ts:%d,interval:%d\r\n",time,ts,interval); } } } } } closedir(dir); - CWM_OS_dbgPrintf("closedir(dir);\r\n"); + printf("closedir(dir);\r\n"); return 0; } @@ -309,10 +309,10 @@ void PgnssSendEphFile(tiot_handle handle, const char *prefix, GnssCmdType cmdTyp char fileName[FILE_PATH_LEN] = {0}; int32_t ret = GetEphFileName(ts, prefix, fileName); if (ret == 0) { - CWM_OS_dbgPrintf("\r\nerror: GetEphFileName failed\r\n"); + printf("\r\nerror: GetEphFileName failed\r\n"); return; } - CWM_OS_dbgPrintf("\nGetEphFileName success\r\n"); + printf("\nGetEphFileName success\r\n"); PgnssSendFileContent(handle, fileName, cmdType); } @@ -320,44 +320,44 @@ void PgnssInjectAllEph(tiot_handle handle, uint32_t ts) { PgnssSendEphFile(handle, "GPS", CMD_PGNSS_INJECT_EPH_GPS, ts); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send GPS eph success\r\n"); + printf("send GPS eph success\r\n"); PgnssSendEphFile(handle, "GLO", CMD_PGNSS_INJECT_EPH_GANSS, ts); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send GLO eph success\r\n"); + printf("send GLO eph success\r\n"); PgnssSendEphFile(handle, "BDS", CMD_PGNSS_INJECT_EPH_GANSS, ts); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send BDS eph success\r\n"); + printf("send BDS eph success\r\n"); PgnssSendEphFile(handle, "GAL", CMD_PGNSS_INJECT_EPH_GANSS, ts); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send GAL eph success\r\n"); + printf("send GAL eph success\r\n"); PgnssSendEphFile(handle, "QZS", CMD_PGNSS_INJECT_EPH_GANSS, ts); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send QZS eph success\r\n"); + printf("send QZS eph success\r\n"); } void PgnssInjectOtherAssist(tiot_handle handle) { PgnssSendFileContent(handle, "/user/userdata/gnss/GPS_UTC.dat", CMD_PGNSS_INJECT_UTC_GPS); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send GPS_UTC success\r\n"); + printf("send GPS_UTC success\r\n"); PgnssSendFileContent(handle, "/user/userdata/gnss/GPS_RTI.dat", CMD_PGNSS_INJECT_RTI_GPS); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send GPS_RTI success\r\n"); + printf("send GPS_RTI success\r\n"); PgnssSendFileContent(handle, "/user/userdata/gnss/GPS_ION.dat", CMD_PGNSS_INJECT_ION_GPS); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send GPS_ION success\r\n"); + printf("send GPS_ION success\r\n"); PgnssSendFileContent(handle, "/user/userdata/gnss/GLO_RTI.dat", CMD_PGNSS_INJECT_RTI_GANSS); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send GLO_RTI success\r\n"); + printf("send GLO_RTI success\r\n"); PgnssSendFileContent(handle, "/user/userdata/gnss/GLO_AUX.dat", CMD_PGNSS_INJECT_AUX_GANSS); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send GLO_AUX success\r\n"); + printf("send GLO_AUX success\r\n"); PgnssSendFileContent(handle, "/user/userdata/gnss/BDS_RTI.dat", CMD_PGNSS_INJECT_RTI_GANSS); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send BDS_RTI success\r\n"); + printf("send BDS_RTI success\r\n"); PgnssSendFileContent(handle, "/user/userdata/gnss/GAL_RTI.dat", CMD_PGNSS_INJECT_RTI_GANSS); osal_msleep(INJECT_SLEEP_MS_TIME); - CWM_OS_dbgPrintf("send GAL_RTI success\r\n"); + printf("send GAL_RTI success\r\n"); } void PgnssInject(tiot_handle handle, uint32_t ts) @@ -374,7 +374,7 @@ int32_t GetNonGloEphFileName(int32_t ts, char *fileName) const char prefix[] = "NonGlo"; DIR *dir = opendir("/user/userdata/gnss/"); if (dir == NULL) { - CWM_OS_dbgPrintf("Failed to open /user/xgnss directory.\r\n"); + printf("Failed to open /user/xgnss directory.\r\n"); return 0; } int32_t time, ret; @@ -396,7 +396,7 @@ int32_t GetNonGloEphFileName(int32_t ts, char *fileName) } else { - CWM_OS_dbgPrintf("time:%d,ts:%d,minDist:%d\r\n",time,ts,minDist); + printf("time:%d,ts:%d,minDist:%d\r\n",time,ts,minDist); } } } @@ -405,13 +405,13 @@ int32_t GetNonGloEphFileName(int32_t ts, char *fileName) if (closestTime != 0) { ret = snprintf_s(fileName, FILE_PATH_LEN, (FILE_PATH_LEN - 1), "%s%d%s", "/user/userdata/gnss/NonGlo_", closestTime, ".eph"); - CWM_OS_dbgPrintf("closest eph fileName:%s\r\n", fileName); + printf("closest eph fileName:%s\r\n", fileName); closedir(dir); return ((ret <= 0) ? 0 : 1); } else { - CWM_OS_dbgPrintf("closestTime == 0\r\n"); + printf("closestTime == 0\r\n"); } closedir(dir); return 0; @@ -422,7 +422,7 @@ int32_t GetGloEphFileName(int32_t ts, char *fileName) const char prefix[] = "GLO"; DIR *dir = opendir("/user/userdata/gnss/"); if (dir == NULL) { - CWM_OS_dbgPrintf("Failed to open /user/xgnss directory.\r\n"); + printf("Failed to open /user/xgnss directory.\r\n"); return 0; } int32_t ephTime, ret; @@ -435,13 +435,13 @@ int32_t GetGloEphFileName(int32_t ts, char *fileName) char *q = strstr(entry->d_name, prefix); if (q != NULL) { ephTime = atoi(p + 1); - CWM_OS_dbgPrintf("ephTime:%ld, ts:%ld\n", ephTime, ts); + printf("ephTime:%ld, ts:%ld\n", ephTime, ts); // 当前时间大于GLO星历文件时间戳,则需要选取相差2小时以内的星历 // 当前时间小于GLO星历文件时间戳,则需要选取相差小于15分钟的星历 if (((ts - ephTime) >= 0 && abs(ephTime - ts) < OTHER_EPH_VALID_TIME) || ((ts - ephTime) <= 0 && abs(ephTime - ts) < GLO_EPH_VALID_TIME)) { ret = FormatFileName(fileName, entry->d_name); - CWM_OS_dbgPrintf("glo eph fileName:%s\n", fileName); + printf("glo eph fileName:%s\n", fileName); closedir(dir); return ret; } @@ -457,7 +457,7 @@ void PgnssSendNonGloEph(tiot_handle handle, const char *fileName) { FILE *fp = fopen(fileName, "rb"); if (fp == NULL) { - CWM_OS_dbgPrintf("\nerror: open file failed: %s\r\n", fileName); + printf("\nerror: open file failed: %s\r\n", fileName); return; } fseek(fp, 0, SEEK_END); @@ -465,19 +465,19 @@ void PgnssSendNonGloEph(tiot_handle handle, const char *fileName) fseek(fp, 0, SEEK_SET); if (len < 0 || len > PGNSS_FILE_MAX_SIZE) { fclose(fp); - CWM_OS_dbgPrintf("\nerror: get file len failed: %s\r\n", fileName); + printf("\nerror: get file len failed: %s\r\n", fileName); return; } uint8_t *buff = (uint8_t *)malloc(len); if (buff == NULL) { fclose(fp); - CWM_OS_dbgPrintf("\nerror: malloc file len failed: %s\r\n", fileName); + printf("\nerror: malloc file len failed: %s\r\n", fileName); return; } int32_t dataSize = fread(buff, len, 1, fp); if (dataSize < 0) { fclose(fp); - CWM_OS_dbgPrintf("\nerror: read file failed: %s\r\n", fileName); + printf("\nerror: read file failed: %s\r\n", fileName); free(buff); return; } @@ -496,7 +496,7 @@ void PgnssSendGloEph(tiot_handle handle, const char *fileName, int32_t ts) { FILE *fp = fopen(fileName, "rb"); if (fp == NULL) { - CWM_OS_dbgPrintf("\nerror: open file failed: %s\r\n", fileName); + printf("\nerror: open file failed: %s\r\n", fileName); return; } fseek(fp, 0, SEEK_END); @@ -504,19 +504,19 @@ void PgnssSendGloEph(tiot_handle handle, const char *fileName, int32_t ts) fseek(fp, 0, SEEK_SET); if (len < 0 || len > PGNSS_FILE_MAX_SIZE) { fclose(fp); - CWM_OS_dbgPrintf("\nerror: get file len failed: %s\r\n", fileName); + printf("\nerror: get file len failed: %s\r\n", fileName); return; } uint8_t *buff = (uint8_t *)malloc(len); if (buff == NULL) { fclose(fp); - CWM_OS_dbgPrintf("\nerror: malloc file len failed: %s\r\n", fileName); + printf("\nerror: malloc file len failed: %s\r\n", fileName); return; } int32_t dataSize = fread(buff, len, 1, fp); if (dataSize < 0) { fclose(fp); - CWM_OS_dbgPrintf("\nerror: read file failed: %s\r\n", fileName); + printf("\nerror: read file failed: %s\r\n", fileName); free(buff); return; } @@ -524,7 +524,7 @@ void PgnssSendGloEph(tiot_handle handle, const char *fileName, int32_t ts) int32_t fileLen = 0; for (int32_t i = 0; i < GLO_EPH_NUM_ONE_FILE && fileLen <= len; i++) { EphHeadInfo *ephHdr = (EphHeadInfo *)(buff + fileLen); - CWM_OS_dbgPrintf("glo eph, time:%u, ts:%d\r\n", ephHdr->time, ts); + printf("glo eph, time:%u, ts:%d\r\n", ephHdr->time, ts); if (abs((int32_t)ephHdr->time - ts) < GLO_EPH_VALID_TIME) { EncodeAndInjectCmd(handle, ephHdr->cmd, (buff + fileLen + sizeof(EphHeadInfo)), ephHdr->len); osal_msleep(INJECT_SLEEP_MS_TIME); @@ -539,12 +539,12 @@ void PgnssInjectAllEphLessFiles(tiot_handle handle, uint32_t ts) { char fileName[FILE_PATH_LEN] = {0}; if (GetNonGloEphFileName(ts, fileName) == 0) { - CWM_OS_dbgPrintf("\nerror: GetNonGloEphFileName failed\r\n"); + printf("\nerror: GetNonGloEphFileName failed\r\n"); return; } PgnssSendNonGloEph(handle, fileName); if (GetGloEphFileName(ts, fileName) == 0) { - CWM_OS_dbgPrintf("\nerror: GetGloEphFileName failed\r\n"); + printf("\nerror: GetGloEphFileName failed\r\n"); return; } PgnssSendGloEph(handle, fileName, ts); @@ -554,7 +554,7 @@ void PgnssSendOtherAssistInfo(tiot_handle handle, const char *fileName) { FILE *fp = fopen(fileName, "rb"); if (fp == NULL) { - CWM_OS_dbgPrintf("\nerror: open file failed: %s\r\n", fileName); + printf("\nerror: open file failed: %s\r\n", fileName); return; } fseek(fp, 0, SEEK_END); @@ -562,19 +562,19 @@ void PgnssSendOtherAssistInfo(tiot_handle handle, const char *fileName) fseek(fp, 0, SEEK_SET); if (len < 0 || len > PGNSS_FILE_MAX_SIZE) { fclose(fp); - CWM_OS_dbgPrintf("\nerror: get file len failed: %s\r\n", fileName); + printf("\nerror: get file len failed: %s\r\n", fileName); return; } uint8_t *buff = (uint8_t *)malloc(len); if (buff == NULL) { fclose(fp); - CWM_OS_dbgPrintf("\nerror: malloc file len failed: %s\r\n", fileName); + printf("\nerror: malloc file len failed: %s\r\n", fileName); return; } int32_t dataSize = fread(buff, len, 1, fp); if (dataSize < 0) { fclose(fp); - CWM_OS_dbgPrintf("\nerror: read file failed: %s\r\n", fileName); + printf("\nerror: read file failed: %s\r\n", fileName); free(buff); return; } diff --git a/code/sdk/drivers/peripheral/gnss/sample/pgnss_sample/pgnss_sample.c b/code/sdk/drivers/peripheral/gnss/sample/pgnss_sample/pgnss_sample.c index a153c14ef..dca45714a 100644 --- a/code/sdk/drivers/peripheral/gnss/sample/pgnss_sample/pgnss_sample.c +++ b/code/sdk/drivers/peripheral/gnss/sample/pgnss_sample/pgnss_sample.c @@ -16,7 +16,6 @@ #include "time.h" #include "gnss_ctl.h" #ifdef SUPPORT_CYWEE_SERVICE -#include "cywee_hal.h" #include "cywee_service.h" #endif @@ -55,7 +54,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\r\n", ret); + printf("\nerror: QryVersion error: %d\r\n", ret); return 0; } return 1; @@ -98,7 +97,7 @@ int32_t InjectPgnssCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle) // 配置log级别：info级别。 int32_t ret = tiot_service_write(handle, cfgLogLevelInfo, sizeof(cfgLogLevelInfo)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: cfgLogLevelInfo error: %d\r\n", ret); + printf("\nerror: cfgLogLevelInfo error: %d\r\n", ret); return 0; } @@ -118,17 +117,17 @@ int32_t InjectPgnssCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle) utcTime.minute = timeinfo->tm_min; utcTime.second = timeinfo->tm_sec; - CWM_OS_dbgPrintf("year[%d], mon[%d], day[%d], hour[%d], min[%d], sec[%d] \r\n", + printf("year[%d], mon[%d], day[%d], hour[%d], min[%d], sec[%d] \r\n", utcTime.year,utcTime.month,utcTime.day, utcTime.hour,utcTime.minute,utcTime.second); uint32_t ts = 0; ret = PgnssInjectUtcTime(handle, &utcTime, &ts); if (ret == 0) { - CWM_OS_dbgPrintf("\nerror: PgnssInjectUtcTime failed!\r\n"); + printf("\nerror: PgnssInjectUtcTime failed!\r\n"); return 0; } - CWM_OS_dbgPrintf("\nPgnssInjectUtcTime success!\r\n"); + printf("\nPgnssInjectUtcTime success!\r\n"); // PGNSS注入 // 注意，默认PGNSS星历文件存放在/user/xgnss/目录中，如修改目录，请全局搜索替换 @@ -145,7 +144,7 @@ int32_t InjectPgnssLessFilesCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle // 配置log级别：info级别。 int32_t ret = tiot_service_write(handle, cfgLogLevelInfo, sizeof(cfgLogLevelInfo)); if (ret < 0) { - CWM_OS_dbgPrintf("\nerror: cfgLogLevelInfo error: %d\r\n", ret); + printf("\nerror: cfgLogLevelInfo error: %d\r\n", ret); return 0; } @@ -165,7 +164,7 @@ int32_t InjectPgnssLessFilesCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle utcTime.minute = timeinfo->tm_min; utcTime.second = timeinfo->tm_sec; - CWM_OS_dbgPrintf("year[%d], mon[%d], day[%d], hour[%d], min[%d], sec[%d] \r\n", + printf("year[%d], mon[%d], day[%d], hour[%d], min[%d], sec[%d] \r\n", utcTime.year,utcTime.month,utcTime.day, utcTime.hour,utcTime.minute,utcTime.second); @@ -173,10 +172,10 @@ int32_t InjectPgnssLessFilesCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle uint32_t ts = 0; ret = PgnssInjectUtcTime(handle, &utcTime, &ts); if (ret == 0) { - CWM_OS_dbgPrintf("\nerror: PgnssInjectUtcTime failed!\r\n"); + printf("\nerror: PgnssInjectUtcTime failed!\r\n"); return 0; } - CWM_OS_dbgPrintf("\nPgnssInjectUtcTime success!\r\n"); + printf("\nPgnssInjectUtcTime success!\r\n"); // PGNSS注入 // 注意，默认PGNSS星历文件存放在/user/xgnss/目录中，如修改目录，请全局搜索替换 @@ -197,10 +196,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\r\n", ret); + printf("\nerror: start gnss error: %d\r\n", ret); return 0; } - CWM_OS_dbgPrintf("\nstart gnss\r\n"); + printf("\nstart gnss\r\n"); return 1; } @@ -210,10 +209,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\r\n", ret); + printf("\nerror: stop gnss error: %d\r\n", ret); return 0; } - CWM_OS_dbgPrintf("\nstop gnss\r\n"); + printf("\nstop gnss\r\n"); return 1; } @@ -225,7 +224,7 @@ static void ListenGnssData(tiot_handle handle) for (;;) { // 写日志条件 if (i >= LISTEN_DATA_MAX_LINES) { - CWM_OS_dbgPrintf("\r\ncnt enough\r\n"); + printf("\r\ncnt enough\r\n"); break; } if (g_pgnss_stopflag == 1) @@ -239,7 +238,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\r\n", pbuf); + printf("%s\r\n", pbuf); if (g_is_pgnss_logon) fprintf(g_gnssLogFp, "%s\n", pbuf); for (int index=0;index < ret ;index++) @@ -247,7 +246,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"); } } } @@ -285,10 +284,10 @@ int PGnssLogEnable(bool enable) void PGnssServerStart(void) { - CWM_OS_dbgPrintf("\nenter gnss samples\r\n"); + printf("\nenter gnss samples\r\n"); if(g_is_pgnss_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); @@ -302,7 +301,7 @@ void PGnssServerStart(void) // Step1: init int32_t ret = tiot_service_init(); if (ret != 0) { - CWM_OS_dbgPrintf("tiot service init fail\r\n"); + printf("tiot service init fail\r\n"); g_is_pgnss_poweron = 0; g_pgnss_stopflag = 1; } @@ -312,21 +311,21 @@ void PGnssServerStart(void) { g_gnssLogFp = fopen("/user/log/gnss.log", "w"); if (g_gnssLogFp == NULL) { - CWM_OS_dbgPrintf("error: open log file error\n"); + printf("error: open log file error\n"); return; } } - CWM_OS_dbgPrintf("before open tiot service\n"); + printf("before open tiot service\n"); // Step2: power on gnss tiot_handle handle = tiot_service_open("gn71", NULL); if (handle == 0) { - CWM_OS_dbgPrintf("open tiot service fail\r\n"); + printf("open tiot service fail\r\n"); g_is_pgnss_poweron = 0; g_pgnss_stopflag = 1; return; } - CWM_OS_dbgPrintf("open tiot service success\r\n"); + printf("open tiot service success\r\n"); int32_t cfgRet; // ---- loop ---------- @@ -340,7 +339,7 @@ void PGnssServerStart(void) if (cfgRet == 0) { continue; } - CWM_OS_dbgPrintf("cfg sample id:%u\r\n", g_gnssSamplesCfg[i].sampleId); + printf("cfg sample id:%u\r\n", g_gnssSamplesCfg[i].sampleId); QryVersion(handle); // Step4: start gnss @@ -372,5 +371,5 @@ void PGnssServerStart(void) #endif uapi_pm_remove_sleep_veto(PM_ID_SYS); g_is_pgnss_poweron=0; - CWM_OS_dbgPrintf("finish gnss samples\r\n"); + printf("finish gnss samples\r\n"); } diff --git a/code/sdk/drivers/peripheral/ppg/pah8009/sensor/pah800x_main.c b/code/sdk/drivers/peripheral/ppg/pah8009/sensor/pah800x_main.c index 485396e41..6147c8243 100644 --- a/code/sdk/drivers/peripheral/ppg/pah8009/sensor/pah800x_main.c +++ b/code/sdk/drivers/peripheral/ppg/pah8009/sensor/pah800x_main.c @@ -1402,8 +1402,7 @@ static void process(uint64_t timestamp) if (duration > UINT8_MAX) { - // DEBUG_PRINT("duration > UINT8_MAX !!!:%llu\n",duration); - PRINT("duration > UINT8_MAX !!!:%llu\n",duration); + DEBUG_PRINT("duration > UINT8_MAX !!!\n"); return; } -- 2.17.1