diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2019-10-18 15:10:19 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2019-10-20 09:41:48 +0200 |
| commit | 3b01d2fbcefdd334028a447343c90912deea8366 (patch) | |
| tree | ee377f07cd8b723ed6719b99af218d88b1b3d244 | |
| parent | 399a137a7767d70c3d4ff810278d7402196ac380 (diff) | |
| download | nextpnr-3b01d2fbcefdd334028a447343c90912deea8366.tar.gz nextpnr-3b01d2fbcefdd334028a447343c90912deea8366.tar.bz2 nextpnr-3b01d2fbcefdd334028a447343c90912deea8366.zip | |
fix slice wire
| -rw-r--r-- | ecp5/arch.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 33f63097..34ee0dbb 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -669,6 +669,26 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const ret.push_back(el); } } + if (tilewire >= TILE_WIRE_FCO_SLICE && tilewire <=TILE_WIRE_FCOA_SLICE) + { + GraphicElement el; + el.type = GraphicElement::TYPE_LINE; + el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE; + el.x1 = x + slice_x1 + 0.005f; + el.x2 = x + slice_x1 + 0.005f; + if (tilewire==TILE_WIRE_FCO_SLICE) + el.y1 = y + slice_y2 + 0.0017f + (3-(tilewire - TILE_WIRE_FCO_SLICE))*slice_pitch; + else + el.y1 = y + slice_y2 + 0.00125f + (3-(tilewire - TILE_WIRE_FCO_SLICE))*slice_pitch; + el.y2 = y + slice_y2 + (3-(tilewire - TILE_WIRE_FCO_SLICE))*slice_pitch; + ret.push_back(el); + if (tilewire==TILE_WIRE_FCO_SLICE) { + el.x1 = x + slice_x1 - 0.005f; + el.x2 = x + slice_x1 + 0.005f; + el.y2 = el.y1; + ret.push_back(el); + } + } } if (wire_type == id_WIRE_TYPE_V01) { if (tilewire >= TILE_WIRE_V01N0001 && tilewire <=TILE_WIRE_V01S0100) @@ -797,26 +817,6 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const el.y2 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_LSR1 - 5) + 3*slice_pitch; ret.push_back(el); } - if (tilewire >= TILE_WIRE_FCO_SLICE && tilewire <=TILE_WIRE_FCOA_SLICE) - { - GraphicElement el; - el.type = GraphicElement::TYPE_LINE; - el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE; - el.x1 = x + slice_x1 + 0.005f; - el.x2 = x + slice_x1 + 0.005f; - if (tilewire==TILE_WIRE_FCO_SLICE) - el.y1 = y + slice_y2 + 0.0017f + (3-(tilewire - TILE_WIRE_FCO_SLICE))*slice_pitch; - else - el.y1 = y + slice_y2 + 0.00125f + (3-(tilewire - TILE_WIRE_FCO_SLICE))*slice_pitch; - el.y2 = y + slice_y2 + (3-(tilewire - TILE_WIRE_FCO_SLICE))*slice_pitch; - ret.push_back(el); - if (tilewire==TILE_WIRE_FCO_SLICE) { - el.x1 = x + slice_x1 - 0.005f; - el.x2 = x + slice_x1 + 0.005f; - el.y2 = el.y1; - ret.push_back(el); - } - } if (tilewire >= TILE_WIRE_LSR1 && tilewire <=TILE_WIRE_CLK0) { GraphicElement el; |