From e454e772049538334a29b8ff18601d07e3903e41 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 29 Aug 2024 17:26:22 +0800
Subject: [PATCH] fix some bug

---
 app/src/main.c                |  3 ++-
 app/src/protocol_utils.c      | 19 +++++++------------
 app/src/service/uart_initer.c |  7 ++++---
 app_protocols                 |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/src/main.c b/app/src/main.c
index 707c8f1..7e2fe83 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -150,7 +150,7 @@ static void debug_light_tmr_cb(void* p_context) {  //
 }
 
 static void heart_state_report_tmr_cb(void* p_context) {  //
-  send_report_heart(100, m_reset_flag, m_connected_state);
+  send_report_heart(99, m_reset_flag, m_connected_state);
 }
 
 static void board_init() {
@@ -179,6 +179,7 @@ int main(void) {
   zappcore_start_schedule();
   send_report_power_on_event();
 
+  zble_proto_utils_init(kzble_master);
   for (;;) {
     if (NRF_LOG_PROCESS() == false) {
       nrf_pwr_mgmt_run();
diff --git a/app/src/protocol_utils.c b/app/src/protocol_utils.c
index 063ee07..3e6b7c4 100644
--- a/app/src/protocol_utils.c
+++ b/app/src/protocol_utils.c
@@ -50,39 +50,34 @@ void send_report_heart(uint8_t power, uint8_t reset_flag, uint8_t connected_flag
   heart.connected_flag = connected_flag;
   heart.reset_flag     = reset_flag;
   heart.power          = power;
-  zble_proto_utils_create_report(reportpacket, kzble_report_heart, index++, (uint8_t*)&heart, sizeof(heart));
-  reportpacket->from = kzble_master;
+
+  zble_proto_utils_create_report(reportpacket, index++, kzble_report_heart, (uint8_t*)&heart, sizeof(heart));
   uart_send_data((uint8_t*)reportpacket, (uint16_t)reportpacket->packetlen);
 }
 void send_report_key_event(hand_acid_remoter_key_event_t event) {
   bletxbuf_clear();
   int32_t keyevent;
-  zble_proto_utils_create_report(reportpacket, 0, kzble_app_report_key_event, (uint8_t*)&keyevent, sizeof(keyevent));
-  reportpacket->from = kzble_master;
+  zble_proto_utils_create_report(reportpacket, index++, kzble_app_report_key_event, (uint8_t*)&keyevent, sizeof(keyevent));
   uart_send_data((uint8_t*)reportpacket, (uint16_t)reportpacket->packetlen);
 }
 
 void send_report_zble_connected_event(zble_connected_event_t* event) {
   bletxbuf_clear();
-  zble_proto_utils_create_report(reportpacket, kzble_report_connected_event, index++, (uint8_t*)event, sizeof(*event));
-  reportpacket->from = kzble_master;
+  zble_proto_utils_create_report(reportpacket, index++, kzble_report_connected_event, (uint8_t*)event, sizeof(*event));
   uart_send_data((uint8_t*)reportpacket, (uint16_t)reportpacket->packetlen);
 }
 void send_report_zble_disconnect_event() {
   bletxbuf_clear();
-  zble_proto_utils_create_report(reportpacket, kzble_report_disconnect_event, index++, NULL, 0);
-  reportpacket->from = kzble_master;
+  zble_proto_utils_create_report(reportpacket, index++, kzble_report_disconnect_event, NULL, 0);
   uart_send_data((uint8_t*)reportpacket, (uint16_t)reportpacket->packetlen);
 }
 void send_report_zble_scan_result(zble_scan_result_t* event) {
   bletxbuf_clear();
-  zble_proto_utils_create_report(reportpacket, kzble_report_scan_result, index++, (uint8_t*)event, sizeof(*event));
-  reportpacket->from = kzble_master;
+  zble_proto_utils_create_report(reportpacket, index++, kzble_report_scan_result, (uint8_t*)event, sizeof(*event));
   uart_send_data((uint8_t*)reportpacket, (uint16_t)reportpacket->packetlen);
 }
 void send_report_power_on_event() {
   bletxbuf_clear();
-  zble_proto_utils_create_report(reportpacket, kzble_report_power_on, index++, NULL, 0);
-  reportpacket->from = kzble_master;
+  zble_proto_utils_create_report(reportpacket, index++, kzble_report_power_on, NULL, 0);
   uart_send_data((uint8_t*)reportpacket, (uint16_t)reportpacket->packetlen);
 }
diff --git a/app/src/service/uart_initer.c b/app/src/service/uart_initer.c
index a1da47b..5e99521 100644
--- a/app/src/service/uart_initer.c
+++ b/app/src/service/uart_initer.c
@@ -25,6 +25,7 @@
 //
 #include "aproject_config/config.h"
 #include "uart_initer.h"
+#include "nrf_delay.h"
 
 #define UART_TX_BUF_SIZE 256 /**< UART TX buffer size. */
 #define UART_RX_BUF_SIZE 256 /**< UART RX buffer size. */
@@ -47,8 +48,6 @@ static void uart_send_tmr_cb(void* p_context) {  //
 }
 
 void uart_event_handle(app_uart_evt_t* p_event) {
-
-
   switch (p_event->evt_type) {
     /**@snippet [Handling data from UART] */
     case APP_UART_DATA_READY:
@@ -88,4 +87,6 @@ void uart_initer_init(on_uart_data_t ondata) {
   app_timer_create(&m_uart_send_tmr, APP_TIMER_MODE_REPEATED, uart_send_tmr_cb);
   app_timer_start(m_uart_send_tmr, APP_TIMER_TICKS(5) /*分包超时时间*/, NULL);
 }
-void uart_send_data(uint8_t* data, int32_t len) { app_uart_put_bytes(data, len); }
+void uart_send_data(uint8_t* data, int32_t len) {
+  app_uart_put_bytes(data, len);
+}
diff --git a/app_protocols b/app_protocols
index 0c908a3..5f6308f 160000
--- a/app_protocols
+++ b/app_protocols
@@ -1 +1 @@
-Subproject commit 0c908a36e5a34c4060689ae533ceca8f137bb54e
+Subproject commit 5f6308f9929809ffe5481b03d32488334f33c0e9