From 3fe352a27c52af066123c1e37075f35affb7efa8 Mon Sep 17 00:00:00 2001 From: ac Date: Tue, 1 Jul 2025 17:17:19 +1000 Subject: [PATCH] FIX: remove logo from xlsx bom, remove erroneous text from foot_gen script --- .scripts/foot_gen.py | 6 ------ configs/default.kibot.yaml | 2 -- 2 files changed, 8 deletions(-) diff --git a/.scripts/foot_gen.py b/.scripts/foot_gen.py index f285e5f..cf9ff2e 100644 --- a/.scripts/foot_gen.py +++ b/.scripts/foot_gen.py @@ -186,13 +186,7 @@ pcb.Add(dummy) # Save and export step of board + mating connectors SaveBoard("test/test.kicad_pcb", pcb) -<<<<<<< HEAD -final_model_path = sys.path[0] + "/../../libs/melon3d/" + foot_path + ".3dshapes/" + foot_name + ".wrl" final_model_path_stp = sys.path[0] + "/../../libs/melon3d/" + foot_path + ".3dshapes/" + foot_name + ".stp" -os.system("kicad-cli pcb export vrml -f --units 'tenths' --user-origin " + str(ToMM(brd_cent.x)) + "x" + str(ToMM(brd_cent.y)) + "mm -o " + final_model_path + " test/test.kicad_pcb") -======= -final_model_path_stp = sys.path[0] + "/../../libs/melon3d/" + foot_path + ".3dshapes/" + foot_name + ".stp" ->>>>>>> dev os.system("kicad-cli pcb export step -f --subst-models --user-origin " + str(ToMM(brd_cent.x)) + "x" + str(ToMM(brd_cent.y)) + "mm -o " + final_model_path_stp + " test/test.kicad_pcb") # Generate footprint diff --git a/configs/default.kibot.yaml b/configs/default.kibot.yaml index 8e4e607..80b02cc 100644 --- a/configs/default.kibot.yaml +++ b/configs/default.kibot.yaml @@ -103,8 +103,6 @@ outputs: disable_run_by_default: _bom options: xlsx: - # this is a relative path unfortunately - logo: ".gitlab/micromelon_default/meta/icon.png" hide_pcb_info: true hide_stats_info: true format: "XLSX"