Skip to content

fix: local time #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: local time #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions data_collector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,13 +382,16 @@ def collecting_thread(ser_ref, conn, port_name):
# 緩衝區設定 - 使用延遲寫入策略
BUFFER_DELAY_MS = 500 # 只寫入 500ms 前的數據,確保晚到的數據能排序
WRITE_INTERVAL = 0.5
BATCH_TIME_INTERVAL = round(1000/6, 1)
sensor_buffer = []
filtered_buffer = []
intensity_buffer = []

# NTP 警告設定
last_ntp_warning = 0
ntp_warning_interval = 5.0

last_timestamp = get_timestamp_utc8()

print("[收集線程] 已啟動\n")

Expand All @@ -399,7 +402,6 @@ def collecting_thread(ser_ref, conn, port_name):
raise serial.SerialException("串列埠已關閉")

# 批次處理封包
timestamp_start = get_timestamp_utc8()
batch_results = []

for _ in range(20):
Expand All @@ -413,18 +415,25 @@ def collecting_thread(ser_ref, conn, port_name):
# 計算時間間隔並分配時間戳
current_time = time.time()
if batch_results:
timestamp_end = get_timestamp_utc8()
this_timestamp = get_timestamp_utc8()

if abs(this_timestamp - last_timestamp) >= 1000:
last_timestamp = this_timestamp

last_timestamp += BATCH_TIME_INTERVAL
# timestamp_end = get_timestamp_utc8()
batch_count = len(batch_results)
time_interval = (timestamp_end - timestamp_start) / \
batch_count if batch_count > 1 else 0
# time_interval = ((this_timestamp - last_timestamp) / \
# batch_count if batch_count > 1 else 0)
time_interval = BATCH_TIME_INTERVAL / batch_count if batch_count > 1 else 0

has_no_ntp = False
for i, result in enumerate(batch_results):
# 如果 timestamp 為 0，使用平分的時間
if result[1] == 0:
has_no_ntp = True
calculated_timestamp = timestamp_start + \
int(i * time_interval)
calculated_timestamp = last_timestamp - \
int((batch_count-i) * time_interval)
result = (result[0], calculated_timestamp, *result[2:])

# 分類存入緩衝區
Expand Down