easyeda 0.0.59 → 0.0.61

package/dist/{chunk-X4DC7FIK.js → chunk-MRLBLBCQ.js}

@@ -1581,20 +1581,51 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, { useModelCdn, shouldRecente
       name: portNumber
     });
     if (pad.holeRadius !== void 0 && mil2mm(pad.holeRadius) !== 0) {
-      soupElements.push(
-        pcb_plated_hole.parse({
-          type: "pcb_plated_hole",
-          pcb_plated_hole_id: `pcb_plated_hole_${index + 1}`,
+      const commonPlatedHoleProps = {
+        type: "pcb_plated_hole",
+        pcb_plated_hole_id: `pcb_plated_hole_${index + 1}`,
+        x: mil2mm(pad.center.x),
+        y: mil2mm(pad.center.y),
+        layers: ["top"],
+        port_hints: [portNumber],
+        pcb_component_id: "pcb_component_1",
+        pcb_port_id: `pcb_port_${index + 1}`
+      };
+      let additionalPlatedHoleProps;
+      if (pad.shape === "OVAL") {
+        const largestOuterDimensionName = mil2mm(pad.width) > mil2mm(pad.height) ? "width" : "height";
+        const smallestOuterDimension = Math.min(
+          mil2mm(pad.width),
+          mil2mm(pad.height)
+        );
+        const largestOuterDimension = Math.max(
+          mil2mm(pad.width),
+          mil2mm(pad.height)
+        );
+        const distanceFromOuterPlatingToHole = smallestOuterDimension / 2 - mil2mm(pad.holeRadius);
+        const largestInnerDimension = largestOuterDimension - distanceFromOuterPlatingToHole * 2;
+        const smallestInnerDimension = mil2mm(pad.holeRadius) * 2;
+        const innerWidth = largestOuterDimensionName === "width" ? largestInnerDimension : smallestInnerDimension;
+        const innerHeight = largestOuterDimensionName === "height" ? largestInnerDimension : smallestInnerDimension;
+        additionalPlatedHoleProps = {
+          shape: "pill",
+          outer_width: mil2mm(pad.width),
+          outer_height: mil2mm(pad.height),
+          hole_width: innerWidth,
+          hole_height: innerHeight
+        };
+      } else {
+        additionalPlatedHoleProps = {
           shape: "circle",
-          x: mil2mm(pad.center.x),
-          y: mil2mm(pad.center.y),
           hole_diameter: mil2mm(pad.holeRadius) * 2,
           outer_diameter: mil2mm(pad.width),
-          radius: mil2mm(pad.holeRadius),
-          port_hints: [portNumber],
-          pcb_component_id: "pcb_component_1",
-          pcb_port_id: `pcb_port_${index + 1}`,
-          layers: ["top"]
+          radius: mil2mm(pad.holeRadius)
+        };
+      }
+      soupElements.push(
+        pcb_plated_hole.parse({
+          ...commonPlatedHoleProps,
+          ...additionalPlatedHoleProps
         })
       );
     } else {
@@ -2370,16 +2401,14 @@ var generateFootprintTsx = (circuitJson) => {
     }
   }
   for (const platedHole of platedHoles) {
-    if (platedHole.shape === "oval") {
+    if (platedHole.shape === "oval" || platedHole.shape === "pill") {
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" outerHeight="${mmStr(platedHole.outer_height)}" outerWidth="${mmStr(platedHole.outer_width)}" holeHeight="${mmStr(platedHole.hole_height)}" holeWidth="${mmStr(platedHole.hole_width)}" height="${mmStr(platedHole.hole_height)}" shape="oval" />`
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" outerHeight="${mmStr(platedHole.outer_height)}" outerWidth="${mmStr(platedHole.outer_width)}" holeHeight="${mmStr(platedHole.hole_height)}" holeWidth="${mmStr(platedHole.hole_width)}" height="${mmStr(platedHole.hole_height)}" shape="${platedHole.shape}" />`
       );
     } else if (platedHole.shape === "circle") {
       elementStrings.push(
         `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" outerDiameter="${mmStr(platedHole.outer_diameter)}" holeDiameter="${mmStr(platedHole.hole_diameter)}" shape="circle" />`
       );
-    } else if (platedHole.shape === "pill") {
-      console.warn("Unhandled pill hole in conversion (needs implementation)");
     }
   }
   for (const smtPad of smtPads) {
@@ -2632,4 +2661,4 @@ export {
   convertRawEasyToTsx,
   convertEasyEdaJsonToVariousFormats
 };
-//# sourceMappingURL=chunk-X4DC7FIK.js.map
+//# sourceMappingURL=chunk-MRLBLBCQ.js.map