update

1 year ago · e2292e861d
6 changed files with 18 additions and 13 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -10,6 +10,6 @@
 [submodule "libznordic"]
 	path = libznordic
 	url = zwsd@192.168.1.3:p_chinagoldgroup_hand_acid/blelib_libznordic.git
-[submodule "ify_hrs_protocol"]
-	path = ify_hrs_protocol
+[submodule "protocol"]
+	path = protocol
 	url = zwsd@192.168.1.3:p_chinagoldgroup_hand_acid/hand_acid_ble_protocol.git
--- a/app/config/sdk_config.h
+++ b/app/config/sdk_config.h
@ -1,16 +1,21 @@
 #pragma once
+#include "libznordic/zsdk_config/zsdk_ble_slave_config.h"
+
+#undef NRF_LOG_ENABLED
+#undef NRF_LOG_BACKEND_UART_ENABLED
+#undef NRF_LOG_BACKEND_UART_TX_PIN
+#undef APP_TIMER_CONFIG_USE_SCHEDULER
+#undef NRF_LOG_BACKEND_UART_BAUDRATE
+#undef NRF_DFU_APP_DATA_AREA_SIZE
+#undef NRF_FSTORAGE_ENABLED

-#define NRF_LOG_ENABLED                1
-#define NRF_LOG_BACKEND_UART_ENABLED   1
-#define NRF_LOG_BACKEND_UART_TX_PIN    41
+#define NRF_LOG_ENABLED              1
+#define NRF_LOG_BACKEND_UART_ENABLED 1
+#define NRF_LOG_BACKEND_UART_TX_PIN  41

 #define APP_TIMER_CONFIG_USE_SCHEDULER 0
 #define NRF_LOG_BACKEND_UART_BAUDRATE  121634816  // 400800 baud
 // #define NRF_LOG_BACKEND_UART_BAUDRATE  268435456  // 1000000 baud

-
 #define NRF_DFU_APP_DATA_AREA_SIZE 8192
-#define NRF_FSTORAGE_ENABLED 1
-
-#include "libznordic/zsdk_config/zsdk_ble_slave_config.h"
-
+#define NRF_FSTORAGE_ENABLED       1
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 286f8bbe136357e72b72f7d3e2a5b0ad64e99710
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 87862e2d0f9e5d1e412ea2cd62b0ff90bdff7ec8
+Subproject commit 22e80909c671f21a6b02adfd7c7a16833d6ee61d
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit f007f70377fd91a50de6f4120d0fd8c76202d469
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 864d18285a795072cd58f877237749e22c5baf27
+Subproject commit ce0c31496e9269273bdad1e162951f65b99779b8