优化pgnss信息打印

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 a205bc4..5d677d4 100644 (file)
--- 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"\r
 #include "tiot_service_interface.h"\r
 #include "gnss_datatypes.h"\r
-#include "cywee_hal.h"\r
+\r
 \r
 #define GNSS_ENCODE_BUFF_MAX_LEN 9300\r
 #define FILE_PATH_LEN            1024\r
@@ -69,12 +69,12 @@ int32_t CheckIfLeapYear(uint16_t year)
 int32_t Utc2UnixTime(GnssUtcTime utcTime, uint32_t *unixTime)\r
 {\r
     if (unixTime == NULL) {\r
-        CWM_OS_dbgPrintf("\nerror: [Utc2UnixTime] null pointer!\n");\r
+        printf("\nerror: [Utc2UnixTime] null pointer!\n");\r
         return 0;\r
     }\r
 \r
     if (utcTime.month > 12 || utcTime.valid == 0) {\r
-        CWM_OS_dbgPrintf("\nerror: [Utc2UnixTime] utcTime invalid!\n");\r
+        printf("\nerror: [Utc2UnixTime] utcTime invalid!\n");\r
         return 0;\r
     }\r
 \r
@@ -115,7 +115,7 @@ int32_t PgnssInjectUtcTime(tiot_handle handle, GnssUtcTime *utcTime, uint32_t* t
 {\r
     uint8_t *buff = (uint8_t *)malloc(GNSS_ENCODE_BUFF_MAX_LEN);\r
     if (buff == NULL) {\r
-        CWM_OS_dbgPrintf("\nerror: malloc failed in PgnssINjectUtcTime\r\n");\r
+        printf("\nerror: malloc failed in PgnssINjectUtcTime\r\n");\r
         return 0;\r
     }\r
     memset_s(buff, GNSS_ENCODE_BUFF_MAX_LEN, 0, GNSS_ENCODE_BUFF_MAX_LEN);\r
@@ -125,7 +125,7 @@ int32_t PgnssInjectUtcTime(tiot_handle handle, GnssUtcTime *utcTime, uint32_t* t
     hdr->sequence = 0;\r
     errno_t copyRet = memcpy_s(hdr->data, (GNSS_ENCODE_BUFF_MAX_LEN - sizeof(GnssMsg)), utcTime, sizeof(GnssUtcTime));\r
     if (copyRet != EOK) {\r
-        CWM_OS_dbgPrintf("\nmemcpy UtcTime failed! Errno is %d\r\n", copyRet);\r
+        printf("\nmemcpy UtcTime failed! Errno is %d\r\n", copyRet);\r
         free(buff);\r
         return 0;\r
     }\r
@@ -133,12 +133,12 @@ int32_t PgnssInjectUtcTime(tiot_handle handle, GnssUtcTime *utcTime, uint32_t* t
     hdr->checkSum = CalcChecksum(hdr->data, hdr->dataLength);\r
     int32_t ret = tiot_service_write(handle, buff, (sizeof(GnssMsg) + hdr->dataLength));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: PgnssInjectUtcTime error: %d\r\n", ret);\r
+        printf("\nerror: PgnssInjectUtcTime error: %d\r\n", ret);\r
         free(buff);\r
         return 0;\r
     }\r
     if (Utc2UnixTime((*utcTime), ts) == 0) {\r
-        CWM_OS_dbgPrintf("\nerror: Utc2UnixTime error\r\n");\r
+        printf("\nerror: Utc2UnixTime error\r\n");\r
         free(buff);\r
         return 0;\r
     }\r
@@ -151,7 +151,7 @@ static uint16_t FillGnssMessageData(uint8_t *inBuff, uint32_t inLen, uint8_t *ou
 {\r
     errno_t ret = memcpy_s(outBuff, outLen, inBuff, inLen);\r
     if (ret != EOK) {\r
-        CWM_OS_dbgPrintf("memcpy XgnssData failed! Errno is %d \r\n", ret);\r
+        printf("memcpy XgnssData failed! Errno is %d \r\n", ret);\r
         return 0;\r
     }\r
 \r
@@ -178,12 +178,12 @@ static void ListenAck(tiot_handle handle)
             // 二进制消息类型\r
             if (type[0] == 0) {\r
                 g_ackBuff[ret] = '\0';\r
-                CWM_OS_dbgPrintf("%s\r\n", (char *)&g_ackBuff[MSG_CONTENT_IDX]);\r
+                printf("%s\r\n", (char *)&g_ackBuff[MSG_CONTENT_IDX]);\r
             }\r
             i++;\r
         }\r
         if (i >= 1) {\r
-            CWM_OS_dbgPrintf("\r\ncnt enough\r\n");\r
+            printf("\r\ncnt enough\r\n");\r
             break;\r
         }\r
     }\r
@@ -195,7 +195,7 @@ static int32_t EncodeAndInjectCmd(tiot_handle handle, GnssCmdType cmdType, uint8
     int32_t len = 0;\r
     uint8_t *buff = (uint8_t *)malloc(GNSS_ENCODE_BUFF_MAX_LEN);\r
     if (buff == NULL) {\r
-        CWM_OS_dbgPrintf("\r\nerror: malloc failed in EncodeAndInjectCmd\r\n");\r
+        printf("\r\nerror: malloc failed in EncodeAndInjectCmd\r\n");\r
         return 0;\r
     }\r
     memset_s(buff, GNSS_ENCODE_BUFF_MAX_LEN, 0, GNSS_ENCODE_BUFF_MAX_LEN);\r
@@ -207,7 +207,7 @@ static int32_t EncodeAndInjectCmd(tiot_handle handle, GnssCmdType cmdType, uint8
 \r
     int32_t retLen = EncodeGnssMsg(inBuff, inLen, buff + len, (GNSS_ENCODE_BUFF_MAX_LEN - len));\r
     if (retLen != 1) {\r
-        CWM_OS_dbgPrintf("\nerror: Encode Cmd failed: %d\r\n", cmdType);\r
+        printf("\nerror: Encode Cmd failed: %d\r\n", cmdType);\r
         free(buff);\r
         return retLen;\r
     }\r
@@ -216,12 +216,12 @@ static int32_t EncodeAndInjectCmd(tiot_handle handle, GnssCmdType cmdType, uint8
     gnssHdr->checkSum = CalcChecksum(gnssHdr->data, gnssHdr->dataLength);\r
     int32_t ret = tiot_service_write(handle, buff, (sizeof(GnssMsg) + gnssHdr->dataLength));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\r\nerror: Inject Cmd failed: %d\r\n", cmdType);\r
+        printf("\r\nerror: Inject Cmd failed: %d\r\n", cmdType);\r
         free(buff);\r
         return 0;\r
     }\r
     ListenAck(handle);\r
-    CWM_OS_dbgPrintf("\r\nInject Cmd SUCCESS: %x\r\n", cmdType);\r
+    printf("\r\nInject Cmd SUCCESS: %x\r\n", cmdType);\r
     free(buff);\r
     return 1;\r
 }\r
@@ -230,7 +230,7 @@ void PgnssSendFileContent(tiot_handle handle, const char *fileName, GnssCmdType
 {\r
     FILE *fp = fopen(fileName, "rb");\r
     if (fp == NULL) {\r
-        CWM_OS_dbgPrintf("\r\nerror: open file failed: %s\r\n", fileName);\r
+        printf("\r\nerror: open file failed: %s\r\n", fileName);\r
         return;\r
     }\r
     fseek(fp, 0, SEEK_END);\r
@@ -238,19 +238,19 @@ void PgnssSendFileContent(tiot_handle handle, const char *fileName, GnssCmdType
     fseek(fp, 0, SEEK_SET);\r
     if (len < 0 || len > PGNSS_FILE_MAX_SIZE) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\r\nerror: get file len failed: %s\r\n", fileName);\r
+        printf("\r\nerror: get file len failed: %s\r\n", fileName);\r
         return;\r
     }\r
     uint8_t *buff = (uint8_t *)malloc(len);\r
     if (buff == NULL) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\r\nerror: malloc file len failed: %s\r\n", fileName);\r
+        printf("\r\nerror: malloc file len failed: %s\r\n", fileName);\r
         return;\r
     }\r
     int32_t dataSize = fread(buff, len, 1, fp);\r
     if (dataSize < 0) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\r\nerror: read file failed: %s\r\n", fileName);\r
+        printf("\r\nerror: read file failed: %s\r\n", fileName);\r
         free(buff);\r
         return;\r
     }\r
@@ -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;\r
     DIR *dir = opendir("/user/userdata/gnss/");\r
     if (dir == NULL) {\r
-        CWM_OS_dbgPrintf("Failed to open /user/xgnss directory.\r\n");\r
+        printf("Failed to open /user/xgnss directory.\r\n");\r
         return 0;\r
     }\r
     int32_t time, ret;\r
@@ -293,14 +293,14 @@ int32_t GetEphFileName(int32_t ts, const char *prefix, char *fileName)
                     }\r
                     else\r
                     {\r
-                        CWM_OS_dbgPrintf("time:%d,ts:%d,interval:%d\r\n",time,ts,interval);\r
+                        printf("time:%d,ts:%d,interval:%d\r\n",time,ts,interval);\r
                     }\r
                 }\r
             }\r
         }\r
     }\r
     closedir(dir);\r
