diff --git a/tests/board_samples/kicad_6/batteryPack.kicad_pcb b/tests/board_samples/kicad_6/batteryPack.kicad_pcb index 59cb6e8a..979489ad 100644 --- a/tests/board_samples/kicad_6/batteryPack.kicad_pcb +++ b/tests/board_samples/kicad_6/batteryPack.kicad_pcb @@ -2186,6 +2186,27 @@ (gr_text "Charger" (at 230 20) (layer "Eco1.User") (tstamp 20deab35-2add-44ca-b53e-5d29f4b700bb) (effects (font (size 5 5) (thickness 0.5))) ) + (gr_text "PCB3D_BR_BConn" (at 137.25 90.75) (layer "Eco2.User") (tstamp 4933471b-9e8d-4a4a-a5cf-e0b8a79177e4) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_BR_BPack" (at 70.25 109.75) (layer "Eco2.User") (tstamp 76855516-c459-4ed7-91fc-62791ac771df) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_STACK_BConn_ONTO_BPack_25" (at 36.25 53.75) (layer "Eco2.User") (tstamp 88f7ea17-f44a-4f81-8969-e3348c639c74) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_TL_BConn" (at 116.25 47.75) (layer "Eco2.User") (tstamp cec4ed75-db9d-40b9-b07a-5b58d07286c6) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_TL_BPack" (at 29.25 29.75) (layer "Eco2.User") (tstamp d6a1b7a1-d935-4632-8b6a-d7e802e149e6) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_BR_Charger" (at 235.25 89.75) (layer "Eco2.User") (tstamp d8896c44-2b3f-4e17-82b5-320400bbc21e) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_TL_Charger" (at 186.25 50.75) (layer "Eco2.User") (tstamp e0c96038-7c50-47f9-9cc2-7bdbc1d8b80e) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) (dimension (type aligned) (layer "F.Fab") (tstamp 00000000-0000-0000-0000-00005e84a4cd) (pts (xy 136 88) (xy 136 52)) (height 8) diff --git a/tests/board_samples/kicad_7/batteryPack.kicad_pcb b/tests/board_samples/kicad_7/batteryPack.kicad_pcb index b7257995..0e14fdf0 100644 --- a/tests/board_samples/kicad_7/batteryPack.kicad_pcb +++ b/tests/board_samples/kicad_7/batteryPack.kicad_pcb @@ -2771,6 +2771,30 @@ (gr_text "Charger" (at 230 20) (layer "Eco1.User") (tstamp 20deab35-2add-44ca-b53e-5d29f4b700bb) (effects (font (size 5 5) (thickness 0.5))) ) + (gr_text "PCB3D_STACK_Charger_ONTO_BPack_10" (at 35.25 95.75) (layer "Eco2.User") (tstamp 3aef369a-4a56-4258-8001-cef68f9a63b0) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_BR_BConn" (at 137.25 90.75) (layer "Eco2.User") (tstamp 4933471b-9e8d-4a4a-a5cf-e0b8a79177e4) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_BR_BPack" (at 70.25 109.75) (layer "Eco2.User") (tstamp 76855516-c459-4ed7-91fc-62791ac771df) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_STACK_BConn_ONTO_BPack_25" (at 36.25 53.75) (layer "Eco2.User") (tstamp 88f7ea17-f44a-4f81-8969-e3348c639c74) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_TL_BConn" (at 116.25 47.75) (layer "Eco2.User") (tstamp cec4ed75-db9d-40b9-b07a-5b58d07286c6) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_TL_BPack" (at 29.25 29.75) (layer "Eco2.User") (tstamp d6a1b7a1-d935-4632-8b6a-d7e802e149e6) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_BR_Charger" (at 235.25 89.75) (layer "Eco2.User") (tstamp d8896c44-2b3f-4e17-82b5-320400bbc21e) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_TL_Charger" (at 186.25 50.75) (layer "Eco2.User") (tstamp e0c96038-7c50-47f9-9cc2-7bdbc1d8b80e) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) (dimension (type aligned) (layer "F.Fab") (tstamp 00000000-0000-0000-0000-00005e84a4cd) (pts (xy 136 88) (xy 136 52)) (height 8) diff --git a/tests/board_samples/kicad_7/batteryPack.kicad_pro b/tests/board_samples/kicad_7/batteryPack.kicad_pro deleted file mode 100644 index db539db4..00000000 --- a/tests/board_samples/kicad_7/batteryPack.kicad_pro +++ /dev/null @@ -1,455 +0,0 @@ -{ - "board": { - "3dviewports": [], - "design_settings": { - "defaults": { - "board_outline_line_width": 0.19999999999999998, - "copper_line_width": 0.19999999999999998, - "copper_text_italic": false, - "copper_text_size_h": 1.5, - "copper_text_size_v": 1.5, - "copper_text_thickness": 0.3, - "copper_text_upright": false, - "courtyard_line_width": 0.049999999999999996, - "dimension_precision": 4, - "dimension_units": 3, - "dimensions": { - "arrow_length": 1270000, - "extension_offset": 500000, - "keep_text_aligned": true, - "suppress_zeroes": false, - "text_position": 0, - "units_format": 1 - }, - "fab_line_width": 0.09999999999999999, - "fab_text_italic": false, - "fab_text_size_h": 1.0, - "fab_text_size_v": 1.0, - "fab_text_thickness": 0.15, - "fab_text_upright": false, - "other_line_width": 0.09999999999999999, - "other_text_italic": false, - "other_text_size_h": 1.0, - "other_text_size_v": 1.0, - "other_text_thickness": 0.15, - "other_text_upright": false, - "pads": { - "drill": 0.762, - "height": 1.524, - "width": 1.524 - }, - "silk_line_width": 0.12, - "silk_text_italic": false, - "silk_text_size_h": 1.0, - "silk_text_size_v": 1.0, - "silk_text_thickness": 0.15, - "silk_text_upright": false, - "zones": { - "45_degree_only": false, - "min_clearance": 1.0 - } - }, - "diff_pair_dimensions": [], - "drc_exclusions": [], - "meta": { - "filename": "board_design_settings.json", - "version": 2 - }, - "rule_severities": { - "annular_width": "error", - "clearance": "error", - "copper_edge_clearance": "error", - "courtyards_overlap": "error", - "diff_pair_gap_out_of_range": "error", - "diff_pair_uncoupled_length_too_long": "error", - "drill_out_of_range": "error", - "duplicate_footprints": "warning", - "extra_footprint": "warning", - "footprint_type_mismatch": "error", - "hole_clearance": "error", - "hole_near_hole": "error", - "invalid_outline": "error", - "item_on_disabled_layer": "error", - "items_not_allowed": "error", - "length_out_of_range": "error", - "malformed_courtyard": "error", - "microvia_drill_out_of_range": "error", - "missing_courtyard": "ignore", - "missing_footprint": "warning", - "net_conflict": "warning", - "npth_inside_courtyard": "ignore", - "padstack": "error", - "pth_inside_courtyard": "ignore", - "shorting_items": "error", - "silk_over_copper": "warning", - "silk_overlap": "warning", - "skew_out_of_range": "error", - "through_hole_pad_without_hole": "error", - "too_many_vias": "error", - "track_dangling": "warning", - "track_width": "error", - "tracks_crossing": "error", - "unconnected_items": "error", - "unresolved_variable": "error", - "via_dangling": "warning", - "zone_has_empty_net": "error", - "zones_intersect": "error" - }, - "rule_severitieslegacy_courtyards_overlap": true, - "rule_severitieslegacy_no_courtyard_defined": false, - "rules": { - "allow_blind_buried_vias": false, - "allow_microvias": false, - "max_error": 0.005, - "min_clearance": 0.0, - "min_copper_edge_clearance": 0.09999999999999999, - "min_hole_clearance": 0.25, - "min_hole_to_hole": 0.25, - "min_microvia_diameter": 0.19999999999999998, - "min_microvia_drill": 0.09999999999999999, - "min_silk_clearance": 0.0, - "min_through_hole_diameter": 0.3, - "min_track_width": 0.09999999999999999, - "min_via_annular_width": 0.049999999999999996, - "min_via_diameter": 0.35, - "use_height_for_length_calcs": true - }, - "track_widths": [ - 0.0, - 0.3, - 0.5, - 2.0 - ], - "via_dimensions": [ - { - "diameter": 0.0, - "drill": 0.0 - }, - { - "diameter": 0.8, - "drill": 0.4 - }, - { - "diameter": 1.4, - "drill": 0.8 - } - ], - "zones_allow_external_fillets": false, - "zones_use_no_outline": true - }, - "layer_presets": [], - "viewports": [] - }, - "boards": [], - "cvpcb": { - "equivalence_files": [] - }, - "erc": { - "erc_exclusions": [], - "meta": { - "version": 0 - }, - "pin_map": [ - [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 2 - ], - [ - 0, - 2, - 0, - 1, - 0, - 0, - 1, - 0, - 2, - 2, - 2, - 2 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 2 - ], - [ - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 2, - 1, - 1, - 2 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 2 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2 - ], - [ - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 2 - ], - [ - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 2 - ], - [ - 0, - 2, - 1, - 2, - 0, - 0, - 1, - 0, - 2, - 2, - 2, - 2 - ], - [ - 0, - 2, - 0, - 1, - 0, - 0, - 1, - 0, - 2, - 0, - 0, - 2 - ], - [ - 0, - 2, - 1, - 1, - 0, - 0, - 1, - 0, - 2, - 0, - 0, - 2 - ], - [ - 2, - 2, - 2, - 2, - 2, - 2, - 2, - 2, - 2, - 2, - 2, - 2 - ] - ], - "rule_severities": { - "bus_definition_conflict": "error", - "bus_entry_needed": "error", - "bus_to_bus_conflict": "error", - "bus_to_net_conflict": "error", - "conflicting_netclasses": "error", - "different_unit_footprint": "error", - "different_unit_net": "error", - "duplicate_reference": "error", - "duplicate_sheet_names": "error", - "endpoint_off_grid": "warning", - "extra_units": "error", - "global_label_dangling": "warning", - "hier_label_mismatch": "error", - "label_dangling": "error", - "lib_symbol_issues": "warning", - "missing_bidi_pin": "warning", - "missing_input_pin": "warning", - "missing_power_pin": "error", - "missing_unit": "warning", - "multiple_net_names": "warning", - "net_not_bus_member": "warning", - "no_connect_connected": "warning", - "no_connect_dangling": "warning", - "pin_not_connected": "error", - "pin_not_driven": "error", - "pin_to_pin": "warning", - "power_pin_not_driven": "error", - "similar_labels": "warning", - "simulation_model_issue": "error", - "unannotated": "error", - "unit_value_mismatch": "error", - "unresolved_variable": "error", - "wire_dangling": "error" - } - }, - "libraries": { - "pinned_footprint_libs": [], - "pinned_symbol_libs": [] - }, - "meta": { - "filename": "batteryPack.kicad_pro", - "version": 1 - }, - "net_settings": { - "classes": [ - { - "bus_width": 12, - "clearance": 0.2, - "diff_pair_gap": 0.25, - "diff_pair_via_gap": 0.25, - "diff_pair_width": 0.2, - "line_style": 0, - "microvia_diameter": 0.3, - "microvia_drill": 0.1, - "name": "Default", - "pcb_color": "rgba(0, 0, 0, 0.000)", - "schematic_color": "rgba(0, 0, 0, 0.000)", - "track_width": 0.25, - "via_diameter": 0.8, - "via_drill": 0.4, - "wire_width": 6 - } - ], - "meta": { - "version": 3 - }, - "net_colors": null, - "netclass_assignments": null, - "netclass_patterns": [] - }, - "pcbnew": { - "last_paths": { - "gencad": "", - "idf": "", - "netlist": "", - "specctra_dsn": "", - "step": "", - "vrml": "" - }, - "page_layout_descr_file": "" - }, - "schematic": { - "annotate_start_num": 0, - "drawing": { - "dashed_lines_dash_length_ratio": 12.0, - "dashed_lines_gap_length_ratio": 3.0, - "default_line_thickness": 6.0, - "default_text_size": 50.0, - "field_names": [], - "intersheets_ref_own_page": false, - "intersheets_ref_prefix": "", - "intersheets_ref_short": false, - "intersheets_ref_show": false, - "intersheets_ref_suffix": "", - "junction_size_choice": 3, - "label_size_ratio": 0.25, - "pin_symbol_size": 0.0, - "text_offset_ratio": 0.08 - }, - "legacy_lib_dir": "", - "legacy_lib_list": [], - "meta": { - "version": 1 - }, - "net_format_name": "", - "ngspice": { - "fix_include_paths": true, - "fix_passive_vals": false, - "meta": { - "version": 0 - }, - "model_mode": 0, - "workbook_filename": "" - }, - "page_layout_descr_file": "", - "plot_directory": "", - "spice_adjust_passive_values": false, - "spice_current_sheet_as_root": false, - "spice_external_command": "spice \"%I\"", - "spice_model_current_sheet_as_root": true, - "spice_save_all_currents": false, - "spice_save_all_voltages": false, - "subpart_first_id": 65, - "subpart_id_separator": 0 - }, - "sheets": [ - [ - "866b5b99-f202-4624-b829-b8d6114498e7", - "" - ] - ], - "text_variables": {} -} diff --git a/tests/board_samples/kicad_8/batteryPack.kicad_pcb b/tests/board_samples/kicad_8/batteryPack.kicad_pcb index b7257995..0e14fdf0 100644 --- a/tests/board_samples/kicad_8/batteryPack.kicad_pcb +++ b/tests/board_samples/kicad_8/batteryPack.kicad_pcb @@ -2771,6 +2771,30 @@ (gr_text "Charger" (at 230 20) (layer "Eco1.User") (tstamp 20deab35-2add-44ca-b53e-5d29f4b700bb) (effects (font (size 5 5) (thickness 0.5))) ) + (gr_text "PCB3D_STACK_Charger_ONTO_BPack_10" (at 35.25 95.75) (layer "Eco2.User") (tstamp 3aef369a-4a56-4258-8001-cef68f9a63b0) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_BR_BConn" (at 137.25 90.75) (layer "Eco2.User") (tstamp 4933471b-9e8d-4a4a-a5cf-e0b8a79177e4) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_BR_BPack" (at 70.25 109.75) (layer "Eco2.User") (tstamp 76855516-c459-4ed7-91fc-62791ac771df) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_STACK_BConn_ONTO_BPack_25" (at 36.25 53.75) (layer "Eco2.User") (tstamp 88f7ea17-f44a-4f81-8969-e3348c639c74) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_TL_BConn" (at 116.25 47.75) (layer "Eco2.User") (tstamp cec4ed75-db9d-40b9-b07a-5b58d07286c6) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_TL_BPack" (at 29.25 29.75) (layer "Eco2.User") (tstamp d6a1b7a1-d935-4632-8b6a-d7e802e149e6) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_BR_Charger" (at 235.25 89.75) (layer "Eco2.User") (tstamp d8896c44-2b3f-4e17-82b5-320400bbc21e) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) + (gr_text "PCB3D_TL_Charger" (at 186.25 50.75) (layer "Eco2.User") (tstamp e0c96038-7c50-47f9-9cc2-7bdbc1d8b80e) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify left bottom)) + ) (dimension (type aligned) (layer "F.Fab") (tstamp 00000000-0000-0000-0000-00005e84a4cd) (pts (xy 136 88) (xy 136 52)) (height 8) diff --git a/tests/test_plot/test_step.py b/tests/test_plot/test_step.py index 8afdfbf1..159aa1ce 100644 --- a/tests/test_plot/test_step.py +++ b/tests/test_plot/test_step.py @@ -204,3 +204,17 @@ def test_blender_export_1(test_dir): ctx.expect_out_file(name, sub=True) # ctx.compare_image(name, fuzz='7%', tol=1000) ctx.clean_up(keep_project=True) + + +@pytest.mark.slow +@pytest.mark.pcbnew +@pytest.mark.skipif(context.ki5(), reason="uses pcb2blender") +def test_blender_export_2(test_dir): + """ Stacked PCBs using the JSON stack-up """ + prj = 'batteryPack' + yaml = 'pcb2blender_tools_3' + ctx = context.TestContext(test_dir, prj, yaml) + ctx.run(extra_debug=True) + name = prj+'.pcb3d' + ctx.expect_out_file(name, sub=True) + ctx.clean_up()