From b03a304e938c9bd626b87f612d15fbb69e46733b Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Wed, 6 Mar 2024 17:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E7=A0=81=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=EF=BC=8C=E5=BD=95=E5=88=B6=E4=BF=A1=E5=8F=B7=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 usrc/main.cpp                           | 9 ++++-----
 usrc/service/report_generator_service.c | 6 ++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/usrc/main.cpp b/usrc/main.cpp
index 322d86c..f18255f 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -144,11 +144,10 @@ void umain() {
     debug_light_ctrl();
     factory_reset_key_detect();
 
-    // xs_gpio_write(&fpga_if.reset_pin_io, true);
-    //
-    // if (xs_has_passedms(0) >= 1* 60 * 60 * 1000) {
-    //   NVIC_SystemReset();
-    // }
+    if (xs_has_passedms(0) >= 1* 60 * 60 * 1000) {
+      NVIC_SystemReset();
+    }
+    
     // ZLOGI(TAG,"factory_reset_key_state %d",xs_gpio_read(&m_factory_reset_key));
 
     // osDelay(10);
diff --git a/usrc/service/report_generator_service.c b/usrc/service/report_generator_service.c
index 34d0a22..2a511c6 100644
--- a/usrc/service/report_generator_service.c
+++ b/usrc/service/report_generator_service.c
@@ -75,14 +75,16 @@ static void timecode_report_thread(void const *argument) {
       uint32_t timecode0, timecode1;
       fpga_if_get_timecode(&timecode0, &timecode1);
       create_and_send_timecode(timecode0, timecode1);
-    } else if (signal.value.signals & 0x02) {
+    }
+    if (signal.value.signals & 0x02) {
       // 开始录制
       uint32_t timecode0 = 0;
       uint32_t timecode1 = 0;
       fpga_if_spi_read_data_02(record_sig_gen_timecode_snapshot0, &timecode0);
       fpga_if_spi_read_data_02(record_sig_gen_timecode_snapshot1, &timecode1);
       create_and_send_sync_record_state_packet(1, timecode0, timecode1);
-    } else if (signal.value.signals & 0x04) {
+    }
+    if (signal.value.signals & 0x04) {
       // 结束录制
       uint32_t timecode0 = 0;
       uint32_t timecode1 = 0;