-    CWM_OS_dbgPrintf("closedir(dir);\r\n");\r
+    printf("closedir(dir);\r\n");\r
     return 0;\r
 }\r
 \r
@@ -309,10 +309,10 @@ void PgnssSendEphFile(tiot_handle handle, const char *prefix, GnssCmdType cmdTyp
     char fileName[FILE_PATH_LEN] = {0};\r
     int32_t ret = GetEphFileName(ts, prefix, fileName);\r
     if (ret == 0) {\r
-        CWM_OS_dbgPrintf("\r\nerror: GetEphFileName failed\r\n");\r
+        printf("\r\nerror: GetEphFileName failed\r\n");\r
         return;\r
     }\r
-    CWM_OS_dbgPrintf("\nGetEphFileName success\r\n");\r
+    printf("\nGetEphFileName success\r\n");\r
     PgnssSendFileContent(handle, fileName, cmdType);\r
 }\r
 \r
@@ -320,44 +320,44 @@ void PgnssInjectAllEph(tiot_handle handle, uint32_t ts)
 {\r
     PgnssSendEphFile(handle, "GPS", CMD_PGNSS_INJECT_EPH_GPS, ts);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send GPS eph success\r\n");\r
+    printf("send GPS eph success\r\n");\r
     PgnssSendEphFile(handle, "GLO", CMD_PGNSS_INJECT_EPH_GANSS, ts);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send GLO eph success\r\n");\r
+    printf("send GLO eph success\r\n");\r
     PgnssSendEphFile(handle, "BDS", CMD_PGNSS_INJECT_EPH_GANSS, ts);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send BDS eph success\r\n");\r
+    printf("send BDS eph success\r\n");\r
     PgnssSendEphFile(handle, "GAL", CMD_PGNSS_INJECT_EPH_GANSS, ts);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send GAL eph success\r\n");\r
+    printf("send GAL eph success\r\n");\r
     PgnssSendEphFile(handle, "QZS", CMD_PGNSS_INJECT_EPH_GANSS, ts);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send QZS eph success\r\n");\r
+    printf("send QZS eph success\r\n");\r
 }\r
 \r
 void PgnssInjectOtherAssist(tiot_handle handle)\r
 {\r
     PgnssSendFileContent(handle, "/user/userdata/gnss/GPS_UTC.dat", CMD_PGNSS_INJECT_UTC_GPS);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send GPS_UTC success\r\n");\r
+    printf("send GPS_UTC success\r\n");\r
     PgnssSendFileContent(handle, "/user/userdata/gnss/GPS_RTI.dat", CMD_PGNSS_INJECT_RTI_GPS);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send GPS_RTI success\r\n");\r
+    printf("send GPS_RTI success\r\n");\r
     PgnssSendFileContent(handle, "/user/userdata/gnss/GPS_ION.dat", CMD_PGNSS_INJECT_ION_GPS);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send GPS_ION success\r\n");\r
+    printf("send GPS_ION success\r\n");\r
     PgnssSendFileContent(handle, "/user/userdata/gnss/GLO_RTI.dat", CMD_PGNSS_INJECT_RTI_GANSS);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send GLO_RTI success\r\n");\r
+    printf("send GLO_RTI success\r\n");\r
     PgnssSendFileContent(handle, "/user/userdata/gnss/GLO_AUX.dat", CMD_PGNSS_INJECT_AUX_GANSS);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send GLO_AUX success\r\n");\r
+    printf("send GLO_AUX success\r\n");\r
     PgnssSendFileContent(handle, "/user/userdata/gnss/BDS_RTI.dat", CMD_PGNSS_INJECT_RTI_GANSS);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send BDS_RTI success\r\n");\r
+    printf("send BDS_RTI success\r\n");\r
     PgnssSendFileContent(handle, "/user/userdata/gnss/GAL_RTI.dat", CMD_PGNSS_INJECT_RTI_GANSS);\r
     osal_msleep(INJECT_SLEEP_MS_TIME);\r
-    CWM_OS_dbgPrintf("send GAL_RTI success\r\n");\r
+    printf("send GAL_RTI success\r\n");\r
 }\r
 \r
 void PgnssInject(tiot_handle handle, uint32_t ts)\r
