JLC2KiCadLib 1.0.33__tar.gz → 1.0.36__tar.gz

jlc2kicadlib-1.0.36/JLC2KiCadLib/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.0.36"

{jlc2kicadlib-1.0.33 → jlc2kicadlib-1.0.36}/JLC2KiCadLib/footprint/footprint.py

@@ -17,7 +17,7 @@ def create_footprint(
     skip_existing,
     models,
 ):
-    logging.info("creating footprint ...")
+    logging.info("Creating footprint ...")
 
     (
         footprint_name,

{jlc2kicadlib-1.0.33 → jlc2kicadlib-1.0.36}/JLC2KiCadLib/footprint/footprint_handlers.py

@@ -1,9 +1,19 @@
 import json
 import logging
-from math import pow, acos, pi
+from math import pow, acos, pi, sqrt
 import re
 
-from KicadModTree import *
+from KicadModTree import (
+    Line,
+    Pad,
+    Polygon,
+    Vector2D,
+    Arc,
+    Circle,
+    RectFill,
+    Text,
+    RectLine,
+)
 from .model3d import get_WrlModel, get_StepModel
 
 __all__ = [
@@ -79,106 +89,113 @@ def h_PAD(data, kicad_mod, footprint_info):
     """
     Append a pad to the footprint
 
-    data : {
+    data : [
         0 : shape type
         1 : pad position x
-        1 : pad position y
+        2 : pad position y
         3 : pad size x
         4 : pad size y
-        5 :
+        5 : layer
         6 : pad number
         7 : drill size
-        8 :
-    }
+        8 : Polygon nodes "skipped for some shapes"
+        9 : rotation
+        10 :
+        11 : drill offset
+        12 :
+        13 :
+        14 :
+        15 :
+        16 :
+        17 : ? position
+    ]
     """
-    # pylint: disable=unused-argument
-
-    shape_correspondance = {
-        "OVAL": "SHAPE_OVAL",
-        "RECT": "SHAPE_RECT",
-        "ELLIPSE": "SHAPE_CIRCLE",
-        "POLYGON": "SHAPE_CUSTOM",
-    }
 
-    data[1] = mil2mm(data[1])
-    data[2] = mil2mm(data[2])
-    data[3] = mil2mm(data[3])
-    data[4] = mil2mm(data[4])
-    data[7] = mil2mm(data[7])
+    # PAD layer definition
+    TOPLAYER = "1"
+    BOTTOMLAYER = "2"
+    MULTILAYER = "11"
 
-    at = [data[1], data[2]]
-    size = [data[3], data[4]]
+    shape_type = data[0]
+    at = [mil2mm(data[1]), mil2mm(data[2])]
+    size = [mil2mm(data[3]), mil2mm(data[4])]
+    layer = data[5]
     pad_number = data[6]
+    drill_diameter = float(mil2mm(data[7])) * 2
+    drill_size = drill_diameter
+
+    # Some shape do not have coordinates, insert empty data to realign later index
+    if shape_type in ["ELLIPSE"]:
+        data.insert(8, "")
+
+    rotation = float(data[9])
+    drill_offset = float(mil2mm(data[11]))
+
     primitives = ""
 
-    if data[5] == "1":
+    if layer == MULTILAYER:
+        pad_type = Pad.TYPE_THT
+        pad_layer = Pad.LAYERS_THT
+    elif layer == TOPLAYER:
         pad_type = Pad.TYPE_SMT
         pad_layer = Pad.LAYERS_SMT
-        drill_size = 1
+    elif layer == BOTTOMLAYER:
+        pad_type = Pad.TYPE_SMT
+        pad_layer = ["B.Cu", "B.Mask", "B.Paste"]
     else:
-        pad_type = Pad.TYPE_THT
-        pad_layer = Pad.LAYERS_THT
-        drill_size = data[7] * 2
+        logging.warning(
+            f"footprint, h_PAD: Unrecognized pad layer. Using default SMT layer for pad {pad_number}"
+        )
+        pad_type = Pad.TYPE_SMT
+        pad_layer = Pad.LAYERS_SMT
 
     if data[0] == "OVAL":
-        shape = getattr(Pad, "SHAPE_OVAL")
-        rotation = float(data[9])
-        data[11] = mil2mm(data[11])
+        shape = Pad.SHAPE_OVAL
 
-        if data[11] == 0:
-            drill_size = data[7] * 2
-        elif (data[7] * 2 < data[11]) ^ (
+        if drill_offset == 0:
+            drill_size = drill_diameter
+        elif (drill_diameter < drill_offset) ^ (
             size[0] > size[1]
         ):  # invert the orientation of the drill hole if not in the same orientation as the pad shape
-            drill_size = [data[7] * 2, data[11]]
+            drill_size = [drill_diameter, drill_offset]
         else:
-            drill_size = [data[11], data[7] * 2]
+            drill_size = [drill_offset, drill_diameter]
 
     elif data[0] == "RECT":
-        shape = getattr(Pad, "SHAPE_RECT")
-        rotation = float(data[9])
-        data[11] = mil2mm(data[11])
+        shape = Pad.SHAPE_RECT
 
-        if data[5] == "1":
-            drill_size = 1
-        elif float(data[11]) == 0:  # Check if the hole is oval
-            pass
+        if drill_offset == 0:
+            drill_size = drill_diameter
         else:
-            drill_size = [data[7] * 2, data[11]]
+            drill_size = [drill_diameter, drill_offset]
 
     elif data[0] == "ELLIPSE":
-        shape = getattr(Pad, "SHAPE_CIRCLE")
-        # if pad is a circle, no rotation is specified
-        rotation = 0
+        shape = Pad.SHAPE_CIRCLE
 
     elif data[0] == "POLYGON":
-        shape = getattr(Pad, "SHAPE_CUSTOM")
-        data[11] = mil2mm(data[11])
-        rotation = float(data[9])
+        shape = Pad.SHAPE_CUSTOM
         points = []
         for i, coord in enumerate(data[8].split(" ")):
             points.append(mil2mm(coord) - at[i % 2])
         primitives = [Polygon(nodes=zip(points[::2], points[1::2]))]
         size = [0.1, 0.1]
-        rotation = 0
 
-        if float(data[11]) == 0:  # Check if the hole is oval
+        if drill_offset == 0:  # Check if the hole is oval
             drill_size = 1
         else:
-            drill_size = [data[7] * 2, data[11]]
+            drill_size = [drill_diameter, drill_offset]
 
     else:
         logging.error(
-            "footprint handler, pad : no correspondance found, using default SHAPE_OVAL"
+            f"footprint handler, pad : no correspondance found, using default SHAPE_OVAL for pad {pad_number}"
         )
-        shape = getattr(Pad, "SHAPE_OVAL")
-        rotation = float(data[9])
+        shape = Pad.SHAPE_OVAL
 
     # update footprint borders
-    footprint_info.max_X = max(footprint_info.max_X, data[1])
-    footprint_info.min_X = min(footprint_info.min_X, data[1])
-    footprint_info.max_Y = max(footprint_info.max_Y, data[2])
-    footprint_info.min_Y = min(footprint_info.min_Y, data[2])
+    footprint_info.max_X = max(footprint_info.max_X, at[0])
+    footprint_info.min_X = min(footprint_info.min_X, at[0])
+    footprint_info.max_Y = max(footprint_info.max_Y, at[1])
+    footprint_info.min_Y = min(footprint_info.min_Y, at[1])
 
     kicad_mod.append(
         Pad(
@@ -196,49 +213,50 @@ def h_PAD(data, kicad_mod, footprint_info):
 
 
 def h_ARC(data, kicad_mod, footprint_info):
-    # append an Arc to the footprint
+    """
+    append an Arc to the footprint
+    """
+    # pylint: disable=unused-argument
+
     try:
-        # parse the data
-        if data[2][0] == "M":
-            startX, startY, midX, midY, _, reversed, direction, endX, endY = [
-                val
-                for val in data[2]
-                .replace("M", "")
-                .replace("A", "")
-                .replace(",", " ")
-                .split(" ")
-                if val
-            ]
-        elif data[3][0] == "M":
-            startX, startY, midX, midY, _, reversed, direction, endX, endY = [
-                val
-                for val in data[3]
-                .replace("M", "")
-                .replace("A", "")
-                .replace(",", " ")
-                .split(" ")
-                if val
-            ]
+
+        # "S$xx" is sometimes inserted at index 2 ?
+        if "$" in data[2]:
+            svg_path = data[3]
         else:
-            logging.warning(
-                "footprint handler, h_ARC : failed to parse footprint ARC data"
-            )
+            svg_path = data[2]
+
+        # Regular expression to match ARC pattern
+        # coordinates can sometime be separated by a "," instead of a space, therefore we match it using [\s,*?]
+        pattern = r"M\s*([\d\.\-]+)[\s,*?]([\d\.\-]+)\s?A\s*([\d\.\-]+)[\s,*?]([\d\.\-]+) ([\d\.\-]+) (\d) (\d) ([\d\.\-]+)[\s,*?]([\d\.\-]+)"
+
+        match = re.search(pattern, svg_path)
+
+        if not match:
+            logging.error("footprint handler, h_ARC: Failed to parse ARC")
+            return
+
+        # Extract values
+        start_x, start_y = float(match.group(1)), float(match.group(2))
+        rx, ry = float(match.group(3)), float(match.group(4))
+        _ = float(match.group(5))  # rotation ?
+        large_arc_flag = int(match.group(6))
+        sweep_flag = int(match.group(7))
+        end_x, end_y = float(match.group(8)), float(match.group(9))
+
         width = data[0]
 
         width = mil2mm(width)
-        startX = mil2mm(startX)
-        startY = mil2mm(startY)
-        midX = mil2mm(midX)
-        midY = mil2mm(midY)
-        endX = mil2mm(endX)
-        endY = mil2mm(endY)
-
-        if midX != midY:
-            logging.warning("Unexpected arc, midX != midY")
-
-        start = [startX, startY]
-        end = [endX, endY]
-        if direction == "0":
+        start_x = mil2mm(start_x)
+        start_y = mil2mm(start_y)
+        mid_x = mil2mm(rx)
+        mid_y = mil2mm(ry)
+        end_x = mil2mm(end_x)
+        end_y = mil2mm(end_y)
+
+        start = [start_x, start_y]
+        end = [end_x, end_y]
+        if sweep_flag == 0:
             start, end = end, start
 
         # find the midpoint of start and end
@@ -247,12 +265,12 @@ def h_ARC(data, kicad_mod, footprint_info):
         vec1 = Vector2D(mid[0] - start[0], mid[1] - start[1])
 
         # create vector that's normal to vec1:
-        length_squared = pow(midX, 2) - pow(vec1.distance_to((0, 0)), 2)
+        length_squared = mid_x * mid_y - pow(vec1.distance_to((0, 0)), 2)
         if length_squared < 0:
             length_squared = 0
-            reversed = "1"
+            large_arc_flag = 1
 
-        if reversed == "1":
+        if large_arc_flag == 1:
             vec2 = vec1.rotate(-90)
         else:
             vec2 = vec1.rotate(90)
@@ -285,25 +303,19 @@ def h_ARC(data, kicad_mod, footprint_info):
         try:
             layer = layer_correspondance[data[1]]
         except KeyError:
-            logging.warning("footprint handler, h_ARC : layer correspondance not found")
-            layer = "F.SilkS"
-        if reversed == "1":
-            kicad_mod.append(
-                Arc(
-                    start=start,
-                    end=end,
-                    width=width,
-                    angle=360 - angle,
-                    center=cen,
-                    layer=layer,
-                )
-            )
-        else:
-            kicad_mod.append(
-                Arc(start=start, end=end, width=width, center=cen, layer=layer)
+            logging.warning(
+                "footprint handler, h_ARC : layer correspondance not found. Adding arc on default F.Silks layer"
             )
+            layer = "F.SilkS"
 
-    except Exception as e:
+        if large_arc_flag == 1:
+            angle = 360 - angle
+
+        kicad_mod.append(
+            Arc(start=start, end=end, width=width, center=cen, layer=layer)
+        )
+
+    except Exception:
         logging.exception("footprint handler, h_ARC: failed to add ARC")
 
 

{jlc2kicadlib-1.0.33 → jlc2kicadlib-1.0.36}/JLC2KiCadLib/footprint/model3d.py

@@ -2,7 +2,7 @@ import requests
 import logging
 import os
 import re
-from KicadModTree import *
+from KicadModTree import Model
 
 wrl_header = """#VRML V2.0 utf8
 #created by JLC2KiCad_lib using the JLCPCB library

{jlc2kicadlib-1.0.33 → jlc2kicadlib-1.0.36}/JLC2KiCadLib/symbol/symbol.py

@@ -4,7 +4,6 @@ import re
 import os
 import logging
 
-from KicadModTree import *
 from .symbol_handlers import *
 
 
@@ -91,7 +90,7 @@ def create_symbol(
 
         filename = f"{output_dir}/{symbol_path}/{library_name}.kicad_sym"
 
-        logging.info(f"creating symbol {component_title} in {library_name}")
+        logging.info(f"Creating symbol {component_title} in {library_name}")
 
         kicad_symbol.drawing += f'''\n    (symbol "{component_title}_1"'''
 

{jlc2kicadlib-1.0.33 → jlc2kicadlib-1.0.36}/JLC2KiCadLib/symbol/symbol_handlers.py

@@ -109,6 +109,11 @@ def h_P(data, translation, kicad_symbol):
         length = round(mil2mm(abs(float(data[8].split("h")[-1]))), 3)
     elif rotation == 90 or rotation == 270:
         length = mil2mm(abs(float(data[8].split("v")[-1])))
+    else:
+        length = 2.54
+        logging.warning(
+            f'symbol : pin number {pinNumber} : "{pinName}" failed to find length. Using Default length'
+        )
 
     try:
         # If on pin name/number is not hidden, show set the synmbol hide property to 0

{jlc2kicadlib-1.0.33 → jlc2kicadlib-1.0.36}/JLC2KiCadLib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: JLC2KiCadLib
-Version: 1.0.33
+Version: 1.0.36
 Summary: JLC2KiCad_lib is a python script that generate a component library (symbol, footprint and 3D model) for KiCad from the JLCPCB/easyEDA library.
 Home-page: https://github.com/TousstNicolas/JLC2KiCad_lib
 Author: TousstNicolas

{jlc2kicadlib-1.0.33 → jlc2kicadlib-1.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: JLC2KiCadLib
-Version: 1.0.33
+Version: 1.0.36
 Summary: JLC2KiCad_lib is a python script that generate a component library (symbol, footprint and 3D model) for KiCad from the JLCPCB/easyEDA library.
 Home-page: https://github.com/TousstNicolas/JLC2KiCad_lib
 Author: TousstNicolas

jlc2kicadlib-1.0.33/JLC2KiCadLib/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.0.33"