解决加了GNSS后fd230编译不过问题

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index c60fe8e..45cc728 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -353,6 +353,7 @@ target = {
             #'ENABLE_WEBSOCKET',
             'CYWEE_SPORT',
             'CYWEE_MAC_ACTIVE',
+            'SUPPORT_CAT1_SERVICE',
             'SUPPORT_TCPIP',                                   
             'SUPPORT_HID_SERVICE',
             'SUPPORT_BAIDU_MAP',

diff --git a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
index d675dda..f712ad6 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp
@@ -4,6 +4,9 @@
 // #include "producttest/include/testcat1.h" 
 #include "AlarmClockModel.h"
 #include "cmsis_os2.h"
+        
+#if defined(GNSS_UART1) || defined(GNSS_UART0)
+
 #include "NMEA0183.h"
 // code/sdk/zhihui/services/gnss/inc/.h
 
@@ -289,3 +292,4 @@ namespace OHOS
     }
 }
 
+#endif

diff --git a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
index 1794140..e7e0565 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp
@@ -27,7 +27,10 @@
 \r
 \r
 #include "custom_runtime.h"\r
+\r
+#if defined(GNSS_UART1) || defined(GNSS_UART0)\r
 #include "gnss_ctl.h"\r
+#endif\r
 \r
 namespace OHOS\r
 {\r
@@ -343,6 +346,8 @@ namespace OHOS
 \r
 \r
         #endif\r
+\r
+        #if defined(GNSS_UART1) || defined(GNSS_UART0)\r
         if (strcmp(view.GetViewId(), GPS_OPEN_CONFIRM_BUTTON) == 0)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GPS On OnClick");\r
@@ -356,7 +361,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GPS On OnClick");\r
             gnss_stop();\r
         }\r
-\r
+        #endif\r
         return false;\r
     }\r
 \r

diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp
index 2001efd..4a870ca 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testView.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp
@@ -44,7 +44,9 @@ namespace OHOS
         {SEChipTest,"SEChipTestbutton","SEChipTest","SEChipTestbutton_next" ,&testView::ChangeSEChipTESTView,true},\r
         {PingTest,"PingTestbutton","PingTest","PingTestbutton_next" ,&testView::ChangePingTESTView,true},\r
 \r
+#if defined(GNSS_UART1) || defined(GNSS_UART0)\r
         {GPSTEST,"GPSTestbutton","GPSTest","GPSTestbutton_next" ,&testView::ChangeGPSTESTView,true},\r
+#endif\r
     #ifdef AGINGTEST\r
         {OLDTEST,"oldtestbutton","aging" ,"oldtestexit",&testView::ChangeoldTESTView,true},\r
     #endif\r
@@ -628,6 +630,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
     \r
     bool testView::ChangeGPSTESTView(int16_t thisView)\r
     {\r
+#if defined(GNSS_UART1) || defined(GNSS_UART0)\r
         if (SystemScrollView[thisView] == nullptr)\r
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeSEChipTESTView");\r
@@ -640,6 +643,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
             SystemScrollView[thisView] = test_GPS_view->testGPSInitIView((uint8_t)thisView);\r
             RootView::GetInstance()->Add(SystemScrollView[thisView]);\r
         }\r
+#endif\r
         return true;\r
     }\r
 \r
@@ -815,12 +819,14 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
                 test_Ping_view = nullptr;\r
                 SystemScrollView[hideView]=nullptr;\r
                 break;\r
+#if defined(GNSS_UART1) || defined(GNSS_UART0)\r
             case GPSTEST:\r
                 RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r
                 delete test_GPS_view;  \r
                 test_GPS_view = nullptr;\r
                 SystemScrollView[hideView]=nullptr;\r
                 break; \r
+#endif\r
 #ifdef SUPPORT_A5133_SERVICE\r
             case RF5133:\r
                 RootView::GetInstance()->Remove(SystemScrollView[hideView]);\r

diff --git a/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.c b/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.c
index 478e091..bc96310 100644 (file)
--- a/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.c
+++ b/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.c
@@ -415,7 +415,7 @@ uint32_t re_init(void)
     struct re_driver_data *redd = NULL;
     // re_err("re_init ----------1!!!\n");
 #ifdef ROTARYENCODER_HX3507
-    g_encoder_drv.private_data = rotary_encoder_get_peri_hx3507_attr();
+    g_encoder_drv.private_data = rotary_encoder_get_hx3507_peri_attr();
     g_encoder_drv.encoder_api = rotary_encoder_get_hx3507_api();
 #elif defined ROTARYENCODER_HX3509
     g_encoder_drv.private_data = rotary_encoder_get_hx3509_peri_attr();