@@ -374,7 +374,7 @@ int32_t GetNonGloEphFileName(int32_t ts, char *fileName)
     const char prefix[] = "NonGlo";\r
     DIR *dir = opendir("/user/userdata/gnss/");\r
     if (dir == NULL) {\r
-        CWM_OS_dbgPrintf("Failed to open /user/xgnss directory.\r\n");\r
+        printf("Failed to open /user/xgnss directory.\r\n");\r
         return 0;\r
     }\r
     int32_t time, ret;\r
@@ -396,7 +396,7 @@ int32_t GetNonGloEphFileName(int32_t ts, char *fileName)
                     }\r
                     else\r
                     {\r
-                        CWM_OS_dbgPrintf("time:%d,ts:%d,minDist:%d\r\n",time,ts,minDist);\r
+                        printf("time:%d,ts:%d,minDist:%d\r\n",time,ts,minDist);\r
                     }\r
                 }\r
             }\r
@@ -405,13 +405,13 @@ int32_t GetNonGloEphFileName(int32_t ts, char *fileName)
     if (closestTime != 0) {\r
         ret = snprintf_s(fileName, FILE_PATH_LEN, (FILE_PATH_LEN - 1), "%s%d%s", "/user/userdata/gnss/NonGlo_", closestTime,\r
             ".eph");\r
-        CWM_OS_dbgPrintf("closest eph fileName:%s\r\n", fileName);\r
+        printf("closest eph fileName:%s\r\n", fileName);\r
         closedir(dir);\r
         return ((ret <= 0) ? 0 : 1);\r
     }\r
     else\r
     {\r
-        CWM_OS_dbgPrintf("closestTime == 0\r\n");\r
+        printf("closestTime == 0\r\n");\r
     }\r
     closedir(dir);\r
     return 0;\r
