From 5fdff22254776ad1544beb9d13ec75bfa9d9c1ec Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 15 Apr 2024 10:06:09 +0800 Subject: [PATCH] v335 --- usrc/project_configs.h | 2 +- usrc/service/report_generator_service.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 502c86e..c7aab4d 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -1,7 +1,7 @@ #pragma once #define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0) -#define PC_VERSION VERSION(3, 3, 4) +#define PC_VERSION VERSION(3, 3, 5) #define PC_MANUFACTURER0 ('i' | 'f' << 8 | 'l' << 16 | 'y' << 24) #define PC_MANUFACTURER1 ('t' | 'o' << 8 | 'p' << 16 | '\0' << 24) diff --git a/usrc/service/report_generator_service.c b/usrc/service/report_generator_service.c index a5b89c9..30ba7f3 100644 --- a/usrc/service/report_generator_service.c +++ b/usrc/service/report_generator_service.c @@ -142,6 +142,7 @@ static void xync_signal_report_thread(void const *argument) { fpga_if_spi_read_data_02(camera_sync_timecode_snapshot0, &tc0); fpga_if_spi_read_data_02(camera_sync_timecode_snapshot1, &tc1); fpga_if_spi_read_data_02(camera_sync_cnt, &cnt); + if (cnt != 0) cnt = cnt - 1; bool newday = false; timecode_parse_result_t result = parsetimecode(tc0, tc1); @@ -158,14 +159,14 @@ static void xync_signal_report_thread(void const *argument) { daycnt = 0; } - create_and_send_timecode(tc0, tc1, cnt); // timecode广播包 - last_report_packet_time = xs_get_ticket(); - if (dtime >= 1 || m_first_frame) { m_first_frame = false; second = daycnt * 24 * 3600 + result.timeinall; create_and_send_camera_sync_msg(second); } + + create_and_send_timecode(tc0, tc1, cnt); // timecode广播包 + last_report_packet_time = xs_get_ticket(); } if (signal.value.signals & 0x02) { // 开始录制