From 441403ee11bfb4edb44c0db236dc8fc34d2cd27b Mon Sep 17 00:00:00 2001 From: hneemann Date: Sat, 17 Aug 2019 20:52:04 +0200 Subject: [PATCH 1/6] Miner improvement of the custom ALU shape. --- src/main/dig/processor/ALU/ALU.dig | 122 +----------- src/main/dig/processor/ALU/ALU.svg | 173 +++++------------- src/main/dig/processor/Processor.dig | 22 +-- src/main/dig/processor/ProcessorIntr.dig | 30 +-- src/main/dig/processor/ProcessorMux.dig | 30 +-- .../dig/processor/ProcessorVonNeumann.dig | 10 +- 6 files changed, 104 insertions(+), 283 deletions(-) diff --git a/src/main/dig/processor/ALU/ALU.dig b/src/main/dig/processor/ALU/ALU.dig index 1f3156ae2..4fb980b7e 100644 --- a/src/main/dig/processor/ALU/ALU.dig +++ b/src/main/dig/processor/ALU/ALU.dig @@ -30,56 +30,56 @@ bei der Speicheradressierung verwendet.}} A - false + true Op - - false + + true Neg - false + true B - false + true Zero - false + true Ci - false + true Carry - false + true Y - false + true @@ -106,110 +106,6 @@ bei der Speicheradressierung verwendet.}} 255 - - - - A - LEFTBOTTOM - 18 - - 128 - 128 - 128 - 255 - - - - - - B - LEFTBOTTOM - 18 - - 128 - 128 - 128 - 255 - - - - - - Op - LEFTBOTTOM - 18 - - 128 - 128 - 128 - 255 - - - - - - Ci - LEFTBOTTOM - 18 - - 128 - 128 - 128 - 255 - - - - - - Y - RIGHTBOTTOM - 18 - - 128 - 128 - 128 - 255 - - - - - - Zero - RIGHTBOTTOM - 18 - - 128 - 128 - 128 - 255 - - - - - - Neg - RIGHTBOTTOM - 18 - - 128 - 128 - 128 - 255 - - - - - - Carry - RIGHTBOTTOM - 18 - - 128 - 128 - 128 - 255 - - diff --git a/src/main/dig/processor/ALU/ALU.svg b/src/main/dig/processor/ALU/ALU.svg index d68874c6c..7b0282420 100644 --- a/src/main/dig/processor/ALU/ALU.svg +++ b/src/main/dig/processor/ALU/ALU.svg @@ -11,7 +11,7 @@ version="1.1" id="svg48" sodipodi:docname="ALU.svg" - inkscape:version="0.92.1 r15371"> + inkscape:version="0.92.4 (5da689c313, 2019-01-14)"> @@ -29,12 +29,12 @@ showgrid="true" id="namedview4" inkscape:zoom="3.5454545" - inkscape:cx="120" + inkscape:cx="71.064102" inkscape:cy="87.435899" inkscape:window-width="1680" - inkscape:window-height="1002" + inkscape:window-height="993" inkscape:window-x="0" - inkscape:window-y="24" + inkscape:window-y="28" inkscape:window-maximized="1" inkscape:current-layer="svg48"> - - - A - - - - B - - Op - - - Ci - - - - Y - - - - Zero - - - - Neg - - - - Carry - + cy="0" + cx="0" + id="pin+:A" /> + + + + + + + diff --git a/src/main/dig/processor/Processor.dig b/src/main/dig/processor/Processor.dig index 37a988b0a..e9bd1b619 100644 --- a/src/main/dig/processor/Processor.dig +++ b/src/main/dig/processor/Processor.dig @@ -573,7 +573,7 @@ Single-Cycle CPU.}} ALUop - + Tunnel @@ -889,12 +889,8 @@ Single-Cycle CPU.}} - - - - - - + + @@ -920,6 +916,14 @@ Single-Cycle CPU.}} + + + + + + + + @@ -1208,10 +1212,6 @@ Single-Cycle CPU.}} - - - - diff --git a/src/main/dig/processor/ProcessorIntr.dig b/src/main/dig/processor/ProcessorIntr.dig index e7782d27b..701000c92 100644 --- a/src/main/dig/processor/ProcessorIntr.dig +++ b/src/main/dig/processor/ProcessorIntr.dig @@ -558,7 +558,7 @@ An dieser Adresse muss sich die ISR befinden.}} ALUop - + Tunnel @@ -1197,16 +1197,8 @@ Interrupt ausgelöst. Die ISR muss sich an Adresse - - - - - - - - - - + + @@ -1228,6 +1220,18 @@ Interrupt ausgelöst. Die ISR muss sich an Adresse + + + + + + + + + + + + @@ -1392,10 +1396,6 @@ Interrupt ausgelöst. Die ISR muss sich an Adresse - - - - diff --git a/src/main/dig/processor/ProcessorMux.dig b/src/main/dig/processor/ProcessorMux.dig index 7bfef123b..199e7c857 100644 --- a/src/main/dig/processor/ProcessorMux.dig +++ b/src/main/dig/processor/ProcessorMux.dig @@ -438,7 +438,7 @@ Single-Cycle CPU.}} ALUop - + Tunnel @@ -971,16 +971,8 @@ Single-Cycle CPU.}} - - - - - - - - - - + + @@ -1010,6 +1002,18 @@ Single-Cycle CPU.}} + + + + + + + + + + + + @@ -1242,10 +1246,6 @@ Single-Cycle CPU.}} - - - - diff --git a/src/main/dig/processor/ProcessorVonNeumann.dig b/src/main/dig/processor/ProcessorVonNeumann.dig index 02185c96a..f9fa05fc8 100644 --- a/src/main/dig/processor/ProcessorVonNeumann.dig +++ b/src/main/dig/processor/ProcessorVonNeumann.dig @@ -498,7 +498,7 @@ Von Neumann Two-Cycle CPU.}} ALUop - + Tunnel @@ -920,6 +920,10 @@ Von Neumann Two-Cycle CPU.}} + + + + @@ -1140,10 +1144,6 @@ Von Neumann Two-Cycle CPU.}} - - - - From 2118dbd11d8f457c750e6a0d5f8aeb263d5f3a91 Mon Sep 17 00:00:00 2001 From: hneemann Date: Sun, 18 Aug 2019 08:43:33 +0200 Subject: [PATCH 2/6] Updates 74247 and 74248, closes #309 --- .../dig/lib/DIL Chips/74xx/display/74247.dig | 662 ++++++++---------- .../dig/lib/DIL Chips/74xx/display/74248.dig | 330 +++++---- 2 files changed, 475 insertions(+), 517 deletions(-) diff --git a/src/main/dig/lib/DIL Chips/74xx/display/74247.dig b/src/main/dig/lib/DIL Chips/74xx/display/74247.dig index 240cdefe3..bcdfa482a 100644 --- a/src/main/dig/lib/DIL Chips/74xx/display/74247.dig +++ b/src/main/dig/lib/DIL Chips/74xx/display/74247.dig @@ -92,24 +92,6 @@ - - Out - - - Description - ripple blanking output (LOW active) - - - Label - ~RBO - - - pinNumber - 4 - - - - In @@ -125,6 +107,10 @@ pinNumber 5 + + InDefault + + @@ -133,7 +119,7 @@ Label - a + ~a pinNumber @@ -144,14 +130,14 @@ 1 - + Out Label - b + ~b pinNumber @@ -162,14 +148,14 @@ 1 - + Out Label - c + ~c pinNumber @@ -180,14 +166,14 @@ 1 - + Out Label - d + ~d pinNumber @@ -198,14 +184,14 @@ 1 - + Out Label - e + ~e pinNumber @@ -216,14 +202,14 @@ 1 - + Out Label - f + ~f pinNumber @@ -234,14 +220,14 @@ 1 - + Out Label - g + ~g pinNumber @@ -252,7 +238,7 @@ 1 - + In @@ -269,13 +255,17 @@ pinNumber 3 + + InDefault + + PowerSupply - + In @@ -293,7 +283,7 @@ - + In @@ -307,7 +297,7 @@ 8 - + Testcase @@ -315,34 +305,42 @@ Testdata - ~LT ~RBI D C B A ~RBO a b c d e f g - 1 1 0 0 0 0 1 0 0 0 0 0 0 1 + ~LT ~RBI D C B A ~BI/~RBO ~a ~b ~c ~d ~e ~f ~g ~BI/~RBO_out + 1 0 0 0 0 0 z 1 1 1 1 1 1 1 0 + 1 1 0 0 0 0 z 0 0 0 0 0 0 1 1 + 1 0 0 0 0 0 0 1 1 1 1 1 1 1 0 +# ~RBI=0 & ~BI=1 is not allowed +#1 0 0 0 0 0 1 0 0 0 0 0 0 1 1 + 1 1 0 0 0 0 0 1 1 1 1 1 1 1 0 + 1 1 0 0 0 0 1 0 0 0 0 0 0 1 1 - 1 x 0 0 0 1 1 1 0 0 1 1 1 1 - 1 x 0 0 1 0 1 0 0 1 0 0 1 0 - 1 x 0 0 1 1 1 0 0 0 0 1 1 0 - 1 x 0 1 0 0 1 1 0 0 1 1 0 0 - 1 x 0 1 0 1 1 0 1 0 0 1 0 0 - 1 x 0 1 1 0 1 0 1 0 0 0 0 0 - 1 x 0 1 1 1 1 0 0 0 1 1 1 1 - 1 x 1 0 0 0 1 0 0 0 0 0 0 0 - 1 x 1 0 0 1 1 0 0 0 0 1 0 0 - 1 x 1 0 1 0 1 1 1 1 0 0 1 0 - 1 x 1 0 1 1 1 1 1 0 0 1 1 0 - 1 x 1 1 0 0 1 1 0 1 1 1 0 0 - 1 x 1 1 0 1 1 0 1 1 0 1 0 0 - 1 x 1 1 1 0 1 1 1 1 0 0 0 0 - 1 x 1 1 1 1 1 1 1 1 1 1 1 1 + 1 x 0 0 0 1 z 1 0 0 1 1 1 1 1 + 1 x 0 0 1 0 z 0 0 1 0 0 1 0 1 + 1 x 0 0 1 1 z 0 0 0 0 1 1 0 1 + 1 x 0 1 0 0 z 1 0 0 1 1 0 0 1 + 1 x 0 1 0 1 z 0 1 0 0 1 0 0 1 + 1 x 0 1 1 0 z 0 1 0 0 0 0 0 1 + 1 x 0 1 1 1 z 0 0 0 1 1 1 1 1 + 1 x 1 0 0 0 z 0 0 0 0 0 0 0 1 + 1 x 1 0 0 1 z 0 0 0 0 1 0 0 1 + 1 x 1 0 1 0 z 1 1 1 0 0 1 0 1 + 1 x 1 0 1 1 z 1 1 0 0 1 1 0 1 + 1 x 1 1 0 0 z 1 0 1 1 1 0 0 1 + 1 x 1 1 0 1 z 0 1 1 0 1 0 0 1 + 1 x 1 1 1 0 z 1 1 1 0 0 0 0 1 + 1 x 1 1 1 1 z 1 1 1 1 1 1 1 1 -#x x x x x x 0 1 1 1 1 1 1 1 - 1 0 0 0 0 0 0 1 1 1 1 1 1 1 - 0 x x x x x 1 0 0 0 0 0 0 0 +#x x x x x x 0 1 1 1 1 1 1 1 0 + 1 0 0 0 0 0 0 1 1 1 1 1 1 1 0 + 0 x x x x x z 0 0 0 0 0 0 0 1 + 0 x x x x x 0 1 1 1 1 1 1 1 0 + 0 x x x x x 1 0 0 0 0 0 0 0 1 - + NAnd @@ -436,7 +434,7 @@ true - + And @@ -665,163 +663,48 @@ - + - NOr + In - wideShape + Description + Blanking Input/Ripple Blank Output + + + Label + ~BI/~RBO + + + pinNumber + 4 + + + InDefault + + + + isHighZ true - + - NOr - - - wideShape - true - - - + PullUp + + - NOr - - - wideShape - true - - - + NFET + + - NOr - - - wideShape - true - - - Inputs - 3 - - - - - - NOr - - - wideShape - true - - - Inputs - 3 - - - - - - NOr - - - wideShape - true - - - Inputs - 3 - - - - - - NOr - - - wideShape - true - - - Inputs - 3 - - - - - - Not - - - wideShape - true - - - - - - Not - - - wideShape - true - - - - - - Not - - - wideShape - true - - - - - - Not - - - wideShape - true - - - - - - Not - - - wideShape - true - - - - - - Not - - - wideShape - true - - - - - - Not - - - wideShape - true - - - + Ground + + And @@ -839,22 +722,93 @@ 6 - + - PullUp - - + Or + + + wideShape + true + + + Inputs + 3 + + + - NFET - - + Or + + + wideShape + true + + + Inputs + 3 + + + - Ground - - + Or + + + wideShape + true + + + + + + Or + + + wideShape + true + + + Inputs + 3 + + + + + + Or + + + wideShape + true + + + + + + Or + + + wideShape + true + + + Inputs + 3 + + + + + + Or + + + wideShape + true + + + @@ -874,6 +828,10 @@ + + + + @@ -902,13 +860,17 @@ + + + + - + @@ -940,10 +902,10 @@ - + - + @@ -951,8 +913,8 @@ - - + + @@ -995,16 +957,8 @@ - - - - - - - - - - + + @@ -1031,7 +985,7 @@ - + @@ -1079,12 +1033,8 @@ - - - - - - + + @@ -1131,12 +1081,8 @@ - - - - - - + + @@ -1146,6 +1092,18 @@ + + + + + + + + + + + + @@ -1155,12 +1113,8 @@ - - - - - - + + @@ -1171,16 +1125,8 @@ - - - - - - - - - - + + @@ -1195,7 +1141,7 @@ - + @@ -1203,12 +1149,8 @@ - - - - - - + + @@ -1254,14 +1196,6 @@ - - - - - - - - @@ -1271,13 +1205,17 @@ - - + + + + + + @@ -1286,10 +1224,6 @@ - - - - @@ -1307,12 +1241,8 @@ - - - - - - + + @@ -1327,12 +1257,8 @@ - - - - - - + + @@ -1348,15 +1274,19 @@ - + + + + + - - + + @@ -1367,11 +1297,7 @@ - - - - - + @@ -1434,10 +1360,6 @@ - - - - @@ -1487,40 +1409,12 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1578,6 +1472,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1611,16 +1545,8 @@ - - - - - - - - - - + + @@ -1628,7 +1554,11 @@ - + + + + + @@ -1659,12 +1589,12 @@ - - + + - - + + @@ -1699,8 +1629,24 @@ - - + + + + + + + + + + + + + + + + + + @@ -1724,7 +1670,7 @@ - + @@ -1742,18 +1688,6 @@ - - - - - - - - - - - - @@ -1766,10 +1700,6 @@ - - - - \ No newline at end of file diff --git a/src/main/dig/lib/DIL Chips/74xx/display/74248.dig b/src/main/dig/lib/DIL Chips/74xx/display/74248.dig index 94d8b231c..83db3ebbe 100644 --- a/src/main/dig/lib/DIL Chips/74xx/display/74248.dig +++ b/src/main/dig/lib/DIL Chips/74xx/display/74248.dig @@ -92,24 +92,6 @@ - - Out - - - Description - ripple blanking output (LOW active) - - - Label - ~RBO - - - pinNumber - 4 - - - - In @@ -125,6 +107,10 @@ pinNumber 5 + + InDefault + + @@ -269,13 +255,17 @@ pinNumber 3 + + InDefault + + PowerSupply - + In @@ -293,7 +283,7 @@ - + In @@ -307,7 +297,7 @@ 8 - + Testcase @@ -315,34 +305,42 @@ Testdata - ~LT ~RBI D C B A ~RBO a b c d e f g - 1 1 0 0 0 0 1 1 1 1 1 1 1 0 + ~LT ~RBI D C B A ~BI/~RBO a b c d e f g ~BI/~RBO_out + 1 0 0 0 0 0 z 0 0 0 0 0 0 0 0 + 1 1 0 0 0 0 z 1 1 1 1 1 1 0 1 + 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +# ~RBI=0 & ~BI=1 is not allowed +#1 0 0 0 0 0 1 1 1 1 1 1 1 0 1 + 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 + 1 1 0 0 0 0 1 1 1 1 1 1 1 0 1 - 1 x 0 0 0 1 1 0 1 1 0 0 0 0 - 1 x 0 0 1 0 1 1 1 0 1 1 0 1 - 1 x 0 0 1 1 1 1 1 1 1 0 0 1 - 1 x 0 1 0 0 1 0 1 1 0 0 1 1 - 1 x 0 1 0 1 1 1 0 1 1 0 1 1 - 1 x 0 1 1 0 1 1 0 1 1 1 1 1 - 1 x 0 1 1 1 1 1 1 1 0 0 0 0 - 1 x 1 0 0 0 1 1 1 1 1 1 1 1 - 1 x 1 0 0 1 1 1 1 1 1 0 1 1 - 1 x 1 0 1 0 1 0 0 0 1 1 0 1 - 1 x 1 0 1 1 1 0 0 1 1 0 0 1 - 1 x 1 1 0 0 1 0 1 0 0 0 1 1 - 1 x 1 1 0 1 1 1 0 0 1 0 1 1 - 1 x 1 1 1 0 1 0 0 0 1 1 1 1 - 1 x 1 1 1 1 1 0 0 0 0 0 0 0 + 1 x 0 0 0 1 z 0 1 1 0 0 0 0 1 + 1 x 0 0 1 0 z 1 1 0 1 1 0 1 1 + 1 x 0 0 1 1 z 1 1 1 1 0 0 1 1 + 1 x 0 1 0 0 z 0 1 1 0 0 1 1 1 + 1 x 0 1 0 1 z 1 0 1 1 0 1 1 1 + 1 x 0 1 1 0 z 1 0 1 1 1 1 1 1 + 1 x 0 1 1 1 z 1 1 1 0 0 0 0 1 + 1 x 1 0 0 0 z 1 1 1 1 1 1 1 1 + 1 x 1 0 0 1 z 1 1 1 1 0 1 1 1 + 1 x 1 0 1 0 z 0 0 0 1 1 0 1 1 + 1 x 1 0 1 1 z 0 0 1 1 0 0 1 1 + 1 x 1 1 0 0 z 0 1 0 0 0 1 1 1 + 1 x 1 1 0 1 z 1 0 0 1 0 1 1 1 + 1 x 1 1 1 0 z 0 0 0 1 1 1 1 1 + 1 x 1 1 1 1 z 0 0 0 0 0 0 0 1 -#x x x x x x 0 0 0 0 0 0 0 0 - 1 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 x x x x x 1 1 1 1 1 1 1 1 +#x x x x x x z 0 0 0 0 0 0 0 + 1 0 0 0 0 0 z 0 0 0 0 0 0 0 0 + 0 x x x x x z 1 1 1 1 1 1 1 1 + 0 x x x x x 0 0 0 0 0 0 0 0 0 + 0 x x x x x 1 1 1 1 1 1 1 1 1 - + NAnd @@ -436,7 +434,7 @@ true - + And @@ -665,7 +663,7 @@ - + And @@ -806,20 +804,46 @@ + + In + + + Description + Blanking Input/Ripple Blank Output + + + Label + ~BI/~RBO + + + pinNumber + 4 + + + InDefault + + + + isHighZ + true + + + + PullUp - + NFET - + Ground - + And @@ -837,7 +861,7 @@ 6 - + @@ -857,6 +881,10 @@ + + + + @@ -865,10 +893,6 @@ - - - - @@ -889,13 +913,17 @@ + + + + - + @@ -927,10 +955,10 @@ - + - + @@ -938,8 +966,8 @@ - - + + @@ -962,25 +990,17 @@ - - + + - - - - - - - - @@ -1018,7 +1038,7 @@ - + @@ -1141,6 +1161,10 @@ + + + + @@ -1153,6 +1177,10 @@ + + + + @@ -1166,7 +1194,7 @@ - + @@ -1217,18 +1245,14 @@ - - - - - - - - + + + + @@ -1303,11 +1327,11 @@ - + - - + + @@ -1326,7 +1350,7 @@ - + @@ -1389,10 +1413,6 @@ - - - - @@ -1442,40 +1462,12 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1533,6 +1525,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1566,16 +1598,8 @@ - - - - - - - - - - + + @@ -1583,7 +1607,11 @@ - + + + + + @@ -1614,12 +1642,12 @@ - - + + - - + + @@ -1654,8 +1682,24 @@ - - + + + + + + + + + + + + + + + + + + @@ -1677,17 +1721,9 @@ - - - - - - - - - + @@ -1705,10 +1741,6 @@ - - - - @@ -1721,10 +1753,6 @@ - - - - \ No newline at end of file From 9c1dd4961be60c9c2a5b2a258850f05f9e11763f Mon Sep 17 00:00:00 2001 From: hneemann Date: Sun, 18 Aug 2019 09:52:01 +0200 Subject: [PATCH 3/6] Updates to 74247 and 74248 --- .../dig/lib/DIL Chips/74xx/display/74247.dig | 33 ++- .../dig/lib/DIL Chips/74xx/display/74248.dig | 278 ++++++++---------- 2 files changed, 134 insertions(+), 177 deletions(-) diff --git a/src/main/dig/lib/DIL Chips/74xx/display/74247.dig b/src/main/dig/lib/DIL Chips/74xx/display/74247.dig index bcdfa482a..6db4d9c8b 100644 --- a/src/main/dig/lib/DIL Chips/74xx/display/74247.dig +++ b/src/main/dig/lib/DIL Chips/74xx/display/74247.dig @@ -696,11 +696,6 @@ - - NFET - - - Ground @@ -810,6 +805,16 @@ + + Driver + + + rotation + + + + + @@ -860,10 +865,6 @@ - - - - @@ -944,6 +945,14 @@ + + + + + + + + @@ -956,10 +965,6 @@ - - - - @@ -1545,7 +1550,7 @@ - + diff --git a/src/main/dig/lib/DIL Chips/74xx/display/74248.dig b/src/main/dig/lib/DIL Chips/74xx/display/74248.dig index 83db3ebbe..8896a7683 100644 --- a/src/main/dig/lib/DIL Chips/74xx/display/74248.dig +++ b/src/main/dig/lib/DIL Chips/74xx/display/74248.dig @@ -130,7 +130,7 @@ 1 - + Out @@ -148,7 +148,7 @@ 1 - + Out @@ -166,7 +166,7 @@ 1 - + Out @@ -184,7 +184,7 @@ 1 - + Out @@ -202,7 +202,7 @@ 1 - + Out @@ -220,7 +220,7 @@ 1 - + Out @@ -238,7 +238,7 @@ 1 - + In @@ -665,145 +665,6 @@ - - And - - - wideShape - true - - - inverterConfig - - In_1 - In_2 - - - - - - - And - - - wideShape - true - - - inverterConfig - - In_1 - In_2 - - - - - - - And - - - wideShape - true - - - inverterConfig - - In_1 - In_2 - - - - - - - And - - - wideShape - true - - - inverterConfig - - In_1 - In_2 - In_3 - - - - Inputs - 3 - - - - - - And - - - wideShape - true - - - inverterConfig - - In_1 - In_2 - In_3 - - - - Inputs - 3 - - - - - - And - - - wideShape - true - - - inverterConfig - - In_1 - In_2 - In_3 - - - - Inputs - 3 - - - - - - And - - - wideShape - true - - - inverterConfig - - In_1 - In_2 - In_3 - - - - Inputs - 3 - - - - In @@ -835,11 +696,6 @@ - - NFET - - - Ground @@ -863,6 +719,102 @@ + + NOr + + + wideShape + true + + + Inputs + 3 + + + + + + NOr + + + wideShape + true + + + Inputs + 3 + + + + + + NOr + + + wideShape + true + + + Inputs + 3 + + + + + + NOr + + + wideShape + true + + + Inputs + 3 + + + + + + NOr + + + wideShape + true + + + + + + NOr + + + wideShape + true + + + + + + NOr + + + wideShape + true + + + + + + Driver + + + rotation + + + + + @@ -913,10 +865,6 @@ - - - - @@ -997,9 +945,13 @@ + + + + - + @@ -1083,7 +1035,7 @@ - + @@ -1135,7 +1087,7 @@ - + @@ -1171,7 +1123,7 @@ - + @@ -1203,7 +1155,7 @@ - + @@ -1291,7 +1243,7 @@ - + @@ -1311,7 +1263,7 @@ - + @@ -1598,7 +1550,7 @@ - + From 44d3073af17fae4d3147d0c9b9108bca07b68f86 Mon Sep 17 00:00:00 2001 From: hneemann Date: Sun, 18 Aug 2019 21:28:41 +0200 Subject: [PATCH 4/6] Fixed an issue with new focus gaining, see #308 --- .../de/neemann/digital/gui/components/CircuitComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java index 48dc151a3..518923243 100644 --- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java +++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java @@ -1335,7 +1335,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib @Override public void mousePressed(MouseEvent e) { - hadFocusAtClick = hasFocus(); + hadFocusAtClick = SwingUtilities.getWindowAncestor(CircuitComponent.this).isFocused(); pos = new Vector(e.getX(), e.getY()); isMoved = false; requestFocusInWindow(); From 3eb51d0344042efaa3de2480987554bb87650351 Mon Sep 17 00:00:00 2001 From: hneemann Date: Sun, 18 Aug 2019 21:33:26 +0200 Subject: [PATCH 5/6] Updates also 7447 and 7448 --- .../dig/lib/DIL Chips/74xx/display/7447.dig | 2433 ++++++++--------- .../dig/lib/DIL Chips/74xx/display/7448.dig | 1977 +++++++------- 2 files changed, 2088 insertions(+), 2322 deletions(-) diff --git a/src/main/dig/lib/DIL Chips/74xx/display/7447.dig b/src/main/dig/lib/DIL Chips/74xx/display/7447.dig index c99be3a64..a8bf4009f 100644 --- a/src/main/dig/lib/DIL Chips/74xx/display/7447.dig +++ b/src/main/dig/lib/DIL Chips/74xx/display/7447.dig @@ -23,6 +23,10 @@ In + + Description + Bit 0 + Label A @@ -32,11 +36,15 @@ 7 - + In + + Description + Bit 1 + Label B @@ -46,11 +54,15 @@ 1 - + In + + Description + Bit 2 + Label C @@ -60,11 +72,15 @@ 2 - + In + + Description + Bit 3 + Label D @@ -74,131 +90,7 @@ 6 - - - - Tunnel - - - rotation - - - - NetName - a - - - - - - Tunnel - - - rotation - - - - NetName - b - - - - - - Tunnel - - - rotation - - - - NetName - c - - - - - - Tunnel - - - rotation - - - - NetName - d - - - - - - Tunnel - - - NetName - a - - - - - - Tunnel - - - NetName - b - - - - - - Tunnel - - - NetName - c - - - - - - Tunnel - - - NetName - d - - - - - - NAnd - - - Inputs - 3 - - - - - - Out - - - Description - ripple blanking output (LOW active) - - - Label - ~RBO - - - pinNumber - 4 - - - + In @@ -215,48 +107,12 @@ pinNumber 5 - - - - - Not - - - - - Or - - - - - Or - - - - - Or - - - - - Or - - - - - NOr - - Inputs - 4 + InDefault + - - - - And - - + Out @@ -274,47 +130,7 @@ 1 - - - - And - - - Inputs - 3 - - - - - - And - - - Inputs - 3 - - - - - - And - - - Inputs - 3 - - - - - - And - - - Inputs - 3 - - - + Out @@ -332,32 +148,7 @@ 1 - - - - And - - - - - And - - - Inputs - 3 - - - - - - And - - - - - And - - + Out @@ -375,22 +166,7 @@ 1 - - - - And - - - - - And - - - - - And - - + Out @@ -408,32 +184,7 @@ 1 - - - - And - - - - - And - - - - - And - - - Inputs - 3 - - - - - - And - - + Out @@ -451,17 +202,7 @@ 1 - - - - And - - - - - And - - + Out @@ -479,27 +220,7 @@ 1 - - - - And - - - - - And - - - - - And - - - - - And - - + Out @@ -517,67 +238,7 @@ 1 - - - - And - - - - - And - - - - - And - - - - - And - - - - - Not - - - rotation - - - - - - - Not - - - rotation - - - - - - - Not - - - rotation - - - - - - - Not - - - rotation - - - - + In @@ -594,88 +255,17 @@ pinNumber 3 - - - - - Not - - - - - NOr - - Inputs - 5 + InDefault + - - - - NOr - - - Inputs - 5 - - - - - - NOr - - - Inputs - 5 - - - - - - NOr - - - Inputs - 5 - - - - - - NOr - - - Inputs - 5 - - - - - - NOr - - - Inputs - 4 - - - - - - NOr - - - Inputs - 3 - - - + PowerSupply - + In @@ -693,7 +283,7 @@ - + In @@ -707,7 +297,7 @@ 8 - + Testcase @@ -715,1136 +305,1385 @@ Testdata - ~LT ~RBI D C B A ~RBO ~a ~b ~c ~d ~e ~f ~g - 1 1 0 0 0 0 1 0 0 0 0 0 0 1 + ~LT ~RBI D C B A ~BI/~RBO ~a ~b ~c ~d ~e ~f ~g ~BI/~RBO_out + 1 0 0 0 0 0 z 1 1 1 1 1 1 1 0 + 1 1 0 0 0 0 z 0 0 0 0 0 0 1 1 + 1 0 0 0 0 0 0 1 1 1 1 1 1 1 0 +# ~RBI=0 & ~BI=1 is not allowed +#1 0 0 0 0 0 1 0 0 0 0 0 0 1 1 + 1 1 0 0 0 0 0 1 1 1 1 1 1 1 0 + 1 1 0 0 0 0 1 0 0 0 0 0 0 1 1 - 1 x 0 0 0 1 1 1 0 0 1 1 1 1 - 1 x 0 0 1 0 1 0 0 1 0 0 1 0 - 1 x 0 0 1 1 1 0 0 0 0 1 1 0 - 1 x 0 1 0 0 1 1 0 0 1 1 0 0 - 1 x 0 1 0 1 1 0 1 0 0 1 0 0 - 1 x 0 1 1 0 1 1 1 0 0 0 0 0 - 1 x 0 1 1 1 1 0 0 0 1 1 1 1 - 1 x 1 0 0 0 1 0 0 0 0 0 0 0 - 1 x 1 0 0 1 1 0 0 0 1 1 0 0 - 1 x 1 0 1 0 1 1 1 1 0 0 1 0 - 1 x 1 0 1 1 1 1 1 0 0 1 1 0 - 1 x 1 1 0 0 1 1 0 1 1 1 0 0 - 1 x 1 1 0 1 1 0 1 1 0 1 0 0 - 1 x 1 1 1 0 1 1 1 1 0 0 0 0 - 1 x 1 1 1 1 1 1 1 1 1 1 1 1 + 1 x 0 0 0 1 z 1 0 0 1 1 1 1 1 + 1 x 0 0 1 0 z 0 0 1 0 0 1 0 1 + 1 x 0 0 1 1 z 0 0 0 0 1 1 0 1 + 1 x 0 1 0 0 z 1 0 0 1 1 0 0 1 + 1 x 0 1 0 1 z 0 1 0 0 1 0 0 1 + 1 x 0 1 1 0 z 1 1 0 0 0 0 0 1 + 1 x 0 1 1 1 z 0 0 0 1 1 1 1 1 + 1 x 1 0 0 0 z 0 0 0 0 0 0 0 1 + 1 x 1 0 0 1 z 0 0 0 1 1 0 0 1 + 1 x 1 0 1 0 z 1 1 1 0 0 1 0 1 + 1 x 1 0 1 1 z 1 1 0 0 1 1 0 1 + 1 x 1 1 0 0 z 1 0 1 1 1 0 0 1 + 1 x 1 1 0 1 z 0 1 1 0 1 0 0 1 + 1 x 1 1 1 0 z 1 1 1 0 0 0 0 1 + 1 x 1 1 1 1 z 1 1 1 1 1 1 1 1 -#x x x x x x 0 0 0 0 0 0 0 0 - 1 0 0 0 0 0 0 1 1 1 1 1 1 1 - 0 x x x x x 1 0 0 0 0 0 0 0 +#x x x x x x 0 1 1 1 1 1 1 1 0 + 1 0 0 0 0 0 0 1 1 1 1 1 1 1 0 + 0 x x x x x z 0 0 0 0 0 0 0 1 + 0 x x x x x 0 1 1 1 1 1 1 1 0 + 0 x x x x x 1 0 0 0 0 0 0 0 1 - + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + Not + + + wideShape + true + + + + + + Not + + + rotation + + + + wideShape + true + + + + + + And + + + wideShape + true + + + Inputs + 4 + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + + + + Delay + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 4 + + + + + + Delay + + + rotation + + + + + + + In + + + Description + Blanking Input/Ripple Blank Output + + + Label + ~BI/~RBO + + + pinNumber + 4 + + + InDefault + + + + isHighZ + true + + + + + + PullUp + + + + + Ground + + + + + And + + + rotation + + + + wideShape + true + + + Inputs + 6 + + + + + + Or + + + wideShape + true + + + Inputs + 3 + + + + + + Or + + + wideShape + true + + + Inputs + 3 + + + + + + Or + + + wideShape + true + + + + + + Or + + + wideShape + true + + + Inputs + 3 + + + + + + Or + + + wideShape + true + + + + + + Or + + + wideShape + true + + + Inputs + 3 + + + + + + Or + + + wideShape + true + + + + + + Driver + + + rotation + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/dig/lib/DIL Chips/74xx/display/7448.dig b/src/main/dig/lib/DIL Chips/74xx/display/7448.dig index 4900497a7..e74a0de8e 100644 --- a/src/main/dig/lib/DIL Chips/74xx/display/7448.dig +++ b/src/main/dig/lib/DIL Chips/74xx/display/7448.dig @@ -36,7 +36,7 @@ 7 - + In @@ -54,7 +54,7 @@ 1 - + In @@ -72,7 +72,7 @@ 2 - + In @@ -90,35 +90,7 @@ 6 - - - - NAnd - - - Inputs - 3 - - - - - - Out - - - Description - ripple blanking output (LOW active) - - - Label - ~RBO - - - pinNumber - 4 - - - + In @@ -135,48 +107,12 @@ pinNumber 5 - - - - - Not - - - - - Or - - - - - Or - - - - - Or - - - - - Or - - - - - NOr - - Inputs - 4 + InDefault + - - - - And - - + Out @@ -194,57 +130,7 @@ 1 - - - - Or - - - Inputs - 5 - - - - - - And - - - Inputs - 3 - - - - - - And - - - Inputs - 3 - - - - - - And - - - Inputs - 3 - - - - - - And - - - Inputs - 3 - - - + Out @@ -262,42 +148,7 @@ 1 - - - - Or - - - Inputs - 5 - - - - - - And - - - - - And - - - Inputs - 3 - - - - - - And - - - - - And - - + Out @@ -315,32 +166,7 @@ 1 - - - - Or - - - Inputs - 4 - - - - - - And - - - - - And - - - - - And - - + Out @@ -358,42 +184,7 @@ 1 - - - - Or - - - Inputs - 5 - - - - - - And - - - - - And - - - - - And - - - Inputs - 3 - - - - - - And - - + Out @@ -411,27 +202,7 @@ 1 - - - - Or - - - Inputs - 3 - - - - - - And - - - - - And - - + Out @@ -449,37 +220,7 @@ 1 - - - - Or - - - Inputs - 5 - - - - - - And - - - - - And - - - - - And - - - - - And - - + Out @@ -497,77 +238,7 @@ 1 - - - - Or - - - Inputs - 5 - - - - - - And - - - - - And - - - - - And - - - - - And - - - - - Not - - - rotation - - - - - - - Not - - - rotation - - - - - - - Not - - - rotation - - - - - - - Not - - - rotation - - - - + In @@ -584,18 +255,17 @@ pinNumber 3 + + InDefault + + - - - - Not - - + PowerSupply - + In @@ -613,7 +283,7 @@ - + In @@ -627,7 +297,7 @@ 8 - + Testcase @@ -635,1128 +305,1385 @@ Testdata - ~LT ~RBI D C B A ~RBO a b c d e f g - 1 1 0 0 0 0 1 1 1 1 1 1 1 0 + ~LT ~RBI D C B A ~BI/~RBO a b c d e f g ~BI/~RBO_out + 1 0 0 0 0 0 z 0 0 0 0 0 0 0 0 + 1 1 0 0 0 0 z 1 1 1 1 1 1 0 1 + 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +# ~RBI=0 & ~BI=1 is not allowed +#1 0 0 0 0 0 1 1 1 1 1 1 1 0 1 + 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 + 1 1 0 0 0 0 1 1 1 1 1 1 1 0 1 - 1 x 0 0 0 1 1 0 1 1 0 0 0 0 - 1 x 0 0 1 0 1 1 1 0 1 1 0 1 - 1 x 0 0 1 1 1 1 1 1 1 0 0 1 - 1 x 0 1 0 0 1 0 1 1 0 0 1 1 - 1 x 0 1 0 1 1 1 0 1 1 0 1 1 - 1 x 0 1 1 0 1 0 0 1 1 1 1 1 - 1 x 0 1 1 1 1 1 1 1 0 0 0 0 - 1 x 1 0 0 0 1 1 1 1 1 1 1 1 - 1 x 1 0 0 1 1 1 1 1 0 0 1 1 - 1 x 1 0 1 0 1 0 0 0 1 1 0 1 - 1 x 1 0 1 1 1 0 0 1 1 0 0 1 - 1 x 1 1 0 0 1 0 1 0 0 0 1 1 - 1 x 1 1 0 1 1 1 0 0 1 0 1 1 - 1 x 1 1 1 0 1 0 0 0 1 1 1 1 - 1 x 1 1 1 1 1 0 0 0 0 0 0 0 + 1 x 0 0 0 1 z 0 1 1 0 0 0 0 1 + 1 x 0 0 1 0 z 1 1 0 1 1 0 1 1 + 1 x 0 0 1 1 z 1 1 1 1 0 0 1 1 + 1 x 0 1 0 0 z 0 1 1 0 0 1 1 1 + 1 x 0 1 0 1 z 1 0 1 1 0 1 1 1 + 1 x 0 1 1 0 z 0 0 1 1 1 1 1 1 + 1 x 0 1 1 1 z 1 1 1 0 0 0 0 1 + 1 x 1 0 0 0 z 1 1 1 1 1 1 1 1 + 1 x 1 0 0 1 z 1 1 1 0 0 1 1 1 + 1 x 1 0 1 0 z 0 0 0 1 1 0 1 1 + 1 x 1 0 1 1 z 0 0 1 1 0 0 1 1 + 1 x 1 1 0 0 z 0 1 0 0 0 1 1 1 + 1 x 1 1 0 1 z 1 0 0 1 0 1 1 1 + 1 x 1 1 1 0 z 0 0 0 1 1 1 1 1 + 1 x 1 1 1 1 z 0 0 0 0 0 0 0 1 -#x x x x x x 0 0 0 0 0 0 0 0 - 1 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 x x x x x 1 1 1 1 1 1 1 1 +#x x x x x x z 0 0 0 0 0 0 0 + 1 0 0 0 0 0 z 0 0 0 0 0 0 0 0 + 0 x x x x x z 1 1 1 1 1 1 1 1 + 0 x x x x x 0 0 0 0 0 0 0 0 0 + 0 x x x x x 1 1 1 1 1 1 1 1 1 - + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + NAnd + + + wideShape + true + + + + + + Not + + + wideShape + true + + + + + + Not + + + rotation + + + + wideShape + true + + + + + + And + + + wideShape + true + + + Inputs + 4 + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + + + + Delay + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 3 + + + + + + And + + + wideShape + true + + + Inputs + 4 + + + + + + Delay + + + rotation + + + + + + + In + + + Description + Blanking Input/Ripple Blank Output + + + Label + ~BI/~RBO + + + pinNumber + 4 + + + InDefault + + + + isHighZ + true + + + + + + PullUp + + + + + Ground + + + + + And + + + rotation + + + + wideShape + true + + + Inputs + 6 + + + + + + NOr + + + wideShape + true + + + Inputs + 3 + + + + + + NOr + + + wideShape + true + + + Inputs + 3 + + + + + + NOr + + + wideShape + true + + + Inputs + 3 + + + + + + NOr + + + wideShape + true + + + Inputs + 3 + + + + + + NOr + + + wideShape + true + + + + + + NOr + + + wideShape + true + + + + + + NOr + + + wideShape + true + + + + + + Driver + + + rotation + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + From 3648bb1529b48fcd92ad298aae7d0b87109c06a7 Mon Sep 17 00:00:00 2001 From: hneemann Date: Mon, 19 Aug 2019 09:54:01 +0200 Subject: [PATCH 6/6] keyboard now reacts on focus traversal keys, closes #311 --- .../de/neemann/digital/gui/components/terminal/Keyboard.java | 2 +- .../digital/gui/components/terminal/KeyboardDialog.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/neemann/digital/gui/components/terminal/Keyboard.java b/src/main/java/de/neemann/digital/gui/components/terminal/Keyboard.java index e29a38400..f10c3b388 100644 --- a/src/main/java/de/neemann/digital/gui/components/terminal/Keyboard.java +++ b/src/main/java/de/neemann/digital/gui/components/terminal/Keyboard.java @@ -99,7 +99,7 @@ public class Keyboard extends Node implements Element { * * @param keyboardInterface the keyboard interface */ - public void setKeyboardDialog(KeyboardInterface keyboardInterface) { + public void setKeyboard(KeyboardInterface keyboardInterface) { this.keyboardInterface = keyboardInterface; } diff --git a/src/main/java/de/neemann/digital/gui/components/terminal/KeyboardDialog.java b/src/main/java/de/neemann/digital/gui/components/terminal/KeyboardDialog.java index bdcdd209c..d41fa8138 100644 --- a/src/main/java/de/neemann/digital/gui/components/terminal/KeyboardDialog.java +++ b/src/main/java/de/neemann/digital/gui/components/terminal/KeyboardDialog.java @@ -37,6 +37,7 @@ public class KeyboardDialog extends JDialog implements Keyboard.KeyboardInterfac text = ""; textLabel.setFocusable(true); + textLabel.setFocusTraversalKeysEnabled(false); textLabel.addKeyListener(new KeyAdapter() { @Override public void keyTyped(KeyEvent e) { @@ -54,7 +55,7 @@ public class KeyboardDialog extends JDialog implements Keyboard.KeyboardInterfac setLocationRelativeTo(owner); setVisible(true); - keyboard.setKeyboardDialog(this); + keyboard.setKeyboard(this); } @Override