imp board: add via definitions

changelog: New Features/Board Editor: add via definitions

Author: carrotIndustries

3rd_party/router/router/pns_diff_pair_placer.cpp

@@ -74,6 +74,7 @@ const VIA DIFF_PAIR_PLACER::makeVia( const VECTOR2I& aP, int aNet )
 
     VIA v( aP, layers, m_sizes.ViaDiameter(), m_sizes.ViaDrill(), -1, m_sizes.ViaType() );
     v.SetNet( aNet );
+    v.SetDefinition( m_sizes.ViaDefinition() );
 
     return v;
 }

3rd_party/router/router/pns_line_placer.cpp

@@ -75,7 +75,9 @@ const VIA LINE_PLACER::makeVia( const VECTOR2I& aP )
     const LAYER_RANGE layers( m_sizes.ViaType() == VIATYPE::THROUGH ? F_Cu : m_sizes.GetLayerTop(),
                               m_sizes.ViaType() == VIATYPE::THROUGH ? B_Cu : m_sizes.GetLayerBottom() );
 
-    return VIA( aP, layers, m_sizes.ViaDiameter(), m_sizes.ViaDrill(), -1, m_sizes.ViaType() );
+    auto via = VIA( aP, layers, m_sizes.ViaDiameter(), m_sizes.ViaDrill(), -1, m_sizes.ViaType() );
+    via.SetDefinition( m_sizes.ViaDefinition() );
+    return via;
 }
 
 

3rd_party/router/router/pns_sizes_settings.h

@@ -48,6 +48,7 @@ class SIZES_SETTINGS
             m_viaType( VIATYPE::THROUGH ),
             m_viaDiameter( 600000 ),
             m_viaDrill( 250000 ),
+            m_viaDefinition( -1 ),
             m_diffPairWidth( 125000 ),
             m_diffPairGap( 180000 ),
             m_diffPairViaGap( 180000 ),
@@ -90,6 +91,9 @@ class SIZES_SETTINGS
 
     int ViaDrill() const { return m_viaDrill; }
     void SetViaDrill( int aDrill ) { m_viaDrill = aDrill; }
+    
+    int ViaDefinition() const { return m_viaDefinition; }
+    void SetViaDefinition( int aDef ) { m_viaDefinition = aDef; }
 
     std::optional<int> PairedLayer( int aLayerId )
     {
@@ -119,6 +123,7 @@ class SIZES_SETTINGS
     VIATYPE m_viaType;
     int     m_viaDiameter;
     int     m_viaDrill;
+    int     m_viaDefinition;
 
     int     m_diffPairWidth;
     int     m_diffPairGap;

3rd_party/router/router/pns_via.cpp

@@ -103,6 +103,7 @@ VIA* VIA::Clone() const
     v->m_parent = m_parent;
     v->m_isFree = m_isFree;
     v->m_isVirtual = m_isVirtual;
+    v->m_definition = m_definition;
 
     return v;
 }

3rd_party/router/router/pns_via.h

@@ -56,6 +56,7 @@ class VIA : public ITEM
         m_viaType  = VIATYPE::THROUGH;
         m_isFree   = false;
         m_isVirtual = false;
+        m_definition = -1;
     }
 
     VIA( const VECTOR2I& aPos, const LAYER_RANGE& aLayers, int aDiameter, int aDrill,
@@ -72,6 +73,7 @@ class VIA : public ITEM
         m_viaType = aViaType;
         m_isFree = false;
         m_isVirtual = false;
+        m_definition = -1;
     }
 
     VIA( const VIA& aB ) :
@@ -89,6 +91,7 @@ class VIA : public ITEM
         m_viaType = aB.m_viaType;
         m_isFree = aB.m_isFree;
         m_isVirtual = aB.m_isVirtual;
+        m_definition = aB.m_definition;
     }
 
     static inline bool ClassOf( const ITEM* aItem )
@@ -149,6 +152,9 @@ class VIA : public ITEM
     {
         return 1;
     }
+    
+    int Definition() const { return m_definition; }
+    void SetDefinition( int aDef ) { m_definition = aDef; }
 
     OPT_BOX2I ChangedArea( const VIA* aOther ) const;
 
@@ -162,6 +168,7 @@ class VIA : public ITEM
     SHAPE_CIRCLE m_hole;
     VIATYPE      m_viaType;
     bool         m_isFree;
+    int          m_definition;
 
 };
 

Makefile

@@ -81,6 +81,8 @@ SRC_COMMON = \
 	src/board/rule_layer_pair.cpp\
 	src/board/rule_clearance_same_net.cpp\
 	src/board/rule_board_connectivity.cpp\
+	src/board/rule_via_definitions.cpp\
+	src/board/via_definition.cpp\
 	3rd_party/delaunator/delaunator.cpp\
 	src/board/airwires.cpp\
 	src/board/gerber_output_settings.cpp\
@@ -443,6 +445,7 @@ SRC_IMP = \
 	src/dialogs/edit_text_window.cpp\
 	src/dialogs/plane_update.cpp\
 	src/dialogs/map_net_tie.cpp\
+	src/dialogs/select_via_definition.cpp\
 	src/util/sort_controller.cpp\
 	src/core/core_symbol.cpp\
 	src/core/core_schematic.cpp\
@@ -519,6 +522,7 @@ SRC_IMP = \
 	src/imp/rules/rule_editor_clearance_same_net.cpp\
 	src/imp/rules/rule_editor_shorted_pads.cpp\
 	src/imp/rules/rule_editor_thermals.cpp\
