diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index e0d25f0dc..8b301742c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -46,12 +46,14 @@ body: options: - X1 Carbon - X1 + - X1E - P1S - P1P - P2S - A1 - A1 Mini - H2D + - H2D Pro - H2C - H2S - Multiple printers diff --git a/backend/app/services/camera.py b/backend/app/services/camera.py index 5f3e4d709..a146d270a 100644 --- a/backend/app/services/camera.py +++ b/backend/app/services/camera.py @@ -74,7 +74,7 @@ def supports_rtsp(model: str | None) -> bool: - O1D: H2D - O1C: H2C - O1S: H2S - - O1E: H2D Pro + - O1E, O2D: H2D Pro - N7: P2S """ if model: @@ -83,7 +83,7 @@ def supports_rtsp(model: str | None) -> bool: if model_upper.startswith(("X1", "H2", "P2")): return True # Internal codes for RTSP models - if model_upper in ("BL-P001", "C13", "O1D", "O1C", "O1S", "O1E", "N7"): + if model_upper in ("BL-P001", "C13", "O1D", "O1C", "O1S", "O1E", "O2D", "N7"): return True # A1/P1 and unknown models use chamber image protocol return False diff --git a/backend/app/services/firmware_check.py b/backend/app/services/firmware_check.py index 01e144774..6bcca67fe 100644 --- a/backend/app/services/firmware_check.py +++ b/backend/app/services/firmware_check.py @@ -44,6 +44,7 @@ MODEL_TO_API_KEY = { "X1E": "x1e", "H2D Pro": "h2d-pro", "H2D-Pro": "h2d-pro", + "H2DPRO": "h2d-pro", } # Reverse mapping: API key to model codes diff --git a/backend/app/services/printer_manager.py b/backend/app/services/printer_manager.py index 4457b5fb4..88f3d9933 100644 --- a/backend/app/services/printer_manager.py +++ b/backend/app/services/printer_manager.py @@ -29,6 +29,7 @@ CHAMBER_TEMP_SUPPORTED_MODELS = frozenset( "O1C", # H2C "O1S", # H2S "O1E", # H2D Pro + "O2D", # H2D Pro (alternate code) "N7", # P2S ] ) diff --git a/backend/app/utils/printer_models.py b/backend/app/utils/printer_models.py index f412bf474..ca33c8135 100644 --- a/backend/app/utils/printer_models.py +++ b/backend/app/utils/printer_models.py @@ -39,7 +39,8 @@ PRINTER_MODEL_ID_MAP = { "A04": "A1 Mini", # H2D series (Office/H series) "O1D": "H2D", - "O2D": "H2D Pro", + "O1E": "H2D Pro", # Some devices report O1E + "O2D": "H2D Pro", # Some devices report O2D } diff --git a/frontend/src/pages/PrintersPage.tsx b/frontend/src/pages/PrintersPage.tsx index 94cb0cd48..209acaaf2 100644 --- a/frontend/src/pages/PrintersPage.tsx +++ b/frontend/src/pages/PrintersPage.tsx @@ -3550,6 +3550,8 @@ function AddPrinterModal({ const modelMap: Record = { // H2 Series 'O1D': 'H2D', + 'O1E': 'H2D Pro', // Some devices report O1E + 'O2D': 'H2D Pro', // Some devices report O2D 'O1C': 'H2C', 'O1S': 'H2S', // X1 Series @@ -3573,6 +3575,7 @@ function AddPrinterModal({ 'A1': 'A1', 'A1 Mini': 'A1 Mini', 'H2D': 'H2D', + 'H2D Pro': 'H2D Pro', 'H2C': 'H2C', 'H2S': 'H2S', }; @@ -3773,6 +3776,7 @@ function AddPrinterModal({ + @@ -4132,6 +4136,7 @@ function EditPrinterModal({ +