@@ -422,7 +422,7 @@ int32_t GetGloEphFileName(int32_t ts, char *fileName)
     const char prefix[] = "GLO";\r
     DIR *dir = opendir("/user/userdata/gnss/");\r
     if (dir == NULL) {\r
-        CWM_OS_dbgPrintf("Failed to open /user/xgnss directory.\r\n");\r
+        printf("Failed to open /user/xgnss directory.\r\n");\r
         return 0;\r
     }\r
     int32_t ephTime, ret;\r
@@ -435,13 +435,13 @@ int32_t GetGloEphFileName(int32_t ts, char *fileName)
                 char *q = strstr(entry->d_name, prefix);\r
                 if (q != NULL) {\r
                     ephTime = atoi(p + 1);\r
-                    CWM_OS_dbgPrintf("ephTime:%ld, ts:%ld\n", ephTime, ts);\r
+                    printf("ephTime:%ld, ts:%ld\n", ephTime, ts);\r
                     // 当前时间大于GLO星历文件时间戳,则需要选取相差2小时以内的星历\r
                     // 当前时间小于GLO星历文件时间戳,则需要选取相差小于15分钟的星历\r
                     if (((ts - ephTime) >= 0 && abs(ephTime - ts) < OTHER_EPH_VALID_TIME) ||\r
                         ((ts - ephTime) <= 0 && abs(ephTime - ts) < GLO_EPH_VALID_TIME)) {\r
                         ret = FormatFileName(fileName, entry->d_name);\r
-                        CWM_OS_dbgPrintf("glo eph fileName:%s\n", fileName);\r
+                        printf("glo eph fileName:%s\n", fileName);\r
                         closedir(dir);\r
                         return ret;\r
                     }\r
@@ -457,7 +457,7 @@ void PgnssSendNonGloEph(tiot_handle handle, const char *fileName)
 {\r
     FILE *fp = fopen(fileName, "rb");\r
     if (fp == NULL) {\r
-        CWM_OS_dbgPrintf("\nerror: open file failed: %s\r\n", fileName);\r
+        printf("\nerror: open file failed: %s\r\n", fileName);\r
         return;\r
     }\r
     fseek(fp, 0, SEEK_END);\r
@@ -465,19 +465,19 @@ void PgnssSendNonGloEph(tiot_handle handle, const char *fileName)
     fseek(fp, 0, SEEK_SET);\r
     if (len < 0 || len > PGNSS_FILE_MAX_SIZE) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\nerror: get file len failed: %s\r\n", fileName);\r
+        printf("\nerror: get file len failed: %s\r\n", fileName);\r
         return;\r
     }\r
     uint8_t *buff = (uint8_t *)malloc(len);\r
     if (buff == NULL) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\nerror: malloc file len failed: %s\r\n", fileName);\r
+        printf("\nerror: malloc file len failed: %s\r\n", fileName);\r
         return;\r
     }\r
     int32_t dataSize = fread(buff, len, 1, fp);\r
     if (dataSize < 0) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\nerror: read file failed: %s\r\n", fileName);\r
