diff --git a/settings.json b/settings.json index 7c2df7d..de89fe0 100644 --- a/settings.json +++ b/settings.json @@ -3,7 +3,7 @@ "scan_limit": 60, "max_range": 100, "geometry": "1200x1024+85+163", - "last_selected_scenario": "scenario_9g", + "last_selected_scenario": "scenario2", "connection": { "target": { "type": "tftp", diff --git a/target_simulator/gui/payload_router.py b/target_simulator/gui/payload_router.py index 200fc8f..b2f46d7 100644 --- a/target_simulator/gui/payload_router.py +++ b/target_simulator/gui/payload_router.py @@ -106,7 +106,11 @@ class DebugPayloadRouter: scenario_dict = { "timetag": int(parsed.scenario.timetag), + "flags": int(parsed.scenario.flags), + "mode": int(parsed.scenario.mode), "platform_azimuth": float(parsed.scenario.platform_azimuth), + "ant_nav_az": float(parsed.scenario.ant_nav_az), + "ant_nav_el": float(parsed.scenario.ant_nav_el), "vx": float(parsed.scenario.vx), "vy": float(parsed.scenario.vy), "vz": float(parsed.scenario.vz), diff --git a/target_simulator/gui/sfp_debug_window.py b/target_simulator/gui/sfp_debug_window.py index a878204..bf89267 100644 --- a/target_simulator/gui/sfp_debug_window.py +++ b/target_simulator/gui/sfp_debug_window.py @@ -624,6 +624,10 @@ class SfpDebugWindow(tk.Toplevel): order = [ ("timetag", "timetag", ""), ("platform_azimuth", "platform_azimuth", "°"), + ("ant_nav_az", "ant_nav_az", "°"), + ("ant_nav_el", "ant_nav_el", "°"), + ("flags", "flags", ""), + ("mode", "mode", ""), ("vx", "vx", "ft/s"), ("vy", "vy", "ft/s"), ("vz", "vz", "ft/s"), @@ -642,6 +646,25 @@ class SfpDebugWindow(tk.Toplevel): display_val = f"{conv:.6f} ° ({val:.6f} rad)" else: display_val = val + elif key in ("ant_nav_az", "ant_nav_el"): + # antenna angles, display degrees with raw radians + if isinstance(val, (int, float)): + conv = to_deg(val) + display_val = f"{conv:.6f} ° ({val:.6f} rad)" + else: + display_val = val + elif key == "flags": + # show flags as int and hex + try: + display_val = f"{int(val)} (0x{int(val):X})" + except Exception: + display_val = str(val) + elif key == "mode": + # mode is an integer code + try: + display_val = str(int(val)) + except Exception: + display_val = str(val) elif key in ("vx", "vy", "vz"): if isinstance(val, (int, float)): conv = m_s_to_ft_s(val)