增加n9编译选项，添加GPS,血压服务，优化原像心率计算(补)

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 799aa77..13ac8a5 100644 (file)
--- 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"\r
 #include "pm_definition.h"\r
 #include "gnss_ctl.h"\r
-#include "cywee_hal.h"\r
+// #include "cywee_hal.h"\r
 \r
 #define COLDSTART_FIXMODEGPS_NMEAALL_SAMPLE        0\r
 #define AUTOSTART_FIXMODEALL_NMEADEF_SAMPLE        1\r
@@ -116,39 +116,39 @@ int32_t CfgColdStartFixModeGpsNmeaAll(tiot_handle handle)
     // 配置启动模式：冷启动模式。\r
     int32_t ret = tiot_service_write(handle, cfgColdStartCmd, sizeof(cfgColdStartCmd));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: cfgColdStartCmd error: %d\n", ret);\r
+        printf("\nerror: cfgColdStartCmd error: %d\n", ret);\r
         return 0;\r
     }\r
 \r
     // 配置使能的GNSS星座：GPS。\r
     ret = tiot_service_write(handle, cfgFixModeAllCmd, sizeof(cfgFixModeAllCmd));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: cfgFixModeAllCmd error: %d\n", ret);\r
+        printf("\nerror: cfgFixModeAllCmd error: %d\n", ret);\r
         return 0;\r
     }\r
 \r
     // 配置上报NMEA类型：PNT/ZDA/VTG/RMC/GSV/GSA/GLL/GGA。\r
     ret = tiot_service_write(handle, cfgNmeaAllCmd, sizeof(cfgNmeaAllCmd));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: cfgNmeaAllCmd error: %d\n", ret);\r
+        printf("\nerror: cfgNmeaAllCmd error: %d\n", ret);\r
         return 0;\r
     }\r
 \r
     ret = tiot_service_write(handle, CFG_TRK_LPW_DISABLE, sizeof(CFG_TRK_LPW_DISABLE));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: CFG_TRK_LPW_DISABLE error: %d\n", ret);\r
+        printf("\nerror: CFG_TRK_LPW_DISABLE error: %d\n", ret);\r
         return 0;\r
     }\r
 \r
     ret = tiot_service_write(handle, CFG_ACQ_LPW_DISABLE, sizeof(CFG_ACQ_LPW_DISABLE));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: CFG_ACQ_LPW_DISABLE error: %d\n", ret);\r
+        printf("\nerror: CFG_ACQ_LPW_DISABLE error: %d\n", ret);\r
         return 0;\r
     }\r
 \r
     ret = tiot_service_write(handle, CFG_ANTIJAM_ENABLE, sizeof(CFG_ANTIJAM_ENABLE));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: CFG_ANTIJAM_ENABLE error: %d\n", ret);\r
+        printf("\nerror: CFG_ANTIJAM_ENABLE error: %d\n", ret);\r
         return 0;\r
     }\r
     return 1;\r
@@ -162,33 +162,33 @@ int32_t CfgAutoStartFixModeAllNmeaDefault(tiot_handle handle)
     // 配置启动模式：自动模式。\r
     int32_t ret = tiot_service_write(handle, cfgAutoStartCmd, sizeof(cfgAutoStartCmd));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: cfgAutoStartCmd error: %d\n", ret);\r
+        printf("\nerror: cfgAutoStartCmd error: %d\n", ret);\r
         return 0;\r
     }\r
 \r
     // 配置使能的GNSS星座：QZSS/GAL/BDS/GLO/GPS。\r
     ret = tiot_service_write(handle, cfgFixModeAllCmd, sizeof(cfgFixModeAllCmd));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: cfgFixModeAllCmd error: %d\n", ret);\r
+        printf("\nerror: cfgFixModeAllCmd error: %d\n", ret);\r
         return 0;\r
     }\r
 \r
     // 配置上报NMEA类型：RMC/GGA。\r
     ret = tiot_service_write(handle, cfgNmeaDefaultCmd, sizeof(cfgNmeaDefaultCmd));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: cfgNmeaDefaultCmd error: %d\n", ret);\r
+        printf("\nerror: cfgNmeaDefaultCmd error: %d\n", ret);\r
         return 0;\r
     }\r
 \r
     ret = tiot_service_write(handle, CFG_TRK_LPW_DISABLE, sizeof(CFG_TRK_LPW_DISABLE));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: CFG_TRK_LPW_DISABLE error: %d\n", ret);\r