+        printf("\nerror: read file failed: %s\r\n", fileName);\r
         free(buff);\r
         return;\r
     }\r
@@ -496,7 +496,7 @@ void PgnssSendGloEph(tiot_handle handle, const char *fileName, int32_t ts)
 {\r
     FILE *fp = fopen(fileName, "rb");\r
     if (fp == NULL) {\r
-        CWM_OS_dbgPrintf("\nerror: open file failed: %s\r\n", fileName);\r
+        printf("\nerror: open file failed: %s\r\n", fileName);\r
         return;\r
     }\r
     fseek(fp, 0, SEEK_END);\r
@@ -504,19 +504,19 @@ void PgnssSendGloEph(tiot_handle handle, const char *fileName, int32_t ts)
     fseek(fp, 0, SEEK_SET);\r
     if (len < 0 || len > PGNSS_FILE_MAX_SIZE) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\nerror: get file len failed: %s\r\n", fileName);\r
+        printf("\nerror: get file len failed: %s\r\n", fileName);\r
         return;\r
     }\r
     uint8_t *buff = (uint8_t *)malloc(len);\r
     if (buff == NULL) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\nerror: malloc file len failed: %s\r\n", fileName);\r
+        printf("\nerror: malloc file len failed: %s\r\n", fileName);\r
         return;\r
     }\r
     int32_t dataSize = fread(buff, len, 1, fp);\r
     if (dataSize < 0) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\nerror: read file failed: %s\r\n", fileName);\r
+        printf("\nerror: read file failed: %s\r\n", fileName);\r
         free(buff);\r
         return;\r
     }\r
