berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Fix build and test errors due to botched last commit

This commit is contained in:
Mikolaj Wielgus 2025-10-14 02:21:48 +02:00
parent cd73c766a5
commit 2895277e73
12 changed files with 71 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/topola-cli/src/main.rs
View File

@ -5,7 +5,6 @@
use clap::Parser; use clap::Parser;
use std::fs::File; use std::fs::File;
use std::io::BufReader; use std::io::BufReader;
use topola::autorouter::anterouter::AnterouterOptions;
use topola::autorouter::execution::Command; use topola::autorouter::execution::Command;
use topola::autorouter::history::History; use topola::autorouter::history::History;
use topola::autorouter::invoker::Invoker; use topola::autorouter::invoker::Invoker;
@ -40,6 +39,7 @@ fn main() -> Result<(), std::io::Error> {
Command::Autoroute( Command::Autoroute(
PinSelection::new_select_layer(&board, 0), PinSelection::new_select_layer(&board, 0),
PlanarAutorouteOptions { PlanarAutorouteOptions {
principal_layer: 0,
presort_by: PresortBy::RatlineIntersectionCountAndLength, presort_by: PresortBy::RatlineIntersectionCountAndLength,
permutate: true, permutate: true,
router: RouterOptions { router: RouterOptions {

10
tests/common/mod.rs
View File

@ -132,7 +132,8 @@ pub fn assert_navnode_count(
expected_count: usize, expected_count: usize,
) { ) {
let (origin, destination) = autorouter let (origin, destination) = autorouter
.ratsnest() .ratsnests()
.on_principal_layer(0)
.graph() .graph()
.edge_indices() .edge_indices()
.collect::<Vec<_>>() .collect::<Vec<_>>()
@ -176,7 +177,12 @@ pub fn assert_that_all_single_layer_groundless_ratlines_are_autorouted(
) { ) {
let conncomps = ConncompsWithPrincipalLayer::new(autorouter.board(), 0); let conncomps = ConncompsWithPrincipalLayer::new(autorouter.board(), 0);
for ratline in autorouter.ratsnest().graph().edge_indices() { for ratline in autorouter
.ratsnests()
.on_principal_layer(0)
.graph()
.edge_indices()
{
let (origin_dot, destination_dot) = ratline.ref_(autorouter).endpoint_dots(); let (origin_dot, destination_dot) = ratline.ref_(autorouter).endpoint_dots();
let origin_layer = autorouter let origin_layer = autorouter

6
tests/single_layer/0603_breakout/autoroute_all.cmd
View File

@ -19,7 +19,8 @@
"squeeze_through_under_bends": true, "squeeze_through_under_bends": true,
"routed_band_width": 100.0 "routed_band_width": 100.0
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -42,7 +43,8 @@
"squeeze_through_under_bends": true, "squeeze_through_under_bends": true,
"routed_band_width": 100.0 "routed_band_width": 100.0
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
} }

3
tests/single_layer/4x4_1206_led_matrix_breakout/autoroute_all.cmd
View File

@ -203,7 +203,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
} }

21
tests/single_layer/4x4_1206_led_matrix_breakout/autoroute_all_in_predefined_order.cmd
View File

@ -75,7 +75,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
}, },
@ -122,7 +123,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
}, },
@ -201,7 +203,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
}, },
@ -232,7 +235,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
}, },
@ -263,7 +267,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
}, },
@ -294,7 +299,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
}, },
@ -325,7 +331,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
} }

12
tests/single_layer/4x_3rd_order_smd_lc_filters/autoroute_signals.cmd
View File

@ -55,7 +55,8 @@
"squeeze_through_under_bends": true, "squeeze_through_under_bends": true,
"routed_band_width": 100.0 "routed_band_width": 100.0
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -114,7 +115,8 @@
"squeeze_through_under_bends": true, "squeeze_through_under_bends": true,
"routed_band_width": 100.0 "routed_band_width": 100.0
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -173,7 +175,8 @@
"squeeze_through_under_bends": true, "squeeze_through_under_bends": true,
"routed_band_width": 100.0 "routed_band_width": 100.0
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -232,7 +235,8 @@
"squeeze_through_under_bends": true, "squeeze_through_under_bends": true,
"routed_band_width": 100.0 "routed_band_width": 100.0
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
} }

3
tests/single_layer/smd_non_rectangular_buck_converter/route_all.cmd
View File

@ -43,7 +43,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
} }

3
tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/autoroute_all.cmd
View File

@ -35,7 +35,8 @@
"squeeze_through_under_bends": true, "squeeze_through_under_bends": true,
"routed_band_width": 100.0 "routed_band_width": 100.0
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
} }

3
tests/single_layer/tht_de9_to_tht_de9/autoroute_all.cmd
View File

@ -83,7 +83,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
} }

27
tests/single_layer/tht_de9_to_tht_de9/autoroute_all_in_predefined_order.cmd
View File

@ -19,7 +19,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -42,7 +43,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -65,7 +67,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -88,7 +91,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -111,7 +115,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -134,7 +139,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -157,7 +163,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -180,7 +187,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -203,7 +211,8 @@
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
} }

6
tests/single_layer/tht_diode_bridge_rectifier/autoroute_all.cmd
View File

@ -55,7 +55,8 @@
"squeeze_through_under_bends": true, "squeeze_through_under_bends": true,
"routed_band_width": 100.0 "routed_band_width": 100.0
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
}, },
@ -78,7 +79,8 @@
"squeeze_through_under_bends": true, "squeeze_through_under_bends": true,
"routed_band_width": 100.0 "routed_band_width": 100.0
}, },
"permutate": false "permutate": false,
"principal_layer": 0
} }
] ]
} }

3
tests/single_layer/vga_dac_breakout/autoroute_all.cmd
View File

@ -215,7 +215,8 @@
"routed_band_width": 100.0, "routed_band_width": 100.0,
"wrap_around_bands": true, "wrap_around_bands": true,
"squeeze_through_under_bends": true "squeeze_through_under_bends": true
} },
"principal_layer": 0
} }
] ]
} }