Merge branch 'main' into dev

This commit is contained in:
andrewc
2025-02-03 15:37:02 +10:00

View File

@@ -110,7 +110,6 @@ for foot in saved:
path_split = vals[0].split(':') path_split = vals[0].split(':')
folder = sys.path[0] + "/../../libs/melonlib/"+ path_split[0] + ".pretty" folder = sys.path[0] + "/../../libs/melonlib/"+ path_split[0] + ".pretty"
load_foot = FootprintLoad(folder, path_split[1]) load_foot = FootprintLoad(folder, path_split[1])
print("Foot: ", vals[0], "; ", folder, ", ", path_split[1])
# foot.SetFPIDAsString(vals[0]) # foot.SetFPIDAsString(vals[0])
# Save the original postion of footprint + pads # Save the original postion of footprint + pads
orig_cent = foot.GetBoundingBox(False,False).Centre() orig_cent = foot.GetBoundingBox(False,False).Centre()
@@ -408,7 +407,7 @@ for i in range(len(corners)):
kicad_mod.append(Line(start=start, end=corners[j], layer='F.SilkS', width=0.1)) kicad_mod.append(Line(start=start, end=corners[j], layer='F.SilkS', width=0.1))
# kicad_mod.append(RectLine(start=[-brd_width/2,-brd_height/2], end=[brd_width/2,brd_height/2], layer='F.S', width=0.15)) # kicad_mod.append(RectLine(start=[-brd_width/2,-brd_height/2], end=[brd_width/2,brd_height/2], layer='F.SilkS', width=0.15))
final_model_path = "${KIPRJMOD}/../libs/melon3d/" + foot_path + ".3dshapes/" + foot_name + ".step" final_model_path = "${KIPRJMOD}/../libs/melon3d/" + foot_path + ".3dshapes/" + foot_name + ".step"