@@ -524,7 +524,7 @@ void PgnssSendGloEph(tiot_handle handle, const char *fileName, int32_t ts)
     int32_t fileLen = 0;\r
     for (int32_t i = 0; i < GLO_EPH_NUM_ONE_FILE && fileLen <= len; i++) {\r
         EphHeadInfo *ephHdr = (EphHeadInfo *)(buff + fileLen);\r
-        CWM_OS_dbgPrintf("glo eph, time:%u, ts:%d\r\n", ephHdr->time, ts);\r
+        printf("glo eph, time:%u, ts:%d\r\n", ephHdr->time, ts);\r
         if (abs((int32_t)ephHdr->time - ts) < GLO_EPH_VALID_TIME) {\r
             EncodeAndInjectCmd(handle, ephHdr->cmd, (buff + fileLen + sizeof(EphHeadInfo)), ephHdr->len);\r
             osal_msleep(INJECT_SLEEP_MS_TIME);\r
@@ -539,12 +539,12 @@ void PgnssInjectAllEphLessFiles(tiot_handle handle, uint32_t ts)
 {\r
     char fileName[FILE_PATH_LEN] = {0};\r
     if (GetNonGloEphFileName(ts, fileName) == 0) {\r
-        CWM_OS_dbgPrintf("\nerror: GetNonGloEphFileName failed\r\n");\r
+        printf("\nerror: GetNonGloEphFileName failed\r\n");\r
         return;\r
     }\r
     PgnssSendNonGloEph(handle, fileName);\r
     if (GetGloEphFileName(ts, fileName) == 0) {\r
-        CWM_OS_dbgPrintf("\nerror: GetGloEphFileName failed\r\n");\r
+        printf("\nerror: GetGloEphFileName failed\r\n");\r
         return;\r
     }\r
     PgnssSendGloEph(handle, fileName, ts);\r
@@ -554,7 +554,7 @@ void PgnssSendOtherAssistInfo(tiot_handle handle, const char *fileName)
 {\r
     FILE *fp = fopen(fileName, "rb");\r
     if (fp == NULL) {\r
-        CWM_OS_dbgPrintf("\nerror: open file failed: %s\r\n", fileName);\r
+        printf("\nerror: open file failed: %s\r\n", fileName);\r
         return;\r
     }\r
     fseek(fp, 0, SEEK_END);\r
@@ -562,19 +562,19 @@ void PgnssSendOtherAssistInfo(tiot_handle handle, const char *fileName)
     fseek(fp, 0, SEEK_SET);\r
     if (len < 0 || len > PGNSS_FILE_MAX_SIZE) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\nerror: get file len failed: %s\r\n", fileName);\r
+        printf("\nerror: get file len failed: %s\r\n", fileName);\r
         return;\r
     }\r
     uint8_t *buff = (uint8_t *)malloc(len);\r
     if (buff == NULL) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\nerror: malloc file len failed: %s\r\n", fileName);\r
+        printf("\nerror: malloc file len failed: %s\r\n", fileName);\r
         return;\r
     }\r
     int32_t dataSize = fread(buff, len, 1, fp);\r
     if (dataSize < 0) {\r
         fclose(fp);\r
-        CWM_OS_dbgPrintf("\nerror: read file failed: %s\r\n", fileName);\r
+        printf("\nerror: read file failed: %s\r\n", fileName);\r
         free(buff);\r
         return;\r
     }\r

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 a153c14..dca4571 100644 (file)
--- 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"\r
 #include "gnss_ctl.h"\r
 #ifdef SUPPORT_CYWEE_SERVICE\r
-#include "cywee_hal.h"\r
 #include "cywee_service.h"\r
 #endif\r
 \r
@@ -55,7 +54,7 @@ static int32_t QryVersion(tiot_handle handle)
     // 查询版本号\r
     int32_t ret = tiot_service_write(handle, qryVersion, sizeof(qryVersion));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: QryVersion error: %d\r\n", ret);\r
+        printf("\nerror: QryVersion error: %d\r\n", ret);\r
         return 0;\r
     }\r
     return 1;\r
@@ -98,7 +97,7 @@ int32_t InjectPgnssCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle)
     // 配置log级别：info级别。\r
     int32_t ret = tiot_service_write(handle, cfgLogLevelInfo, sizeof(cfgLogLevelInfo));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: cfgLogLevelInfo error: %d\r\n", ret);\r
+        printf("\nerror: cfgLogLevelInfo error: %d\r\n", ret);\r
         return 0;\r
     }\r
 \r
@@ -118,17 +117,17 @@ int32_t InjectPgnssCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle)
     utcTime.minute = timeinfo->tm_min;\r
     utcTime.second = timeinfo->tm_sec;\r
 \r