+	src/imp/rules/rule_editor_via_definitions.cpp\
 	src/imp/rules/import.cpp\
 	src/imp/rules/export.cpp\
 	src/widgets/location_entry.cpp\
@@ -613,6 +617,7 @@ SRC_IMP = \
 	src/util/done_revealer_controller.cpp\
 	src/widgets/reflow_box.cpp\
 	src/util/pasted_package.cpp\
+	src/widgets/layer_range_editor.cpp\
 
 SRC_IMPC = \
 	3rd_party/footag/wiz.c\

imp.gresource.xml

@@ -109,6 +109,7 @@
     <file>imp/rules/rule_editor_hole_size.ui</file>
     <file>imp/rules/rule_editor_track_width.ui</file>
     <file>imp/rules/rule_editor_clearance_copper.ui</file>
+    <file>imp/rules/rule_editor_via_definitions.ui</file>
     <file>imp/rules/rule_export.ui</file>
     <file>imp/fab_output.ui</file>
     <file>imp/bom_export.ui</file>

scripts/app_versions.yml

@@ -19,6 +19,7 @@ versions:
     17: save plane fragements to a separate file
     18: increase maximum number of inner layers to 8
     19: add blind and buried vias
+    20: add via definitions
   schematic:
     1: add custom values on symbols
     2: add hierarchy

src/board/board.cpp

@@ -43,7 +43,7 @@ const LutEnumStr<Board::OutputFormat> Board::output_format_lut = {
         {"odb", Board::OutputFormat::ODB},
 };
 
-static const unsigned int app_version = 19;
+static const unsigned int app_version = 20;
 
 unsigned int Board::get_app_version()
 {

src/board/board_rules.cpp

@@ -21,7 +21,8 @@ BoardRules::BoardRules(const BoardRules &other)
       rule_shorted_pads(other.rule_shorted_pads), rule_thermals(other.rule_thermals),
       rule_clearance_silkscreen_exposed_copper(other.rule_clearance_silkscreen_exposed_copper),
       rule_parameters(other.rule_parameters), rule_preflight_checks(other.rule_preflight_checks),
-      rule_net_ties(other.rule_net_ties), rule_board_connectivity(other.rule_board_connectivity)
+      rule_net_ties(other.rule_net_ties), rule_board_connectivity(other.rule_board_connectivity),
+      rule_via_definitions(other.rule_via_definitions)
 {
     update_sorted();
 }
@@ -45,6 +46,7 @@ void BoardRules::operator=(const BoardRules &other)
     rule_preflight_checks = other.rule_preflight_checks;
     rule_net_ties = other.rule_net_ties;
     rule_board_connectivity = other.rule_board_connectivity;
+    rule_via_definitions = other.rule_via_definitions;
 
     update_sorted();
 }
@@ -179,6 +181,10 @@ void BoardRules::import_rules(const json &j, const RuleImportMap &import_map)
         const json &o = j["parameters"];
         rule_parameters = RuleParameters(o, import_map);
     }
+    if (j.count("via_definitions")) {
+        const json &o = j["via_definitions"];
+        rule_via_definitions = RuleViaDefinitions(o, import_map);
+    }
 }
 
 void BoardRules::cleanup(const Block *block)
@@ -274,6 +280,19 @@ void BoardRules::apply(RuleID id, Board &brd, IPool &pool) const
             }
         }
     }
+    else if (id == RuleID::VIA_DEFINITIONS) {
+        for (auto &[uu, via] : brd.vias) {
+            if (via.source == Via::Source::DEFINITION) {
+                if (rule_via_definitions.via_definitions.count(via.definition)) {
+                    auto &def = rule_via_definitions.via_definitions.at(via.definition);
+                    via.pool_padstack = pool.get_padstack(def.padstack);
+                    via.span = def.span;
+                    via.parameter_set = def.parameters;
+                    via.expand(brd);
+                }
+            }
+        }
+    }
     else if (id == RuleID::PLANE) {
         for (auto &it : brd.planes) {
             auto &plane = it.second;
@@ -318,6 +337,7 @@ json BoardRules::serialize_or_export(Rule::SerializeMode mode) const
 
     j["clearance_silkscreen_exposed_copper"] = rule_clearance_silkscreen_exposed_copper.serialize();
     j["parameters"] = rule_parameters.serialize();
+    j["via_definitions"] = rule_via_definitions.serialize();
     return j;
 }
 
@@ -339,6 +359,7 @@ std::vector<RuleID> BoardRules::get_rule_ids() const
             RuleID::HOLE_SIZE,
 
             RuleID::VIA,
+            RuleID::VIA_DEFINITIONS,
             RuleID::PLANE,
             RuleID::THERMALS,
             RuleID::DIFFPAIR,
@@ -369,6 +390,9 @@ const Rule &BoardRules::get_rule(RuleID id) const
     else if (id == RuleID::BOARD_CONNECTIVITY) {
         return rule_board_connectivity;
     }
+    else if (id == RuleID::VIA_DEFINITIONS) {
+        return rule_via_definitions;
+    }
     throw std::runtime_error("rule does not exist");
 }
 
@@ -722,6 +746,11 @@ const RuleParameters &BoardRules::get_parameters() const
     return rule_parameters;
 }
 
+const RuleViaDefinitions &BoardRules::get_via_definitions() const
+{
+    return rule_via_definitions;
+}
+
 UUID BoardRules::get_via_padstack_uuid(const Net *net) const
 {
     auto rules = get_rules_sorted<RuleVia>();