+        printf("\nerror: CFG_TRK_LPW_DISABLE error: %d\n", ret);\r
         return 0;\r
     }\r
 \r
     ret = tiot_service_write(handle, CFG_ACQ_LPW_DISABLE, sizeof(CFG_ACQ_LPW_DISABLE));\r
     if (ret < 0) {\r
-        CWM_OS_dbgPrintf("\nerror: CFG_ACQ_LPW_DISABLE error: %d\n", ret);\r
+        printf("\nerror: CFG_ACQ_LPW_DISABLE error: %d\n", ret);\r
         return 0;\r
     }\r
     return 1;\r
@@ -200,7 +200,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\n", ret);\r
+        printf("\nerror: QryVersion error: %d\n", ret);\r
         return 0;\r
     }\r
     return 1;\r
@@ -217,10 +217,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\n", ret);\r
+        printf("\nerror: start gnss error: %d\n", ret);\r
         return 0;\r
     }\r
-    CWM_OS_dbgPrintf("\nstart gnss\n");\r
+    printf("\nstart gnss\n");\r
     return 1;\r
 }\r
 \r
@@ -229,10 +229,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\n", ret);\r
+        printf("\nerror: stop gnss error: %d\n", ret);\r
         return 0;\r
     }\r
-    CWM_OS_dbgPrintf("\nstop gnss\n");\r
+    printf("\nstop gnss\n");\r
     return 1;\r
 }\r
 \r
@@ -243,7 +243,7 @@ static void ListenGnssData(tiot_handle handle)
     for (;;) {  // 写日志条件\r
 \r
         if (i >= LISTEN_DATA_MAX_LINES) {\r
-            CWM_OS_dbgPrintf("\ncnt enough\n");\r
+            printf("\ncnt enough\n");\r
             break;\r
         }\r
         if (g_gnss_stopflag == 1)\r
@@ -257,7 +257,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\n", pbuf);\r
+                printf("%s\n", pbuf);\r
                 if (g_is_gnss_logon)\r
                     fprintf(g_gnssLogFp, "%s\n", pbuf);\r
                 for (int index=0;index < ret ;index++)\r
@@ -265,7 +265,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
@@ -301,10 +301,10 @@ int GnssLogEnable(bool enable)
 \r
 void GnssServerStart(void)\r
 {\r
-    CWM_OS_dbgPrintf("\nenter gnss samples\n");\r
+    printf("\nenter gnss samples\n");\r
     if(g_is_gnss_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
@@ -317,7 +317,7 @@ void GnssServerStart(void)
     // Step1: init\r
     int32_t ret = tiot_service_init();\r
     if (ret != 0) {\r
-        CWM_OS_dbgPrintf("\ntiot service init fail\n");\r
+        printf("\ntiot service init fail\n");\r
         g_is_gnss_poweron = 0;\r
         g_gnss_stopflag = 1;\r
     }\r
@@ -327,21 +327,21 @@ void GnssServerStart(void)
     {\r
         g_gnssLogFp = fopen("/user/log/gnss.log", "w");\r
         if (g_gnssLogFp == NULL) {\r
-            CWM_OS_dbgPrintf("\nerror: open log file error\n");\r
+            printf("\nerror: open log file error\n");\r
             return;\r
         }\r
     }\r
-    CWM_OS_dbgPrintf("\nbefore open tiot service\n");\r
+    printf("\nbefore 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("\nopen tiot service fail\n");\r
+        printf("\nopen tiot service fail\n");\r
         g_is_gnss_poweron = 0;\r
         g_gnss_stopflag = 1;\r
         return;\r
     }\r
-    CWM_OS_dbgPrintf("\nopen tiot service success\n");\r
+    printf("\nopen tiot service success\n");\r
 \r
     int32_t cfgRet;\r
     // ---- loop ----------\r
@@ -355,7 +355,7 @@ void GnssServerStart(void)
             if (cfgRet == 0) {\r
                 continue;\r
             }\r
-            CWM_OS_dbgPrintf("\ncfg sample id:%u\n", g_gnssSamplesCfg[i].sampleId);\r
+            printf("\ncfg sample id:%u\n", g_gnssSamplesCfg[i].sampleId);\r
             QryVersion(handle);\r
 \r
             // Step4: start gnss\r
@@ -387,5 +387,5 @@ void GnssServerStart(void)
     #endif\r
     uapi_pm_remove_sleep_veto(PM_ID_SYS);\r
     g_is_gnss_poweron=0;\r
-    CWM_OS_dbgPrintf("\nfinish gnss samples\n");\r
+    printf("\nfinish gnss samples\n");\r
 }
\ 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 ed33383..e73a5bf 100644 (file)
--- 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