-    CWM_OS_dbgPrintf("year[%d], mon[%d], day[%d], hour[%d], min[%d], sec[%d] \r\n",\r
+    printf("year[%d], mon[%d], day[%d], hour[%d], min[%d], sec[%d] \r\n",\r
     utcTime.year,utcTime.month,utcTime.day,\r
     utcTime.hour,utcTime.minute,utcTime.second);\r
 \r
     uint32_t ts = 0;\r
     ret = PgnssInjectUtcTime(handle, &utcTime, &ts);\r
     if (ret == 0) {\r
-        CWM_OS_dbgPrintf("\nerror: PgnssInjectUtcTime failed!\r\n");\r
+        printf("\nerror: PgnssInjectUtcTime failed!\r\n");\r
         return 0;\r
     }\r
-    CWM_OS_dbgPrintf("\nPgnssInjectUtcTime success!\r\n");\r
+    printf("\nPgnssInjectUtcTime success!\r\n");\r
 \r
     // PGNSS注入\r
     // 注意，默认PGNSS星历文件存放在/user/xgnss/目录中，如修改目录，请全局搜索替换\r
@@ -145,7 +144,7 @@ int32_t InjectPgnssLessFilesCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle
     // 配置log级别：info级别。\r
     int32_t ret = tiot_service_write(handle, cfgLogLevelInfo, sizeof(cfgLogLevelInfo));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: cfgLogLevelInfo error: %d\r\n", ret);\r
+        printf("\nerror: cfgLogLevelInfo error: %d\r\n", ret);\r
         return 0;\r
     }\r
 \r
@@ -165,7 +164,7 @@ int32_t InjectPgnssLessFilesCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle
     utcTime.minute = timeinfo->tm_min;\r
     utcTime.second = timeinfo->tm_sec;\r
 \r
-    CWM_OS_dbgPrintf("year[%d], mon[%d], day[%d], hour[%d], min[%d], sec[%d] \r\n",\r
+    printf("year[%d], mon[%d], day[%d], hour[%d], min[%d], sec[%d] \r\n",\r
     utcTime.year,utcTime.month,utcTime.day,\r
     utcTime.hour,utcTime.minute,utcTime.second);\r
 \r
@@ -173,10 +172,10 @@ int32_t InjectPgnssLessFilesCfgAutoStartFixModeAndNmeaDefault(tiot_handle handle
     uint32_t ts = 0;\r
     ret = PgnssInjectUtcTime(handle, &utcTime, &ts);\r
     if (ret == 0) {\r
-        CWM_OS_dbgPrintf("\nerror: PgnssInjectUtcTime failed!\r\n");\r
+        printf("\nerror: PgnssInjectUtcTime failed!\r\n");\r
         return 0;\r
     }\r
-    CWM_OS_dbgPrintf("\nPgnssInjectUtcTime success!\r\n");\r
+    printf("\nPgnssInjectUtcTime success!\r\n");\r
 \r
     // PGNSS注入\r
     // 注意，默认PGNSS星历文件存放在/user/xgnss/目录中，如修改目录，请全局搜索替换\r
@@ -197,10 +196,10 @@ static int32_t StartGnss(tiot_handle handle)
     // 启动GNSS\r
     int32_t ret = tiot_service_write(handle, startCmd, sizeof(startCmd));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: start gnss error: %d\r\n", ret);\r
+        printf("\nerror: start gnss error: %d\r\n", ret);\r
         return 0;\r
     }\r
-    CWM_OS_dbgPrintf("\nstart gnss\r\n");\r
+    printf("\nstart gnss\r\n");\r
     return 1;\r
 }\r
 \r
@@ -210,10 +209,10 @@ static int32_t StopGnss(tiot_handle handle)
     // 停止GNSS\r
     int32_t ret = tiot_service_write(handle, stopCmd, sizeof(stopCmd));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: stop gnss error: %d\r\n", ret);\r
+        printf("\nerror: stop gnss error: %d\r\n", ret);\r
         return 0;\r
     }\r
-    CWM_OS_dbgPrintf("\nstop gnss\r\n");\r
+    printf("\nstop gnss\r\n");\r
     return 1;\r
 }\r
 \r
