cleaning

BerkeleyHCI · Apr 17, 2024 · 607a454 · 607a454
1 parent 78e9957
commit 607a454
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/electronics_lib/SwitchMatrix.py b/electronics_lib/SwitchMatrix.py
@@ -87,18 +87,18 @@ def _svgpcb_template(self) -> str:
       rowDiodeVias.push(diodeVia)
     }}
     allColWirePoints.push(colWirePoints)
-    }}
-
-    // Inter-row wiring
-    for (let xIndex=0; xIndex < allColWirePoints[0].length; xIndex++) {{
-      board.wire([
-        allColWirePoints[0][xIndex],
-        allColWirePoints[allColWirePoints.length - 1][xIndex]
-      ], traceSize, "F.Cu")
-    }}
+  }}
 
-    return obj
+  // Inter-row wiring
+  for (let xIndex=0; xIndex < allColWirePoints[0].length; xIndex++) {{
+    board.wire([
+      allColWirePoints[0][xIndex],
+      allColWirePoints[allColWirePoints.length - 1][xIndex]
+    ], traceSize, "F.Cu")
   }}
+
+  return obj
+}}
 """
 
   @init_in_parent

diff --git a/electronics_model/SvgPcbTemplateBlock.py b/electronics_model/SvgPcbTemplateBlock.py
@@ -54,7 +54,7 @@ def _svgpcb_footprint_block_path_of(self, block_path: List[str]) -> Optional[Tra
                             if block.full_path.startswith(block_path)]
         if len(candidate_blocks) != 1:
             return None
-        return candidate_blocks[0].full_path
+        return self._svgpcb_footprint_to_svgpcb(candidate_blocks[0].full_path)
 
     def _svgpcb_footprint_of(self, path: TransformUtil.Path) -> str:
         """Infrastructure method, returns the footprint for the output of _svgpcb_footprint_block_path_of.