From b37d909d32e3f5b3dd98730e74825eab3c18bc4d Mon Sep 17 00:00:00 2001 From: Pavels Veretennikovs Date: Sun, 21 Aug 2022 00:06:09 +0300 Subject: [PATCH] fix(pcb): replace KISYS3DMOD with v6's KICAD6_3DMODEL_DIR --- .../MyModules.pretty/LM2596S_MODULE.kicad_mod | 8 ++--- .../OpenMowerMainboard.kicad_pcb | 32 +++++++++---------- .../Crystal_SMD_HC49-US.kicad_mod | 2 +- .../RP2040-QFN-56.kicad_mod | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Hardware/OpenMowerMainboard/MyModules.pretty/LM2596S_MODULE.kicad_mod b/Hardware/OpenMowerMainboard/MyModules.pretty/LM2596S_MODULE.kicad_mod index 7f4f49a7..10eaf713 100644 --- a/Hardware/OpenMowerMainboard/MyModules.pretty/LM2596S_MODULE.kicad_mod +++ b/Hardware/OpenMowerMainboard/MyModules.pretty/LM2596S_MODULE.kicad_mod @@ -35,22 +35,22 @@ (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) ) - (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" (offset (xyz 1 1.5 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) ) - (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" (offset (xyz 1 20 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) ) - (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" (offset (xyz 42 1.5 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) ) - (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" (offset (xyz 42 20 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) diff --git a/Hardware/OpenMowerMainboard/OpenMowerMainboard.kicad_pcb b/Hardware/OpenMowerMainboard/OpenMowerMainboard.kicad_pcb index 36cf1bc9..6138fe7b 100644 --- a/Hardware/OpenMowerMainboard/OpenMowerMainboard.kicad_pcb +++ b/Hardware/OpenMowerMainboard/OpenMowerMainboard.kicad_pcb @@ -509,7 +509,7 @@ (net 114 "/ESCs/MR_PHASE_U") (pinfunction "Pin_21") (pintype "passive") (tstamp 62c6f8ce-78e5-4ab3-bb01-2fcb0df87aa6)) (pad "22" thru_hole oval locked (at 42 5.5) (size 2.7 3.3) (drill 1.4) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_22") (pintype "passive") (tstamp 47890384-6eaa-420c-b9ae-e68a6a7f17b5)) - (model "${KISYS3DMOD}/Connector_Molex.3dshapes/Molex_Mini-Fit_Jr_5566-22A_2x11_P4.20mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_Molex.3dshapes/Molex_Mini-Fit_Jr_5566-22A_2x11_P4.20mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -621,7 +621,7 @@ (net 152 "Net-(F4-Pad1)") (pinfunction "Pin_7") (pintype "passive") (tstamp 6e416a78-df14-48ee-9842-e6e24081191e)) (pad "8" thru_hole oval locked (at 12.6 5.5) (size 2.7 3.3) (drill 1.4) (layers *.Cu *.Mask) (net 7 "unconnected-(J2-Pad8)") (pinfunction "Pin_8") (pintype "passive") (tstamp eac540a2-0555-4530-b9cb-9b037a65c0a7)) - (model "${KISYS3DMOD}/Connector_Molex.3dshapes/Molex_Mini-Fit_Jr_5566-08A_2x04_P4.20mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_Molex.3dshapes/Molex_Mini-Fit_Jr_5566-08A_2x04_P4.20mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -691,7 +691,7 @@ (net 1 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 4375ab9a-cebb-448a-bb75-1fa4fe977171)) (pad "2" thru_hole oval locked (at 0 5.5) (size 2.7 3.3) (drill 1.4) (layers *.Cu *.Mask) (net 151 "Net-(F2-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 9475edbb-286b-4bed-b5f0-0b68a18bdc52)) - (model "${KISYS3DMOD}/Connector_Molex.3dshapes/Molex_Mini-Fit_Jr_5566-02A_2x01_P4.20mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_Molex.3dshapes/Molex_Mini-Fit_Jr_5566-02A_2x01_P4.20mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -762,7 +762,7 @@ (net 49 "/RobotConnectors/HALL_SWITCH_3_5V") (pinfunction "Pin_2") (pintype "passive") (tstamp f40d350f-0d3e-4f8a-b004-d950f2f8f1ba)) (pad "3" thru_hole oval locked (at 5 0) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_3") (pintype "passive") (tstamp aa2ea573-3f20-43c1-aa99-1f9c6031a9aa)) - (model "${KISYS3DMOD}/Connector_JST.3dshapes/JST_XH_B3B-XH-A_1x03_P2.50mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B3B-XH-A_1x03_P2.50mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -833,7 +833,7 @@ (net 50 "/RobotConnectors/HALL_SWITCH_4_5V") (pinfunction "Pin_2") (pintype "passive") (tstamp abe07c9a-17c3-43b5-b7a6-ae867ac27ea7)) (pad "3" thru_hole oval locked (at 5 0) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_3") (pintype "passive") (tstamp 730b670c-9bcf-4dcd-9a8d-fcaa61fb0955)) - (model "${KISYS3DMOD}/Connector_JST.3dshapes/JST_XH_B3B-XH-A_1x03_P2.50mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B3B-XH-A_1x03_P2.50mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -906,7 +906,7 @@ (net 38 "/RobotConnectors/USS_1_ECHO_5V") (pinfunction "Pin_3") (pintype "passive") (tstamp f4a1ab68-998b-43e3-aa33-40b58210bc99)) (pad "4" thru_hole oval locked (at 7.5 0) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 12fa3c3f-3d14-451a-a6a8-884fd1b32fa7)) - (model "${KISYS3DMOD}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -979,7 +979,7 @@ (net 40 "/RobotConnectors/USS_2_ECHO_5V") (pinfunction "Pin_3") (pintype "passive") (tstamp de370984-7922-4327-a0ba-7cd613995df4)) (pad "4" thru_hole oval locked (at 7.5 0) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp b794d099-f823-4d35-9755-ca1c45247ee9)) - (model "${KISYS3DMOD}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -1052,7 +1052,7 @@ (net 42 "/RobotConnectors/USS_3_ECHO_5V") (pinfunction "Pin_3") (pintype "passive") (tstamp fad4c712-0a2e-465d-a9f8-83d26bd66e37)) (pad "4" thru_hole oval locked (at 7.5 0) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp e2b24e25-1a0d-434a-876b-c595b47d80d2)) - (model "${KISYS3DMOD}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -1125,7 +1125,7 @@ (net 44 "/RobotConnectors/USS_4_ECHO_5V") (pinfunction "Pin_3") (pintype "passive") (tstamp a0e7a81b-2259-4f8d-8368-ba75f2004714)) (pad "4" thru_hole oval locked (at 7.5 0) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 775e8983-a723-43c5-bf00-61681f0840f3)) - (model "${KISYS3DMOD}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -1198,7 +1198,7 @@ (net 46 "/RobotConnectors/USS_5_ECHO_5V") (pinfunction "Pin_3") (pintype "passive") (tstamp a599509f-fbb9-4db4-9adf-9e96bab1138d)) (pad "4" thru_hole oval locked (at 7.5 0) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 616287d9-a51f-498c-8b91-be46a0aa3a7f)) - (model "${KISYS3DMOD}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -1269,7 +1269,7 @@ (net 48 "/RobotConnectors/HALL_SWITCH_2_5V") (pinfunction "Pin_2") (pintype "passive") (tstamp 7a4ce4b3-518a-4819-b8b2-5127b3347c64)) (pad "3" thru_hole oval locked (at 5 0) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_3") (pintype "passive") (tstamp a9b3f6e4-7a6d-4ae8-ad28-3d8458e0ca1a)) - (model "${KISYS3DMOD}/Connector_JST.3dshapes/JST_XH_B3B-XH-A_1x03_P2.50mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B3B-XH-A_1x03_P2.50mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -1357,7 +1357,7 @@ (net 117 "/ESCs/MC_HALL_U") (pinfunction "Pin_4") (pintype "passive") (tstamp 7c00778a-4692-4f9b-87d5-2d355077ce1e)) (pad "5" thru_hole oval locked (at 8 0 180) (size 1.2 1.75) (drill 0.75) (layers *.Cu *.Mask) (net 1 "GND") (pinfunction "Pin_5") (pintype "passive") (tstamp 71f8d568-0f23-4ff2-8e60-1600ce517a48)) - (model "${KISYS3DMOD}/Connector_JST.3dshapes/JST_PH_B5B-PH-K_1x05_P2.00mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_PH_B5B-PH-K_1x05_P2.00mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) @@ -5558,22 +5558,22 @@ (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) ) - (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" (offset (xyz 1 1.5 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) ) - (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" (offset (xyz 1 20 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) ) - (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" (offset (xyz 42 1.5 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) ) - (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x01_P2.54mm_Vertical.step" (offset (xyz 42 20 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) diff --git a/Hardware/OpenMowerMainboard/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty/Crystal_SMD_HC49-US.kicad_mod b/Hardware/OpenMowerMainboard/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty/Crystal_SMD_HC49-US.kicad_mod index 1dfbc3c3..7b18e855 100644 --- a/Hardware/OpenMowerMainboard/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty/Crystal_SMD_HC49-US.kicad_mod +++ b/Hardware/OpenMowerMainboard/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty/Crystal_SMD_HC49-US.kicad_mod @@ -29,7 +29,7 @@ (fp_arc (start 3.015 0) (end 3.015 -2.115) (angle 180) (layer F.Fab) (width 0.1)) (pad 1 smd rect (at -4.5 0) (size 5.6 2.1) (layers F.Cu F.Paste F.Mask)) (pad 2 smd rect (at 4.5 0) (size 5.6 2.1) (layers F.Cu F.Paste F.Mask)) - (model ${KISYS3DMOD}/Crystal.3dshapes/Crystal_SMD_HC49-SD.wrl + (model ${KICAD6_3DMODEL_DIR}/Crystal.3dshapes/Crystal_SMD_HC49-SD.wrl (at (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0)) diff --git a/Hardware/OpenMowerMainboard/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty/RP2040-QFN-56.kicad_mod b/Hardware/OpenMowerMainboard/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty/RP2040-QFN-56.kicad_mod index b085e717..3e7dd557 100644 --- a/Hardware/OpenMowerMainboard/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty/RP2040-QFN-56.kicad_mod +++ b/Hardware/OpenMowerMainboard/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty/RP2040-QFN-56.kicad_mod @@ -97,7 +97,7 @@ (pad 57 thru_hole circle (at 0 -1.275) (size 0.6 0.6) (drill 0.35) (layers *.Cu)) (pad 57 thru_hole circle (at -1.275 -1.275) (size 0.6 0.6) (drill 0.35) (layers *.Cu)) (pad 57 smd roundrect (at 0 0) (size 3.2 3.2) (layers F.Cu F.Mask) (roundrect_rratio 0.045)) - (model ${KISYS3DMOD}/Package_DFN_QFN.3dshapes/QFN-56-1EP_7x7mm_P0.4mm_EP5.6x5.6mm.wrl + (model ${KICAD6_3DMODEL_DIR}/Package_DFN_QFN.3dshapes/QFN-56-1EP_7x7mm_P0.4mm_EP5.6x5.6mm.wrl (at (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0))