Update timeturner.py

This commit is contained in:
Chris Frankland-Wright 2025-07-08 15:29:34 +01:00 committed by GitHub
parent 21b24cfff0
commit 6bceabd1a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,217 +1,191 @@
import serial import serial
import curses
import time import time
import datetime import datetime
import curses
import re import re
import subprocess
import os import os
import threading
import queue
import json import json
from threading import Thread, Lock
from collections import deque from collections import deque
SERIAL_PORT = None # Config
CONFIG_FILE = "config.json"
DEFAULT_CONFIG = {
"serial_port": "auto",
"hardware_offset_ms": 0
}
# Globals
SERIAL_PORT = "/dev/ttyUSB0"
BAUD_RATE = 115200 BAUD_RATE = 115200
FRAME_RATE = 25.0 FRAME_RATE = 25.0
CONFIG_PATH = "config.json"
sync_pending = False
ltc_data_queue = queue.Queue()
latest_ltc = None
offset_history = deque(maxlen=20)
lock_total = 0
free_total = 0
hardware_offset_ms = 0 hardware_offset_ms = 0
ltc_locked = False
lock_stable_since = None
sync_enabled = False
def load_config(): # Shared data
global hardware_offset_ms latest_line = None
latest_timestamp = None
line_lock = Lock()
# Rolling jitter calculation
jitter_samples = deque(maxlen=25)
last_jitter_update = time.time()
displayed_jitter_ms = None
displayed_jitter_frames = None
# Load config
if os.path.exists(CONFIG_FILE):
with open(CONFIG_FILE) as f:
try: try:
with open(CONFIG_PATH, "r") as f:
config = json.load(f) config = json.load(f)
hardware_offset_ms = int(config.get("hardware_offset_ms", 0)) SERIAL_PORT = config.get("serial_port", SERIAL_PORT)
except Exception: hardware_offset_ms = config.get("hardware_offset_ms", 0)
hardware_offset_ms = 0 except json.JSONDecodeError:
print("⚠️ Failed to parse config.json. Using defaults.")
else:
config = DEFAULT_CONFIG
def find_teensy_serial(): def auto_detect_serial_port():
for dev in os.listdir('/dev'): for dev in os.listdir("/dev"):
if dev.startswith('ttyACM') or dev.startswith('ttyUSB'): if dev.startswith("ttyACM") or dev.startswith("ttyUSB"):
return f'/dev/{dev}' return f"/dev/{dev}"
return None return SERIAL_PORT
def parse_ltc_line(line): def parse_ltc_line(line):
match = re.match(r"\[(LOCK|FREE)\]\s+(\d{2}):(\d{2}):(\d{2})[:;](\d{2})\s+\|\s+([\d.]+)fps", line) match = re.match(r"\[(LOCK|FREE)\]\s+(\d{2}):(\d{2}):(\d{2})[:;](\d{2})\s+\|\s+([\d.]+)fps", line)
if not match: if not match:
return None return None
status, hh, mm, ss, ff, fps = match.groups()
return { return {
"status": status, "lock": match.group(1),
"hours": int(hh), "hours": int(match.group(2)),
"minutes": int(mm), "minutes": int(match.group(3)),
"seconds": int(ss), "seconds": int(match.group(4)),
"frames": int(ff), "frames": int(match.group(5)),
"frame_rate": float(fps) "fps": float(match.group(6))
} }
def serial_thread(port, baud, q): def serial_reader(port, baud):
try: global latest_line, latest_timestamp
ser = serial.Serial(port, baud, timeout=1) ser = serial.Serial(port, baud, timeout=1)
while True: while True:
line = ser.readline().decode(errors='ignore').strip() line = ser.readline().decode(errors='ignore').strip()
timestamp = datetime.datetime.now() if line:
parsed = parse_ltc_line(line) with line_lock:
if parsed: latest_line = line
q.put((parsed, timestamp)) latest_timestamp = datetime.datetime.now()
except Exception as e:
print(f"Serial thread error: {e}")
def get_system_time():
return datetime.datetime.now()
def format_time(dt):
return dt.strftime("%H:%M:%S.%f")[:-3]
def run_curses(stdscr): def run_curses(stdscr):
global FRAME_RATE, sync_pending, SERIAL_PORT, latest_ltc global displayed_jitter_ms, displayed_jitter_frames, last_jitter_update
global offset_history, lock_total, free_total
global ltc_locked, lock_stable_since, sync_enabled
curses.curs_set(0) curses.curs_set(0)
stdscr.nodelay(True) stdscr.nodelay(True)
stdscr.timeout(50) stdscr.timeout(100)
load_config() serial_port = auto_detect_serial_port()
stdscr.addstr(1, 2, f"NTP Timeturner v1.3")
SERIAL_PORT = find_teensy_serial() stdscr.addstr(2, 2, f"Using Serial Port: {serial_port}")
if not SERIAL_PORT:
stdscr.addstr(0, 0, "❌ No serial device found.")
stdscr.refresh() stdscr.refresh()
time.sleep(2)
return
thread = threading.Thread(target=serial_thread, args=(SERIAL_PORT, BAUD_RATE, ltc_data_queue), daemon=True) reader_thread = Thread(target=serial_reader, args=(serial_port, BAUD_RATE), daemon=True)
thread.start() reader_thread.start()
lock_count = 0
free_count = 0
last_displayed_frame = ""
sync_allowed = False
last_frame = None
while True: while True:
try: now = datetime.datetime.now()
while not ltc_data_queue.empty(): with line_lock:
parsed, arrival_time = ltc_data_queue.get_nowait() line = latest_line
latest_ltc = (parsed, arrival_time) timestamp = latest_timestamp
FRAME_RATE = parsed["frame_rate"] parsed = parse_ltc_line(line) if line else None
status = parsed["status"]
if status == "LOCK":
lock_total += 1
if not ltc_locked:
lock_stable_since = time.time()
ltc_locked = True
elif time.time() - lock_stable_since > 1.0:
sync_enabled = True
else:
free_total += 1
ltc_locked = False
sync_enabled = False
lock_stable_since = None
offset_history.clear()
if ltc_locked and sync_enabled:
offset_ms = (get_system_time() - arrival_time).total_seconds() * 1000 - hardware_offset_ms
offset_frames = offset_ms / (1000 / FRAME_RATE)
offset_history.append((offset_ms, offset_frames))
if sync_pending and ltc_locked and sync_enabled:
do_sync(stdscr, parsed, arrival_time)
sync_pending = False
stdscr.erase() stdscr.erase()
stdscr.addstr(0, 2, "NTP Timeturner v1.2") stdscr.addstr(1, 2, f"NTP Timeturner v1.3")
stdscr.addstr(1, 2, f"Using Serial Port: {SERIAL_PORT}") stdscr.addstr(2, 2, f"Using Serial Port: {serial_port}")
if latest_ltc: if parsed:
parsed, arrival_time = latest_ltc lock_state = parsed["lock"]
stdscr.addstr(3, 2, f"LTC Status : {parsed['status']}") if lock_state == "LOCK":
stdscr.addstr(4, 2, f"LTC Timecode : {parsed['hours']:02}:{parsed['minutes']:02}:{parsed['seconds']:02}:{parsed['frames']:02}") lock_count += 1
stdscr.addstr(5, 2, f"Frame Rate : {FRAME_RATE:.2f}fps")
stdscr.addstr(6, 2, f"System Clock : {format_time(get_system_time())}")
if ltc_locked and sync_enabled and offset_history:
avg_ms = sum(x[0] for x in offset_history) / len(offset_history)
avg_frames = sum(x[1] for x in offset_history) / len(offset_history)
if abs(avg_ms) < 10:
color = curses.color_pair(2)
elif abs(avg_ms) < 40:
color = curses.color_pair(3)
else: else:
color = curses.color_pair(1) free_count += 1
stdscr.attron(color) stdscr.addstr(4, 2, f"LTC Status : {lock_state}", curses.color_pair(2 if lock_state == "LOCK" else 3))
stdscr.addstr(7, 2, f"Sync Offset : {avg_ms:+.0f} ms ({avg_frames:+.0f} frames)")
stdscr.attroff(color)
elif parsed["status"] == "FREE":
stdscr.attron(curses.color_pair(3))
stdscr.addstr(7, 2, "⚠️ LTC UNSYNCED — offset unavailable")
stdscr.attroff(curses.color_pair(3))
else:
stdscr.addstr(7, 2, "Sync Offset : …")
total = lock_total + free_total timecode_str = f"{parsed['hours']:02}:{parsed['minutes']:02}:{parsed['seconds']:02}:{parsed['frames']:02}"
lock_pct = (lock_total / total) * 100 if total else 0 stdscr.addstr(5, 2, f"LTC Timecode : {timecode_str}")
if ltc_locked and sync_enabled: stdscr.addstr(6, 2, f"Frame Rate : {parsed['fps']:.2f}fps")
stdscr.addstr(8, 2, f"Lock Ratio : {lock_pct:.1f}% LOCK")
else:
stdscr.attron(curses.color_pair(3))
stdscr.addstr(8, 2, f"Lock Ratio : {lock_pct:.1f}% (not stable)")
stdscr.attroff(curses.color_pair(3))
else:
stdscr.addstr(3, 2, "LTC Status : (waiting)")
stdscr.addstr(4, 2, "LTC Timecode : …")
stdscr.addstr(5, 2, "Frame Rate : …")
stdscr.addstr(6, 2, f"System Clock : {format_time(get_system_time())}")
stdscr.addstr(7, 2, "Sync Offset : …")
stdscr.addstr(8, 2, "Lock Ratio : …")
if sync_enabled: # Approximate LTC timecode as a datetime
stdscr.addstr(10, 2, "[S] Set system clock to LTC [Ctrl+C] Quit") ltc_time = timestamp.replace(
else:
stdscr.addstr(10, 2, "(Sync disabled — LTC not locked) [Ctrl+C] Quit")
stdscr.refresh()
key = stdscr.getch()
if key in (ord('s'), ord('S')) and latest_ltc and sync_enabled:
sync_pending = True
except KeyboardInterrupt:
break
except Exception as e:
stdscr.addstr(13, 2, f"⚠️ Error: {e}")
stdscr.refresh()
time.sleep(1)
def do_sync(stdscr, parsed, arrival_time):
try:
ms = int((parsed["frames"] / parsed["frame_rate"]) * 1000)
sync_time = arrival_time.replace(
hour=parsed["hours"], hour=parsed["hours"],
minute=parsed["minutes"], minute=parsed["minutes"],
second=parsed["seconds"], second=parsed["seconds"],
microsecond=(ms + hardware_offset_ms) * 1000 microsecond=int((parsed["frames"] / parsed["fps"]) * 1_000_000)
) )
timestamp = sync_time.strftime("%H:%M:%S.%f")[:-3]
subprocess.run(["sudo", "date", "-s", timestamp], check=True) # Show system clock
stdscr.addstr(13, 2, f"✔️ Synced to LTC: {timestamp}") system_time = datetime.datetime.now()
except Exception as e: stdscr.addstr(7, 2, f"System Clock : {system_time.strftime('%H:%M:%S.%f')[:-3]}")
stdscr.addstr(13, 2, f"❌ Sync failed: {e}")
# Only calculate jitter if LOCKED
if lock_state == "LOCK":
offset_ms = (system_time - ltc_time).total_seconds() * 1000 - hardware_offset_ms
jitter_samples.append(offset_ms)
if time.time() - last_jitter_update >= 1.0:
avg_offset = sum(jitter_samples) / len(jitter_samples)
displayed_jitter_ms = avg_offset
frame_error = round((avg_offset / 1000) * parsed["fps"])
displayed_jitter_frames = frame_error
last_jitter_update = time.time()
if displayed_jitter_ms is not None:
stdscr.addstr(8, 2, f"Sync Jitter : {displayed_jitter_ms:+.0f} ms ({displayed_jitter_frames:+} frames)",
curses.color_pair(0 if abs(displayed_jitter_ms) < 5 else 3))
# Compare timecode match
ltc_str = ltc_time.strftime('%H:%M:%S')
sys_str = system_time.strftime('%H:%M:%S')
if ltc_str == sys_str and parsed["frames"] == int((system_time.microsecond / 1_000_000) * parsed["fps"]):
stdscr.addstr(9, 2, "Timecode Match: MATCHED", curses.color_pair(2))
else:
stdscr.addstr(9, 2, "Timecode Match: OUT OF SYNC", curses.color_pair(3))
sync_allowed = True
else:
stdscr.addstr(8, 2, f"Sync Jitter : -- (FREE mode)", curses.color_pair(3))
stdscr.addstr(9, 2, f"Timecode Match: UNKNOWN", curses.color_pair(3))
sync_allowed = False
total = lock_count + free_count
if total > 0:
lock_ratio = (lock_count / total) * 100
stdscr.addstr(10, 2, f"Lock Ratio : {lock_ratio:.1f}% LOCK", curses.color_pair(2 if lock_ratio > 90 else 3))
else:
stdscr.addstr(4, 2, "Waiting for LTC data...", curses.color_pair(3))
stdscr.addstr(12, 2, "[S] Set system clock to LTC [Ctrl+C] Quit")
key = stdscr.getch()
if key in (ord('s'), ord('S')) and parsed and sync_allowed:
os.system(f"sudo date -s \"{timecode_str.replace(':', ':')}\"")
stdscr.refresh()
time.sleep(0.05)
def main():
curses.wrapper(start_curses)
def start_curses(stdscr):
curses.start_color()
curses.init_pair(1, curses.COLOR_WHITE, curses.COLOR_BLACK)
curses.init_pair(2, curses.COLOR_GREEN, curses.COLOR_BLACK)
curses.init_pair(3, curses.COLOR_RED, curses.COLOR_BLACK)
run_curses(stdscr)
if __name__ == "__main__": if __name__ == "__main__":
curses.initscr() main()
curses.start_color()
curses.init_pair(1, curses.COLOR_RED, curses.COLOR_BLACK)
curses.init_pair(2, curses.COLOR_GREEN, curses.COLOR_BLACK)
curses.init_pair(3, curses.COLOR_YELLOW, curses.COLOR_BLACK)
curses.wrapper(run_curses)