@@ -225,7 +224,7 @@ static void ListenGnssData(tiot_handle handle)
     for (;;) {  // 写日志条件\r
 \r
         if (i >= LISTEN_DATA_MAX_LINES) {\r
-            CWM_OS_dbgPrintf("\r\ncnt enough\r\n");\r
+            printf("\r\ncnt enough\r\n");\r
             break;\r
         }\r
         if (g_pgnss_stopflag == 1)\r
@@ -239,7 +238,7 @@ static void ListenGnssData(tiot_handle handle)
             if (type[0] == MSG_TYPE_ASCII) {\r
                 g_gnssServiceBuff[ret] = '\0';\r
                 char* pbuf=(char *)&g_gnssServiceBuff[MSG_CONTENT_IDX];\r
-                CWM_OS_dbgPrintf("%s\r\n", pbuf);\r
+                printf("%s\r\n", pbuf);\r
                 if (g_is_pgnss_logon)\r
                     fprintf(g_gnssLogFp, "%s\n", pbuf);\r
                 for (int index=0;index < ret ;index++)\r
@@ -247,7 +246,7 @@ static void ListenGnssData(tiot_handle handle)
                     if (decode_nmea(pbuf[index])==1)\r
                     {\r
                         // dump_location_data(&g_global_gpsData);\r
-                        CWM_OS_dbgPrintf("decode_nmea done\r\n");\r
+                        printf("decode_nmea done\r\n");\r
                     }\r
                 }\r
             }\r
@@ -285,10 +284,10 @@ int PGnssLogEnable(bool enable)
 \r
 void PGnssServerStart(void)\r
 {\r
-    CWM_OS_dbgPrintf("\nenter gnss samples\r\n");\r
+    printf("\nenter gnss samples\r\n");\r
     if(g_is_pgnss_poweron == 1)\r
     {\r
-        CWM_OS_dbgPrintf("gnss already on\r\n");\r
+        printf("gnss already on\r\n");\r
         return ;\r
     }\r
     uapi_pm_add_sleep_veto(PM_ID_SYS);\r
@@ -302,7 +301,7 @@ void PGnssServerStart(void)
     // Step1: init\r
     int32_t ret = tiot_service_init();\r
     if (ret != 0) {\r
-        CWM_OS_dbgPrintf("tiot service init fail\r\n");\r
+        printf("tiot service init fail\r\n");\r
         g_is_pgnss_poweron = 0;\r
         g_pgnss_stopflag = 1;\r
     }\r
@@ -312,21 +311,21 @@ void PGnssServerStart(void)
     {\r
         g_gnssLogFp = fopen("/user/log/gnss.log", "w");\r
         if (g_gnssLogFp == NULL) {\r
-            CWM_OS_dbgPrintf("error: open log file error\n");\r
+            printf("error: open log file error\n");\r
             return;\r
         }\r
     }\r
-    CWM_OS_dbgPrintf("before open tiot service\n");\r
+    printf("before open tiot service\n");\r
 \r
     // Step2: power on gnss\r
     tiot_handle handle = tiot_service_open("gn71", NULL);\r
     if (handle == 0) {\r
-        CWM_OS_dbgPrintf("open tiot service fail\r\n");\r
+        printf("open tiot service fail\r\n");\r
         g_is_pgnss_poweron = 0;\r
         g_pgnss_stopflag = 1;\r
         return;\r
     }\r
-    CWM_OS_dbgPrintf("open tiot service success\r\n");\r
+    printf("open tiot service success\r\n");\r
 \r
     int32_t cfgRet;\r
     // ---- loop ----------\r
@@ -340,7 +339,7 @@ void PGnssServerStart(void)
             if (cfgRet == 0) {\r
                 continue;\r
             }\r
-            CWM_OS_dbgPrintf("cfg sample id:%u\r\n", g_gnssSamplesCfg[i].sampleId);\r
+            printf("cfg sample id:%u\r\n", g_gnssSamplesCfg[i].sampleId);\r
             QryVersion(handle);\r
 \r
             // Step4: start gnss\r
@@ -372,5 +371,5 @@ void PGnssServerStart(void)
     #endif\r
     uapi_pm_remove_sleep_veto(PM_ID_SYS);\r
     g_is_pgnss_poweron=0;\r
-    CWM_OS_dbgPrintf("finish gnss samples\r\n");\r
+    printf("finish gnss samples\r\n");\r
 }\r

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 485396e..6147c82 100644 (file)
--- 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)
 \r
             if (duration > UINT8_MAX)\r
             {\r
-                // DEBUG_PRINT("duration > UINT8_MAX !!!:%llu\n",duration);\r
-                PRINT("duration > UINT8_MAX !!!:%llu\n",duration);\r
+                DEBUG_PRINT("duration > UINT8_MAX !!!\n");\r
                 return;\r
             }\r
             \r