Remove old nimble_tray and use new trays from nimble_builder

Wakoma · May 16, 2024 · 4997946 · 4997946
1 parent 9654a18
commit 4997946
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 99 deletions.
diff --git a/mechanical/components/cadquery/nimble_tray.py b/mechanical/components/cadquery/nimble_tray.py
diff --git a/nimble_orchestration/configuration.py b/nimble_orchestration/configuration.py
@@ -198,7 +198,7 @@ def _trays(self):
         long and messy!
         """
 
-        source = os.path.join(REL_MECH_DIR, "components/cadquery/nimble_tray.py")
+        source = os.path.join(REL_MECH_DIR, "components/cadquery/tray_6in.py")
         source = posixpath.normpath(source)
         trays = []
         z_offset = self._rack_params.bottom_tray_offet
@@ -220,8 +220,7 @@ def _trays(self):
                 source_files=[source],
                 parameters={
                     "height_in_u": device.height_in_u,
-                    "tray_width": self._rack_params.tray_width,
-                    "tray_depth": self._rack_params.tray_depth,
+                    "shelf_type": "generic",
                 },
                 application="cadquery"
             )

diff --git a/server/nimble_server.py b/server/nimble_server.py
@@ -213,8 +213,9 @@ def read_item(number_of_units: float = 2, tray_width: float = 115, tray_depth: f
 
     import cadquery as cq
 
+    ## NOTE that tray_width and tray_depth are no longer used after moving to tray_6in.py
     # Run the script with customized parameters
-    tray = cqgi_model_script("nimble_tray.py", {"height_in_u": number_of_units, "tray_width": tray_width, "tray_depth": tray_depth})
+    tray = cqgi_model_script("tray_6in.py", {"height_in_u": number_of_units, "shelf_type" = "generic"})
 
     # In case there was an error
     if (type(tray).__name__ == "HTMLResponse"):