From f5994959253a8e777012ca0823cdf00ad70ffac2 Mon Sep 17 00:00:00 2001 From: ouabache Date: Thu, 19 Mar 2020 12:31:07 -0700 Subject: [PATCH 01/23] initial checkin for Logic script and files --- Logic/Boilerplate_Logic.csv | 4 + Logic/Boilerplate_gates.csv | 4 + Logic/Logic/AND2_4.csv | 27 +++ Logic/Logic/AND2_dm_4.csv | 32 +++ Logic/Logic/NAND2_4.csv | 28 +++ Logic/Logic/NAND2_dm_4.csv | 31 +++ Logic/Logic/NOR2_4.csv | 29 +++ Logic/Logic/NOR2_dm_4.csv | 30 +++ Logic/Logic/OR2_4.csv | 28 +++ Logic/Logic/OR2_dm_4.csv | 31 +++ Logic/Logic/XNOR_4.csv | 33 +++ Logic/Logic/XOR_4.csv | 32 +++ Logic/script | 11 + Logic/uuid_cache_gates.csv | 70 +++++++ Logic/uuid_cache_gates_cmpcat.csv | 10 + entities/symbol.py | 7 +- generate_logic_sym.py | 323 ++++++++++++++++++++++++++++++ 17 files changed, 729 insertions(+), 1 deletion(-) create mode 100644 Logic/Boilerplate_Logic.csv create mode 100644 Logic/Boilerplate_gates.csv create mode 100644 Logic/Logic/AND2_4.csv create mode 100644 Logic/Logic/AND2_dm_4.csv create mode 100644 Logic/Logic/NAND2_4.csv create mode 100644 Logic/Logic/NAND2_dm_4.csv create mode 100644 Logic/Logic/NOR2_4.csv create mode 100644 Logic/Logic/NOR2_dm_4.csv create mode 100644 Logic/Logic/OR2_4.csv create mode 100644 Logic/Logic/OR2_dm_4.csv create mode 100644 Logic/Logic/XNOR_4.csv create mode 100644 Logic/Logic/XOR_4.csv create mode 100755 Logic/script create mode 100644 Logic/uuid_cache_gates.csv create mode 100644 Logic/uuid_cache_gates_cmpcat.csv create mode 100644 generate_logic_sym.py diff --git a/Logic/Boilerplate_Logic.csv b/Logic/Boilerplate_Logic.csv new file mode 100644 index 00000000..8503daf8 --- /dev/null +++ b/Logic/Boilerplate_Logic.csv @@ -0,0 +1,4 @@ +KEYWORDS,digital,logic +CREATE,2019-12-17T00:00:00Z +VERSION,0.1 +AUTHOR,John E. diff --git a/Logic/Boilerplate_gates.csv b/Logic/Boilerplate_gates.csv new file mode 100644 index 00000000..8503daf8 --- /dev/null +++ b/Logic/Boilerplate_gates.csv @@ -0,0 +1,4 @@ +KEYWORDS,digital,logic +CREATE,2019-12-17T00:00:00Z +VERSION,0.1 +AUTHOR,John E. diff --git a/Logic/Logic/AND2_4.csv b/Logic/Logic/AND2_4.csv new file mode 100644 index 00000000..9db70788 --- /dev/null +++ b/Logic/Logic/AND2_4.csv @@ -0,0 +1,27 @@ +DEF,AND2_4 +KEYWORDS,gates +KEYWORDS,and +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-10.16,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-10.16,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_dm_4.csv b/Logic/Logic/AND2_dm_4.csv new file mode 100644 index 00000000..7a6fed85 --- /dev/null +++ b/Logic/Logic/AND2_dm_4.csv @@ -0,0 +1,32 @@ +DEF,AND2_dm_4 +KEYWORDS,gates +KEYWORDS,and +KEYWORDS,demorgan +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-11.24,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-11.24,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,11.43,0,2.54 +CIRC,-9.97,5.08,2.54 +CIRC,-9.97,-5.08,2.54 +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_4.csv b/Logic/Logic/NAND2_4.csv new file mode 100644 index 00000000..282aad1e --- /dev/null +++ b/Logic/Logic/NAND2_4.csv @@ -0,0 +1,28 @@ +DEF,NAND2_4 +KEYWORDS,gates +KEYWORDS,nand +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-10.16,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-10.16,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,11.43,0,2.54 +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_dm_4.csv b/Logic/Logic/NAND2_dm_4.csv new file mode 100644 index 00000000..45b1158d --- /dev/null +++ b/Logic/Logic/NAND2_dm_4.csv @@ -0,0 +1,31 @@ +DEF,NAND2_dm_4 +KEYWORDS,gates +KEYWORDS,nand +KEYWORDS,demorgan +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-11.24,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-11.24,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +CIRC,-9.97,5.08,2.54 +CIRC,-9.97,-5.08,2.54 +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_4.csv b/Logic/Logic/NOR2_4.csv new file mode 100644 index 00000000..967622a1 --- /dev/null +++ b/Logic/Logic/NOR2_4.csv @@ -0,0 +1,29 @@ +DEF,NOR2_4 +KEYWORDS,gates +KEYWORDS,nor +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,11.43,0,2.54 +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_dm_4.csv b/Logic/Logic/NOR2_dm_4.csv new file mode 100644 index 00000000..ad6b4e9f --- /dev/null +++ b/Logic/Logic/NOR2_dm_4.csv @@ -0,0 +1,30 @@ +DEF,NOR2_dm_4 +KEYWORDS,gates +KEYWORDS,nor +KEYWORDS,demorgan +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-12.70,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-12.70,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +CIRC,-11.43,5.08,2.54 +CIRC,-11.43,-5.08,2.54 +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_4.csv b/Logic/Logic/OR2_4.csv new file mode 100644 index 00000000..757c76ec --- /dev/null +++ b/Logic/Logic/OR2_4.csv @@ -0,0 +1,28 @@ +DEF,OR2_4 +KEYWORDS,gates +KEYWORDS,or +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_dm_4.csv b/Logic/Logic/OR2_dm_4.csv new file mode 100644 index 00000000..117f35dd --- /dev/null +++ b/Logic/Logic/OR2_dm_4.csv @@ -0,0 +1,31 @@ +DEF,OR2_dm_4 +KEYWORDS,gates +KEYWORDS,or +KEYWORDS,demorgan +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-12.70,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-12.70,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,11.43,0,2.54 +CIRC,-11.43,5.08,2.54 +CIRC,-11.43,-5.08,2.54 +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/XNOR_4.csv b/Logic/Logic/XNOR_4.csv new file mode 100644 index 00000000..a8426fa5 --- /dev/null +++ b/Logic/Logic/XNOR_4.csv @@ -0,0 +1,33 @@ +DEF,XNOR_4 +KEYWORDS,gates +KEYWORDS,xnor +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-11.43,-8.255,65.0 +POLYPT,-11.43,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,11.43,0,2.54 +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/XOR_4.csv b/Logic/Logic/XOR_4.csv new file mode 100644 index 00000000..f7933c37 --- /dev/null +++ b/Logic/Logic/XOR_4.csv @@ -0,0 +1,32 @@ +DEF,XOR_4 +KEYWORDS,gates +KEYWORDS,xor +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-11.43,-8.255,65.0 +POLYPT,-11.43,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-15.24,5.08,7.62 +PIN,B,R,-15.24,-5.08,7.62 +PIN,OUT,L,15.24,0,7.62 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/script b/Logic/script new file mode 100755 index 00000000..72be37c2 --- /dev/null +++ b/Logic/script @@ -0,0 +1,11 @@ +rm -r out/Logic +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_4 diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv new file mode 100644 index 00000000..bf5a15fc --- /dev/null +++ b/Logic/uuid_cache_gates.csv @@ -0,0 +1,70 @@ +sym-and2_4-pin-a_-15.24,baecdb47-c3a2-40d9-bbdf-ac7aefadab9b +sym-and2_4-pin-b_-15.24,3618f21b-f57d-47aa-8860-7353459fd594 +sym-and2_4-pin-out_15.24,7d6c100d-2aeb-46d9-a230-e0b3806ff34b +sym-and2_4-polygon-contour,676fe810-044f-49ba-b68b-2672a2f17d8b +sym-and2_4-sym,31f05179-7a70-40cc-83ea-d93b7e681a0a +sym-and2_4-text-name,71fdcbef-b2fd-4ee8-ba1c-ba15f5c5565d +sym-and2_4-text-value,7b4253d4-d999-4c2a-ac80-8c1c2e84bc9a +sym-and2_dm_4-pin-a_-15.24,7403109a-a953-4068-b498-9017284e2e40 +sym-and2_dm_4-pin-b_-15.24,b66b7374-0c9c-42c1-a440-ae1e74fc1f37 +sym-and2_dm_4-pin-out_15.24,38a5e609-f79a-461d-9f71-4089fe84d1f8 +sym-and2_dm_4-polygon-contour,57f42fe1-6c56-4529-b736-0b52d946bdac +sym-and2_dm_4-sym,264c7b9c-8926-40e9-beec-d4c6b85a43fc +sym-and2_dm_4-text-name,18e26a59-4f6c-43f0-ab00-a88c34e585b6 +sym-and2_dm_4-text-value,22f3c0f7-886b-4031-ad73-427f7ed0269c +sym-nand2_4-pin-a_-15.24,a1975fed-3020-4fa8-8dec-c85106fd4e9b +sym-nand2_4-pin-b_-15.24,c5dd740c-f0da-42a4-bd61-63c5fb8a904a +sym-nand2_4-pin-out_15.24,e75f2b90-5cbb-4c55-8c48-6266c6c0a3c7 +sym-nand2_4-polygon-contour,13e613c9-6ad6-4750-b361-3d22303c6d50 +sym-nand2_4-sym,7dc4cdeb-f1f0-47a5-9303-5aede0c62dd6 +sym-nand2_4-text-name,dd6ab3d5-370e-4791-8432-dbe5d596dc77 +sym-nand2_4-text-value,f62f9e69-eded-42d1-ab83-8df830c51911 +sym-nand2_dm_4-pin-a_-15.24,b2de0033-306e-496a-8e14-763f78f2beab +sym-nand2_dm_4-pin-b_-15.24,f83fecef-3915-4817-a7c3-89650a510827 +sym-nand2_dm_4-pin-out_15.24,f52aef48-988b-49f9-93e1-0b7569d60ba6 +sym-nand2_dm_4-polygon-contour,4ca7e4a4-20fc-499b-a635-8fe2cf53a504 +sym-nand2_dm_4-sym,f75ede3f-e302-4481-8d8b-99b7e30b25bd +sym-nand2_dm_4-text-name,74e35958-aadb-4258-9dcc-6dfa3023daa5 +sym-nand2_dm_4-text-value,ae107422-7a2d-4dbf-8861-bd643f2dea1f +sym-nor2_4-pin-a_-15.24,a1418454-166b-4ea2-bc99-501615116dca +sym-nor2_4-pin-b_-15.24,0f5126c2-4075-401a-b27e-741cfaa9bac8 +sym-nor2_4-pin-out_15.24,2521463d-c4ac-4c96-b50a-7d8e0f837a0a +sym-nor2_4-polygon-contour,bc394931-ae1e-42d9-83b9-dbac3c8fe352 +sym-nor2_4-sym,3ea52eae-fbe0-4794-a8fa-559f2534c8fd +sym-nor2_4-text-name,bba48606-4d92-4c07-86e3-445448bcd264 +sym-nor2_4-text-value,5f0481c4-f855-4a65-a781-b088fe73556a +sym-nor2_dm_4-pin-a_-15.24,19bfc94f-9632-4f5e-aebc-6e2513f749b9 +sym-nor2_dm_4-pin-b_-15.24,5c8252af-c751-4f59-9a5b-bed3f2935e68 +sym-nor2_dm_4-pin-out_15.24,25fb2fb1-6f73-454e-9584-0b20b8997e40 +sym-nor2_dm_4-polygon-contour,955aceb2-523a-43af-af63-2a06087bfbea +sym-nor2_dm_4-sym,e51f3659-ca65-49a3-a79c-ec280a559399 +sym-nor2_dm_4-text-name,deca1048-f3ea-4ac6-b374-2a67bb38eb68 +sym-nor2_dm_4-text-value,f7176430-3002-4469-8881-477fa4c35164 +sym-or2_4-pin-a_-15.24,ba001a82-d51a-4552-897a-665dda0a1639 +sym-or2_4-pin-b_-15.24,031772cf-d301-48e7-b4f8-3ec5549b98ad +sym-or2_4-pin-out_15.24,6d88211c-6940-4caf-8089-bb8c661b52ca +sym-or2_4-polygon-contour,1ef01e19-a8a3-4ed3-a53d-b5e7252fc91b +sym-or2_4-sym,ef11bc02-4da2-46c4-a47c-7a51a9dae230 +sym-or2_4-text-name,0e73f9f9-b009-4ae3-9264-c2cd5d67f1df +sym-or2_4-text-value,dd69e83a-ddf2-4070-9ab2-a74ebae766b5 +sym-or2_dm_4-pin-a_-15.24,bfc199ea-d18c-48b4-9434-6478b24cf211 +sym-or2_dm_4-pin-b_-15.24,63c270d7-6b4f-4d26-ab3e-00931880ff57 +sym-or2_dm_4-pin-out_15.24,29a3c0af-3b36-48eb-8188-1ff256a68b98 +sym-or2_dm_4-polygon-contour,a13f5f6c-a857-4549-9cd6-017c75460b47 +sym-or2_dm_4-sym,4a456fc8-d24e-4af7-89c2-9e78b41e2001 +sym-or2_dm_4-text-name,553190f8-d399-47ee-a0dd-bdceac8dbd12 +sym-or2_dm_4-text-value,0f4e8b3a-f710-413a-ac99-c4f9206e4fa4 +sym-xnor_4-pin-a_-15.24,cb5c2ac3-8d8d-4087-9e1a-dc7f632c0bc3 +sym-xnor_4-pin-b_-15.24,790f3f1e-e101-47a2-a09a-21b87bdaa90d +sym-xnor_4-pin-out_15.24,a1fd68e7-00dc-4a13-9252-cd7c1abb7743 +sym-xnor_4-polygon-contour,2c3f662b-dbd5-4648-9f77-66e8a122a384 +sym-xnor_4-sym,469c55b4-0584-4575-a701-7bc9d783c649 +sym-xnor_4-text-name,67916fb0-a407-4010-8d79-822f45f67659 +sym-xnor_4-text-value,659173c5-7e5f-4e93-8bc2-ca3575bc9956 +sym-xor_4-pin-a_-15.24,c5bbeff0-b6ca-4ceb-b15a-6bb0079d11f5 +sym-xor_4-pin-b_-15.24,b3b6b407-8265-484d-9219-bcea9e9a5ca2 +sym-xor_4-pin-out_15.24,654ba614-7f0d-4d6e-a910-235f236785f3 +sym-xor_4-polygon-contour,45455469-7a2a-420b-a646-799b6d9c266c +sym-xor_4-sym,4c7958b8-578e-4166-9bb8-4293de44071a +sym-xor_4-text-name,7c70627a-5fcd-4c48-a2e1-8fc325cf04f7 +sym-xor_4-text-value,0b30f5f4-681f-4cbc-bcec-f23a93deb15a diff --git a/Logic/uuid_cache_gates_cmpcat.csv b/Logic/uuid_cache_gates_cmpcat.csv new file mode 100644 index 00000000..ad2ee29f --- /dev/null +++ b/Logic/uuid_cache_gates_cmpcat.csv @@ -0,0 +1,10 @@ +cmpcat-and2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-xnor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-xor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 diff --git a/entities/symbol.py b/entities/symbol.py index 7a20680d..c4df4c18 100644 --- a/entities/symbol.py +++ b/entities/symbol.py @@ -1,7 +1,7 @@ from typing import List from .common import ( - Author, Category, Created, Deprecated, Description, Keywords, Length, Name, Polygon, Position, Rotation, Text, + Author, Category, Circle, Created, Deprecated, Description, Keywords, Length, Name, Polygon, Position, Rotation, Text, Version ) from .helper import indent_entities @@ -37,6 +37,7 @@ def __init__(self, uuid: str, name: Name, description: Description, self.category = category self.pins = [] # type: List[Pin] self.polygons = [] # type: List[Polygon] + self.circles = [] # type: List[Circle] self.texts = [] # type: List[Text] def add_pin(self, pin: Pin) -> None: @@ -48,6 +49,9 @@ def add_polygon(self, polygon: Polygon) -> None: def add_text(self, text: Text) -> None: self.texts.append(text) + def add_circle(self, circle: Circle) -> None: + self.circles.append(circle) + def __str__(self) -> str: ret = '(librepcb_symbol {}\n'.format(self.uuid) +\ ' {}\n'.format(self.name) +\ @@ -60,6 +64,7 @@ def __str__(self) -> str: ' {}\n'.format(self.category) ret += indent_entities(self.pins) ret += indent_entities(self.polygons) + ret += indent_entities(self.circles) ret += indent_entities(self.texts) ret += ')' return ret diff --git a/generate_logic_sym.py b/generate_logic_sym.py new file mode 100644 index 00000000..a0afa6f0 --- /dev/null +++ b/generate_logic_sym.py @@ -0,0 +1,323 @@ + +# importing csv module +import csv + +import argparse +from os import makedirs, path +from uuid import uuid4 +from typing import Optional +from common import init_cache, now, save_cache +from entities.common import ( + Align, Angle, Author, Category, Circle, Created, Description, Diameter, Fill, GrabArea, Height, Keywords, Layer, Length, + Name, Polygon, Position, Rotation, Text, Value, Version, Vertex, Width +) +from entities.symbol import Pin as SymbolPin +from entities.symbol import Symbol + +parser = argparse.ArgumentParser(description='create a symbol from csv file') +parser.add_argument("--design") +parser.add_argument("--group") +parser.add_argument("--directory") + +args = parser.parse_args() +design_name = args.design +group_name = args.group +directory_name = args.directory + +# initializing +boilerplate_raw_data = [] +cvs_raw_data = [] + + +""" + +""" + +generator = 'librepcb-parts-generator (generate_logic_sym.py)' + + +def uuid(category: str, kind: str, identifier: str) -> str: + """ + Return a uuid for the specified pin. + + Params: + category: + For example 'cmp' or 'pkg'. + kind: + For example 'pinheader' or 'pinsocket'. + identifier: + For example 'pad-1' or 'pin-13'. + """ + key = '{}-{}-{}'.format(category, kind, identifier).lower().replace(' ', '~') + if key not in uuid_cache: + uuid_cache[key] = str(uuid4()) + return uuid_cache[key] + + +width = 2.54 +line_width = 0.25 +pkg_text_height = 1.0 +sym_text_height = 2.54 + +boilerplate_cvs_file = 'Boilerplate_{}.csv'.format(group_name) + +with open(boilerplate_cvs_file, 'r') as CSVBfile: + # creating a csv reader object + CSVbreader = csv.reader(CSVBfile) + # extracting each data row one by one + for brow in CSVbreader: + boilerplate_raw_data.append(brow) + + print(" Total no. of rows: %d" % (CSVbreader.line_num)) + num_of_brows = CSVbreader.line_num + +for brow in boilerplate_raw_data[:num_of_brows]: + # parsing each column of a row + row_type = brow[0] + if row_type == "CREATE": + create_date = brow[1] + if row_type == "VERSION": + version = brow[1] + if row_type == "AUTHOR": + author = brow[1] + if row_type == "KEYWORDS": + keywords = brow[1] + if len(brow) > 2: + for p in range(2, len(brow)): + keywords = '{},{}'.format(keywords, brow[p]) + +print(" Create Date : {}".format(create_date)) +print(" Version : {}".format(version)) +print(" Author : {}".format(author)) +print(" Keywords : {}".format(keywords)) + + +cvs_file = '{}{}.csv'.format(directory_name, design_name) + +with open(cvs_file, 'r') as CSVxfile: + # creating a csv reader object + CSVxreader = csv.reader(CSVxfile) + # extracting each data row one by one + for row in CSVxreader: + cvs_raw_data.append(row) + + print(" Total no. of rows: %d" % (CSVxreader.line_num)) + num_of_rows = CSVxreader.line_num + +for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + if row_type == "KEYWORDS": + keywords = '{},{}'.format(keywords, row[1]) + if row_type == "DEF": + def_name = row[1] + +uuid_cmpcat_file = 'uuid_cache_{}_cmpcat.csv'.format(group_name) +uuid_cache = init_cache(uuid_cmpcat_file) +cmpcat = uuid('cmpcat', def_name, "cmpcat") +save_cache(uuid_cmpcat_file, uuid_cache) + +# Initialize UUID cache +uuid_cache_file = 'uuid_cache_{}.csv'.format(group_name) +uuid_cache = init_cache(uuid_cache_file) + + +def generate_sym( + cvs_file: str, + dirpath: str, + author: str, + keywords: str, + version: str, + cmpcat: str, + create_date: Optional[str], +) -> None: + category = 'sym' + scale = 1 + pad_type = [] + pad_name = [] + pad_posx = [] + pad_posy = [] + pad_length = [] + pad_orientation = [] + uuid_pins = [] + num_of_pins = 0 + low_x = 0 + low_y = 0 + high_x = 0 + high_y = 0 + + for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + + if row_type == "DEF": + def_name = row[1] + if row_type == "PIN": + + pin_type = row[2] + if pin_type == "R": + pad_orientation.append(0.0) + if pin_type == "L": + pad_orientation.append(180.0) + if pin_type == "D": + pad_orientation.append(270.0) + + if pin_type == "U": + pad_orientation.append(90.0) + + pad_name.append(row[1]) + pad_type.append(row[2]) + pad_posx.append(float(row[3]) / scale) + pad_posy.append(float(row[4]) / scale) + pad_length.append(float(row[5]) / scale) + uuid_pins.append(uuid('sym', def_name, 'pin-{}_{}'.format(row[1], row[3]))) + num_of_pins = num_of_pins + 1 + + uuid_sym = uuid('sym', '{}'.format(def_name), 'sym') + + def _uuid(identifier: str) -> str: + return uuid(category, def_name, identifier) + + uuid_polygon = _uuid('polygon-contour') + uuid_text_name = _uuid('text-name') + uuid_text_value = _uuid('text-value') + sym_name = '{}'.format(def_name) + + # General info + symbol = Symbol( + uuid_sym, + Name('{}'.format(sym_name)), + Description('created from file--- {}.\\n' + 'Generated with {}'.format(cvs_file, generator)), + Keywords('{}'.format( keywords)), + Author(author), + Version(version), + Created(create_date or now()), + Category(cmpcat), + ) + + for p in range(1, num_of_pins + 1, 1): + # parsing each column of a row + pin_type = pad_type[p - 1] + pin_name = pad_name[p - 1] + pin_posx = pad_posx[p - 1] + pin_posy = pad_posy[p - 1] + pin_orient = pad_orientation[p - 1] + + pin = SymbolPin( + uuid_pins[p - 1], + Name( pin_name), + Position(pin_posx, pin_posy), + Rotation(pin_orient), + Length(0.0) + ) + + symbol.add_pin(pin) + + # Polygons + for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + if row_type == "POLY": + fill = row[2] + fill_str = "False" + if fill == "F": + fill_str = "True" + print('POLY {} '.format( row[1])) + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(fill_str) + ) + + if row_type == "POLYPT": + print('POLYPT {} {} {}'.format( row[1], row[2], row[3])) + poly_x = float(row[1]) / scale + poly_y = float(row[2]) / scale + poly_angle = float(row[3]) + polygon.add_vertex(Vertex(Position(poly_x, poly_y), Angle(poly_angle))) + + if row_type == "POLYST": + print('POLY Stop ') + symbol.add_polygon(polygon) + + if row_type == "RECT": + low_x = float(row[1]) / scale + low_y = float(row[2]) / scale + high_x = float(row[3]) / scale + high_y = float(row[4]) / scale + print('Rectangle ') + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(True) + ) + polygon.add_vertex(Vertex(Position(low_x, low_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(low_x, high_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(high_x, high_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(high_x, low_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(low_x, low_y), Angle(0.0))) + symbol.add_polygon(polygon) + + if row_type == "CIRC": + pos_x = float(row[1]) / scale + pos_y = float(row[2]) / scale + dia = float(row[3]) / scale + + print('Circle ') + circle = Circle( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(True), + Diameter(dia), + Position(pos_x, pos_y) + ) + symbol.add_circle(circle) + + if row_type == "TEXT": + pos_x = float(row[1]) / scale + pos_y = float(row[2]) / scale + textfield = row[3] + if textfield == "NAME": + text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('center bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) + if textfield == "VALUE": + text = Text(uuid_text_value, Layer('sym_values'), Value('{{VALUE}}'), Align('center bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) + symbol.add_text(text) + + sym_dir_path = path.join(dirpath, uuid_sym) + if not (path.exists(sym_dir_path) and path.isdir(sym_dir_path)): + makedirs(sym_dir_path) + with open(path.join(sym_dir_path, '.librepcb-sym'), 'w') as f: + f.write('0.1\n') + with open(path.join(sym_dir_path, 'symbol.lp'), 'w') as f: + f.write(str(symbol)) + f.write('\n') + + print(' {}: Wrote symbol {}'.format( def_name, uuid_sym)) + + +if __name__ == '__main__': + def _make(dirpath: str) -> None: + if not (path.exists(dirpath) and path.isdir(dirpath)): + makedirs(dirpath) + _make('out') + _make('out/{}'.format(group_name)) + _make('out/{}/sym'.format(group_name)) + + generate_sym( + cvs_file=cvs_file, + dirpath='out/{}/sym'.format(group_name), + author=author, + version=version, + keywords=keywords, + cmpcat=cmpcat, + create_date=create_date, + ) + + save_cache(uuid_cache_file, uuid_cache) From 7baccf184722983f5e0daca99dc37d01ea78050d Mon Sep 17 00:00:00 2001 From: ouabache Date: Thu, 19 Mar 2020 17:51:17 -0700 Subject: [PATCH 02/23] added support for pin lengths added extra parts --- Logic/Boilerplate_buffer.csv | 4 + Logic/Boilerplate_flipflop.csv | 4 + Logic/Logic/AND2_4.csv | 6 +- Logic/Logic/AND2_dm_4.csv | 6 +- Logic/Logic/AND3_4.csv | 32 +++ Logic/Logic/BUFFER_4.csv | 12 + Logic/Logic/INV_4.csv | 13 ++ Logic/Logic/NAND2_4.csv | 6 +- Logic/Logic/NAND2_dm_4.csv | 6 +- Logic/Logic/NAND3_4.csv | 33 +++ Logic/Logic/NOR2_4.csv | 6 +- Logic/Logic/NOR2_dm_4.csv | 6 +- Logic/Logic/NOR3_4.csv | 34 +++ Logic/Logic/OR2_4.csv | 6 +- Logic/Logic/OR2_dm_4.csv | 6 +- Logic/Logic/OR3_4.csv | 33 +++ Logic/Logic/QQN_RNPN_4.csv | 33 +++ Logic/Logic/XNOR_4.csv | 6 +- Logic/Logic/XOR_4.csv | 6 +- Logic/script | 7 + Logic/uuid_cache_buffer.csv | 6 + Logic/uuid_cache_buffer_cmpcat.csv | 1 + Logic/uuid_cache_flipflop.csv | 10 + Logic/uuid_cache_flipflop_cmpcat.csv | 1 + Logic/uuid_cache_gates.csv | 38 ++++ Logic/uuid_cache_gates_cmpcat.csv | 5 + generate_logic_sym.py | 4 +- generate_sym.py | 323 +++++++++++++++++++++++++++ 28 files changed, 621 insertions(+), 32 deletions(-) create mode 100644 Logic/Boilerplate_buffer.csv create mode 100644 Logic/Boilerplate_flipflop.csv create mode 100644 Logic/Logic/AND3_4.csv create mode 100644 Logic/Logic/BUFFER_4.csv create mode 100644 Logic/Logic/INV_4.csv create mode 100644 Logic/Logic/NAND3_4.csv create mode 100644 Logic/Logic/NOR3_4.csv create mode 100644 Logic/Logic/OR3_4.csv create mode 100644 Logic/Logic/QQN_RNPN_4.csv create mode 100644 Logic/uuid_cache_buffer.csv create mode 100644 Logic/uuid_cache_buffer_cmpcat.csv create mode 100644 Logic/uuid_cache_flipflop.csv create mode 100644 Logic/uuid_cache_flipflop_cmpcat.csv create mode 100644 generate_sym.py diff --git a/Logic/Boilerplate_buffer.csv b/Logic/Boilerplate_buffer.csv new file mode 100644 index 00000000..4180f5dc --- /dev/null +++ b/Logic/Boilerplate_buffer.csv @@ -0,0 +1,4 @@ +KEYWORDS,digital,logic,buffer +CREATE,2019-12-17T00:00:00Z +VERSION,0.1 +AUTHOR,John E. diff --git a/Logic/Boilerplate_flipflop.csv b/Logic/Boilerplate_flipflop.csv new file mode 100644 index 00000000..76c8bfb4 --- /dev/null +++ b/Logic/Boilerplate_flipflop.csv @@ -0,0 +1,4 @@ +KEYWORDS,digital,logic,flipflop +CREATE,2019-12-17T00:00:00Z +VERSION,0.1 +AUTHOR,John E. diff --git a/Logic/Logic/AND2_4.csv b/Logic/Logic/AND2_4.csv index 9db70788..c95c853a 100644 --- a/Logic/Logic/AND2_4.csv +++ b/Logic/Logic/AND2_4.csv @@ -20,8 +20,8 @@ POLY,10,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_dm_4.csv b/Logic/Logic/AND2_dm_4.csv index 7a6fed85..08604146 100644 --- a/Logic/Logic/AND2_dm_4.csv +++ b/Logic/Logic/AND2_dm_4.csv @@ -25,8 +25,8 @@ POLYST CIRC,11.43,0,2.54 CIRC,-9.97,5.08,2.54 CIRC,-9.97,-5.08,2.54 -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND3_4.csv b/Logic/Logic/AND3_4.csv new file mode 100644 index 00000000..85a9185b --- /dev/null +++ b/Logic/Logic/AND3_4.csv @@ -0,0 +1,32 @@ +DEF,AND3_4 +KEYWORDS,gates +KEYWORDS,and +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-10.16,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,0,0 +POLYPT,-10.16,0,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-10.16,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,0,0 +PIN,C,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/BUFFER_4.csv b/Logic/Logic/BUFFER_4.csv new file mode 100644 index 00000000..66edee60 --- /dev/null +++ b/Logic/Logic/BUFFER_4.csv @@ -0,0 +1,12 @@ +DEF,BUFFER_4 +KEYWORDS,buffer +POLY,10,F +POLYPT,-5.08,-7.62,0 +POLYPT,-5.08,7.62,0 +POLYPT,10.16,0,0 +POLYPT,-5.08,-7.62,0 +POLYST +PIN,A,R,-15.24,0,10.16 +PIN,OUT,L,15.24,0,5.08 +TEXT,2.54,7.62,NAME +TEXT,2.54,-10.16,VALUE \ No newline at end of file diff --git a/Logic/Logic/INV_4.csv b/Logic/Logic/INV_4.csv new file mode 100644 index 00000000..cba7e346 --- /dev/null +++ b/Logic/Logic/INV_4.csv @@ -0,0 +1,13 @@ +DEF,INV_4 +KEYWORDS,inverter +POLY,10,F +POLYPT,-5.08,-7.62,0 +POLYPT,-5.08,7.62,0 +POLYPT,10.16,0,0 +POLYPT,-5.08,-7.62,0 +POLYST +CIRC,11.43,0,2.54 +PIN,A,R,-15.24,0,10.16 +PIN,OUT,L,15.24,0,2.54 +TEXT,2.54,7.62,NAME +TEXT,2.54,-10.16,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_4.csv b/Logic/Logic/NAND2_4.csv index 282aad1e..7d09507c 100644 --- a/Logic/Logic/NAND2_4.csv +++ b/Logic/Logic/NAND2_4.csv @@ -21,8 +21,8 @@ POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST CIRC,11.43,0,2.54 -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_dm_4.csv b/Logic/Logic/NAND2_dm_4.csv index 45b1158d..36d66735 100644 --- a/Logic/Logic/NAND2_dm_4.csv +++ b/Logic/Logic/NAND2_dm_4.csv @@ -24,8 +24,8 @@ POLYPT,10.16,0,0 POLYST CIRC,-9.97,5.08,2.54 CIRC,-9.97,-5.08,2.54 -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND3_4.csv b/Logic/Logic/NAND3_4.csv new file mode 100644 index 00000000..2afb6ea4 --- /dev/null +++ b/Logic/Logic/NAND3_4.csv @@ -0,0 +1,33 @@ +DEF,NAND3_4 +KEYWORDS,gates +KEYWORDS,nand +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-10.16,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,0,0 +POLYPT,-10.16,0,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-10.16,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,11.43,0,2.54 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,0,0 +PIN,C,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_4.csv b/Logic/Logic/NOR2_4.csv index 967622a1..9c3f1870 100644 --- a/Logic/Logic/NOR2_4.csv +++ b/Logic/Logic/NOR2_4.csv @@ -22,8 +22,8 @@ POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST CIRC,11.43,0,2.54 -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_dm_4.csv b/Logic/Logic/NOR2_dm_4.csv index ad6b4e9f..90b970d6 100644 --- a/Logic/Logic/NOR2_dm_4.csv +++ b/Logic/Logic/NOR2_dm_4.csv @@ -23,8 +23,8 @@ POLYPT,10.16,0,0 POLYST CIRC,-11.43,5.08,2.54 CIRC,-11.43,-5.08,2.54 -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR3_4.csv b/Logic/Logic/NOR3_4.csv new file mode 100644 index 00000000..8570bc38 --- /dev/null +++ b/Logic/Logic/NOR3_4.csv @@ -0,0 +1,34 @@ +DEF,NOR3_4 +KEYWORDS,gates +KEYWORDS,nor +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,0,0 +POLYPT,-7.8,0,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,11.43,0,2.54 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,0,0 +PIN,C,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_4.csv b/Logic/Logic/OR2_4.csv index 757c76ec..ec728892 100644 --- a/Logic/Logic/OR2_4.csv +++ b/Logic/Logic/OR2_4.csv @@ -21,8 +21,8 @@ POLY,10,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_dm_4.csv b/Logic/Logic/OR2_dm_4.csv index 117f35dd..8b27d3bb 100644 --- a/Logic/Logic/OR2_dm_4.csv +++ b/Logic/Logic/OR2_dm_4.csv @@ -24,8 +24,8 @@ POLYST CIRC,11.43,0,2.54 CIRC,-11.43,5.08,2.54 CIRC,-11.43,-5.08,2.54 -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR3_4.csv b/Logic/Logic/OR3_4.csv new file mode 100644 index 00000000..d6f630e8 --- /dev/null +++ b/Logic/Logic/OR3_4.csv @@ -0,0 +1,33 @@ +DEF,OR3_4 +KEYWORDS,gates +KEYWORDS,or +POLY,10,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,10,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,10,N +POLYPT,-15.24,0,0 +POLYPT,-7.8,0,0 +POLYST +POLY,10,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,10,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,0,0 +PIN,C,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/QQN_RNPN_4.csv b/Logic/Logic/QQN_RNPN_4.csv new file mode 100644 index 00000000..0e5fc08a --- /dev/null +++ b/Logic/Logic/QQN_RNPN_4.csv @@ -0,0 +1,33 @@ +DEF,QQN_RNPN_4 +POLY,10,F +POLYPT,-10.16,10.16,0 +POLYPT,10.16,10.16,0 +POLYPT,10.16,-10.16,0 +POLYPT,-10.16,-10.16,0 +POLYPT,-10.16,10.16,0 +POLYST +POLY,10,N +POLYPT,-10.16,-6.35,0 +POLYPT,-7.62,-5.08,0 +POLYPT,-10.16,-3.81,0 +POLYST +POLY,10,N +POLYPT,-12.7,-15.24,0 +POLYPT,0,-15.24,0 +POLYPT,0,-12.7,0 +POLYST +POLY,10,N +POLYPT,-12.7,15.24,0 +POLYPT,0,15.24,0 +POLYPT,0,12.7,0 +POLYST +CIRC,0,11.43,2.54 +CIRC,0,-11.43,2.54 +PIN,D,R,-15.24,5.08,5.08 +PIN,CLK,R,-15.24,-5.08,5.08 +PIN,RST_N,R,-15.24,-15.24,5.08 +PIN,PRE_N,R,-15.24,15.24,5.08 +PIN,Q,L,15.24,5.08,5.08 +PIN,Q_N,L,15.24,-5.08,5.08 +TEXT,-12.7,10.16,NAME +TEXT,-15.24,-15.24,VALUE \ No newline at end of file diff --git a/Logic/Logic/XNOR_4.csv b/Logic/Logic/XNOR_4.csv index a8426fa5..2ebf9265 100644 --- a/Logic/Logic/XNOR_4.csv +++ b/Logic/Logic/XNOR_4.csv @@ -26,8 +26,8 @@ POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST CIRC,11.43,0,2.54 -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/Logic/XOR_4.csv b/Logic/Logic/XOR_4.csv index f7933c37..287db7c2 100644 --- a/Logic/Logic/XOR_4.csv +++ b/Logic/Logic/XOR_4.csv @@ -25,8 +25,8 @@ POLY,10,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST -PIN,A,R,-15.24,5.08,7.62 -PIN,B,R,-15.24,-5.08,7.62 -PIN,OUT,L,15.24,0,7.62 +PIN,A,R,-15.24,5.08,0 +PIN,B,R,-15.24,-5.08,0 +PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME TEXT,-2.54,-11.43,VALUE \ No newline at end of file diff --git a/Logic/script b/Logic/script index 72be37c2..1f739714 100755 --- a/Logic/script +++ b/Logic/script @@ -1,11 +1,18 @@ rm -r out/Logic python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_4 +python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design QQN_RNPN_4 diff --git a/Logic/uuid_cache_buffer.csv b/Logic/uuid_cache_buffer.csv new file mode 100644 index 00000000..c74f733f --- /dev/null +++ b/Logic/uuid_cache_buffer.csv @@ -0,0 +1,6 @@ +sym-buffer_4-pin-a_-15.24,2ab415b5-be67-4851-9edd-1e8f8c572b14 +sym-buffer_4-pin-out_15.24,4ac2607c-814e-4172-8d25-9185da2d5756 +sym-buffer_4-polygon-contour,5ec2cf07-6fb0-4461-ae32-fa3b53443207 +sym-buffer_4-sym,d7b7d172-16b3-4309-9846-cfeca61efdc5 +sym-buffer_4-text-name,dca1cc75-774d-4411-a837-96d30e91969d +sym-buffer_4-text-value,28b3f255-c8d5-4c97-8139-fb0caf6d4aaa diff --git a/Logic/uuid_cache_buffer_cmpcat.csv b/Logic/uuid_cache_buffer_cmpcat.csv new file mode 100644 index 00000000..c979ff8d --- /dev/null +++ b/Logic/uuid_cache_buffer_cmpcat.csv @@ -0,0 +1 @@ +cmpcat-buffer_4-cmpcat,56f01b1d-0723-4c33-88f7-9968cf96b50f diff --git a/Logic/uuid_cache_flipflop.csv b/Logic/uuid_cache_flipflop.csv new file mode 100644 index 00000000..47f3156d --- /dev/null +++ b/Logic/uuid_cache_flipflop.csv @@ -0,0 +1,10 @@ +sym-qqn_rnpn_4-pin-clk_-15.24,454f77a1-47a3-41ac-9269-191e323fcf7f +sym-qqn_rnpn_4-pin-d_-15.24,8f87316b-5780-45c8-ad0b-70aaad386632 +sym-qqn_rnpn_4-pin-pre_n_-15.24,e3968c20-c111-45cd-a192-c3a2f2d82dc5 +sym-qqn_rnpn_4-pin-q_15.24,0ae0010c-969c-45c5-b8c9-704f5475ec85 +sym-qqn_rnpn_4-pin-q_n_15.24,ff309f0f-1bdc-4f71-8164-8b9ea0a5043d +sym-qqn_rnpn_4-pin-rst_n_-15.24,f8dc8a04-d0e3-4191-9dd4-787bb7df93e8 +sym-qqn_rnpn_4-polygon-contour,23359ee2-1144-4a27-9956-7ec7bb2e542c +sym-qqn_rnpn_4-sym,461d3234-12ad-4e19-8f3e-2a923b167f69 +sym-qqn_rnpn_4-text-name,e7b89a11-36cb-437d-a859-2b7be3e5aeac +sym-qqn_rnpn_4-text-value,c015efbf-a091-4f88-a3c2-e52008869c3f diff --git a/Logic/uuid_cache_flipflop_cmpcat.csv b/Logic/uuid_cache_flipflop_cmpcat.csv new file mode 100644 index 00000000..a01ff21b --- /dev/null +++ b/Logic/uuid_cache_flipflop_cmpcat.csv @@ -0,0 +1 @@ +cmpcat-qqn_rnpn_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv index bf5a15fc..340da9d0 100644 --- a/Logic/uuid_cache_gates.csv +++ b/Logic/uuid_cache_gates.csv @@ -12,6 +12,20 @@ sym-and2_dm_4-polygon-contour,57f42fe1-6c56-4529-b736-0b52d946bdac sym-and2_dm_4-sym,264c7b9c-8926-40e9-beec-d4c6b85a43fc sym-and2_dm_4-text-name,18e26a59-4f6c-43f0-ab00-a88c34e585b6 sym-and2_dm_4-text-value,22f3c0f7-886b-4031-ad73-427f7ed0269c +sym-and3_4-pin-a_-15.24,41520a7d-d8ad-4ded-9111-c37cfb8ac1c7 +sym-and3_4-pin-b_-15.24,8bb5af77-c6c4-46f0-bebb-3c9e21166943 +sym-and3_4-pin-c_-15.24,00db6a08-10cc-4210-bd91-1b767d437b77 +sym-and3_4-pin-out_15.24,8dabb99a-b106-4ffe-9684-3a5d1c28299d +sym-and3_4-polygon-contour,c824c807-0189-4dc7-9d8b-57abb5003b7a +sym-and3_4-sym,e976075b-6e73-4d8f-a202-e67949951071 +sym-and3_4-text-name,0ed2e659-d549-43b9-ad30-b63e41aff236 +sym-and3_4-text-value,f5fb6992-737a-4efb-b181-4c063eab0f59 +sym-inv_4-pin-a_-15.24,e11fc48b-53a3-40b7-bfe5-1109f774c20b +sym-inv_4-pin-out_15.24,9d32012b-1f63-4d05-baa2-14c7d0916db7 +sym-inv_4-polygon-contour,2f6db1df-339e-463b-92ed-1fdc63384649 +sym-inv_4-sym,e98daf14-8056-447f-b9d5-bf4cc6353fb3 +sym-inv_4-text-name,4876a8ce-2432-4ed0-80c8-e510ff0b4dc5 +sym-inv_4-text-value,38b705ac-eb66-47f8-b7c5-91eb537cb00f sym-nand2_4-pin-a_-15.24,a1975fed-3020-4fa8-8dec-c85106fd4e9b sym-nand2_4-pin-b_-15.24,c5dd740c-f0da-42a4-bd61-63c5fb8a904a sym-nand2_4-pin-out_15.24,e75f2b90-5cbb-4c55-8c48-6266c6c0a3c7 @@ -26,6 +40,14 @@ sym-nand2_dm_4-polygon-contour,4ca7e4a4-20fc-499b-a635-8fe2cf53a504 sym-nand2_dm_4-sym,f75ede3f-e302-4481-8d8b-99b7e30b25bd sym-nand2_dm_4-text-name,74e35958-aadb-4258-9dcc-6dfa3023daa5 sym-nand2_dm_4-text-value,ae107422-7a2d-4dbf-8861-bd643f2dea1f +sym-nand3_4-pin-a_-15.24,30767fbb-bde1-46c5-9889-8a6e65093019 +sym-nand3_4-pin-b_-15.24,284f7bf3-c45d-441e-b5af-d4917a263269 +sym-nand3_4-pin-c_-15.24,cda2d381-ec08-4038-8681-e08d61cb433d +sym-nand3_4-pin-out_15.24,05d99887-7b5b-47a8-93cd-afcad5f9aa58 +sym-nand3_4-polygon-contour,edc1c08b-472b-4bda-801a-924b0a7f15cc +sym-nand3_4-sym,a29aa8a4-af94-4e81-ad39-d7ea2e3163f5 +sym-nand3_4-text-name,05057d9a-1fa7-43bc-9c6a-0cff08627f9b +sym-nand3_4-text-value,609cdc1d-216b-4eed-b841-f34d55b2e2cb sym-nor2_4-pin-a_-15.24,a1418454-166b-4ea2-bc99-501615116dca sym-nor2_4-pin-b_-15.24,0f5126c2-4075-401a-b27e-741cfaa9bac8 sym-nor2_4-pin-out_15.24,2521463d-c4ac-4c96-b50a-7d8e0f837a0a @@ -40,6 +62,14 @@ sym-nor2_dm_4-polygon-contour,955aceb2-523a-43af-af63-2a06087bfbea sym-nor2_dm_4-sym,e51f3659-ca65-49a3-a79c-ec280a559399 sym-nor2_dm_4-text-name,deca1048-f3ea-4ac6-b374-2a67bb38eb68 sym-nor2_dm_4-text-value,f7176430-3002-4469-8881-477fa4c35164 +sym-nor3_4-pin-a_-15.24,35f884af-a209-41a6-b135-57e1475ebb9e +sym-nor3_4-pin-b_-15.24,180c7719-8d61-49e7-bdd8-701ce0f60430 +sym-nor3_4-pin-c_-15.24,7e09a0f9-250e-4435-ba7d-cf1bfa10a94f +sym-nor3_4-pin-out_15.24,e4d62ee0-92ae-4f6d-a0ff-1caf4a770a64 +sym-nor3_4-polygon-contour,d0cbbc4f-f409-4f3b-a203-d07a1099c2b8 +sym-nor3_4-sym,46e622a4-1947-4fe3-92a4-15d03a3555e3 +sym-nor3_4-text-name,28fd63cb-9634-4a81-9d7e-48f16a94336b +sym-nor3_4-text-value,5d384a97-2d39-424b-9355-c274519ba55e sym-or2_4-pin-a_-15.24,ba001a82-d51a-4552-897a-665dda0a1639 sym-or2_4-pin-b_-15.24,031772cf-d301-48e7-b4f8-3ec5549b98ad sym-or2_4-pin-out_15.24,6d88211c-6940-4caf-8089-bb8c661b52ca @@ -54,6 +84,14 @@ sym-or2_dm_4-polygon-contour,a13f5f6c-a857-4549-9cd6-017c75460b47 sym-or2_dm_4-sym,4a456fc8-d24e-4af7-89c2-9e78b41e2001 sym-or2_dm_4-text-name,553190f8-d399-47ee-a0dd-bdceac8dbd12 sym-or2_dm_4-text-value,0f4e8b3a-f710-413a-ac99-c4f9206e4fa4 +sym-or3_4-pin-a_-15.24,ae49313e-b2b0-437b-a73e-edd6d0159c37 +sym-or3_4-pin-b_-15.24,6d69b869-f9e2-40b2-925c-5aed98913b94 +sym-or3_4-pin-c_-15.24,c7247b30-882e-42c9-8cff-062c244bd9f3 +sym-or3_4-pin-out_15.24,0bce2119-2a0c-4278-baa9-34b62377e8f4 +sym-or3_4-polygon-contour,7847eb99-5efe-4e06-a74d-366077b7bed8 +sym-or3_4-sym,242a5682-984a-4bb3-8841-b631a0303125 +sym-or3_4-text-name,4e8b5d6c-094c-4385-b265-c521047fa582 +sym-or3_4-text-value,4c53fde9-71d9-4a19-b2af-05f8f8c5c801 sym-xnor_4-pin-a_-15.24,cb5c2ac3-8d8d-4087-9e1a-dc7f632c0bc3 sym-xnor_4-pin-b_-15.24,790f3f1e-e101-47a2-a09a-21b87bdaa90d sym-xnor_4-pin-out_15.24,a1fd68e7-00dc-4a13-9252-cd7c1abb7743 diff --git a/Logic/uuid_cache_gates_cmpcat.csv b/Logic/uuid_cache_gates_cmpcat.csv index ad2ee29f..269e2ff7 100644 --- a/Logic/uuid_cache_gates_cmpcat.csv +++ b/Logic/uuid_cache_gates_cmpcat.csv @@ -1,10 +1,15 @@ cmpcat-and2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-inv_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xnor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 diff --git a/generate_logic_sym.py b/generate_logic_sym.py index a0afa6f0..e3fbb364 100644 --- a/generate_logic_sym.py +++ b/generate_logic_sym.py @@ -203,13 +203,13 @@ def _uuid(identifier: str) -> str: pin_posx = pad_posx[p - 1] pin_posy = pad_posy[p - 1] pin_orient = pad_orientation[p - 1] - + pin_length = pad_length[p - 1] pin = SymbolPin( uuid_pins[p - 1], Name( pin_name), Position(pin_posx, pin_posy), Rotation(pin_orient), - Length(0.0) + Length(pin_length) ) symbol.add_pin(pin) diff --git a/generate_sym.py b/generate_sym.py new file mode 100644 index 00000000..a1bc4fd9 --- /dev/null +++ b/generate_sym.py @@ -0,0 +1,323 @@ + +# importing csv module +import csv + +import argparse +from os import makedirs, path +from uuid import uuid4 +from typing import Optional +from common import init_cache, now, save_cache +from entities.common import ( + Align, Angle, Author, Category, Circle, Created, Description, Diameter, Fill, GrabArea, Height, Keywords, Layer, Length, + Name, Polygon, Position, Rotation, Text, Value, Version, Vertex, Width +) +from entities.symbol import Pin as SymbolPin +from entities.symbol import Symbol + +parser = argparse.ArgumentParser(description='create a symbol from csv file') +parser.add_argument("--design") +parser.add_argument("--group") +parser.add_argument("--directory") + +args = parser.parse_args() +design_name = args.design +group_name = args.group +directory_name = args.directory + +# initializing +boilerplate_raw_data = [] +cvs_raw_data = [] + + +""" + +""" + +generator = 'librepcb-parts-generator (generate_sym.py)' + + +def uuid(category: str, kind: str, identifier: str) -> str: + """ + Return a uuid for the specified pin. + + Params: + category: + For example 'cmp' or 'pkg'. + kind: + For example 'pinheader' or 'pinsocket'. + identifier: + For example 'pad-1' or 'pin-13'. + """ + key = '{}-{}-{}'.format(category, kind, identifier).lower().replace(' ', '~') + if key not in uuid_cache: + uuid_cache[key] = str(uuid4()) + return uuid_cache[key] + + +width = 2.54 +line_width = 0.25 +pkg_text_height = 1.0 +sym_text_height = 2.54 + +boilerplate_cvs_file = 'Boilerplate_{}.csv'.format(group_name) + +with open(boilerplate_cvs_file, 'r') as CSVBfile: + # creating a csv reader object + CSVbreader = csv.reader(CSVBfile) + # extracting each data row one by one + for brow in CSVbreader: + boilerplate_raw_data.append(brow) + + print(" Total no. of rows: %d" % (CSVbreader.line_num)) + num_of_brows = CSVbreader.line_num + +for brow in boilerplate_raw_data[:num_of_brows]: + # parsing each column of a row + row_type = brow[0] + if row_type == "CREATE": + create_date = brow[1] + if row_type == "VERSION": + version = brow[1] + if row_type == "AUTHOR": + author = brow[1] + if row_type == "KEYWORDS": + keywords = brow[1] + if len(brow) > 2: + for p in range(2, len(brow)): + keywords = '{},{}'.format(keywords, brow[p]) + +print(" Create Date : {}".format(create_date)) +print(" Version : {}".format(version)) +print(" Author : {}".format(author)) +print(" Keywords : {}".format(keywords)) + + +cvs_file = '{}{}.csv'.format(directory_name, design_name) + +with open(cvs_file, 'r') as CSVxfile: + # creating a csv reader object + CSVxreader = csv.reader(CSVxfile) + # extracting each data row one by one + for row in CSVxreader: + cvs_raw_data.append(row) + + print(" Total no. of rows: %d" % (CSVxreader.line_num)) + num_of_rows = CSVxreader.line_num + +for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + if row_type == "KEYWORDS": + keywords = '{},{}'.format(keywords, row[1]) + if row_type == "DEF": + def_name = row[1] + +uuid_cmpcat_file = 'uuid_cache_{}_cmpcat.csv'.format(group_name) +uuid_cache = init_cache(uuid_cmpcat_file) +cmpcat = uuid('cmpcat', def_name, "cmpcat") +save_cache(uuid_cmpcat_file, uuid_cache) + +# Initialize UUID cache +uuid_cache_file = 'uuid_cache_{}.csv'.format(group_name) +uuid_cache = init_cache(uuid_cache_file) + + +def generate_sym( + cvs_file: str, + dirpath: str, + author: str, + keywords: str, + version: str, + cmpcat: str, + create_date: Optional[str], +) -> None: + category = 'sym' + scale = 1 + pad_type = [] + pad_name = [] + pad_posx = [] + pad_posy = [] + pad_length = [] + pad_orientation = [] + uuid_pins = [] + num_of_pins = 0 + low_x = 0 + low_y = 0 + high_x = 0 + high_y = 0 + + for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + + if row_type == "DEF": + def_name = row[1] + if row_type == "PIN": + + pin_type = row[2] + if pin_type == "R": + pad_orientation.append(0.0) + if pin_type == "L": + pad_orientation.append(180.0) + if pin_type == "D": + pad_orientation.append(270.0) + + if pin_type == "U": + pad_orientation.append(90.0) + + pad_name.append(row[1]) + pad_type.append(row[2]) + pad_posx.append(float(row[3]) / scale) + pad_posy.append(float(row[4]) / scale) + pad_length.append(float(row[5]) / scale) + uuid_pins.append(uuid('sym', def_name, 'pin-{}_{}'.format(row[1], row[3]))) + num_of_pins = num_of_pins + 1 + + uuid_sym = uuid('sym', '{}'.format(def_name), 'sym') + + def _uuid(identifier: str) -> str: + return uuid(category, def_name, identifier) + + uuid_polygon = _uuid('polygon-contour') + uuid_text_name = _uuid('text-name') + uuid_text_value = _uuid('text-value') + sym_name = '{}'.format(def_name) + + # General info + symbol = Symbol( + uuid_sym, + Name('{}'.format(sym_name)), + Description('created from file--- {}.\\n' + 'Generated with {}'.format(cvs_file, generator)), + Keywords('{}'.format( keywords)), + Author(author), + Version(version), + Created(create_date or now()), + Category(cmpcat), + ) + + for p in range(1, num_of_pins + 1, 1): + # parsing each column of a row + pin_type = pad_type[p - 1] + pin_name = pad_name[p - 1] + pin_posx = pad_posx[p - 1] + pin_posy = pad_posy[p - 1] + pin_orient = pad_orientation[p - 1] + + pin = SymbolPin( + uuid_pins[p - 1], + Name( pin_name), + Position(pin_posx, pin_posy), + Rotation(pin_orient), + Length(0.0) + ) + + symbol.add_pin(pin) + + # Polygons + for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + if row_type == "POLY": + fill = row[2] + fill_str = "False" + if fill == "F": + fill_str = "True" + print('POLY {} '.format( row[1])) + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(fill_str) + ) + + if row_type == "POLYPT": + print('POLYPT {} {} {}'.format( row[1], row[2], row[3])) + poly_x = float(row[1]) / scale + poly_y = float(row[2]) / scale + poly_angle = float(row[3]) + polygon.add_vertex(Vertex(Position(poly_x, poly_y), Angle(poly_angle))) + + if row_type == "POLYST": + print('POLY Stop ') + symbol.add_polygon(polygon) + + if row_type == "RECT": + low_x = float(row[1]) / scale + low_y = float(row[2]) / scale + high_x = float(row[3]) / scale + high_y = float(row[4]) / scale + print('Rectangle ') + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(True) + ) + polygon.add_vertex(Vertex(Position(low_x, low_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(low_x, high_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(high_x, high_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(high_x, low_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(low_x, low_y), Angle(0.0))) + symbol.add_polygon(polygon) + + if row_type == "CIRC": + pos_x = float(row[1]) / scale + pos_y = float(row[2]) / scale + dia = float(row[3]) / scale + + print('Circle ') + circle = Circle( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(True), + Diameter(dia), + Position(pos_x, pos_y) + ) + symbol.add_circle(circle) + + if row_type == "TEXT": + pos_x = float(row[1]) / scale + pos_y = float(row[2]) / scale + textfield = row[3] + if textfield == "NAME": + text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('center bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) + if textfield == "VALUE": + text = Text(uuid_text_value, Layer('sym_values'), Value('{{VALUE}}'), Align('center bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) + symbol.add_text(text) + + sym_dir_path = path.join(dirpath, uuid_sym) + if not (path.exists(sym_dir_path) and path.isdir(sym_dir_path)): + makedirs(sym_dir_path) + with open(path.join(sym_dir_path, '.librepcb-sym'), 'w') as f: + f.write('0.1\n') + with open(path.join(sym_dir_path, 'symbol.lp'), 'w') as f: + f.write(str(symbol)) + f.write('\n') + + print(' {}: Wrote symbol {}'.format( def_name, uuid_sym)) + + +if __name__ == '__main__': + def _make(dirpath: str) -> None: + if not (path.exists(dirpath) and path.isdir(dirpath)): + makedirs(dirpath) + _make('out') + _make('out/{}'.format(group_name)) + _make('out/{}/sym'.format(group_name)) + + generate_sym( + cvs_file=cvs_file, + dirpath='out/{}/sym'.format(group_name), + author=author, + version=version, + keywords=keywords, + cmpcat=cmpcat, + create_date=create_date, + ) + + save_cache(uuid_cache_file, uuid_cache) From 86e893f275b76cafb20f2188dc1fc00e3002ed27 Mon Sep 17 00:00:00 2001 From: ouabache Date: Sat, 21 Mar 2020 09:25:43 -0700 Subject: [PATCH 03/23] added scaling and line_width added more parts --- Logic/Logic/AND2_4.csv | 11 +- Logic/Logic/AND2_6.csv | 28 +++ Logic/Logic/AND2_8.csv | 28 +++ Logic/Logic/AND2_dm_4.csv | 17 +- Logic/Logic/AND2_dm_8.csv | 33 ++++ Logic/Logic/AND3_4.csv | 13 +- Logic/Logic/AND3_8.csv | 34 ++++ Logic/Logic/BUFFER_4.csv | 3 +- Logic/Logic/DFF_PN_4.csv | 26 +++ Logic/Logic/DFF_RNPN_4.csv | 33 ++++ Logic/Logic/DFF_RN_4.csv | 26 +++ Logic/Logic/INV_4.csv | 5 +- Logic/Logic/NAND2_4.csv | 13 +- Logic/Logic/NAND2_dm_4.csv | 15 +- Logic/Logic/NAND3_4.csv | 15 +- Logic/Logic/NOR2_4.csv | 13 +- Logic/Logic/NOR2_dm_4.csv | 15 +- Logic/Logic/NOR3_4.csv | 15 +- Logic/Logic/OR2_4.csv | 11 +- Logic/Logic/OR2_dm_4.csv | 17 +- Logic/Logic/OR3_4.csv | 13 +- Logic/Logic/QQN_RNPN_4.csv | 13 +- Logic/Logic/XNOR_4.csv | 15 +- Logic/Logic/XOR_4.csv | 13 +- Logic/script | 9 +- Logic/uuid_cache_buffer.csv | 12 +- Logic/uuid_cache_flipflop.csv | 45 +++-- Logic/uuid_cache_flipflop_cmpcat.csv | 3 + Logic/uuid_cache_gates.csv | 245 +++++++++++++++------------ Logic/uuid_cache_gates_cmpcat.csv | 4 + generate_logic_sym.py | 27 +-- 31 files changed, 535 insertions(+), 235 deletions(-) create mode 100644 Logic/Logic/AND2_6.csv create mode 100644 Logic/Logic/AND2_8.csv create mode 100644 Logic/Logic/AND2_dm_8.csv create mode 100644 Logic/Logic/AND3_8.csv create mode 100644 Logic/Logic/DFF_PN_4.csv create mode 100644 Logic/Logic/DFF_RNPN_4.csv create mode 100644 Logic/Logic/DFF_RN_4.csv diff --git a/Logic/Logic/AND2_4.csv b/Logic/Logic/AND2_4.csv index c95c853a..037564ca 100644 --- a/Logic/Logic/AND2_4.csv +++ b/Logic/Logic/AND2_4.csv @@ -1,22 +1,23 @@ +SCALE,1.000 DEF,AND2_4 KEYWORDS,gates KEYWORDS,and -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 POLYPT,-10.16,-8.255,0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-10.16,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-10.16,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST @@ -24,4 +25,4 @@ PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_6.csv b/Logic/Logic/AND2_6.csv new file mode 100644 index 00000000..d5107ac5 --- /dev/null +++ b/Logic/Logic/AND2_6.csv @@ -0,0 +1,28 @@ +SCALE,1.333 +DEF,AND2_6 +KEYWORDS,gates +KEYWORDS,and +POLY,.25,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-16.93,3.385,0 +POLYPT,-10.16,3.385,0 +POLYST +POLY,.158,N +POLYPT,-16.93,-3.385,0 +POLYPT,-10.16,-3.385,0 +POLYST +POLY,.158,N +POLYPT,16.93,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-12.70,2.54,0 +PIN,B,R,-12.70,-2.54,0 +PIN,OUT,L,12.70,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_8.csv b/Logic/Logic/AND2_8.csv new file mode 100644 index 00000000..4f83207a --- /dev/null +++ b/Logic/Logic/AND2_8.csv @@ -0,0 +1,28 @@ +SCALE,2.000 +DEF,AND2_8 +KEYWORDS,gates +KEYWORDS,and +POLY,.25,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-10.16,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-10.16,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_dm_4.csv b/Logic/Logic/AND2_dm_4.csv index 08604146..d522f036 100644 --- a/Logic/Logic/AND2_dm_4.csv +++ b/Logic/Logic/AND2_dm_4.csv @@ -1,8 +1,9 @@ +SCALE,1.000 DEF,AND2_dm_4 KEYWORDS,gates KEYWORDS,and KEYWORDS,demorgan -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -10,23 +11,23 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-11.24,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-11.24,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,11.43,0,2.54 -CIRC,-9.97,5.08,2.54 -CIRC,-9.97,-5.08,2.54 +CIRC,.25,11.43,0,2.54 +CIRC,.25,-9.97,5.08,2.54 +CIRC,.25,-9.97,-5.08,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_dm_8.csv b/Logic/Logic/AND2_dm_8.csv new file mode 100644 index 00000000..5f5d2174 --- /dev/null +++ b/Logic/Logic/AND2_dm_8.csv @@ -0,0 +1,33 @@ +SCALE,2.000 +DEF,AND2_dm_8 +KEYWORDS,gates +KEYWORDS,and +KEYWORDS,demorgan +POLY,.25,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-11.24,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-11.24,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,.25,11.43,0,2.54 +CIRC,.25,-9.97,5.08,2.54 +CIRC,.25,-9.97,-5.08,2.54 +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND3_4.csv b/Logic/Logic/AND3_4.csv index 85a9185b..8088f50c 100644 --- a/Logic/Logic/AND3_4.csv +++ b/Logic/Logic/AND3_4.csv @@ -1,26 +1,27 @@ +SCALE,1.000 DEF,AND3_4 KEYWORDS,gates KEYWORDS,and -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 POLYPT,-10.16,-8.255,0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-10.16,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,0,0 POLYPT,-10.16,0,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-10.16,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST @@ -29,4 +30,4 @@ PIN,B,R,-15.24,0,0 PIN,C,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND3_8.csv b/Logic/Logic/AND3_8.csv new file mode 100644 index 00000000..8bb18068 --- /dev/null +++ b/Logic/Logic/AND3_8.csv @@ -0,0 +1,34 @@ +SCALE,1.000 +DEF,AND3_8 +KEYWORDS,gates +KEYWORDS,and +SCALE,2.000 +POLY,.25,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-10.16,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,0,0 +POLYPT,-10.16,0,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-10.16,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,0,0 +PIN,C,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/BUFFER_4.csv b/Logic/Logic/BUFFER_4.csv index 66edee60..9836df9d 100644 --- a/Logic/Logic/BUFFER_4.csv +++ b/Logic/Logic/BUFFER_4.csv @@ -1,6 +1,7 @@ +SCALE,1.000 DEF,BUFFER_4 KEYWORDS,buffer -POLY,10,F +POLY,.25,F POLYPT,-5.08,-7.62,0 POLYPT,-5.08,7.62,0 POLYPT,10.16,0,0 diff --git a/Logic/Logic/DFF_PN_4.csv b/Logic/Logic/DFF_PN_4.csv new file mode 100644 index 00000000..b377c735 --- /dev/null +++ b/Logic/Logic/DFF_PN_4.csv @@ -0,0 +1,26 @@ +SCALE,1.000 +DEF,DFF_PN_4 +POLY,.25,F +POLYPT,-10.16,10.16,0 +POLYPT,10.16,10.16,0 +POLYPT,10.16,-10.16,0 +POLYPT,-10.16,-10.16,0 +POLYPT,-10.16,10.16,0 +POLYST +POLY,.158,N +POLYPT,-10.16,-6.35,0 +POLYPT,-7.62,-5.08,0 +POLYPT,-10.16,-3.81,0 +POLYST +POLY,.158,N +POLYPT,-12.7,15.24,0 +POLYPT,0,15.24,0 +POLYPT,0,12.7,0 +POLYST +CIRC,.25,0,11.43,2.54 +PIN,D,R,-15.24,5.08,5.08 +PIN,CLK,R,-15.24,-5.08,5.08 +PIN,PRE_N,R,-15.24,15.24,5.08 +PIN,Q,L,15.24,5.08,5.08 +TEXT,-12.7,10.16,NAME +TEXT,-15.24,-15.24,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_RNPN_4.csv b/Logic/Logic/DFF_RNPN_4.csv new file mode 100644 index 00000000..957551f0 --- /dev/null +++ b/Logic/Logic/DFF_RNPN_4.csv @@ -0,0 +1,33 @@ +SCALE,1.000 +DEF,DFF_RNPN_4 +POLY,.25,F +POLYPT,-10.16,10.16,0 +POLYPT,10.16,10.16,0 +POLYPT,10.16,-10.16,0 +POLYPT,-10.16,-10.16,0 +POLYPT,-10.16,10.16,0 +POLYST +POLY,.158,N +POLYPT,-10.16,-6.35,0 +POLYPT,-7.62,-5.08,0 +POLYPT,-10.16,-3.81,0 +POLYST +POLY,.158,N +POLYPT,-12.7,-15.24,0 +POLYPT,0,-15.24,0 +POLYPT,0,-12.7,0 +POLYST +POLY,.158,N +POLYPT,-12.7,15.24,0 +POLYPT,0,15.24,0 +POLYPT,0,12.7,0 +POLYST +CIRC,.25,0,11.43,2.54 +CIRC,.25,0,-11.43,2.54 +PIN,D,R,-15.24,5.08,5.08 +PIN,CLK,R,-15.24,-5.08,5.08 +PIN,RST_N,R,-15.24,-15.24,5.08 +PIN,PRE_N,R,-15.24,15.24,5.08 +PIN,Q,L,15.24,5.08,5.08 +TEXT,-12.7,10.16,NAME +TEXT,-15.24,-15.24,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_RN_4.csv b/Logic/Logic/DFF_RN_4.csv new file mode 100644 index 00000000..5a779a1f --- /dev/null +++ b/Logic/Logic/DFF_RN_4.csv @@ -0,0 +1,26 @@ +SCALE,1.000 +DEF,DFF_RN_4 +POLY,.25,F +POLYPT,-10.16,10.16,0 +POLYPT,10.16,10.16,0 +POLYPT,10.16,-10.16,0 +POLYPT,-10.16,-10.16,0 +POLYPT,-10.16,10.16,0 +POLYST +POLY,.158,N +POLYPT,-10.16,-6.35,0 +POLYPT,-7.62,-5.08,0 +POLYPT,-10.16,-3.81,0 +POLYST +POLY,.158,N +POLYPT,-12.7,-15.24,0 +POLYPT,0,-15.24,0 +POLYPT,0,-12.7,0 +POLYST +CIRC,.25,0,-11.43,2.54 +PIN,D,R,-15.24,5.08,5.08 +PIN,CLK,R,-15.24,-5.08,5.08 +PIN,RST_N,R,-15.24,-15.24,5.08 +PIN,Q,L,15.24,5.08,5.08 +TEXT,-12.7,10.16,NAME +TEXT,-15.24,-15.24,VALUE \ No newline at end of file diff --git a/Logic/Logic/INV_4.csv b/Logic/Logic/INV_4.csv index cba7e346..0c9f9e72 100644 --- a/Logic/Logic/INV_4.csv +++ b/Logic/Logic/INV_4.csv @@ -1,12 +1,13 @@ +SCALE,1.000 DEF,INV_4 KEYWORDS,inverter -POLY,10,F +POLY,.25,F POLYPT,-5.08,-7.62,0 POLYPT,-5.08,7.62,0 POLYPT,10.16,0,0 POLYPT,-5.08,-7.62,0 POLYST -CIRC,11.43,0,2.54 +CIRC,.25,11.43,0,2.54 PIN,A,R,-15.24,0,10.16 PIN,OUT,L,15.24,0,2.54 TEXT,2.54,7.62,NAME diff --git a/Logic/Logic/NAND2_4.csv b/Logic/Logic/NAND2_4.csv index 7d09507c..3ef55f70 100644 --- a/Logic/Logic/NAND2_4.csv +++ b/Logic/Logic/NAND2_4.csv @@ -1,28 +1,29 @@ +SCALE,1.000 DEF,NAND2_4 KEYWORDS,gates KEYWORDS,nand -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 POLYPT,-10.16,-8.255,0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-10.16,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-10.16,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,11.43,0,2.54 +CIRC,.25,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_dm_4.csv b/Logic/Logic/NAND2_dm_4.csv index 36d66735..8423305e 100644 --- a/Logic/Logic/NAND2_dm_4.csv +++ b/Logic/Logic/NAND2_dm_4.csv @@ -1,8 +1,9 @@ +SCALE,1.000 DEF,NAND2_dm_4 KEYWORDS,gates KEYWORDS,nand KEYWORDS,demorgan -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -10,22 +11,22 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-11.24,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-11.24,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST -CIRC,-9.97,5.08,2.54 -CIRC,-9.97,-5.08,2.54 +CIRC,.25,-9.97,5.08,2.54 +CIRC,.25,-9.97,-5.08,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND3_4.csv b/Logic/Logic/NAND3_4.csv index 2afb6ea4..6b490919 100644 --- a/Logic/Logic/NAND3_4.csv +++ b/Logic/Logic/NAND3_4.csv @@ -1,33 +1,34 @@ +SCALE,1.000 DEF,NAND3_4 KEYWORDS,gates KEYWORDS,nand -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 POLYPT,-10.16,-8.255,0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-10.16,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,0,0 POLYPT,-10.16,0,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-10.16,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,11.43,0,2.54 +CIRC,.25,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,0,0 PIN,C,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_4.csv b/Logic/Logic/NOR2_4.csv index 9c3f1870..6928f7d0 100644 --- a/Logic/Logic/NOR2_4.csv +++ b/Logic/Logic/NOR2_4.csv @@ -1,7 +1,8 @@ +SCALE,1.000 DEF,NOR2_4 KEYWORDS,gates KEYWORDS,nor -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -9,21 +10,21 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-8.7,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-8.7,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,11.43,0,2.54 +CIRC,.25,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_dm_4.csv b/Logic/Logic/NOR2_dm_4.csv index 90b970d6..7b3b8e93 100644 --- a/Logic/Logic/NOR2_dm_4.csv +++ b/Logic/Logic/NOR2_dm_4.csv @@ -1,30 +1,31 @@ +SCALE,1.000 DEF,NOR2_dm_4 KEYWORDS,gates KEYWORDS,nor KEYWORDS,demorgan -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 POLYPT,-10.16,-8.255,0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-12.70,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-12.70,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST -CIRC,-11.43,5.08,2.54 -CIRC,-11.43,-5.08,2.54 +CIRC,.25,-11.43,5.08,2.54 +CIRC,.25,-11.43,-5.08,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR3_4.csv b/Logic/Logic/NOR3_4.csv index 8570bc38..17046b07 100644 --- a/Logic/Logic/NOR3_4.csv +++ b/Logic/Logic/NOR3_4.csv @@ -1,7 +1,8 @@ +SCALE,1.000 DEF,NOR3_4 KEYWORDS,gates KEYWORDS,nor -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -9,26 +10,26 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-8.7,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,0,0 POLYPT,-7.8,0,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-8.7,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,11.43,0,2.54 +CIRC,.25,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,0,0 PIN,C,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_4.csv b/Logic/Logic/OR2_4.csv index ec728892..499b1eea 100644 --- a/Logic/Logic/OR2_4.csv +++ b/Logic/Logic/OR2_4.csv @@ -1,7 +1,8 @@ +SCALE,1.000 DEF,OR2_4 KEYWORDS,gates KEYWORDS,or -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -9,15 +10,15 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-8.7,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-8.7,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST @@ -25,4 +26,4 @@ PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_dm_4.csv b/Logic/Logic/OR2_dm_4.csv index 8b27d3bb..abf3c93e 100644 --- a/Logic/Logic/OR2_dm_4.csv +++ b/Logic/Logic/OR2_dm_4.csv @@ -1,31 +1,32 @@ +SCALE,1.000 DEF,OR2_dm_4 KEYWORDS,gates KEYWORDS,or KEYWORDS,demorgan -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 POLYPT,-10.16,-8.255,0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-12.70,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-12.70,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,11.43,0,2.54 -CIRC,-11.43,5.08,2.54 -CIRC,-11.43,-5.08,2.54 +CIRC,.25,11.43,0,2.54 +CIRC,.25,-11.43,5.08,2.54 +CIRC,.25,-11.43,-5.08,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR3_4.csv b/Logic/Logic/OR3_4.csv index d6f630e8..886d524c 100644 --- a/Logic/Logic/OR3_4.csv +++ b/Logic/Logic/OR3_4.csv @@ -1,7 +1,8 @@ +SCALE,1.000 DEF,OR3_4 KEYWORDS,gates KEYWORDS,or -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -9,19 +10,19 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-8.7,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,0,0 POLYPT,-7.8,0,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-8.7,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST @@ -30,4 +31,4 @@ PIN,B,R,-15.24,0,0 PIN,C,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/QQN_RNPN_4.csv b/Logic/Logic/QQN_RNPN_4.csv index 0e5fc08a..a79a97fd 100644 --- a/Logic/Logic/QQN_RNPN_4.csv +++ b/Logic/Logic/QQN_RNPN_4.csv @@ -1,28 +1,29 @@ +SCALE,1.000 DEF,QQN_RNPN_4 -POLY,10,F +POLY,.25,F POLYPT,-10.16,10.16,0 POLYPT,10.16,10.16,0 POLYPT,10.16,-10.16,0 POLYPT,-10.16,-10.16,0 POLYPT,-10.16,10.16,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-10.16,-6.35,0 POLYPT,-7.62,-5.08,0 POLYPT,-10.16,-3.81,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-12.7,-15.24,0 POLYPT,0,-15.24,0 POLYPT,0,-12.7,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-12.7,15.24,0 POLYPT,0,15.24,0 POLYPT,0,12.7,0 POLYST -CIRC,0,11.43,2.54 -CIRC,0,-11.43,2.54 +CIRC,.25,0,11.43,2.54 +CIRC,.25,0,-11.43,2.54 PIN,D,R,-15.24,5.08,5.08 PIN,CLK,R,-15.24,-5.08,5.08 PIN,RST_N,R,-15.24,-15.24,5.08 diff --git a/Logic/Logic/XNOR_4.csv b/Logic/Logic/XNOR_4.csv index 2ebf9265..8053a231 100644 --- a/Logic/Logic/XNOR_4.csv +++ b/Logic/Logic/XNOR_4.csv @@ -1,7 +1,8 @@ +SCALE,1.000 DEF,XNOR_4 KEYWORDS,gates KEYWORDS,xnor -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -9,25 +10,25 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.25,N POLYPT,-11.43,-8.255,65.0 POLYPT,-11.43,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-8.7,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-8.7,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,11.43,0,2.54 +CIRC,.25,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/XOR_4.csv b/Logic/Logic/XOR_4.csv index 287db7c2..afc24deb 100644 --- a/Logic/Logic/XOR_4.csv +++ b/Logic/Logic/XOR_4.csv @@ -1,7 +1,8 @@ +SCALE,1.000 DEF,XOR_4 KEYWORDS,gates KEYWORDS,xor -POLY,10,F +POLY,.25,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -9,19 +10,19 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,10,N +POLY,.25,N POLYPT,-11.43,-8.255,65.0 POLYPT,-11.43,8.255,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,5.08,0 POLYPT,-8.7,5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,-15.24,-5.08,0 POLYPT,-8.7,-5.08,0 POLYST -POLY,10,N +POLY,.158,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST @@ -29,4 +30,4 @@ PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 TEXT,-2.54,7.62,NAME -TEXT,-2.54,-11.43,VALUE \ No newline at end of file +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/script b/Logic/script index 1f739714..aa464bda 100755 --- a/Logic/script +++ b/Logic/script @@ -1,4 +1,4 @@ -rm -r out/Logic +rm -r out python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_4 @@ -16,3 +16,10 @@ python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_4 python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_4 python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design QQN_RNPN_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RNPN_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RN_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_PN_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_6 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_8 \ No newline at end of file diff --git a/Logic/uuid_cache_buffer.csv b/Logic/uuid_cache_buffer.csv index c74f733f..19bc80f8 100644 --- a/Logic/uuid_cache_buffer.csv +++ b/Logic/uuid_cache_buffer.csv @@ -1,6 +1,6 @@ -sym-buffer_4-pin-a_-15.24,2ab415b5-be67-4851-9edd-1e8f8c572b14 -sym-buffer_4-pin-out_15.24,4ac2607c-814e-4172-8d25-9185da2d5756 -sym-buffer_4-polygon-contour,5ec2cf07-6fb0-4461-ae32-fa3b53443207 -sym-buffer_4-sym,d7b7d172-16b3-4309-9846-cfeca61efdc5 -sym-buffer_4-text-name,dca1cc75-774d-4411-a837-96d30e91969d -sym-buffer_4-text-value,28b3f255-c8d5-4c97-8139-fb0caf6d4aaa +sym-buffer_4-pin-a,30100ce9-f74d-443b-ad3e-e9582dbd7227 +sym-buffer_4-pin-out,a62d1444-6308-4232-8da7-4c277f1aa212 +sym-buffer_4-polygon-contour,31577bb4-151a-46ac-b1c1-6ab12975ffb4 +sym-buffer_4-sym,5056713c-62ad-4c5e-90d4-a46a12b6aeaa +sym-buffer_4-text-name,ea4dafbd-17ac-4c21-ac7c-bf9180e42874 +sym-buffer_4-text-value,8608ea1b-a4c6-4eff-9322-15929dad02c8 diff --git a/Logic/uuid_cache_flipflop.csv b/Logic/uuid_cache_flipflop.csv index 47f3156d..4f66e20c 100644 --- a/Logic/uuid_cache_flipflop.csv +++ b/Logic/uuid_cache_flipflop.csv @@ -1,10 +1,35 @@ -sym-qqn_rnpn_4-pin-clk_-15.24,454f77a1-47a3-41ac-9269-191e323fcf7f -sym-qqn_rnpn_4-pin-d_-15.24,8f87316b-5780-45c8-ad0b-70aaad386632 -sym-qqn_rnpn_4-pin-pre_n_-15.24,e3968c20-c111-45cd-a192-c3a2f2d82dc5 -sym-qqn_rnpn_4-pin-q_15.24,0ae0010c-969c-45c5-b8c9-704f5475ec85 -sym-qqn_rnpn_4-pin-q_n_15.24,ff309f0f-1bdc-4f71-8164-8b9ea0a5043d -sym-qqn_rnpn_4-pin-rst_n_-15.24,f8dc8a04-d0e3-4191-9dd4-787bb7df93e8 -sym-qqn_rnpn_4-polygon-contour,23359ee2-1144-4a27-9956-7ec7bb2e542c -sym-qqn_rnpn_4-sym,461d3234-12ad-4e19-8f3e-2a923b167f69 -sym-qqn_rnpn_4-text-name,e7b89a11-36cb-437d-a859-2b7be3e5aeac -sym-qqn_rnpn_4-text-value,c015efbf-a091-4f88-a3c2-e52008869c3f +sym-dff_pn_4-pin-clk,5b5bf55e-cb29-41d3-93cb-a71a437909e1 +sym-dff_pn_4-pin-d,c79219e4-014e-48ae-9a58-9ee6056a8955 +sym-dff_pn_4-pin-pre_n,da401084-429f-41df-983a-1536ced22d9e +sym-dff_pn_4-pin-q,15247761-631b-4e62-9cf9-3017db39664b +sym-dff_pn_4-polygon-contour,c4f5a6b6-b4a7-47da-a2d6-fdf1328deb67 +sym-dff_pn_4-sym,7c16be6d-ff31-475e-b83b-316c51159639 +sym-dff_pn_4-text-name,a2798e22-41ce-4e89-9b26-ba197ad4b8b1 +sym-dff_pn_4-text-value,ef6fe216-909c-4701-9374-76fd665e7ea5 +sym-dff_rn_4-pin-clk,78eced60-2bbe-4922-8db8-f40e6d94794d +sym-dff_rn_4-pin-d,69f49bbf-42e5-4934-ac1a-c97fe00236a7 +sym-dff_rn_4-pin-q,1cddbd30-eed9-4429-8b6a-1e39df36c8da +sym-dff_rn_4-pin-rst_n,75321453-8eb8-404d-ac8b-ca2203e3c924 +sym-dff_rn_4-polygon-contour,7d4e1d94-f890-41cb-a497-e600e7adcde9 +sym-dff_rn_4-sym,8f53f06e-6539-4b1a-a345-aecfdbeafacc +sym-dff_rn_4-text-name,bd1f35a4-5f5a-4741-918c-6814003bf438 +sym-dff_rn_4-text-value,6402e517-c13e-4d78-8872-e73195b60b17 +sym-dff_rnpn_4-pin-clk,81b89bc0-4576-4388-ab95-c9fe24d0aada +sym-dff_rnpn_4-pin-d,6f5194ba-3f03-4990-9420-c8986d8d6905 +sym-dff_rnpn_4-pin-pre_n,ff7aad50-bb8c-462e-b219-5af96bd9fb8d +sym-dff_rnpn_4-pin-q,ec92ed79-273b-4c55-9f65-3e09ab5d6b18 +sym-dff_rnpn_4-pin-rst_n,fedbc5c2-2fe3-4c9a-a6eb-b528fd32786e +sym-dff_rnpn_4-polygon-contour,51ea09cb-62bc-4797-beac-12cefad4462e +sym-dff_rnpn_4-sym,c5cad6f8-cf63-4a9d-8961-42e52b24f37f +sym-dff_rnpn_4-text-name,04729999-1e26-4ec4-bd3a-5f47771ce244 +sym-dff_rnpn_4-text-value,362ba51f-b286-4b8c-a9c5-d648b66270cf +sym-qqn_rnpn_4-pin-clk,37342d56-7b75-472b-93b5-cb8a21c0b0db +sym-qqn_rnpn_4-pin-d,779b216d-6821-4680-b7fe-91ae765f39b0 +sym-qqn_rnpn_4-pin-pre_n,4ef8069f-b239-438a-8c6f-5ced0084f1b1 +sym-qqn_rnpn_4-pin-q,d40d309b-19df-4f49-a1c5-747702ecbe4c +sym-qqn_rnpn_4-pin-q_n,c3f8137e-6453-4565-a451-057fc55ca1b4 +sym-qqn_rnpn_4-pin-rst_n,7dd22415-0de0-4d50-b106-9aa52a46bb91 +sym-qqn_rnpn_4-polygon-contour,bf029b96-6724-46ed-9308-58f1abe81bc1 +sym-qqn_rnpn_4-sym,041d4605-e768-46a0-8db1-7665f45e9f19 +sym-qqn_rnpn_4-text-name,5894cf48-ebe4-41e7-b8db-cfd7b4c8596d +sym-qqn_rnpn_4-text-value,7d2b3933-efef-4783-99d1-e8a79fe9cda8 diff --git a/Logic/uuid_cache_flipflop_cmpcat.csv b/Logic/uuid_cache_flipflop_cmpcat.csv index a01ff21b..13e5a376 100644 --- a/Logic/uuid_cache_flipflop_cmpcat.csv +++ b/Logic/uuid_cache_flipflop_cmpcat.csv @@ -1 +1,4 @@ +cmpcat-dff_pn_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d +cmpcat-dff_rn_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d +cmpcat-dff_rnpn_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d cmpcat-qqn_rnpn_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv index 340da9d0..6a6e82fa 100644 --- a/Logic/uuid_cache_gates.csv +++ b/Logic/uuid_cache_gates.csv @@ -1,108 +1,137 @@ -sym-and2_4-pin-a_-15.24,baecdb47-c3a2-40d9-bbdf-ac7aefadab9b -sym-and2_4-pin-b_-15.24,3618f21b-f57d-47aa-8860-7353459fd594 -sym-and2_4-pin-out_15.24,7d6c100d-2aeb-46d9-a230-e0b3806ff34b -sym-and2_4-polygon-contour,676fe810-044f-49ba-b68b-2672a2f17d8b -sym-and2_4-sym,31f05179-7a70-40cc-83ea-d93b7e681a0a -sym-and2_4-text-name,71fdcbef-b2fd-4ee8-ba1c-ba15f5c5565d -sym-and2_4-text-value,7b4253d4-d999-4c2a-ac80-8c1c2e84bc9a -sym-and2_dm_4-pin-a_-15.24,7403109a-a953-4068-b498-9017284e2e40 -sym-and2_dm_4-pin-b_-15.24,b66b7374-0c9c-42c1-a440-ae1e74fc1f37 -sym-and2_dm_4-pin-out_15.24,38a5e609-f79a-461d-9f71-4089fe84d1f8 -sym-and2_dm_4-polygon-contour,57f42fe1-6c56-4529-b736-0b52d946bdac -sym-and2_dm_4-sym,264c7b9c-8926-40e9-beec-d4c6b85a43fc -sym-and2_dm_4-text-name,18e26a59-4f6c-43f0-ab00-a88c34e585b6 -sym-and2_dm_4-text-value,22f3c0f7-886b-4031-ad73-427f7ed0269c -sym-and3_4-pin-a_-15.24,41520a7d-d8ad-4ded-9111-c37cfb8ac1c7 -sym-and3_4-pin-b_-15.24,8bb5af77-c6c4-46f0-bebb-3c9e21166943 -sym-and3_4-pin-c_-15.24,00db6a08-10cc-4210-bd91-1b767d437b77 -sym-and3_4-pin-out_15.24,8dabb99a-b106-4ffe-9684-3a5d1c28299d -sym-and3_4-polygon-contour,c824c807-0189-4dc7-9d8b-57abb5003b7a -sym-and3_4-sym,e976075b-6e73-4d8f-a202-e67949951071 -sym-and3_4-text-name,0ed2e659-d549-43b9-ad30-b63e41aff236 -sym-and3_4-text-value,f5fb6992-737a-4efb-b181-4c063eab0f59 -sym-inv_4-pin-a_-15.24,e11fc48b-53a3-40b7-bfe5-1109f774c20b -sym-inv_4-pin-out_15.24,9d32012b-1f63-4d05-baa2-14c7d0916db7 -sym-inv_4-polygon-contour,2f6db1df-339e-463b-92ed-1fdc63384649 -sym-inv_4-sym,e98daf14-8056-447f-b9d5-bf4cc6353fb3 -sym-inv_4-text-name,4876a8ce-2432-4ed0-80c8-e510ff0b4dc5 -sym-inv_4-text-value,38b705ac-eb66-47f8-b7c5-91eb537cb00f -sym-nand2_4-pin-a_-15.24,a1975fed-3020-4fa8-8dec-c85106fd4e9b -sym-nand2_4-pin-b_-15.24,c5dd740c-f0da-42a4-bd61-63c5fb8a904a -sym-nand2_4-pin-out_15.24,e75f2b90-5cbb-4c55-8c48-6266c6c0a3c7 -sym-nand2_4-polygon-contour,13e613c9-6ad6-4750-b361-3d22303c6d50 -sym-nand2_4-sym,7dc4cdeb-f1f0-47a5-9303-5aede0c62dd6 -sym-nand2_4-text-name,dd6ab3d5-370e-4791-8432-dbe5d596dc77 -sym-nand2_4-text-value,f62f9e69-eded-42d1-ab83-8df830c51911 -sym-nand2_dm_4-pin-a_-15.24,b2de0033-306e-496a-8e14-763f78f2beab -sym-nand2_dm_4-pin-b_-15.24,f83fecef-3915-4817-a7c3-89650a510827 -sym-nand2_dm_4-pin-out_15.24,f52aef48-988b-49f9-93e1-0b7569d60ba6 -sym-nand2_dm_4-polygon-contour,4ca7e4a4-20fc-499b-a635-8fe2cf53a504 -sym-nand2_dm_4-sym,f75ede3f-e302-4481-8d8b-99b7e30b25bd -sym-nand2_dm_4-text-name,74e35958-aadb-4258-9dcc-6dfa3023daa5 -sym-nand2_dm_4-text-value,ae107422-7a2d-4dbf-8861-bd643f2dea1f -sym-nand3_4-pin-a_-15.24,30767fbb-bde1-46c5-9889-8a6e65093019 -sym-nand3_4-pin-b_-15.24,284f7bf3-c45d-441e-b5af-d4917a263269 -sym-nand3_4-pin-c_-15.24,cda2d381-ec08-4038-8681-e08d61cb433d -sym-nand3_4-pin-out_15.24,05d99887-7b5b-47a8-93cd-afcad5f9aa58 -sym-nand3_4-polygon-contour,edc1c08b-472b-4bda-801a-924b0a7f15cc -sym-nand3_4-sym,a29aa8a4-af94-4e81-ad39-d7ea2e3163f5 -sym-nand3_4-text-name,05057d9a-1fa7-43bc-9c6a-0cff08627f9b -sym-nand3_4-text-value,609cdc1d-216b-4eed-b841-f34d55b2e2cb -sym-nor2_4-pin-a_-15.24,a1418454-166b-4ea2-bc99-501615116dca -sym-nor2_4-pin-b_-15.24,0f5126c2-4075-401a-b27e-741cfaa9bac8 -sym-nor2_4-pin-out_15.24,2521463d-c4ac-4c96-b50a-7d8e0f837a0a -sym-nor2_4-polygon-contour,bc394931-ae1e-42d9-83b9-dbac3c8fe352 -sym-nor2_4-sym,3ea52eae-fbe0-4794-a8fa-559f2534c8fd -sym-nor2_4-text-name,bba48606-4d92-4c07-86e3-445448bcd264 -sym-nor2_4-text-value,5f0481c4-f855-4a65-a781-b088fe73556a -sym-nor2_dm_4-pin-a_-15.24,19bfc94f-9632-4f5e-aebc-6e2513f749b9 -sym-nor2_dm_4-pin-b_-15.24,5c8252af-c751-4f59-9a5b-bed3f2935e68 -sym-nor2_dm_4-pin-out_15.24,25fb2fb1-6f73-454e-9584-0b20b8997e40 -sym-nor2_dm_4-polygon-contour,955aceb2-523a-43af-af63-2a06087bfbea -sym-nor2_dm_4-sym,e51f3659-ca65-49a3-a79c-ec280a559399 -sym-nor2_dm_4-text-name,deca1048-f3ea-4ac6-b374-2a67bb38eb68 -sym-nor2_dm_4-text-value,f7176430-3002-4469-8881-477fa4c35164 -sym-nor3_4-pin-a_-15.24,35f884af-a209-41a6-b135-57e1475ebb9e -sym-nor3_4-pin-b_-15.24,180c7719-8d61-49e7-bdd8-701ce0f60430 -sym-nor3_4-pin-c_-15.24,7e09a0f9-250e-4435-ba7d-cf1bfa10a94f -sym-nor3_4-pin-out_15.24,e4d62ee0-92ae-4f6d-a0ff-1caf4a770a64 -sym-nor3_4-polygon-contour,d0cbbc4f-f409-4f3b-a203-d07a1099c2b8 -sym-nor3_4-sym,46e622a4-1947-4fe3-92a4-15d03a3555e3 -sym-nor3_4-text-name,28fd63cb-9634-4a81-9d7e-48f16a94336b -sym-nor3_4-text-value,5d384a97-2d39-424b-9355-c274519ba55e -sym-or2_4-pin-a_-15.24,ba001a82-d51a-4552-897a-665dda0a1639 -sym-or2_4-pin-b_-15.24,031772cf-d301-48e7-b4f8-3ec5549b98ad -sym-or2_4-pin-out_15.24,6d88211c-6940-4caf-8089-bb8c661b52ca -sym-or2_4-polygon-contour,1ef01e19-a8a3-4ed3-a53d-b5e7252fc91b -sym-or2_4-sym,ef11bc02-4da2-46c4-a47c-7a51a9dae230 -sym-or2_4-text-name,0e73f9f9-b009-4ae3-9264-c2cd5d67f1df -sym-or2_4-text-value,dd69e83a-ddf2-4070-9ab2-a74ebae766b5 -sym-or2_dm_4-pin-a_-15.24,bfc199ea-d18c-48b4-9434-6478b24cf211 -sym-or2_dm_4-pin-b_-15.24,63c270d7-6b4f-4d26-ab3e-00931880ff57 -sym-or2_dm_4-pin-out_15.24,29a3c0af-3b36-48eb-8188-1ff256a68b98 -sym-or2_dm_4-polygon-contour,a13f5f6c-a857-4549-9cd6-017c75460b47 -sym-or2_dm_4-sym,4a456fc8-d24e-4af7-89c2-9e78b41e2001 -sym-or2_dm_4-text-name,553190f8-d399-47ee-a0dd-bdceac8dbd12 -sym-or2_dm_4-text-value,0f4e8b3a-f710-413a-ac99-c4f9206e4fa4 -sym-or3_4-pin-a_-15.24,ae49313e-b2b0-437b-a73e-edd6d0159c37 -sym-or3_4-pin-b_-15.24,6d69b869-f9e2-40b2-925c-5aed98913b94 -sym-or3_4-pin-c_-15.24,c7247b30-882e-42c9-8cff-062c244bd9f3 -sym-or3_4-pin-out_15.24,0bce2119-2a0c-4278-baa9-34b62377e8f4 -sym-or3_4-polygon-contour,7847eb99-5efe-4e06-a74d-366077b7bed8 -sym-or3_4-sym,242a5682-984a-4bb3-8841-b631a0303125 -sym-or3_4-text-name,4e8b5d6c-094c-4385-b265-c521047fa582 -sym-or3_4-text-value,4c53fde9-71d9-4a19-b2af-05f8f8c5c801 -sym-xnor_4-pin-a_-15.24,cb5c2ac3-8d8d-4087-9e1a-dc7f632c0bc3 -sym-xnor_4-pin-b_-15.24,790f3f1e-e101-47a2-a09a-21b87bdaa90d -sym-xnor_4-pin-out_15.24,a1fd68e7-00dc-4a13-9252-cd7c1abb7743 -sym-xnor_4-polygon-contour,2c3f662b-dbd5-4648-9f77-66e8a122a384 -sym-xnor_4-sym,469c55b4-0584-4575-a701-7bc9d783c649 -sym-xnor_4-text-name,67916fb0-a407-4010-8d79-822f45f67659 -sym-xnor_4-text-value,659173c5-7e5f-4e93-8bc2-ca3575bc9956 -sym-xor_4-pin-a_-15.24,c5bbeff0-b6ca-4ceb-b15a-6bb0079d11f5 -sym-xor_4-pin-b_-15.24,b3b6b407-8265-484d-9219-bcea9e9a5ca2 -sym-xor_4-pin-out_15.24,654ba614-7f0d-4d6e-a910-235f236785f3 -sym-xor_4-polygon-contour,45455469-7a2a-420b-a646-799b6d9c266c -sym-xor_4-sym,4c7958b8-578e-4166-9bb8-4293de44071a -sym-xor_4-text-name,7c70627a-5fcd-4c48-a2e1-8fc325cf04f7 -sym-xor_4-text-value,0b30f5f4-681f-4cbc-bcec-f23a93deb15a +sym-and2_4-pin-a,f54541e6-f3d5-4fff-b485-a2f8d2beeb26 +sym-and2_4-pin-b,61851241-77b1-4be1-8ce6-10512ccd49ff +sym-and2_4-pin-out,e69d96f2-9ef8-41fe-b5c6-060d405136ef +sym-and2_4-polygon-contour,54d8eca8-3d27-4ea0-bd6d-d33fb8995cb8 +sym-and2_4-sym,3c262a18-c9ae-4910-9d11-1a2358bdf4d0 +sym-and2_4-text-name,17a5c3e5-2cac-4c0a-ad0a-3ce170457c81 +sym-and2_4-text-value,9d674aff-efba-4987-9c4b-4cc617a679d4 +sym-and2_6-pin-a,128456e3-bdc6-43bb-8182-db995fcc5557 +sym-and2_6-pin-b,78ebc339-df31-48d8-87c8-e2db69bf0127 +sym-and2_6-pin-out,ce5b24c0-8d43-423b-851a-f7c73f7f9ce0 +sym-and2_6-polygon-contour,553f84c6-ec78-4c31-bb6a-a5caee7da41e +sym-and2_6-sym,07788c43-61c7-44b6-b609-83ab497735a3 +sym-and2_6-text-name,5a725f33-13c2-4200-92af-64036a9bf545 +sym-and2_6-text-value,296b8af5-1e89-42f1-bbd3-24c6106d3f32 +sym-and2_8-pin-a,860f56a0-f644-4650-a6b7-bce9cda95f15 +sym-and2_8-pin-b,fe02eabe-6882-431c-8c7c-c8fbd55c25f0 +sym-and2_8-pin-out,317a9a39-5fe4-4d67-963c-d6ad03c15017 +sym-and2_8-polygon-contour,57fca127-5072-4af8-b8f8-43363fa21e80 +sym-and2_8-sym,c4b15609-970b-4637-adc7-a97152a78480 +sym-and2_8-text-name,db9ccc6e-166c-40e9-9d75-283a4a44e647 +sym-and2_8-text-value,d3cb9e03-472b-406f-be62-b82a5c4fbb67 +sym-and2_dm_4-pin-a,530b6995-f2f8-47a4-97d6-d165e46823f0 +sym-and2_dm_4-pin-b,555d4da2-fc18-4c7e-9f4d-f1f4eeee941c +sym-and2_dm_4-pin-out,a09b49c8-5b11-4770-b38a-e718e379610d +sym-and2_dm_4-polygon-contour,479e323a-161f-4723-b390-6901525739c8 +sym-and2_dm_4-sym,e4118c45-3863-4107-b373-5a25fe95175d +sym-and2_dm_4-text-name,c946fbd9-59c3-4a67-8cff-32e7fd45208e +sym-and2_dm_4-text-value,de23f908-7a01-42c8-847a-4ed823bbf060 +sym-and2_dm_8-pin-a,504a3f96-bedf-480c-981f-72957ed566e0 +sym-and2_dm_8-pin-b,a23735ee-79c0-45ca-a649-ee09fceaacca +sym-and2_dm_8-pin-out,1d6515c2-c3d7-4f66-86fe-57c20a1ff6bd +sym-and2_dm_8-polygon-contour,f50be834-6dfb-4b39-9c3c-eae33742b4c0 +sym-and2_dm_8-sym,f59a0c87-e60a-4de9-b3b4-1dce5fd5cb8a +sym-and2_dm_8-text-name,1dd04541-918a-4e80-8d5a-9e5fb1dfecbd +sym-and2_dm_8-text-value,56278c5a-3a40-4ff6-8c57-b764a2c28dc8 +sym-and3_4-pin-a,8c2f3352-e5b3-4d8a-9f97-3146fa9d575a +sym-and3_4-pin-b,42782759-826f-434f-8c97-11dc88658078 +sym-and3_4-pin-c,6e598b6f-dd7a-48a7-9271-ba7e778742c2 +sym-and3_4-pin-out,2a80173d-1f48-4c74-9c2f-d9d162d6be09 +sym-and3_4-polygon-contour,23bab8a2-87f3-4fe4-9bb6-30e828fca9af +sym-and3_4-sym,c7e7b5e2-24c0-4ce1-b06e-b255eac70b7e +sym-and3_4-text-name,ebeb0978-1d0d-4c11-bac4-fb052c21422a +sym-and3_4-text-value,d71c9601-3f10-4e14-bdb8-d70314d8bb8e +sym-and3_8-pin-a,f713063d-891e-46fd-b596-8d9e2f497af3 +sym-and3_8-pin-b,db749abe-584a-4124-9234-04305a0d44ab +sym-and3_8-pin-c,55b823e8-3fba-4976-b5ed-dcfd0dfaaff0 +sym-and3_8-pin-out,549f38a0-8d6b-4a17-8de9-83e0e4bdceb8 +sym-and3_8-polygon-contour,c4a89b3c-f249-4fcd-9d61-b91985cc2264 +sym-and3_8-sym,a58b86ea-7795-4afe-9693-497759e2a14f +sym-and3_8-text-name,c2ce762c-1e16-4fcb-989e-08f504e7ba70 +sym-and3_8-text-value,52acad07-202e-4418-95c2-255e5cbfe0df +sym-inv_4-pin-a,c7bd99e6-7377-40ca-9afd-99f54bddb314 +sym-inv_4-pin-out,6f9e4711-1bde-4049-8843-54abc799dd27 +sym-inv_4-polygon-contour,0a5932f1-23f3-4da3-9c84-bff353f4cc98 +sym-inv_4-sym,2abb4c96-39e3-4a54-a0af-f157dc952c6f +sym-inv_4-text-name,0905a207-5b35-4ce5-b795-60f095fcd086 +sym-inv_4-text-value,8d3be6b2-7a2a-41df-be68-93c394a4d894 +sym-nand2_4-pin-a,bd6a472f-d301-4a11-a0a0-1a7f152c7a69 +sym-nand2_4-pin-b,149f9758-5289-4274-a9ab-446fa67a7140 +sym-nand2_4-pin-out,b432a92a-4128-4093-9089-6e806dd10cd5 +sym-nand2_4-polygon-contour,16278946-3ca9-4868-9dac-c963ab9fd17b +sym-nand2_4-sym,dba50be9-299e-434a-979b-ad6e99a96be0 +sym-nand2_4-text-name,28d08756-5a37-40fe-ae15-91c2bcb6f11f +sym-nand2_4-text-value,83acd99e-93af-442e-a228-9af054fe3859 +sym-nand2_dm_4-pin-a,d7132dbe-c67d-4208-a3db-6667cc7f0257 +sym-nand2_dm_4-pin-b,d52ef654-c361-4002-8b89-eac215b3da24 +sym-nand2_dm_4-pin-out,27f9da2b-3555-4042-b242-1da6a3c7ed23 +sym-nand2_dm_4-polygon-contour,40815697-bb87-4c29-95f4-1a30f18cd41c +sym-nand2_dm_4-sym,d5480d6d-4090-4167-8aaf-b2221398c767 +sym-nand2_dm_4-text-name,849d6d01-cfe3-43d7-9095-35e31f3e6d6c +sym-nand2_dm_4-text-value,e78fb97e-52c2-40b4-94f2-277d052eac9c +sym-nand3_4-pin-a,d0eb4c67-8d6d-4bab-906f-47d9204fba4d +sym-nand3_4-pin-b,6f0f0edb-f105-4139-ac9d-d331fdfc3d28 +sym-nand3_4-pin-c,759534f7-41d6-4048-a665-a746be098820 +sym-nand3_4-pin-out,d3fbbdba-6bca-4619-9bb3-40d3c042bc61 +sym-nand3_4-polygon-contour,0cd1c4d8-46e8-4e9d-b30f-1eb1687112e7 +sym-nand3_4-sym,dd006f54-c31d-44f5-82b0-47001a85bd8e +sym-nand3_4-text-name,143b4f49-d8d3-4775-b47f-8fa5a35574c7 +sym-nand3_4-text-value,9f30c727-c89c-4fd0-99ce-a4873fd0c2a0 +sym-nor2_4-pin-a,c3f92a54-f9c9-4b32-a7df-adcb0f5dc334 +sym-nor2_4-pin-b,05d4b781-dd70-4a02-837b-6f41cb891e9c +sym-nor2_4-pin-out,8803f39a-e4b9-4605-83c9-3d262c703a67 +sym-nor2_4-polygon-contour,4c1a2562-b127-4879-94d9-80b1b430311a +sym-nor2_4-sym,b15667ef-5883-474f-a6b9-c467702159f7 +sym-nor2_4-text-name,5ab8f769-e60b-4bd9-99be-ea43846de962 +sym-nor2_4-text-value,3c228c55-482e-4010-9edd-063fcbfe5091 +sym-nor2_dm_4-pin-a,175111bb-47c4-43c5-a1fe-774aa7c533a6 +sym-nor2_dm_4-pin-b,cd75a4f4-69f2-4861-a971-bf9c689eb9a2 +sym-nor2_dm_4-pin-out,c14fbabb-4c63-4850-885d-55e77821ce76 +sym-nor2_dm_4-polygon-contour,a6001d63-9e07-4b6a-a42f-403362fd4e35 +sym-nor2_dm_4-sym,3d39b897-a882-4494-bbb9-e31c1dd88e90 +sym-nor2_dm_4-text-name,a2834d16-da9d-45ff-be68-f9576dfd6a0b +sym-nor2_dm_4-text-value,2f3ca9af-5679-4a5b-829a-9dfcb33ef89c +sym-nor3_4-pin-a,cf02fec4-17c0-447f-a848-6f9f16f78418 +sym-nor3_4-pin-b,ef8a8fa4-8849-4f82-ae16-f300df5fdd7b +sym-nor3_4-pin-c,323c2ac0-379d-4cc0-b9b5-f3b47bd97cfa +sym-nor3_4-pin-out,f8cf0f8d-5b0c-4dc6-9bd2-55026f50d67e +sym-nor3_4-polygon-contour,c0f254cb-0347-4f6d-8ed5-b319ce813bf9 +sym-nor3_4-sym,fb544ead-bfa0-4bd0-b876-58cdc4c971af +sym-nor3_4-text-name,fb151569-b8ef-4776-8ee7-32dca5e255e4 +sym-nor3_4-text-value,d4740a3a-128d-4a5d-9b78-15e8487b9245 +sym-or2_4-pin-a,4eb1ab6c-6a8a-49d0-baa7-bcc9ba90d593 +sym-or2_4-pin-b,a9130261-6090-43d2-941c-5b55fdc48d93 +sym-or2_4-pin-out,9a2ebb93-81ba-453a-a45d-344758eadd53 +sym-or2_4-polygon-contour,23dd60d9-981f-4e4d-834c-d8238fac71ba +sym-or2_4-sym,1a493221-27db-4124-8c4c-0aa0e8f37584 +sym-or2_4-text-name,03db9547-c82e-477c-a679-9e6296c6d51e +sym-or2_4-text-value,4a45f20d-48ee-4d79-98b2-9a0001b77b5c +sym-or2_dm_4-pin-a,617832f7-890a-4679-8eb0-b72374efdc50 +sym-or2_dm_4-pin-b,a0b2f9d5-b7ea-455a-9a9c-f743c13221ef +sym-or2_dm_4-pin-out,00eb5100-999f-4100-932f-4ed7eae810e2 +sym-or2_dm_4-polygon-contour,d47bbbab-1189-463c-b7ba-5809df7cac4d +sym-or2_dm_4-sym,6e80543e-9da6-4c83-b3d5-be521ec92f9c +sym-or2_dm_4-text-name,5446fe8f-1602-4ab0-b6fd-575445b34c21 +sym-or2_dm_4-text-value,2d10e202-020c-4397-aad5-8cd52a66c5e0 +sym-or3_4-pin-a,2f7ec72a-a135-4746-9c89-961189defa32 +sym-or3_4-pin-b,80c7a59b-3574-4ffe-b5eb-311f40406be0 +sym-or3_4-pin-c,65a2bb92-4a99-4fb3-aab7-d653831a8d47 +sym-or3_4-pin-out,4022f295-fcf8-49fa-b6f3-1c30f255b9ad +sym-or3_4-polygon-contour,4b03e82f-2a66-4273-bfde-983e635c0244 +sym-or3_4-sym,7700ce42-997e-4db6-92cc-14e758244867 +sym-or3_4-text-name,c93c4e4d-248d-48b5-bde3-630a444c75f7 +sym-or3_4-text-value,0d4e1196-d172-44a8-96fc-5e3869729b7e +sym-xnor_4-pin-a,f22fa393-1d2f-4bf7-b9d6-03c40e266dd2 +sym-xnor_4-pin-b,7a4a4f42-4b3b-49a9-aeb1-90063ddcbccc +sym-xnor_4-pin-out,5f9867bc-da43-45ed-b1d2-d08cca03562e +sym-xnor_4-polygon-contour,1c638ffb-e0ce-4b00-8da4-e153d7c903e6 +sym-xnor_4-sym,dc4b515b-ad62-4753-a31f-0bb2211ecd58 +sym-xnor_4-text-name,b2fcd69b-1405-4157-b1b3-2f44940cf3fd +sym-xnor_4-text-value,6aa4c037-b011-43f8-bf27-18b0fbbd09ed +sym-xor_4-pin-a,5b0a0953-df86-4415-9424-235b2c5967c5 +sym-xor_4-pin-b,65dd29b4-408e-4ae3-905d-72842453e3b1 +sym-xor_4-pin-out,a78e7aa6-f8e3-4343-94dd-67692f44dd5a +sym-xor_4-polygon-contour,024d7f92-990d-4416-8afd-5c2f95d05c36 +sym-xor_4-sym,c8f3539f-7c42-48cd-89d8-93e4c96748df +sym-xor_4-text-name,3c75a325-2158-4d4d-b2a1-96c23e670341 +sym-xor_4-text-value,2d81b591-bb40-485a-b25a-55e25009a0ff diff --git a/Logic/uuid_cache_gates_cmpcat.csv b/Logic/uuid_cache_gates_cmpcat.csv index 269e2ff7..255909c9 100644 --- a/Logic/uuid_cache_gates_cmpcat.csv +++ b/Logic/uuid_cache_gates_cmpcat.csv @@ -1,6 +1,10 @@ cmpcat-and2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and2_6-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and2_8-cmpcat,d5520d06-02ea-4fda-8464-a6e826df861b cmpcat-and2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and2_dm_8-cmpcat,f2454fd2-590a-48d7-a3f1-b3367c2fc662 cmpcat-and3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and3_8-cmpcat,c27abb9b-defc-4c32-804a-eb8b1e1a8e7f cmpcat-inv_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 diff --git a/generate_logic_sym.py b/generate_logic_sym.py index e3fbb364..ad3a7ffe 100644 --- a/generate_logic_sym.py +++ b/generate_logic_sym.py @@ -132,7 +132,6 @@ def generate_sym( create_date: Optional[str], ) -> None: category = 'sym' - scale = 1 pad_type = [] pad_name = [] pad_posx = [] @@ -145,11 +144,15 @@ def generate_sym( low_y = 0 high_x = 0 high_y = 0 - + scale = 1.000 + for row in cvs_raw_data[:num_of_rows]: # parsing each column of a row row_type = row[0] + if row_type == "SCALE": + scale = float(row[1]) + if row_type == "DEF": def_name = row[1] if row_type == "PIN": @@ -167,10 +170,10 @@ def generate_sym( pad_name.append(row[1]) pad_type.append(row[2]) - pad_posx.append(float(row[3]) / scale) - pad_posy.append(float(row[4]) / scale) - pad_length.append(float(row[5]) / scale) - uuid_pins.append(uuid('sym', def_name, 'pin-{}_{}'.format(row[1], row[3]))) + pad_posx.append(float(row[3])) + pad_posy.append(float(row[4])) + pad_length.append(float(row[5])) + uuid_pins.append(uuid('sym', def_name, 'pin-{}'.format(row[1]))) num_of_pins = num_of_pins + 1 uuid_sym = uuid('sym', '{}'.format(def_name), 'sym') @@ -219,6 +222,7 @@ def _uuid(identifier: str) -> str: # parsing each column of a row row_type = row[0] if row_type == "POLY": + line_width = float(row[1]) fill = row[2] fill_str = "False" if fill == "F": @@ -232,6 +236,8 @@ def _uuid(identifier: str) -> str: GrabArea(fill_str) ) + + if row_type == "POLYPT": print('POLYPT {} {} {}'.format( row[1], row[2], row[3])) poly_x = float(row[1]) / scale @@ -264,9 +270,10 @@ def _uuid(identifier: str) -> str: symbol.add_polygon(polygon) if row_type == "CIRC": - pos_x = float(row[1]) / scale - pos_y = float(row[2]) / scale - dia = float(row[3]) / scale + line_width = float(row[1]) / scale + pos_x = float(row[2]) / scale + pos_y = float(row[3]) / scale + dia = float(row[4]) / scale print('Circle ') circle = Circle( @@ -274,7 +281,7 @@ def _uuid(identifier: str) -> str: Layer('sym_outlines'), Width(line_width), Fill(False), - GrabArea(True), + GrabArea(False), Diameter(dia), Position(pos_x, pos_y) ) From b930a6f9b2e5242f5c4ebf22abe0de2cfc21f9eb Mon Sep 17 00:00:00 2001 From: ouabache Date: Sat, 21 Mar 2020 09:46:26 -0700 Subject: [PATCH 04/23] added NAND2_8 and BUFFER_8 changed body line width to .254 --- Logic/Logic/AND2_4.csv | 2 +- Logic/Logic/AND2_6.csv | 2 +- Logic/Logic/AND2_8.csv | 2 +- Logic/Logic/AND2_dm_4.csv | 8 ++++---- Logic/Logic/AND2_dm_8.csv | 8 ++++---- Logic/Logic/AND3_4.csv | 2 +- Logic/Logic/AND3_8.csv | 2 +- Logic/Logic/BUFFER_4.csv | 2 +- Logic/Logic/BUFFER_8.csv | 13 +++++++++++++ Logic/Logic/DFF_PN_4.csv | 4 ++-- Logic/Logic/DFF_RNPN_4.csv | 6 +++--- Logic/Logic/DFF_RN_4.csv | 4 ++-- Logic/Logic/INV_4.csv | 4 ++-- Logic/Logic/NAND2_4.csv | 4 ++-- Logic/Logic/NAND2_8.csv | 29 +++++++++++++++++++++++++++++ Logic/Logic/NAND2_dm_4.csv | 6 +++--- Logic/Logic/NAND3_4.csv | 4 ++-- Logic/Logic/NOR2_4.csv | 4 ++-- Logic/Logic/NOR2_dm_4.csv | 6 +++--- Logic/Logic/NOR3_4.csv | 4 ++-- Logic/Logic/OR2_4.csv | 2 +- Logic/Logic/OR2_dm_4.csv | 8 ++++---- Logic/Logic/OR3_4.csv | 2 +- Logic/Logic/QQN_RNPN_4.csv | 6 +++--- Logic/Logic/XNOR_4.csv | 6 +++--- Logic/Logic/XOR_4.csv | 4 ++-- Logic/script | 4 +++- Logic/uuid_cache_buffer.csv | 6 ++++++ Logic/uuid_cache_buffer_cmpcat.csv | 1 + Logic/uuid_cache_gates.csv | 7 +++++++ Logic/uuid_cache_gates_cmpcat.csv | 1 + 31 files changed, 111 insertions(+), 52 deletions(-) create mode 100644 Logic/Logic/BUFFER_8.csv create mode 100644 Logic/Logic/NAND2_8.csv diff --git a/Logic/Logic/AND2_4.csv b/Logic/Logic/AND2_4.csv index 037564ca..59c54ac8 100644 --- a/Logic/Logic/AND2_4.csv +++ b/Logic/Logic/AND2_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,AND2_4 KEYWORDS,gates KEYWORDS,and -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 diff --git a/Logic/Logic/AND2_6.csv b/Logic/Logic/AND2_6.csv index d5107ac5..9c126b78 100644 --- a/Logic/Logic/AND2_6.csv +++ b/Logic/Logic/AND2_6.csv @@ -2,7 +2,7 @@ SCALE,1.333 DEF,AND2_6 KEYWORDS,gates KEYWORDS,and -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 diff --git a/Logic/Logic/AND2_8.csv b/Logic/Logic/AND2_8.csv index 4f83207a..2a7409dd 100644 --- a/Logic/Logic/AND2_8.csv +++ b/Logic/Logic/AND2_8.csv @@ -2,7 +2,7 @@ SCALE,2.000 DEF,AND2_8 KEYWORDS,gates KEYWORDS,and -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 diff --git a/Logic/Logic/AND2_dm_4.csv b/Logic/Logic/AND2_dm_4.csv index d522f036..e0fef040 100644 --- a/Logic/Logic/AND2_dm_4.csv +++ b/Logic/Logic/AND2_dm_4.csv @@ -3,7 +3,7 @@ DEF,AND2_dm_4 KEYWORDS,gates KEYWORDS,and KEYWORDS,demorgan -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -23,9 +23,9 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,.25,11.43,0,2.54 -CIRC,.25,-9.97,5.08,2.54 -CIRC,.25,-9.97,-5.08,2.54 +CIRC,.254,11.43,0,2.54 +CIRC,.254,-9.97,5.08,2.54 +CIRC,.254,-9.97,-5.08,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 diff --git a/Logic/Logic/AND2_dm_8.csv b/Logic/Logic/AND2_dm_8.csv index 5f5d2174..455a611a 100644 --- a/Logic/Logic/AND2_dm_8.csv +++ b/Logic/Logic/AND2_dm_8.csv @@ -3,7 +3,7 @@ DEF,AND2_dm_8 KEYWORDS,gates KEYWORDS,and KEYWORDS,demorgan -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -23,9 +23,9 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,.25,11.43,0,2.54 -CIRC,.25,-9.97,5.08,2.54 -CIRC,.25,-9.97,-5.08,2.54 +CIRC,.254,11.43,0,2.54 +CIRC,.254,-9.97,5.08,2.54 +CIRC,.254,-9.97,-5.08,2.54 PIN,A,R,-7.62,2.54,0 PIN,B,R,-7.62,-2.54,0 PIN,OUT,L,7.62,0,0 diff --git a/Logic/Logic/AND3_4.csv b/Logic/Logic/AND3_4.csv index 8088f50c..ce716611 100644 --- a/Logic/Logic/AND3_4.csv +++ b/Logic/Logic/AND3_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,AND3_4 KEYWORDS,gates KEYWORDS,and -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 diff --git a/Logic/Logic/AND3_8.csv b/Logic/Logic/AND3_8.csv index 8bb18068..8b30fcf7 100644 --- a/Logic/Logic/AND3_8.csv +++ b/Logic/Logic/AND3_8.csv @@ -3,7 +3,7 @@ DEF,AND3_8 KEYWORDS,gates KEYWORDS,and SCALE,2.000 -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 diff --git a/Logic/Logic/BUFFER_4.csv b/Logic/Logic/BUFFER_4.csv index 9836df9d..71788c94 100644 --- a/Logic/Logic/BUFFER_4.csv +++ b/Logic/Logic/BUFFER_4.csv @@ -1,7 +1,7 @@ SCALE,1.000 DEF,BUFFER_4 KEYWORDS,buffer -POLY,.25,F +POLY,.254,F POLYPT,-5.08,-7.62,0 POLYPT,-5.08,7.62,0 POLYPT,10.16,0,0 diff --git a/Logic/Logic/BUFFER_8.csv b/Logic/Logic/BUFFER_8.csv new file mode 100644 index 00000000..8dd14b6a --- /dev/null +++ b/Logic/Logic/BUFFER_8.csv @@ -0,0 +1,13 @@ +SCALE,2.000 +DEF,BUFFER_8 +KEYWORDS,buffer +POLY,.254,F +POLYPT,-5.08,-7.62,0 +POLYPT,-5.08,7.62,0 +POLYPT,10.16,0,0 +POLYPT,-5.08,-7.62,0 +POLYST +PIN,A,R,-7.62,0,5.08 +PIN,OUT,L,7.62,0,2.54 +TEXT,2.54,7.62,NAME +TEXT,2.54,-10.16,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_PN_4.csv b/Logic/Logic/DFF_PN_4.csv index b377c735..eeeb7095 100644 --- a/Logic/Logic/DFF_PN_4.csv +++ b/Logic/Logic/DFF_PN_4.csv @@ -1,6 +1,6 @@ SCALE,1.000 DEF,DFF_PN_4 -POLY,.25,F +POLY,.254,F POLYPT,-10.16,10.16,0 POLYPT,10.16,10.16,0 POLYPT,10.16,-10.16,0 @@ -17,7 +17,7 @@ POLYPT,-12.7,15.24,0 POLYPT,0,15.24,0 POLYPT,0,12.7,0 POLYST -CIRC,.25,0,11.43,2.54 +CIRC,.254,0,11.43,2.54 PIN,D,R,-15.24,5.08,5.08 PIN,CLK,R,-15.24,-5.08,5.08 PIN,PRE_N,R,-15.24,15.24,5.08 diff --git a/Logic/Logic/DFF_RNPN_4.csv b/Logic/Logic/DFF_RNPN_4.csv index 957551f0..f31d6760 100644 --- a/Logic/Logic/DFF_RNPN_4.csv +++ b/Logic/Logic/DFF_RNPN_4.csv @@ -1,6 +1,6 @@ SCALE,1.000 DEF,DFF_RNPN_4 -POLY,.25,F +POLY,.254,F POLYPT,-10.16,10.16,0 POLYPT,10.16,10.16,0 POLYPT,10.16,-10.16,0 @@ -22,8 +22,8 @@ POLYPT,-12.7,15.24,0 POLYPT,0,15.24,0 POLYPT,0,12.7,0 POLYST -CIRC,.25,0,11.43,2.54 -CIRC,.25,0,-11.43,2.54 +CIRC,.254,0,11.43,2.54 +CIRC,.254,0,-11.43,2.54 PIN,D,R,-15.24,5.08,5.08 PIN,CLK,R,-15.24,-5.08,5.08 PIN,RST_N,R,-15.24,-15.24,5.08 diff --git a/Logic/Logic/DFF_RN_4.csv b/Logic/Logic/DFF_RN_4.csv index 5a779a1f..dae1efb0 100644 --- a/Logic/Logic/DFF_RN_4.csv +++ b/Logic/Logic/DFF_RN_4.csv @@ -1,6 +1,6 @@ SCALE,1.000 DEF,DFF_RN_4 -POLY,.25,F +POLY,.254,F POLYPT,-10.16,10.16,0 POLYPT,10.16,10.16,0 POLYPT,10.16,-10.16,0 @@ -17,7 +17,7 @@ POLYPT,-12.7,-15.24,0 POLYPT,0,-15.24,0 POLYPT,0,-12.7,0 POLYST -CIRC,.25,0,-11.43,2.54 +CIRC,.254,0,-11.43,2.54 PIN,D,R,-15.24,5.08,5.08 PIN,CLK,R,-15.24,-5.08,5.08 PIN,RST_N,R,-15.24,-15.24,5.08 diff --git a/Logic/Logic/INV_4.csv b/Logic/Logic/INV_4.csv index 0c9f9e72..f3bf63df 100644 --- a/Logic/Logic/INV_4.csv +++ b/Logic/Logic/INV_4.csv @@ -1,13 +1,13 @@ SCALE,1.000 DEF,INV_4 KEYWORDS,inverter -POLY,.25,F +POLY,.254,F POLYPT,-5.08,-7.62,0 POLYPT,-5.08,7.62,0 POLYPT,10.16,0,0 POLYPT,-5.08,-7.62,0 POLYST -CIRC,.25,11.43,0,2.54 +CIRC,.254,11.43,0,2.54 PIN,A,R,-15.24,0,10.16 PIN,OUT,L,15.24,0,2.54 TEXT,2.54,7.62,NAME diff --git a/Logic/Logic/NAND2_4.csv b/Logic/Logic/NAND2_4.csv index 3ef55f70..070cc97d 100644 --- a/Logic/Logic/NAND2_4.csv +++ b/Logic/Logic/NAND2_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,NAND2_4 KEYWORDS,gates KEYWORDS,nand -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 @@ -21,7 +21,7 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,.25,11.43,0,2.54 +CIRC,.254,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 diff --git a/Logic/Logic/NAND2_8.csv b/Logic/Logic/NAND2_8.csv new file mode 100644 index 00000000..faf444d0 --- /dev/null +++ b/Logic/Logic/NAND2_8.csv @@ -0,0 +1,29 @@ +SCALE,2.000 +DEF,NAND2_8 +KEYWORDS,gates +KEYWORDS,nand +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-10.16,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-10.16,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,.254,11.43,0,2.54 +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_dm_4.csv b/Logic/Logic/NAND2_dm_4.csv index 8423305e..93df082d 100644 --- a/Logic/Logic/NAND2_dm_4.csv +++ b/Logic/Logic/NAND2_dm_4.csv @@ -3,7 +3,7 @@ DEF,NAND2_dm_4 KEYWORDS,gates KEYWORDS,nand KEYWORDS,demorgan -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -23,8 +23,8 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST -CIRC,.25,-9.97,5.08,2.54 -CIRC,.25,-9.97,-5.08,2.54 +CIRC,.254,-9.97,5.08,2.54 +CIRC,.254,-9.97,-5.08,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 diff --git a/Logic/Logic/NAND3_4.csv b/Logic/Logic/NAND3_4.csv index 6b490919..ee2a2d26 100644 --- a/Logic/Logic/NAND3_4.csv +++ b/Logic/Logic/NAND3_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,NAND3_4 KEYWORDS,gates KEYWORDS,nand -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 @@ -25,7 +25,7 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,.25,11.43,0,2.54 +CIRC,.254,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,0,0 PIN,C,R,-15.24,-5.08,0 diff --git a/Logic/Logic/NOR2_4.csv b/Logic/Logic/NOR2_4.csv index 6928f7d0..8c8ecc4c 100644 --- a/Logic/Logic/NOR2_4.csv +++ b/Logic/Logic/NOR2_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,NOR2_4 KEYWORDS,gates KEYWORDS,nor -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -22,7 +22,7 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,.25,11.43,0,2.54 +CIRC,.254,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 diff --git a/Logic/Logic/NOR2_dm_4.csv b/Logic/Logic/NOR2_dm_4.csv index 7b3b8e93..5fa4f4c3 100644 --- a/Logic/Logic/NOR2_dm_4.csv +++ b/Logic/Logic/NOR2_dm_4.csv @@ -3,7 +3,7 @@ DEF,NOR2_dm_4 KEYWORDS,gates KEYWORDS,nor KEYWORDS,demorgan -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 @@ -22,8 +22,8 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,10.16,0,0 POLYST -CIRC,.25,-11.43,5.08,2.54 -CIRC,.25,-11.43,-5.08,2.54 +CIRC,.254,-11.43,5.08,2.54 +CIRC,.254,-11.43,-5.08,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 diff --git a/Logic/Logic/NOR3_4.csv b/Logic/Logic/NOR3_4.csv index 17046b07..7a8ac00f 100644 --- a/Logic/Logic/NOR3_4.csv +++ b/Logic/Logic/NOR3_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,NOR3_4 KEYWORDS,gates KEYWORDS,nor -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -26,7 +26,7 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,.25,11.43,0,2.54 +CIRC,.254,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,0,0 PIN,C,R,-15.24,-5.08,0 diff --git a/Logic/Logic/OR2_4.csv b/Logic/Logic/OR2_4.csv index 499b1eea..fa08a0d1 100644 --- a/Logic/Logic/OR2_4.csv +++ b/Logic/Logic/OR2_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,OR2_4 KEYWORDS,gates KEYWORDS,or -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 diff --git a/Logic/Logic/OR2_dm_4.csv b/Logic/Logic/OR2_dm_4.csv index abf3c93e..ac937cfe 100644 --- a/Logic/Logic/OR2_dm_4.csv +++ b/Logic/Logic/OR2_dm_4.csv @@ -3,7 +3,7 @@ DEF,OR2_dm_4 KEYWORDS,gates KEYWORDS,or KEYWORDS,demorgan -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,1.905,8.255,-180 POLYPT,1.905,-8.255,0 @@ -22,9 +22,9 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,.25,11.43,0,2.54 -CIRC,.25,-11.43,5.08,2.54 -CIRC,.25,-11.43,-5.08,2.54 +CIRC,.254,11.43,0,2.54 +CIRC,.254,-11.43,5.08,2.54 +CIRC,.254,-11.43,-5.08,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 diff --git a/Logic/Logic/OR3_4.csv b/Logic/Logic/OR3_4.csv index 886d524c..658e3de5 100644 --- a/Logic/Logic/OR3_4.csv +++ b/Logic/Logic/OR3_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,OR3_4 KEYWORDS,gates KEYWORDS,or -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 diff --git a/Logic/Logic/QQN_RNPN_4.csv b/Logic/Logic/QQN_RNPN_4.csv index a79a97fd..d4b06b09 100644 --- a/Logic/Logic/QQN_RNPN_4.csv +++ b/Logic/Logic/QQN_RNPN_4.csv @@ -1,6 +1,6 @@ SCALE,1.000 DEF,QQN_RNPN_4 -POLY,.25,F +POLY,.254,F POLYPT,-10.16,10.16,0 POLYPT,10.16,10.16,0 POLYPT,10.16,-10.16,0 @@ -22,8 +22,8 @@ POLYPT,-12.7,15.24,0 POLYPT,0,15.24,0 POLYPT,0,12.7,0 POLYST -CIRC,.25,0,11.43,2.54 -CIRC,.25,0,-11.43,2.54 +CIRC,.254,0,11.43,2.54 +CIRC,.254,0,-11.43,2.54 PIN,D,R,-15.24,5.08,5.08 PIN,CLK,R,-15.24,-5.08,5.08 PIN,RST_N,R,-15.24,-15.24,5.08 diff --git a/Logic/Logic/XNOR_4.csv b/Logic/Logic/XNOR_4.csv index 8053a231..8e7c8986 100644 --- a/Logic/Logic/XNOR_4.csv +++ b/Logic/Logic/XNOR_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,XNOR_4 KEYWORDS,gates KEYWORDS,xnor -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -10,7 +10,7 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,.25,N +POLY,.254,N POLYPT,-11.43,-8.255,65.0 POLYPT,-11.43,8.255,0 POLYST @@ -26,7 +26,7 @@ POLY,.158,N POLYPT,15.24,0,0 POLYPT,12.7,0,0 POLYST -CIRC,.25,11.43,0,2.54 +CIRC,.254,11.43,0,2.54 PIN,A,R,-15.24,5.08,0 PIN,B,R,-15.24,-5.08,0 PIN,OUT,L,15.24,0,0 diff --git a/Logic/Logic/XOR_4.csv b/Logic/Logic/XOR_4.csv index afc24deb..3dbafe3e 100644 --- a/Logic/Logic/XOR_4.csv +++ b/Logic/Logic/XOR_4.csv @@ -2,7 +2,7 @@ SCALE,1.000 DEF,XOR_4 KEYWORDS,gates KEYWORDS,xor -POLY,.25,F +POLY,.254,F POLYPT,-10.16,8.255,0 POLYPT,-3.81,8.255,-65.0 POLYPT,10.16,0,-65.0 @@ -10,7 +10,7 @@ POLYPT,-3.81,-8.255,0 POLYPT,-10.16,-8.255,65.0 POLYPT,-10.16,8.255,0 POLYST -POLY,.25,N +POLY,.254,N POLYPT,-11.43,-8.255,65.0 POLYPT,-11.43,8.255,0 POLYST diff --git a/Logic/script b/Logic/script index aa464bda..8f1ccecf 100755 --- a/Logic/script +++ b/Logic/script @@ -15,6 +15,7 @@ python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_4 python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_4 +python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_8 python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design QQN_RNPN_4 python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RNPN_4 python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RN_4 @@ -22,4 +23,5 @@ python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_6 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_8 \ No newline at end of file +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_8 \ No newline at end of file diff --git a/Logic/uuid_cache_buffer.csv b/Logic/uuid_cache_buffer.csv index 19bc80f8..246a0c40 100644 --- a/Logic/uuid_cache_buffer.csv +++ b/Logic/uuid_cache_buffer.csv @@ -4,3 +4,9 @@ sym-buffer_4-polygon-contour,31577bb4-151a-46ac-b1c1-6ab12975ffb4 sym-buffer_4-sym,5056713c-62ad-4c5e-90d4-a46a12b6aeaa sym-buffer_4-text-name,ea4dafbd-17ac-4c21-ac7c-bf9180e42874 sym-buffer_4-text-value,8608ea1b-a4c6-4eff-9322-15929dad02c8 +sym-buffer_8-pin-a,f71a21e1-b713-477c-a87d-94908c37679a +sym-buffer_8-pin-out,91d4e65c-c81b-4bf2-87fe-cb5872255f9c +sym-buffer_8-polygon-contour,2b002120-17f6-4f14-b697-fef217579922 +sym-buffer_8-sym,8f1e795f-12a9-4c9e-8acd-1a643a1fc543 +sym-buffer_8-text-name,28f85863-fd26-43b6-b267-6e845b5bffd8 +sym-buffer_8-text-value,0b9f90e3-2203-4b39-ba5e-5f14425639b8 diff --git a/Logic/uuid_cache_buffer_cmpcat.csv b/Logic/uuid_cache_buffer_cmpcat.csv index c979ff8d..c6773e99 100644 --- a/Logic/uuid_cache_buffer_cmpcat.csv +++ b/Logic/uuid_cache_buffer_cmpcat.csv @@ -1 +1,2 @@ cmpcat-buffer_4-cmpcat,56f01b1d-0723-4c33-88f7-9968cf96b50f +cmpcat-buffer_8-cmpcat,56f01b1d-0723-4c33-88f7-9968cf96b50f diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv index 6a6e82fa..4670f05b 100644 --- a/Logic/uuid_cache_gates.csv +++ b/Logic/uuid_cache_gates.csv @@ -62,6 +62,13 @@ sym-nand2_4-polygon-contour,16278946-3ca9-4868-9dac-c963ab9fd17b sym-nand2_4-sym,dba50be9-299e-434a-979b-ad6e99a96be0 sym-nand2_4-text-name,28d08756-5a37-40fe-ae15-91c2bcb6f11f sym-nand2_4-text-value,83acd99e-93af-442e-a228-9af054fe3859 +sym-nand2_8-pin-a,a85f484c-8f8c-4035-aa1b-4d4139ae334e +sym-nand2_8-pin-b,4069c8f8-2709-4295-ade2-6c5ead1b02a1 +sym-nand2_8-pin-out,4016f10a-3ea6-4ada-bccd-fcb82eec1347 +sym-nand2_8-polygon-contour,a6202f6d-7848-47b1-8b0f-86040cb5fd3b +sym-nand2_8-sym,ce347ad6-691b-4a35-82a6-e540733830d5 +sym-nand2_8-text-name,d31e54a8-4ba7-44a6-899e-de9faa3e3b49 +sym-nand2_8-text-value,2028972a-bdea-4fbb-8103-894bf3c5a9c4 sym-nand2_dm_4-pin-a,d7132dbe-c67d-4208-a3db-6667cc7f0257 sym-nand2_dm_4-pin-b,d52ef654-c361-4002-8b89-eac215b3da24 sym-nand2_dm_4-pin-out,27f9da2b-3555-4042-b242-1da6a3c7ed23 diff --git a/Logic/uuid_cache_gates_cmpcat.csv b/Logic/uuid_cache_gates_cmpcat.csv index 255909c9..ed9be4a5 100644 --- a/Logic/uuid_cache_gates_cmpcat.csv +++ b/Logic/uuid_cache_gates_cmpcat.csv @@ -7,6 +7,7 @@ cmpcat-and3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and3_8-cmpcat,c27abb9b-defc-4c32-804a-eb8b1e1a8e7f cmpcat-inv_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 From efb4f7654aa5d9c442286b41e507a314b472921e Mon Sep 17 00:00:00 2001 From: ouabache Date: Sat, 21 Mar 2020 10:26:10 -0700 Subject: [PATCH 05/23] fixed lint errors --- generate_logic_sym.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/generate_logic_sym.py b/generate_logic_sym.py index ad3a7ffe..d3b3e721 100644 --- a/generate_logic_sym.py +++ b/generate_logic_sym.py @@ -145,7 +145,7 @@ def generate_sym( high_x = 0 high_y = 0 scale = 1.000 - + for row in cvs_raw_data[:num_of_rows]: # parsing each column of a row row_type = row[0] @@ -236,8 +236,6 @@ def _uuid(identifier: str) -> str: GrabArea(fill_str) ) - - if row_type == "POLYPT": print('POLYPT {} {} {}'.format( row[1], row[2], row[3])) poly_x = float(row[1]) / scale From e40aedbf0abbaafd5d45fc5c4273b25dce244020 Mon Sep 17 00:00:00 2001 From: ouabache Date: Sat, 21 Mar 2020 11:31:43 -0700 Subject: [PATCH 06/23] added more parts --- Logic/Logic/INV_8.csv | 14 ++++++ Logic/Logic/NAND2_dm_8.csv | 32 +++++++++++++ Logic/Logic/NAND3_8.csv | 34 +++++++++++++ Logic/Logic/NOR2_8.csv | 30 ++++++++++++ Logic/Logic/NOR2_dm_8.csv | 31 ++++++++++++ Logic/Logic/NOR3_8.csv | 35 ++++++++++++++ Logic/Logic/OR2_8.csv | 29 ++++++++++++ Logic/Logic/OR2_dm_8.csv | 32 +++++++++++++ Logic/Logic/OR3_8.csv | 34 +++++++++++++ Logic/Logic/XNOR_8.csv | 34 +++++++++++++ Logic/Logic/XOR_8.csv | 33 +++++++++++++ Logic/script | 22 +++++++-- Logic/uuid_cache_gates.csv | 79 +++++++++++++++++++++++++++++++ Logic/uuid_cache_gates_cmpcat.csv | 11 +++++ 14 files changed, 445 insertions(+), 5 deletions(-) create mode 100644 Logic/Logic/INV_8.csv create mode 100644 Logic/Logic/NAND2_dm_8.csv create mode 100644 Logic/Logic/NAND3_8.csv create mode 100644 Logic/Logic/NOR2_8.csv create mode 100644 Logic/Logic/NOR2_dm_8.csv create mode 100644 Logic/Logic/NOR3_8.csv create mode 100644 Logic/Logic/OR2_8.csv create mode 100644 Logic/Logic/OR2_dm_8.csv create mode 100644 Logic/Logic/OR3_8.csv create mode 100644 Logic/Logic/XNOR_8.csv create mode 100644 Logic/Logic/XOR_8.csv diff --git a/Logic/Logic/INV_8.csv b/Logic/Logic/INV_8.csv new file mode 100644 index 00000000..19cb407a --- /dev/null +++ b/Logic/Logic/INV_8.csv @@ -0,0 +1,14 @@ +SCALE,2.000 +DEF,INV_8 +KEYWORDS,inverter +POLY,.254,F +POLYPT,-5.08,-7.62,0 +POLYPT,-5.08,7.62,0 +POLYPT,10.16,0,0 +POLYPT,-5.08,-7.62,0 +POLYST +CIRC,.254,11.43,0,2.54 +PIN,A,R,-7.62,0,5.08 +PIN,OUT,L,7.62,0,1.27 +TEXT,2.54,7.62,NAME +TEXT,2.54,-10.16,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_dm_8.csv b/Logic/Logic/NAND2_dm_8.csv new file mode 100644 index 00000000..943659ea --- /dev/null +++ b/Logic/Logic/NAND2_dm_8.csv @@ -0,0 +1,32 @@ +SCALE,2.000 +DEF,NAND2_dm_8 +KEYWORDS,gates +KEYWORDS,nand +KEYWORDS,demorgan +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-11.24,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-11.24,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +CIRC,.254,-9.97,5.08,2.54 +CIRC,.254,-9.97,-5.08,2.54 +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND3_8.csv b/Logic/Logic/NAND3_8.csv new file mode 100644 index 00000000..5c90c376 --- /dev/null +++ b/Logic/Logic/NAND3_8.csv @@ -0,0 +1,34 @@ +SCALE,2.000 +DEF,NAND3_8 +KEYWORDS,gates +KEYWORDS,nand +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-10.16,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,0,0 +POLYPT,-10.16,0,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-10.16,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,.254,11.43,0,2.54 +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,0,0 +PIN,C,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_8.csv b/Logic/Logic/NOR2_8.csv new file mode 100644 index 00000000..71295ea7 --- /dev/null +++ b/Logic/Logic/NOR2_8.csv @@ -0,0 +1,30 @@ +SCALE,2.000 +DEF,NOR2_8 +KEYWORDS,gates +KEYWORDS,nor +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,.254,11.43,0,2.54 +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_dm_8.csv b/Logic/Logic/NOR2_dm_8.csv new file mode 100644 index 00000000..f41f8b52 --- /dev/null +++ b/Logic/Logic/NOR2_dm_8.csv @@ -0,0 +1,31 @@ +SCALE,2.000 +DEF,NOR2_dm_8 +KEYWORDS,gates +KEYWORDS,nor +KEYWORDS,demorgan +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-12.70,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-12.70,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +CIRC,.254,-11.43,5.08,2.54 +CIRC,.254,-11.43,-5.08,2.54 +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR3_8.csv b/Logic/Logic/NOR3_8.csv new file mode 100644 index 00000000..26e2133a --- /dev/null +++ b/Logic/Logic/NOR3_8.csv @@ -0,0 +1,35 @@ +SCALE,2.000 +DEF,NOR3_8 +KEYWORDS,gates +KEYWORDS,nor +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,0,0 +POLYPT,-7.8,0,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,.254,11.43,0,2.54 +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,0,0 +PIN,C,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_8.csv b/Logic/Logic/OR2_8.csv new file mode 100644 index 00000000..6fb0670e --- /dev/null +++ b/Logic/Logic/OR2_8.csv @@ -0,0 +1,29 @@ +SCALE,2.000 +DEF,OR2_8 +KEYWORDS,gates +KEYWORDS,or +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_dm_8.csv b/Logic/Logic/OR2_dm_8.csv new file mode 100644 index 00000000..6f5a36cb --- /dev/null +++ b/Logic/Logic/OR2_dm_8.csv @@ -0,0 +1,32 @@ +SCALE,2.000 +DEF,OR2_dm_8 +KEYWORDS,gates +KEYWORDS,or +KEYWORDS,demorgan +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,1.905,8.255,-180 +POLYPT,1.905,-8.255,0 +POLYPT,-10.16,-8.255,0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-12.70,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-12.70,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,.254,11.43,0,2.54 +CIRC,.254,-11.43,5.08,2.54 +CIRC,.254,-11.43,-5.08,2.54 +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR3_8.csv b/Logic/Logic/OR3_8.csv new file mode 100644 index 00000000..2ff6db48 --- /dev/null +++ b/Logic/Logic/OR3_8.csv @@ -0,0 +1,34 @@ +SCALE,2.000 +DEF,OR3_8 +KEYWORDS,gates +KEYWORDS,or +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,0,0 +POLYPT,-7.8,0,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,0,0 +PIN,C,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/XNOR_8.csv b/Logic/Logic/XNOR_8.csv new file mode 100644 index 00000000..99f58c83 --- /dev/null +++ b/Logic/Logic/XNOR_8.csv @@ -0,0 +1,34 @@ +SCALE,2.000 +DEF,XNOR_8 +KEYWORDS,gates +KEYWORDS,xnor +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.254,N +POLYPT,-11.43,-8.255,65.0 +POLYPT,-11.43,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,12.7,0,0 +POLYST +CIRC,.254,11.43,0,2.54 +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/XOR_8.csv b/Logic/Logic/XOR_8.csv new file mode 100644 index 00000000..12f6e556 --- /dev/null +++ b/Logic/Logic/XOR_8.csv @@ -0,0 +1,33 @@ +SCALE,2.000 +DEF,XOR_8 +KEYWORDS,gates +KEYWORDS,xor +POLY,.254,F +POLYPT,-10.16,8.255,0 +POLYPT,-3.81,8.255,-65.0 +POLYPT,10.16,0,-65.0 +POLYPT,-3.81,-8.255,0 +POLYPT,-10.16,-8.255,65.0 +POLYPT,-10.16,8.255,0 +POLYST +POLY,.254,N +POLYPT,-11.43,-8.255,65.0 +POLYPT,-11.43,8.255,0 +POLYST +POLY,.158,N +POLYPT,-15.24,5.08,0 +POLYPT,-8.7,5.08,0 +POLYST +POLY,.158,N +POLYPT,-15.24,-5.08,0 +POLYPT,-8.7,-5.08,0 +POLYST +POLY,.158,N +POLYPT,15.24,0,0 +POLYPT,10.16,0,0 +POLYST +PIN,A,R,-7.62,2.54,0 +PIN,B,R,-7.62,-2.54,0 +PIN,OUT,L,7.62,0,0 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/script b/Logic/script index 8f1ccecf..3c9f22f7 100755 --- a/Logic/script +++ b/Logic/script @@ -16,12 +16,24 @@ python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_4 python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_4 python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_8 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design QQN_RNPN_4 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RNPN_4 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RN_4 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_PN_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design QQN_RNPN_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RNPN_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RN_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_PN_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_6 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_8 \ No newline at end of file +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_8 + diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv index 4670f05b..c639c828 100644 --- a/Logic/uuid_cache_gates.csv +++ b/Logic/uuid_cache_gates.csv @@ -55,6 +55,12 @@ sym-inv_4-polygon-contour,0a5932f1-23f3-4da3-9c84-bff353f4cc98 sym-inv_4-sym,2abb4c96-39e3-4a54-a0af-f157dc952c6f sym-inv_4-text-name,0905a207-5b35-4ce5-b795-60f095fcd086 sym-inv_4-text-value,8d3be6b2-7a2a-41df-be68-93c394a4d894 +sym-inv_8-pin-a,3c783f17-2a80-4548-8851-b999dc0c4092 +sym-inv_8-pin-out,a5b0393e-2058-4e0c-89d5-b60cf740eab1 +sym-inv_8-polygon-contour,5c229317-661f-4b44-92a3-fb6fec97b9cc +sym-inv_8-sym,444b840d-1a08-406e-a124-7fd191bce716 +sym-inv_8-text-name,fbd11c9e-e9f8-4f16-9808-6d32121f1b6d +sym-inv_8-text-value,baee5c41-c6b8-4010-a40f-56de0b09cf21 sym-nand2_4-pin-a,bd6a472f-d301-4a11-a0a0-1a7f152c7a69 sym-nand2_4-pin-b,149f9758-5289-4274-a9ab-446fa67a7140 sym-nand2_4-pin-out,b432a92a-4128-4093-9089-6e806dd10cd5 @@ -76,6 +82,13 @@ sym-nand2_dm_4-polygon-contour,40815697-bb87-4c29-95f4-1a30f18cd41c sym-nand2_dm_4-sym,d5480d6d-4090-4167-8aaf-b2221398c767 sym-nand2_dm_4-text-name,849d6d01-cfe3-43d7-9095-35e31f3e6d6c sym-nand2_dm_4-text-value,e78fb97e-52c2-40b4-94f2-277d052eac9c +sym-nand2_dm_8-pin-a,98f71f8c-267b-404e-b330-c95ed76410d7 +sym-nand2_dm_8-pin-b,1cdfb4dc-05ef-482f-a932-a4546abdf164 +sym-nand2_dm_8-pin-out,bf4ab288-c8a7-4ed5-ba3e-b67c568d4c4c +sym-nand2_dm_8-polygon-contour,6b45cebb-736e-4166-b51d-91f809ce9fc9 +sym-nand2_dm_8-sym,89f0fd74-1964-4c78-b68c-6717b6864f34 +sym-nand2_dm_8-text-name,e06e70b8-0da9-468c-b423-dfa058c94958 +sym-nand2_dm_8-text-value,bbb91e2d-3035-4c96-87c9-f353e9446de8 sym-nand3_4-pin-a,d0eb4c67-8d6d-4bab-906f-47d9204fba4d sym-nand3_4-pin-b,6f0f0edb-f105-4139-ac9d-d331fdfc3d28 sym-nand3_4-pin-c,759534f7-41d6-4048-a665-a746be098820 @@ -84,6 +97,14 @@ sym-nand3_4-polygon-contour,0cd1c4d8-46e8-4e9d-b30f-1eb1687112e7 sym-nand3_4-sym,dd006f54-c31d-44f5-82b0-47001a85bd8e sym-nand3_4-text-name,143b4f49-d8d3-4775-b47f-8fa5a35574c7 sym-nand3_4-text-value,9f30c727-c89c-4fd0-99ce-a4873fd0c2a0 +sym-nand3_8-pin-a,a7fe9eac-8d22-448c-b710-d5df62e9ad49 +sym-nand3_8-pin-b,98e47102-1c2b-4f0b-aa17-33a1d243e59e +sym-nand3_8-pin-c,6fab44ec-f742-43e3-9e63-b30d19aa62d9 +sym-nand3_8-pin-out,03b7fb7a-c420-4371-8387-acfbebaf3a2f +sym-nand3_8-polygon-contour,0ce120d4-a092-44c6-b7b2-e3c2b9d216c1 +sym-nand3_8-sym,8e831381-b3e0-4b51-bc2b-fd1a27c8861b +sym-nand3_8-text-name,bd62c812-80d7-4e4e-ada9-d44bfdea297d +sym-nand3_8-text-value,cb00d927-b927-4e2f-88ac-4c4e9f8f1361 sym-nor2_4-pin-a,c3f92a54-f9c9-4b32-a7df-adcb0f5dc334 sym-nor2_4-pin-b,05d4b781-dd70-4a02-837b-6f41cb891e9c sym-nor2_4-pin-out,8803f39a-e4b9-4605-83c9-3d262c703a67 @@ -91,6 +112,13 @@ sym-nor2_4-polygon-contour,4c1a2562-b127-4879-94d9-80b1b430311a sym-nor2_4-sym,b15667ef-5883-474f-a6b9-c467702159f7 sym-nor2_4-text-name,5ab8f769-e60b-4bd9-99be-ea43846de962 sym-nor2_4-text-value,3c228c55-482e-4010-9edd-063fcbfe5091 +sym-nor2_8-pin-a,e29da491-bdaa-41fa-8198-f2c763784daf +sym-nor2_8-pin-b,5a553e97-1591-4cc7-b35a-2c902b06db75 +sym-nor2_8-pin-out,c2649ec1-630d-4467-a5c8-0bb3704a8e97 +sym-nor2_8-polygon-contour,f6fa7d2e-269f-4163-90b6-ff02f77c02af +sym-nor2_8-sym,43f46563-060f-41a2-b667-7651e8af820b +sym-nor2_8-text-name,5271d0a5-95e2-4b36-a8cf-0c37527a2cf2 +sym-nor2_8-text-value,b9cbd5a0-3fb2-403d-9592-e7d5e79eb429 sym-nor2_dm_4-pin-a,175111bb-47c4-43c5-a1fe-774aa7c533a6 sym-nor2_dm_4-pin-b,cd75a4f4-69f2-4861-a971-bf9c689eb9a2 sym-nor2_dm_4-pin-out,c14fbabb-4c63-4850-885d-55e77821ce76 @@ -98,6 +126,13 @@ sym-nor2_dm_4-polygon-contour,a6001d63-9e07-4b6a-a42f-403362fd4e35 sym-nor2_dm_4-sym,3d39b897-a882-4494-bbb9-e31c1dd88e90 sym-nor2_dm_4-text-name,a2834d16-da9d-45ff-be68-f9576dfd6a0b sym-nor2_dm_4-text-value,2f3ca9af-5679-4a5b-829a-9dfcb33ef89c +sym-nor2_dm_8-pin-a,e65c2484-f75f-46f4-87ba-ef5be0fe33b0 +sym-nor2_dm_8-pin-b,b7678ba7-4c5e-40fd-9b11-8c49a5fe7221 +sym-nor2_dm_8-pin-out,26c646ee-a222-49b0-b04c-8a58bccaf5b6 +sym-nor2_dm_8-polygon-contour,588a49e2-2756-49fb-9a14-46728dc5e26c +sym-nor2_dm_8-sym,ff55295b-5b80-4eb8-b5ef-76ac359acddc +sym-nor2_dm_8-text-name,3b3ca633-29b0-4071-9744-077c37505f03 +sym-nor2_dm_8-text-value,4e06443d-369b-4bb2-84a3-a754184f02d1 sym-nor3_4-pin-a,cf02fec4-17c0-447f-a848-6f9f16f78418 sym-nor3_4-pin-b,ef8a8fa4-8849-4f82-ae16-f300df5fdd7b sym-nor3_4-pin-c,323c2ac0-379d-4cc0-b9b5-f3b47bd97cfa @@ -106,6 +141,14 @@ sym-nor3_4-polygon-contour,c0f254cb-0347-4f6d-8ed5-b319ce813bf9 sym-nor3_4-sym,fb544ead-bfa0-4bd0-b876-58cdc4c971af sym-nor3_4-text-name,fb151569-b8ef-4776-8ee7-32dca5e255e4 sym-nor3_4-text-value,d4740a3a-128d-4a5d-9b78-15e8487b9245 +sym-nor3_8-pin-a,e178fdaa-2b8f-480d-901e-4c1247629d9c +sym-nor3_8-pin-b,4dec14f6-d65a-43bc-baa7-04febf32c3b1 +sym-nor3_8-pin-c,5313d57e-6a8a-4265-96f5-53009680845d +sym-nor3_8-pin-out,dcc02552-ed24-4954-9c8f-70717b465eb8 +sym-nor3_8-polygon-contour,ae2b3d89-cacb-419c-bf53-82116f4fa34c +sym-nor3_8-sym,0baeb161-2ebb-4100-898d-613f27371a6e +sym-nor3_8-text-name,b6adcd80-2e9e-413c-9e7c-129062686fdf +sym-nor3_8-text-value,7d8605f1-e588-4c60-bfaf-67fe4e320dab sym-or2_4-pin-a,4eb1ab6c-6a8a-49d0-baa7-bcc9ba90d593 sym-or2_4-pin-b,a9130261-6090-43d2-941c-5b55fdc48d93 sym-or2_4-pin-out,9a2ebb93-81ba-453a-a45d-344758eadd53 @@ -113,6 +156,13 @@ sym-or2_4-polygon-contour,23dd60d9-981f-4e4d-834c-d8238fac71ba sym-or2_4-sym,1a493221-27db-4124-8c4c-0aa0e8f37584 sym-or2_4-text-name,03db9547-c82e-477c-a679-9e6296c6d51e sym-or2_4-text-value,4a45f20d-48ee-4d79-98b2-9a0001b77b5c +sym-or2_8-pin-a,4773dfd0-1490-461b-8448-bba53cbe1185 +sym-or2_8-pin-b,b37f2fe1-fb07-4899-a1d9-1c1d7f549ad0 +sym-or2_8-pin-out,b23aa1e3-a7df-4c33-a042-51162588900f +sym-or2_8-polygon-contour,923ef5c4-213a-4f0f-bb07-ff143efd4124 +sym-or2_8-sym,675f5d37-b184-46bf-a744-d23ec8e1098e +sym-or2_8-text-name,484d3ccb-488f-45f7-99c8-09526145c7fe +sym-or2_8-text-value,f180cb1b-8206-4446-af28-2788eef606aa sym-or2_dm_4-pin-a,617832f7-890a-4679-8eb0-b72374efdc50 sym-or2_dm_4-pin-b,a0b2f9d5-b7ea-455a-9a9c-f743c13221ef sym-or2_dm_4-pin-out,00eb5100-999f-4100-932f-4ed7eae810e2 @@ -120,6 +170,13 @@ sym-or2_dm_4-polygon-contour,d47bbbab-1189-463c-b7ba-5809df7cac4d sym-or2_dm_4-sym,6e80543e-9da6-4c83-b3d5-be521ec92f9c sym-or2_dm_4-text-name,5446fe8f-1602-4ab0-b6fd-575445b34c21 sym-or2_dm_4-text-value,2d10e202-020c-4397-aad5-8cd52a66c5e0 +sym-or2_dm_8-pin-a,de4a5093-1f51-4843-b970-6cede57936af +sym-or2_dm_8-pin-b,6eadfe40-842d-402a-a395-c332865730d1 +sym-or2_dm_8-pin-out,070fe6be-ef57-4326-862c-e26ba4e5f54b +sym-or2_dm_8-polygon-contour,a6307bb0-ecca-4c17-bf45-5a8679e78ac7 +sym-or2_dm_8-sym,851db818-df67-4046-9219-c9b910665655 +sym-or2_dm_8-text-name,77fb0b7b-e0aa-47fe-9cbd-edd43ef9fe89 +sym-or2_dm_8-text-value,20593adc-ff85-474d-a9e5-1ee112a301c5 sym-or3_4-pin-a,2f7ec72a-a135-4746-9c89-961189defa32 sym-or3_4-pin-b,80c7a59b-3574-4ffe-b5eb-311f40406be0 sym-or3_4-pin-c,65a2bb92-4a99-4fb3-aab7-d653831a8d47 @@ -128,6 +185,14 @@ sym-or3_4-polygon-contour,4b03e82f-2a66-4273-bfde-983e635c0244 sym-or3_4-sym,7700ce42-997e-4db6-92cc-14e758244867 sym-or3_4-text-name,c93c4e4d-248d-48b5-bde3-630a444c75f7 sym-or3_4-text-value,0d4e1196-d172-44a8-96fc-5e3869729b7e +sym-or3_8-pin-a,08ad2a5f-7a39-47a9-83b6-8b5c6bec6870 +sym-or3_8-pin-b,e6085e57-6680-4b5c-a413-cf13f8e2be64 +sym-or3_8-pin-c,db829c66-6c54-4a98-ac51-dee370b504e0 +sym-or3_8-pin-out,d10eb37e-9716-421b-81ac-3740a3762d8c +sym-or3_8-polygon-contour,f898d388-db02-4551-8dd1-5f5f4753c759 +sym-or3_8-sym,4a6abc91-983f-49a3-9457-f3cd33cbfce7 +sym-or3_8-text-name,d62696c1-09bb-4b78-be88-08d790dc8868 +sym-or3_8-text-value,45228c6e-0d03-42c1-822d-240965356811 sym-xnor_4-pin-a,f22fa393-1d2f-4bf7-b9d6-03c40e266dd2 sym-xnor_4-pin-b,7a4a4f42-4b3b-49a9-aeb1-90063ddcbccc sym-xnor_4-pin-out,5f9867bc-da43-45ed-b1d2-d08cca03562e @@ -135,6 +200,13 @@ sym-xnor_4-polygon-contour,1c638ffb-e0ce-4b00-8da4-e153d7c903e6 sym-xnor_4-sym,dc4b515b-ad62-4753-a31f-0bb2211ecd58 sym-xnor_4-text-name,b2fcd69b-1405-4157-b1b3-2f44940cf3fd sym-xnor_4-text-value,6aa4c037-b011-43f8-bf27-18b0fbbd09ed +sym-xnor_8-pin-a,68e96016-a7b2-46c0-985f-e1a666132e59 +sym-xnor_8-pin-b,8bd974a4-081a-4ec5-ac2a-d26aaaf2b13e +sym-xnor_8-pin-out,cc7be725-bc76-4928-a373-864ca23e8828 +sym-xnor_8-polygon-contour,a3fe1ab2-6b5b-4e61-a680-5a9e587fca80 +sym-xnor_8-sym,60985adf-d640-470b-b786-b17b0e26137e +sym-xnor_8-text-name,9e5d2a41-aa10-4988-bba8-6d7c1bc85883 +sym-xnor_8-text-value,d1fb5e3c-206b-41f3-ade0-a1e8d94a8899 sym-xor_4-pin-a,5b0a0953-df86-4415-9424-235b2c5967c5 sym-xor_4-pin-b,65dd29b4-408e-4ae3-905d-72842453e3b1 sym-xor_4-pin-out,a78e7aa6-f8e3-4343-94dd-67692f44dd5a @@ -142,3 +214,10 @@ sym-xor_4-polygon-contour,024d7f92-990d-4416-8afd-5c2f95d05c36 sym-xor_4-sym,c8f3539f-7c42-48cd-89d8-93e4c96748df sym-xor_4-text-name,3c75a325-2158-4d4d-b2a1-96c23e670341 sym-xor_4-text-value,2d81b591-bb40-485a-b25a-55e25009a0ff +sym-xor_8-pin-a,373dcdaf-88c4-4eb7-b424-bc67789d4975 +sym-xor_8-pin-b,59e653ad-20c4-4903-a7d0-ff2b08a37bcc +sym-xor_8-pin-out,f505e166-66a3-4116-80a9-793e10ecb94f +sym-xor_8-polygon-contour,baef2a84-37ff-448a-9719-e5915ca2db0d +sym-xor_8-sym,1a76db63-ffb5-4914-aecd-ec0607637d73 +sym-xor_8-text-name,7ef1b485-b119-4af6-b848-b57ef5e90da9 +sym-xor_8-text-value,c49a8109-aea0-4661-8d03-c9f0d6c02f34 diff --git a/Logic/uuid_cache_gates_cmpcat.csv b/Logic/uuid_cache_gates_cmpcat.csv index ed9be4a5..f822bd7e 100644 --- a/Logic/uuid_cache_gates_cmpcat.csv +++ b/Logic/uuid_cache_gates_cmpcat.csv @@ -6,15 +6,26 @@ cmpcat-and2_dm_8-cmpcat,f2454fd2-590a-48d7-a3f1-b3367c2fc662 cmpcat-and3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and3_8-cmpcat,c27abb9b-defc-4c32-804a-eb8b1e1a8e7f cmpcat-inv_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-inv_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xnor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-xnor_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-xor_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 From b99c4bf6e79882a23e0b3d2563bdc91ba5d05057 Mon Sep 17 00:00:00 2001 From: ouabache Date: Sat, 21 Mar 2020 18:20:26 -0700 Subject: [PATCH 07/23] added more parts --- Logic/Boilerplate_multiplexor.csv | 4 ++++ Logic/Logic/DFF_4.csv | 19 +++++++++++++++++ Logic/Logic/DFF_P_4.csv | 25 +++++++++++++++++++++++ Logic/Logic/DFF_R_4.csv | 25 +++++++++++++++++++++++ Logic/Logic/MUX2_4.csv | 21 +++++++++++++++++++ Logic/Logic/MUX4_4.csv | 27 +++++++++++++++++++++++++ Logic/script | 5 +++++ Logic/uuid_cache_flipflop.csv | 23 +++++++++++++++++++++ Logic/uuid_cache_flipflop_cmpcat.csv | 3 +++ Logic/uuid_cache_multiplexor.csv | 19 +++++++++++++++++ Logic/uuid_cache_multiplexor_cmpcat.csv | 2 ++ 11 files changed, 173 insertions(+) create mode 100644 Logic/Boilerplate_multiplexor.csv create mode 100644 Logic/Logic/DFF_4.csv create mode 100644 Logic/Logic/DFF_P_4.csv create mode 100644 Logic/Logic/DFF_R_4.csv create mode 100644 Logic/Logic/MUX2_4.csv create mode 100644 Logic/Logic/MUX4_4.csv create mode 100644 Logic/uuid_cache_multiplexor.csv create mode 100644 Logic/uuid_cache_multiplexor_cmpcat.csv diff --git a/Logic/Boilerplate_multiplexor.csv b/Logic/Boilerplate_multiplexor.csv new file mode 100644 index 00000000..b17ba3d5 --- /dev/null +++ b/Logic/Boilerplate_multiplexor.csv @@ -0,0 +1,4 @@ +KEYWORDS,digital,logic,multiplexor +CREATE,2019-12-17T00:00:00Z +VERSION,0.1 +AUTHOR,John E. diff --git a/Logic/Logic/DFF_4.csv b/Logic/Logic/DFF_4.csv new file mode 100644 index 00000000..560276d0 --- /dev/null +++ b/Logic/Logic/DFF_4.csv @@ -0,0 +1,19 @@ +SCALE,1.000 +DEF,DFF_4 +POLY,.254,F +POLYPT,-10.16,10.16,0 +POLYPT,10.16,10.16,0 +POLYPT,10.16,-10.16,0 +POLYPT,-10.16,-10.16,0 +POLYPT,-10.16,10.16,0 +POLYST +POLY,.158,N +POLYPT,-10.16,-6.35,0 +POLYPT,-7.62,-5.08,0 +POLYPT,-10.16,-3.81,0 +POLYST +PIN,D,R,-15.24,5.08,5.08 +PIN,CLK,R,-15.24,-5.08,5.08 +PIN,Q,L,15.24,5.08,5.08 +TEXT,-12.7,10.16,NAME +TEXT,-15.24,-15.24,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_P_4.csv b/Logic/Logic/DFF_P_4.csv new file mode 100644 index 00000000..525d6682 --- /dev/null +++ b/Logic/Logic/DFF_P_4.csv @@ -0,0 +1,25 @@ +SCALE,1.000 +DEF,DFF_P_4 +POLY,.254,F +POLYPT,-10.16,10.16,0 +POLYPT,10.16,10.16,0 +POLYPT,10.16,-10.16,0 +POLYPT,-10.16,-10.16,0 +POLYPT,-10.16,10.16,0 +POLYST +POLY,.158,N +POLYPT,-10.16,-6.35,0 +POLYPT,-7.62,-5.08,0 +POLYPT,-10.16,-3.81,0 +POLYST +POLY,.158,N +POLYPT,-12.7,15.24,0 +POLYPT,0,15.24,0 +POLYPT,0,10.16,0 +POLYST +PIN,D,R,-15.24,5.08,5.08 +PIN,CLK,R,-15.24,-5.08,5.08 +PIN,PRE,R,-15.24,15.24,5.08 +PIN,Q,L,15.24,5.08,5.08 +TEXT,-12.7,10.16,NAME +TEXT,-15.24,-15.24,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_R_4.csv b/Logic/Logic/DFF_R_4.csv new file mode 100644 index 00000000..dcfa9c0e --- /dev/null +++ b/Logic/Logic/DFF_R_4.csv @@ -0,0 +1,25 @@ +SCALE,1.000 +DEF,DFF_R_4 +POLY,.254,F +POLYPT,-10.16,10.16,0 +POLYPT,10.16,10.16,0 +POLYPT,10.16,-10.16,0 +POLYPT,-10.16,-10.16,0 +POLYPT,-10.16,10.16,0 +POLYST +POLY,.158,N +POLYPT,-10.16,-6.35,0 +POLYPT,-7.62,-5.08,0 +POLYPT,-10.16,-3.81,0 +POLYST +POLY,.158,N +POLYPT,-12.7,-15.24,0 +POLYPT,0,-15.24,0 +POLYPT,0,-10.16,0 +POLYST +PIN,D,R,-15.24,5.08,5.08 +PIN,CLK,R,-15.24,-5.08,5.08 +PIN,RST,R,-15.24,-15.24,5.08 +PIN,Q,L,15.24,5.08,5.08 +TEXT,-12.7,10.16,NAME +TEXT,-15.24,-15.24,VALUE \ No newline at end of file diff --git a/Logic/Logic/MUX2_4.csv b/Logic/Logic/MUX2_4.csv new file mode 100644 index 00000000..856e0d42 --- /dev/null +++ b/Logic/Logic/MUX2_4.csv @@ -0,0 +1,21 @@ +SCALE,1.000 +DEF,MUX2_4 +KEYWORDS,Dual +POLY,.254,F +POLYPT,-10.16,-10.16,0 +POLYPT,-10.16,10.16,0 +POLYPT,10.16,5.08,0 +POLYPT,10.16,-5.08,0 +POLYPT,-10.16,-10.16,0 +POLYST +POLY,.158,N +POLYPT,-12.7,-15.24,0 +POLYPT,0,-15.24,0 +POLYPT,0,-7.62,0 +POLYST +PIN,A,R,-15.24,5.08,5.08 +PIN,B,R,-15.24,-5.08,5.08 +PIN,SEL,R,-15.24,-15.24,2.54 +PIN,OUT,L,15.24,0,5.08 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/Logic/MUX4_4.csv b/Logic/Logic/MUX4_4.csv new file mode 100644 index 00000000..f7735228 --- /dev/null +++ b/Logic/Logic/MUX4_4.csv @@ -0,0 +1,27 @@ +SCALE,1.000 +DEF,MUX4_4 +KEYWORDS,quad +POLY,.254,F +POLYPT,-10.16,-10.16,0 +POLYPT,-10.16,10.16,0 +POLYPT,10.16,5.08,0 +POLYPT,10.16,-5.08,0 +POLYPT,-10.16,-10.16,0 +POLYST +POLY,.158,N +POLYPT,-2.54,-15.24,0 +POLYPT,-2.54,-8.2,0 +POLYST +POLY,.158,N +POLYPT,2.54,-20.32,0 +POLYPT,2.54,-7.0,0 +POLYST +PIN,A,R,-15.24,7.62,5.08 +PIN,B,R,-15.24,2.54,5.08 +PIN,C,R,-15.24,-2.54,5.08 +PIN,D,R,-15.24,-7.62,5.08 +PIN,SEL0,R,-15.24,-15.24,12.7 +PIN,SEL1,R,-15.24,-20.32,17.78 +PIN,OUT,L,15.24,0,5.08 +TEXT,-2.54,7.62,NAME +TEXT,-2.54,-13.97,VALUE \ No newline at end of file diff --git a/Logic/script b/Logic/script index 3c9f22f7..4aef8f4b 100755 --- a/Logic/script +++ b/Logic/script @@ -20,6 +20,9 @@ python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RNPN_4 python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RN_4 python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_PN_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_P_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_R_4 +python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_6 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_8 @@ -36,4 +39,6 @@ python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_8 +python3.7 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ --design MUX2_4 +python3.7 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ --design MUX4_4 diff --git a/Logic/uuid_cache_flipflop.csv b/Logic/uuid_cache_flipflop.csv index 4f66e20c..c1220379 100644 --- a/Logic/uuid_cache_flipflop.csv +++ b/Logic/uuid_cache_flipflop.csv @@ -1,3 +1,18 @@ +sym-dff_4-pin-clk,dfc7a80e-906f-490d-a6cc-5582acdcd7f8 +sym-dff_4-pin-d,5935073f-013a-4888-8d2d-611780eb3f40 +sym-dff_4-pin-q,47483f20-b83e-485a-8626-22e6cbf61820 +sym-dff_4-polygon-contour,2f8bc6ca-5d38-4b46-95a6-ca1eb4e0d142 +sym-dff_4-sym,7e046efe-069a-4451-8d95-bbbb42172ddf +sym-dff_4-text-name,b19d9a9b-b7d5-4f80-8afd-de9431f0feb2 +sym-dff_4-text-value,0821bb56-d26f-4e9c-a227-aa7595659d5b +sym-dff_p_4-pin-clk,56fb8fba-03c0-41a9-a243-63b61f058fe1 +sym-dff_p_4-pin-d,d69a5e5f-0dcd-47ac-bdb0-4a94d6e457dc +sym-dff_p_4-pin-pre,9f9ee6d3-813d-49dc-922a-a7142e5181a2 +sym-dff_p_4-pin-q,6a4570f8-86c0-45e3-8715-8d55966f62f7 +sym-dff_p_4-polygon-contour,49a7f92d-b83e-4a71-a8c8-23969bbb0b75 +sym-dff_p_4-sym,e30cd3bb-556f-4cf1-8945-2afdab02105d +sym-dff_p_4-text-name,a5575b8d-cbed-4a9d-bd78-c70adc6e827f +sym-dff_p_4-text-value,1c6debd6-d2b0-4546-bbd4-1bffa69daceb sym-dff_pn_4-pin-clk,5b5bf55e-cb29-41d3-93cb-a71a437909e1 sym-dff_pn_4-pin-d,c79219e4-014e-48ae-9a58-9ee6056a8955 sym-dff_pn_4-pin-pre_n,da401084-429f-41df-983a-1536ced22d9e @@ -6,6 +21,14 @@ sym-dff_pn_4-polygon-contour,c4f5a6b6-b4a7-47da-a2d6-fdf1328deb67 sym-dff_pn_4-sym,7c16be6d-ff31-475e-b83b-316c51159639 sym-dff_pn_4-text-name,a2798e22-41ce-4e89-9b26-ba197ad4b8b1 sym-dff_pn_4-text-value,ef6fe216-909c-4701-9374-76fd665e7ea5 +sym-dff_r_4-pin-clk,8e21abb8-fb4d-484f-ab50-c66d732513e3 +sym-dff_r_4-pin-d,39b2cca8-f7c5-4ab9-bdec-25ad9a22ef3a +sym-dff_r_4-pin-q,71c9a916-fd42-4ccf-99a8-9ccd23042147 +sym-dff_r_4-pin-rst,562e46de-39c8-4053-b412-2752dae5da08 +sym-dff_r_4-polygon-contour,f64a35fa-c461-492a-af81-75d197322516 +sym-dff_r_4-sym,086b2bda-1fe1-46d0-980a-1d0a35908b74 +sym-dff_r_4-text-name,70c971c9-5feb-47b0-be79-b6d13be91ff2 +sym-dff_r_4-text-value,537ac67f-efc9-4165-937e-2651affd26ca sym-dff_rn_4-pin-clk,78eced60-2bbe-4922-8db8-f40e6d94794d sym-dff_rn_4-pin-d,69f49bbf-42e5-4934-ac1a-c97fe00236a7 sym-dff_rn_4-pin-q,1cddbd30-eed9-4429-8b6a-1e39df36c8da diff --git a/Logic/uuid_cache_flipflop_cmpcat.csv b/Logic/uuid_cache_flipflop_cmpcat.csv index 13e5a376..41f06aec 100644 --- a/Logic/uuid_cache_flipflop_cmpcat.csv +++ b/Logic/uuid_cache_flipflop_cmpcat.csv @@ -1,4 +1,7 @@ +cmpcat-dff_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d +cmpcat-dff_p_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d cmpcat-dff_pn_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d +cmpcat-dff_r_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d cmpcat-dff_rn_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d cmpcat-dff_rnpn_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d cmpcat-qqn_rnpn_4-cmpcat,f4abe9d8-20b1-4818-a007-0f1b527e621d diff --git a/Logic/uuid_cache_multiplexor.csv b/Logic/uuid_cache_multiplexor.csv new file mode 100644 index 00000000..16c5f23f --- /dev/null +++ b/Logic/uuid_cache_multiplexor.csv @@ -0,0 +1,19 @@ +sym-mux2_4-pin-a,6900868e-a880-4eb4-a5bc-14564cb5c7a3 +sym-mux2_4-pin-b,477777e1-a84f-4d71-877b-424d75b02ef8 +sym-mux2_4-pin-out,4d7fa97c-9c85-4769-aa44-8d4a044d625f +sym-mux2_4-pin-sel,9579d332-ed26-4957-944f-ed45a6b92613 +sym-mux2_4-polygon-contour,8d06b56b-b467-4ba3-b0c8-951cebb54394 +sym-mux2_4-sym,d79b314a-3895-4c67-8526-7a4241bc0a00 +sym-mux2_4-text-name,12219f60-2243-47ee-8ec2-cc4b8cf26677 +sym-mux2_4-text-value,13d8b681-3676-46e1-b45c-a99a47fbf9bd +sym-mux4_4-pin-a,1927c88c-08d1-4440-b4e7-535da5282f37 +sym-mux4_4-pin-b,70fb91ef-cc6e-468d-bc2f-3d11d1b77d41 +sym-mux4_4-pin-c,5408946f-9607-4199-846f-89bf212171ea +sym-mux4_4-pin-d,d4f30fb3-2e23-4358-a798-23ca9d4c236c +sym-mux4_4-pin-out,e2a62587-98d0-4fb3-bfdc-53df85241e31 +sym-mux4_4-pin-sel0,fcaaab0a-7a87-4c70-92f1-8d057e67f747 +sym-mux4_4-pin-sel1,1105af0d-5424-4bd5-8070-0f6521190edc +sym-mux4_4-polygon-contour,755dc772-57ed-4f9f-ab07-4818c0d7e52e +sym-mux4_4-sym,90b6616f-4296-45a4-97c3-789b3b573033 +sym-mux4_4-text-name,5482510b-a9e7-499a-94d2-d9a04b07d359 +sym-mux4_4-text-value,ba79ebef-87de-45e7-b88a-2035c6dcc86c diff --git a/Logic/uuid_cache_multiplexor_cmpcat.csv b/Logic/uuid_cache_multiplexor_cmpcat.csv new file mode 100644 index 00000000..5f7f95a9 --- /dev/null +++ b/Logic/uuid_cache_multiplexor_cmpcat.csv @@ -0,0 +1,2 @@ +cmpcat-mux2_4-cmpcat,651dca6f-67a5-4ee3-a07f-ed028243a6e2 +cmpcat-mux4_4-cmpcat,651dca6f-67a5-4ee3-a07f-ed028243a6e2 From 76ce4b1920fa1f7d4a436809f416e11cfee3600f Mon Sep 17 00:00:00 2001 From: ouabache Date: Sun, 22 Mar 2020 12:37:24 -0700 Subject: [PATCH 08/23] converted units from mm to snap grids --- Logic/Logic/AND2_4.csv | 40 +++++++++++++-------------- Logic/Logic/AND2_6.csv | 40 +++++++++++++-------------- Logic/Logic/AND2_8.csv | 40 +++++++++++++-------------- Logic/Logic/AND2_dm_4.csv | 48 ++++++++++++++++---------------- Logic/Logic/AND2_dm_8.csv | 48 ++++++++++++++++---------------- Logic/Logic/AND3_4.csv | 48 ++++++++++++++++---------------- Logic/Logic/AND3_8.csv | 48 ++++++++++++++++---------------- Logic/Logic/BUFFER_4.csv | 18 ++++++------ Logic/Logic/BUFFER_8.csv | 18 ++++++------ Logic/Logic/DFF_4.csv | 30 ++++++++++---------- Logic/Logic/DFF_PN_4.csv | 42 ++++++++++++++-------------- Logic/Logic/DFF_P_4.csv | 40 +++++++++++++-------------- Logic/Logic/DFF_RNPN_4.csv | 54 ++++++++++++++++++------------------ Logic/Logic/DFF_RN_4.csv | 42 ++++++++++++++-------------- Logic/Logic/DFF_R_4.csv | 40 +++++++++++++-------------- Logic/Logic/INV_4.csv | 20 +++++++------- Logic/Logic/INV_8.csv | 20 +++++++------- Logic/Logic/MUX2_4.csv | 32 +++++++++++----------- Logic/Logic/MUX4_4.csv | 42 ++++++++++++++-------------- Logic/Logic/NAND2_4.csv | 42 ++++++++++++++-------------- Logic/Logic/NAND2_8.csv | 42 ++++++++++++++-------------- Logic/Logic/NAND2_dm_4.csv | 46 +++++++++++++++---------------- Logic/Logic/NAND2_dm_8.csv | 46 +++++++++++++++---------------- Logic/Logic/NAND3_4.csv | 50 +++++++++++++++++----------------- Logic/Logic/NAND3_8.csv | 50 +++++++++++++++++----------------- Logic/Logic/NOR2_4.csv | 44 +++++++++++++++--------------- Logic/Logic/NOR2_8.csv | 44 +++++++++++++++--------------- Logic/Logic/NOR2_dm_4.csv | 44 +++++++++++++++--------------- Logic/Logic/NOR2_dm_8.csv | 44 +++++++++++++++--------------- Logic/Logic/NOR3_4.csv | 52 +++++++++++++++++------------------ Logic/Logic/NOR3_8.csv | 52 +++++++++++++++++------------------ Logic/Logic/OR2_4.csv | 42 ++++++++++++++-------------- Logic/Logic/OR2_8.csv | 42 ++++++++++++++-------------- Logic/Logic/OR2_dm_4.csv | 46 +++++++++++++++---------------- Logic/Logic/OR2_dm_8.csv | 46 +++++++++++++++---------------- Logic/Logic/OR3_4.csv | 50 +++++++++++++++++----------------- Logic/Logic/OR3_8.csv | 50 +++++++++++++++++----------------- Logic/Logic/QQN_RNPN_4.csv | 56 +++++++++++++++++++------------------- Logic/Logic/XNOR_4.csv | 50 +++++++++++++++++----------------- Logic/Logic/XNOR_8.csv | 50 +++++++++++++++++----------------- Logic/Logic/XOR_4.csv | 48 ++++++++++++++++---------------- Logic/Logic/XOR_8.csv | 48 ++++++++++++++++---------------- generate_logic_sym.py | 34 +++++++++++------------ 43 files changed, 914 insertions(+), 914 deletions(-) diff --git a/Logic/Logic/AND2_4.csv b/Logic/Logic/AND2_4.csv index 59c54ac8..83aacf1b 100644 --- a/Logic/Logic/AND2_4.csv +++ b/Logic/Logic/AND2_4.csv @@ -2,27 +2,27 @@ SCALE,1.000 DEF,AND2_4 KEYWORDS,gates KEYWORDS,and -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-10.16,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-10.16,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_6.csv b/Logic/Logic/AND2_6.csv index 9c126b78..bd2eaa91 100644 --- a/Logic/Logic/AND2_6.csv +++ b/Logic/Logic/AND2_6.csv @@ -2,27 +2,27 @@ SCALE,1.333 DEF,AND2_6 KEYWORDS,gates KEYWORDS,and -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-16.93,3.385,0 -POLYPT,-10.16,3.385,0 +POLY,.0622,N +POLYPT,-6.6654,1.3327,0 +POLYPT,-4.00,1.3327,0 POLYST -POLY,.158,N -POLYPT,-16.93,-3.385,0 -POLYPT,-10.16,-3.385,0 +POLY,.0622,N +POLYPT,-6.6654,-1.3327,0 +POLYPT,-4.00,-1.3327,0 POLYST -POLY,.158,N -POLYPT,16.93,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.6654,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-12.70,2.54,0 -PIN,B,R,-12.70,-2.54,0 -PIN,OUT,L,12.70,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-5.000,1.00,0 +PIN,B,R,-5.000,-1.00,0 +PIN,OUT,L,5.000,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_8.csv b/Logic/Logic/AND2_8.csv index 2a7409dd..a9db0b85 100644 --- a/Logic/Logic/AND2_8.csv +++ b/Logic/Logic/AND2_8.csv @@ -2,27 +2,27 @@ SCALE,2.000 DEF,AND2_8 KEYWORDS,gates KEYWORDS,and -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-10.16,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-10.16,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_dm_4.csv b/Logic/Logic/AND2_dm_4.csv index e0fef040..e030a72a 100644 --- a/Logic/Logic/AND2_dm_4.csv +++ b/Logic/Logic/AND2_dm_4.csv @@ -3,31 +3,31 @@ DEF,AND2_dm_4 KEYWORDS,gates KEYWORDS,and KEYWORDS,demorgan -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-11.24,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-11.24,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -CIRC,.254,-9.97,5.08,2.54 -CIRC,.254,-9.97,-5.08,2.54 -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +CIRC,.100,-3.9252,2.00,1.00 +CIRC,.100,-3.9252,-2.00,1.00 +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_dm_8.csv b/Logic/Logic/AND2_dm_8.csv index 455a611a..10eb89f9 100644 --- a/Logic/Logic/AND2_dm_8.csv +++ b/Logic/Logic/AND2_dm_8.csv @@ -3,31 +3,31 @@ DEF,AND2_dm_8 KEYWORDS,gates KEYWORDS,and KEYWORDS,demorgan -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-11.24,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-11.24,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -CIRC,.254,-9.97,5.08,2.54 -CIRC,.254,-9.97,-5.08,2.54 -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +CIRC,.100,-3.9252,2.00,1.00 +CIRC,.100,-3.9252,-2.00,1.00 +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND3_4.csv b/Logic/Logic/AND3_4.csv index ce716611..47555c6d 100644 --- a/Logic/Logic/AND3_4.csv +++ b/Logic/Logic/AND3_4.csv @@ -2,32 +2,32 @@ SCALE,1.000 DEF,AND3_4 KEYWORDS,gates KEYWORDS,and -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-10.16,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,0,0 -POLYPT,-10.16,0,0 +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-4.00,0,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-10.16,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,0,0 -PIN,C,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,0,0 +PIN,C,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND3_8.csv b/Logic/Logic/AND3_8.csv index 8b30fcf7..3d35f85b 100644 --- a/Logic/Logic/AND3_8.csv +++ b/Logic/Logic/AND3_8.csv @@ -3,32 +3,32 @@ DEF,AND3_8 KEYWORDS,gates KEYWORDS,and SCALE,2.000 -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-10.16,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,0,0 -POLYPT,-10.16,0,0 +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-4.00,0,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-10.16,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,0,0 -PIN,C,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,0,0 +PIN,C,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/BUFFER_4.csv b/Logic/Logic/BUFFER_4.csv index 71788c94..dcd3d107 100644 --- a/Logic/Logic/BUFFER_4.csv +++ b/Logic/Logic/BUFFER_4.csv @@ -1,13 +1,13 @@ SCALE,1.000 DEF,BUFFER_4 KEYWORDS,buffer -POLY,.254,F -POLYPT,-5.08,-7.62,0 -POLYPT,-5.08,7.62,0 -POLYPT,10.16,0,0 -POLYPT,-5.08,-7.62,0 +POLY,.100,F +POLYPT,-2.00,-3.00,0 +POLYPT,-2.00,3.00,0 +POLYPT,4.00,0,0 +POLYPT,-2.00,-3.00,0 POLYST -PIN,A,R,-15.24,0,10.16 -PIN,OUT,L,15.24,0,5.08 -TEXT,2.54,7.62,NAME -TEXT,2.54,-10.16,VALUE \ No newline at end of file +PIN,A,R,-6.00,0,4.00 +PIN,OUT,L,6.00,0,2.00 +TEXT,1.00,3.00,NAME +TEXT,1.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/BUFFER_8.csv b/Logic/Logic/BUFFER_8.csv index 8dd14b6a..e26e6797 100644 --- a/Logic/Logic/BUFFER_8.csv +++ b/Logic/Logic/BUFFER_8.csv @@ -1,13 +1,13 @@ SCALE,2.000 DEF,BUFFER_8 KEYWORDS,buffer -POLY,.254,F -POLYPT,-5.08,-7.62,0 -POLYPT,-5.08,7.62,0 -POLYPT,10.16,0,0 -POLYPT,-5.08,-7.62,0 +POLY,.100,F +POLYPT,-2.00,-3.00,0 +POLYPT,-2.00,3.00,0 +POLYPT,4.00,0,0 +POLYPT,-2.00,-3.00,0 POLYST -PIN,A,R,-7.62,0,5.08 -PIN,OUT,L,7.62,0,2.54 -TEXT,2.54,7.62,NAME -TEXT,2.54,-10.16,VALUE \ No newline at end of file +PIN,A,R,-3.00,0,2.00 +PIN,OUT,L,3.00,0,1.00 +TEXT,1.00,3.00,NAME +TEXT,1.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_4.csv b/Logic/Logic/DFF_4.csv index 560276d0..3c501261 100644 --- a/Logic/Logic/DFF_4.csv +++ b/Logic/Logic/DFF_4.csv @@ -1,19 +1,19 @@ SCALE,1.000 DEF,DFF_4 -POLY,.254,F -POLYPT,-10.16,10.16,0 -POLYPT,10.16,10.16,0 -POLYPT,10.16,-10.16,0 -POLYPT,-10.16,-10.16,0 -POLYPT,-10.16,10.16,0 +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 POLYST -POLY,.158,N -POLYPT,-10.16,-6.35,0 -POLYPT,-7.62,-5.08,0 -POLYPT,-10.16,-3.81,0 +POLY,.0622,N +POLYPT,-4.00,-2.50,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-4.00,-1.50,0 POLYST -PIN,D,R,-15.24,5.08,5.08 -PIN,CLK,R,-15.24,-5.08,5.08 -PIN,Q,L,15.24,5.08,5.08 -TEXT,-12.7,10.16,NAME -TEXT,-15.24,-15.24,VALUE \ No newline at end of file +PIN,D,R,-6.00,2.00,2.00 +PIN,CLK,R,-6.00,-2.00,2.00 +PIN,Q,L,6.00,2.00,2.00 +TEXT,-5.00,4.00,NAME +TEXT,-6.00,-6.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_PN_4.csv b/Logic/Logic/DFF_PN_4.csv index eeeb7095..89083c5d 100644 --- a/Logic/Logic/DFF_PN_4.csv +++ b/Logic/Logic/DFF_PN_4.csv @@ -1,26 +1,26 @@ SCALE,1.000 DEF,DFF_PN_4 -POLY,.254,F -POLYPT,-10.16,10.16,0 -POLYPT,10.16,10.16,0 -POLYPT,10.16,-10.16,0 -POLYPT,-10.16,-10.16,0 -POLYPT,-10.16,10.16,0 +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 POLYST -POLY,.158,N -POLYPT,-10.16,-6.35,0 -POLYPT,-7.62,-5.08,0 -POLYPT,-10.16,-3.81,0 +POLY,.0622,N +POLYPT,-4.00,-2.50,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-4.00,-1.50,0 POLYST -POLY,.158,N -POLYPT,-12.7,15.24,0 -POLYPT,0,15.24,0 -POLYPT,0,12.7,0 +POLY,.0622,N +POLYPT,-5.00,6.00,0 +POLYPT,0,6.00,0 +POLYPT,0,5.00,0 POLYST -CIRC,.254,0,11.43,2.54 -PIN,D,R,-15.24,5.08,5.08 -PIN,CLK,R,-15.24,-5.08,5.08 -PIN,PRE_N,R,-15.24,15.24,5.08 -PIN,Q,L,15.24,5.08,5.08 -TEXT,-12.7,10.16,NAME -TEXT,-15.24,-15.24,VALUE \ No newline at end of file +CIRC,.100,0,4.50,1.00 +PIN,D,R,-6.00,2.00,2.00 +PIN,CLK,R,-6.00,-2.00,2.00 +PIN,PRE_N,R,-6.00,6.00,2.00 +PIN,Q,L,6.00,2.00,2.00 +TEXT,-5.00,4.00,NAME +TEXT,-6.00,-6.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_P_4.csv b/Logic/Logic/DFF_P_4.csv index 525d6682..e5a636f7 100644 --- a/Logic/Logic/DFF_P_4.csv +++ b/Logic/Logic/DFF_P_4.csv @@ -1,25 +1,25 @@ SCALE,1.000 DEF,DFF_P_4 -POLY,.254,F -POLYPT,-10.16,10.16,0 -POLYPT,10.16,10.16,0 -POLYPT,10.16,-10.16,0 -POLYPT,-10.16,-10.16,0 -POLYPT,-10.16,10.16,0 +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 POLYST -POLY,.158,N -POLYPT,-10.16,-6.35,0 -POLYPT,-7.62,-5.08,0 -POLYPT,-10.16,-3.81,0 +POLY,.0622,N +POLYPT,-4.00,-2.50,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-4.00,-1.50,0 POLYST -POLY,.158,N -POLYPT,-12.7,15.24,0 -POLYPT,0,15.24,0 -POLYPT,0,10.16,0 +POLY,.0622,N +POLYPT,-5.00,6.00,0 +POLYPT,0,6.00,0 +POLYPT,0,4.00,0 POLYST -PIN,D,R,-15.24,5.08,5.08 -PIN,CLK,R,-15.24,-5.08,5.08 -PIN,PRE,R,-15.24,15.24,5.08 -PIN,Q,L,15.24,5.08,5.08 -TEXT,-12.7,10.16,NAME -TEXT,-15.24,-15.24,VALUE \ No newline at end of file +PIN,D,R,-6.00,2.00,2.00 +PIN,CLK,R,-6.00,-2.00,2.00 +PIN,PRE,R,-6.00,6.00,2.00 +PIN,Q,L,6.00,2.00,2.00 +TEXT,-5.00,4.00,NAME +TEXT,-6.00,-6.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_RNPN_4.csv b/Logic/Logic/DFF_RNPN_4.csv index f31d6760..eaa64094 100644 --- a/Logic/Logic/DFF_RNPN_4.csv +++ b/Logic/Logic/DFF_RNPN_4.csv @@ -1,33 +1,33 @@ SCALE,1.000 DEF,DFF_RNPN_4 -POLY,.254,F -POLYPT,-10.16,10.16,0 -POLYPT,10.16,10.16,0 -POLYPT,10.16,-10.16,0 -POLYPT,-10.16,-10.16,0 -POLYPT,-10.16,10.16,0 +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 POLYST -POLY,.158,N -POLYPT,-10.16,-6.35,0 -POLYPT,-7.62,-5.08,0 -POLYPT,-10.16,-3.81,0 +POLY,.0622,N +POLYPT,-4.00,-2.50,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-4.00,-1.50,0 POLYST -POLY,.158,N -POLYPT,-12.7,-15.24,0 -POLYPT,0,-15.24,0 -POLYPT,0,-12.7,0 +POLY,.0622,N +POLYPT,-5.00,-6.00,0 +POLYPT,0,-6.00,0 +POLYPT,0,-5.00,0 POLYST -POLY,.158,N -POLYPT,-12.7,15.24,0 -POLYPT,0,15.24,0 -POLYPT,0,12.7,0 +POLY,.0622,N +POLYPT,-5.00,6.00,0 +POLYPT,0,6.00,0 +POLYPT,0,5.00,0 POLYST -CIRC,.254,0,11.43,2.54 -CIRC,.254,0,-11.43,2.54 -PIN,D,R,-15.24,5.08,5.08 -PIN,CLK,R,-15.24,-5.08,5.08 -PIN,RST_N,R,-15.24,-15.24,5.08 -PIN,PRE_N,R,-15.24,15.24,5.08 -PIN,Q,L,15.24,5.08,5.08 -TEXT,-12.7,10.16,NAME -TEXT,-15.24,-15.24,VALUE \ No newline at end of file +CIRC,.100,0,4.50,1.00 +CIRC,.100,0,-4.50,1.00 +PIN,D,R,-6.00,2.00,2.00 +PIN,CLK,R,-6.00,-2.00,2.00 +PIN,RST_N,R,-6.00,-6.00,2.00 +PIN,PRE_N,R,-6.00,6.00,2.00 +PIN,Q,L,6.00,2.00,2.00 +TEXT,-5.00,4.00,NAME +TEXT,-6.00,-6.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_RN_4.csv b/Logic/Logic/DFF_RN_4.csv index dae1efb0..d3d2ceb4 100644 --- a/Logic/Logic/DFF_RN_4.csv +++ b/Logic/Logic/DFF_RN_4.csv @@ -1,26 +1,26 @@ SCALE,1.000 DEF,DFF_RN_4 -POLY,.254,F -POLYPT,-10.16,10.16,0 -POLYPT,10.16,10.16,0 -POLYPT,10.16,-10.16,0 -POLYPT,-10.16,-10.16,0 -POLYPT,-10.16,10.16,0 +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 POLYST -POLY,.158,N -POLYPT,-10.16,-6.35,0 -POLYPT,-7.62,-5.08,0 -POLYPT,-10.16,-3.81,0 +POLY,.0622,N +POLYPT,-4.00,-2.50,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-4.00,-1.50,0 POLYST -POLY,.158,N -POLYPT,-12.7,-15.24,0 -POLYPT,0,-15.24,0 -POLYPT,0,-12.7,0 +POLY,.0622,N +POLYPT,-5.00,-6.00,0 +POLYPT,0,-6.00,0 +POLYPT,0,-5.00,0 POLYST -CIRC,.254,0,-11.43,2.54 -PIN,D,R,-15.24,5.08,5.08 -PIN,CLK,R,-15.24,-5.08,5.08 -PIN,RST_N,R,-15.24,-15.24,5.08 -PIN,Q,L,15.24,5.08,5.08 -TEXT,-12.7,10.16,NAME -TEXT,-15.24,-15.24,VALUE \ No newline at end of file +CIRC,.100,0,-4.50,1.00 +PIN,D,R,-6.00,2.00,2.00 +PIN,CLK,R,-6.00,-2.00,2.00 +PIN,RST_N,R,-6.00,-6.00,2.00 +PIN,Q,L,6.00,2.00,2.00 +TEXT,-5.00,4.00,NAME +TEXT,-6.00,-6.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_R_4.csv b/Logic/Logic/DFF_R_4.csv index dcfa9c0e..b45cfd17 100644 --- a/Logic/Logic/DFF_R_4.csv +++ b/Logic/Logic/DFF_R_4.csv @@ -1,25 +1,25 @@ SCALE,1.000 DEF,DFF_R_4 -POLY,.254,F -POLYPT,-10.16,10.16,0 -POLYPT,10.16,10.16,0 -POLYPT,10.16,-10.16,0 -POLYPT,-10.16,-10.16,0 -POLYPT,-10.16,10.16,0 +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 POLYST -POLY,.158,N -POLYPT,-10.16,-6.35,0 -POLYPT,-7.62,-5.08,0 -POLYPT,-10.16,-3.81,0 +POLY,.0622,N +POLYPT,-4.00,-2.50,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-4.00,-1.50,0 POLYST -POLY,.158,N -POLYPT,-12.7,-15.24,0 -POLYPT,0,-15.24,0 -POLYPT,0,-10.16,0 +POLY,.0622,N +POLYPT,-5.00,-6.00,0 +POLYPT,0,-6.00,0 +POLYPT,0,-4.00,0 POLYST -PIN,D,R,-15.24,5.08,5.08 -PIN,CLK,R,-15.24,-5.08,5.08 -PIN,RST,R,-15.24,-15.24,5.08 -PIN,Q,L,15.24,5.08,5.08 -TEXT,-12.7,10.16,NAME -TEXT,-15.24,-15.24,VALUE \ No newline at end of file +PIN,D,R,-6.00,2.00,2.00 +PIN,CLK,R,-6.00,-2.00,2.00 +PIN,RST,R,-6.00,-6.00,2.00 +PIN,Q,L,6.00,2.00,2.00 +TEXT,-5.00,4.00,NAME +TEXT,-6.00,-6.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/INV_4.csv b/Logic/Logic/INV_4.csv index f3bf63df..a2eb9d9f 100644 --- a/Logic/Logic/INV_4.csv +++ b/Logic/Logic/INV_4.csv @@ -1,14 +1,14 @@ SCALE,1.000 DEF,INV_4 KEYWORDS,inverter -POLY,.254,F -POLYPT,-5.08,-7.62,0 -POLYPT,-5.08,7.62,0 -POLYPT,10.16,0,0 -POLYPT,-5.08,-7.62,0 +POLY,.100,F +POLYPT,-2.00,-3.00,0 +POLYPT,-2.00,3.00,0 +POLYPT,4.00,0,0 +POLYPT,-2.00,-3.00,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-15.24,0,10.16 -PIN,OUT,L,15.24,0,2.54 -TEXT,2.54,7.62,NAME -TEXT,2.54,-10.16,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-6.00,0,4.00 +PIN,OUT,L,6.00,0,1.00 +TEXT,1.00,3.00,NAME +TEXT,1.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/INV_8.csv b/Logic/Logic/INV_8.csv index 19cb407a..ad80f711 100644 --- a/Logic/Logic/INV_8.csv +++ b/Logic/Logic/INV_8.csv @@ -1,14 +1,14 @@ SCALE,2.000 DEF,INV_8 KEYWORDS,inverter -POLY,.254,F -POLYPT,-5.08,-7.62,0 -POLYPT,-5.08,7.62,0 -POLYPT,10.16,0,0 -POLYPT,-5.08,-7.62,0 +POLY,.100,F +POLYPT,-2.00,-3.00,0 +POLYPT,-2.00,3.00,0 +POLYPT,4.00,0,0 +POLYPT,-2.00,-3.00,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-7.62,0,5.08 -PIN,OUT,L,7.62,0,1.27 -TEXT,2.54,7.62,NAME -TEXT,2.54,-10.16,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-3.00,0,2.00 +PIN,OUT,L,3.00,0,1.27 +TEXT,1.00,3.00,NAME +TEXT,1.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/MUX2_4.csv b/Logic/Logic/MUX2_4.csv index 856e0d42..07f79916 100644 --- a/Logic/Logic/MUX2_4.csv +++ b/Logic/Logic/MUX2_4.csv @@ -1,21 +1,21 @@ SCALE,1.000 DEF,MUX2_4 KEYWORDS,Dual -POLY,.254,F -POLYPT,-10.16,-10.16,0 -POLYPT,-10.16,10.16,0 -POLYPT,10.16,5.08,0 -POLYPT,10.16,-5.08,0 -POLYPT,-10.16,-10.16,0 +POLY,.100,F +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYPT,4.00,2.00,0 +POLYPT,4.00,-2.00,0 +POLYPT,-4.00,-4.00,0 POLYST -POLY,.158,N -POLYPT,-12.7,-15.24,0 -POLYPT,0,-15.24,0 -POLYPT,0,-7.62,0 +POLY,.0622,N +POLYPT,-5.00,-6.00,0 +POLYPT,0,-6.00,0 +POLYPT,0,-3.00,0 POLYST -PIN,A,R,-15.24,5.08,5.08 -PIN,B,R,-15.24,-5.08,5.08 -PIN,SEL,R,-15.24,-15.24,2.54 -PIN,OUT,L,15.24,0,5.08 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-6.00,2.00,2.00 +PIN,B,R,-6.00,-2.00,2.00 +PIN,SEL,R,-6.00,-6.00,1.00 +PIN,OUT,L,6.00,0,2.00 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/MUX4_4.csv b/Logic/Logic/MUX4_4.csv index f7735228..eb7b0eda 100644 --- a/Logic/Logic/MUX4_4.csv +++ b/Logic/Logic/MUX4_4.csv @@ -1,27 +1,27 @@ SCALE,1.000 DEF,MUX4_4 KEYWORDS,quad -POLY,.254,F -POLYPT,-10.16,-10.16,0 -POLYPT,-10.16,10.16,0 -POLYPT,10.16,5.08,0 -POLYPT,10.16,-5.08,0 -POLYPT,-10.16,-10.16,0 +POLY,.100,F +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYPT,4.00,2.00,0 +POLYPT,4.00,-2.00,0 +POLYPT,-4.00,-4.00,0 POLYST -POLY,.158,N -POLYPT,-2.54,-15.24,0 -POLYPT,-2.54,-8.2,0 +POLY,.0622,N +POLYPT,-1.00,-6.00,0 +POLYPT,-1.00,-3.2283,0 POLYST -POLY,.158,N -POLYPT,2.54,-20.32,0 -POLYPT,2.54,-7.0,0 +POLY,.0622,N +POLYPT,1.00,-8.00,0 +POLYPT,1.00,-2.7559,0 POLYST -PIN,A,R,-15.24,7.62,5.08 -PIN,B,R,-15.24,2.54,5.08 -PIN,C,R,-15.24,-2.54,5.08 -PIN,D,R,-15.24,-7.62,5.08 -PIN,SEL0,R,-15.24,-15.24,12.7 -PIN,SEL1,R,-15.24,-20.32,17.78 -PIN,OUT,L,15.24,0,5.08 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-6.00,3.00,2.00 +PIN,B,R,-6.00,1.00,2.00 +PIN,C,R,-6.00,-1.00,2.00 +PIN,D,R,-6.00,-3.00,2.00 +PIN,SEL0,R,-6.00,-6.00,5.00 +PIN,SEL1,R,-6.00,-8.00,7.00 +PIN,OUT,L,6.00,0,2.00 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_4.csv b/Logic/Logic/NAND2_4.csv index 070cc97d..73c7f104 100644 --- a/Logic/Logic/NAND2_4.csv +++ b/Logic/Logic/NAND2_4.csv @@ -2,28 +2,28 @@ SCALE,1.000 DEF,NAND2_4 KEYWORDS,gates KEYWORDS,nand -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-10.16,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-10.16,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_8.csv b/Logic/Logic/NAND2_8.csv index faf444d0..cd4caad8 100644 --- a/Logic/Logic/NAND2_8.csv +++ b/Logic/Logic/NAND2_8.csv @@ -2,28 +2,28 @@ SCALE,2.000 DEF,NAND2_8 KEYWORDS,gates KEYWORDS,nand -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-10.16,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-10.16,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_dm_4.csv b/Logic/Logic/NAND2_dm_4.csv index 93df082d..91f77b28 100644 --- a/Logic/Logic/NAND2_dm_4.csv +++ b/Logic/Logic/NAND2_dm_4.csv @@ -3,30 +3,30 @@ DEF,NAND2_dm_4 KEYWORDS,gates KEYWORDS,nand KEYWORDS,demorgan -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-11.24,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-11.24,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -CIRC,.254,-9.97,5.08,2.54 -CIRC,.254,-9.97,-5.08,2.54 -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,-3.9252,2.00,1.00 +CIRC,.100,-3.9252,-2.00,1.00 +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_dm_8.csv b/Logic/Logic/NAND2_dm_8.csv index 943659ea..7910299c 100644 --- a/Logic/Logic/NAND2_dm_8.csv +++ b/Logic/Logic/NAND2_dm_8.csv @@ -3,30 +3,30 @@ DEF,NAND2_dm_8 KEYWORDS,gates KEYWORDS,nand KEYWORDS,demorgan -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-11.24,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-11.24,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -CIRC,.254,-9.97,5.08,2.54 -CIRC,.254,-9.97,-5.08,2.54 -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,-3.9252,2.00,1.00 +CIRC,.100,-3.9252,-2.00,1.00 +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND3_4.csv b/Logic/Logic/NAND3_4.csv index ee2a2d26..9613cac4 100644 --- a/Logic/Logic/NAND3_4.csv +++ b/Logic/Logic/NAND3_4.csv @@ -2,33 +2,33 @@ SCALE,1.000 DEF,NAND3_4 KEYWORDS,gates KEYWORDS,nand -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-10.16,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,0,0 -POLYPT,-10.16,0,0 +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-4.00,0,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-10.16,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,0,0 -PIN,C,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,0,0 +PIN,C,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND3_8.csv b/Logic/Logic/NAND3_8.csv index 5c90c376..fee71aab 100644 --- a/Logic/Logic/NAND3_8.csv +++ b/Logic/Logic/NAND3_8.csv @@ -2,33 +2,33 @@ SCALE,2.000 DEF,NAND3_8 KEYWORDS,gates KEYWORDS,nand -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-10.16,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,0,0 -POLYPT,-10.16,0,0 +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-4.00,0,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-10.16,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,0,0 -PIN,C,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,0,0 +PIN,C,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_4.csv b/Logic/Logic/NOR2_4.csv index 8c8ecc4c..798ed222 100644 --- a/Logic/Logic/NOR2_4.csv +++ b/Logic/Logic/NOR2_4.csv @@ -2,29 +2,29 @@ SCALE,1.000 DEF,NOR2_4 KEYWORDS,gates KEYWORDS,nor -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_8.csv b/Logic/Logic/NOR2_8.csv index 71295ea7..dc0cf1b2 100644 --- a/Logic/Logic/NOR2_8.csv +++ b/Logic/Logic/NOR2_8.csv @@ -2,29 +2,29 @@ SCALE,2.000 DEF,NOR2_8 KEYWORDS,gates KEYWORDS,nor -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_dm_4.csv b/Logic/Logic/NOR2_dm_4.csv index 5fa4f4c3..f2aaa618 100644 --- a/Logic/Logic/NOR2_dm_4.csv +++ b/Logic/Logic/NOR2_dm_4.csv @@ -3,29 +3,29 @@ DEF,NOR2_dm_4 KEYWORDS,gates KEYWORDS,nor KEYWORDS,demorgan -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-12.70,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-5.000,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-12.70,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-5.000,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -CIRC,.254,-11.43,5.08,2.54 -CIRC,.254,-11.43,-5.08,2.54 -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,-4.50,2.00,1.00 +CIRC,.100,-4.50,-2.00,1.00 +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_dm_8.csv b/Logic/Logic/NOR2_dm_8.csv index f41f8b52..6d7819fd 100644 --- a/Logic/Logic/NOR2_dm_8.csv +++ b/Logic/Logic/NOR2_dm_8.csv @@ -3,29 +3,29 @@ DEF,NOR2_dm_8 KEYWORDS,gates KEYWORDS,nor KEYWORDS,demorgan -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-12.70,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-5.000,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-12.70,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-5.000,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -CIRC,.254,-11.43,5.08,2.54 -CIRC,.254,-11.43,-5.08,2.54 -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,-4.50,2.00,1.00 +CIRC,.100,-4.50,-2.00,1.00 +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR3_4.csv b/Logic/Logic/NOR3_4.csv index 7a8ac00f..b71a8e61 100644 --- a/Logic/Logic/NOR3_4.csv +++ b/Logic/Logic/NOR3_4.csv @@ -2,34 +2,34 @@ SCALE,1.000 DEF,NOR3_4 KEYWORDS,gates KEYWORDS,nor -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,0,0 -POLYPT,-7.8,0,0 +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-3.0709,0,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,0,0 -PIN,C,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,0,0 +PIN,C,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR3_8.csv b/Logic/Logic/NOR3_8.csv index 26e2133a..a2aaa00f 100644 --- a/Logic/Logic/NOR3_8.csv +++ b/Logic/Logic/NOR3_8.csv @@ -2,34 +2,34 @@ SCALE,2.000 DEF,NOR3_8 KEYWORDS,gates KEYWORDS,nor -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,0,0 -POLYPT,-7.8,0,0 +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-3.0709,0,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,0,0 -PIN,C,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,0,0 +PIN,C,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_4.csv b/Logic/Logic/OR2_4.csv index fa08a0d1..d90a64f8 100644 --- a/Logic/Logic/OR2_4.csv +++ b/Logic/Logic/OR2_4.csv @@ -2,28 +2,28 @@ SCALE,1.000 DEF,OR2_4 KEYWORDS,gates KEYWORDS,or -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_8.csv b/Logic/Logic/OR2_8.csv index 6fb0670e..52c5a28d 100644 --- a/Logic/Logic/OR2_8.csv +++ b/Logic/Logic/OR2_8.csv @@ -2,28 +2,28 @@ SCALE,2.000 DEF,OR2_8 KEYWORDS,gates KEYWORDS,or -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_dm_4.csv b/Logic/Logic/OR2_dm_4.csv index ac937cfe..345b325d 100644 --- a/Logic/Logic/OR2_dm_4.csv +++ b/Logic/Logic/OR2_dm_4.csv @@ -3,30 +3,30 @@ DEF,OR2_dm_4 KEYWORDS,gates KEYWORDS,or KEYWORDS,demorgan -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-12.70,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-5.000,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-12.70,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-5.000,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -CIRC,.254,-11.43,5.08,2.54 -CIRC,.254,-11.43,-5.08,2.54 -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +CIRC,.100,-4.50,2.00,1.00 +CIRC,.100,-4.50,-2.00,1.00 +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_dm_8.csv b/Logic/Logic/OR2_dm_8.csv index 6f5a36cb..b39e2ed1 100644 --- a/Logic/Logic/OR2_dm_8.csv +++ b/Logic/Logic/OR2_dm_8.csv @@ -3,30 +3,30 @@ DEF,OR2_dm_8 KEYWORDS,gates KEYWORDS,or KEYWORDS,demorgan -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,1.905,8.255,-180 -POLYPT,1.905,-8.255,0 -POLYPT,-10.16,-8.255,0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-12.70,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-5.000,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-12.70,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-5.000,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -CIRC,.254,-11.43,5.08,2.54 -CIRC,.254,-11.43,-5.08,2.54 -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +CIRC,.100,-4.50,2.00,1.00 +CIRC,.100,-4.50,-2.00,1.00 +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR3_4.csv b/Logic/Logic/OR3_4.csv index 658e3de5..c1ba2cf5 100644 --- a/Logic/Logic/OR3_4.csv +++ b/Logic/Logic/OR3_4.csv @@ -2,33 +2,33 @@ SCALE,1.000 DEF,OR3_4 KEYWORDS,gates KEYWORDS,or -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,0,0 -POLYPT,-7.8,0,0 +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-3.0709,0,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,0,0 -PIN,C,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,0,0 +PIN,C,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR3_8.csv b/Logic/Logic/OR3_8.csv index 2ff6db48..aad19194 100644 --- a/Logic/Logic/OR3_8.csv +++ b/Logic/Logic/OR3_8.csv @@ -2,33 +2,33 @@ SCALE,2.000 DEF,OR3_8 KEYWORDS,gates KEYWORDS,or -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,0,0 -POLYPT,-7.8,0,0 +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-3.0709,0,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,0,0 -PIN,C,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,0,0 +PIN,C,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/QQN_RNPN_4.csv b/Logic/Logic/QQN_RNPN_4.csv index d4b06b09..608b7274 100644 --- a/Logic/Logic/QQN_RNPN_4.csv +++ b/Logic/Logic/QQN_RNPN_4.csv @@ -1,34 +1,34 @@ SCALE,1.000 DEF,QQN_RNPN_4 -POLY,.254,F -POLYPT,-10.16,10.16,0 -POLYPT,10.16,10.16,0 -POLYPT,10.16,-10.16,0 -POLYPT,-10.16,-10.16,0 -POLYPT,-10.16,10.16,0 +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 POLYST -POLY,.158,N -POLYPT,-10.16,-6.35,0 -POLYPT,-7.62,-5.08,0 -POLYPT,-10.16,-3.81,0 +POLY,.0622,N +POLYPT,-4.00,-2.50,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-4.00,-1.50,0 POLYST -POLY,.158,N -POLYPT,-12.7,-15.24,0 -POLYPT,0,-15.24,0 -POLYPT,0,-12.7,0 +POLY,.0622,N +POLYPT,-5.00,-6.00,0 +POLYPT,0,-6.00,0 +POLYPT,0,-5.00,0 POLYST -POLY,.158,N -POLYPT,-12.7,15.24,0 -POLYPT,0,15.24,0 -POLYPT,0,12.7,0 +POLY,.0622,N +POLYPT,-5.00,6.00,0 +POLYPT,0,6.00,0 +POLYPT,0,5.00,0 POLYST -CIRC,.254,0,11.43,2.54 -CIRC,.254,0,-11.43,2.54 -PIN,D,R,-15.24,5.08,5.08 -PIN,CLK,R,-15.24,-5.08,5.08 -PIN,RST_N,R,-15.24,-15.24,5.08 -PIN,PRE_N,R,-15.24,15.24,5.08 -PIN,Q,L,15.24,5.08,5.08 -PIN,Q_N,L,15.24,-5.08,5.08 -TEXT,-12.7,10.16,NAME -TEXT,-15.24,-15.24,VALUE \ No newline at end of file +CIRC,.100,0,4.50,1.00 +CIRC,.100,0,-4.50,1.00 +PIN,D,R,-6.00,2.00,2.00 +PIN,CLK,R,-6.00,-2.00,2.00 +PIN,RST_N,R,-6.00,-6.00,2.00 +PIN,PRE_N,R,-6.00,6.00,2.00 +PIN,Q,L,6.00,2.00,2.00 +PIN,Q_N,L,6.00,-2.00,2.00 +TEXT,-5.00,4.00,NAME +TEXT,-6.00,-6.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/XNOR_4.csv b/Logic/Logic/XNOR_4.csv index 8e7c8986..301c9e8a 100644 --- a/Logic/Logic/XNOR_4.csv +++ b/Logic/Logic/XNOR_4.csv @@ -2,33 +2,33 @@ SCALE,1.000 DEF,XNOR_4 KEYWORDS,gates KEYWORDS,xnor -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.254,N -POLYPT,-11.43,-8.255,65.0 -POLYPT,-11.43,8.255,0 +POLY,.100,N +POLYPT,-4.50,-3.25,65.0 +POLYPT,-4.50,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/XNOR_8.csv b/Logic/Logic/XNOR_8.csv index 99f58c83..7e268078 100644 --- a/Logic/Logic/XNOR_8.csv +++ b/Logic/Logic/XNOR_8.csv @@ -2,33 +2,33 @@ SCALE,2.000 DEF,XNOR_8 KEYWORDS,gates KEYWORDS,xnor -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.254,N -POLYPT,-11.43,-8.255,65.0 -POLYPT,-11.43,8.255,0 +POLY,.100,N +POLYPT,-4.50,-3.25,65.0 +POLYPT,-4.50,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,12.7,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 POLYST -CIRC,.254,11.43,0,2.54 -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +CIRC,.100,4.50,0,1.00 +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/XOR_4.csv b/Logic/Logic/XOR_4.csv index 3dbafe3e..d30766e0 100644 --- a/Logic/Logic/XOR_4.csv +++ b/Logic/Logic/XOR_4.csv @@ -2,32 +2,32 @@ SCALE,1.000 DEF,XOR_4 KEYWORDS,gates KEYWORDS,xor -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.254,N -POLYPT,-11.43,-8.255,65.0 -POLYPT,-11.43,8.255,0 +POLY,.100,N +POLYPT,-4.50,-3.25,65.0 +POLYPT,-4.50,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-15.24,5.08,0 -PIN,B,R,-15.24,-5.08,0 -PIN,OUT,L,15.24,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-6.00,2.00,0 +PIN,B,R,-6.00,-2.00,0 +PIN,OUT,L,6.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/Logic/Logic/XOR_8.csv b/Logic/Logic/XOR_8.csv index 12f6e556..c90d3ddb 100644 --- a/Logic/Logic/XOR_8.csv +++ b/Logic/Logic/XOR_8.csv @@ -2,32 +2,32 @@ SCALE,2.000 DEF,XOR_8 KEYWORDS,gates KEYWORDS,xor -POLY,.254,F -POLYPT,-10.16,8.255,0 -POLYPT,-3.81,8.255,-65.0 -POLYPT,10.16,0,-65.0 -POLYPT,-3.81,-8.255,0 -POLYPT,-10.16,-8.255,65.0 -POLYPT,-10.16,8.255,0 +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 POLYST -POLY,.254,N -POLYPT,-11.43,-8.255,65.0 -POLYPT,-11.43,8.255,0 +POLY,.100,N +POLYPT,-4.50,-3.25,65.0 +POLYPT,-4.50,3.25,0 POLYST -POLY,.158,N -POLYPT,-15.24,5.08,0 -POLYPT,-8.7,5.08,0 +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-3.4252,2.00,0 POLYST -POLY,.158,N -POLYPT,-15.24,-5.08,0 -POLYPT,-8.7,-5.08,0 +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.4252,-2.00,0 POLYST -POLY,.158,N -POLYPT,15.24,0,0 -POLYPT,10.16,0,0 +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 POLYST -PIN,A,R,-7.62,2.54,0 -PIN,B,R,-7.62,-2.54,0 -PIN,OUT,L,7.62,0,0 -TEXT,-2.54,7.62,NAME -TEXT,-2.54,-13.97,VALUE \ No newline at end of file +PIN,A,R,-3.00,1.00,0 +PIN,B,R,-3.00,-1.00,0 +PIN,OUT,L,3.00,0,0 +TEXT,-1.00,3.00,NAME +TEXT,-1.00,-5.5,VALUE \ No newline at end of file diff --git a/generate_logic_sym.py b/generate_logic_sym.py index d3b3e721..c1dbdacf 100644 --- a/generate_logic_sym.py +++ b/generate_logic_sym.py @@ -53,7 +53,7 @@ def uuid(category: str, kind: str, identifier: str) -> str: uuid_cache[key] = str(uuid4()) return uuid_cache[key] - +unit = 2.54 width = 2.54 line_width = 0.25 pkg_text_height = 1.0 @@ -170,9 +170,9 @@ def generate_sym( pad_name.append(row[1]) pad_type.append(row[2]) - pad_posx.append(float(row[3])) - pad_posy.append(float(row[4])) - pad_length.append(float(row[5])) + pad_posx.append(float(row[3]) * unit ) + pad_posy.append(float(row[4]) * unit ) + pad_length.append(float(row[5]) * unit ) uuid_pins.append(uuid('sym', def_name, 'pin-{}'.format(row[1]))) num_of_pins = num_of_pins + 1 @@ -222,7 +222,7 @@ def _uuid(identifier: str) -> str: # parsing each column of a row row_type = row[0] if row_type == "POLY": - line_width = float(row[1]) + line_width = float(row[1]) * unit fill = row[2] fill_str = "False" if fill == "F": @@ -238,8 +238,8 @@ def _uuid(identifier: str) -> str: if row_type == "POLYPT": print('POLYPT {} {} {}'.format( row[1], row[2], row[3])) - poly_x = float(row[1]) / scale - poly_y = float(row[2]) / scale + poly_x = float(row[1]) * unit / scale + poly_y = float(row[2]) * unit / scale poly_angle = float(row[3]) polygon.add_vertex(Vertex(Position(poly_x, poly_y), Angle(poly_angle))) @@ -248,10 +248,10 @@ def _uuid(identifier: str) -> str: symbol.add_polygon(polygon) if row_type == "RECT": - low_x = float(row[1]) / scale - low_y = float(row[2]) / scale - high_x = float(row[3]) / scale - high_y = float(row[4]) / scale + low_x = float(row[1]) * unit / scale + low_y = float(row[2]) * unit / scale + high_x = float(row[3]) * unit / scale + high_y = float(row[4]) * unit / scale print('Rectangle ') polygon = Polygon( uuid_polygon, @@ -268,10 +268,10 @@ def _uuid(identifier: str) -> str: symbol.add_polygon(polygon) if row_type == "CIRC": - line_width = float(row[1]) / scale - pos_x = float(row[2]) / scale - pos_y = float(row[3]) / scale - dia = float(row[4]) / scale + line_width = float(row[1]) * unit / scale + pos_x = float(row[2]) * unit / scale + pos_y = float(row[3]) * unit / scale + dia = float(row[4]) * unit / scale print('Circle ') circle = Circle( @@ -286,8 +286,8 @@ def _uuid(identifier: str) -> str: symbol.add_circle(circle) if row_type == "TEXT": - pos_x = float(row[1]) / scale - pos_y = float(row[2]) / scale + pos_x = float(row[1]) * unit / scale + pos_y = float(row[2]) * unit / scale textfield = row[3] if textfield == "NAME": text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('center bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) From fa82731f88c6d804f3487ea15f12a5b55951c820 Mon Sep 17 00:00:00 2001 From: ouabache Date: Sun, 22 Mar 2020 14:48:43 -0700 Subject: [PATCH 09/23] adjusted text positions adjusted gate pin names fixed XOR symbols changed create date --- Logic/Boilerplate_buffer.csv | 2 +- Logic/Boilerplate_flipflop.csv | 2 +- Logic/Boilerplate_gates.csv | 2 +- Logic/Boilerplate_multiplexor.csv | 2 +- Logic/Logic/AND2_4.csv | 10 +++++----- Logic/Logic/AND2_6.csv | 10 +++++----- Logic/Logic/AND2_8.csv | 10 +++++----- Logic/Logic/AND2_dm_4.csv | 10 +++++----- Logic/Logic/AND2_dm_8.csv | 10 +++++----- Logic/Logic/AND3_4.csv | 12 ++++++------ Logic/Logic/AND3_8.csv | 12 ++++++------ Logic/Logic/BUFFER_4.csv | 4 ++-- Logic/Logic/BUFFER_8.csv | 4 ++-- Logic/Logic/DFF_4.csv | 2 +- Logic/Logic/DFF_PN_4.csv | 2 +- Logic/Logic/DFF_P_4.csv | 2 +- Logic/Logic/DFF_RNPN_4.csv | 2 +- Logic/Logic/DFF_RN_4.csv | 2 +- Logic/Logic/DFF_R_4.csv | 2 +- Logic/Logic/INV_4.csv | 4 ++-- Logic/Logic/INV_8.csv | 6 +++--- Logic/Logic/MUX2_4.csv | 4 ++-- Logic/Logic/MUX4_4.csv | 4 ++-- Logic/Logic/NAND2_4.csv | 10 +++++----- Logic/Logic/NAND2_8.csv | 10 +++++----- Logic/Logic/NAND2_dm_4.csv | 10 +++++----- Logic/Logic/NAND2_dm_8.csv | 10 +++++----- Logic/Logic/NAND3_4.csv | 12 ++++++------ Logic/Logic/NAND3_8.csv | 12 ++++++------ Logic/Logic/NOR2_4.csv | 10 +++++----- Logic/Logic/NOR2_8.csv | 10 +++++----- Logic/Logic/NOR2_dm_4.csv | 10 +++++----- Logic/Logic/NOR2_dm_8.csv | 10 +++++----- Logic/Logic/NOR3_4.csv | 12 ++++++------ Logic/Logic/NOR3_8.csv | 12 ++++++------ Logic/Logic/OR2_4.csv | 10 +++++----- Logic/Logic/OR2_8.csv | 10 +++++----- Logic/Logic/OR2_dm_4.csv | 10 +++++----- Logic/Logic/OR2_dm_8.csv | 10 +++++----- Logic/Logic/OR3_4.csv | 12 ++++++------ Logic/Logic/OR3_8.csv | 12 ++++++------ Logic/Logic/QQN_RNPN_4.csv | 2 +- Logic/Logic/XNOR_4.csv | 14 +++++++------- Logic/Logic/XNOR_8.csv | 14 +++++++------- Logic/Logic/XOR_4.csv | 14 +++++++------- Logic/Logic/XOR_8.csv | 14 +++++++------- generate_logic_sym.py | 4 ++-- 47 files changed, 187 insertions(+), 187 deletions(-) diff --git a/Logic/Boilerplate_buffer.csv b/Logic/Boilerplate_buffer.csv index 4180f5dc..0db6e716 100644 --- a/Logic/Boilerplate_buffer.csv +++ b/Logic/Boilerplate_buffer.csv @@ -1,4 +1,4 @@ KEYWORDS,digital,logic,buffer -CREATE,2019-12-17T00:00:00Z +CREATE,2020-03-22T00:00:00Z VERSION,0.1 AUTHOR,John E. diff --git a/Logic/Boilerplate_flipflop.csv b/Logic/Boilerplate_flipflop.csv index 76c8bfb4..de16cbfe 100644 --- a/Logic/Boilerplate_flipflop.csv +++ b/Logic/Boilerplate_flipflop.csv @@ -1,4 +1,4 @@ KEYWORDS,digital,logic,flipflop -CREATE,2019-12-17T00:00:00Z +CREATE,2020-03-22T00:00:00Z VERSION,0.1 AUTHOR,John E. diff --git a/Logic/Boilerplate_gates.csv b/Logic/Boilerplate_gates.csv index 8503daf8..eb374f9d 100644 --- a/Logic/Boilerplate_gates.csv +++ b/Logic/Boilerplate_gates.csv @@ -1,4 +1,4 @@ KEYWORDS,digital,logic -CREATE,2019-12-17T00:00:00Z +CREATE,2020-03-22T00:00:00Z VERSION,0.1 AUTHOR,John E. diff --git a/Logic/Boilerplate_multiplexor.csv b/Logic/Boilerplate_multiplexor.csv index b17ba3d5..8e186043 100644 --- a/Logic/Boilerplate_multiplexor.csv +++ b/Logic/Boilerplate_multiplexor.csv @@ -1,4 +1,4 @@ KEYWORDS,digital,logic,multiplexor -CREATE,2019-12-17T00:00:00Z +CREATE,2020-03-22T00:00:00Z VERSION,0.1 AUTHOR,John E. diff --git a/Logic/Logic/AND2_4.csv b/Logic/Logic/AND2_4.csv index 83aacf1b..7fef86bc 100644 --- a/Logic/Logic/AND2_4.csv +++ b/Logic/Logic/AND2_4.csv @@ -21,8 +21,8 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_6.csv b/Logic/Logic/AND2_6.csv index bd2eaa91..c428b164 100644 --- a/Logic/Logic/AND2_6.csv +++ b/Logic/Logic/AND2_6.csv @@ -21,8 +21,8 @@ POLY,.0622,N POLYPT,6.6654,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-5.000,1.00,0 -PIN,B,R,-5.000,-1.00,0 -PIN,OUT,L,5.000,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-5.000,1.00,0 +PIN,B,L,-5.000,-1.00,0 +PIN,OUT,R,5.000,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_8.csv b/Logic/Logic/AND2_8.csv index a9db0b85..b5571c1b 100644 --- a/Logic/Logic/AND2_8.csv +++ b/Logic/Logic/AND2_8.csv @@ -21,8 +21,8 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_dm_4.csv b/Logic/Logic/AND2_dm_4.csv index e030a72a..682ae189 100644 --- a/Logic/Logic/AND2_dm_4.csv +++ b/Logic/Logic/AND2_dm_4.csv @@ -26,8 +26,8 @@ POLYST CIRC,.100,4.50,0,1.00 CIRC,.100,-3.9252,2.00,1.00 CIRC,.100,-3.9252,-2.00,1.00 -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND2_dm_8.csv b/Logic/Logic/AND2_dm_8.csv index 10eb89f9..4d6cb410 100644 --- a/Logic/Logic/AND2_dm_8.csv +++ b/Logic/Logic/AND2_dm_8.csv @@ -26,8 +26,8 @@ POLYST CIRC,.100,4.50,0,1.00 CIRC,.100,-3.9252,2.00,1.00 CIRC,.100,-3.9252,-2.00,1.00 -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND3_4.csv b/Logic/Logic/AND3_4.csv index 47555c6d..89bfd560 100644 --- a/Logic/Logic/AND3_4.csv +++ b/Logic/Logic/AND3_4.csv @@ -25,9 +25,9 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,0,0 -PIN,C,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,0,0 +PIN,C,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND3_8.csv b/Logic/Logic/AND3_8.csv index 3d35f85b..74c6832d 100644 --- a/Logic/Logic/AND3_8.csv +++ b/Logic/Logic/AND3_8.csv @@ -26,9 +26,9 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,0,0 -PIN,C,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,0,0 +PIN,C,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/BUFFER_4.csv b/Logic/Logic/BUFFER_4.csv index dcd3d107..83570908 100644 --- a/Logic/Logic/BUFFER_4.csv +++ b/Logic/Logic/BUFFER_4.csv @@ -9,5 +9,5 @@ POLYPT,-2.00,-3.00,0 POLYST PIN,A,R,-6.00,0,4.00 PIN,OUT,L,6.00,0,2.00 -TEXT,1.00,3.00,NAME -TEXT,1.00,-4.00,VALUE \ No newline at end of file +TEXT,-2.00,3.00,NAME +TEXT,-2.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/BUFFER_8.csv b/Logic/Logic/BUFFER_8.csv index e26e6797..7a72620c 100644 --- a/Logic/Logic/BUFFER_8.csv +++ b/Logic/Logic/BUFFER_8.csv @@ -9,5 +9,5 @@ POLYPT,-2.00,-3.00,0 POLYST PIN,A,R,-3.00,0,2.00 PIN,OUT,L,3.00,0,1.00 -TEXT,1.00,3.00,NAME -TEXT,1.00,-4.00,VALUE \ No newline at end of file +TEXT,-2.00,3.00,NAME +TEXT,-2.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_4.csv b/Logic/Logic/DFF_4.csv index 3c501261..8a2af61e 100644 --- a/Logic/Logic/DFF_4.csv +++ b/Logic/Logic/DFF_4.csv @@ -16,4 +16,4 @@ PIN,D,R,-6.00,2.00,2.00 PIN,CLK,R,-6.00,-2.00,2.00 PIN,Q,L,6.00,2.00,2.00 TEXT,-5.00,4.00,NAME -TEXT,-6.00,-6.00,VALUE \ No newline at end of file +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_PN_4.csv b/Logic/Logic/DFF_PN_4.csv index 89083c5d..866250a4 100644 --- a/Logic/Logic/DFF_PN_4.csv +++ b/Logic/Logic/DFF_PN_4.csv @@ -23,4 +23,4 @@ PIN,CLK,R,-6.00,-2.00,2.00 PIN,PRE_N,R,-6.00,6.00,2.00 PIN,Q,L,6.00,2.00,2.00 TEXT,-5.00,4.00,NAME -TEXT,-6.00,-6.00,VALUE \ No newline at end of file +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_P_4.csv b/Logic/Logic/DFF_P_4.csv index e5a636f7..fcf0858f 100644 --- a/Logic/Logic/DFF_P_4.csv +++ b/Logic/Logic/DFF_P_4.csv @@ -22,4 +22,4 @@ PIN,CLK,R,-6.00,-2.00,2.00 PIN,PRE,R,-6.00,6.00,2.00 PIN,Q,L,6.00,2.00,2.00 TEXT,-5.00,4.00,NAME -TEXT,-6.00,-6.00,VALUE \ No newline at end of file +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_RNPN_4.csv b/Logic/Logic/DFF_RNPN_4.csv index eaa64094..e9d260a7 100644 --- a/Logic/Logic/DFF_RNPN_4.csv +++ b/Logic/Logic/DFF_RNPN_4.csv @@ -30,4 +30,4 @@ PIN,RST_N,R,-6.00,-6.00,2.00 PIN,PRE_N,R,-6.00,6.00,2.00 PIN,Q,L,6.00,2.00,2.00 TEXT,-5.00,4.00,NAME -TEXT,-6.00,-6.00,VALUE \ No newline at end of file +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_RN_4.csv b/Logic/Logic/DFF_RN_4.csv index d3d2ceb4..d96eb9a6 100644 --- a/Logic/Logic/DFF_RN_4.csv +++ b/Logic/Logic/DFF_RN_4.csv @@ -23,4 +23,4 @@ PIN,CLK,R,-6.00,-2.00,2.00 PIN,RST_N,R,-6.00,-6.00,2.00 PIN,Q,L,6.00,2.00,2.00 TEXT,-5.00,4.00,NAME -TEXT,-6.00,-6.00,VALUE \ No newline at end of file +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/DFF_R_4.csv b/Logic/Logic/DFF_R_4.csv index b45cfd17..094b7bc2 100644 --- a/Logic/Logic/DFF_R_4.csv +++ b/Logic/Logic/DFF_R_4.csv @@ -22,4 +22,4 @@ PIN,CLK,R,-6.00,-2.00,2.00 PIN,RST,R,-6.00,-6.00,2.00 PIN,Q,L,6.00,2.00,2.00 TEXT,-5.00,4.00,NAME -TEXT,-6.00,-6.00,VALUE \ No newline at end of file +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/INV_4.csv b/Logic/Logic/INV_4.csv index a2eb9d9f..9c780afb 100644 --- a/Logic/Logic/INV_4.csv +++ b/Logic/Logic/INV_4.csv @@ -10,5 +10,5 @@ POLYST CIRC,.100,4.50,0,1.00 PIN,A,R,-6.00,0,4.00 PIN,OUT,L,6.00,0,1.00 -TEXT,1.00,3.00,NAME -TEXT,1.00,-4.00,VALUE \ No newline at end of file +TEXT,-2.00,3.00,NAME +TEXT,-2.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/INV_8.csv b/Logic/Logic/INV_8.csv index ad80f711..65fe7ca0 100644 --- a/Logic/Logic/INV_8.csv +++ b/Logic/Logic/INV_8.csv @@ -9,6 +9,6 @@ POLYPT,-2.00,-3.00,0 POLYST CIRC,.100,4.50,0,1.00 PIN,A,R,-3.00,0,2.00 -PIN,OUT,L,3.00,0,1.27 -TEXT,1.00,3.00,NAME -TEXT,1.00,-4.00,VALUE \ No newline at end of file +PIN,OUT,L,3.00,0,0.50 +TEXT,-2.00,3.00,NAME +TEXT,-2.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/MUX2_4.csv b/Logic/Logic/MUX2_4.csv index 07f79916..aa7de375 100644 --- a/Logic/Logic/MUX2_4.csv +++ b/Logic/Logic/MUX2_4.csv @@ -17,5 +17,5 @@ PIN,A,R,-6.00,2.00,2.00 PIN,B,R,-6.00,-2.00,2.00 PIN,SEL,R,-6.00,-6.00,1.00 PIN,OUT,L,6.00,0,2.00 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +TEXT,-5.00,4.00,NAME +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/MUX4_4.csv b/Logic/Logic/MUX4_4.csv index eb7b0eda..13b0e0bd 100644 --- a/Logic/Logic/MUX4_4.csv +++ b/Logic/Logic/MUX4_4.csv @@ -23,5 +23,5 @@ PIN,D,R,-6.00,-3.00,2.00 PIN,SEL0,R,-6.00,-6.00,5.00 PIN,SEL1,R,-6.00,-8.00,7.00 PIN,OUT,L,6.00,0,2.00 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +TEXT,-5.00,4.00,NAME +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_4.csv b/Logic/Logic/NAND2_4.csv index 73c7f104..d824bb12 100644 --- a/Logic/Logic/NAND2_4.csv +++ b/Logic/Logic/NAND2_4.csv @@ -22,8 +22,8 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_8.csv b/Logic/Logic/NAND2_8.csv index cd4caad8..812a7618 100644 --- a/Logic/Logic/NAND2_8.csv +++ b/Logic/Logic/NAND2_8.csv @@ -22,8 +22,8 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_dm_4.csv b/Logic/Logic/NAND2_dm_4.csv index 91f77b28..3b58a5be 100644 --- a/Logic/Logic/NAND2_dm_4.csv +++ b/Logic/Logic/NAND2_dm_4.csv @@ -25,8 +25,8 @@ POLYPT,4.00,0,0 POLYST CIRC,.100,-3.9252,2.00,1.00 CIRC,.100,-3.9252,-2.00,1.00 -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_dm_8.csv b/Logic/Logic/NAND2_dm_8.csv index 7910299c..847df911 100644 --- a/Logic/Logic/NAND2_dm_8.csv +++ b/Logic/Logic/NAND2_dm_8.csv @@ -25,8 +25,8 @@ POLYPT,4.00,0,0 POLYST CIRC,.100,-3.9252,2.00,1.00 CIRC,.100,-3.9252,-2.00,1.00 -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND3_4.csv b/Logic/Logic/NAND3_4.csv index 9613cac4..64966d26 100644 --- a/Logic/Logic/NAND3_4.csv +++ b/Logic/Logic/NAND3_4.csv @@ -26,9 +26,9 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,0,0 -PIN,C,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,0,0 +PIN,C,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND3_8.csv b/Logic/Logic/NAND3_8.csv index fee71aab..1295b66a 100644 --- a/Logic/Logic/NAND3_8.csv +++ b/Logic/Logic/NAND3_8.csv @@ -26,9 +26,9 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,0,0 -PIN,C,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,0,0 +PIN,C,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_4.csv b/Logic/Logic/NOR2_4.csv index 798ed222..08dfa08a 100644 --- a/Logic/Logic/NOR2_4.csv +++ b/Logic/Logic/NOR2_4.csv @@ -23,8 +23,8 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_8.csv b/Logic/Logic/NOR2_8.csv index dc0cf1b2..6c9e56f7 100644 --- a/Logic/Logic/NOR2_8.csv +++ b/Logic/Logic/NOR2_8.csv @@ -23,8 +23,8 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_dm_4.csv b/Logic/Logic/NOR2_dm_4.csv index f2aaa618..ca237294 100644 --- a/Logic/Logic/NOR2_dm_4.csv +++ b/Logic/Logic/NOR2_dm_4.csv @@ -24,8 +24,8 @@ POLYPT,4.00,0,0 POLYST CIRC,.100,-4.50,2.00,1.00 CIRC,.100,-4.50,-2.00,1.00 -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_dm_8.csv b/Logic/Logic/NOR2_dm_8.csv index 6d7819fd..5411f6ef 100644 --- a/Logic/Logic/NOR2_dm_8.csv +++ b/Logic/Logic/NOR2_dm_8.csv @@ -24,8 +24,8 @@ POLYPT,4.00,0,0 POLYST CIRC,.100,-4.50,2.00,1.00 CIRC,.100,-4.50,-2.00,1.00 -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR3_4.csv b/Logic/Logic/NOR3_4.csv index b71a8e61..e50b700e 100644 --- a/Logic/Logic/NOR3_4.csv +++ b/Logic/Logic/NOR3_4.csv @@ -27,9 +27,9 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,0,0 -PIN,C,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,0,0 +PIN,C,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR3_8.csv b/Logic/Logic/NOR3_8.csv index a2aaa00f..5b864c3b 100644 --- a/Logic/Logic/NOR3_8.csv +++ b/Logic/Logic/NOR3_8.csv @@ -27,9 +27,9 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,0,0 -PIN,C,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,0,0 +PIN,C,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_4.csv b/Logic/Logic/OR2_4.csv index d90a64f8..1fa89675 100644 --- a/Logic/Logic/OR2_4.csv +++ b/Logic/Logic/OR2_4.csv @@ -22,8 +22,8 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_8.csv b/Logic/Logic/OR2_8.csv index 52c5a28d..b7168d8d 100644 --- a/Logic/Logic/OR2_8.csv +++ b/Logic/Logic/OR2_8.csv @@ -22,8 +22,8 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_dm_4.csv b/Logic/Logic/OR2_dm_4.csv index 345b325d..bed83560 100644 --- a/Logic/Logic/OR2_dm_4.csv +++ b/Logic/Logic/OR2_dm_4.csv @@ -25,8 +25,8 @@ POLYST CIRC,.100,4.50,0,1.00 CIRC,.100,-4.50,2.00,1.00 CIRC,.100,-4.50,-2.00,1.00 -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_dm_8.csv b/Logic/Logic/OR2_dm_8.csv index b39e2ed1..abb1d29b 100644 --- a/Logic/Logic/OR2_dm_8.csv +++ b/Logic/Logic/OR2_dm_8.csv @@ -25,8 +25,8 @@ POLYST CIRC,.100,4.50,0,1.00 CIRC,.100,-4.50,2.00,1.00 CIRC,.100,-4.50,-2.00,1.00 -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR3_4.csv b/Logic/Logic/OR3_4.csv index c1ba2cf5..61469abb 100644 --- a/Logic/Logic/OR3_4.csv +++ b/Logic/Logic/OR3_4.csv @@ -26,9 +26,9 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,0,0 -PIN,C,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,0,0 +PIN,C,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR3_8.csv b/Logic/Logic/OR3_8.csv index aad19194..0a54b74d 100644 --- a/Logic/Logic/OR3_8.csv +++ b/Logic/Logic/OR3_8.csv @@ -26,9 +26,9 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,0,0 -PIN,C,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,0,0 +PIN,C,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/QQN_RNPN_4.csv b/Logic/Logic/QQN_RNPN_4.csv index 608b7274..16d68ea9 100644 --- a/Logic/Logic/QQN_RNPN_4.csv +++ b/Logic/Logic/QQN_RNPN_4.csv @@ -31,4 +31,4 @@ PIN,PRE_N,R,-6.00,6.00,2.00 PIN,Q,L,6.00,2.00,2.00 PIN,Q_N,L,6.00,-2.00,2.00 TEXT,-5.00,4.00,NAME -TEXT,-6.00,-6.00,VALUE \ No newline at end of file +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/XNOR_4.csv b/Logic/Logic/XNOR_4.csv index 301c9e8a..77504aac 100644 --- a/Logic/Logic/XNOR_4.csv +++ b/Logic/Logic/XNOR_4.csv @@ -11,8 +11,8 @@ POLYPT,-4.00,-3.25,65.0 POLYPT,-4.00,3.25,0 POLYST POLY,.100,N -POLYPT,-4.50,-3.25,65.0 -POLYPT,-4.50,3.25,0 +POLYPT,-5.25,-3.25,65.0 +POLYPT,-5.25,3.25,0 POLYST POLY,.0622,N POLYPT,-6.00,2.00,0 @@ -27,8 +27,8 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/XNOR_8.csv b/Logic/Logic/XNOR_8.csv index 7e268078..ae9339a0 100644 --- a/Logic/Logic/XNOR_8.csv +++ b/Logic/Logic/XNOR_8.csv @@ -11,8 +11,8 @@ POLYPT,-4.00,-3.25,65.0 POLYPT,-4.00,3.25,0 POLYST POLY,.100,N -POLYPT,-4.50,-3.25,65.0 -POLYPT,-4.50,3.25,0 +POLYPT,-5.25,-3.25,65.0 +POLYPT,-5.25,3.25,0 POLYST POLY,.0622,N POLYPT,-6.00,2.00,0 @@ -27,8 +27,8 @@ POLYPT,6.00,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/XOR_4.csv b/Logic/Logic/XOR_4.csv index d30766e0..3ce0b851 100644 --- a/Logic/Logic/XOR_4.csv +++ b/Logic/Logic/XOR_4.csv @@ -11,8 +11,8 @@ POLYPT,-4.00,-3.25,65.0 POLYPT,-4.00,3.25,0 POLYST POLY,.100,N -POLYPT,-4.50,-3.25,65.0 -POLYPT,-4.50,3.25,0 +POLYPT,-5.25,-3.25,65.0 +POLYPT,-5.25,3.25,0 POLYST POLY,.0622,N POLYPT,-6.00,2.00,0 @@ -26,8 +26,8 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-6.00,2.00,0 -PIN,B,R,-6.00,-2.00,0 -PIN,OUT,L,6.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/XOR_8.csv b/Logic/Logic/XOR_8.csv index c90d3ddb..04cbffef 100644 --- a/Logic/Logic/XOR_8.csv +++ b/Logic/Logic/XOR_8.csv @@ -11,8 +11,8 @@ POLYPT,-4.00,-3.25,65.0 POLYPT,-4.00,3.25,0 POLYST POLY,.100,N -POLYPT,-4.50,-3.25,65.0 -POLYPT,-4.50,3.25,0 +POLYPT,-5.25,-3.25,65.0 +POLYPT,-5.25,3.25,0 POLYST POLY,.0622,N POLYPT,-6.00,2.00,0 @@ -26,8 +26,8 @@ POLY,.0622,N POLYPT,6.00,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,R,-3.00,1.00,0 -PIN,B,R,-3.00,-1.00,0 -PIN,OUT,L,3.00,0,0 -TEXT,-1.00,3.00,NAME -TEXT,-1.00,-5.5,VALUE \ No newline at end of file +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/generate_logic_sym.py b/generate_logic_sym.py index c1dbdacf..ebb88c72 100644 --- a/generate_logic_sym.py +++ b/generate_logic_sym.py @@ -290,9 +290,9 @@ def _uuid(identifier: str) -> str: pos_y = float(row[2]) * unit / scale textfield = row[3] if textfield == "NAME": - text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('center bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) + text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('left bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) if textfield == "VALUE": - text = Text(uuid_text_value, Layer('sym_values'), Value('{{VALUE}}'), Align('center bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) + text = Text(uuid_text_value, Layer('sym_values'), Value('{{VALUE}}'), Align('left top'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) symbol.add_text(text) sym_dir_path = path.join(dirpath, uuid_sym) From 95e5f7551e3f0271a6fd11d391ba3d5fe15186ef Mon Sep 17 00:00:00 2001 From: ouabache Date: Mon, 23 Mar 2020 12:13:56 -0700 Subject: [PATCH 10/23] added new parts resynced uuids to Logic lib repo --- Logic/Logic/AND4_4.csv | 38 +++ Logic/Logic/AND8_4.csv | 62 +++++ Logic/Logic/BUFFERTS_4.csv | 19 ++ Logic/Logic/BUFFERTS_N_4.csv | 20 ++ Logic/Logic/INV_6.csv | 14 + Logic/Logic/INV_i_4.csv | 14 + Logic/Logic/NAND4_4.csv | 39 +++ Logic/Logic/NAND8_4.csv | 63 +++++ Logic/Logic/NOR4_4.csv | 40 +++ Logic/Logic/NOR4_8.csv | 48 ++++ Logic/Logic/OR4_4.csv | 39 +++ Logic/Logic/OR4_8.csv | 47 ++++ Logic/script | 13 + Logic/uuid_cache_buffer.csv | 26 +- Logic/uuid_cache_buffer_cmpcat.csv | 2 + Logic/uuid_cache_flipflop.csv | 116 ++++---- Logic/uuid_cache_gates.csv | 418 ++++++++++++++++++----------- Logic/uuid_cache_gates_cmpcat.csv | 16 +- Logic/uuid_cache_multiplexor.csv | 38 +-- 19 files changed, 823 insertions(+), 249 deletions(-) create mode 100644 Logic/Logic/AND4_4.csv create mode 100644 Logic/Logic/AND8_4.csv create mode 100644 Logic/Logic/BUFFERTS_4.csv create mode 100644 Logic/Logic/BUFFERTS_N_4.csv create mode 100644 Logic/Logic/INV_6.csv create mode 100644 Logic/Logic/INV_i_4.csv create mode 100644 Logic/Logic/NAND4_4.csv create mode 100644 Logic/Logic/NAND8_4.csv create mode 100644 Logic/Logic/NOR4_4.csv create mode 100644 Logic/Logic/NOR4_8.csv create mode 100644 Logic/Logic/OR4_4.csv create mode 100644 Logic/Logic/OR4_8.csv diff --git a/Logic/Logic/AND4_4.csv b/Logic/Logic/AND4_4.csv new file mode 100644 index 00000000..4d3193f1 --- /dev/null +++ b/Logic/Logic/AND4_4.csv @@ -0,0 +1,38 @@ +SCALE,1.000 +DEF,AND4_4 +KEYWORDS,gates +KEYWORDS,and +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-4.00,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-4.00,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-4.00,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-4.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +PIN,A,L,-6.00,3.00,0 +PIN,B,L,-6.00,1,0 +PIN,C,L,-6.00,-1.00,0 +PIN,D,L,-6.00,-3.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND8_4.csv b/Logic/Logic/AND8_4.csv new file mode 100644 index 00000000..e4ff5b6a --- /dev/null +++ b/Logic/Logic/AND8_4.csv @@ -0,0 +1,62 @@ +SCALE,1.000 +DEF,AND8_4 +KEYWORDS,gates +KEYWORDS,and +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,8.00,0 +POLYPT,-4.00,-8.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,7.00,0 +POLYPT,-4.00,7.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,5.00,0 +POLYPT,-4.00,5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-4.00,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-4.00,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-4.00,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-4.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-5.00,0 +POLYPT,-4.00,-5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-7.00,0 +POLYPT,-4.00,-7.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +PIN,A,L,-6.00,7.00,0 +PIN,B,L,-6.00,5,0 +PIN,C,L,-6.00,3.00,0 +PIN,D,L,-6.00,1.00,0 +PIN,E,L,-6.00,-1.00,0 +PIN,F,L,-6.00,-3.00,0 +PIN,G,L,-6.00,-5.00,0 +PIN,H,L,-6.00,-7.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/BUFFERTS_4.csv b/Logic/Logic/BUFFERTS_4.csv new file mode 100644 index 00000000..8e1acaac --- /dev/null +++ b/Logic/Logic/BUFFERTS_4.csv @@ -0,0 +1,19 @@ +SCALE,1.000 +DEF,BUFFERTS_4 +KEYWORDS,buffer +KEYWORDS,tristate +POLY,.100,F +POLYPT,-2.00,-3.00,0 +POLYPT,-2.00,3.00,0 +POLYPT,4.00,0,0 +POLYPT,-2.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,0.00,2.00,0 +POLYPT,0.00,4.00,0 +POLYST +PIN,A,R,-6.00,0,4.00 +PIN,EN,R,-6.00,4.0,6.00 +PIN,OUT,L,6.00,0,2.00 +TEXT,-2.00,4.00,NAME +TEXT,-2.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/BUFFERTS_N_4.csv b/Logic/Logic/BUFFERTS_N_4.csv new file mode 100644 index 00000000..c00106b6 --- /dev/null +++ b/Logic/Logic/BUFFERTS_N_4.csv @@ -0,0 +1,20 @@ +SCALE,1.000 +DEF,BUFFERTS_N_4 +KEYWORDS,buffer +KEYWORDS,tristate +POLY,.100,F +POLYPT,-2.00,-3.00,0 +POLYPT,-2.00,3.00,0 +POLYPT,4.00,0,0 +POLYPT,-2.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,0.00,3.00,0 +POLYPT,0.00,4.00,0 +POLYST +CIRC,.100,0.00,2.50,1.00 +PIN,A,R,-6.00,0,4.00 +PIN,EN_N,R,-6.00,4.0,6.00 +PIN,OUT,L,6.00,0,2.00 +TEXT,-2.00,4.00,NAME +TEXT,-2.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/INV_6.csv b/Logic/Logic/INV_6.csv new file mode 100644 index 00000000..f9c1897a --- /dev/null +++ b/Logic/Logic/INV_6.csv @@ -0,0 +1,14 @@ +SCALE,1.333 +DEF,INV_6 +KEYWORDS,inverter +POLY,.100,F +POLYPT,-2.00,-3.00,0 +POLYPT,-2.00,3.00,0 +POLYPT,4.00,0,0 +POLYPT,-2.00,-3.00,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,R,-5.00,0,3.50 +PIN,OUT,L,5.00,0,1.2205 +TEXT,-2.00,3.00,NAME +TEXT,-2.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/INV_i_4.csv b/Logic/Logic/INV_i_4.csv new file mode 100644 index 00000000..f9ebabbf --- /dev/null +++ b/Logic/Logic/INV_i_4.csv @@ -0,0 +1,14 @@ +SCALE,1.000 +DEF,INV_i_4 +KEYWORDS,inverter +POLY,.100,F +POLYPT,-2.00,-3.00,0 +POLYPT,-2.00,3.00,0 +POLYPT,4.00,0,0 +POLYPT,-2.00,-3.00,0 +POLYST +CIRC,.100,-2.50,0,1.00 +PIN,A,R,-6.00,0,3.00 +PIN,OUT,L,6.00,0,2.00 +TEXT,-2.00,3.00,NAME +TEXT,-2.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND4_4.csv b/Logic/Logic/NAND4_4.csv new file mode 100644 index 00000000..c2f82096 --- /dev/null +++ b/Logic/Logic/NAND4_4.csv @@ -0,0 +1,39 @@ +SCALE,1.000 +DEF,NAND4_4 +KEYWORDS,gates +KEYWORDS,nand +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-4.00,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-4.00,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-4.00,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-4.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,L,-6.00,3.00,0 +PIN,B,L,-6.00,1,0 +PIN,C,L,-6.00,-1.00,0 +PIN,D,L,-6.00,-3.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND8_4.csv b/Logic/Logic/NAND8_4.csv new file mode 100644 index 00000000..9d5cc78f --- /dev/null +++ b/Logic/Logic/NAND8_4.csv @@ -0,0 +1,63 @@ +SCALE,1.000 +DEF,NAND8_4 +KEYWORDS,gates +KEYWORDS,nand +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,8.00,0 +POLYPT,-4.00,-8.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,7.00,0 +POLYPT,-4.00,7.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,5.00,0 +POLYPT,-4.00,5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-4.00,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-4.00,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-4.00,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-4.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-5.00,0 +POLYPT,-4.00,-5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-7.00,0 +POLYPT,-4.00,-7.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,L,-6.00,7.00,0 +PIN,B,L,-6.00,5,0 +PIN,C,L,-6.00,3.00,0 +PIN,D,L,-6.00,1.00,0 +PIN,E,L,-6.00,-1.00,0 +PIN,F,L,-6.00,-3.00,0 +PIN,G,L,-6.00,-5.00,0 +PIN,H,L,-6.00,-7.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR4_4.csv b/Logic/Logic/NOR4_4.csv new file mode 100644 index 00000000..daf04470 --- /dev/null +++ b/Logic/Logic/NOR4_4.csv @@ -0,0 +1,40 @@ +SCALE,1.000 +DEF,NOR4_4 +KEYWORDS,gates +KEYWORDS,nor +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-3.8583,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1,0 +POLYPT,-3.1496,1,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-3.1496,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-3.8583,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,L,-6.00,3.00,0 +PIN,B,L,-6.00,1,0 +PIN,C,L,-6.00,-1.00,0 +PIN,D,L,-6.00,-3.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR4_8.csv b/Logic/Logic/NOR4_8.csv new file mode 100644 index 00000000..2f7266dc --- /dev/null +++ b/Logic/Logic/NOR4_8.csv @@ -0,0 +1,48 @@ +SCALE,2.000 +DEF,NOR4_8 +KEYWORDS,gates +KEYWORDS,nor +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,3.25,0 +POLYPT,-4.00,7.00,0 +POLYST +POLY,.100,N +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,-7.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,6.00,0 +POLYPT,-4.00,6.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2,0 +POLYPT,-3.465,2,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.465,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-6.00,0 +POLYPT,-4.00,-6.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,L,-3.00,3.00,0 +PIN,B,L,-3.00,1,0 +PIN,C,L,-3.00,-1.00,0 +PIN,D,L,-3.00,-3.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR4_4.csv b/Logic/Logic/OR4_4.csv new file mode 100644 index 00000000..37af6eb2 --- /dev/null +++ b/Logic/Logic/OR4_4.csv @@ -0,0 +1,39 @@ +SCALE,1.000 +DEF,OR4_4 +KEYWORDS,gates +KEYWORDS,or +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-3.8583,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1,0 +POLYPT,-3.1496,1,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-3.1496,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-3.8583,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +PIN,A,L,-6.00,3.00,0 +PIN,B,L,-6.00,1,0 +PIN,C,L,-6.00,-1.00,0 +PIN,D,L,-6.00,-3.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR4_8.csv b/Logic/Logic/OR4_8.csv new file mode 100644 index 00000000..791b9d90 --- /dev/null +++ b/Logic/Logic/OR4_8.csv @@ -0,0 +1,47 @@ +SCALE,2.000 +DEF,OR4_8 +KEYWORDS,gates +KEYWORDS,or +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,3.25,0 +POLYPT,-4.00,7.00,0 +POLYST +POLY,.100,N +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,-7.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,6.00,0 +POLYPT,-4.00,6.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2,0 +POLYPT,-3.465,2,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-3.465,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-6.00,0 +POLYPT,-4.00,-6.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +PIN,A,L,-3.00,3.00,0 +PIN,B,L,-3.00,1,0 +PIN,C,L,-3.00,-1.00,0 +PIN,D,L,-3.00,-3.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/script b/Logic/script index 4aef8f4b..f6f1b28d 100755 --- a/Logic/script +++ b/Logic/script @@ -2,19 +2,32 @@ rm -r out python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND8_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND8_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_6 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_i_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_8 python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_4 +python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFERTS_4 +python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFERTS_N_4 python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_8 python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design QQN_RNPN_4 python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RNPN_4 diff --git a/Logic/uuid_cache_buffer.csv b/Logic/uuid_cache_buffer.csv index 246a0c40..7ec7c1cb 100644 --- a/Logic/uuid_cache_buffer.csv +++ b/Logic/uuid_cache_buffer.csv @@ -1,12 +1,26 @@ -sym-buffer_4-pin-a,30100ce9-f74d-443b-ad3e-e9582dbd7227 -sym-buffer_4-pin-out,a62d1444-6308-4232-8da7-4c277f1aa212 -sym-buffer_4-polygon-contour,31577bb4-151a-46ac-b1c1-6ab12975ffb4 -sym-buffer_4-sym,5056713c-62ad-4c5e-90d4-a46a12b6aeaa -sym-buffer_4-text-name,ea4dafbd-17ac-4c21-ac7c-bf9180e42874 -sym-buffer_4-text-value,8608ea1b-a4c6-4eff-9322-15929dad02c8 +sym-buffer_4-pin-a,bda670ec-50dc-4834-9254-ea564341547c +sym-buffer_4-pin-out,f33d9174-a364-4097-bf4a-cd8f5837148f +sym-buffer_4-polygon-contour,605c26e5-5afb-409a-af9d-ad26a09db976 +sym-buffer_4-sym,782a6b45-3448-4be4-9d8a-9f99adad6109 +sym-buffer_4-text-name,67144092-1106-4359-bca0-e36fc090e3f6 +sym-buffer_4-text-value,23e7f2c5-6376-4898-8fe5-a0fd6809c93b sym-buffer_8-pin-a,f71a21e1-b713-477c-a87d-94908c37679a sym-buffer_8-pin-out,91d4e65c-c81b-4bf2-87fe-cb5872255f9c sym-buffer_8-polygon-contour,2b002120-17f6-4f14-b697-fef217579922 sym-buffer_8-sym,8f1e795f-12a9-4c9e-8acd-1a643a1fc543 sym-buffer_8-text-name,28f85863-fd26-43b6-b267-6e845b5bffd8 sym-buffer_8-text-value,0b9f90e3-2203-4b39-ba5e-5f14425639b8 +sym-bufferts_4-pin-a,448904b4-3ac7-4c4f-bc24-9a82e2957fa1 +sym-bufferts_4-pin-en,99bc5f97-e49c-46ab-9171-868e468454ba +sym-bufferts_4-pin-out,501e0d01-97eb-46c1-a3de-3a54a8de466b +sym-bufferts_4-polygon-contour,19968d0c-b3b2-44c2-94d5-92869f8a2f61 +sym-bufferts_4-sym,096fe5b3-a3c5-4813-9096-a8f6a6cc4e89 +sym-bufferts_4-text-name,0c650348-f4b6-4d36-9c2f-639141bdbe11 +sym-bufferts_4-text-value,becc2a63-2fda-497a-9a64-69c9c40e901a +sym-bufferts_n_4-pin-a,5237b2a6-8525-4309-b2b4-939272312336 +sym-bufferts_n_4-pin-en_n,3f4e3b46-5bbd-406b-872a-580fc25850b1 +sym-bufferts_n_4-pin-out,192096c6-8248-44cf-8408-07e68fd16980 +sym-bufferts_n_4-polygon-contour,cef62873-13a4-435d-8ffb-8e0b43cbd4c4 +sym-bufferts_n_4-sym,c50be687-d276-4934-a12f-b548ba7b7065 +sym-bufferts_n_4-text-name,ea96ae83-aaa0-4d39-89b5-b0bd4b925eef +sym-bufferts_n_4-text-value,ecb3f868-1f57-4781-8c98-3f46b8c1664a diff --git a/Logic/uuid_cache_buffer_cmpcat.csv b/Logic/uuid_cache_buffer_cmpcat.csv index c6773e99..b852ec8f 100644 --- a/Logic/uuid_cache_buffer_cmpcat.csv +++ b/Logic/uuid_cache_buffer_cmpcat.csv @@ -1,2 +1,4 @@ cmpcat-buffer_4-cmpcat,56f01b1d-0723-4c33-88f7-9968cf96b50f cmpcat-buffer_8-cmpcat,56f01b1d-0723-4c33-88f7-9968cf96b50f +cmpcat-bufferts_4-cmpcat,56f01b1d-0723-4c33-88f7-9968cf96b50f +cmpcat-bufferts_n_4-cmpcat,56f01b1d-0723-4c33-88f7-9968cf96b50f diff --git a/Logic/uuid_cache_flipflop.csv b/Logic/uuid_cache_flipflop.csv index c1220379..fac4e66a 100644 --- a/Logic/uuid_cache_flipflop.csv +++ b/Logic/uuid_cache_flipflop.csv @@ -1,58 +1,58 @@ -sym-dff_4-pin-clk,dfc7a80e-906f-490d-a6cc-5582acdcd7f8 -sym-dff_4-pin-d,5935073f-013a-4888-8d2d-611780eb3f40 -sym-dff_4-pin-q,47483f20-b83e-485a-8626-22e6cbf61820 -sym-dff_4-polygon-contour,2f8bc6ca-5d38-4b46-95a6-ca1eb4e0d142 -sym-dff_4-sym,7e046efe-069a-4451-8d95-bbbb42172ddf -sym-dff_4-text-name,b19d9a9b-b7d5-4f80-8afd-de9431f0feb2 -sym-dff_4-text-value,0821bb56-d26f-4e9c-a227-aa7595659d5b -sym-dff_p_4-pin-clk,56fb8fba-03c0-41a9-a243-63b61f058fe1 -sym-dff_p_4-pin-d,d69a5e5f-0dcd-47ac-bdb0-4a94d6e457dc -sym-dff_p_4-pin-pre,9f9ee6d3-813d-49dc-922a-a7142e5181a2 -sym-dff_p_4-pin-q,6a4570f8-86c0-45e3-8715-8d55966f62f7 -sym-dff_p_4-polygon-contour,49a7f92d-b83e-4a71-a8c8-23969bbb0b75 -sym-dff_p_4-sym,e30cd3bb-556f-4cf1-8945-2afdab02105d -sym-dff_p_4-text-name,a5575b8d-cbed-4a9d-bd78-c70adc6e827f -sym-dff_p_4-text-value,1c6debd6-d2b0-4546-bbd4-1bffa69daceb -sym-dff_pn_4-pin-clk,5b5bf55e-cb29-41d3-93cb-a71a437909e1 -sym-dff_pn_4-pin-d,c79219e4-014e-48ae-9a58-9ee6056a8955 -sym-dff_pn_4-pin-pre_n,da401084-429f-41df-983a-1536ced22d9e -sym-dff_pn_4-pin-q,15247761-631b-4e62-9cf9-3017db39664b -sym-dff_pn_4-polygon-contour,c4f5a6b6-b4a7-47da-a2d6-fdf1328deb67 -sym-dff_pn_4-sym,7c16be6d-ff31-475e-b83b-316c51159639 -sym-dff_pn_4-text-name,a2798e22-41ce-4e89-9b26-ba197ad4b8b1 -sym-dff_pn_4-text-value,ef6fe216-909c-4701-9374-76fd665e7ea5 -sym-dff_r_4-pin-clk,8e21abb8-fb4d-484f-ab50-c66d732513e3 -sym-dff_r_4-pin-d,39b2cca8-f7c5-4ab9-bdec-25ad9a22ef3a -sym-dff_r_4-pin-q,71c9a916-fd42-4ccf-99a8-9ccd23042147 -sym-dff_r_4-pin-rst,562e46de-39c8-4053-b412-2752dae5da08 -sym-dff_r_4-polygon-contour,f64a35fa-c461-492a-af81-75d197322516 -sym-dff_r_4-sym,086b2bda-1fe1-46d0-980a-1d0a35908b74 -sym-dff_r_4-text-name,70c971c9-5feb-47b0-be79-b6d13be91ff2 -sym-dff_r_4-text-value,537ac67f-efc9-4165-937e-2651affd26ca -sym-dff_rn_4-pin-clk,78eced60-2bbe-4922-8db8-f40e6d94794d -sym-dff_rn_4-pin-d,69f49bbf-42e5-4934-ac1a-c97fe00236a7 -sym-dff_rn_4-pin-q,1cddbd30-eed9-4429-8b6a-1e39df36c8da -sym-dff_rn_4-pin-rst_n,75321453-8eb8-404d-ac8b-ca2203e3c924 -sym-dff_rn_4-polygon-contour,7d4e1d94-f890-41cb-a497-e600e7adcde9 -sym-dff_rn_4-sym,8f53f06e-6539-4b1a-a345-aecfdbeafacc -sym-dff_rn_4-text-name,bd1f35a4-5f5a-4741-918c-6814003bf438 -sym-dff_rn_4-text-value,6402e517-c13e-4d78-8872-e73195b60b17 -sym-dff_rnpn_4-pin-clk,81b89bc0-4576-4388-ab95-c9fe24d0aada -sym-dff_rnpn_4-pin-d,6f5194ba-3f03-4990-9420-c8986d8d6905 -sym-dff_rnpn_4-pin-pre_n,ff7aad50-bb8c-462e-b219-5af96bd9fb8d -sym-dff_rnpn_4-pin-q,ec92ed79-273b-4c55-9f65-3e09ab5d6b18 -sym-dff_rnpn_4-pin-rst_n,fedbc5c2-2fe3-4c9a-a6eb-b528fd32786e -sym-dff_rnpn_4-polygon-contour,51ea09cb-62bc-4797-beac-12cefad4462e -sym-dff_rnpn_4-sym,c5cad6f8-cf63-4a9d-8961-42e52b24f37f -sym-dff_rnpn_4-text-name,04729999-1e26-4ec4-bd3a-5f47771ce244 -sym-dff_rnpn_4-text-value,362ba51f-b286-4b8c-a9c5-d648b66270cf -sym-qqn_rnpn_4-pin-clk,37342d56-7b75-472b-93b5-cb8a21c0b0db -sym-qqn_rnpn_4-pin-d,779b216d-6821-4680-b7fe-91ae765f39b0 -sym-qqn_rnpn_4-pin-pre_n,4ef8069f-b239-438a-8c6f-5ced0084f1b1 -sym-qqn_rnpn_4-pin-q,d40d309b-19df-4f49-a1c5-747702ecbe4c -sym-qqn_rnpn_4-pin-q_n,c3f8137e-6453-4565-a451-057fc55ca1b4 -sym-qqn_rnpn_4-pin-rst_n,7dd22415-0de0-4d50-b106-9aa52a46bb91 -sym-qqn_rnpn_4-polygon-contour,bf029b96-6724-46ed-9308-58f1abe81bc1 -sym-qqn_rnpn_4-sym,041d4605-e768-46a0-8db1-7665f45e9f19 -sym-qqn_rnpn_4-text-name,5894cf48-ebe4-41e7-b8db-cfd7b4c8596d -sym-qqn_rnpn_4-text-value,7d2b3933-efef-4783-99d1-e8a79fe9cda8 +sym-dff_4-pin-clk,ff87c347-eb98-4421-98ca-6f11ac8bb0f3 +sym-dff_4-pin-d,2c19951a-d180-4395-8ee6-9ccc6a84a65b +sym-dff_4-pin-q,9627a399-4802-4d66-8d05-c1e475a57bea +sym-dff_4-polygon-contour,8706687f-9d4c-4e30-a7c5-deaf6422119a +sym-dff_4-sym,593981e4-44ff-475b-b577-d979d0802107 +sym-dff_4-text-name,ab0328fe-8dae-4906-bf50-7f84bff145a6 +sym-dff_4-text-value,8c3eb111-79f8-46ff-bfa2-d66e1a8dc6a5 +sym-dff_p_4-pin-clk,82366630-04b3-4364-b9e8-61e577634a55 +sym-dff_p_4-pin-d,9f6f6143-56ef-4a10-8c0c-6a664064c94c +sym-dff_p_4-pin-pre,5328726c-2910-4dcc-aacf-891ee5c357bd +sym-dff_p_4-pin-q,dd5cfa19-3dea-422a-9b97-b13a0f2da4f8 +sym-dff_p_4-polygon-contour,1a46a45a-6385-4347-95ff-e5cddc5e60d0 +sym-dff_p_4-sym,a9855853-e5be-4159-8cc7-7126d089a61f +sym-dff_p_4-text-name,2fdec625-4d49-4908-bd35-57f91c825b54 +sym-dff_p_4-text-value,e4aefad6-b3b6-4ece-8071-58d641df8abb +sym-dff_pn_4-pin-clk,dd10715a-93fc-470e-a066-c983d613ea91 +sym-dff_pn_4-pin-d,952e1b9c-83b5-47fa-98fb-a19926d3e5ab +sym-dff_pn_4-pin-pre_n,e0409772-0974-4ff1-989d-8beb6d903890 +sym-dff_pn_4-pin-q,580cb578-ff22-4cdc-a8f8-a7dae11ef8cf +sym-dff_pn_4-polygon-contour,003b389b-9e74-43f4-92e7-6e72de1e01b1 +sym-dff_pn_4-sym,b252653d-f7e7-4da8-a637-9c153c9611e5 +sym-dff_pn_4-text-name,d1821323-7625-40af-a207-d76112ce296a +sym-dff_pn_4-text-value,4e6c2305-588d-461b-835c-f082a8daa0a2 +sym-dff_r_4-pin-clk,2429ae4f-649e-47b1-aac7-eec56f0f836a +sym-dff_r_4-pin-d,fe9cf610-e2a6-45e8-91d5-f136551490cd +sym-dff_r_4-pin-q,45a25660-000f-4e00-b097-01de2d5f99fe +sym-dff_r_4-pin-rst,56c3c61b-0e41-42e3-92fa-46f5287b1344 +sym-dff_r_4-polygon-contour,215741b7-35c3-4c46-91c3-652606b46768 +sym-dff_r_4-sym,4a3febcd-3201-4573-a841-e33094606d8d +sym-dff_r_4-text-name,8f9bebbd-414a-44e2-a291-7b24ddae895c +sym-dff_r_4-text-value,d0e820ad-2e82-4204-817b-042f43fa3564 +sym-dff_rn_4-pin-clk,2e5b4bc2-dfe9-40ed-9e50-8347f95eab9c +sym-dff_rn_4-pin-d,94b4a365-d14a-42b9-a0f8-fd6abab1cc17 +sym-dff_rn_4-pin-q,c2dd8771-9e36-46ac-9d14-17bca156451e +sym-dff_rn_4-pin-rst_n,337f2af5-ab75-4596-be4b-946f8d992276 +sym-dff_rn_4-polygon-contour,0d80e2ae-17b7-45b1-b8d8-563bb762a199 +sym-dff_rn_4-sym,1795e5cd-4471-455a-a4d5-92032a358a0d +sym-dff_rn_4-text-name,72860bd9-b646-4e6a-8ce0-d10cb11a81ef +sym-dff_rn_4-text-value,9cb5603f-f3b1-46dd-b493-b50556b66919 +sym-dff_rnpn_4-pin-clk,6c54a2d8-fb3a-4000-8ecf-cdd285bd6fe7 +sym-dff_rnpn_4-pin-d,a9dc5f13-57ce-4255-8772-9be95597f8c8 +sym-dff_rnpn_4-pin-pre_n,0a25ea41-d00d-4f6b-afca-5dcf8e1e5bc5 +sym-dff_rnpn_4-pin-q,1af3bf50-fee3-4a54-a601-35aa999aa7a4 +sym-dff_rnpn_4-pin-rst_n,fb1cc05c-454a-425d-84d9-8c459be79027 +sym-dff_rnpn_4-polygon-contour,749ba72d-0380-4db8-9643-3386d0bef3ed +sym-dff_rnpn_4-sym,30cd9140-5261-4fc9-b445-db4be16f84fe +sym-dff_rnpn_4-text-name,b9ec7882-3e9f-4ec7-abbe-f0d79476a544 +sym-dff_rnpn_4-text-value,8f499f26-d4b6-41c3-8b33-021ccfdb7d31 +sym-qqn_rnpn_4-pin-clk,b86368bf-40f4-4f4b-b1ae-5fc20278f047 +sym-qqn_rnpn_4-pin-d,e4b21b41-0801-4a55-8104-b357b038532f +sym-qqn_rnpn_4-pin-pre_n,8a8748ef-013f-42cf-8435-873f1a930bac +sym-qqn_rnpn_4-pin-q,33510a60-5a61-4f4f-89bf-f6333475ec98 +sym-qqn_rnpn_4-pin-q_n,448d187e-4b0c-42e7-b8b0-34da376a3f96 +sym-qqn_rnpn_4-pin-rst_n,a1a83d4f-5958-4d48-8d97-d6a66076b30f +sym-qqn_rnpn_4-polygon-contour,8d7bb023-f773-4dcd-8ab4-8480055bc376 +sym-qqn_rnpn_4-sym,6f9a28e8-ed57-4fa1-99d1-3fab2e2c436a +sym-qqn_rnpn_4-text-name,469f8b8c-4832-41f4-af87-f296846d46e9 +sym-qqn_rnpn_4-text-value,25e5c5bf-7347-4f6e-b08f-c02136997aa6 diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv index c639c828..2d2c56d6 100644 --- a/Logic/uuid_cache_gates.csv +++ b/Logic/uuid_cache_gates.csv @@ -1,46 +1,46 @@ -sym-and2_4-pin-a,f54541e6-f3d5-4fff-b485-a2f8d2beeb26 -sym-and2_4-pin-b,61851241-77b1-4be1-8ce6-10512ccd49ff -sym-and2_4-pin-out,e69d96f2-9ef8-41fe-b5c6-060d405136ef -sym-and2_4-polygon-contour,54d8eca8-3d27-4ea0-bd6d-d33fb8995cb8 -sym-and2_4-sym,3c262a18-c9ae-4910-9d11-1a2358bdf4d0 -sym-and2_4-text-name,17a5c3e5-2cac-4c0a-ad0a-3ce170457c81 -sym-and2_4-text-value,9d674aff-efba-4987-9c4b-4cc617a679d4 -sym-and2_6-pin-a,128456e3-bdc6-43bb-8182-db995fcc5557 -sym-and2_6-pin-b,78ebc339-df31-48d8-87c8-e2db69bf0127 -sym-and2_6-pin-out,ce5b24c0-8d43-423b-851a-f7c73f7f9ce0 -sym-and2_6-polygon-contour,553f84c6-ec78-4c31-bb6a-a5caee7da41e -sym-and2_6-sym,07788c43-61c7-44b6-b609-83ab497735a3 -sym-and2_6-text-name,5a725f33-13c2-4200-92af-64036a9bf545 -sym-and2_6-text-value,296b8af5-1e89-42f1-bbd3-24c6106d3f32 -sym-and2_8-pin-a,860f56a0-f644-4650-a6b7-bce9cda95f15 -sym-and2_8-pin-b,fe02eabe-6882-431c-8c7c-c8fbd55c25f0 -sym-and2_8-pin-out,317a9a39-5fe4-4d67-963c-d6ad03c15017 -sym-and2_8-polygon-contour,57fca127-5072-4af8-b8f8-43363fa21e80 -sym-and2_8-sym,c4b15609-970b-4637-adc7-a97152a78480 -sym-and2_8-text-name,db9ccc6e-166c-40e9-9d75-283a4a44e647 -sym-and2_8-text-value,d3cb9e03-472b-406f-be62-b82a5c4fbb67 -sym-and2_dm_4-pin-a,530b6995-f2f8-47a4-97d6-d165e46823f0 -sym-and2_dm_4-pin-b,555d4da2-fc18-4c7e-9f4d-f1f4eeee941c -sym-and2_dm_4-pin-out,a09b49c8-5b11-4770-b38a-e718e379610d -sym-and2_dm_4-polygon-contour,479e323a-161f-4723-b390-6901525739c8 -sym-and2_dm_4-sym,e4118c45-3863-4107-b373-5a25fe95175d -sym-and2_dm_4-text-name,c946fbd9-59c3-4a67-8cff-32e7fd45208e -sym-and2_dm_4-text-value,de23f908-7a01-42c8-847a-4ed823bbf060 -sym-and2_dm_8-pin-a,504a3f96-bedf-480c-981f-72957ed566e0 -sym-and2_dm_8-pin-b,a23735ee-79c0-45ca-a649-ee09fceaacca -sym-and2_dm_8-pin-out,1d6515c2-c3d7-4f66-86fe-57c20a1ff6bd -sym-and2_dm_8-polygon-contour,f50be834-6dfb-4b39-9c3c-eae33742b4c0 -sym-and2_dm_8-sym,f59a0c87-e60a-4de9-b3b4-1dce5fd5cb8a -sym-and2_dm_8-text-name,1dd04541-918a-4e80-8d5a-9e5fb1dfecbd -sym-and2_dm_8-text-value,56278c5a-3a40-4ff6-8c57-b764a2c28dc8 -sym-and3_4-pin-a,8c2f3352-e5b3-4d8a-9f97-3146fa9d575a -sym-and3_4-pin-b,42782759-826f-434f-8c97-11dc88658078 -sym-and3_4-pin-c,6e598b6f-dd7a-48a7-9271-ba7e778742c2 -sym-and3_4-pin-out,2a80173d-1f48-4c74-9c2f-d9d162d6be09 -sym-and3_4-polygon-contour,23bab8a2-87f3-4fe4-9bb6-30e828fca9af -sym-and3_4-sym,c7e7b5e2-24c0-4ce1-b06e-b255eac70b7e -sym-and3_4-text-name,ebeb0978-1d0d-4c11-bac4-fb052c21422a -sym-and3_4-text-value,d71c9601-3f10-4e14-bdb8-d70314d8bb8e +sym-and2_4-pin-a,86101e31-a58d-4dff-86d0-73f0c8e0382c +sym-and2_4-pin-b,12d487f4-309d-4ca3-a5c6-9f56fac1bd81 +sym-and2_4-pin-out,cc15b9a6-8e72-4086-924f-e194cc1f6ce2 +sym-and2_4-polygon-contour,85f7ce97-c567-417e-889d-76a293e66e75 +sym-and2_4-sym,05819783-74fa-41b5-af88-3f631a6976d8 +sym-and2_4-text-name,50b49425-ae40-45ec-8462-e9ee75d6d4a4 +sym-and2_4-text-value,73c1f9e7-c7af-44a9-9042-1ec79697dcc2 +sym-and2_6-pin-a,15479eaa-1dbb-49d2-8acd-4fbbbef965fe +sym-and2_6-pin-b,cac418e3-89cb-4bb9-8f87-52c82ebc802b +sym-and2_6-pin-out,1776b698-4b1e-4def-99d7-b615f5b9b6fa +sym-and2_6-polygon-contour,eecb8977-9365-4215-8528-ed2248deb5a2 +sym-and2_6-sym,adaf9181-a460-46ed-8576-f4e13448adbe +sym-and2_6-text-name,3312c679-d296-438f-91c1-7fb81814b1f9 +sym-and2_6-text-value,5cd4a9c0-023e-4373-a2b0-b4e551d94b69 +sym-and2_8-pin-a,96299d23-c126-4f46-9890-d902ae291e4f +sym-and2_8-pin-b,6010fcdb-fe20-4121-a2c2-42699baffb55 +sym-and2_8-pin-out,03125a49-3207-4fdb-b32e-1309c1791f9a +sym-and2_8-polygon-contour,84b8f96a-5629-4d3c-89d2-77cdbdc3880d +sym-and2_8-sym,1d5eab7c-5b95-473e-9ea2-fce0b306a068 +sym-and2_8-text-name,716bd6a8-40b6-47ea-92a1-8171c78d87ee +sym-and2_8-text-value,a243bff4-9001-4025-97be-b8e1cb08ceb2 +sym-and2_dm_4-pin-a,6d831560-07cf-43df-94ad-ddbe689ec2b3 +sym-and2_dm_4-pin-b,f3c799ab-47e8-4801-8442-79cb7b0c0afd +sym-and2_dm_4-pin-out,15ea96e3-3858-44d3-b142-6454737ac6d1 +sym-and2_dm_4-polygon-contour,2ee385a9-1272-4e1c-ae62-79553ea2cd04 +sym-and2_dm_4-sym,75a5cb4e-03b3-4c50-9085-3c6e77eab1a5 +sym-and2_dm_4-text-name,af0de7c5-24de-4712-99f5-f761a41474b8 +sym-and2_dm_4-text-value,49c8a7bf-763e-4e4b-8061-1f0e59a7c78d +sym-and2_dm_8-pin-a,7f23afd9-2543-47b2-9561-c9563a1caa13 +sym-and2_dm_8-pin-b,dbdb992f-eeaa-4c74-a15b-d8d8d9a8ce52 +sym-and2_dm_8-pin-out,362dbb80-e48b-4423-bcd7-277d44bb2811 +sym-and2_dm_8-polygon-contour,4779143b-b540-4d92-9084-3e0a08fdf4f2 +sym-and2_dm_8-sym,2ec2287d-9988-4b9f-8572-4e22e0783465 +sym-and2_dm_8-text-name,641229f4-0c9e-4300-88fc-7ccbb822032e +sym-and2_dm_8-text-value,ac092086-5af9-434a-9d64-3db5b2362358 +sym-and3_4-pin-a,91cce3ca-ca68-46cc-9f64-8706ca1c2a16 +sym-and3_4-pin-b,62515683-56d5-4c44-8fc6-3eefab114e79 +sym-and3_4-pin-c,e107aeac-8aca-4a6a-acc3-a6f3a8fda2f5 +sym-and3_4-pin-out,7f645e7a-dda6-47f8-aa90-f1e7f6bb14af +sym-and3_4-polygon-contour,a8d898ba-eb97-4a5e-acd2-6ddc234a76de +sym-and3_4-sym,386725a0-9e95-4262-9761-0ad2fc4eb114 +sym-and3_4-text-name,0bfa03b4-b1e4-469f-ada9-9180df2e6919 +sym-and3_4-text-value,28e431d8-01d6-410d-8e7d-50746377f478 sym-and3_8-pin-a,f713063d-891e-46fd-b596-8d9e2f497af3 sym-and3_8-pin-b,db749abe-584a-4124-9234-04305a0d44ab sym-and3_8-pin-c,55b823e8-3fba-4976-b5ed-dcfd0dfaaff0 @@ -49,39 +49,73 @@ sym-and3_8-polygon-contour,c4a89b3c-f249-4fcd-9d61-b91985cc2264 sym-and3_8-sym,a58b86ea-7795-4afe-9693-497759e2a14f sym-and3_8-text-name,c2ce762c-1e16-4fcb-989e-08f504e7ba70 sym-and3_8-text-value,52acad07-202e-4418-95c2-255e5cbfe0df -sym-inv_4-pin-a,c7bd99e6-7377-40ca-9afd-99f54bddb314 -sym-inv_4-pin-out,6f9e4711-1bde-4049-8843-54abc799dd27 -sym-inv_4-polygon-contour,0a5932f1-23f3-4da3-9c84-bff353f4cc98 -sym-inv_4-sym,2abb4c96-39e3-4a54-a0af-f157dc952c6f -sym-inv_4-text-name,0905a207-5b35-4ce5-b795-60f095fcd086 -sym-inv_4-text-value,8d3be6b2-7a2a-41df-be68-93c394a4d894 -sym-inv_8-pin-a,3c783f17-2a80-4548-8851-b999dc0c4092 -sym-inv_8-pin-out,a5b0393e-2058-4e0c-89d5-b60cf740eab1 -sym-inv_8-polygon-contour,5c229317-661f-4b44-92a3-fb6fec97b9cc -sym-inv_8-sym,444b840d-1a08-406e-a124-7fd191bce716 -sym-inv_8-text-name,fbd11c9e-e9f8-4f16-9808-6d32121f1b6d -sym-inv_8-text-value,baee5c41-c6b8-4010-a40f-56de0b09cf21 -sym-nand2_4-pin-a,bd6a472f-d301-4a11-a0a0-1a7f152c7a69 -sym-nand2_4-pin-b,149f9758-5289-4274-a9ab-446fa67a7140 -sym-nand2_4-pin-out,b432a92a-4128-4093-9089-6e806dd10cd5 -sym-nand2_4-polygon-contour,16278946-3ca9-4868-9dac-c963ab9fd17b -sym-nand2_4-sym,dba50be9-299e-434a-979b-ad6e99a96be0 -sym-nand2_4-text-name,28d08756-5a37-40fe-ae15-91c2bcb6f11f -sym-nand2_4-text-value,83acd99e-93af-442e-a228-9af054fe3859 -sym-nand2_8-pin-a,a85f484c-8f8c-4035-aa1b-4d4139ae334e -sym-nand2_8-pin-b,4069c8f8-2709-4295-ade2-6c5ead1b02a1 -sym-nand2_8-pin-out,4016f10a-3ea6-4ada-bccd-fcb82eec1347 -sym-nand2_8-polygon-contour,a6202f6d-7848-47b1-8b0f-86040cb5fd3b -sym-nand2_8-sym,ce347ad6-691b-4a35-82a6-e540733830d5 -sym-nand2_8-text-name,d31e54a8-4ba7-44a6-899e-de9faa3e3b49 -sym-nand2_8-text-value,2028972a-bdea-4fbb-8103-894bf3c5a9c4 -sym-nand2_dm_4-pin-a,d7132dbe-c67d-4208-a3db-6667cc7f0257 -sym-nand2_dm_4-pin-b,d52ef654-c361-4002-8b89-eac215b3da24 -sym-nand2_dm_4-pin-out,27f9da2b-3555-4042-b242-1da6a3c7ed23 -sym-nand2_dm_4-polygon-contour,40815697-bb87-4c29-95f4-1a30f18cd41c -sym-nand2_dm_4-sym,d5480d6d-4090-4167-8aaf-b2221398c767 -sym-nand2_dm_4-text-name,849d6d01-cfe3-43d7-9095-35e31f3e6d6c -sym-nand2_dm_4-text-value,e78fb97e-52c2-40b4-94f2-277d052eac9c +sym-and4_4-pin-a,afb17912-4871-484f-ad1a-182b533f4da7 +sym-and4_4-pin-b,664b4cf5-7718-4f85-acf3-0912d1c2c5f7 +sym-and4_4-pin-c,4ba20a04-7384-4190-ba32-d3a0274fdd04 +sym-and4_4-pin-d,6da595d4-6ae3-4072-88f2-67b064a6174f +sym-and4_4-pin-out,677ce88e-7b35-42a5-af47-621ae290a84d +sym-and4_4-polygon-contour,a36d2ec9-2fde-4855-bec9-f612712bf6dc +sym-and4_4-sym,f5c271aa-810f-4fda-aae2-beba9b41ea29 +sym-and4_4-text-name,4bd74ec7-8a59-4a10-9582-33309e2b1c46 +sym-and4_4-text-value,873aad6d-faea-47f6-ad85-6ff794c36973 +sym-and8_4-pin-a,c1aab202-7ef7-4472-bab7-3631e6b874fc +sym-and8_4-pin-b,37b5906c-881a-4b90-85fd-a63aafba2930 +sym-and8_4-pin-c,db37f8f5-6779-4fa7-addc-b98360424ece +sym-and8_4-pin-d,03c4b8da-4bc8-45d7-926b-339ae5ca3566 +sym-and8_4-pin-e,c3352b66-4e43-45b2-82b1-03a1637cdf1a +sym-and8_4-pin-f,679db82d-cd06-44c6-87eb-b826dda4d8a5 +sym-and8_4-pin-g,40fd9dd8-4bea-4503-8d2c-f9e8f8397abc +sym-and8_4-pin-h,d6871d2e-d51e-4467-aea4-6d8d601aa84b +sym-and8_4-pin-out,0e9883f4-56dc-40a0-bfa5-98c6cbc69d71 +sym-and8_4-polygon-contour,bcc98464-f79c-4025-a522-58156811e582 +sym-and8_4-sym,dc118934-41d7-49ab-a0fe-0fb78d2f31bc +sym-and8_4-text-name,e13e940d-31da-4d0a-b977-030051953a66 +sym-and8_4-text-value,76e7ac76-8c88-4b50-8fb6-10fe688ca43d +sym-inv_4-pin-a,cecb1a45-c0a4-4782-95c4-7b1099b1dbb3 +sym-inv_4-pin-out,e3a53677-898f-4106-ba9f-7257bee9e5cf +sym-inv_4-polygon-contour,4e856918-3010-45cd-be9f-16e6653698c2 +sym-inv_4-sym,a440f00e-fa41-4736-90b5-703d77554075 +sym-inv_4-text-name,6ea55fc4-ee4d-4a8d-8211-5c8a0f0ae0e6 +sym-inv_4-text-value,8df4708a-0c7d-4896-bf99-f73872dc6af9 +sym-inv_6-pin-a,45c72c76-da74-4a4e-9664-3747d3912b0f +sym-inv_6-pin-out,accd37a5-a329-4d28-a152-71f932e15d15 +sym-inv_6-polygon-contour,405db82a-2779-4fe2-8fe4-036077eee6d7 +sym-inv_6-sym,0451538b-6b26-45c0-bd61-5840bb22212d +sym-inv_6-text-name,61d96ade-7431-4f70-9de5-e9d2b7206451 +sym-inv_6-text-value,b0988889-a9c8-4b09-ada9-b2fac9f77e69 +sym-inv_8-pin-a,49323d6d-0ed1-4a5a-ba5d-dd3b6635b1dc +sym-inv_8-pin-out,7083a62f-849a-486b-adca-a1391430caa6 +sym-inv_8-polygon-contour,13bfd555-6667-4d54-8f56-20ff6955f050 +sym-inv_8-sym,ea2f70dd-ad70-47cc-aa6e-e540c2189bdc +sym-inv_8-text-name,592aa219-6c0b-4513-8b62-969aa97c65e4 +sym-inv_8-text-value,58ce8b20-d991-436f-8a79-03fdff018828 +sym-inv_i_4-pin-a,a68f42d2-2064-49c9-901b-de419829e4d4 +sym-inv_i_4-pin-out,04dd5535-8506-4514-921c-0da380400ef3 +sym-inv_i_4-polygon-contour,0110f0a4-6dc4-4543-a444-6b71b9fe291e +sym-inv_i_4-sym,bef95e15-b97b-45aa-9f3a-e39eae38d664 +sym-inv_i_4-text-name,2692a175-dbea-410c-b04b-e45a0fbcb5ea +sym-inv_i_4-text-value,8722997d-addc-481e-9f1f-ffd49bf5af64 +sym-nand2_4-pin-a,be95e331-433f-4364-b2ef-3b6375dd0a79 +sym-nand2_4-pin-b,e43e34e9-7552-44e2-a9c0-7e30b9d11fe8 +sym-nand2_4-pin-out,e7c64f38-8b4c-431d-ad0a-d74e2645545d +sym-nand2_4-polygon-contour,5a4ad0c9-ab9c-479f-a4ea-df756b49e120 +sym-nand2_4-sym,33d9b808-8012-4d57-b6f6-51b360e38ef2 +sym-nand2_4-text-name,218f116b-d6c6-4dca-8dff-b95679ef3067 +sym-nand2_4-text-value,d719858a-cb76-47fc-9e8c-927dabcb2c9f +sym-nand2_8-pin-a,9b823a88-9626-4978-b7c5-29a1167d3d2c +sym-nand2_8-pin-b,c2cd7e2b-b281-4817-aa41-c77a8864432b +sym-nand2_8-pin-out,e3ce5311-3039-4e9c-9322-17e4b3226b19 +sym-nand2_8-polygon-contour,fd606a6a-8228-4a65-b80a-67d5151913b3 +sym-nand2_8-sym,be980977-9907-4a03-800e-b050e9576e83 +sym-nand2_8-text-name,a68bf33c-ee9e-4388-b2ec-61e4bf9133b0 +sym-nand2_8-text-value,7699f2d3-cb47-44d2-b902-5b52e0ae1328 +sym-nand2_dm_4-pin-a,eec34ae9-e62c-48ca-a31f-e342ecac668f +sym-nand2_dm_4-pin-b,b0e56074-ff8f-4720-b417-22a415e266bf +sym-nand2_dm_4-pin-out,ae2e8257-6cc2-4965-aeb1-ecd1844c47ba +sym-nand2_dm_4-polygon-contour,6285d5e6-fa80-485e-b79e-4218606d71f4 +sym-nand2_dm_4-sym,152d9f9d-3bfd-484e-bab3-3e7cc9d57707 +sym-nand2_dm_4-text-name,7054a34d-8cf0-426e-a393-6a9fc5826a44 +sym-nand2_dm_4-text-value,3bb5c45b-4e15-4fee-ba17-9875a7f76c2f sym-nand2_dm_8-pin-a,98f71f8c-267b-404e-b330-c95ed76410d7 sym-nand2_dm_8-pin-b,1cdfb4dc-05ef-482f-a932-a4546abdf164 sym-nand2_dm_8-pin-out,bf4ab288-c8a7-4ed5-ba3e-b67c568d4c4c @@ -89,14 +123,14 @@ sym-nand2_dm_8-polygon-contour,6b45cebb-736e-4166-b51d-91f809ce9fc9 sym-nand2_dm_8-sym,89f0fd74-1964-4c78-b68c-6717b6864f34 sym-nand2_dm_8-text-name,e06e70b8-0da9-468c-b423-dfa058c94958 sym-nand2_dm_8-text-value,bbb91e2d-3035-4c96-87c9-f353e9446de8 -sym-nand3_4-pin-a,d0eb4c67-8d6d-4bab-906f-47d9204fba4d -sym-nand3_4-pin-b,6f0f0edb-f105-4139-ac9d-d331fdfc3d28 -sym-nand3_4-pin-c,759534f7-41d6-4048-a665-a746be098820 -sym-nand3_4-pin-out,d3fbbdba-6bca-4619-9bb3-40d3c042bc61 -sym-nand3_4-polygon-contour,0cd1c4d8-46e8-4e9d-b30f-1eb1687112e7 -sym-nand3_4-sym,dd006f54-c31d-44f5-82b0-47001a85bd8e -sym-nand3_4-text-name,143b4f49-d8d3-4775-b47f-8fa5a35574c7 -sym-nand3_4-text-value,9f30c727-c89c-4fd0-99ce-a4873fd0c2a0 +sym-nand3_4-pin-a,06f663d5-3d96-4aa6-9951-84e4ba6d1164 +sym-nand3_4-pin-b,cfa5a5dc-d41e-427a-bcd3-e57d90ff8687 +sym-nand3_4-pin-c,881d6e35-4a01-4f9b-b5f0-a58551dce61e +sym-nand3_4-pin-out,2f86dece-ae73-43d0-b3fe-7c799c02ff55 +sym-nand3_4-polygon-contour,f410c182-ad05-47da-9eec-24ac6d9f84d7 +sym-nand3_4-sym,28a55165-1447-45b3-a5a8-f3071db2d4ec +sym-nand3_4-text-name,d70ff16b-1826-4306-9953-4d53a8c2913f +sym-nand3_4-text-value,392db30b-248e-44fa-a2f4-84e026202081 sym-nand3_8-pin-a,a7fe9eac-8d22-448c-b710-d5df62e9ad49 sym-nand3_8-pin-b,98e47102-1c2b-4f0b-aa17-33a1d243e59e sym-nand3_8-pin-c,6fab44ec-f742-43e3-9e63-b30d19aa62d9 @@ -105,27 +139,49 @@ sym-nand3_8-polygon-contour,0ce120d4-a092-44c6-b7b2-e3c2b9d216c1 sym-nand3_8-sym,8e831381-b3e0-4b51-bc2b-fd1a27c8861b sym-nand3_8-text-name,bd62c812-80d7-4e4e-ada9-d44bfdea297d sym-nand3_8-text-value,cb00d927-b927-4e2f-88ac-4c4e9f8f1361 -sym-nor2_4-pin-a,c3f92a54-f9c9-4b32-a7df-adcb0f5dc334 -sym-nor2_4-pin-b,05d4b781-dd70-4a02-837b-6f41cb891e9c -sym-nor2_4-pin-out,8803f39a-e4b9-4605-83c9-3d262c703a67 -sym-nor2_4-polygon-contour,4c1a2562-b127-4879-94d9-80b1b430311a -sym-nor2_4-sym,b15667ef-5883-474f-a6b9-c467702159f7 -sym-nor2_4-text-name,5ab8f769-e60b-4bd9-99be-ea43846de962 -sym-nor2_4-text-value,3c228c55-482e-4010-9edd-063fcbfe5091 -sym-nor2_8-pin-a,e29da491-bdaa-41fa-8198-f2c763784daf -sym-nor2_8-pin-b,5a553e97-1591-4cc7-b35a-2c902b06db75 -sym-nor2_8-pin-out,c2649ec1-630d-4467-a5c8-0bb3704a8e97 -sym-nor2_8-polygon-contour,f6fa7d2e-269f-4163-90b6-ff02f77c02af -sym-nor2_8-sym,43f46563-060f-41a2-b667-7651e8af820b -sym-nor2_8-text-name,5271d0a5-95e2-4b36-a8cf-0c37527a2cf2 -sym-nor2_8-text-value,b9cbd5a0-3fb2-403d-9592-e7d5e79eb429 -sym-nor2_dm_4-pin-a,175111bb-47c4-43c5-a1fe-774aa7c533a6 -sym-nor2_dm_4-pin-b,cd75a4f4-69f2-4861-a971-bf9c689eb9a2 -sym-nor2_dm_4-pin-out,c14fbabb-4c63-4850-885d-55e77821ce76 -sym-nor2_dm_4-polygon-contour,a6001d63-9e07-4b6a-a42f-403362fd4e35 -sym-nor2_dm_4-sym,3d39b897-a882-4494-bbb9-e31c1dd88e90 -sym-nor2_dm_4-text-name,a2834d16-da9d-45ff-be68-f9576dfd6a0b -sym-nor2_dm_4-text-value,2f3ca9af-5679-4a5b-829a-9dfcb33ef89c +sym-nand4_4-pin-a,56c16b0a-cb32-4bfc-b616-06cb57f681b9 +sym-nand4_4-pin-b,e91835d5-69d4-4bc8-ad5f-958e036fda41 +sym-nand4_4-pin-c,ba9178bc-755a-4aae-8f29-87329c6fb54a +sym-nand4_4-pin-d,2a7b6b44-fee7-4986-9c40-66fad489c853 +sym-nand4_4-pin-out,84bbfbb9-e09f-4e34-8289-398904ec2667 +sym-nand4_4-polygon-contour,e60dde76-6c08-4994-9264-84095a889b2e +sym-nand4_4-sym,08c3f893-d142-4d8a-ab39-2478cfe67e92 +sym-nand4_4-text-name,61dc2eb7-d561-4cfc-9693-ccfe8bb45458 +sym-nand4_4-text-value,24a10c7c-c155-49ab-9948-ec7cd1e89eec +sym-nand8_4-pin-a,6b979c5e-e972-4a3e-8959-7f4ead57ff90 +sym-nand8_4-pin-b,8181b9f0-81d4-4e48-89f1-964df4880df6 +sym-nand8_4-pin-c,999331fe-cb68-4b31-b6e5-1375920b66ab +sym-nand8_4-pin-d,a96acdf7-2e5c-43c3-abd2-0e7269629563 +sym-nand8_4-pin-e,b92a84f9-3f51-453c-8f78-fae54d23857c +sym-nand8_4-pin-f,5fd50677-1b7c-4803-8d06-d6ff1751bec8 +sym-nand8_4-pin-g,8201125c-6d34-49d2-8705-1d677d061ab1 +sym-nand8_4-pin-h,7c208d8b-b894-47a2-ae11-681d1a74f1f3 +sym-nand8_4-pin-out,36ffb0c7-18be-4ecb-bf87-3a6b653ae741 +sym-nand8_4-polygon-contour,3dca6b07-dacb-4aa7-a82a-5bb8796b42da +sym-nand8_4-sym,f49baafe-3fdb-42c8-9481-577183e5c2ab +sym-nand8_4-text-name,0fbc711f-b4f5-48e4-b767-37d93dd32ebc +sym-nand8_4-text-value,09d2fc92-afaf-44cb-968b-eb3c8a739a14 +sym-nor2_4-pin-a,e109a99f-ce9f-420e-a709-fdb2ba61237c +sym-nor2_4-pin-b,490454ab-f15e-493e-8643-bed4550eba50 +sym-nor2_4-pin-out,c301e5eb-5da4-4c88-9882-54f8a83ffe2d +sym-nor2_4-polygon-contour,9a38485c-4c6b-4fde-91ee-31e1237c85a0 +sym-nor2_4-sym,473abaeb-575b-4c0e-a3d9-fbb3f7447832 +sym-nor2_4-text-name,e4be109a-915b-45cf-984e-a64931a5aae0 +sym-nor2_4-text-value,8bf78a6d-8430-488c-a66e-728e1dbcca3b +sym-nor2_8-pin-a,0268be05-4136-4786-bfc9-dd0154711e74 +sym-nor2_8-pin-b,93cfec98-c535-4f37-bdb8-49fb64dabae0 +sym-nor2_8-pin-out,a3e964ae-40e4-400c-8cc3-200b5deb9a0d +sym-nor2_8-polygon-contour,7556f645-597b-4df6-a43c-99bcd3ed5b03 +sym-nor2_8-sym,ac8a8bbe-8b59-4f51-b36d-4927ae7025a2 +sym-nor2_8-text-name,253e394c-524e-4b3d-aad1-70a51087260b +sym-nor2_8-text-value,c03fd3fe-7bbf-4be8-9c17-3de0858cdd94 +sym-nor2_dm_4-pin-a,64ad7a3d-4e73-4b64-986b-f5ea2fc50a10 +sym-nor2_dm_4-pin-b,7dd5253d-e8e2-4004-affa-fa1a218201e0 +sym-nor2_dm_4-pin-out,626b2d49-f909-4ca7-a724-7c5a1e2ba041 +sym-nor2_dm_4-polygon-contour,50037951-2028-4f13-8514-6886229860f2 +sym-nor2_dm_4-sym,4d3cebd7-cb78-4de3-b8c8-13debd98b505 +sym-nor2_dm_4-text-name,e79ae0f0-7951-4248-b60b-2d7b9e1c4a09 +sym-nor2_dm_4-text-value,5ac66a60-b0bc-49f1-9197-bcacc3c448e1 sym-nor2_dm_8-pin-a,e65c2484-f75f-46f4-87ba-ef5be0fe33b0 sym-nor2_dm_8-pin-b,b7678ba7-4c5e-40fd-9b11-8c49a5fe7221 sym-nor2_dm_8-pin-out,26c646ee-a222-49b0-b04c-8a58bccaf5b6 @@ -133,14 +189,14 @@ sym-nor2_dm_8-polygon-contour,588a49e2-2756-49fb-9a14-46728dc5e26c sym-nor2_dm_8-sym,ff55295b-5b80-4eb8-b5ef-76ac359acddc sym-nor2_dm_8-text-name,3b3ca633-29b0-4071-9744-077c37505f03 sym-nor2_dm_8-text-value,4e06443d-369b-4bb2-84a3-a754184f02d1 -sym-nor3_4-pin-a,cf02fec4-17c0-447f-a848-6f9f16f78418 -sym-nor3_4-pin-b,ef8a8fa4-8849-4f82-ae16-f300df5fdd7b -sym-nor3_4-pin-c,323c2ac0-379d-4cc0-b9b5-f3b47bd97cfa -sym-nor3_4-pin-out,f8cf0f8d-5b0c-4dc6-9bd2-55026f50d67e -sym-nor3_4-polygon-contour,c0f254cb-0347-4f6d-8ed5-b319ce813bf9 -sym-nor3_4-sym,fb544ead-bfa0-4bd0-b876-58cdc4c971af -sym-nor3_4-text-name,fb151569-b8ef-4776-8ee7-32dca5e255e4 -sym-nor3_4-text-value,d4740a3a-128d-4a5d-9b78-15e8487b9245 +sym-nor3_4-pin-a,056a6e21-8ea5-4c35-88d4-041c46093b93 +sym-nor3_4-pin-b,96a4801e-ddbc-43f9-b03d-69dee1e17e5f +sym-nor3_4-pin-c,1fec1a57-ad31-40d0-bee8-ebd4ffb7a17f +sym-nor3_4-pin-out,470ceee7-f087-4bdc-a76e-68aca2c852bf +sym-nor3_4-polygon-contour,5a71268e-81c7-4eb2-9b31-1db1193b28bf +sym-nor3_4-sym,ef2fbe95-83f8-4b88-8fb0-f136ccb4fef8 +sym-nor3_4-text-name,cfc9e02e-0e46-4cf3-8e79-47aaa760de29 +sym-nor3_4-text-value,d4bc55ae-ce67-4f5f-932c-a0e881cfea90 sym-nor3_8-pin-a,e178fdaa-2b8f-480d-901e-4c1247629d9c sym-nor3_8-pin-b,4dec14f6-d65a-43bc-baa7-04febf32c3b1 sym-nor3_8-pin-c,5313d57e-6a8a-4265-96f5-53009680845d @@ -149,27 +205,45 @@ sym-nor3_8-polygon-contour,ae2b3d89-cacb-419c-bf53-82116f4fa34c sym-nor3_8-sym,0baeb161-2ebb-4100-898d-613f27371a6e sym-nor3_8-text-name,b6adcd80-2e9e-413c-9e7c-129062686fdf sym-nor3_8-text-value,7d8605f1-e588-4c60-bfaf-67fe4e320dab -sym-or2_4-pin-a,4eb1ab6c-6a8a-49d0-baa7-bcc9ba90d593 -sym-or2_4-pin-b,a9130261-6090-43d2-941c-5b55fdc48d93 -sym-or2_4-pin-out,9a2ebb93-81ba-453a-a45d-344758eadd53 -sym-or2_4-polygon-contour,23dd60d9-981f-4e4d-834c-d8238fac71ba -sym-or2_4-sym,1a493221-27db-4124-8c4c-0aa0e8f37584 -sym-or2_4-text-name,03db9547-c82e-477c-a679-9e6296c6d51e -sym-or2_4-text-value,4a45f20d-48ee-4d79-98b2-9a0001b77b5c -sym-or2_8-pin-a,4773dfd0-1490-461b-8448-bba53cbe1185 -sym-or2_8-pin-b,b37f2fe1-fb07-4899-a1d9-1c1d7f549ad0 -sym-or2_8-pin-out,b23aa1e3-a7df-4c33-a042-51162588900f -sym-or2_8-polygon-contour,923ef5c4-213a-4f0f-bb07-ff143efd4124 -sym-or2_8-sym,675f5d37-b184-46bf-a744-d23ec8e1098e -sym-or2_8-text-name,484d3ccb-488f-45f7-99c8-09526145c7fe -sym-or2_8-text-value,f180cb1b-8206-4446-af28-2788eef606aa -sym-or2_dm_4-pin-a,617832f7-890a-4679-8eb0-b72374efdc50 -sym-or2_dm_4-pin-b,a0b2f9d5-b7ea-455a-9a9c-f743c13221ef -sym-or2_dm_4-pin-out,00eb5100-999f-4100-932f-4ed7eae810e2 -sym-or2_dm_4-polygon-contour,d47bbbab-1189-463c-b7ba-5809df7cac4d -sym-or2_dm_4-sym,6e80543e-9da6-4c83-b3d5-be521ec92f9c -sym-or2_dm_4-text-name,5446fe8f-1602-4ab0-b6fd-575445b34c21 -sym-or2_dm_4-text-value,2d10e202-020c-4397-aad5-8cd52a66c5e0 +sym-nor4_4-pin-a,c0f1ca1e-e962-475e-a987-cd90fe6876b2 +sym-nor4_4-pin-b,ff60d6ca-52f5-4511-a8ad-2d498255ec9d +sym-nor4_4-pin-c,5107397e-2577-4fef-9199-42aa4d77f121 +sym-nor4_4-pin-d,227276fd-aa58-4a05-a316-29b533e9a1d7 +sym-nor4_4-pin-out,9eda3dae-36e1-4f36-a7a7-448d0db3b0be +sym-nor4_4-polygon-contour,32839875-96df-4225-b75f-fe6d2f852e33 +sym-nor4_4-sym,d6072c19-e8de-4cf1-9e9d-3c4a3a5710b2 +sym-nor4_4-text-name,b1ad8419-be28-44f6-ab07-dd19e4643665 +sym-nor4_4-text-value,efa231ff-5cc2-4bc0-b22e-15c3157f9313 +sym-nor4_8-pin-a,e97e41d9-3585-4e98-ab60-20b48a536a80 +sym-nor4_8-pin-b,eea07d6d-ee45-4dc1-ba65-e6688f13e29f +sym-nor4_8-pin-c,c14a1385-9805-4ecf-9f0d-014f5097cf2d +sym-nor4_8-pin-d,2f99d206-7805-49ce-bbd0-96a291c0f1da +sym-nor4_8-pin-out,7032318f-30a0-4447-86f4-0252083222c4 +sym-nor4_8-polygon-contour,6e7dc742-9fa8-404b-9b7a-4023b4d44c0c +sym-nor4_8-sym,0e465a71-de9f-41bd-8211-30e44dae03b1 +sym-nor4_8-text-name,a743e9fd-fdaf-46ea-a0c9-c7f772531a10 +sym-nor4_8-text-value,ac407d7a-7ec5-4327-a80a-24a030ee6b1a +sym-or2_4-pin-a,586e16bc-e77c-4830-a913-eb1d2ff095f9 +sym-or2_4-pin-b,6d09e9d8-2e7e-4ccf-8183-9ce1bf082de7 +sym-or2_4-pin-out,cf24f002-2ca2-4584-8cff-576295468e9b +sym-or2_4-polygon-contour,60f8536a-f80d-4adb-aa5d-9897f804469f +sym-or2_4-sym,1a47e0b2-ebed-499e-9d41-ca98891957d2 +sym-or2_4-text-name,75ee292d-6b51-46e8-813e-626381910c56 +sym-or2_4-text-value,3dbf3efd-5319-48a9-8157-75ec0de573c5 +sym-or2_8-pin-a,6df6d259-398b-4f95-a68a-4cb7f64d1bf8 +sym-or2_8-pin-b,45d3397c-19d6-40d6-840f-8fc7fbfa34b2 +sym-or2_8-pin-out,fd321fec-468a-4645-ac2d-16714b44f2aa +sym-or2_8-polygon-contour,c7aa106b-cbf5-4993-b1df-e2ddce41b570 +sym-or2_8-sym,d294cf01-9c5f-4273-9095-674f37f0f6cb +sym-or2_8-text-name,941c8d03-15e7-4a34-9bde-0f367947a522 +sym-or2_8-text-value,9c51c7f9-9aee-4b43-b624-e168c963dbea +sym-or2_dm_4-pin-a,b28cf13b-4f30-430d-b185-2ad0caf49215 +sym-or2_dm_4-pin-b,67db14bb-28bf-4aa0-8548-f1a199a0d979 +sym-or2_dm_4-pin-out,1c432d13-30bd-4809-acf9-3c183d8f2bf9 +sym-or2_dm_4-polygon-contour,96d3e365-063c-4ff5-9564-a87c8d76e4b7 +sym-or2_dm_4-sym,34678761-2da2-40f0-b5f2-85c665bd3b05 +sym-or2_dm_4-text-name,a588e715-e535-492c-b993-45edab3bf6d5 +sym-or2_dm_4-text-value,5e9a2e5c-d319-404f-b654-b80d0b26a182 sym-or2_dm_8-pin-a,de4a5093-1f51-4843-b970-6cede57936af sym-or2_dm_8-pin-b,6eadfe40-842d-402a-a395-c332865730d1 sym-or2_dm_8-pin-out,070fe6be-ef57-4326-862c-e26ba4e5f54b @@ -177,14 +251,14 @@ sym-or2_dm_8-polygon-contour,a6307bb0-ecca-4c17-bf45-5a8679e78ac7 sym-or2_dm_8-sym,851db818-df67-4046-9219-c9b910665655 sym-or2_dm_8-text-name,77fb0b7b-e0aa-47fe-9cbd-edd43ef9fe89 sym-or2_dm_8-text-value,20593adc-ff85-474d-a9e5-1ee112a301c5 -sym-or3_4-pin-a,2f7ec72a-a135-4746-9c89-961189defa32 -sym-or3_4-pin-b,80c7a59b-3574-4ffe-b5eb-311f40406be0 -sym-or3_4-pin-c,65a2bb92-4a99-4fb3-aab7-d653831a8d47 -sym-or3_4-pin-out,4022f295-fcf8-49fa-b6f3-1c30f255b9ad -sym-or3_4-polygon-contour,4b03e82f-2a66-4273-bfde-983e635c0244 -sym-or3_4-sym,7700ce42-997e-4db6-92cc-14e758244867 -sym-or3_4-text-name,c93c4e4d-248d-48b5-bde3-630a444c75f7 -sym-or3_4-text-value,0d4e1196-d172-44a8-96fc-5e3869729b7e +sym-or3_4-pin-a,a98e718f-b758-4b52-9c8a-43f2fec546dd +sym-or3_4-pin-b,2e382d83-0091-4a4c-bbd3-9327d85e0d41 +sym-or3_4-pin-c,4fb9627b-000e-4898-bcc9-b2fc9394a986 +sym-or3_4-pin-out,ece5fa56-7d48-4832-8f6a-94951e4377bf +sym-or3_4-polygon-contour,7a62e951-ee13-4f83-9abf-30cf2b0c8f6f +sym-or3_4-sym,687cc1b5-d1da-4eb9-af0b-55c620bbf72b +sym-or3_4-text-name,ea863938-ed78-4ed0-8ecf-3ca7310145f4 +sym-or3_4-text-value,51342626-30f2-4bea-bbe0-9706c89cf2c6 sym-or3_8-pin-a,08ad2a5f-7a39-47a9-83b6-8b5c6bec6870 sym-or3_8-pin-b,e6085e57-6680-4b5c-a413-cf13f8e2be64 sym-or3_8-pin-c,db829c66-6c54-4a98-ac51-dee370b504e0 @@ -193,13 +267,31 @@ sym-or3_8-polygon-contour,f898d388-db02-4551-8dd1-5f5f4753c759 sym-or3_8-sym,4a6abc91-983f-49a3-9457-f3cd33cbfce7 sym-or3_8-text-name,d62696c1-09bb-4b78-be88-08d790dc8868 sym-or3_8-text-value,45228c6e-0d03-42c1-822d-240965356811 -sym-xnor_4-pin-a,f22fa393-1d2f-4bf7-b9d6-03c40e266dd2 -sym-xnor_4-pin-b,7a4a4f42-4b3b-49a9-aeb1-90063ddcbccc -sym-xnor_4-pin-out,5f9867bc-da43-45ed-b1d2-d08cca03562e -sym-xnor_4-polygon-contour,1c638ffb-e0ce-4b00-8da4-e153d7c903e6 -sym-xnor_4-sym,dc4b515b-ad62-4753-a31f-0bb2211ecd58 -sym-xnor_4-text-name,b2fcd69b-1405-4157-b1b3-2f44940cf3fd -sym-xnor_4-text-value,6aa4c037-b011-43f8-bf27-18b0fbbd09ed +sym-or4_4-pin-a,faec5693-132d-427e-ac2d-e436e951c550 +sym-or4_4-pin-b,fff3ac4b-00fa-494b-a292-ba2e3bfd303d +sym-or4_4-pin-c,91e681b5-5147-45e1-90ae-4ad0d1b35d1c +sym-or4_4-pin-d,01d0f1ef-3e96-4d59-90b7-ce21733f3007 +sym-or4_4-pin-out,fd0d10c7-3071-405c-8950-9c2db258c13b +sym-or4_4-polygon-contour,858ad3be-cc66-49f9-8502-87c5cfec0c70 +sym-or4_4-sym,77d99d52-007c-4491-b58a-27f57591cf96 +sym-or4_4-text-name,f2c5beb1-ee89-4336-b0d1-5420824d8c8f +sym-or4_4-text-value,44c4ca0e-79ec-4f24-833b-44fe9ec80ab0 +sym-or4_8-pin-a,806dcd90-69a5-4123-ae47-135a1161f7a9 +sym-or4_8-pin-b,6e8dbf03-eb25-40a0-b5de-4df1ae9e79d2 +sym-or4_8-pin-c,6616ccac-e3e1-44eb-8ffb-ed8222ce5f3a +sym-or4_8-pin-d,97d851fd-3deb-4bd8-a99e-c87f8e235405 +sym-or4_8-pin-out,3919aae7-ab79-4fe4-9715-18222a814ebe +sym-or4_8-polygon-contour,5aa45723-bab0-415c-8e19-7bb50522e6eb +sym-or4_8-sym,32408ee3-fd3f-4052-bc96-d34e204225e8 +sym-or4_8-text-name,2c03533a-abfe-4473-be2e-67130a9d3f54 +sym-or4_8-text-value,2b8beede-01c8-43e5-bf05-81c3d85e5975 +sym-xnor_4-pin-a,8694c480-f02a-497a-9bfb-5a82b42df48c +sym-xnor_4-pin-b,d7a4432f-7e38-4055-947b-4d3eafe70140 +sym-xnor_4-pin-out,25e87fc2-d6ba-462b-a80c-c3eac14c7085 +sym-xnor_4-polygon-contour,a5baa390-763f-4bf1-bb5d-9743c785dbb3 +sym-xnor_4-sym,3ea62b44-4085-4af5-95b0-7691f2ea0119 +sym-xnor_4-text-name,157f4dfa-56cf-4b0a-83b2-d2d73e15d491 +sym-xnor_4-text-value,2812d88b-a8fe-4c6d-aa11-c6340db7bf61 sym-xnor_8-pin-a,68e96016-a7b2-46c0-985f-e1a666132e59 sym-xnor_8-pin-b,8bd974a4-081a-4ec5-ac2a-d26aaaf2b13e sym-xnor_8-pin-out,cc7be725-bc76-4928-a373-864ca23e8828 @@ -207,17 +299,17 @@ sym-xnor_8-polygon-contour,a3fe1ab2-6b5b-4e61-a680-5a9e587fca80 sym-xnor_8-sym,60985adf-d640-470b-b786-b17b0e26137e sym-xnor_8-text-name,9e5d2a41-aa10-4988-bba8-6d7c1bc85883 sym-xnor_8-text-value,d1fb5e3c-206b-41f3-ade0-a1e8d94a8899 -sym-xor_4-pin-a,5b0a0953-df86-4415-9424-235b2c5967c5 -sym-xor_4-pin-b,65dd29b4-408e-4ae3-905d-72842453e3b1 -sym-xor_4-pin-out,a78e7aa6-f8e3-4343-94dd-67692f44dd5a -sym-xor_4-polygon-contour,024d7f92-990d-4416-8afd-5c2f95d05c36 -sym-xor_4-sym,c8f3539f-7c42-48cd-89d8-93e4c96748df -sym-xor_4-text-name,3c75a325-2158-4d4d-b2a1-96c23e670341 -sym-xor_4-text-value,2d81b591-bb40-485a-b25a-55e25009a0ff -sym-xor_8-pin-a,373dcdaf-88c4-4eb7-b424-bc67789d4975 -sym-xor_8-pin-b,59e653ad-20c4-4903-a7d0-ff2b08a37bcc -sym-xor_8-pin-out,f505e166-66a3-4116-80a9-793e10ecb94f -sym-xor_8-polygon-contour,baef2a84-37ff-448a-9719-e5915ca2db0d -sym-xor_8-sym,1a76db63-ffb5-4914-aecd-ec0607637d73 -sym-xor_8-text-name,7ef1b485-b119-4af6-b848-b57ef5e90da9 -sym-xor_8-text-value,c49a8109-aea0-4661-8d03-c9f0d6c02f34 +sym-xor_4-pin-a,f463d291-5e21-4f8b-bc1d-620ac23a7f9a +sym-xor_4-pin-b,97b646f5-e3ff-4a91-9373-2d9e44975132 +sym-xor_4-pin-out,6e169527-6528-4b1b-8fde-a1ff9288d046 +sym-xor_4-polygon-contour,f786b3de-3564-4a4f-9e02-f466a60881a3 +sym-xor_4-sym,6419d6f0-b0f5-4fa5-83d1-410204f35bb5 +sym-xor_4-text-name,95a94dcd-2435-4475-b58f-6d2d16c5d29e +sym-xor_4-text-value,fbdaa5f3-75e8-4435-9d64-2c44c6a09ccc +sym-xor_8-pin-a,429021a8-e961-4829-8e4f-7a740cb22506 +sym-xor_8-pin-b,74345e97-991d-432c-b623-d2d35b365529 +sym-xor_8-pin-out,a69eea54-e0e4-4bd9-8241-3a112a9b5280 +sym-xor_8-polygon-contour,dd1bce53-3c84-43a5-b3bd-c601af180d64 +sym-xor_8-sym,9bef141f-de89-444a-8ffa-a5cb05d5dde6 +sym-xor_8-text-name,c6721533-3eb5-4647-9753-65895cf4c4f1 +sym-xor_8-text-value,eff15caa-b308-49a4-9145-5de5fdedc9cb diff --git a/Logic/uuid_cache_gates_cmpcat.csv b/Logic/uuid_cache_gates_cmpcat.csv index f822bd7e..2b77719f 100644 --- a/Logic/uuid_cache_gates_cmpcat.csv +++ b/Logic/uuid_cache_gates_cmpcat.csv @@ -1,30 +1,40 @@ cmpcat-and2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and2_6-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 -cmpcat-and2_8-cmpcat,d5520d06-02ea-4fda-8464-a6e826df861b +cmpcat-and2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 -cmpcat-and2_dm_8-cmpcat,f2454fd2-590a-48d7-a3f1-b3367c2fc662 +cmpcat-and2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 -cmpcat-and3_8-cmpcat,c27abb9b-defc-4c32-804a-eb8b1e1a8e7f +cmpcat-and3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and8_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-inv_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-inv_6-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-inv_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-inv_i_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand8_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor4_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or4_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xnor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xnor_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 diff --git a/Logic/uuid_cache_multiplexor.csv b/Logic/uuid_cache_multiplexor.csv index 16c5f23f..b9c87be8 100644 --- a/Logic/uuid_cache_multiplexor.csv +++ b/Logic/uuid_cache_multiplexor.csv @@ -1,19 +1,19 @@ -sym-mux2_4-pin-a,6900868e-a880-4eb4-a5bc-14564cb5c7a3 -sym-mux2_4-pin-b,477777e1-a84f-4d71-877b-424d75b02ef8 -sym-mux2_4-pin-out,4d7fa97c-9c85-4769-aa44-8d4a044d625f -sym-mux2_4-pin-sel,9579d332-ed26-4957-944f-ed45a6b92613 -sym-mux2_4-polygon-contour,8d06b56b-b467-4ba3-b0c8-951cebb54394 -sym-mux2_4-sym,d79b314a-3895-4c67-8526-7a4241bc0a00 -sym-mux2_4-text-name,12219f60-2243-47ee-8ec2-cc4b8cf26677 -sym-mux2_4-text-value,13d8b681-3676-46e1-b45c-a99a47fbf9bd -sym-mux4_4-pin-a,1927c88c-08d1-4440-b4e7-535da5282f37 -sym-mux4_4-pin-b,70fb91ef-cc6e-468d-bc2f-3d11d1b77d41 -sym-mux4_4-pin-c,5408946f-9607-4199-846f-89bf212171ea -sym-mux4_4-pin-d,d4f30fb3-2e23-4358-a798-23ca9d4c236c -sym-mux4_4-pin-out,e2a62587-98d0-4fb3-bfdc-53df85241e31 -sym-mux4_4-pin-sel0,fcaaab0a-7a87-4c70-92f1-8d057e67f747 -sym-mux4_4-pin-sel1,1105af0d-5424-4bd5-8070-0f6521190edc -sym-mux4_4-polygon-contour,755dc772-57ed-4f9f-ab07-4818c0d7e52e -sym-mux4_4-sym,90b6616f-4296-45a4-97c3-789b3b573033 -sym-mux4_4-text-name,5482510b-a9e7-499a-94d2-d9a04b07d359 -sym-mux4_4-text-value,ba79ebef-87de-45e7-b88a-2035c6dcc86c +sym-mux2_4-pin-a,ab467da0-2f3e-4012-8f87-26080584a701 +sym-mux2_4-pin-b,aba9c265-d0c2-462d-a7a1-9841ad2b242c +sym-mux2_4-pin-out,5bccc6ce-6e50-4e75-8c46-56bfe8942e84 +sym-mux2_4-pin-sel,f591841c-6b57-4354-ae1f-66660d60c738 +sym-mux2_4-polygon-contour,82765dfb-3939-40c7-aad3-f27cb6f7502d +sym-mux2_4-sym,257bf433-93e9-4a14-bd13-a986f0058059 +sym-mux2_4-text-name,54a5843a-90c5-4c75-9239-75cf13d33716 +sym-mux2_4-text-value, 62aac8ac-6b9e-413c-a931-c0c2e196a133 +sym-mux4_4-pin-a,4f898853-dd46-43d4-816a-ea74c12e9ed8 +sym-mux4_4-pin-b,f9e53ade-b520-4356-85e8-c371014a1875 +sym-mux4_4-pin-c,56480dc6-2724-4079-8a1e-7c50bbf7ad36 +sym-mux4_4-pin-d,319fe8ee-8e39-42e0-a281-75f68ff3b472 +sym-mux4_4-pin-out,c2fc4725-77e7-49d7-9dbf-ae0aea8b74f4 +sym-mux4_4-pin-sel0,805f4653-65ea-429e-ba60-138081a3b554 +sym-mux4_4-pin-sel1,5b6d5cd5-2085-471f-9cfc-ae2db6b738dd +sym-mux4_4-polygon-contour,9273e7da-a8ff-4a05-af98-3349a220cff2 +sym-mux4_4-sym,cf841298-6626-4623-b819-3a0ac4587c32 +sym-mux4_4-text-name,b3f67723-2b1d-41e8-9b8b-fb7600323fbd +sym-mux4_4-text-value,7cd23916-6050-48a4-ba30-e47f81245131 From cc00ab82129a8958c7399c8f0af6cabb9de5eff7 Mon Sep 17 00:00:00 2001 From: ouabache Date: Wed, 25 Mar 2020 10:02:37 -0700 Subject: [PATCH 11/23] added more parts Now fully generates LibrePCB_Logic.lplib repo --- Logic/Logic/AND3_dm_4.csv | 38 +++++++ Logic/Logic/AND4_8.csv | 42 +++++++ Logic/Logic/AND4_dm_4.csv | 44 ++++++++ Logic/Logic/AND6_4.csv | 52 +++++++++ Logic/Logic/BARREL_SHIFTER4_4.csv | 21 ++++ Logic/Logic/FULL_ADDER_4.csv | 16 +++ Logic/Logic/HALF_ADDER_4.csv | 15 +++ Logic/Logic/NAND2_6.csv | 29 +++++ Logic/Logic/NAND3_dm_4.csv | 37 +++++++ Logic/Logic/NAND4_8.csv | 43 ++++++++ Logic/Logic/NAND4_dm_4.csv | 43 ++++++++ Logic/Logic/NAND6_4.csv | 53 +++++++++ Logic/Logic/NOR2_6.csv | 30 +++++ Logic/Logic/NOR3_dm_4.csv | 36 ++++++ Logic/Logic/NOR4_dm_4.csv | 42 +++++++ Logic/Logic/NOR6_4.csv | 58 ++++++++++ Logic/Logic/NOR8_4.csv | 68 ++++++++++++ Logic/Logic/OR2_6.csv | 29 +++++ Logic/Logic/OR3_dm_4.csv | 37 +++++++ Logic/Logic/OR4_dm_4.csv | 43 ++++++++ Logic/Logic/OR6_4.csv | 57 ++++++++++ Logic/Logic/OR8_4.csv | 67 +++++++++++ Logic/script | 22 ++++ Logic/uuid_cache_Logic.csv | 31 ++++++ Logic/uuid_cache_Logic_cmpcat.csv | 3 + Logic/uuid_cache_gates.csv | 177 ++++++++++++++++++++++++++++++ Logic/uuid_cache_gates_cmpcat.csv | 19 ++++ 27 files changed, 1152 insertions(+) create mode 100644 Logic/Logic/AND3_dm_4.csv create mode 100644 Logic/Logic/AND4_8.csv create mode 100644 Logic/Logic/AND4_dm_4.csv create mode 100644 Logic/Logic/AND6_4.csv create mode 100644 Logic/Logic/BARREL_SHIFTER4_4.csv create mode 100644 Logic/Logic/FULL_ADDER_4.csv create mode 100644 Logic/Logic/HALF_ADDER_4.csv create mode 100644 Logic/Logic/NAND2_6.csv create mode 100644 Logic/Logic/NAND3_dm_4.csv create mode 100644 Logic/Logic/NAND4_8.csv create mode 100644 Logic/Logic/NAND4_dm_4.csv create mode 100644 Logic/Logic/NAND6_4.csv create mode 100644 Logic/Logic/NOR2_6.csv create mode 100644 Logic/Logic/NOR3_dm_4.csv create mode 100644 Logic/Logic/NOR4_dm_4.csv create mode 100644 Logic/Logic/NOR6_4.csv create mode 100644 Logic/Logic/NOR8_4.csv create mode 100644 Logic/Logic/OR2_6.csv create mode 100644 Logic/Logic/OR3_dm_4.csv create mode 100644 Logic/Logic/OR4_dm_4.csv create mode 100644 Logic/Logic/OR6_4.csv create mode 100644 Logic/Logic/OR8_4.csv create mode 100644 Logic/uuid_cache_Logic.csv create mode 100644 Logic/uuid_cache_Logic_cmpcat.csv diff --git a/Logic/Logic/AND3_dm_4.csv b/Logic/Logic/AND3_dm_4.csv new file mode 100644 index 00000000..381d1299 --- /dev/null +++ b/Logic/Logic/AND3_dm_4.csv @@ -0,0 +1,38 @@ +SCALE,1.000 +DEF,AND3_dm_4 +KEYWORDS,gates +KEYWORDS,and +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.4252,2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-4.0709,0,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.4252,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +CIRC,.100,-3.9252,2.00,1.00 +CIRC,.100,-3.5709,0.00,1.00 +CIRC,.100,-3.9252,-2.00,1.00 +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,0,0 +PIN,C,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND4_8.csv b/Logic/Logic/AND4_8.csv new file mode 100644 index 00000000..bdc648e7 --- /dev/null +++ b/Logic/Logic/AND4_8.csv @@ -0,0 +1,42 @@ +SCALE,2.000 +DEF,AND4_8 +KEYWORDS,gates +KEYWORDS,and +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,7.0,0 +POLYPT,-4.00,-7.0,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,6.00,0 +POLYPT,-4.00,6.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-6.00,0 +POLYPT,-4.00,-6.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +PIN,A,L,-3.00,3.00,0 +PIN,B,L,-3.00,1,0 +PIN,C,L,-3.00,-1.00,0 +PIN,D,L,-3.00,-3.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND4_dm_4.csv b/Logic/Logic/AND4_dm_4.csv new file mode 100644 index 00000000..469e2b5a --- /dev/null +++ b/Logic/Logic/AND4_dm_4.csv @@ -0,0 +1,44 @@ +SCALE,1.000 +DEF,AND4_dm_4 +KEYWORDS,gates +KEYWORDS,and +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-4.8583,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1,0 +POLYPT,-4.1496,1,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-4.1496,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-4.8583,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,-4.3883,3.00,1.00 +CIRC,.100,-3.6796,1.00,1.00 +CIRC,.100,-3.6796,-1.00,1.00 +CIRC,.100,-4.3883,-3.00,1.00 +CIRC,.100,4.5,0.00,1.00 +PIN,A,L,-6.00,3.00,0 +PIN,B,L,-6.00,1,0 +PIN,C,L,-6.00,-1.00,0 +PIN,D,L,-6.00,-3.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND6_4.csv b/Logic/Logic/AND6_4.csv new file mode 100644 index 00000000..5459af33 --- /dev/null +++ b/Logic/Logic/AND6_4.csv @@ -0,0 +1,52 @@ +SCALE,1.000 +DEF,AND6_4 +KEYWORDS,gates +KEYWORDS,and +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,6.00,0 +POLYPT,-4.00,-6.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,5.00,0 +POLYPT,-4.00,5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-4.00,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-4.00,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-4.00,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-4.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-5.00,0 +POLYPT,-4.00,-5.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +PIN,A,L,-6.00,5.00,0 +PIN,B,L,-6.00,3,0 +PIN,C,L,-6.00,1.00,0 +PIN,D,L,-6.00,-1.00,0 +PIN,E,L,-6.00,-3.00,0 +PIN,F,L,-6.00,-5.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/BARREL_SHIFTER4_4.csv b/Logic/Logic/BARREL_SHIFTER4_4.csv new file mode 100644 index 00000000..98fa7ecb --- /dev/null +++ b/Logic/Logic/BARREL_SHIFTER4_4.csv @@ -0,0 +1,21 @@ +SCALE,1.000 +DEF,BARREL_SHIFTER4_4 +POLY,.100,F +POLYPT,-4.00,8.00,0 +POLYPT,4.00,8.00,0 +POLYPT,4.00,-8.00,0 +POLYPT,-4.00,-8.00,0 +POLYPT,-4.00,8.00,0 +POLYST +PIN,S1,R,-6.00,6.00,2.00 +PIN,S0,R,-6.00,4.00,2.0 +PIN,IN_3,R,-6.00,0.00,2.00 +PIN,IN_2,R,-6.00,-2.00,2.0 +PIN,IN_1,R,-6.00,-4.00,2.00 +PIN,IN_0,R,-6.00,-6.00,2.00 +PIN,OUT_3,L,6.00,0.00,2.00 +PIN,OUT_2,L,6.00,-2.00,2.00 +PIN,OUT_1,L,6.00,-4.00,2.00 +PIN,OUT_0,L,6.00,-6.00,2.00 +TEXT,-5.00,8.00,NAME +TEXT,-5.00,-8.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/FULL_ADDER_4.csv b/Logic/Logic/FULL_ADDER_4.csv new file mode 100644 index 00000000..09698f80 --- /dev/null +++ b/Logic/Logic/FULL_ADDER_4.csv @@ -0,0 +1,16 @@ +SCALE,1.000 +DEF,FULL_ADDER_4 +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,A,R,-6.00,2.00,2.00 +PIN,B,R,-6.00,0.00,2.00 +PIN,CARRY_IN,R,-6.00,-2.00,2.00 +PIN,SUM,L,6.00,2.00,2.00 +PIN,CARRY_OUT,L,6.00,-2.00,2.00 +TEXT,-5.00,4.00,NAME +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/HALF_ADDER_4.csv b/Logic/Logic/HALF_ADDER_4.csv new file mode 100644 index 00000000..7a897cc4 --- /dev/null +++ b/Logic/Logic/HALF_ADDER_4.csv @@ -0,0 +1,15 @@ +SCALE,1.000 +DEF,HALF_ADDER_4 +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,A,R,-6.00,2.00,2.00 +PIN,B,R,-6.00,-2.00,2.00 +PIN,SUM,L,6.00,2.00,2.00 +PIN,CARRY,L,6.00,-2.00,2.00 +TEXT,-5.00,4.00,NAME +TEXT,-5.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_6.csv b/Logic/Logic/NAND2_6.csv new file mode 100644 index 00000000..ede6fca1 --- /dev/null +++ b/Logic/Logic/NAND2_6.csv @@ -0,0 +1,29 @@ +SCALE,1.333 +DEF,NAND2_6 +KEYWORDS,gates +KEYWORDS,nand +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.6654,1.3327,0 +POLYPT,-4.00,1.3327,0 +POLYST +POLY,.0622,N +POLYPT,-6.6654,-1.3327,0 +POLYPT,-4.00,-1.3327,0 +POLYST +POLY,.0622,N +POLYPT,6.6654,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0.00,1.00 +PIN,A,L,-5.000,1.00,0 +PIN,B,L,-5.000,-1.00,0 +PIN,OUT,R,5.000,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND3_dm_4.csv b/Logic/Logic/NAND3_dm_4.csv new file mode 100644 index 00000000..7bb45a2b --- /dev/null +++ b/Logic/Logic/NAND3_dm_4.csv @@ -0,0 +1,37 @@ +SCALE,1.000 +DEF,NAND3_dm_4 +KEYWORDS,gates +KEYWORDS,nand +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.4252,2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-4.0709,0,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.4252,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +CIRC,.100,-3.9252,2.00,1.00 +CIRC,.100,-3.5709,0.00,1.00 +CIRC,.100,-3.9252,-2.00,1.00 +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,0,0 +PIN,C,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND4_8.csv b/Logic/Logic/NAND4_8.csv new file mode 100644 index 00000000..5ee6a52e --- /dev/null +++ b/Logic/Logic/NAND4_8.csv @@ -0,0 +1,43 @@ +SCALE,2.000 +DEF,NAND4_8 +KEYWORDS,gates +KEYWORDS,nand +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,7.00,0 +POLYPT,-4.00,-7.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,6.00,0 +POLYPT,-4.00,6.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.00,2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.00,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-6.00,0 +POLYPT,-4.00,-6.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,L,-3.00,3.00,0 +PIN,B,L,-3.00,1,0 +PIN,C,L,-3.00,-1.00,0 +PIN,D,L,-3.00,-3.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND4_dm_4.csv b/Logic/Logic/NAND4_dm_4.csv new file mode 100644 index 00000000..cfb559bc --- /dev/null +++ b/Logic/Logic/NAND4_dm_4.csv @@ -0,0 +1,43 @@ +SCALE,1.000 +DEF,NAND4_dm_4 +KEYWORDS,gates +KEYWORDS,nand +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-4.8583,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1,0 +POLYPT,-4.1496,1,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-4.1496,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-4.8583,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +CIRC,.100,-4.3883,3.00,1.00 +CIRC,.100,-3.6796,1.00,1.00 +CIRC,.100,-3.6796,-1.00,1.00 +CIRC,.100,-4.3883,-3.00,1.00 +PIN,A,L,-6.00,3.00,0 +PIN,B,L,-6.00,1,0 +PIN,C,L,-6.00,-1.00,0 +PIN,D,L,-6.00,-3.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND6_4.csv b/Logic/Logic/NAND6_4.csv new file mode 100644 index 00000000..af81d598 --- /dev/null +++ b/Logic/Logic/NAND6_4.csv @@ -0,0 +1,53 @@ +SCALE,1.000 +DEF,NAND6_4 +KEYWORDS,gates +KEYWORDS,nand +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,6.00,0 +POLYPT,-4.00,-6.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,5.00,0 +POLYPT,-4.00,5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-4.00,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-4.00,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-4.00,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-4.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-5.00,0 +POLYPT,-4.00,-5.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,L,-6.00,5.00,0 +PIN,B,L,-6.00,3,0 +PIN,C,L,-6.00,1.00,0 +PIN,D,L,-6.00,-1.00,0 +PIN,E,L,-6.00,-3.00,0 +PIN,F,L,-6.00,-5.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_6.csv b/Logic/Logic/NOR2_6.csv new file mode 100644 index 00000000..0af04d5a --- /dev/null +++ b/Logic/Logic/NOR2_6.csv @@ -0,0 +1,30 @@ +SCALE,1.333 +DEF,NOR2_6 +KEYWORDS,gates +KEYWORDS,nor +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.666,1.333,0 +POLYPT,-3.2,1.333,0 +POLYST +POLY,.0622,N +POLYPT,-6.666,-1.333,0 +POLYPT,-3.2,-1.333,0 +POLYST +POLY,.0622,N +POLYPT,6.666,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,L,-5.00,1.00,0 +PIN,B,L,-5.00,-1.00,0 +PIN,OUT,R,5.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR3_dm_4.csv b/Logic/Logic/NOR3_dm_4.csv new file mode 100644 index 00000000..2c596ad6 --- /dev/null +++ b/Logic/Logic/NOR3_dm_4.csv @@ -0,0 +1,36 @@ +SCALE,1.000 +DEF,NOR3_dm_4 +KEYWORDS,gates +KEYWORDS,nor +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-5.00,2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-5.00,0,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-5.00,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +CIRC,.100,-4.50,2.00,1.00 +CIRC,.100,-4.50,0.00,1.00 +CIRC,.100,-4.50,-2.00,1.00 +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,0,0 +PIN,C,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR4_dm_4.csv b/Logic/Logic/NOR4_dm_4.csv new file mode 100644 index 00000000..8ba2c74c --- /dev/null +++ b/Logic/Logic/NOR4_dm_4.csv @@ -0,0 +1,42 @@ +SCALE,1.000 +DEF,NOR4_dm_4 +KEYWORDS,gates +KEYWORDS,nor +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-5.00,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-5.00,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-5.00,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-5.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +CIRC,.100,-4.50,3.00,1.00 +CIRC,.100,-4.50,1.00,1.00 +CIRC,.100,-4.50,-1.00,1.00 +CIRC,.100,-4.50,-3.00,1.00 +PIN,A,L,-6.00,3.00,0 +PIN,B,L,-6.00,1,0 +PIN,C,L,-6.00,-1.00,0 +PIN,D,L,-6.00,-3.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR6_4.csv b/Logic/Logic/NOR6_4.csv new file mode 100644 index 00000000..f9f649bc --- /dev/null +++ b/Logic/Logic/NOR6_4.csv @@ -0,0 +1,58 @@ +SCALE,1.000 +DEF,NOR6_4 +KEYWORDS,gates +KEYWORDS,nor +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,3.25,0 +POLYPT,-4.00,5.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,-5.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,5.00,0 +POLYPT,-4.00,5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3,0 +POLYPT,-3.8583,3,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-3.1496,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-3.1496,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-3.8583,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-5.00,0 +POLYPT,-4.00,-5.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,L,-6.00,5.00,0 +PIN,B,L,-6.00,3,0 +PIN,C,L,-6.00,1.00,0 +PIN,D,L,-6.00,-1.00,0 +PIN,E,L,-6.00,-3.00,0 +PIN,F,L,-6.00,-5.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR8_4.csv b/Logic/Logic/NOR8_4.csv new file mode 100644 index 00000000..22707cdf --- /dev/null +++ b/Logic/Logic/NOR8_4.csv @@ -0,0 +1,68 @@ +SCALE,1.000 +DEF,NOR8_4 +KEYWORDS,gates +KEYWORDS,nor +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,3.25,0 +POLYPT,-4.00,7.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,-7.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,7.00,0 +POLYPT,-4.00,7.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,5.00,0 +POLYPT,-4.00,5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3,0 +POLYPT,-3.8583,3,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-3.1496,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-3.1496,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-3.8583,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-5.00,0 +POLYPT,-4.00,-5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-7.00,0 +POLYPT,-4.00,-7.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +PIN,A,L,-6.00,7.00,0 +PIN,B,L,-6.00,5,0 +PIN,C,L,-6.00,3.00,0 +PIN,D,L,-6.00,1.00,0 +PIN,E,L,-6.00,-1.00,0 +PIN,F,L,-6.00,-3.00,0 +PIN,G,L,-6.00,-5.00,0 +PIN,H,L,-6.00,-7.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_6.csv b/Logic/Logic/OR2_6.csv new file mode 100644 index 00000000..ab998694 --- /dev/null +++ b/Logic/Logic/OR2_6.csv @@ -0,0 +1,29 @@ +SCALE,1.333 +DEF,OR2_6 +KEYWORDS,gates +KEYWORDS,or +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.666,1.333,0 +POLYPT,-3.2,1.333,0 +POLYST +POLY,.0622,N +POLYPT,-6.666,-1.333,0 +POLYPT,-3.2,-1.333,0 +POLYST +POLY,.0622,N +POLYPT,6.666,0,0 +POLYPT,4.00,0,0 +POLYST +PIN,A,L,-5.00,1.00,0 +PIN,B,L,-5.00,-1.00,0 +PIN,OUT,R,5.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR3_dm_4.csv b/Logic/Logic/OR3_dm_4.csv new file mode 100644 index 00000000..6d935857 --- /dev/null +++ b/Logic/Logic/OR3_dm_4.csv @@ -0,0 +1,37 @@ +SCALE,1.000 +DEF,OR3_dm_4 +KEYWORDS,gates +KEYWORDS,or +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-5.00,2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-5.00,0,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-5.00,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0.00,1.00 +CIRC,.100,-4.50,2.00,1.00 +CIRC,.100,-4.50,0.00,1.00 +CIRC,.100,-4.50,-2.00,1.00 +PIN,A,L,-6.00,2.00,0 +PIN,B,L,-6.00,0,0 +PIN,C,L,-6.00,-2.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR4_dm_4.csv b/Logic/Logic/OR4_dm_4.csv new file mode 100644 index 00000000..02e2a95d --- /dev/null +++ b/Logic/Logic/OR4_dm_4.csv @@ -0,0 +1,43 @@ +SCALE,1.000 +DEF,OR4_dm_4 +KEYWORDS,gates +KEYWORDS,or +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,.750,3.25,-180 +POLYPT,.750,-3.25,0 +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3.00,0 +POLYPT,-5.00,3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-5.00,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-5.00,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-5.00,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +CIRC,.100,-4.50,3.00,1.00 +CIRC,.100,-4.50,1.00,1.00 +CIRC,.100,-4.50,-1.00,1.00 +CIRC,.100,-4.50,-3.00,1.00 +PIN,A,L,-6.00,3.00,0 +PIN,B,L,-6.00,1,0 +PIN,C,L,-6.00,-1.00,0 +PIN,D,L,-6.00,-3.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR6_4.csv b/Logic/Logic/OR6_4.csv new file mode 100644 index 00000000..96b4252d --- /dev/null +++ b/Logic/Logic/OR6_4.csv @@ -0,0 +1,57 @@ +SCALE,1.000 +DEF,OR6_4 +KEYWORDS,gates +KEYWORDS,or +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,3.25,0 +POLYPT,-4.00,5.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,-5.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,5.00,0 +POLYPT,-4.00,5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3,0 +POLYPT,-3.8583,3,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-3.1496,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-3.1496,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-3.8583,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-5.00,0 +POLYPT,-4.00,-5.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +PIN,A,L,-6.00,5.00,0 +PIN,B,L,-6.00,3,0 +PIN,C,L,-6.00,1.00,0 +PIN,D,L,-6.00,-1.00,0 +PIN,E,L,-6.00,-3.00,0 +PIN,F,L,-6.00,-5.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR8_4.csv b/Logic/Logic/OR8_4.csv new file mode 100644 index 00000000..4a873860 --- /dev/null +++ b/Logic/Logic/OR8_4.csv @@ -0,0 +1,67 @@ +SCALE,1.000 +DEF,OR8_4 +KEYWORDS,gates +KEYWORDS,or +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,3.25,0 +POLYPT,-4.00,7.25,0 +POLYST +POLY,.100,N +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,-7.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,7.00,0 +POLYPT,-4.00,7.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,5.00,0 +POLYPT,-4.00,5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,3,0 +POLYPT,-3.8583,3,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,1.00,0 +POLYPT,-3.1496,1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-1.00,0 +POLYPT,-3.1496,-1.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-3.00,0 +POLYPT,-3.8583,-3.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-5.00,0 +POLYPT,-4.00,-5.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-7.00,0 +POLYPT,-4.00,-7.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +PIN,A,L,-6.00,7.00,0 +PIN,B,L,-6.00,5,0 +PIN,C,L,-6.00,3.00,0 +PIN,D,L,-6.00,1.00,0 +PIN,E,L,-6.00,-1.00,0 +PIN,F,L,-6.00,-3.00,0 +PIN,G,L,-6.00,-5.00,0 +PIN,H,L,-6.00,-7.00,0 +PIN,OUT,R,6.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/script b/Logic/script index f6f1b28d..79dde8e8 100755 --- a/Logic/script +++ b/Logic/script @@ -1,10 +1,16 @@ rm -r out python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_6 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND6_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND8_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_6 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_4 @@ -12,13 +18,21 @@ python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND6_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND8_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_6 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR8_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_4 @@ -46,12 +60,20 @@ python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR6_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR8_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_8 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR6_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_8 python3.7 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ --design MUX2_4 python3.7 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ --design MUX4_4 +python3.7 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design HALF_ADDER_4 +python3.7 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design FULL_ADDER_4 +python3.7 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design BARREL_SHIFTER4_4 diff --git a/Logic/uuid_cache_Logic.csv b/Logic/uuid_cache_Logic.csv new file mode 100644 index 00000000..8413a2f3 --- /dev/null +++ b/Logic/uuid_cache_Logic.csv @@ -0,0 +1,31 @@ +sym-barrel_shifter4_4-pin-in_0,27ccef58-eff4-4062-918a-72105e7af3c5 +sym-barrel_shifter4_4-pin-in_1,58949f51-6f33-40dd-92bd-8f8835d07059 +sym-barrel_shifter4_4-pin-in_2,911c9eb7-c0ee-4fb2-ba18-6462400d8481 +sym-barrel_shifter4_4-pin-in_3,9583dd66-3c81-4805-9b45-3c2ef639e1e7 +sym-barrel_shifter4_4-pin-out_0,9b652180-f8f7-473d-8a50-7089bad91dd5 +sym-barrel_shifter4_4-pin-out_1,18bc3219-06f5-4577-96fd-f9288dcbee6d +sym-barrel_shifter4_4-pin-out_2,6db1d1e8-f83e-4692-bf7f-72b749148da9 +sym-barrel_shifter4_4-pin-out_3,f56253c9-55ae-4a2f-a474-67e789c9ef08 +sym-barrel_shifter4_4-pin-s0,1183dda9-d7c2-440a-9e04-162bba8bdd69 +sym-barrel_shifter4_4-pin-s1,7d7d4252-5cbd-443f-b249-80cba7b08cad +sym-barrel_shifter4_4-polygon-contour,6d7320b6-c147-4938-ad5d-31bae2a54fbd +sym-barrel_shifter4_4-sym,a0159914-0a38-49c3-8988-3078277a340c +sym-barrel_shifter4_4-text-name,508921d7-9b6c-4fa0-bf04-2457f793524c +sym-barrel_shifter4_4-text-value,3ae500a1-e893-44cc-9796-44d5e2116e50 +sym-full_adder_4-pin-a,fa996838-bd3f-4f4c-93ad-c6f13df5b5c9 +sym-full_adder_4-pin-b,14913b6e-2484-4be9-9581-5206cb640106 +sym-full_adder_4-pin-carry_in,7e412019-826b-4d4b-8789-010ebff94a67 +sym-full_adder_4-pin-carry_out,c2ff9d61-7e90-4bab-a0f7-2127e4d8ada8 +sym-full_adder_4-pin-sum,03551acf-d055-4168-806e-83661b931c4f +sym-full_adder_4-polygon-contour,90d1e29f-cac4-46be-953d-49a1dad6940f +sym-full_adder_4-sym,f1888812-c3b4-429c-89c7-91733dce245a +sym-full_adder_4-text-name,1cf37346-c7ad-48de-afbc-965dde03286f +sym-full_adder_4-text-value,4f890b28-25dc-4eb1-9f77-8cbd680019fc +sym-half_adder_4-pin-a,de31c323-ce6d-47c2-9f6b-c1b4ab1c88b9 +sym-half_adder_4-pin-b,afb6417e-2a51-42cf-a255-9aed8f436f95 +sym-half_adder_4-pin-carry,accefd04-3025-4200-9754-4cb837318a82 +sym-half_adder_4-pin-sum,bbf2b053-3d20-4a9e-acec-e48ddcdbea9a +sym-half_adder_4-polygon-contour,bc62cea7-d6ef-4f20-9591-74772e49fb34 +sym-half_adder_4-sym,687263b8-584c-4522-ba71-6d4ea759dcc4 +sym-half_adder_4-text-name,ed246923-d6fd-4e34-8bf7-0daf8ad06129 +sym-half_adder_4-text-value,91b9a13e-76a3-4861-8653-1c61727362c7 diff --git a/Logic/uuid_cache_Logic_cmpcat.csv b/Logic/uuid_cache_Logic_cmpcat.csv new file mode 100644 index 00000000..92c40e6d --- /dev/null +++ b/Logic/uuid_cache_Logic_cmpcat.csv @@ -0,0 +1,3 @@ +cmpcat-barrel_shifter4_4-cmpcat,9212a13b-d12d-4d13-b2c3-07a6c86e5e5c +cmpcat-full_adder_4-cmpcat,9212a13b-d12d-4d13-b2c3-07a6c86e5e5c +cmpcat-half_adder_4-cmpcat,9212a13b-d12d-4d13-b2c3-07a6c86e5e5c diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv index 2d2c56d6..93d266f8 100644 --- a/Logic/uuid_cache_gates.csv +++ b/Logic/uuid_cache_gates.csv @@ -49,6 +49,14 @@ sym-and3_8-polygon-contour,c4a89b3c-f249-4fcd-9d61-b91985cc2264 sym-and3_8-sym,a58b86ea-7795-4afe-9693-497759e2a14f sym-and3_8-text-name,c2ce762c-1e16-4fcb-989e-08f504e7ba70 sym-and3_8-text-value,52acad07-202e-4418-95c2-255e5cbfe0df +sym-and3_dm_4-pin-a,3c037b5c-c0a5-4480-9b16-84eecfe205de +sym-and3_dm_4-pin-b,50e58fcc-44d3-49f9-880e-c30056b249ce +sym-and3_dm_4-pin-c,e5b9d944-7265-4b1f-a6eb-f9cbc10d5ae7 +sym-and3_dm_4-pin-out,10969d00-1f31-41c3-948d-c24bb5efcc30 +sym-and3_dm_4-polygon-contour,92231b7a-895b-4109-908d-6c85a82565b5 +sym-and3_dm_4-sym,a1f50d3c-1567-4068-ae08-2dcfbfbb2e2f +sym-and3_dm_4-text-name,bed92559-1ebe-452d-ad4f-f1047549ac69 +sym-and3_dm_4-text-value,3f82d42a-633c-4680-890d-512051fd50e2 sym-and4_4-pin-a,afb17912-4871-484f-ad1a-182b533f4da7 sym-and4_4-pin-b,664b4cf5-7718-4f85-acf3-0912d1c2c5f7 sym-and4_4-pin-c,4ba20a04-7384-4190-ba32-d3a0274fdd04 @@ -58,6 +66,35 @@ sym-and4_4-polygon-contour,a36d2ec9-2fde-4855-bec9-f612712bf6dc sym-and4_4-sym,f5c271aa-810f-4fda-aae2-beba9b41ea29 sym-and4_4-text-name,4bd74ec7-8a59-4a10-9582-33309e2b1c46 sym-and4_4-text-value,873aad6d-faea-47f6-ad85-6ff794c36973 +sym-and4_8-pin-a,5c925066-07c8-45c5-9059-52fc3c989fa5 +sym-and4_8-pin-b,18eb4b09-8cf0-452a-bb68-5b4f98c317da +sym-and4_8-pin-c,2ceb81a1-335b-4512-bf95-7445234246d9 +sym-and4_8-pin-d,1dd2210f-1b15-4306-99b3-04bb8cc7199a +sym-and4_8-pin-out,1281fcca-b43f-48a9-87c3-7115b1cadfdf +sym-and4_8-polygon-contour,c704f211-e466-48f4-825e-38eb2a52834e +sym-and4_8-sym,cc016829-58ad-47a3-add3-4b90903de03b +sym-and4_8-text-name,ba8d6238-f543-429c-9cdb-98a4969ffe6c +sym-and4_8-text-value,9a7e1983-7326-4ff9-a29e-01639867ecf3 +sym-and4_dm_4-pin-a,962c38b3-8c80-404a-89dc-a08a42b99e05 +sym-and4_dm_4-pin-b,6fa8a4fc-c5cd-4d1b-b552-54cc3fc2e1e3 +sym-and4_dm_4-pin-c,cbf87a6c-1953-4276-bb9c-089a01c5dac9 +sym-and4_dm_4-pin-d,75e4228b-afeb-4ca6-9dfa-b3b88af19d5f +sym-and4_dm_4-pin-out,9750c616-6bd4-4cfa-8f14-de314bac8593 +sym-and4_dm_4-polygon-contour,0ad67861-06ff-4c64-b310-294cd85c0511 +sym-and4_dm_4-sym,cc9c541a-aa3e-43fb-bd59-9c71d9b1f869 +sym-and4_dm_4-text-name,8e0dfe9f-cb28-4f73-a14d-96795cecb4fc +sym-and4_dm_4-text-value,fae10883-7c74-4eb8-ae09-ab512f18dbaa +sym-and6_4-pin-a,46d52f8a-f317-425b-8607-a62ceee3f52b +sym-and6_4-pin-b,c55ea999-1a6a-4e39-8ea5-237c0bde7e9c +sym-and6_4-pin-c,b6547ca2-e50e-4255-bfaa-58a4dbb60e55 +sym-and6_4-pin-d,233fe0bc-4215-4cad-a59a-ec8876982dd8 +sym-and6_4-pin-e,bafac554-430f-44d1-bd72-bbb09c065f03 +sym-and6_4-pin-f,47a1c680-8e3e-44cf-9b50-bae059a66948 +sym-and6_4-pin-out,7f9d3fbc-7a25-4343-9142-6625ecf1c13d +sym-and6_4-polygon-contour,02d78719-2d53-4ef1-98c0-a659964db585 +sym-and6_4-sym,90b69ceb-a5c8-4612-839d-1769a9d2cc9b +sym-and6_4-text-name,301bf55f-0150-432d-9bd7-502b7824fc60 +sym-and6_4-text-value,a71f564b-50fc-47d4-9385-d11bdc8fb084 sym-and8_4-pin-a,c1aab202-7ef7-4472-bab7-3631e6b874fc sym-and8_4-pin-b,37b5906c-881a-4b90-85fd-a63aafba2930 sym-and8_4-pin-c,db37f8f5-6779-4fa7-addc-b98360424ece @@ -102,6 +139,13 @@ sym-nand2_4-polygon-contour,5a4ad0c9-ab9c-479f-a4ea-df756b49e120 sym-nand2_4-sym,33d9b808-8012-4d57-b6f6-51b360e38ef2 sym-nand2_4-text-name,218f116b-d6c6-4dca-8dff-b95679ef3067 sym-nand2_4-text-value,d719858a-cb76-47fc-9e8c-927dabcb2c9f +sym-nand2_6-pin-a,7eb9a289-1e64-419f-a04d-cf0ed6d4f715 +sym-nand2_6-pin-b,460e2848-ebac-40a2-9f4d-4f0fa2b76a87 +sym-nand2_6-pin-out,db2f92a7-0db8-46d0-937e-8abe8d5ef2d6 +sym-nand2_6-polygon-contour,4ba8d92b-8055-418e-8d32-73ce0e72ee2e +sym-nand2_6-sym,6798843c-7e11-40a6-bbe0-c80dd78eb507 +sym-nand2_6-text-name,6a82f2a3-5397-4c81-98e7-fa10960ae3bf +sym-nand2_6-text-value,3d24ce7b-5f87-49cb-85c7-50e0abc287e6 sym-nand2_8-pin-a,9b823a88-9626-4978-b7c5-29a1167d3d2c sym-nand2_8-pin-b,c2cd7e2b-b281-4817-aa41-c77a8864432b sym-nand2_8-pin-out,e3ce5311-3039-4e9c-9322-17e4b3226b19 @@ -139,6 +183,14 @@ sym-nand3_8-polygon-contour,0ce120d4-a092-44c6-b7b2-e3c2b9d216c1 sym-nand3_8-sym,8e831381-b3e0-4b51-bc2b-fd1a27c8861b sym-nand3_8-text-name,bd62c812-80d7-4e4e-ada9-d44bfdea297d sym-nand3_8-text-value,cb00d927-b927-4e2f-88ac-4c4e9f8f1361 +sym-nand3_dm_4-pin-a,5f1a4d42-bd2e-4189-a8b5-d47d6c6148a3 +sym-nand3_dm_4-pin-b,eaac20cd-e135-41a4-9085-96db4fcc9212 +sym-nand3_dm_4-pin-c,2ff60ea4-7afb-4549-bda7-6c19521e8ca5 +sym-nand3_dm_4-pin-out,71a0b42c-f952-4dfd-ad6b-f8706356b130 +sym-nand3_dm_4-polygon-contour,6238b46c-7bc8-40be-af9a-5e84a02772b5 +sym-nand3_dm_4-sym,613c175e-ad55-4544-bc53-76520f91162b +sym-nand3_dm_4-text-name,1e78aa79-2000-4c61-a014-b9860a70d950 +sym-nand3_dm_4-text-value,ee8a20ef-2f81-4f4d-88d6-6c9e5fb10db1 sym-nand4_4-pin-a,56c16b0a-cb32-4bfc-b616-06cb57f681b9 sym-nand4_4-pin-b,e91835d5-69d4-4bc8-ad5f-958e036fda41 sym-nand4_4-pin-c,ba9178bc-755a-4aae-8f29-87329c6fb54a @@ -148,6 +200,35 @@ sym-nand4_4-polygon-contour,e60dde76-6c08-4994-9264-84095a889b2e sym-nand4_4-sym,08c3f893-d142-4d8a-ab39-2478cfe67e92 sym-nand4_4-text-name,61dc2eb7-d561-4cfc-9693-ccfe8bb45458 sym-nand4_4-text-value,24a10c7c-c155-49ab-9948-ec7cd1e89eec +sym-nand4_8-pin-a,bac368d4-1ea8-4f14-971a-cdf0253a0161 +sym-nand4_8-pin-b,f4a2e898-a161-450a-bb82-132156fd13da +sym-nand4_8-pin-c,5ddd12dc-66fc-4aaa-bac2-c23a8807a88b +sym-nand4_8-pin-d,35855d22-7d43-4222-b32e-b8a5a59c9ff6 +sym-nand4_8-pin-out,3c866e1e-423d-4da6-b72f-b53808952160 +sym-nand4_8-polygon-contour,4c6e1517-b286-496e-879f-88eaeba21f8f +sym-nand4_8-sym,95bcc0ac-3ed3-4221-a009-e230803ed659 +sym-nand4_8-text-name,5e6739e5-8e29-4bbc-a610-7bd7e35e42c6 +sym-nand4_8-text-value,ba8d0ceb-6f30-4146-be4b-35b4d9090584 +sym-nand4_dm_4-pin-a,ea49ccc0-8b37-4ef0-95cd-630cdc611ad8 +sym-nand4_dm_4-pin-b,c51f7665-708b-4220-9ae5-1659864af8bd +sym-nand4_dm_4-pin-c,5b62e8d6-7455-4b7d-8f23-96c9ce46432e +sym-nand4_dm_4-pin-d,33fb056e-0220-4dd0-a997-77385b182167 +sym-nand4_dm_4-pin-out,3666ac6b-8c86-4424-8c38-621a3edbac34 +sym-nand4_dm_4-polygon-contour,8d550747-8671-4325-89ee-f521851ef48e +sym-nand4_dm_4-sym,5cbc9361-9d4d-4e85-9aa4-a563c8b2bfeb +sym-nand4_dm_4-text-name,6fb6f3a8-b468-455a-88db-14173ec83f54 +sym-nand4_dm_4-text-value,40dbb856-e8e2-4d5e-8b2a-ea4a49b3cd9f +sym-nand6_4-pin-a,798b2cd9-12e4-4736-9aa3-5faab776dc5a +sym-nand6_4-pin-b,981ed111-256c-4fc3-8d93-09cca2967cef +sym-nand6_4-pin-c,fd5582d8-3a50-46b6-ae01-c34224f33f00 +sym-nand6_4-pin-d,0b68c257-df6d-414f-9b04-7f645d44bbe9 +sym-nand6_4-pin-e,f507c76c-9771-49d2-ad0b-88a5ce8caa97 +sym-nand6_4-pin-f,b55d8b08-0391-4b68-9a9d-633b928e409b +sym-nand6_4-pin-out,374d6462-304a-4630-92f3-c6fbfcfa3a88 +sym-nand6_4-polygon-contour,da8fa4be-052d-4dca-861f-3bd774fce07e +sym-nand6_4-sym,c469e1ba-bc52-4934-8d2b-cd9a29cfbd86 +sym-nand6_4-text-name,0f371729-0e21-4c13-bad2-7ab16216b67f +sym-nand6_4-text-value,fe62ef58-3b1e-4aa6-9f63-5d0a7e6784f1 sym-nand8_4-pin-a,6b979c5e-e972-4a3e-8959-7f4ead57ff90 sym-nand8_4-pin-b,8181b9f0-81d4-4e48-89f1-964df4880df6 sym-nand8_4-pin-c,999331fe-cb68-4b31-b6e5-1375920b66ab @@ -168,6 +249,13 @@ sym-nor2_4-polygon-contour,9a38485c-4c6b-4fde-91ee-31e1237c85a0 sym-nor2_4-sym,473abaeb-575b-4c0e-a3d9-fbb3f7447832 sym-nor2_4-text-name,e4be109a-915b-45cf-984e-a64931a5aae0 sym-nor2_4-text-value,8bf78a6d-8430-488c-a66e-728e1dbcca3b +sym-nor2_6-pin-a,7fe902c5-3c5f-4a80-9b52-b0510108959c +sym-nor2_6-pin-b,00f6ec28-0459-45f0-9b94-224a587f497a +sym-nor2_6-pin-out,3518b705-c15c-499c-a97f-6f4f51ec4c7f +sym-nor2_6-polygon-contour,796b230a-cb82-4243-95f3-557bf10a47a4 +sym-nor2_6-sym,8068c149-5241-4fb3-a6c2-b1c66cc6514d +sym-nor2_6-text-name,c33b97de-719e-4a2d-b068-d2ff53013f37 +sym-nor2_6-text-value,0409677f-6ce5-42aa-8d7c-4ac50e6dca0f sym-nor2_8-pin-a,0268be05-4136-4786-bfc9-dd0154711e74 sym-nor2_8-pin-b,93cfec98-c535-4f37-bdb8-49fb64dabae0 sym-nor2_8-pin-out,a3e964ae-40e4-400c-8cc3-200b5deb9a0d @@ -205,6 +293,14 @@ sym-nor3_8-polygon-contour,ae2b3d89-cacb-419c-bf53-82116f4fa34c sym-nor3_8-sym,0baeb161-2ebb-4100-898d-613f27371a6e sym-nor3_8-text-name,b6adcd80-2e9e-413c-9e7c-129062686fdf sym-nor3_8-text-value,7d8605f1-e588-4c60-bfaf-67fe4e320dab +sym-nor3_dm_4-pin-a,4210154e-151b-49f4-8121-0b7caa8abc3e +sym-nor3_dm_4-pin-b,b0d43f15-1e4c-44bc-bf53-20f53e53b44b +sym-nor3_dm_4-pin-c,6611212a-e146-4a93-8143-4fb1b5edd09a +sym-nor3_dm_4-pin-out,7732783b-1eeb-4ccf-8bda-0c0607a24ada +sym-nor3_dm_4-polygon-contour,485f6870-7d4f-43e3-9384-ac14e0c21c0a +sym-nor3_dm_4-sym,b0e97ab7-5b35-4a59-9334-a2fdc9c98eee +sym-nor3_dm_4-text-name,52489579-e001-4f89-baa7-acb6506d3e7a +sym-nor3_dm_4-text-value,c6009cb4-dc62-4427-9164-1bae1ad9973c sym-nor4_4-pin-a,c0f1ca1e-e962-475e-a987-cd90fe6876b2 sym-nor4_4-pin-b,ff60d6ca-52f5-4511-a8ad-2d498255ec9d sym-nor4_4-pin-c,5107397e-2577-4fef-9199-42aa4d77f121 @@ -223,6 +319,39 @@ sym-nor4_8-polygon-contour,6e7dc742-9fa8-404b-9b7a-4023b4d44c0c sym-nor4_8-sym,0e465a71-de9f-41bd-8211-30e44dae03b1 sym-nor4_8-text-name,a743e9fd-fdaf-46ea-a0c9-c7f772531a10 sym-nor4_8-text-value,ac407d7a-7ec5-4327-a80a-24a030ee6b1a +sym-nor4_dm_4-pin-a,dd8e1c94-2f67-49b6-a8d5-9a9aea70bdcf +sym-nor4_dm_4-pin-b,2bbd8d9d-97cb-4584-b66a-7f3b5f5a544e +sym-nor4_dm_4-pin-c,9cfa7a4a-68fc-43f8-a5dd-e4ba7a6ccf9e +sym-nor4_dm_4-pin-d,d0f8d4c4-dfbc-43ba-9869-7bc4cebd63f4 +sym-nor4_dm_4-pin-out,f35ce24d-200b-492c-95ad-0f8e90f9d3f6 +sym-nor4_dm_4-polygon-contour,7b9e6e55-778d-41a9-adc8-e223dea3c9a9 +sym-nor4_dm_4-sym,689a03fb-5d1e-4723-89ac-35dfaf0c2db0 +sym-nor4_dm_4-text-name,51ef135c-f405-426e-963b-461364ef30bf +sym-nor4_dm_4-text-value,8c17f279-e8a0-49ab-ad2c-7e782c61b84c +sym-nor6_4-pin-a,5b51028a-2d91-4323-bf04-d8128e7671da +sym-nor6_4-pin-b,961d06e9-13b9-4466-9657-48268c812631 +sym-nor6_4-pin-c,2df53a0b-5421-4bee-a9fa-9df2ed118a05 +sym-nor6_4-pin-d,4aa0e582-9a07-4445-94ef-86f15cd038a9 +sym-nor6_4-pin-e,9964c617-c27c-461b-8586-a1dc9933ba69 +sym-nor6_4-pin-f,be3d01cb-9ed9-43fe-8d40-e9caa6e0c57b +sym-nor6_4-pin-out,9e8ec59c-97e8-466d-8eb5-ac5b0c9b9fc3 +sym-nor6_4-polygon-contour,ec5a4ec8-4618-4131-ae08-fe5303d7285b +sym-nor6_4-sym,a2de5a17-5c75-4bb6-87cd-4cad0d599d31 +sym-nor6_4-text-name,34e21392-209b-4dd7-be3e-16caa852103f +sym-nor6_4-text-value,99f15b54-4186-4409-99e6-f4b52a577611 +sym-nor8_4-pin-a,ac204dc5-09db-4ea0-aa2e-1d5581a6eada +sym-nor8_4-pin-b,74d5501a-dec5-411c-bf46-d321a0a644ce +sym-nor8_4-pin-c,0fa28dce-91ab-478d-9bda-74fb034e9aab +sym-nor8_4-pin-d,2eead853-7c40-4c82-94b7-b894d7cefc2c +sym-nor8_4-pin-e,88845528-0945-40e4-91c4-772ec11d7e17 +sym-nor8_4-pin-f,eb32593b-7343-4408-b426-0a6fda5d1065 +sym-nor8_4-pin-g,17b7b175-3ee4-44e5-93f1-29cf06fd4991 +sym-nor8_4-pin-h,4e115651-391e-4e34-a858-78dff157f861 +sym-nor8_4-pin-out,01b955c4-f07e-40f1-9eee-60835d84b8b0 +sym-nor8_4-polygon-contour,813ddcda-dec2-4d16-af89-c794f42e07d4 +sym-nor8_4-sym,f571c63d-690a-439f-be8a-541ca1eca01e +sym-nor8_4-text-name,5e225e41-b9a3-4c28-a24b-520e5eeb1532 +sym-nor8_4-text-value,02fa82bb-d907-4900-a6da-85f356876e82 sym-or2_4-pin-a,586e16bc-e77c-4830-a913-eb1d2ff095f9 sym-or2_4-pin-b,6d09e9d8-2e7e-4ccf-8183-9ce1bf082de7 sym-or2_4-pin-out,cf24f002-2ca2-4584-8cff-576295468e9b @@ -230,6 +359,13 @@ sym-or2_4-polygon-contour,60f8536a-f80d-4adb-aa5d-9897f804469f sym-or2_4-sym,1a47e0b2-ebed-499e-9d41-ca98891957d2 sym-or2_4-text-name,75ee292d-6b51-46e8-813e-626381910c56 sym-or2_4-text-value,3dbf3efd-5319-48a9-8157-75ec0de573c5 +sym-or2_6-pin-a,532aecc6-c0b4-4110-9e89-f4840c9acedd +sym-or2_6-pin-b,bd100263-0f1e-4070-a47e-c07ed2eb37f4 +sym-or2_6-pin-out,47611e34-4ab4-41ea-92ea-4d88a88959ec +sym-or2_6-polygon-contour,d4a84e23-44ac-4163-b171-a71e0d25ffa4 +sym-or2_6-sym,27b45855-2a81-4ca3-a56c-efb1d0afd561 +sym-or2_6-text-name,cf535e52-55b9-49dc-ae9c-7f312a69722d +sym-or2_6-text-value,15a834db-1f64-4f5a-ae6d-a6f990942eaf sym-or2_8-pin-a,6df6d259-398b-4f95-a68a-4cb7f64d1bf8 sym-or2_8-pin-b,45d3397c-19d6-40d6-840f-8fc7fbfa34b2 sym-or2_8-pin-out,fd321fec-468a-4645-ac2d-16714b44f2aa @@ -267,6 +403,14 @@ sym-or3_8-polygon-contour,f898d388-db02-4551-8dd1-5f5f4753c759 sym-or3_8-sym,4a6abc91-983f-49a3-9457-f3cd33cbfce7 sym-or3_8-text-name,d62696c1-09bb-4b78-be88-08d790dc8868 sym-or3_8-text-value,45228c6e-0d03-42c1-822d-240965356811 +sym-or3_dm_4-pin-a,4a3e6cce-2d31-46c4-a8e1-3d561be5febe +sym-or3_dm_4-pin-b,c2d582f0-ba42-4ec3-9817-7e132dda0a2b +sym-or3_dm_4-pin-c,60d31264-7ec4-463f-a141-f503547359bc +sym-or3_dm_4-pin-out,e8155f73-06c8-4280-a99b-e1862ced9cfb +sym-or3_dm_4-polygon-contour,1fabc38a-92ec-4043-b63f-009f1e4900ef +sym-or3_dm_4-sym,d2bf1861-8b96-43c8-9e1f-0b257d02cce9 +sym-or3_dm_4-text-name,490f11be-6311-44d6-a3b9-2bed3c1d3c30 +sym-or3_dm_4-text-value,3e284784-2818-46dd-8eb6-7483d63d2576 sym-or4_4-pin-a,faec5693-132d-427e-ac2d-e436e951c550 sym-or4_4-pin-b,fff3ac4b-00fa-494b-a292-ba2e3bfd303d sym-or4_4-pin-c,91e681b5-5147-45e1-90ae-4ad0d1b35d1c @@ -285,6 +429,39 @@ sym-or4_8-polygon-contour,5aa45723-bab0-415c-8e19-7bb50522e6eb sym-or4_8-sym,32408ee3-fd3f-4052-bc96-d34e204225e8 sym-or4_8-text-name,2c03533a-abfe-4473-be2e-67130a9d3f54 sym-or4_8-text-value,2b8beede-01c8-43e5-bf05-81c3d85e5975 +sym-or4_dm_4-pin-a,e7e9e3e4-95c2-438f-8135-802ab02333ef +sym-or4_dm_4-pin-b,1d87320b-0007-4338-b244-0ab3d1238b23 +sym-or4_dm_4-pin-c,f6ba4a28-25c1-4cf0-aa8b-c50b3c83777f +sym-or4_dm_4-pin-d,009fc5c9-d998-45b4-9a73-b32e5b358240 +sym-or4_dm_4-pin-out,b391dfa9-1cc8-4126-9632-881b5878294f +sym-or4_dm_4-polygon-contour,60229327-8e24-48d3-aeb6-6647b2dc8980 +sym-or4_dm_4-sym,71ac4017-9c2e-45b9-b319-370479f95cc0 +sym-or4_dm_4-text-name,dfae168b-6e29-4c09-9960-fc57d5688796 +sym-or4_dm_4-text-value,d7cdfda0-7202-4869-9b0d-d39d1bd8f65f +sym-or6_4-pin-a,ac817b54-a074-45a2-8e86-e6551e1eb1df +sym-or6_4-pin-b,7819e675-d87d-41f0-8402-9c05563030c5 +sym-or6_4-pin-c,cf6de305-fcba-4e27-8e58-e5263703cb05 +sym-or6_4-pin-d,3a032d80-1784-4a9f-a322-b506fd2c3dd9 +sym-or6_4-pin-e,d854e639-5e84-46ab-b694-673d409af816 +sym-or6_4-pin-f,b96a2f39-5fbb-4834-b7b3-312249a69bf9 +sym-or6_4-pin-out,8e93a51d-483a-4e20-ae49-631462f61755 +sym-or6_4-polygon-contour,99ea9975-a582-43e3-b71b-9865fefcce86 +sym-or6_4-sym,44bd2bd4-590d-4213-af20-d759026b96ab +sym-or6_4-text-name,daa9f0de-93e9-4023-b63b-95b17739e27c +sym-or6_4-text-value,c5621f80-9630-4791-ac8d-90bc69a7445c +sym-or8_4-pin-a,db3d055a-0ac5-4594-a411-f7472f41e399 +sym-or8_4-pin-b,3f13a10f-bb73-4e33-8db5-9a3207d767a3 +sym-or8_4-pin-c,006f5f00-5f08-44e5-b856-5e59787ffe1e +sym-or8_4-pin-d,a63520a8-170b-46c4-8a1c-15267041edb3 +sym-or8_4-pin-e,71055ead-1c52-434a-8005-af3fe85de831 +sym-or8_4-pin-f,f698cf0d-f55e-4525-95d9-a3548e16a8c5 +sym-or8_4-pin-g,aa0a725f-9421-42e9-bf1e-85c422e9a203 +sym-or8_4-pin-h,b7d141d0-d9bc-484e-aaa2-e7549c5325cc +sym-or8_4-pin-out,aa5b04b3-57f2-459c-a696-66b47b18074d +sym-or8_4-polygon-contour,25631fac-647b-4560-be64-d6f4784c17ce +sym-or8_4-sym,bcb5c452-057e-42d8-b6bf-b5e825867761 +sym-or8_4-text-name,ef1460c5-306d-4ccf-88b2-16b6d6b370ba +sym-or8_4-text-value,408543b0-67ed-483a-9541-281df8e2ce1b sym-xnor_4-pin-a,8694c480-f02a-497a-9bfb-5a82b42df48c sym-xnor_4-pin-b,d7a4432f-7e38-4055-947b-4d3eafe70140 sym-xnor_4-pin-out,25e87fc2-d6ba-462b-a80c-c3eac14c7085 diff --git a/Logic/uuid_cache_gates_cmpcat.csv b/Logic/uuid_cache_gates_cmpcat.csv index 2b77719f..656c2d37 100644 --- a/Logic/uuid_cache_gates_cmpcat.csv +++ b/Logic/uuid_cache_gates_cmpcat.csv @@ -5,36 +5,55 @@ cmpcat-and2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and3_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and4_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and4_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and6_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and8_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-inv_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-inv_6-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-inv_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-inv_i_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand2_6-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand3_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand4_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand4_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand6_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand8_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor2_6-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor3_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor4_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor4_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor6_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nor8_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or2_6-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or3_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-or4_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or4_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or6_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-or8_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xnor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xnor_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-xor_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 From 3255aaa82468666bf87e49a2bb96feb02bf9ec7f Mon Sep 17 00:00:00 2001 From: ouabache Date: Wed, 25 Mar 2020 10:12:51 -0700 Subject: [PATCH 12/23] fixed lint errors --- generate_logic_sym.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/generate_logic_sym.py b/generate_logic_sym.py index ebb88c72..f4ba749d 100644 --- a/generate_logic_sym.py +++ b/generate_logic_sym.py @@ -53,6 +53,7 @@ def uuid(category: str, kind: str, identifier: str) -> str: uuid_cache[key] = str(uuid4()) return uuid_cache[key] + unit = 2.54 width = 2.54 line_width = 0.25 @@ -170,9 +171,9 @@ def generate_sym( pad_name.append(row[1]) pad_type.append(row[2]) - pad_posx.append(float(row[3]) * unit ) - pad_posy.append(float(row[4]) * unit ) - pad_length.append(float(row[5]) * unit ) + pad_posx.append(float(row[3]) * unit) + pad_posy.append(float(row[4]) * unit) + pad_length.append(float(row[5]) * unit) uuid_pins.append(uuid('sym', def_name, 'pin-{}'.format(row[1]))) num_of_pins = num_of_pins + 1 From e3125060e842dc9a8983bbe592d80414a8470f77 Mon Sep 17 00:00:00 2001 From: ouabache Date: Wed, 25 Mar 2020 11:29:26 -0700 Subject: [PATCH 13/23] fixed lint errors --- generate_sym.py | 345 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 256 insertions(+), 89 deletions(-) diff --git a/generate_sym.py b/generate_sym.py index a1bc4fd9..70916775 100644 --- a/generate_sym.py +++ b/generate_sym.py @@ -5,7 +5,10 @@ import argparse from os import makedirs, path from uuid import uuid4 + from typing import Optional + + from common import init_cache, now, save_cache from entities.common import ( Align, Angle, Author, Category, Circle, Created, Description, Diameter, Fill, GrabArea, Height, Keywords, Layer, Length, @@ -14,15 +17,20 @@ from entities.symbol import Pin as SymbolPin from entities.symbol import Symbol + parser = argparse.ArgumentParser(description='create a symbol from csv file') parser.add_argument("--design") +parser.add_argument("--variant") parser.add_argument("--group") parser.add_argument("--directory") +parser.add_argument("--part") args = parser.parse_args() design_name = args.design +variant_name = args.variant group_name = args.group directory_name = args.directory +part_name = args.part # initializing boilerplate_raw_data = [] @@ -58,7 +66,6 @@ def uuid(category: str, kind: str, identifier: str) -> str: line_width = 0.25 pkg_text_height = 1.0 sym_text_height = 2.54 - boilerplate_cvs_file = 'Boilerplate_{}.csv'.format(group_name) with open(boilerplate_cvs_file, 'r') as CSVBfile: @@ -67,7 +74,6 @@ def uuid(category: str, kind: str, identifier: str) -> str: # extracting each data row one by one for brow in CSVbreader: boilerplate_raw_data.append(brow) - print(" Total no. of rows: %d" % (CSVbreader.line_num)) num_of_brows = CSVbreader.line_num @@ -86,13 +92,19 @@ def uuid(category: str, kind: str, identifier: str) -> str: for p in range(2, len(brow)): keywords = '{},{}'.format(keywords, brow[p]) + print(" Create Date : {}".format(create_date)) print(" Version : {}".format(version)) print(" Author : {}".format(author)) print(" Keywords : {}".format(keywords)) +part = float(part_name) + +if part >= 1: + cvs_file = '{}{}_{}.csv'.format(directory_name, design_name, part_name) +else: + cvs_file = '{}{}.csv'.format(directory_name, design_name) -cvs_file = '{}{}.csv'.format(directory_name, design_name) with open(cvs_file, 'r') as CSVxfile: # creating a csv reader object @@ -100,7 +112,6 @@ def uuid(category: str, kind: str, identifier: str) -> str: # extracting each data row one by one for row in CSVxreader: cvs_raw_data.append(row) - print(" Total no. of rows: %d" % (CSVxreader.line_num)) num_of_rows = CSVxreader.line_num @@ -108,7 +119,7 @@ def uuid(category: str, kind: str, identifier: str) -> str: # parsing each column of a row row_type = row[0] if row_type == "KEYWORDS": - keywords = '{},{}'.format(keywords, row[1]) + keywords = row[1] if row_type == "DEF": def_name = row[1] @@ -126,13 +137,23 @@ def generate_sym( cvs_file: str, dirpath: str, author: str, + part: str, + variant: str, keywords: str, version: str, cmpcat: str, create_date: Optional[str], ) -> None: category = 'sym' - scale = 1 + top_count = 12 + bottom_count = 12 + left_length = 0 + right_length = 0 + left_count = 6 + right_count = 6 + real_width = 6 + real_height = 6 + pad_list = [] pad_type = [] pad_name = [] pad_posx = [] @@ -145,35 +166,60 @@ def generate_sym( low_y = 0 high_x = 0 high_y = 0 + max_y = 0 + min_y = 0 for row in cvs_raw_data[:num_of_rows]: # parsing each column of a row row_type = row[0] + if row_type == "KEYWORDS": + keywords = row[1] if row_type == "DEF": def_name = row[1] if row_type == "PIN": - pin_type = row[2] if pin_type == "R": + left_count = left_count + 1 + left_length = max(round(len(row[1]) / 5), left_length) pad_orientation.append(0.0) + if pin_type == "L": + right_count = right_count + 1 + right_length = max(round(len(row[1]) / 5), right_length) pad_orientation.append(180.0) + if pin_type == "D": + top_count = top_count + 1 pad_orientation.append(270.0) if pin_type == "U": + bottom_count = bottom_count + 1 pad_orientation.append(90.0) pad_name.append(row[1]) pad_type.append(row[2]) - pad_posx.append(float(row[3]) / scale) - pad_posy.append(float(row[4]) / scale) - pad_length.append(float(row[5]) / scale) + pad_list.append(row[3]) + if variant != "default": + pad_posx.append(float(row[4]) / 19.685) + pad_posy.append(float(row[5]) / 19.685) + pad_length.append(float(row[6]) / 19.685) + + if variant == "default": + pad_posx.append(0) + pad_posy.append(0) + pad_length.append(width) + uuid_pins.append(uuid('sym', def_name, 'pin-{}_{}'.format(row[1], row[3]))) num_of_pins = num_of_pins + 1 - uuid_sym = uuid('sym', '{}'.format(def_name), 'sym') + if part >= 1: + uuid_sym = uuid('sym', '{}_{}_{}'.format(def_name, part_name, variant_name), 'sym') + else: + uuid_sym = uuid('sym', '{}_{}'.format(def_name, variant_name), 'sym') + + real_width = max(top_count, bottom_count) + left_length + right_length + real_height = max(left_count, right_count) def _uuid(identifier: str) -> str: return uuid(category, def_name, identifier) @@ -181,14 +227,53 @@ def _uuid(identifier: str) -> str: uuid_polygon = _uuid('polygon-contour') uuid_text_name = _uuid('text-name') uuid_text_value = _uuid('text-value') - sym_name = '{}'.format(def_name) + y_max = round(real_height / 2) * width + y_min = -round(real_height / 2) * width + w = round(real_width / 2 + .5) * width + x_min = -round(real_width / 2 + .5) * width + x_max = round(real_width / 2 + .5) * width + left_pin = y_max - width * 2 + right_pin = y_max - width * 2 + top_pin = w - width * 6 + bottom_pin = w - width * 4 + + for p in range(1, num_of_pins + 1, 1): + + if variant == "default": + + # parsing each column of a row + pin_type = pad_type[p - 1] + if pin_type == "R": + pad_posx[p - 1] = x_min - width + pad_posy[p - 1] = left_pin + left_pin = left_pin - width + + if pin_type == "L": + pad_posx[p - 1] = x_max + width + pad_posy[p - 1] = right_pin + right_pin = right_pin - width + + if pin_type == "D": + pad_posx[p - 1] = top_pin + pad_posy[p - 1] = y_max + width + top_pin = top_pin - width + + if pin_type == "U": + pad_posx[p - 1] = bottom_pin + pad_posy[p - 1] = y_min - width + bottom_pin = bottom_pin - width + + if part >= 1: + sym_name = '{}_{}'.format(def_name, part_name) + else: + sym_name = '{}'.format(def_name) # General info symbol = Symbol( uuid_sym, Name('{}'.format(sym_name)), - Description('created from file--- {}.\\n' - 'Generated with {}'.format(cvs_file, generator)), + Description('created from file--- {}.\\nVariant-{}\\n' + 'Generated with {}'.format(cvs_file, variant, generator)), Keywords('{}'.format( keywords)), Author(author), Version(version), @@ -202,6 +287,7 @@ def _uuid(identifier: str) -> str: pin_name = pad_name[p - 1] pin_posx = pad_posx[p - 1] pin_posy = pad_posy[p - 1] + pin_length = pad_length[p - 1] pin_orient = pad_orientation[p - 1] pin = SymbolPin( @@ -209,86 +295,165 @@ def _uuid(identifier: str) -> str: Name( pin_name), Position(pin_posx, pin_posy), Rotation(pin_orient), - Length(0.0) + Length(pin_length) ) symbol.add_pin(pin) # Polygons - for row in cvs_raw_data[:num_of_rows]: - # parsing each column of a row - row_type = row[0] - if row_type == "POLY": - fill = row[2] - fill_str = "False" - if fill == "F": - fill_str = "True" - print('POLY {} '.format( row[1])) - polygon = Polygon( - uuid_polygon, - Layer('sym_outlines'), - Width(line_width), - Fill(False), - GrabArea(fill_str) - ) - - if row_type == "POLYPT": - print('POLYPT {} {} {}'.format( row[1], row[2], row[3])) - poly_x = float(row[1]) / scale - poly_y = float(row[2]) / scale - poly_angle = float(row[3]) - polygon.add_vertex(Vertex(Position(poly_x, poly_y), Angle(poly_angle))) - - if row_type == "POLYST": - print('POLY Stop ') - symbol.add_polygon(polygon) - - if row_type == "RECT": - low_x = float(row[1]) / scale - low_y = float(row[2]) / scale - high_x = float(row[3]) / scale - high_y = float(row[4]) / scale - print('Rectangle ') - polygon = Polygon( - uuid_polygon, - Layer('sym_outlines'), - Width(line_width), - Fill(False), - GrabArea(True) - ) - polygon.add_vertex(Vertex(Position(low_x, low_y), Angle(0.0))) - polygon.add_vertex(Vertex(Position(low_x, high_y), Angle(0.0))) - polygon.add_vertex(Vertex(Position(high_x, high_y), Angle(0.0))) - polygon.add_vertex(Vertex(Position(high_x, low_y), Angle(0.0))) - polygon.add_vertex(Vertex(Position(low_x, low_y), Angle(0.0))) - symbol.add_polygon(polygon) - - if row_type == "CIRC": - pos_x = float(row[1]) / scale - pos_y = float(row[2]) / scale - dia = float(row[3]) / scale - - print('Circle ') - circle = Circle( - uuid_polygon, - Layer('sym_outlines'), - Width(line_width), - Fill(False), - GrabArea(True), - Diameter(dia), - Position(pos_x, pos_y) - ) - symbol.add_circle(circle) - - if row_type == "TEXT": - pos_x = float(row[1]) / scale - pos_y = float(row[2]) / scale - textfield = row[3] - if textfield == "NAME": - text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('center bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) - if textfield == "VALUE": - text = Text(uuid_text_value, Layer('sym_values'), Value('{{VALUE}}'), Align('center bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) - symbol.add_text(text) + if variant == "default": + + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(True) + ) + polygon.add_vertex(Vertex(Position(-w, y_max), Angle(0.0))) + polygon.add_vertex(Vertex(Position(w, y_max), Angle(0.0))) + polygon.add_vertex(Vertex(Position(w, y_min), Angle(0.0))) + polygon.add_vertex(Vertex(Position(-w, y_min), Angle(0.0))) + polygon.add_vertex(Vertex(Position(-w, y_max), Angle(0.0))) + symbol.add_polygon(polygon) + + # Text + + text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('center bottom'), Height(sym_text_height), Position(-w + 2 * width, y_max), Rotation(0.0)) + symbol.add_text(text) + + text = Text(uuid_text_value, Layer('sym_values'), Value('{{VALUE}}'), Align('center top'), Height(sym_text_height), Position(-w + 2 * width, y_min), Rotation(0.0)) + symbol.add_text(text) + + if variant != "default": + + for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + if row_type == "POLY": + fill = row[2] + fill_str = "False" + if fill == "F": + fill_str = "True" + print('POLY {} '.format( row[1])) + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(fill_str) + ) + + if row_type == "POLYPT": + print('POLYPT {} {}'.format( row[1], row[2])) + poly_x = float(row[1]) / 19.685 + poly_y = float(row[2]) / 19.685 + polygon.add_vertex(Vertex(Position(poly_x, poly_y), Angle(0.0))) + if poly_y > max_y: + max_y = poly_y + if poly_y < min_y: + min_y = poly_y + + if row_type == "POLYST": + print('POLY Stop ') + symbol.add_polygon(polygon) + + if row_type == "RECT": + low_x = float(row[1]) / 19.685 + low_y = float(row[2]) / 19.685 + high_x = float(row[3]) / 19.685 + high_y = float(row[4]) / 19.685 + if high_y > max_y: + max_y = high_y + if high_y < min_y: + min_y = high_y + + if low_y > max_y: + max_y = low_y + if low_y < min_y: + min_y = low_y + + print('Rectangle ') + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(True) + ) + polygon.add_vertex(Vertex(Position(low_x, low_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(low_x, high_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(high_x, high_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(high_x, low_y), Angle(0.0))) + polygon.add_vertex(Vertex(Position(low_x, low_y), Angle(0.0))) + symbol.add_polygon(polygon) + + if row_type == "CIRC": + pos_x = float(row[1]) / 19.685 + pos_y = float(row[2]) / 19.685 + dia = float(row[3]) / 19.685 + + if pos_y > max_y: + max_y = pos_y + if pos_y < min_y: + min_y = pos_y + + print('Circle ') + circle = Circle( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(True), + Diameter(dia), + Position(pos_x, pos_y) + ) + symbol.add_circle(circle) + + if row_type == "ARC": + pos_x = float(row[1]) / 19.685 + pos_y = float(row[2]) / 19.685 + dia = float(row[3]) / 19.685 * 2 + start_ang = float(row[4]) / 10 + end_ang = float(row[5]) / 10 + start_x = float(row[10]) / 19.685 + start_y = float(row[11]) / 19.685 + end_x = float(row[12]) / 19.685 + end_y = float(row[13]) / 19.685 + dangle = float(row[14]) + angle = (end_ang - start_ang) + if angle < -180: + angle = 360 + angle + if angle > 180: + angle = -(360 - angle) + print('ARC angle {}'.format(angle)) + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(False) + ) + polygon.add_vertex(Vertex(Position(start_x, start_y), Angle(dangle))) + polygon.add_vertex(Vertex(Position(end_x, end_y), Angle(0.0))) + symbol.add_polygon(polygon) + + if start_y > max_y: + max_y = start_y + if start_y < min_y: + min_y = start_y + if end_y > max_y: + max_y = end_y + if end_y < min_y: + min_y = end_y + + # Text + + text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('center bottom'), Height(sym_text_height), Position(-w + 2 * width, max_y), Rotation(0.0)) + symbol.add_text(text) + + text = Text(uuid_text_value, Layer('sym_values'), Value('{{VALUE}}'), Align('center top'), Height(sym_text_height), Position(-w + 2 * width, min_y), Rotation(0.0)) + symbol.add_text(text) sym_dir_path = path.join(dirpath, uuid_sym) if not (path.exists(sym_dir_path) and path.isdir(sym_dir_path)): @@ -314,6 +479,8 @@ def _make(dirpath: str) -> None: cvs_file=cvs_file, dirpath='out/{}/sym'.format(group_name), author=author, + part=part, + variant=variant_name, version=version, keywords=keywords, cmpcat=cmpcat, From cac504f5c87c42ae55cb69e18a9918e49ac56228 Mon Sep 17 00:00:00 2001 From: ouabache Date: Wed, 25 Mar 2020 12:51:52 -0700 Subject: [PATCH 14/23] added generate_cmp.py and generate_dev.py added entities/component.py with added gates method --- entities/component.py | 15 ++- generate_cmp.py | 301 ++++++++++++++++++++++++++++++++++++++++++ generate_dev.py | 255 +++++++++++++++++++++++++++++++++++ 3 files changed, 565 insertions(+), 6 deletions(-) create mode 100644 generate_cmp.py create mode 100644 generate_dev.py diff --git a/entities/component.py b/entities/component.py index be6b5e29..ea0feec1 100644 --- a/entities/component.py +++ b/entities/component.py @@ -2,8 +2,6 @@ from typing import List -from common import indent - from .common import ( Author, BoolValue, Category, Created, Deprecated, Description, EnumValue, Keywords, Name, Position, Rotation, StringValue, UUIDValue, Version @@ -141,19 +139,24 @@ def get_name(self) -> str: class Variant: - def __init__(self, uuid: str, norm: Norm, name: Name, description: Description, - gate: Gate, ): + def __init__(self, uuid: str, norm: Norm, name: Name, description: Description): self.uuid = uuid self.norm = norm self.name = name self.description = description - self.gate = gate + self.gates = [] # type: List[Gate] + + def add_gate(self, gate_map: Gate) -> None: + self.gates.append(gate_map) def __str__(self) -> str: ret = '(variant {} {}\n'.format(self.uuid, self.norm) +\ ' {}\n'.format(self.name) +\ ' {}\n'.format(self.description) - ret += '\n'.join(indent(1, str(self.gate).splitlines())) + gate_lines = [] + for gate in self.gates: + gate_lines.append(' {}'.format(gate)) + ret += '\n'.join(sorted(gate_lines)) ret += '\n)' return ret diff --git a/generate_cmp.py b/generate_cmp.py new file mode 100644 index 00000000..0f4a8a1e --- /dev/null +++ b/generate_cmp.py @@ -0,0 +1,301 @@ + +# importing csv module +import csv + +import argparse + +from os import makedirs, path +from uuid import uuid4 +from typing import Optional +from common import init_cache, now, save_cache +from entities.common import ( + Author, Category, Created, Deprecated, Description, Keywords, + Name, Position, Rotation, Version +) +from entities.component import ( + Clock, Component, DefaultValue, ForcedNet, Gate, Negated, Norm, PinSignalMap, Prefix, Required, Role, SchematicOnly, + Signal, SignalUUID, Suffix, SymbolUUID, TextDesignator, Variant +) + +parser = argparse.ArgumentParser(description='create a component from csv file') +parser.add_argument("--design") +parser.add_argument("--group") +parser.add_argument("--variant") +parser.add_argument("--directory") +args = parser.parse_args() +design_name = args.design +group_name = args.group +variant_name = args.variant +directory_name = args.directory + +# initializing + +cvs_raw_data = [] +boilerplate_raw_data = [] + + +""" + +""" + + +generator = 'librepcb-parts-generator (generate_cmp.py)' + + +def uuid(category: str, kind: str, identifier: str) -> str: + """ + Return a uuid for the specified pin. + + Params: + category: + For example 'cmp' or 'pkg'. + kind: + For example 'pinheader' or 'pinsocket'. + identifier: + For example 'pad-1' or 'pin-13'. + """ + key = '{}-{}-{}'.format(category, kind, identifier).lower().replace(' ', '~') + if key not in uuid_cache: + uuid_cache[key] = str(uuid4()) + return uuid_cache[key] + + +boilerplate_cvs_file = 'Boilerplate_{}.csv'.format(group_name) + +with open(boilerplate_cvs_file, 'r') as CSVBfile: + # creating a csv reader object + CSVbreader = csv.reader(CSVBfile) + # extracting each data row one by one + for brow in CSVbreader: + boilerplate_raw_data.append(brow) + +print(" Total no. of rows: %d" % (CSVbreader.line_num)) +num_of_brows = CSVbreader.line_num + +for brow in boilerplate_raw_data[:num_of_brows]: + # parsing each column of a row + row_type = brow[0] + if row_type == "CREATE": + create_date = brow[1] + if row_type == "VERSION": + version = brow[1] + if row_type == "AUTHOR": + author = brow[1] + if row_type == "KEYWORDS": + keywords = brow[1] + if len(brow) > 2: + for p in range(2, len(brow)): + keywords = '{},{}'.format(keywords, brow[p]) + +print(" Create Date : {}".format(create_date)) +print(" Version : {}".format(version)) +print(" Author : {}".format(author)) +print(" Keywords : {}".format(keywords)) + +cvs_file = '{}{}.csv'.format(directory_name, design_name) +with open(cvs_file, 'r') as CSVxfile: + # creating a csv reader object + CSVxreader = csv.reader(CSVxfile) + # extracting each data row one by one + for row in CSVxreader: + cvs_raw_data.append(row) + + num_of_rows = CSVxreader.line_num + +for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + + if row_type == "VERSION": + version = row[1] + if row_type == "KEYWORDS": + keywords = row[1] + if row_type == "UNITS": + units = row[1] + if row_type == "DEF": + def_name = row[1] + +uuid_cmpcat_file = 'uuid_cache_{}_cmpcat.csv'.format(group_name) +uuid_cache = init_cache(uuid_cmpcat_file) +cmpcat = uuid('cmpcat', def_name, "cmpcat") +save_cache(uuid_cmpcat_file, uuid_cache) + +# Initialize UUID cache +uuid_cache_file = 'uuid_cache_{}.csv'.format(group_name) +uuid_cache = init_cache(uuid_cache_file) + + +def generate_cmp( + cvs_file: str, + dirpath: str, + author: str, + version: str, + keywords: str, + cmpcat: str, + default_value: str, + create_date: Optional[str], +) -> None: + category = 'cmp' + + with open(cvs_file, 'r') as CSVxfile: + # creating a csv reader object + CSVxreader = csv.reader(CSVxfile) + # extracting each data row one by one + for row in CSVxreader: + cvs_raw_data.append(row) + + num_of_rows = CSVxreader.line_num + + pad_list = [] + pad_name = [] + pad_unit = [] + uuid_pins = [] + uuid_signals = [] + num_of_pins = 0 + units = 0 + for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + + if row_type == "VERSION": + version = row[1] + if row_type == "KEYWORDS": + keywords = row[1] + if row_type == "UNITS": + units = row[1] + if row_type == "DEF": + def_name = row[1] + + if row_type == "PIN": + pad_name.append(row[1]) + pad_list.append(row[3]) + uuid_pins.append(uuid('sym', def_name, 'pin-{}_{}'.format(row[1], row[3]))) + uuid_signals.append(uuid('cmp', def_name, 'signal-{}_{}'.format(row[1], row[3]))) + num_of_pins = num_of_pins + 1 + if units != 0: + pad_unit.append(row[10]) + + def _uuid(identifier: str) -> str: + return uuid(category, def_name, identifier) + + print('Number of pins {}'.format(num_of_pins)) + uuid_cmp = _uuid('cmp') + + uuid_variant_default = _uuid('variant-default') + uuid_gate_default = _uuid('gate-default') + uuid_symbol_default = uuid('sym', '{}_default'.format(def_name), 'sym') + uuid_dev = uuid('dev', def_name, 'dev') + + # General info + component = Component( + uuid_cmp, + Name('{}'.format(def_name)), + Description('created from file--- {}.\\n' + 'Generated with {}'.format(cvs_file, generator)), + Keywords('{}'.format( keywords)), + Author(author), + Version(version), + Created(create_date or now()), + Deprecated(False), + Category(cmpcat), + SchematicOnly(False), + DefaultValue(default_value), + Prefix('U'), + ) + + for p in range(1, num_of_pins + 1): + component.add_signal(Signal( + uuid_signals[p - 1], + Name('{}_{}'.format(pad_name[p - 1], pad_list[p - 1])), + Role.PASSIVE, + Required(False), + Negated(False), + Clock(False), + ForcedNet(''),) + ) + + gate = Gate( + uuid_gate_default, + SymbolUUID(uuid_symbol_default), + Position(0.0, 0.0), + Rotation(0.0), + Required(True), + Suffix(''), + ) + + for p in range(1, num_of_pins + 1): + gate.add_pin_signal_map(PinSignalMap( + uuid_pins[p - 1], + SignalUUID(uuid_signals[p - 1]), + TextDesignator.SYMBOL_PIN_NAME,) + ) + + variant = Variant(uuid_variant_default, Norm.EMPTY, Name('default'), Description('')) + + variant.add_gate(gate) + component.add_variant(variant) + uuid_symbol_variant = uuid('sym', '{}_{}'.format(def_name, variant_name), 'sym') + uuid_variant_variant = _uuid('variant-{}'.format(variant_name)) + + if uuid_symbol_default != uuid_symbol_variant: + + iunits = int(units) + variant = Variant(uuid_variant_variant, Norm.EMPTY, Name('{}'.format(variant_name)), Description('')) + + position = 0.0 + for u in range(1, iunits + 1): + uuid_symbol_variant = uuid('sym', '{}_{}_{}'.format(def_name, u, variant_name), 'sym') + uuid_gate_variant = _uuid('gate-{}_{}'.format(u, variant_name)) + + gate = Gate( + uuid_gate_variant, + SymbolUUID(uuid_symbol_variant), + Position(0.0, position), + Rotation(0.0), + Required(True), + Suffix(''), + ) + + position = position + 100.0 + + for p in range(1, num_of_pins + 1): + if u == int(pad_unit[p - 1]): + gate.add_pin_signal_map(PinSignalMap(uuid_pins[p - 1], SignalUUID(uuid_signals[p - 1]), TextDesignator.SYMBOL_PIN_NAME,)) + + variant.add_gate(gate) + + component.add_variant(variant) + component.serialize(dirpath) + + cmp_dir_path = path.join(dirpath, uuid_cmp) + if not (path.exists(cmp_dir_path) and path.isdir(cmp_dir_path)): + makedirs(cmp_dir_path) + with open(path.join(cmp_dir_path, '.librepcb-cmp'), 'w') as f: + f.write('0.1\n') + with open(path.join(cmp_dir_path, 'component.lp'), 'w') as f: + f.write(str(component)) + f.write('\n') + + print(' :Wrote component {} {}'.format(def_name, uuid_cmp)) + + +if __name__ == '__main__': + def _make(dirpath: str) -> None: + if not (path.exists(dirpath) and path.isdir(dirpath)): + makedirs(dirpath) + _make('out') + _make('out/{}'.format(group_name)) + _make('out/{}/cmp'.format(group_name)) + + generate_cmp( + cvs_file=cvs_file, + dirpath='out/{}/cmp'.format(group_name), + author=author, + version=version, + keywords=keywords, + cmpcat=cmpcat, + default_value='{{PARTNUMBER or DEVICE or COMPONENT}}', + create_date=create_date, + ) + + save_cache(uuid_cache_file, uuid_cache) diff --git a/generate_dev.py b/generate_dev.py new file mode 100644 index 00000000..5ba13a7e --- /dev/null +++ b/generate_dev.py @@ -0,0 +1,255 @@ + +# importing csv module +import csv +import argparse +import collections +from os import makedirs, path +from uuid import uuid4 +from typing import Optional, Dict +from common import init_cache, now, save_cache + +parser = argparse.ArgumentParser(description='create a device from csv file') +parser.add_argument("--design") +parser.add_argument("--group") +parser.add_argument("--directory") +args = parser.parse_args() +design_name = args.design +group_name = args.group +directory_name = args.directory + + +# initializing + +cvs_raw_data = [] +boilerplate_raw_data = [] +uuid_pads = [] +uuid_signals = [] + + +""" + +""" + +generator = 'librepcb-parts-generator (generate_dev.py)' + + +def init_CACHE(uuid_CACHE_file: str) -> Dict[str, str]: + print('Loading CACHE: {}'.format(uuid_CACHE_file)) + uuid_CACHE = collections.OrderedDict() # type: Dict[str, str] + try: + with open(uuid_CACHE_file, 'r') as f: + reader = csv.reader(f, delimiter=',', quotechar='"') + for row in reader: + uuid_CACHE[row[0]] = row[1] + except FileNotFoundError: + pass + return uuid_CACHE + + +def save_CACHE(uuid_CACHE_file: str, uuid_CACHE: Dict[str, str]) -> None: + print('Saving CACHE: {}'.format(uuid_CACHE_file)) + with open(uuid_CACHE_file, 'w') as f: + writer = csv.writer(f, delimiter=',', quotechar='"', lineterminator='\n') + for k, v in sorted(uuid_CACHE.items()): + writer.writerow([k, v]) + print('Done, CACHEd {} UUIDs'.format(len(uuid_CACHE))) + + +def uuid(category: str, kind: str, identifier: str) -> str: + """ + Return a uuid for the specified pin. + + Params: + category: + For example 'cmp' or 'pkg'. + kind: + For example 'pinheader' or 'pinsocket'. + identifier: + For example 'pad-1' or 'pin-13'. + """ + key = '{}-{}-{}'.format(category, kind, identifier).lower().replace(' ', '~') + if key not in uuid_cache: + uuid_cache[key] = str(uuid4()) + return uuid_cache[key] + + +def UUID(category: str) -> str: + """ + + """ + key = '{}'.format(category).lower().replace(' ', '~') + if key not in uuid_CACHE: + uuid_CACHE[key] = 'none' + return uuid_CACHE[key] + + +boilerplate_cvs_file = 'Boilerplate_{}.csv'.format(group_name) + +with open(boilerplate_cvs_file, 'r') as CSVBfile: + # creating a csv reader object + CSVbreader = csv.reader(CSVBfile) + # extracting each data row one by one + for brow in CSVbreader: + boilerplate_raw_data.append(brow) + print(" Total no. of rows: %d" % (CSVbreader.line_num)) + num_of_brows = CSVbreader.line_num + +for brow in boilerplate_raw_data[:num_of_brows]: + # parsing each column of a row + row_type = brow[0] + if row_type == "CREATE": + create_date = brow[1] + if row_type == "VERSION": + version = brow[1] + if row_type == "AUTHOR": + author = brow[1] + if row_type == "KEYWORDS": + keywords = brow[1] + if len(brow) > 2: + for p in range(2, len(brow)): + keywords = '{},{}'.format(keywords, brow[p]) + +print(" Create Date : {}".format(create_date)) +print(" Version : {}".format(version)) +print(" Author : {}".format(author)) +print(" Keywords : {}".format(keywords)) + +cvs_file = '{}{}.csv'.format(directory_name, design_name) + +with open(cvs_file, 'r') as CSVxfile: + # creating a csv reader object + CSVxreader = csv.reader(CSVxfile) + # extracting each data row one by one + for row in CSVxreader: + cvs_raw_data.append(row) + num_of_rows = CSVxreader.line_num + +for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + + if row_type == "VERSION": + version = row[1] + if row_type == "KEYWORDS": + keywords = row[1] + if row_type == "DEF": + def_name = row[1] + +# Initialize cmpcat UUID +uuid_cmpcat_file = 'uuid_cache_{}_cmpcat.csv'.format(group_name) +uuid_cache = init_cache(uuid_cmpcat_file) +cmpcat = uuid('cmpcat', def_name, "cmpcat") +save_cache(uuid_cmpcat_file, uuid_cache) + + +# Initialize UUID cache +uuid_cache_file = 'uuid_cache_{}.csv'.format(group_name) +uuid_cache = init_cache(uuid_cache_file) + + +uuid_CACHE_file = 'MapFile.csv' +uuid_CACHE = init_CACHE(uuid_CACHE_file) + +category = 'dev' +pad_list = [] +pad_name = [] +lines = [] +num_of_pins = 0 +package = "none" + +for row in cvs_raw_data[:num_of_rows]: + # parsing each column of a row + row_type = row[0] + + if row_type == "VERSION": + version = row[1] + if row_type == "KEYWORDS": + keywords = row[1] + if row_type == "DEF": + def_name = row[1] + if row_type == "FOOT": + package = row[1].lower() + if row_type == "PIN": + pad_name.append(row[1]) + pad_list.append(row[3]) + uuid_signals.append(uuid('cmp', def_name, 'signal-{}_{}'. format(row[1], row[3]))) + num_of_pins = num_of_pins + 1 + +uuid_PKG = UUID(package) +uuid_CACHE_file = 'MapFile.out' +save_CACHE(uuid_CACHE_file, uuid_CACHE) + +package = uuid_PKG + +print(" device: %s Number of pins %s Package %s UUID %s" % (def_name, num_of_pins, package, uuid_PKG)) +uuid_dev = uuid('dev', def_name, 'dev') +uuid_cmp = uuid('cmp', def_name, 'cmp') + +# Initialize UUID cache +uuid_cache_file = 'uuid_cache_pkg.csv' +uuid_cache = init_cache(uuid_cache_file) + + +uuid_pkg = uuid('pkg', package, 'pkg') + + +def generate_dev( + cvs_file: str, + dirpath: str, + author: str, + version: str, + keywords: str, + cmpcat: str, + create_date: Optional[str], +) -> None: + + # General info + lines.append('(librepcb_device {}'.format(uuid_dev)) + lines.append(' (name "{}")'.format(def_name)) + lines.append(' (description " ''Generated with {}")'.format(generator)) + lines.append(' (keywords "{}")'.format(keywords)) + lines.append(' (author "{}")'.format(author)) + lines.append(' (version "{}")'.format(version)) + lines.append(' (created {})'.format(create_date or now())) + lines.append(' (deprecated false)') + lines.append(' (category {})'.format(cmpcat)) + lines.append(' (component {})'.format(uuid_cmp)) + lines.append(' (package {})'.format(uuid_pkg)) + signalmappings = [] + + for p in range(1, num_of_pins + 1): + uuid_pad = uuid('pkg', package, 'pad-{}'.format(pad_list[p - 1])) + signalmappings.append(' (pad {} (signal {}))'.format(uuid_pad, uuid_signals[p - 1])) + lines.extend(sorted(signalmappings)) + lines.append(')') + + if package != "none": + dev_dir_path = path.join(dirpath, uuid_dev) + if not (path.exists(dev_dir_path) and path.isdir(dev_dir_path)): + makedirs(dev_dir_path) + with open(path.join(dev_dir_path, '.librepcb-dev'), 'w') as f: + f.write('0.1\n') + with open(path.join(dev_dir_path, 'device.lp'), 'w') as f: + f.write('\n'.join(lines)) + f.write('\n') + + print(' {}'.format(uuid_dev)) + + +if __name__ == '__main__': + def _make(dirpath: str) -> None: + if not (path.exists(dirpath) and path.isdir(dirpath)): + makedirs(dirpath) + _make('out') + _make('out/{}'.format(group_name)) + _make('out/{}/dev'.format(group_name)) + + generate_dev( + cvs_file=cvs_file, + dirpath='out/{}/dev'.format(group_name), + author=author, + version=version, + keywords=keywords, + cmpcat=cmpcat, + create_date=create_date, + ) From 9762d2b0e0867dd26735a4f8baed92736d1e3e1f Mon Sep 17 00:00:00 2001 From: ouabache Date: Thu, 26 Mar 2020 09:42:39 -0700 Subject: [PATCH 15/23] fixed bug introed in linting --- generate_cmp.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/generate_cmp.py b/generate_cmp.py index 0f4a8a1e..db10641d 100644 --- a/generate_cmp.py +++ b/generate_cmp.py @@ -236,7 +236,7 @@ def _uuid(identifier: str) -> str: component.add_variant(variant) uuid_symbol_variant = uuid('sym', '{}_{}'.format(def_name, variant_name), 'sym') uuid_variant_variant = _uuid('variant-{}'.format(variant_name)) - + print('default {} variant {}'.format(uuid_symbol_default, uuid_symbol_variant)) if uuid_symbol_default != uuid_symbol_variant: iunits = int(units) @@ -262,9 +262,10 @@ def _uuid(identifier: str) -> str: if u == int(pad_unit[p - 1]): gate.add_pin_signal_map(PinSignalMap(uuid_pins[p - 1], SignalUUID(uuid_signals[p - 1]), TextDesignator.SYMBOL_PIN_NAME,)) - variant.add_gate(gate) + variant.add_gate(gate) + + component.add_variant(variant) - component.add_variant(variant) component.serialize(dirpath) cmp_dir_path = path.join(dirpath, uuid_cmp) @@ -276,7 +277,7 @@ def _uuid(identifier: str) -> str: f.write(str(component)) f.write('\n') - print(' :Wrote component {} {}'.format(def_name, uuid_cmp)) + print(' :Wrote component {} {} {}'.format(def_name, uuid_cmp, uuid_dev)) if __name__ == '__main__': From 3d2eaad5cececa81f56915d317feef933d7320a8 Mon Sep 17 00:00:00 2001 From: ouabache Date: Mon, 30 Mar 2020 11:17:18 -0700 Subject: [PATCH 16/23] added 4 tiny demorgan parts --- Logic/Logic/AND3_dm_8.csv | 38 ++++++++++++++++++++++ Logic/Logic/AND4_dm_8.csv | 52 +++++++++++++++++++++++++++++++ Logic/Logic/NAND3_dm_8.csv | 37 ++++++++++++++++++++++ Logic/Logic/NAND4_dm_8.csv | 51 ++++++++++++++++++++++++++++++ Logic/script | 4 +++ Logic/uuid_cache_gates.csv | 34 ++++++++++++++++++++ Logic/uuid_cache_gates_cmpcat.csv | 4 +++ 7 files changed, 220 insertions(+) create mode 100644 Logic/Logic/AND3_dm_8.csv create mode 100644 Logic/Logic/AND4_dm_8.csv create mode 100644 Logic/Logic/NAND3_dm_8.csv create mode 100644 Logic/Logic/NAND4_dm_8.csv diff --git a/Logic/Logic/AND3_dm_8.csv b/Logic/Logic/AND3_dm_8.csv new file mode 100644 index 00000000..d28a0df8 --- /dev/null +++ b/Logic/Logic/AND3_dm_8.csv @@ -0,0 +1,38 @@ +SCALE,2.000 +DEF,AND3_dm_8 +KEYWORDS,gates +KEYWORDS,and +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.4252,2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-4.0709,0,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.4252,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,4.50,0,1.00 +CIRC,.100,-3.9252,2.00,1.00 +CIRC,.100,-3.5709,0.00,1.00 +CIRC,.100,-3.9252,-2.00,1.00 +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,0,0 +PIN,C,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/AND4_dm_8.csv b/Logic/Logic/AND4_dm_8.csv new file mode 100644 index 00000000..37244db8 --- /dev/null +++ b/Logic/Logic/AND4_dm_8.csv @@ -0,0 +1,52 @@ +SCALE,2.000 +DEF,AND4_dm_8 +KEYWORDS,gates +KEYWORDS,and +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-4.00,7.00,0 +POLYST +POLY,.100,F +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,-7.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,6.00,0 +POLYPT,-5.11,6.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2,0 +POLYPT,-4.5,2,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.5,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-6.00,0 +POLYPT,-5.11,-6.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,5.00,0,0 +POLYST +CIRC,.100,-4.55,6.00,1.00 +CIRC,.100,-4.0,2.00,1.00 +CIRC,.100,-4.0,-2.00,1.00 +CIRC,.100,-4.5,-6.00,1.00 +CIRC,.100,4.5,0.00,1.00 +PIN,A,L,-3.00,3.0,0 +PIN,B,L,-3.00,1.0,0 +PIN,C,L,-3.00,-1.0,0 +PIN,D,L,-3.00,-3.0,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND3_dm_8.csv b/Logic/Logic/NAND3_dm_8.csv new file mode 100644 index 00000000..10689172 --- /dev/null +++ b/Logic/Logic/NAND3_dm_8.csv @@ -0,0 +1,37 @@ +SCALE,2.000 +DEF,NAND3_dm_8 +KEYWORDS,gates +KEYWORDS,nand +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2.00,0 +POLYPT,-4.4252,2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,0,0 +POLYPT,-4.0709,0,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.4252,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +CIRC,.100,-3.9252,2.00,1.00 +CIRC,.100,-3.5709,0.00,1.00 +CIRC,.100,-3.9252,-2.00,1.00 +PIN,A,L,-3.00,1.00,0 +PIN,B,L,-3.00,0,0 +PIN,C,L,-3.00,-1.00,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND4_dm_8.csv b/Logic/Logic/NAND4_dm_8.csv new file mode 100644 index 00000000..fee192a0 --- /dev/null +++ b/Logic/Logic/NAND4_dm_8.csv @@ -0,0 +1,51 @@ +SCALE,2.000 +DEF,NAND4_dm_8 +KEYWORDS,gates +KEYWORDS,nand +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-1.50,3.25,-65.0 +POLYPT,4.00,0,-65.0 +POLYPT,-1.50,-3.25,0 +POLYPT,-4.00,-3.25,65.0 +POLYPT,-4.00,3.25,0 +POLYST +POLY,.100,F +POLYPT,-4.00,3.25,0 +POLYPT,-4.00,7.00,0 +POLYST +POLY,.100,F +POLYPT,-4.00,-3.25,0 +POLYPT,-4.00,-7.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,6.00,0 +POLYPT,-5.11,6.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,2,0 +POLYPT,-4.5,2,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-2.00,0 +POLYPT,-4.5,-2.00,0 +POLYST +POLY,.0622,N +POLYPT,-6.00,-6.00,0 +POLYPT,-5.11,-6.00,0 +POLYST +POLY,.0622,N +POLYPT,6.00,0,0 +POLYPT,4.00,0,0 +POLYST +CIRC,.100,-4.55,6.00,1.00 +CIRC,.100,-4.0,2.00,1.00 +CIRC,.100,-4.0,-2.00,1.00 +CIRC,.100,-4.5,-6.00,1.00 +PIN,A,L,-3.00,3.0,0 +PIN,B,L,-3.00,1.0,0 +PIN,C,L,-3.00,-1.0,0 +PIN,D,L,-3.00,-3.0,0 +PIN,OUT,R,3.00,0,0 +TEXT,-4.00,3.00,NAME +TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/script b/Logic/script index 79dde8e8..9ef2820b 100755 --- a/Logic/script +++ b/Logic/script @@ -4,9 +4,11 @@ python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_dm_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_dm_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND6_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND8_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_4 @@ -19,9 +21,11 @@ python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ -- python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_dm_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_dm_4 +python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_dm_8 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND6_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND8_4 python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_4 diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv index 93d266f8..daefde7a 100644 --- a/Logic/uuid_cache_gates.csv +++ b/Logic/uuid_cache_gates.csv @@ -57,6 +57,14 @@ sym-and3_dm_4-polygon-contour,92231b7a-895b-4109-908d-6c85a82565b5 sym-and3_dm_4-sym,a1f50d3c-1567-4068-ae08-2dcfbfbb2e2f sym-and3_dm_4-text-name,bed92559-1ebe-452d-ad4f-f1047549ac69 sym-and3_dm_4-text-value,3f82d42a-633c-4680-890d-512051fd50e2 +sym-and3_dm_8-pin-a,546326cb-e1a6-419f-baa4-dc40c4142a25 +sym-and3_dm_8-pin-b,422ff9a2-c468-40d9-abd3-d288bb9b819e +sym-and3_dm_8-pin-c,1ff50424-b739-4c2b-abc6-ad2bef6076ed +sym-and3_dm_8-pin-out,df56b35c-600d-4609-a15f-e9d641570e21 +sym-and3_dm_8-polygon-contour,3c778c6e-d432-4860-898a-ada64d6fcdfc +sym-and3_dm_8-sym,40ef2d8d-1647-41f1-88a4-2a2bd5b08de8 +sym-and3_dm_8-text-name,48ac29dd-e84b-4cd5-98c5-56d33b41d7a9 +sym-and3_dm_8-text-value,78b0a6da-78b5-40db-9f4b-498a6088f411 sym-and4_4-pin-a,afb17912-4871-484f-ad1a-182b533f4da7 sym-and4_4-pin-b,664b4cf5-7718-4f85-acf3-0912d1c2c5f7 sym-and4_4-pin-c,4ba20a04-7384-4190-ba32-d3a0274fdd04 @@ -84,6 +92,15 @@ sym-and4_dm_4-polygon-contour,0ad67861-06ff-4c64-b310-294cd85c0511 sym-and4_dm_4-sym,cc9c541a-aa3e-43fb-bd59-9c71d9b1f869 sym-and4_dm_4-text-name,8e0dfe9f-cb28-4f73-a14d-96795cecb4fc sym-and4_dm_4-text-value,fae10883-7c74-4eb8-ae09-ab512f18dbaa +sym-and4_dm_8-pin-a,932883b1-27c7-4f97-8091-cb5370deab9d +sym-and4_dm_8-pin-b,619564a4-b694-4e24-9816-972de591e6ea +sym-and4_dm_8-pin-c,0905e7bb-dd3f-4ee0-805b-8d70f3a5ea6d +sym-and4_dm_8-pin-d,b5d3d145-1598-44b9-9d71-888eb1273eab +sym-and4_dm_8-pin-out,0d30fcdc-2b3b-476a-b926-512f28c4bd0f +sym-and4_dm_8-polygon-contour,cc55a41a-0b56-4d4f-946e-df132e159609 +sym-and4_dm_8-sym,f5ce23eb-5ce4-4952-a1ca-31e7b91c153f +sym-and4_dm_8-text-name,47d8c68d-dd17-4e1c-814a-efc6fe8cefc4 +sym-and4_dm_8-text-value,aa1496c6-6d43-4f68-b2ad-a99cb0c44f3e sym-and6_4-pin-a,46d52f8a-f317-425b-8607-a62ceee3f52b sym-and6_4-pin-b,c55ea999-1a6a-4e39-8ea5-237c0bde7e9c sym-and6_4-pin-c,b6547ca2-e50e-4255-bfaa-58a4dbb60e55 @@ -191,6 +208,14 @@ sym-nand3_dm_4-polygon-contour,6238b46c-7bc8-40be-af9a-5e84a02772b5 sym-nand3_dm_4-sym,613c175e-ad55-4544-bc53-76520f91162b sym-nand3_dm_4-text-name,1e78aa79-2000-4c61-a014-b9860a70d950 sym-nand3_dm_4-text-value,ee8a20ef-2f81-4f4d-88d6-6c9e5fb10db1 +sym-nand3_dm_8-pin-a,18dede3d-a11e-4041-950e-139ed66757a4 +sym-nand3_dm_8-pin-b,937974e1-7256-4478-87e3-e09ab80ceb53 +sym-nand3_dm_8-pin-c,91333fa2-ef88-4401-bcd9-f0a0d9b3a6a9 +sym-nand3_dm_8-pin-out,78ae7a5c-bb65-416c-97b3-597e09155fe0 +sym-nand3_dm_8-polygon-contour,7b7bb599-5460-4679-94a2-6445e71baeac +sym-nand3_dm_8-sym,3e0703e0-7450-4fba-bb29-548a2cd990db +sym-nand3_dm_8-text-name,1a42a73e-aa9c-4c64-a5bd-a059e3e3b37c +sym-nand3_dm_8-text-value,d77b97e7-b4b5-4c7b-a5a1-8cfc2f7c8aec sym-nand4_4-pin-a,56c16b0a-cb32-4bfc-b616-06cb57f681b9 sym-nand4_4-pin-b,e91835d5-69d4-4bc8-ad5f-958e036fda41 sym-nand4_4-pin-c,ba9178bc-755a-4aae-8f29-87329c6fb54a @@ -218,6 +243,15 @@ sym-nand4_dm_4-polygon-contour,8d550747-8671-4325-89ee-f521851ef48e sym-nand4_dm_4-sym,5cbc9361-9d4d-4e85-9aa4-a563c8b2bfeb sym-nand4_dm_4-text-name,6fb6f3a8-b468-455a-88db-14173ec83f54 sym-nand4_dm_4-text-value,40dbb856-e8e2-4d5e-8b2a-ea4a49b3cd9f +sym-nand4_dm_8-pin-a,62bcf75d-6520-44b6-b1d2-c3dcdf97fe8a +sym-nand4_dm_8-pin-b,247c9d34-32e3-4a8f-8bae-1d7d87271ce6 +sym-nand4_dm_8-pin-c,b86aacc5-c65f-4f8f-baa6-e359da654af1 +sym-nand4_dm_8-pin-d,5111b46e-e410-44a2-a593-4355b20ee45a +sym-nand4_dm_8-pin-out,f7a857a9-e65f-4777-b0a1-2e4fca27c6cd +sym-nand4_dm_8-polygon-contour,ce9fa492-d028-4716-8092-7d59b0ed6109 +sym-nand4_dm_8-sym,e2c2b229-c779-424e-86e7-9c6f198f47ae +sym-nand4_dm_8-text-name,51287de6-1701-49f5-9310-10bd3671270b +sym-nand4_dm_8-text-value,9f57be3b-4b26-4f05-8b5f-28ebebd574bd sym-nand6_4-pin-a,798b2cd9-12e4-4736-9aa3-5faab776dc5a sym-nand6_4-pin-b,981ed111-256c-4fc3-8d93-09cca2967cef sym-nand6_4-pin-c,fd5582d8-3a50-46b6-ae01-c34224f33f00 diff --git a/Logic/uuid_cache_gates_cmpcat.csv b/Logic/uuid_cache_gates_cmpcat.csv index 656c2d37..da525d86 100644 --- a/Logic/uuid_cache_gates_cmpcat.csv +++ b/Logic/uuid_cache_gates_cmpcat.csv @@ -6,9 +6,11 @@ cmpcat-and2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and3_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and3_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and4_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and4_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-and4_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and6_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-and8_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-inv_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 @@ -23,9 +25,11 @@ cmpcat-nand2_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand3_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand3_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand3_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand3_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand4_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand4_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand4_dm_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 +cmpcat-nand4_dm_8-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand6_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nand8_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 cmpcat-nor2_4-cmpcat,8e4af7b5-cbff-4409-9698-f2b545218075 From a339cb00574678cee41ad44582a9c219f6ecc2b7 Mon Sep 17 00:00:00 2001 From: ouabache Date: Tue, 31 Mar 2020 13:57:37 -0700 Subject: [PATCH 17/23] fixed 2 spaces in uuis files changed author name --- Logic/Boilerplate_Logic.csv | 2 +- Logic/Boilerplate_buffer.csv | 2 +- Logic/Boilerplate_flipflop.csv | 2 +- Logic/Boilerplate_gates.csv | 2 +- Logic/Boilerplate_multiplexor.csv | 2 +- Logic/uuid_cache_gates.csv | 2 +- Logic/uuid_cache_multiplexor.csv | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Logic/Boilerplate_Logic.csv b/Logic/Boilerplate_Logic.csv index 8503daf8..9ed9a621 100644 --- a/Logic/Boilerplate_Logic.csv +++ b/Logic/Boilerplate_Logic.csv @@ -1,4 +1,4 @@ KEYWORDS,digital,logic CREATE,2019-12-17T00:00:00Z VERSION,0.1 -AUTHOR,John E. +AUTHOR,John Eaton diff --git a/Logic/Boilerplate_buffer.csv b/Logic/Boilerplate_buffer.csv index 0db6e716..04a14e35 100644 --- a/Logic/Boilerplate_buffer.csv +++ b/Logic/Boilerplate_buffer.csv @@ -1,4 +1,4 @@ KEYWORDS,digital,logic,buffer CREATE,2020-03-22T00:00:00Z VERSION,0.1 -AUTHOR,John E. +AUTHOR,John Eaton diff --git a/Logic/Boilerplate_flipflop.csv b/Logic/Boilerplate_flipflop.csv index de16cbfe..c24589c2 100644 --- a/Logic/Boilerplate_flipflop.csv +++ b/Logic/Boilerplate_flipflop.csv @@ -1,4 +1,4 @@ KEYWORDS,digital,logic,flipflop CREATE,2020-03-22T00:00:00Z VERSION,0.1 -AUTHOR,John E. +AUTHOR,John Eaton diff --git a/Logic/Boilerplate_gates.csv b/Logic/Boilerplate_gates.csv index eb374f9d..90ce32d0 100644 --- a/Logic/Boilerplate_gates.csv +++ b/Logic/Boilerplate_gates.csv @@ -1,4 +1,4 @@ KEYWORDS,digital,logic CREATE,2020-03-22T00:00:00Z VERSION,0.1 -AUTHOR,John E. +AUTHOR,John Eaton diff --git a/Logic/Boilerplate_multiplexor.csv b/Logic/Boilerplate_multiplexor.csv index 8e186043..44d5001f 100644 --- a/Logic/Boilerplate_multiplexor.csv +++ b/Logic/Boilerplate_multiplexor.csv @@ -1,4 +1,4 @@ KEYWORDS,digital,logic,multiplexor CREATE,2020-03-22T00:00:00Z VERSION,0.1 -AUTHOR,John E. +AUTHOR,John Eaton diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv index daefde7a..709c4348 100644 --- a/Logic/uuid_cache_gates.csv +++ b/Logic/uuid_cache_gates.csv @@ -239,7 +239,7 @@ sym-nand4_dm_4-pin-b,c51f7665-708b-4220-9ae5-1659864af8bd sym-nand4_dm_4-pin-c,5b62e8d6-7455-4b7d-8f23-96c9ce46432e sym-nand4_dm_4-pin-d,33fb056e-0220-4dd0-a997-77385b182167 sym-nand4_dm_4-pin-out,3666ac6b-8c86-4424-8c38-621a3edbac34 -sym-nand4_dm_4-polygon-contour,8d550747-8671-4325-89ee-f521851ef48e +sym-nand4_dm_4-polygon-contour,8d550747-8671-4325-89ee-f521851ef48e sym-nand4_dm_4-sym,5cbc9361-9d4d-4e85-9aa4-a563c8b2bfeb sym-nand4_dm_4-text-name,6fb6f3a8-b468-455a-88db-14173ec83f54 sym-nand4_dm_4-text-value,40dbb856-e8e2-4d5e-8b2a-ea4a49b3cd9f diff --git a/Logic/uuid_cache_multiplexor.csv b/Logic/uuid_cache_multiplexor.csv index b9c87be8..40811377 100644 --- a/Logic/uuid_cache_multiplexor.csv +++ b/Logic/uuid_cache_multiplexor.csv @@ -5,7 +5,7 @@ sym-mux2_4-pin-sel,f591841c-6b57-4354-ae1f-66660d60c738 sym-mux2_4-polygon-contour,82765dfb-3939-40c7-aad3-f27cb6f7502d sym-mux2_4-sym,257bf433-93e9-4a14-bd13-a986f0058059 sym-mux2_4-text-name,54a5843a-90c5-4c75-9239-75cf13d33716 -sym-mux2_4-text-value, 62aac8ac-6b9e-413c-a931-c0c2e196a133 +sym-mux2_4-text-value,62aac8ac-6b9e-413c-a931-c0c2e196a133 sym-mux4_4-pin-a,4f898853-dd46-43d4-816a-ea74c12e9ed8 sym-mux4_4-pin-b,f9e53ade-b520-4356-85e8-c371014a1875 sym-mux4_4-pin-c,56480dc6-2724-4079-8a1e-7c50bbf7ad36 From 71984ceb350838568850c058efa3a7f5ba944b51 Mon Sep 17 00:00:00 2001 From: ouabache Date: Sun, 5 Apr 2020 13:41:23 -0700 Subject: [PATCH 18/23] now support descr --- generate_logic_sym.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/generate_logic_sym.py b/generate_logic_sym.py index f4ba749d..1960168e 100644 --- a/generate_logic_sym.py +++ b/generate_logic_sym.py @@ -59,7 +59,7 @@ def uuid(category: str, kind: str, identifier: str) -> str: line_width = 0.25 pkg_text_height = 1.0 sym_text_height = 2.54 - +descr = "" boilerplate_cvs_file = 'Boilerplate_{}.csv'.format(group_name) with open(boilerplate_cvs_file, 'r') as CSVBfile: @@ -112,6 +112,8 @@ def uuid(category: str, kind: str, identifier: str) -> str: keywords = '{},{}'.format(keywords, row[1]) if row_type == "DEF": def_name = row[1] + if row_type == "DESCR": + descr = row[1] uuid_cmpcat_file = 'uuid_cache_{}_cmpcat.csv'.format(group_name) uuid_cache = init_cache(uuid_cmpcat_file) @@ -128,6 +130,7 @@ def generate_sym( dirpath: str, author: str, keywords: str, + descr: str, version: str, cmpcat: str, create_date: Optional[str], @@ -191,8 +194,8 @@ def _uuid(identifier: str) -> str: symbol = Symbol( uuid_sym, Name('{}'.format(sym_name)), - Description('created from file--- {}.\\n' - 'Generated with {}'.format(cvs_file, generator)), + Description('{}\\ncreated from file--- {}.\\n' + 'Generated with {}'.format(descr, cvs_file, generator)), Keywords('{}'.format( keywords)), Author(author), Version(version), @@ -322,6 +325,7 @@ def _make(dirpath: str) -> None: author=author, version=version, keywords=keywords, + descr=descr, cmpcat=cmpcat, create_date=create_date, ) From cabfd6a8cbbe018931e000221dec5439ffc4eb9a Mon Sep 17 00:00:00 2001 From: ouabache Date: Thu, 9 Apr 2020 08:00:13 -0700 Subject: [PATCH 19/23] polyygons and circles now get unique uuids --- Logic/uuid_cache_buffer.csv | 3 + Logic/uuid_cache_flipflop.csv | 21 ++ Logic/uuid_cache_gates.csv | 376 +++++++++++++++++++++++++++++++ Logic/uuid_cache_multiplexor.csv | 3 + generate_logic_sym.py | 36 ++- 5 files changed, 427 insertions(+), 12 deletions(-) diff --git a/Logic/uuid_cache_buffer.csv b/Logic/uuid_cache_buffer.csv index 7ec7c1cb..84b1e249 100644 --- a/Logic/uuid_cache_buffer.csv +++ b/Logic/uuid_cache_buffer.csv @@ -13,6 +13,7 @@ sym-buffer_8-text-value,0b9f90e3-2203-4b39-ba5e-5f14425639b8 sym-bufferts_4-pin-a,448904b4-3ac7-4c4f-bc24-9a82e2957fa1 sym-bufferts_4-pin-en,99bc5f97-e49c-46ab-9171-868e468454ba sym-bufferts_4-pin-out,501e0d01-97eb-46c1-a3de-3a54a8de466b +sym-bufferts_4-polygon-1-sym,1052a8a0-2736-4355-bfea-ac4c316bf669 sym-bufferts_4-polygon-contour,19968d0c-b3b2-44c2-94d5-92869f8a2f61 sym-bufferts_4-sym,096fe5b3-a3c5-4813-9096-a8f6a6cc4e89 sym-bufferts_4-text-name,0c650348-f4b6-4d36-9c2f-639141bdbe11 @@ -20,6 +21,8 @@ sym-bufferts_4-text-value,becc2a63-2fda-497a-9a64-69c9c40e901a sym-bufferts_n_4-pin-a,5237b2a6-8525-4309-b2b4-939272312336 sym-bufferts_n_4-pin-en_n,3f4e3b46-5bbd-406b-872a-580fc25850b1 sym-bufferts_n_4-pin-out,192096c6-8248-44cf-8408-07e68fd16980 +sym-bufferts_n_4-polygon-1-sym,c157c3a6-1b1c-44d5-882d-73b68e5a16af +sym-bufferts_n_4-polygon-2-sym,e63a7415-45cc-4a81-8c90-46284eec070f sym-bufferts_n_4-polygon-contour,cef62873-13a4-435d-8ffb-8e0b43cbd4c4 sym-bufferts_n_4-sym,c50be687-d276-4934-a12f-b548ba7b7065 sym-bufferts_n_4-text-name,ea96ae83-aaa0-4d39-89b5-b0bd4b925eef diff --git a/Logic/uuid_cache_flipflop.csv b/Logic/uuid_cache_flipflop.csv index fac4e66a..2a703aed 100644 --- a/Logic/uuid_cache_flipflop.csv +++ b/Logic/uuid_cache_flipflop.csv @@ -1,6 +1,7 @@ sym-dff_4-pin-clk,ff87c347-eb98-4421-98ca-6f11ac8bb0f3 sym-dff_4-pin-d,2c19951a-d180-4395-8ee6-9ccc6a84a65b sym-dff_4-pin-q,9627a399-4802-4d66-8d05-c1e475a57bea +sym-dff_4-polygon-1-sym,ccda4558-6f81-487e-9ee5-7961df22a934 sym-dff_4-polygon-contour,8706687f-9d4c-4e30-a7c5-deaf6422119a sym-dff_4-sym,593981e4-44ff-475b-b577-d979d0802107 sym-dff_4-text-name,ab0328fe-8dae-4906-bf50-7f84bff145a6 @@ -9,6 +10,8 @@ sym-dff_p_4-pin-clk,82366630-04b3-4364-b9e8-61e577634a55 sym-dff_p_4-pin-d,9f6f6143-56ef-4a10-8c0c-6a664064c94c sym-dff_p_4-pin-pre,5328726c-2910-4dcc-aacf-891ee5c357bd sym-dff_p_4-pin-q,dd5cfa19-3dea-422a-9b97-b13a0f2da4f8 +sym-dff_p_4-polygon-1-sym,e54d0adf-2b86-4de5-beeb-84148068471a +sym-dff_p_4-polygon-2-sym,27229ef1-a138-4a75-aad5-9c6e4282ca55 sym-dff_p_4-polygon-contour,1a46a45a-6385-4347-95ff-e5cddc5e60d0 sym-dff_p_4-sym,a9855853-e5be-4159-8cc7-7126d089a61f sym-dff_p_4-text-name,2fdec625-4d49-4908-bd35-57f91c825b54 @@ -17,6 +20,9 @@ sym-dff_pn_4-pin-clk,dd10715a-93fc-470e-a066-c983d613ea91 sym-dff_pn_4-pin-d,952e1b9c-83b5-47fa-98fb-a19926d3e5ab sym-dff_pn_4-pin-pre_n,e0409772-0974-4ff1-989d-8beb6d903890 sym-dff_pn_4-pin-q,580cb578-ff22-4cdc-a8f8-a7dae11ef8cf +sym-dff_pn_4-polygon-1-sym,ea68a221-0821-47fa-ad9f-3eb642873035 +sym-dff_pn_4-polygon-2-sym,431c6759-9caf-4bc7-a06f-424f79d981b1 +sym-dff_pn_4-polygon-3-sym,10d65662-8bdb-45ae-a870-41a99760a73e sym-dff_pn_4-polygon-contour,003b389b-9e74-43f4-92e7-6e72de1e01b1 sym-dff_pn_4-sym,b252653d-f7e7-4da8-a637-9c153c9611e5 sym-dff_pn_4-text-name,d1821323-7625-40af-a207-d76112ce296a @@ -25,6 +31,8 @@ sym-dff_r_4-pin-clk,2429ae4f-649e-47b1-aac7-eec56f0f836a sym-dff_r_4-pin-d,fe9cf610-e2a6-45e8-91d5-f136551490cd sym-dff_r_4-pin-q,45a25660-000f-4e00-b097-01de2d5f99fe sym-dff_r_4-pin-rst,56c3c61b-0e41-42e3-92fa-46f5287b1344 +sym-dff_r_4-polygon-1-sym,913fcb4e-47a5-4ea1-9772-8d9f33de5613 +sym-dff_r_4-polygon-2-sym,52b381c3-5858-449a-9294-d68522028f8b sym-dff_r_4-polygon-contour,215741b7-35c3-4c46-91c3-652606b46768 sym-dff_r_4-sym,4a3febcd-3201-4573-a841-e33094606d8d sym-dff_r_4-text-name,8f9bebbd-414a-44e2-a291-7b24ddae895c @@ -33,6 +41,9 @@ sym-dff_rn_4-pin-clk,2e5b4bc2-dfe9-40ed-9e50-8347f95eab9c sym-dff_rn_4-pin-d,94b4a365-d14a-42b9-a0f8-fd6abab1cc17 sym-dff_rn_4-pin-q,c2dd8771-9e36-46ac-9d14-17bca156451e sym-dff_rn_4-pin-rst_n,337f2af5-ab75-4596-be4b-946f8d992276 +sym-dff_rn_4-polygon-1-sym,e2a0ef50-c662-4503-ab51-15f677f7b356 +sym-dff_rn_4-polygon-2-sym,ae69a3ca-ecf7-4211-b368-b9b3de9595fd +sym-dff_rn_4-polygon-3-sym,645d1518-ef01-47c7-870f-27a8aa2e2974 sym-dff_rn_4-polygon-contour,0d80e2ae-17b7-45b1-b8d8-563bb762a199 sym-dff_rn_4-sym,1795e5cd-4471-455a-a4d5-92032a358a0d sym-dff_rn_4-text-name,72860bd9-b646-4e6a-8ce0-d10cb11a81ef @@ -42,6 +53,11 @@ sym-dff_rnpn_4-pin-d,a9dc5f13-57ce-4255-8772-9be95597f8c8 sym-dff_rnpn_4-pin-pre_n,0a25ea41-d00d-4f6b-afca-5dcf8e1e5bc5 sym-dff_rnpn_4-pin-q,1af3bf50-fee3-4a54-a601-35aa999aa7a4 sym-dff_rnpn_4-pin-rst_n,fb1cc05c-454a-425d-84d9-8c459be79027 +sym-dff_rnpn_4-polygon-1-sym,058e7011-63b6-46c0-bf0b-060105250c6d +sym-dff_rnpn_4-polygon-2-sym,85ef4bf9-10dd-4357-95a3-f22ac52caa82 +sym-dff_rnpn_4-polygon-3-sym,127239b7-ba1d-446d-9c90-eddca837fa11 +sym-dff_rnpn_4-polygon-4-sym,5092b406-f436-46db-b433-7996ae855d5a +sym-dff_rnpn_4-polygon-5-sym,1a2d33dd-a457-41a5-b3cc-9315ac38d53c sym-dff_rnpn_4-polygon-contour,749ba72d-0380-4db8-9643-3386d0bef3ed sym-dff_rnpn_4-sym,30cd9140-5261-4fc9-b445-db4be16f84fe sym-dff_rnpn_4-text-name,b9ec7882-3e9f-4ec7-abbe-f0d79476a544 @@ -52,6 +68,11 @@ sym-qqn_rnpn_4-pin-pre_n,8a8748ef-013f-42cf-8435-873f1a930bac sym-qqn_rnpn_4-pin-q,33510a60-5a61-4f4f-89bf-f6333475ec98 sym-qqn_rnpn_4-pin-q_n,448d187e-4b0c-42e7-b8b0-34da376a3f96 sym-qqn_rnpn_4-pin-rst_n,a1a83d4f-5958-4d48-8d97-d6a66076b30f +sym-qqn_rnpn_4-polygon-1-sym,2519a832-7c52-4faa-9f9d-98bf8b368301 +sym-qqn_rnpn_4-polygon-2-sym,cd580e25-acd2-4b13-abc7-3adc2f929c3b +sym-qqn_rnpn_4-polygon-3-sym,9571602d-8e4a-4d51-ad3e-2d0f73332580 +sym-qqn_rnpn_4-polygon-4-sym,62659d71-2f36-4c44-96d5-bd50c570c495 +sym-qqn_rnpn_4-polygon-5-sym,e707ded2-c15b-4996-8f25-aaaa63101daa sym-qqn_rnpn_4-polygon-contour,8d7bb023-f773-4dcd-8ab4-8480055bc376 sym-qqn_rnpn_4-sym,6f9a28e8-ed57-4fa1-99d1-3fab2e2c436a sym-qqn_rnpn_4-text-name,469f8b8c-4832-41f4-af87-f296846d46e9 diff --git a/Logic/uuid_cache_gates.csv b/Logic/uuid_cache_gates.csv index 709c4348..40313180 100644 --- a/Logic/uuid_cache_gates.csv +++ b/Logic/uuid_cache_gates.csv @@ -1,6 +1,9 @@ sym-and2_4-pin-a,86101e31-a58d-4dff-86d0-73f0c8e0382c sym-and2_4-pin-b,12d487f4-309d-4ca3-a5c6-9f56fac1bd81 sym-and2_4-pin-out,cc15b9a6-8e72-4086-924f-e194cc1f6ce2 +sym-and2_4-polygon-1-sym,55f42ca5-ac44-4e0c-910e-10ac82bddb6f +sym-and2_4-polygon-2-sym,4145d431-554c-425b-9a37-7be46cb14499 +sym-and2_4-polygon-3-sym,d087ab8d-8f6e-4fce-b762-ab5269c9474d sym-and2_4-polygon-contour,85f7ce97-c567-417e-889d-76a293e66e75 sym-and2_4-sym,05819783-74fa-41b5-af88-3f631a6976d8 sym-and2_4-text-name,50b49425-ae40-45ec-8462-e9ee75d6d4a4 @@ -8,6 +11,9 @@ sym-and2_4-text-value,73c1f9e7-c7af-44a9-9042-1ec79697dcc2 sym-and2_6-pin-a,15479eaa-1dbb-49d2-8acd-4fbbbef965fe sym-and2_6-pin-b,cac418e3-89cb-4bb9-8f87-52c82ebc802b sym-and2_6-pin-out,1776b698-4b1e-4def-99d7-b615f5b9b6fa +sym-and2_6-polygon-1-sym,33eb60a9-27cf-46fb-90f7-b2a3d0557fd6 +sym-and2_6-polygon-2-sym,b0afd854-a538-461a-b5eb-c7ae1534ae71 +sym-and2_6-polygon-3-sym,0a91e266-e0f2-4d29-b57c-2fabc43600ef sym-and2_6-polygon-contour,eecb8977-9365-4215-8528-ed2248deb5a2 sym-and2_6-sym,adaf9181-a460-46ed-8576-f4e13448adbe sym-and2_6-text-name,3312c679-d296-438f-91c1-7fb81814b1f9 @@ -15,6 +21,9 @@ sym-and2_6-text-value,5cd4a9c0-023e-4373-a2b0-b4e551d94b69 sym-and2_8-pin-a,96299d23-c126-4f46-9890-d902ae291e4f sym-and2_8-pin-b,6010fcdb-fe20-4121-a2c2-42699baffb55 sym-and2_8-pin-out,03125a49-3207-4fdb-b32e-1309c1791f9a +sym-and2_8-polygon-1-sym,447d5b76-35ac-455c-be41-4ec63b49914a +sym-and2_8-polygon-2-sym,2a889183-ea23-472a-8304-fbedb027c79d +sym-and2_8-polygon-3-sym,3534293b-387f-4c9e-9445-7d90ca93d688 sym-and2_8-polygon-contour,84b8f96a-5629-4d3c-89d2-77cdbdc3880d sym-and2_8-sym,1d5eab7c-5b95-473e-9ea2-fce0b306a068 sym-and2_8-text-name,716bd6a8-40b6-47ea-92a1-8171c78d87ee @@ -22,6 +31,12 @@ sym-and2_8-text-value,a243bff4-9001-4025-97be-b8e1cb08ceb2 sym-and2_dm_4-pin-a,6d831560-07cf-43df-94ad-ddbe689ec2b3 sym-and2_dm_4-pin-b,f3c799ab-47e8-4801-8442-79cb7b0c0afd sym-and2_dm_4-pin-out,15ea96e3-3858-44d3-b142-6454737ac6d1 +sym-and2_dm_4-polygon-1-sym,e5a71192-95e1-478e-92b9-1ca2a3d152c0 +sym-and2_dm_4-polygon-2-sym,501ec9df-1876-4f95-9685-1e1bf2cd1a8b +sym-and2_dm_4-polygon-3-sym,d7f3deeb-b0d1-45c9-8ee5-a4380d1d5f5d +sym-and2_dm_4-polygon-4-sym,61edb018-98e5-4079-a76f-69d09c6d7156 +sym-and2_dm_4-polygon-5-sym,0ce3ca3e-79c9-4141-b2b3-2e2b1c5fa64c +sym-and2_dm_4-polygon-6-sym,1234d6de-3bc0-49d9-be1d-e2d72f524fa4 sym-and2_dm_4-polygon-contour,2ee385a9-1272-4e1c-ae62-79553ea2cd04 sym-and2_dm_4-sym,75a5cb4e-03b3-4c50-9085-3c6e77eab1a5 sym-and2_dm_4-text-name,af0de7c5-24de-4712-99f5-f761a41474b8 @@ -29,6 +44,12 @@ sym-and2_dm_4-text-value,49c8a7bf-763e-4e4b-8061-1f0e59a7c78d sym-and2_dm_8-pin-a,7f23afd9-2543-47b2-9561-c9563a1caa13 sym-and2_dm_8-pin-b,dbdb992f-eeaa-4c74-a15b-d8d8d9a8ce52 sym-and2_dm_8-pin-out,362dbb80-e48b-4423-bcd7-277d44bb2811 +sym-and2_dm_8-polygon-1-sym,458eb8cb-8bda-4961-93c4-9a62d0f57cff +sym-and2_dm_8-polygon-2-sym,33bf6c77-dd0d-4b76-9fd3-c51ee023f987 +sym-and2_dm_8-polygon-3-sym,2c5add36-17d1-4afa-8757-a4e9db16bb77 +sym-and2_dm_8-polygon-4-sym,96f07a47-3a0a-4ce9-8807-996e23ae7560 +sym-and2_dm_8-polygon-5-sym,a856cc4f-308c-433d-8500-8ce8f9258d95 +sym-and2_dm_8-polygon-6-sym,b3f345d1-7f0e-4793-8680-186e20f9c883 sym-and2_dm_8-polygon-contour,4779143b-b540-4d92-9084-3e0a08fdf4f2 sym-and2_dm_8-sym,2ec2287d-9988-4b9f-8572-4e22e0783465 sym-and2_dm_8-text-name,641229f4-0c9e-4300-88fc-7ccbb822032e @@ -37,6 +58,10 @@ sym-and3_4-pin-a,91cce3ca-ca68-46cc-9f64-8706ca1c2a16 sym-and3_4-pin-b,62515683-56d5-4c44-8fc6-3eefab114e79 sym-and3_4-pin-c,e107aeac-8aca-4a6a-acc3-a6f3a8fda2f5 sym-and3_4-pin-out,7f645e7a-dda6-47f8-aa90-f1e7f6bb14af +sym-and3_4-polygon-1-sym,aca3c78e-347b-4d85-befe-421d112bbac7 +sym-and3_4-polygon-2-sym,e4ac06b0-77f3-4523-8423-342399dd72a7 +sym-and3_4-polygon-3-sym,44810ee8-0ac3-44c8-aa83-5d3e771ed825 +sym-and3_4-polygon-4-sym,2f0ae8b5-d56b-477d-b653-eb14ac6d9523 sym-and3_4-polygon-contour,a8d898ba-eb97-4a5e-acd2-6ddc234a76de sym-and3_4-sym,386725a0-9e95-4262-9761-0ad2fc4eb114 sym-and3_4-text-name,0bfa03b4-b1e4-469f-ada9-9180df2e6919 @@ -45,6 +70,10 @@ sym-and3_8-pin-a,f713063d-891e-46fd-b596-8d9e2f497af3 sym-and3_8-pin-b,db749abe-584a-4124-9234-04305a0d44ab sym-and3_8-pin-c,55b823e8-3fba-4976-b5ed-dcfd0dfaaff0 sym-and3_8-pin-out,549f38a0-8d6b-4a17-8de9-83e0e4bdceb8 +sym-and3_8-polygon-1-sym,07a7452a-8044-40c3-a7df-7548ada31d60 +sym-and3_8-polygon-2-sym,6da3419d-f494-4b5e-9653-46f8d2790a4e +sym-and3_8-polygon-3-sym,a5ef1331-6d9d-40e9-9607-178753132bef +sym-and3_8-polygon-4-sym,cbda304f-01c4-4bd6-8b33-626fc6b52f4a sym-and3_8-polygon-contour,c4a89b3c-f249-4fcd-9d61-b91985cc2264 sym-and3_8-sym,a58b86ea-7795-4afe-9693-497759e2a14f sym-and3_8-text-name,c2ce762c-1e16-4fcb-989e-08f504e7ba70 @@ -53,6 +82,14 @@ sym-and3_dm_4-pin-a,3c037b5c-c0a5-4480-9b16-84eecfe205de sym-and3_dm_4-pin-b,50e58fcc-44d3-49f9-880e-c30056b249ce sym-and3_dm_4-pin-c,e5b9d944-7265-4b1f-a6eb-f9cbc10d5ae7 sym-and3_dm_4-pin-out,10969d00-1f31-41c3-948d-c24bb5efcc30 +sym-and3_dm_4-polygon-1-sym,86c7825a-2738-4f49-bf13-d5e110b34f95 +sym-and3_dm_4-polygon-2-sym,a8d266ea-fc6b-46c7-832b-9f1a322b1313 +sym-and3_dm_4-polygon-3-sym,d88ddafb-85d0-4436-a66b-e0f84c5861d6 +sym-and3_dm_4-polygon-4-sym,65f8cc4d-b4b7-424b-8c2f-5c848a5843ee +sym-and3_dm_4-polygon-5-sym,321c85cb-85a2-4d56-b6d2-6617d910cfff +sym-and3_dm_4-polygon-6-sym,cc545749-b58a-4d03-a79c-3ba2920c73dd +sym-and3_dm_4-polygon-7-sym,b34bacdf-2cc3-428a-8ffc-99474ae416fd +sym-and3_dm_4-polygon-8-sym,afc8f1da-d0d0-4332-92a4-e20c2d923a0e sym-and3_dm_4-polygon-contour,92231b7a-895b-4109-908d-6c85a82565b5 sym-and3_dm_4-sym,a1f50d3c-1567-4068-ae08-2dcfbfbb2e2f sym-and3_dm_4-text-name,bed92559-1ebe-452d-ad4f-f1047549ac69 @@ -61,6 +98,14 @@ sym-and3_dm_8-pin-a,546326cb-e1a6-419f-baa4-dc40c4142a25 sym-and3_dm_8-pin-b,422ff9a2-c468-40d9-abd3-d288bb9b819e sym-and3_dm_8-pin-c,1ff50424-b739-4c2b-abc6-ad2bef6076ed sym-and3_dm_8-pin-out,df56b35c-600d-4609-a15f-e9d641570e21 +sym-and3_dm_8-polygon-1-sym,e6f3b32e-fb95-433b-a703-bbe159feafd7 +sym-and3_dm_8-polygon-2-sym,21d7e0e7-1f1c-497c-9a8b-5e20c78de36b +sym-and3_dm_8-polygon-3-sym,1b497255-ca9b-417d-96f5-04f8c74167d0 +sym-and3_dm_8-polygon-4-sym,828059b3-b610-4b1b-abcc-c19db338c375 +sym-and3_dm_8-polygon-5-sym,3888c935-537e-4fcc-bd79-bfbb2448c1aa +sym-and3_dm_8-polygon-6-sym,f1ba3407-965f-488a-8930-72129988845e +sym-and3_dm_8-polygon-7-sym,43de5ee6-e12f-4317-8c5b-cfd81175419f +sym-and3_dm_8-polygon-8-sym,0bb75f41-a678-415d-88ed-17606dc26314 sym-and3_dm_8-polygon-contour,3c778c6e-d432-4860-898a-ada64d6fcdfc sym-and3_dm_8-sym,40ef2d8d-1647-41f1-88a4-2a2bd5b08de8 sym-and3_dm_8-text-name,48ac29dd-e84b-4cd5-98c5-56d33b41d7a9 @@ -70,6 +115,11 @@ sym-and4_4-pin-b,664b4cf5-7718-4f85-acf3-0912d1c2c5f7 sym-and4_4-pin-c,4ba20a04-7384-4190-ba32-d3a0274fdd04 sym-and4_4-pin-d,6da595d4-6ae3-4072-88f2-67b064a6174f sym-and4_4-pin-out,677ce88e-7b35-42a5-af47-621ae290a84d +sym-and4_4-polygon-1-sym,e3834044-1a5b-46de-8802-21b7cf147436 +sym-and4_4-polygon-2-sym,08221e62-8123-4810-98b1-4cb9bb36028d +sym-and4_4-polygon-3-sym,0c15a91a-fc5e-462c-ad15-2d097ccc4f18 +sym-and4_4-polygon-4-sym,79a9d0d5-a7a4-4a95-9a52-833d91c8d47f +sym-and4_4-polygon-5-sym,5e9b26e7-6d06-4f6e-a636-ab7a7971f13c sym-and4_4-polygon-contour,a36d2ec9-2fde-4855-bec9-f612712bf6dc sym-and4_4-sym,f5c271aa-810f-4fda-aae2-beba9b41ea29 sym-and4_4-text-name,4bd74ec7-8a59-4a10-9582-33309e2b1c46 @@ -79,6 +129,12 @@ sym-and4_8-pin-b,18eb4b09-8cf0-452a-bb68-5b4f98c317da sym-and4_8-pin-c,2ceb81a1-335b-4512-bf95-7445234246d9 sym-and4_8-pin-d,1dd2210f-1b15-4306-99b3-04bb8cc7199a sym-and4_8-pin-out,1281fcca-b43f-48a9-87c3-7115b1cadfdf +sym-and4_8-polygon-1-sym,7e77a49a-d0c4-498f-b043-3d49e0fdc3dc +sym-and4_8-polygon-2-sym,8ae1c9f9-e63d-4f21-9ea5-2ad106863bc8 +sym-and4_8-polygon-3-sym,1b52dfe7-2790-47b1-9eab-7807ce131a6a +sym-and4_8-polygon-4-sym,f0692e11-2e7c-432c-b71c-e6c33973d56f +sym-and4_8-polygon-5-sym,077494e9-827a-462f-99fe-f252b9ca54ba +sym-and4_8-polygon-6-sym,15dd59b6-3faf-4180-b8e0-daac0c7cdfe7 sym-and4_8-polygon-contour,c704f211-e466-48f4-825e-38eb2a52834e sym-and4_8-sym,cc016829-58ad-47a3-add3-4b90903de03b sym-and4_8-text-name,ba8d6238-f543-429c-9cdb-98a4969ffe6c @@ -88,6 +144,16 @@ sym-and4_dm_4-pin-b,6fa8a4fc-c5cd-4d1b-b552-54cc3fc2e1e3 sym-and4_dm_4-pin-c,cbf87a6c-1953-4276-bb9c-089a01c5dac9 sym-and4_dm_4-pin-d,75e4228b-afeb-4ca6-9dfa-b3b88af19d5f sym-and4_dm_4-pin-out,9750c616-6bd4-4cfa-8f14-de314bac8593 +sym-and4_dm_4-polygon-1-sym,a58473a2-6054-4a8d-bf49-7e63e1a15189 +sym-and4_dm_4-polygon-10-sym,5f043b5d-7da9-41ea-b723-e71e95c9d75a +sym-and4_dm_4-polygon-2-sym,3b77bda4-22db-4674-9961-104086bf6e63 +sym-and4_dm_4-polygon-3-sym,efa358f1-7084-4281-acea-d0d360e71d67 +sym-and4_dm_4-polygon-4-sym,735fa95f-e55e-4a08-ac90-7bb787584ed5 +sym-and4_dm_4-polygon-5-sym,ace71dc7-08c4-42ef-a7d8-978afe681322 +sym-and4_dm_4-polygon-6-sym,d2a52fdb-fe63-4a87-903b-109582125195 +sym-and4_dm_4-polygon-7-sym,06ed9dc0-efc7-48ab-a38c-b5503fe34ffd +sym-and4_dm_4-polygon-8-sym,5a95e98e-73f0-488d-905f-cac649c8553c +sym-and4_dm_4-polygon-9-sym,93d7b838-c667-46fc-8c9c-cc115f5c722b sym-and4_dm_4-polygon-contour,0ad67861-06ff-4c64-b310-294cd85c0511 sym-and4_dm_4-sym,cc9c541a-aa3e-43fb-bd59-9c71d9b1f869 sym-and4_dm_4-text-name,8e0dfe9f-cb28-4f73-a14d-96795cecb4fc @@ -97,6 +163,16 @@ sym-and4_dm_8-pin-b,619564a4-b694-4e24-9816-972de591e6ea sym-and4_dm_8-pin-c,0905e7bb-dd3f-4ee0-805b-8d70f3a5ea6d sym-and4_dm_8-pin-d,b5d3d145-1598-44b9-9d71-888eb1273eab sym-and4_dm_8-pin-out,0d30fcdc-2b3b-476a-b926-512f28c4bd0f +sym-and4_dm_8-polygon-1-sym,883d979a-20aa-4095-8e95-0d904c8595a7 +sym-and4_dm_8-polygon-10-sym,d1fad7ac-02a2-46fd-b22c-b22abeabece2 +sym-and4_dm_8-polygon-2-sym,6faca398-1f22-4bd7-be8f-baee39678bcf +sym-and4_dm_8-polygon-3-sym,8404c136-1988-41e5-867e-c634398ced2a +sym-and4_dm_8-polygon-4-sym,8f4271b5-8f1c-4a85-8c6f-bf140a4e7141 +sym-and4_dm_8-polygon-5-sym,e374c712-7839-45f9-ba11-389236870492 +sym-and4_dm_8-polygon-6-sym,a9c3e31b-4036-4e66-ab08-dc00125488d3 +sym-and4_dm_8-polygon-7-sym,88cbc341-6779-4cd9-98a1-a1db39af79df +sym-and4_dm_8-polygon-8-sym,74c3f415-2bbd-485c-b6a3-6b708128ef30 +sym-and4_dm_8-polygon-9-sym,9e8bff68-427f-4994-b1af-c6de02628f1d sym-and4_dm_8-polygon-contour,cc55a41a-0b56-4d4f-946e-df132e159609 sym-and4_dm_8-sym,f5ce23eb-5ce4-4952-a1ca-31e7b91c153f sym-and4_dm_8-text-name,47d8c68d-dd17-4e1c-814a-efc6fe8cefc4 @@ -108,6 +184,14 @@ sym-and6_4-pin-d,233fe0bc-4215-4cad-a59a-ec8876982dd8 sym-and6_4-pin-e,bafac554-430f-44d1-bd72-bbb09c065f03 sym-and6_4-pin-f,47a1c680-8e3e-44cf-9b50-bae059a66948 sym-and6_4-pin-out,7f9d3fbc-7a25-4343-9142-6625ecf1c13d +sym-and6_4-polygon-1-sym,718be557-120d-4d2b-9c99-75c44cc3c63b +sym-and6_4-polygon-2-sym,3d8ea40f-1837-4f91-a18e-caca0e5483ac +sym-and6_4-polygon-3-sym,941975d1-bdce-44d7-a35f-7b6f673c90c1 +sym-and6_4-polygon-4-sym,484f3d87-32e7-4fbe-85be-7c75c15c91fc +sym-and6_4-polygon-5-sym,3557279a-6b93-48b6-8c51-9ec790df52b0 +sym-and6_4-polygon-6-sym,74d215c7-8ff1-405f-adc7-8996326b7d69 +sym-and6_4-polygon-7-sym,0b48b9c7-bcee-453d-9f0a-09006df183f3 +sym-and6_4-polygon-8-sym,2e36435d-066f-471c-83ad-8d4d8a25aebc sym-and6_4-polygon-contour,02d78719-2d53-4ef1-98c0-a659964db585 sym-and6_4-sym,90b69ceb-a5c8-4612-839d-1769a9d2cc9b sym-and6_4-text-name,301bf55f-0150-432d-9bd7-502b7824fc60 @@ -121,30 +205,44 @@ sym-and8_4-pin-f,679db82d-cd06-44c6-87eb-b826dda4d8a5 sym-and8_4-pin-g,40fd9dd8-4bea-4503-8d2c-f9e8f8397abc sym-and8_4-pin-h,d6871d2e-d51e-4467-aea4-6d8d601aa84b sym-and8_4-pin-out,0e9883f4-56dc-40a0-bfa5-98c6cbc69d71 +sym-and8_4-polygon-1-sym,8279480a-3109-4c14-8e10-5ddfdddee89e +sym-and8_4-polygon-10-sym,21a7154d-21c8-4240-8e14-16e8dcd077b1 +sym-and8_4-polygon-2-sym,a9fc74a9-c421-4432-b8c8-f1cb773e8fb4 +sym-and8_4-polygon-3-sym,b330cf7e-83b9-4229-8c4a-2731059b3a3e +sym-and8_4-polygon-4-sym,54039ae6-3a98-4edf-afbb-9928ffdb0656 +sym-and8_4-polygon-5-sym,7f326b4a-d26c-49fb-978e-3b9a66ee942f +sym-and8_4-polygon-6-sym,dedf5723-bcad-409c-b80a-91e8e091ac7d +sym-and8_4-polygon-7-sym,3d6d3b79-a6fc-4960-9c80-0f62474c878b +sym-and8_4-polygon-8-sym,58f167b0-bdce-48db-a5d0-92d369249242 +sym-and8_4-polygon-9-sym,f4b76fa2-29ea-46b8-9b1f-c61c5cac415f sym-and8_4-polygon-contour,bcc98464-f79c-4025-a522-58156811e582 sym-and8_4-sym,dc118934-41d7-49ab-a0fe-0fb78d2f31bc sym-and8_4-text-name,e13e940d-31da-4d0a-b977-030051953a66 sym-and8_4-text-value,76e7ac76-8c88-4b50-8fb6-10fe688ca43d sym-inv_4-pin-a,cecb1a45-c0a4-4782-95c4-7b1099b1dbb3 sym-inv_4-pin-out,e3a53677-898f-4106-ba9f-7257bee9e5cf +sym-inv_4-polygon-1-sym,e9442dbb-edaf-4e17-9fdf-17da4e2e0ebc sym-inv_4-polygon-contour,4e856918-3010-45cd-be9f-16e6653698c2 sym-inv_4-sym,a440f00e-fa41-4736-90b5-703d77554075 sym-inv_4-text-name,6ea55fc4-ee4d-4a8d-8211-5c8a0f0ae0e6 sym-inv_4-text-value,8df4708a-0c7d-4896-bf99-f73872dc6af9 sym-inv_6-pin-a,45c72c76-da74-4a4e-9664-3747d3912b0f sym-inv_6-pin-out,accd37a5-a329-4d28-a152-71f932e15d15 +sym-inv_6-polygon-1-sym,8f89a528-4f71-445f-8f2a-9705dfeda3e0 sym-inv_6-polygon-contour,405db82a-2779-4fe2-8fe4-036077eee6d7 sym-inv_6-sym,0451538b-6b26-45c0-bd61-5840bb22212d sym-inv_6-text-name,61d96ade-7431-4f70-9de5-e9d2b7206451 sym-inv_6-text-value,b0988889-a9c8-4b09-ada9-b2fac9f77e69 sym-inv_8-pin-a,49323d6d-0ed1-4a5a-ba5d-dd3b6635b1dc sym-inv_8-pin-out,7083a62f-849a-486b-adca-a1391430caa6 +sym-inv_8-polygon-1-sym,94882b55-3fee-44a7-9492-77f173e00fad sym-inv_8-polygon-contour,13bfd555-6667-4d54-8f56-20ff6955f050 sym-inv_8-sym,ea2f70dd-ad70-47cc-aa6e-e540c2189bdc sym-inv_8-text-name,592aa219-6c0b-4513-8b62-969aa97c65e4 sym-inv_8-text-value,58ce8b20-d991-436f-8a79-03fdff018828 sym-inv_i_4-pin-a,a68f42d2-2064-49c9-901b-de419829e4d4 sym-inv_i_4-pin-out,04dd5535-8506-4514-921c-0da380400ef3 +sym-inv_i_4-polygon-1-sym,f1ecccd3-f5ba-4865-8061-7b030b2dc3ae sym-inv_i_4-polygon-contour,0110f0a4-6dc4-4543-a444-6b71b9fe291e sym-inv_i_4-sym,bef95e15-b97b-45aa-9f3a-e39eae38d664 sym-inv_i_4-text-name,2692a175-dbea-410c-b04b-e45a0fbcb5ea @@ -152,6 +250,10 @@ sym-inv_i_4-text-value,8722997d-addc-481e-9f1f-ffd49bf5af64 sym-nand2_4-pin-a,be95e331-433f-4364-b2ef-3b6375dd0a79 sym-nand2_4-pin-b,e43e34e9-7552-44e2-a9c0-7e30b9d11fe8 sym-nand2_4-pin-out,e7c64f38-8b4c-431d-ad0a-d74e2645545d +sym-nand2_4-polygon-1-sym,0e998241-bfe4-4b8d-ba09-425389e1f40d +sym-nand2_4-polygon-2-sym,e95c0881-1cc4-4d27-8ae8-829718847a7b +sym-nand2_4-polygon-3-sym,cd23a577-c0dc-428b-9d1b-db64555d443c +sym-nand2_4-polygon-4-sym,f77784e7-d7ee-4783-a997-dfb6d39dca23 sym-nand2_4-polygon-contour,5a4ad0c9-ab9c-479f-a4ea-df756b49e120 sym-nand2_4-sym,33d9b808-8012-4d57-b6f6-51b360e38ef2 sym-nand2_4-text-name,218f116b-d6c6-4dca-8dff-b95679ef3067 @@ -159,6 +261,10 @@ sym-nand2_4-text-value,d719858a-cb76-47fc-9e8c-927dabcb2c9f sym-nand2_6-pin-a,7eb9a289-1e64-419f-a04d-cf0ed6d4f715 sym-nand2_6-pin-b,460e2848-ebac-40a2-9f4d-4f0fa2b76a87 sym-nand2_6-pin-out,db2f92a7-0db8-46d0-937e-8abe8d5ef2d6 +sym-nand2_6-polygon-1-sym,0efadb3b-9915-4343-bf5b-daf758ea9c8d +sym-nand2_6-polygon-2-sym,9bfe85e4-6a69-42c0-b52b-49f72dcc9942 +sym-nand2_6-polygon-3-sym,90804eb6-fd03-4146-bc61-bb68d7eed622 +sym-nand2_6-polygon-4-sym,d070dc71-2eb3-4cc6-8591-6d1989eec933 sym-nand2_6-polygon-contour,4ba8d92b-8055-418e-8d32-73ce0e72ee2e sym-nand2_6-sym,6798843c-7e11-40a6-bbe0-c80dd78eb507 sym-nand2_6-text-name,6a82f2a3-5397-4c81-98e7-fa10960ae3bf @@ -166,6 +272,10 @@ sym-nand2_6-text-value,3d24ce7b-5f87-49cb-85c7-50e0abc287e6 sym-nand2_8-pin-a,9b823a88-9626-4978-b7c5-29a1167d3d2c sym-nand2_8-pin-b,c2cd7e2b-b281-4817-aa41-c77a8864432b sym-nand2_8-pin-out,e3ce5311-3039-4e9c-9322-17e4b3226b19 +sym-nand2_8-polygon-1-sym,2b4c0bc9-f6da-421e-83bb-a4e13d2ac9f6 +sym-nand2_8-polygon-2-sym,e29fe158-1934-4f2f-943b-c3447373a1b3 +sym-nand2_8-polygon-3-sym,dbe59c5b-cb5b-4fa8-8f27-4464d77986ad +sym-nand2_8-polygon-4-sym,f0de0d47-ae32-40e2-bf8e-ccff83bee83b sym-nand2_8-polygon-contour,fd606a6a-8228-4a65-b80a-67d5151913b3 sym-nand2_8-sym,be980977-9907-4a03-800e-b050e9576e83 sym-nand2_8-text-name,a68bf33c-ee9e-4388-b2ec-61e4bf9133b0 @@ -173,6 +283,11 @@ sym-nand2_8-text-value,7699f2d3-cb47-44d2-b902-5b52e0ae1328 sym-nand2_dm_4-pin-a,eec34ae9-e62c-48ca-a31f-e342ecac668f sym-nand2_dm_4-pin-b,b0e56074-ff8f-4720-b417-22a415e266bf sym-nand2_dm_4-pin-out,ae2e8257-6cc2-4965-aeb1-ecd1844c47ba +sym-nand2_dm_4-polygon-1-sym,597b29bf-8c4a-47ff-9873-44885eb32166 +sym-nand2_dm_4-polygon-2-sym,e0806a18-f988-4cb5-b0a1-1605764ec40c +sym-nand2_dm_4-polygon-3-sym,96bb83d4-ce74-486d-8c22-b3448a54f44b +sym-nand2_dm_4-polygon-4-sym,1c5ec11a-1156-4bc5-b706-05f2e8936627 +sym-nand2_dm_4-polygon-5-sym,dcfac6ac-a958-4fa7-881e-1c78c303b8c4 sym-nand2_dm_4-polygon-contour,6285d5e6-fa80-485e-b79e-4218606d71f4 sym-nand2_dm_4-sym,152d9f9d-3bfd-484e-bab3-3e7cc9d57707 sym-nand2_dm_4-text-name,7054a34d-8cf0-426e-a393-6a9fc5826a44 @@ -180,6 +295,11 @@ sym-nand2_dm_4-text-value,3bb5c45b-4e15-4fee-ba17-9875a7f76c2f sym-nand2_dm_8-pin-a,98f71f8c-267b-404e-b330-c95ed76410d7 sym-nand2_dm_8-pin-b,1cdfb4dc-05ef-482f-a932-a4546abdf164 sym-nand2_dm_8-pin-out,bf4ab288-c8a7-4ed5-ba3e-b67c568d4c4c +sym-nand2_dm_8-polygon-1-sym,9cd38fe3-fb29-4c30-afa5-e3d4b0a88052 +sym-nand2_dm_8-polygon-2-sym,2afe0280-5771-46a6-b927-1cd941a08bcf +sym-nand2_dm_8-polygon-3-sym,64763419-6c96-471e-bb22-88dbef0418f0 +sym-nand2_dm_8-polygon-4-sym,2c72b1c3-97f0-410a-8d57-df8e2cac0580 +sym-nand2_dm_8-polygon-5-sym,e0600bce-8448-4cfb-a3d3-18b10d2fd763 sym-nand2_dm_8-polygon-contour,6b45cebb-736e-4166-b51d-91f809ce9fc9 sym-nand2_dm_8-sym,89f0fd74-1964-4c78-b68c-6717b6864f34 sym-nand2_dm_8-text-name,e06e70b8-0da9-468c-b423-dfa058c94958 @@ -188,6 +308,11 @@ sym-nand3_4-pin-a,06f663d5-3d96-4aa6-9951-84e4ba6d1164 sym-nand3_4-pin-b,cfa5a5dc-d41e-427a-bcd3-e57d90ff8687 sym-nand3_4-pin-c,881d6e35-4a01-4f9b-b5f0-a58551dce61e sym-nand3_4-pin-out,2f86dece-ae73-43d0-b3fe-7c799c02ff55 +sym-nand3_4-polygon-1-sym,314e356c-68e8-4129-82d1-9ae0d94a8f60 +sym-nand3_4-polygon-2-sym,d856162c-6d67-4827-8ba8-484277020c00 +sym-nand3_4-polygon-3-sym,02500908-fd1d-4869-8ec1-9fa05ddab964 +sym-nand3_4-polygon-4-sym,4d73cef6-c481-411e-826a-899ae574ad94 +sym-nand3_4-polygon-5-sym,c38f3850-60d8-40b2-9b8d-3a803d36e0d2 sym-nand3_4-polygon-contour,f410c182-ad05-47da-9eec-24ac6d9f84d7 sym-nand3_4-sym,28a55165-1447-45b3-a5a8-f3071db2d4ec sym-nand3_4-text-name,d70ff16b-1826-4306-9953-4d53a8c2913f @@ -196,6 +321,11 @@ sym-nand3_8-pin-a,a7fe9eac-8d22-448c-b710-d5df62e9ad49 sym-nand3_8-pin-b,98e47102-1c2b-4f0b-aa17-33a1d243e59e sym-nand3_8-pin-c,6fab44ec-f742-43e3-9e63-b30d19aa62d9 sym-nand3_8-pin-out,03b7fb7a-c420-4371-8387-acfbebaf3a2f +sym-nand3_8-polygon-1-sym,3cf13412-84a0-43a0-a2e3-1820bf7d6cd5 +sym-nand3_8-polygon-2-sym,58e34dec-0311-4a31-874d-5565f20f44fb +sym-nand3_8-polygon-3-sym,b68eff5c-beb0-476d-bf7a-40c25cc1f9b0 +sym-nand3_8-polygon-4-sym,9d27e676-f64c-42bc-b45b-9a5348716ec4 +sym-nand3_8-polygon-5-sym,bc3650c9-33bd-4b86-9b10-e8484568a45f sym-nand3_8-polygon-contour,0ce120d4-a092-44c6-b7b2-e3c2b9d216c1 sym-nand3_8-sym,8e831381-b3e0-4b51-bc2b-fd1a27c8861b sym-nand3_8-text-name,bd62c812-80d7-4e4e-ada9-d44bfdea297d @@ -204,6 +334,13 @@ sym-nand3_dm_4-pin-a,5f1a4d42-bd2e-4189-a8b5-d47d6c6148a3 sym-nand3_dm_4-pin-b,eaac20cd-e135-41a4-9085-96db4fcc9212 sym-nand3_dm_4-pin-c,2ff60ea4-7afb-4549-bda7-6c19521e8ca5 sym-nand3_dm_4-pin-out,71a0b42c-f952-4dfd-ad6b-f8706356b130 +sym-nand3_dm_4-polygon-1-sym,c2df9971-a6dc-4dfc-bd49-18c1070bad13 +sym-nand3_dm_4-polygon-2-sym,f495770a-3a9f-430f-8591-3ad1df3554db +sym-nand3_dm_4-polygon-3-sym,2f656c7c-b6de-4aec-8c8b-b54ad9eb336a +sym-nand3_dm_4-polygon-4-sym,483acd45-01ba-4c19-b9a3-cf9c4f7fb0bc +sym-nand3_dm_4-polygon-5-sym,be140e67-b614-4373-89e7-5bff67a944f6 +sym-nand3_dm_4-polygon-6-sym,9fb791f2-257b-4db6-af4b-6425bbdbe817 +sym-nand3_dm_4-polygon-7-sym,2c9a7162-6d6e-4dcc-8381-83cb326d11ba sym-nand3_dm_4-polygon-contour,6238b46c-7bc8-40be-af9a-5e84a02772b5 sym-nand3_dm_4-sym,613c175e-ad55-4544-bc53-76520f91162b sym-nand3_dm_4-text-name,1e78aa79-2000-4c61-a014-b9860a70d950 @@ -212,6 +349,13 @@ sym-nand3_dm_8-pin-a,18dede3d-a11e-4041-950e-139ed66757a4 sym-nand3_dm_8-pin-b,937974e1-7256-4478-87e3-e09ab80ceb53 sym-nand3_dm_8-pin-c,91333fa2-ef88-4401-bcd9-f0a0d9b3a6a9 sym-nand3_dm_8-pin-out,78ae7a5c-bb65-416c-97b3-597e09155fe0 +sym-nand3_dm_8-polygon-1-sym,c3b1782b-c4ad-4852-ab6f-e618b07388b2 +sym-nand3_dm_8-polygon-2-sym,c412ed3c-7f4c-4bec-ada6-b1d1fb509580 +sym-nand3_dm_8-polygon-3-sym,7dfb485b-8479-449b-90cc-622cd072612f +sym-nand3_dm_8-polygon-4-sym,5d659ee0-32de-441b-9482-8a676b696ca9 +sym-nand3_dm_8-polygon-5-sym,d9197424-6af2-48bc-821d-49a872171f3a +sym-nand3_dm_8-polygon-6-sym,1f8b41d7-a587-491d-a2b6-7fe440de545a +sym-nand3_dm_8-polygon-7-sym,54ff8ed4-2c38-4914-ad58-03187ca9c8e8 sym-nand3_dm_8-polygon-contour,7b7bb599-5460-4679-94a2-6445e71baeac sym-nand3_dm_8-sym,3e0703e0-7450-4fba-bb29-548a2cd990db sym-nand3_dm_8-text-name,1a42a73e-aa9c-4c64-a5bd-a059e3e3b37c @@ -221,6 +365,12 @@ sym-nand4_4-pin-b,e91835d5-69d4-4bc8-ad5f-958e036fda41 sym-nand4_4-pin-c,ba9178bc-755a-4aae-8f29-87329c6fb54a sym-nand4_4-pin-d,2a7b6b44-fee7-4986-9c40-66fad489c853 sym-nand4_4-pin-out,84bbfbb9-e09f-4e34-8289-398904ec2667 +sym-nand4_4-polygon-1-sym,37718e0c-a3fd-4b2a-9e7f-4d20e8b7f5eb +sym-nand4_4-polygon-2-sym,7d4b72c1-4ae6-48d4-8022-bbad7f1d1ba9 +sym-nand4_4-polygon-3-sym,18919f21-984f-45e0-b952-0c2ec0fb559a +sym-nand4_4-polygon-4-sym,07e5acbe-c7e3-4f75-b43b-0bdc9438909e +sym-nand4_4-polygon-5-sym,cca608d3-18b1-4126-88ba-8d82b90ea5ef +sym-nand4_4-polygon-6-sym,371b8863-5aaf-4ff2-b659-5e6c8c5b0d2a sym-nand4_4-polygon-contour,e60dde76-6c08-4994-9264-84095a889b2e sym-nand4_4-sym,08c3f893-d142-4d8a-ab39-2478cfe67e92 sym-nand4_4-text-name,61dc2eb7-d561-4cfc-9693-ccfe8bb45458 @@ -230,6 +380,13 @@ sym-nand4_8-pin-b,f4a2e898-a161-450a-bb82-132156fd13da sym-nand4_8-pin-c,5ddd12dc-66fc-4aaa-bac2-c23a8807a88b sym-nand4_8-pin-d,35855d22-7d43-4222-b32e-b8a5a59c9ff6 sym-nand4_8-pin-out,3c866e1e-423d-4da6-b72f-b53808952160 +sym-nand4_8-polygon-1-sym,c64f1aa4-f4b4-4c6c-b079-a3607e53bcc1 +sym-nand4_8-polygon-2-sym,bca55ffe-603c-4a31-960d-35cd0bcebba0 +sym-nand4_8-polygon-3-sym,98872116-5636-4952-9331-a5adc62f2a82 +sym-nand4_8-polygon-4-sym,83c7177d-9116-4283-a485-706d6b99243d +sym-nand4_8-polygon-5-sym,148797b1-5e7e-4b78-b75f-b9e3407588a5 +sym-nand4_8-polygon-6-sym,896f8401-f51b-47f9-97ba-5226ece7d903 +sym-nand4_8-polygon-7-sym,629d9d57-1d97-4940-8154-7f1dc90dbdca sym-nand4_8-polygon-contour,4c6e1517-b286-496e-879f-88eaeba21f8f sym-nand4_8-sym,95bcc0ac-3ed3-4221-a009-e230803ed659 sym-nand4_8-text-name,5e6739e5-8e29-4bbc-a610-7bd7e35e42c6 @@ -239,6 +396,15 @@ sym-nand4_dm_4-pin-b,c51f7665-708b-4220-9ae5-1659864af8bd sym-nand4_dm_4-pin-c,5b62e8d6-7455-4b7d-8f23-96c9ce46432e sym-nand4_dm_4-pin-d,33fb056e-0220-4dd0-a997-77385b182167 sym-nand4_dm_4-pin-out,3666ac6b-8c86-4424-8c38-621a3edbac34 +sym-nand4_dm_4-polygon-1-sym,033e40c0-22b4-4f77-b9ef-267e7215ed5e +sym-nand4_dm_4-polygon-2-sym,c5cf1832-2699-4f09-8377-46953cc3d01f +sym-nand4_dm_4-polygon-3-sym,f4346ad0-7393-4087-a8d7-9a3a82d71cd7 +sym-nand4_dm_4-polygon-4-sym,0a563032-16ee-4d03-9cb3-45178ec26a68 +sym-nand4_dm_4-polygon-5-sym,8df96376-a805-4fe6-a8b9-b938572dfb1d +sym-nand4_dm_4-polygon-6-sym,344e46e2-5d9c-4bd1-b2cd-c94abaca881b +sym-nand4_dm_4-polygon-7-sym,e13b660e-042c-495f-b413-289f5cca7e73 +sym-nand4_dm_4-polygon-8-sym,4763f508-8f33-4d69-88bb-45a1d070bf08 +sym-nand4_dm_4-polygon-9-sym,895a8035-4515-49a4-a76d-78fbe5260dbe sym-nand4_dm_4-polygon-contour,8d550747-8671-4325-89ee-f521851ef48e sym-nand4_dm_4-sym,5cbc9361-9d4d-4e85-9aa4-a563c8b2bfeb sym-nand4_dm_4-text-name,6fb6f3a8-b468-455a-88db-14173ec83f54 @@ -248,6 +414,15 @@ sym-nand4_dm_8-pin-b,247c9d34-32e3-4a8f-8bae-1d7d87271ce6 sym-nand4_dm_8-pin-c,b86aacc5-c65f-4f8f-baa6-e359da654af1 sym-nand4_dm_8-pin-d,5111b46e-e410-44a2-a593-4355b20ee45a sym-nand4_dm_8-pin-out,f7a857a9-e65f-4777-b0a1-2e4fca27c6cd +sym-nand4_dm_8-polygon-1-sym,30aa7ac6-2116-420f-b275-4ea689571702 +sym-nand4_dm_8-polygon-2-sym,2bda436a-4b3f-4d22-a9eb-8fdf00111ca8 +sym-nand4_dm_8-polygon-3-sym,d0eb0d26-0458-4f2a-a612-e23cc0c13945 +sym-nand4_dm_8-polygon-4-sym,e10c5aaa-6148-433a-a01d-48f69aec6861 +sym-nand4_dm_8-polygon-5-sym,447a86e5-80fe-4135-b17c-b4e08928b83e +sym-nand4_dm_8-polygon-6-sym,d06238e6-8941-47c4-b785-479a67870850 +sym-nand4_dm_8-polygon-7-sym,42a84eb4-117b-4b56-9eba-41bed4f60602 +sym-nand4_dm_8-polygon-8-sym,69a5a52b-982e-493a-b553-a7793f32bd10 +sym-nand4_dm_8-polygon-9-sym,54ee44e8-6edc-4267-9ea6-f9541bb9bf22 sym-nand4_dm_8-polygon-contour,ce9fa492-d028-4716-8092-7d59b0ed6109 sym-nand4_dm_8-sym,e2c2b229-c779-424e-86e7-9c6f198f47ae sym-nand4_dm_8-text-name,51287de6-1701-49f5-9310-10bd3671270b @@ -259,6 +434,15 @@ sym-nand6_4-pin-d,0b68c257-df6d-414f-9b04-7f645d44bbe9 sym-nand6_4-pin-e,f507c76c-9771-49d2-ad0b-88a5ce8caa97 sym-nand6_4-pin-f,b55d8b08-0391-4b68-9a9d-633b928e409b sym-nand6_4-pin-out,374d6462-304a-4630-92f3-c6fbfcfa3a88 +sym-nand6_4-polygon-1-sym,b69759fe-55ff-4a81-bda7-d49cbc07b188 +sym-nand6_4-polygon-2-sym,ec591007-5c3a-4a55-aeb0-ef49da7972ff +sym-nand6_4-polygon-3-sym,fc83dfb9-850d-469e-869d-5456fce5a630 +sym-nand6_4-polygon-4-sym,9047dae6-f7b2-4b43-bbcd-44ef1f345804 +sym-nand6_4-polygon-5-sym,7e7df0f8-d60d-4eb1-bcca-9c3a3639b432 +sym-nand6_4-polygon-6-sym,c993a824-2c0f-43d4-b1ae-48af77477091 +sym-nand6_4-polygon-7-sym,a887bd74-4b77-4fd2-8889-2edcd82bfd77 +sym-nand6_4-polygon-8-sym,6ff9fa9f-ced4-4faf-ae71-19f1f08a57b0 +sym-nand6_4-polygon-9-sym,67d3cd41-8cc0-43d9-b4a1-2f7cfbb165c0 sym-nand6_4-polygon-contour,da8fa4be-052d-4dca-861f-3bd774fce07e sym-nand6_4-sym,c469e1ba-bc52-4934-8d2b-cd9a29cfbd86 sym-nand6_4-text-name,0f371729-0e21-4c13-bad2-7ab16216b67f @@ -272,6 +456,17 @@ sym-nand8_4-pin-f,5fd50677-1b7c-4803-8d06-d6ff1751bec8 sym-nand8_4-pin-g,8201125c-6d34-49d2-8705-1d677d061ab1 sym-nand8_4-pin-h,7c208d8b-b894-47a2-ae11-681d1a74f1f3 sym-nand8_4-pin-out,36ffb0c7-18be-4ecb-bf87-3a6b653ae741 +sym-nand8_4-polygon-1-sym,1e592ed5-b133-42e2-8de5-ec720368d6b9 +sym-nand8_4-polygon-10-sym,b88087ac-9ac8-44b3-8d44-d7404150cd65 +sym-nand8_4-polygon-11-sym,b9f67a9e-bc3f-4c09-868b-d5ca4156496b +sym-nand8_4-polygon-2-sym,d7c98884-4568-4be3-b5e6-8858473a4898 +sym-nand8_4-polygon-3-sym,1203883a-8ecb-40a5-8508-5bda9092e7a9 +sym-nand8_4-polygon-4-sym,f245c9ea-ae00-4959-b72b-00e57cbda9ab +sym-nand8_4-polygon-5-sym,034f2383-358d-4602-8a37-ff960069bd0e +sym-nand8_4-polygon-6-sym,e43426cf-ceef-46a7-9f8c-67699c622445 +sym-nand8_4-polygon-7-sym,a241bbf6-422a-46d6-bfa9-ef4807a9f3ef +sym-nand8_4-polygon-8-sym,1ddb8789-6fe6-406b-9c02-8521df421518 +sym-nand8_4-polygon-9-sym,1bf8dcbc-4fce-417c-9ad1-7de1ec3e98b2 sym-nand8_4-polygon-contour,3dca6b07-dacb-4aa7-a82a-5bb8796b42da sym-nand8_4-sym,f49baafe-3fdb-42c8-9481-577183e5c2ab sym-nand8_4-text-name,0fbc711f-b4f5-48e4-b767-37d93dd32ebc @@ -279,6 +474,10 @@ sym-nand8_4-text-value,09d2fc92-afaf-44cb-968b-eb3c8a739a14 sym-nor2_4-pin-a,e109a99f-ce9f-420e-a709-fdb2ba61237c sym-nor2_4-pin-b,490454ab-f15e-493e-8643-bed4550eba50 sym-nor2_4-pin-out,c301e5eb-5da4-4c88-9882-54f8a83ffe2d +sym-nor2_4-polygon-1-sym,ef0c6868-02be-468e-ad88-280ff84eb255 +sym-nor2_4-polygon-2-sym,e8e9b2ac-6c9e-4018-805d-fb80de6e2b4c +sym-nor2_4-polygon-3-sym,2c5e92cb-62d2-4e3f-8cca-6605e4479eca +sym-nor2_4-polygon-4-sym,6dc7d006-0245-4d07-8df7-ccc9ef0c6bad sym-nor2_4-polygon-contour,9a38485c-4c6b-4fde-91ee-31e1237c85a0 sym-nor2_4-sym,473abaeb-575b-4c0e-a3d9-fbb3f7447832 sym-nor2_4-text-name,e4be109a-915b-45cf-984e-a64931a5aae0 @@ -286,6 +485,10 @@ sym-nor2_4-text-value,8bf78a6d-8430-488c-a66e-728e1dbcca3b sym-nor2_6-pin-a,7fe902c5-3c5f-4a80-9b52-b0510108959c sym-nor2_6-pin-b,00f6ec28-0459-45f0-9b94-224a587f497a sym-nor2_6-pin-out,3518b705-c15c-499c-a97f-6f4f51ec4c7f +sym-nor2_6-polygon-1-sym,a6e08626-0d4d-49c6-a7e5-573941b44194 +sym-nor2_6-polygon-2-sym,09725a88-a159-400f-901b-70df0476b0cd +sym-nor2_6-polygon-3-sym,17e53242-62c2-4b0d-ad8b-c4697e032fca +sym-nor2_6-polygon-4-sym,152df7cc-86b5-420a-aff0-83507d93b65d sym-nor2_6-polygon-contour,796b230a-cb82-4243-95f3-557bf10a47a4 sym-nor2_6-sym,8068c149-5241-4fb3-a6c2-b1c66cc6514d sym-nor2_6-text-name,c33b97de-719e-4a2d-b068-d2ff53013f37 @@ -293,6 +496,10 @@ sym-nor2_6-text-value,0409677f-6ce5-42aa-8d7c-4ac50e6dca0f sym-nor2_8-pin-a,0268be05-4136-4786-bfc9-dd0154711e74 sym-nor2_8-pin-b,93cfec98-c535-4f37-bdb8-49fb64dabae0 sym-nor2_8-pin-out,a3e964ae-40e4-400c-8cc3-200b5deb9a0d +sym-nor2_8-polygon-1-sym,3b851473-c5dc-479f-b9a7-69dcad079ed0 +sym-nor2_8-polygon-2-sym,2243a715-b6ef-495f-a787-f7fe0ebb4c49 +sym-nor2_8-polygon-3-sym,d0b95f99-d1a1-4c02-a492-2db6974e921c +sym-nor2_8-polygon-4-sym,e965fd86-4037-4606-88c0-6bf3db4f0dcb sym-nor2_8-polygon-contour,7556f645-597b-4df6-a43c-99bcd3ed5b03 sym-nor2_8-sym,ac8a8bbe-8b59-4f51-b36d-4927ae7025a2 sym-nor2_8-text-name,253e394c-524e-4b3d-aad1-70a51087260b @@ -300,6 +507,11 @@ sym-nor2_8-text-value,c03fd3fe-7bbf-4be8-9c17-3de0858cdd94 sym-nor2_dm_4-pin-a,64ad7a3d-4e73-4b64-986b-f5ea2fc50a10 sym-nor2_dm_4-pin-b,7dd5253d-e8e2-4004-affa-fa1a218201e0 sym-nor2_dm_4-pin-out,626b2d49-f909-4ca7-a724-7c5a1e2ba041 +sym-nor2_dm_4-polygon-1-sym,b6d6cf1c-b551-44fc-beaf-3d908b83271d +sym-nor2_dm_4-polygon-2-sym,30da6554-8397-45ea-bfa2-cbbdbde4df92 +sym-nor2_dm_4-polygon-3-sym,0e7a5dca-e041-4282-bc3b-1be6d60efee9 +sym-nor2_dm_4-polygon-4-sym,bdd15f8f-4fd9-41d0-99aa-1232ddab2661 +sym-nor2_dm_4-polygon-5-sym,5d7def28-6968-4ae0-8d8f-b07dd8600a5c sym-nor2_dm_4-polygon-contour,50037951-2028-4f13-8514-6886229860f2 sym-nor2_dm_4-sym,4d3cebd7-cb78-4de3-b8c8-13debd98b505 sym-nor2_dm_4-text-name,e79ae0f0-7951-4248-b60b-2d7b9e1c4a09 @@ -307,6 +519,11 @@ sym-nor2_dm_4-text-value,5ac66a60-b0bc-49f1-9197-bcacc3c448e1 sym-nor2_dm_8-pin-a,e65c2484-f75f-46f4-87ba-ef5be0fe33b0 sym-nor2_dm_8-pin-b,b7678ba7-4c5e-40fd-9b11-8c49a5fe7221 sym-nor2_dm_8-pin-out,26c646ee-a222-49b0-b04c-8a58bccaf5b6 +sym-nor2_dm_8-polygon-1-sym,be00ef99-a1a5-4d28-85e9-4b0971e76dc5 +sym-nor2_dm_8-polygon-2-sym,9ed91be1-0cf1-4e8b-9538-a312f09d8816 +sym-nor2_dm_8-polygon-3-sym,a6ae2f68-08cb-49bf-a63c-325eba1aacf8 +sym-nor2_dm_8-polygon-4-sym,76118012-7816-4fe0-9608-d84dffc47b59 +sym-nor2_dm_8-polygon-5-sym,d821f66f-00a2-470f-9701-8ae523cc94b6 sym-nor2_dm_8-polygon-contour,588a49e2-2756-49fb-9a14-46728dc5e26c sym-nor2_dm_8-sym,ff55295b-5b80-4eb8-b5ef-76ac359acddc sym-nor2_dm_8-text-name,3b3ca633-29b0-4071-9744-077c37505f03 @@ -315,6 +532,11 @@ sym-nor3_4-pin-a,056a6e21-8ea5-4c35-88d4-041c46093b93 sym-nor3_4-pin-b,96a4801e-ddbc-43f9-b03d-69dee1e17e5f sym-nor3_4-pin-c,1fec1a57-ad31-40d0-bee8-ebd4ffb7a17f sym-nor3_4-pin-out,470ceee7-f087-4bdc-a76e-68aca2c852bf +sym-nor3_4-polygon-1-sym,dbc25def-d74b-4f90-895a-53e369f2d8e4 +sym-nor3_4-polygon-2-sym,55561e4d-327d-4e99-af17-99721d6b9f08 +sym-nor3_4-polygon-3-sym,698d6311-edf6-42ff-8fd7-f2a8a0cffc9a +sym-nor3_4-polygon-4-sym,ce603b14-0724-45dd-a387-35cf39ae69f1 +sym-nor3_4-polygon-5-sym,6ed7aeed-ce49-4c16-aa8e-024a967fdcc0 sym-nor3_4-polygon-contour,5a71268e-81c7-4eb2-9b31-1db1193b28bf sym-nor3_4-sym,ef2fbe95-83f8-4b88-8fb0-f136ccb4fef8 sym-nor3_4-text-name,cfc9e02e-0e46-4cf3-8e79-47aaa760de29 @@ -323,6 +545,11 @@ sym-nor3_8-pin-a,e178fdaa-2b8f-480d-901e-4c1247629d9c sym-nor3_8-pin-b,4dec14f6-d65a-43bc-baa7-04febf32c3b1 sym-nor3_8-pin-c,5313d57e-6a8a-4265-96f5-53009680845d sym-nor3_8-pin-out,dcc02552-ed24-4954-9c8f-70717b465eb8 +sym-nor3_8-polygon-1-sym,c0a85c6a-6d40-490a-918a-7baa3d8a205e +sym-nor3_8-polygon-2-sym,4cedd4d2-da72-4481-ab45-1cba6a9bdad9 +sym-nor3_8-polygon-3-sym,8ffb1332-c8e9-427b-b8a8-9f444917f282 +sym-nor3_8-polygon-4-sym,fd9f35bd-dcbc-4de8-ac6b-b545bfccdff7 +sym-nor3_8-polygon-5-sym,d4d95ff3-51b3-49ae-9680-b73c5b45b90e sym-nor3_8-polygon-contour,ae2b3d89-cacb-419c-bf53-82116f4fa34c sym-nor3_8-sym,0baeb161-2ebb-4100-898d-613f27371a6e sym-nor3_8-text-name,b6adcd80-2e9e-413c-9e7c-129062686fdf @@ -331,6 +558,13 @@ sym-nor3_dm_4-pin-a,4210154e-151b-49f4-8121-0b7caa8abc3e sym-nor3_dm_4-pin-b,b0d43f15-1e4c-44bc-bf53-20f53e53b44b sym-nor3_dm_4-pin-c,6611212a-e146-4a93-8143-4fb1b5edd09a sym-nor3_dm_4-pin-out,7732783b-1eeb-4ccf-8bda-0c0607a24ada +sym-nor3_dm_4-polygon-1-sym,7834c8a8-2dda-42ec-901e-2ad9c9ef0589 +sym-nor3_dm_4-polygon-2-sym,8421edda-2f0e-45a6-bdf3-222a0b164df3 +sym-nor3_dm_4-polygon-3-sym,2d109551-9e7d-4539-ab67-0b886fa5933c +sym-nor3_dm_4-polygon-4-sym,9231f89e-066c-42e9-bb15-896a87ca7cd7 +sym-nor3_dm_4-polygon-5-sym,1a94a456-6000-4f02-95d5-35400f5d4d6f +sym-nor3_dm_4-polygon-6-sym,3cfa465c-759f-4f11-b5b4-b99e29ac92a1 +sym-nor3_dm_4-polygon-7-sym,eb549ecd-a1e0-4131-b823-ceb02e0f96ec sym-nor3_dm_4-polygon-contour,485f6870-7d4f-43e3-9384-ac14e0c21c0a sym-nor3_dm_4-sym,b0e97ab7-5b35-4a59-9334-a2fdc9c98eee sym-nor3_dm_4-text-name,52489579-e001-4f89-baa7-acb6506d3e7a @@ -340,6 +574,12 @@ sym-nor4_4-pin-b,ff60d6ca-52f5-4511-a8ad-2d498255ec9d sym-nor4_4-pin-c,5107397e-2577-4fef-9199-42aa4d77f121 sym-nor4_4-pin-d,227276fd-aa58-4a05-a316-29b533e9a1d7 sym-nor4_4-pin-out,9eda3dae-36e1-4f36-a7a7-448d0db3b0be +sym-nor4_4-polygon-1-sym,40f54a76-664b-4b90-b822-79ecc3e046af +sym-nor4_4-polygon-2-sym,25861d54-23f9-4281-9e88-026fc12ef138 +sym-nor4_4-polygon-3-sym,35ebbaac-2547-4cd5-8d0d-ef4f4e79d6b0 +sym-nor4_4-polygon-4-sym,f7edf099-3eb0-46c2-8d34-9e62d6ca368e +sym-nor4_4-polygon-5-sym,1a381088-43a0-4257-bb9f-188156550695 +sym-nor4_4-polygon-6-sym,563cab3c-5544-412e-a7b4-0f4900f5f9d7 sym-nor4_4-polygon-contour,32839875-96df-4225-b75f-fe6d2f852e33 sym-nor4_4-sym,d6072c19-e8de-4cf1-9e9d-3c4a3a5710b2 sym-nor4_4-text-name,b1ad8419-be28-44f6-ab07-dd19e4643665 @@ -349,6 +589,14 @@ sym-nor4_8-pin-b,eea07d6d-ee45-4dc1-ba65-e6688f13e29f sym-nor4_8-pin-c,c14a1385-9805-4ecf-9f0d-014f5097cf2d sym-nor4_8-pin-d,2f99d206-7805-49ce-bbd0-96a291c0f1da sym-nor4_8-pin-out,7032318f-30a0-4447-86f4-0252083222c4 +sym-nor4_8-polygon-1-sym,e5342072-93ab-48d7-a454-91f75ef4446b +sym-nor4_8-polygon-2-sym,a3975800-1920-4f0d-9756-2a1cb3e70b91 +sym-nor4_8-polygon-3-sym,d6bd8234-cbee-46af-b189-6cfe5b37060b +sym-nor4_8-polygon-4-sym,e1f64a93-4f80-4843-b258-b5fd125ae83f +sym-nor4_8-polygon-5-sym,91e3a066-f67e-4aa0-8a7d-921d694a5409 +sym-nor4_8-polygon-6-sym,692f36e5-a82f-4692-8736-415a2b62e562 +sym-nor4_8-polygon-7-sym,344ae1e1-fb66-4015-99de-f8915180a64f +sym-nor4_8-polygon-8-sym,5ca53d58-f06a-4ad9-8a3a-8627d3bface8 sym-nor4_8-polygon-contour,6e7dc742-9fa8-404b-9b7a-4023b4d44c0c sym-nor4_8-sym,0e465a71-de9f-41bd-8211-30e44dae03b1 sym-nor4_8-text-name,a743e9fd-fdaf-46ea-a0c9-c7f772531a10 @@ -358,6 +606,15 @@ sym-nor4_dm_4-pin-b,2bbd8d9d-97cb-4584-b66a-7f3b5f5a544e sym-nor4_dm_4-pin-c,9cfa7a4a-68fc-43f8-a5dd-e4ba7a6ccf9e sym-nor4_dm_4-pin-d,d0f8d4c4-dfbc-43ba-9869-7bc4cebd63f4 sym-nor4_dm_4-pin-out,f35ce24d-200b-492c-95ad-0f8e90f9d3f6 +sym-nor4_dm_4-polygon-1-sym,408f486f-2fef-4f9f-aa06-6ea29bc86a15 +sym-nor4_dm_4-polygon-2-sym,2ad89f6c-1e94-455c-b163-97320ab9c427 +sym-nor4_dm_4-polygon-3-sym,4661b74e-e257-43e3-8e27-304d99ddc1e3 +sym-nor4_dm_4-polygon-4-sym,4ce3d555-b209-472a-ad73-b0f4f783f7ee +sym-nor4_dm_4-polygon-5-sym,456547c2-4619-4180-926a-b68bbbc36222 +sym-nor4_dm_4-polygon-6-sym,c387c6a2-8549-4660-9be4-804864754010 +sym-nor4_dm_4-polygon-7-sym,9f770ed6-d20c-4dc8-8539-894cbc79faf6 +sym-nor4_dm_4-polygon-8-sym,cc197fd0-4aca-40f6-b80e-489095e6f730 +sym-nor4_dm_4-polygon-9-sym,45ed1537-c90e-48a8-b5b5-353ff46e5699 sym-nor4_dm_4-polygon-contour,7b9e6e55-778d-41a9-adc8-e223dea3c9a9 sym-nor4_dm_4-sym,689a03fb-5d1e-4723-89ac-35dfaf0c2db0 sym-nor4_dm_4-text-name,51ef135c-f405-426e-963b-461364ef30bf @@ -369,6 +626,16 @@ sym-nor6_4-pin-d,4aa0e582-9a07-4445-94ef-86f15cd038a9 sym-nor6_4-pin-e,9964c617-c27c-461b-8586-a1dc9933ba69 sym-nor6_4-pin-f,be3d01cb-9ed9-43fe-8d40-e9caa6e0c57b sym-nor6_4-pin-out,9e8ec59c-97e8-466d-8eb5-ac5b0c9b9fc3 +sym-nor6_4-polygon-1-sym,460a02d0-d46d-4d8a-9e2d-720ae2e5be3e +sym-nor6_4-polygon-10-sym,f66e4b6f-6e99-47c4-88e6-f2a648781c99 +sym-nor6_4-polygon-2-sym,2babf10b-9415-4cb3-b8f0-412b65b9897d +sym-nor6_4-polygon-3-sym,f598f008-f1b3-4764-92fa-4237aec9c727 +sym-nor6_4-polygon-4-sym,56f810b0-9ee2-41c7-a4ab-940b36e9630c +sym-nor6_4-polygon-5-sym,e4896f1d-3577-4706-90f4-f537b2b63e49 +sym-nor6_4-polygon-6-sym,8904af51-825a-422c-9e16-f81aaf6910d9 +sym-nor6_4-polygon-7-sym,50e1a1da-1c52-4627-b1f5-495838739522 +sym-nor6_4-polygon-8-sym,3f1fd274-983e-4873-b825-a36044c3bfd1 +sym-nor6_4-polygon-9-sym,be4ec4d1-090b-4afa-acfd-adf2aee047b9 sym-nor6_4-polygon-contour,ec5a4ec8-4618-4131-ae08-fe5303d7285b sym-nor6_4-sym,a2de5a17-5c75-4bb6-87cd-4cad0d599d31 sym-nor6_4-text-name,34e21392-209b-4dd7-be3e-16caa852103f @@ -382,6 +649,18 @@ sym-nor8_4-pin-f,eb32593b-7343-4408-b426-0a6fda5d1065 sym-nor8_4-pin-g,17b7b175-3ee4-44e5-93f1-29cf06fd4991 sym-nor8_4-pin-h,4e115651-391e-4e34-a858-78dff157f861 sym-nor8_4-pin-out,01b955c4-f07e-40f1-9eee-60835d84b8b0 +sym-nor8_4-polygon-1-sym,a84a3a14-eacd-474b-950f-979ca0ed6d92 +sym-nor8_4-polygon-10-sym,c125bb17-249b-4fa9-9e65-14fc3612b28c +sym-nor8_4-polygon-11-sym,62f6615d-9cc3-4986-b06d-f92c57669a7f +sym-nor8_4-polygon-12-sym,5e428e15-ea62-43fa-b34a-4445466f7d54 +sym-nor8_4-polygon-2-sym,3c908f49-b322-4d08-a334-4e2cdd93329e +sym-nor8_4-polygon-3-sym,b1344743-0faf-4073-8e58-68da9526c5c5 +sym-nor8_4-polygon-4-sym,024f0dba-00c7-47f2-891a-5d8715c3cea9 +sym-nor8_4-polygon-5-sym,a14cd2bc-3ebe-4fdb-87d5-530233bab2da +sym-nor8_4-polygon-6-sym,6526b00e-361e-4eab-8194-114e76bc8f4c +sym-nor8_4-polygon-7-sym,e307b95f-204d-47b3-9764-abd2add666f5 +sym-nor8_4-polygon-8-sym,0909423d-97d2-44cc-b275-acf11d650ea9 +sym-nor8_4-polygon-9-sym,24ae8ee6-3204-413f-afcf-2858763cbd8a sym-nor8_4-polygon-contour,813ddcda-dec2-4d16-af89-c794f42e07d4 sym-nor8_4-sym,f571c63d-690a-439f-be8a-541ca1eca01e sym-nor8_4-text-name,5e225e41-b9a3-4c28-a24b-520e5eeb1532 @@ -389,6 +668,9 @@ sym-nor8_4-text-value,02fa82bb-d907-4900-a6da-85f356876e82 sym-or2_4-pin-a,586e16bc-e77c-4830-a913-eb1d2ff095f9 sym-or2_4-pin-b,6d09e9d8-2e7e-4ccf-8183-9ce1bf082de7 sym-or2_4-pin-out,cf24f002-2ca2-4584-8cff-576295468e9b +sym-or2_4-polygon-1-sym,151c88ad-8da5-4000-81f7-8be49bee7273 +sym-or2_4-polygon-2-sym,f0ebfe60-abea-4729-bbc9-43d2046623a6 +sym-or2_4-polygon-3-sym,f1b090f1-9b2e-4540-8edf-6e7072a116df sym-or2_4-polygon-contour,60f8536a-f80d-4adb-aa5d-9897f804469f sym-or2_4-sym,1a47e0b2-ebed-499e-9d41-ca98891957d2 sym-or2_4-text-name,75ee292d-6b51-46e8-813e-626381910c56 @@ -396,6 +678,9 @@ sym-or2_4-text-value,3dbf3efd-5319-48a9-8157-75ec0de573c5 sym-or2_6-pin-a,532aecc6-c0b4-4110-9e89-f4840c9acedd sym-or2_6-pin-b,bd100263-0f1e-4070-a47e-c07ed2eb37f4 sym-or2_6-pin-out,47611e34-4ab4-41ea-92ea-4d88a88959ec +sym-or2_6-polygon-1-sym,2980cf2a-47c9-4bdc-9ffa-a0e21c7b8e89 +sym-or2_6-polygon-2-sym,98dbc5d7-f35e-41bd-a37c-6b4ae6c2c748 +sym-or2_6-polygon-3-sym,9f47fa60-b2ba-481e-8b96-89f7d233825a sym-or2_6-polygon-contour,d4a84e23-44ac-4163-b171-a71e0d25ffa4 sym-or2_6-sym,27b45855-2a81-4ca3-a56c-efb1d0afd561 sym-or2_6-text-name,cf535e52-55b9-49dc-ae9c-7f312a69722d @@ -403,6 +688,9 @@ sym-or2_6-text-value,15a834db-1f64-4f5a-ae6d-a6f990942eaf sym-or2_8-pin-a,6df6d259-398b-4f95-a68a-4cb7f64d1bf8 sym-or2_8-pin-b,45d3397c-19d6-40d6-840f-8fc7fbfa34b2 sym-or2_8-pin-out,fd321fec-468a-4645-ac2d-16714b44f2aa +sym-or2_8-polygon-1-sym,60dcd42b-b8a2-4cda-9131-d695e0622f1f +sym-or2_8-polygon-2-sym,bb894d7a-dce7-4501-a662-014e7115314f +sym-or2_8-polygon-3-sym,a673ba4c-9231-4365-afb1-4bf83f682273 sym-or2_8-polygon-contour,c7aa106b-cbf5-4993-b1df-e2ddce41b570 sym-or2_8-sym,d294cf01-9c5f-4273-9095-674f37f0f6cb sym-or2_8-text-name,941c8d03-15e7-4a34-9bde-0f367947a522 @@ -410,6 +698,12 @@ sym-or2_8-text-value,9c51c7f9-9aee-4b43-b624-e168c963dbea sym-or2_dm_4-pin-a,b28cf13b-4f30-430d-b185-2ad0caf49215 sym-or2_dm_4-pin-b,67db14bb-28bf-4aa0-8548-f1a199a0d979 sym-or2_dm_4-pin-out,1c432d13-30bd-4809-acf9-3c183d8f2bf9 +sym-or2_dm_4-polygon-1-sym,7c7a486c-1892-46da-ba4b-e45d8af2199e +sym-or2_dm_4-polygon-2-sym,561b6a3a-3421-4dad-b613-85bd351766c3 +sym-or2_dm_4-polygon-3-sym,f439ab01-6b0a-4601-9639-95c5beb1376e +sym-or2_dm_4-polygon-4-sym,dd56bee5-e92d-4611-9300-f45f2ca6c5ec +sym-or2_dm_4-polygon-5-sym,ef9c08de-70dc-47e0-a074-bd6e19bf01ee +sym-or2_dm_4-polygon-6-sym,6bf91a1a-e590-4ab8-b476-4ba71ed87f82 sym-or2_dm_4-polygon-contour,96d3e365-063c-4ff5-9564-a87c8d76e4b7 sym-or2_dm_4-sym,34678761-2da2-40f0-b5f2-85c665bd3b05 sym-or2_dm_4-text-name,a588e715-e535-492c-b993-45edab3bf6d5 @@ -417,6 +711,12 @@ sym-or2_dm_4-text-value,5e9a2e5c-d319-404f-b654-b80d0b26a182 sym-or2_dm_8-pin-a,de4a5093-1f51-4843-b970-6cede57936af sym-or2_dm_8-pin-b,6eadfe40-842d-402a-a395-c332865730d1 sym-or2_dm_8-pin-out,070fe6be-ef57-4326-862c-e26ba4e5f54b +sym-or2_dm_8-polygon-1-sym,430e66bc-6236-4406-bf2e-a327223be2ce +sym-or2_dm_8-polygon-2-sym,5ddb1f1d-ffb1-4253-8f39-a6f8cb0829fb +sym-or2_dm_8-polygon-3-sym,0e5447af-635a-4279-88b2-3e699a584e0d +sym-or2_dm_8-polygon-4-sym,a22446bc-16d5-459a-bd99-5e13af0d3257 +sym-or2_dm_8-polygon-5-sym,bec9bba6-fdc2-4bc8-9b14-f72bc703f405 +sym-or2_dm_8-polygon-6-sym,7500607a-a975-401d-9e52-c9d5465f9237 sym-or2_dm_8-polygon-contour,a6307bb0-ecca-4c17-bf45-5a8679e78ac7 sym-or2_dm_8-sym,851db818-df67-4046-9219-c9b910665655 sym-or2_dm_8-text-name,77fb0b7b-e0aa-47fe-9cbd-edd43ef9fe89 @@ -425,6 +725,10 @@ sym-or3_4-pin-a,a98e718f-b758-4b52-9c8a-43f2fec546dd sym-or3_4-pin-b,2e382d83-0091-4a4c-bbd3-9327d85e0d41 sym-or3_4-pin-c,4fb9627b-000e-4898-bcc9-b2fc9394a986 sym-or3_4-pin-out,ece5fa56-7d48-4832-8f6a-94951e4377bf +sym-or3_4-polygon-1-sym,11858bbd-7439-4dae-a01b-8a25a6a69f56 +sym-or3_4-polygon-2-sym,fe624240-9990-4f45-9be4-f113f7fb7ae7 +sym-or3_4-polygon-3-sym,7134df2e-d7ba-41f3-9c73-b41ba182c4e2 +sym-or3_4-polygon-4-sym,a88c72a7-4240-446c-b159-cab533cb000c sym-or3_4-polygon-contour,7a62e951-ee13-4f83-9abf-30cf2b0c8f6f sym-or3_4-sym,687cc1b5-d1da-4eb9-af0b-55c620bbf72b sym-or3_4-text-name,ea863938-ed78-4ed0-8ecf-3ca7310145f4 @@ -433,6 +737,10 @@ sym-or3_8-pin-a,08ad2a5f-7a39-47a9-83b6-8b5c6bec6870 sym-or3_8-pin-b,e6085e57-6680-4b5c-a413-cf13f8e2be64 sym-or3_8-pin-c,db829c66-6c54-4a98-ac51-dee370b504e0 sym-or3_8-pin-out,d10eb37e-9716-421b-81ac-3740a3762d8c +sym-or3_8-polygon-1-sym,532f934c-0d2a-4f15-9b62-790cc988eadf +sym-or3_8-polygon-2-sym,cc8916b5-c2a6-423f-bcbb-60aaaf25ba65 +sym-or3_8-polygon-3-sym,0e04733c-4af1-45c7-949b-ccbbdab3be66 +sym-or3_8-polygon-4-sym,2118cd08-56e3-48da-ac33-b04c9bb61417 sym-or3_8-polygon-contour,f898d388-db02-4551-8dd1-5f5f4753c759 sym-or3_8-sym,4a6abc91-983f-49a3-9457-f3cd33cbfce7 sym-or3_8-text-name,d62696c1-09bb-4b78-be88-08d790dc8868 @@ -441,6 +749,14 @@ sym-or3_dm_4-pin-a,4a3e6cce-2d31-46c4-a8e1-3d561be5febe sym-or3_dm_4-pin-b,c2d582f0-ba42-4ec3-9817-7e132dda0a2b sym-or3_dm_4-pin-c,60d31264-7ec4-463f-a141-f503547359bc sym-or3_dm_4-pin-out,e8155f73-06c8-4280-a99b-e1862ced9cfb +sym-or3_dm_4-polygon-1-sym,4ad0d60c-dba5-4a20-812b-81b7226ec31f +sym-or3_dm_4-polygon-2-sym,10b8838a-a816-4868-8fbe-09f72e0dc8ab +sym-or3_dm_4-polygon-3-sym,33a847ce-5796-4851-ba26-c7fc5e5cf883 +sym-or3_dm_4-polygon-4-sym,875f1b57-b144-48af-905b-8518345192f2 +sym-or3_dm_4-polygon-5-sym,4d7d59ec-1dbf-4869-9520-621e0aba2c84 +sym-or3_dm_4-polygon-6-sym,23278aff-aeb2-4d98-9470-73338dae6314 +sym-or3_dm_4-polygon-7-sym,524ad2fb-583a-4b3d-8ee9-782b0da08709 +sym-or3_dm_4-polygon-8-sym,95ebee69-cc40-4183-8d4c-77f02d83cb26 sym-or3_dm_4-polygon-contour,1fabc38a-92ec-4043-b63f-009f1e4900ef sym-or3_dm_4-sym,d2bf1861-8b96-43c8-9e1f-0b257d02cce9 sym-or3_dm_4-text-name,490f11be-6311-44d6-a3b9-2bed3c1d3c30 @@ -450,6 +766,11 @@ sym-or4_4-pin-b,fff3ac4b-00fa-494b-a292-ba2e3bfd303d sym-or4_4-pin-c,91e681b5-5147-45e1-90ae-4ad0d1b35d1c sym-or4_4-pin-d,01d0f1ef-3e96-4d59-90b7-ce21733f3007 sym-or4_4-pin-out,fd0d10c7-3071-405c-8950-9c2db258c13b +sym-or4_4-polygon-1-sym,f9a10eda-d266-4414-a39a-f54b847adb37 +sym-or4_4-polygon-2-sym,8b30b0a8-3053-4405-9968-e722b0bd4e9b +sym-or4_4-polygon-3-sym,5802e3d8-7c96-4638-985d-65a6526ef4d4 +sym-or4_4-polygon-4-sym,241e04f4-83f6-43c7-94c3-a8aa4a8be03b +sym-or4_4-polygon-5-sym,e2d4380e-1c23-4f09-b59e-ce5d63cfa1f7 sym-or4_4-polygon-contour,858ad3be-cc66-49f9-8502-87c5cfec0c70 sym-or4_4-sym,77d99d52-007c-4491-b58a-27f57591cf96 sym-or4_4-text-name,f2c5beb1-ee89-4336-b0d1-5420824d8c8f @@ -459,6 +780,13 @@ sym-or4_8-pin-b,6e8dbf03-eb25-40a0-b5de-4df1ae9e79d2 sym-or4_8-pin-c,6616ccac-e3e1-44eb-8ffb-ed8222ce5f3a sym-or4_8-pin-d,97d851fd-3deb-4bd8-a99e-c87f8e235405 sym-or4_8-pin-out,3919aae7-ab79-4fe4-9715-18222a814ebe +sym-or4_8-polygon-1-sym,941949c0-fab0-4dba-9005-06aab3a474bf +sym-or4_8-polygon-2-sym,a8c01972-7f64-4aa1-9fd7-a6f2a3d88538 +sym-or4_8-polygon-3-sym,ffcb9b44-51f5-40d4-b81c-9c5e448af6d7 +sym-or4_8-polygon-4-sym,ea91ae8e-e5a7-4d8f-b3ab-12444d10cbc7 +sym-or4_8-polygon-5-sym,cafdefcb-1602-45b9-92e1-cec75445eb75 +sym-or4_8-polygon-6-sym,ca78da28-8830-47ca-b244-872b7b637bd5 +sym-or4_8-polygon-7-sym,9da51e67-fcc6-41e5-8fce-a823e5ec20b1 sym-or4_8-polygon-contour,5aa45723-bab0-415c-8e19-7bb50522e6eb sym-or4_8-sym,32408ee3-fd3f-4052-bc96-d34e204225e8 sym-or4_8-text-name,2c03533a-abfe-4473-be2e-67130a9d3f54 @@ -468,6 +796,16 @@ sym-or4_dm_4-pin-b,1d87320b-0007-4338-b244-0ab3d1238b23 sym-or4_dm_4-pin-c,f6ba4a28-25c1-4cf0-aa8b-c50b3c83777f sym-or4_dm_4-pin-d,009fc5c9-d998-45b4-9a73-b32e5b358240 sym-or4_dm_4-pin-out,b391dfa9-1cc8-4126-9632-881b5878294f +sym-or4_dm_4-polygon-1-sym,a2c05903-c768-4d51-afa5-920c6bc0e4b4 +sym-or4_dm_4-polygon-10-sym,8c235c61-169f-4df6-88bc-255b655521ad +sym-or4_dm_4-polygon-2-sym,f1dc9537-beb4-4179-903d-2d3e5147caa7 +sym-or4_dm_4-polygon-3-sym,84aa89e9-f267-417e-b26a-06315f0d5365 +sym-or4_dm_4-polygon-4-sym,9ae6efa4-089e-4b04-93f3-783a0d327e5f +sym-or4_dm_4-polygon-5-sym,a43e3504-05b5-4b85-9938-9169c895cf17 +sym-or4_dm_4-polygon-6-sym,0f9febd8-507b-407f-b48d-097df0d58c88 +sym-or4_dm_4-polygon-7-sym,8dfdffcf-447b-4bb4-8090-354f0daca2e5 +sym-or4_dm_4-polygon-8-sym,bfa6c386-1ad2-417d-b2d9-3ec6ab0132ad +sym-or4_dm_4-polygon-9-sym,05ec3ed1-6bd4-483f-8ccd-50c9a940bc92 sym-or4_dm_4-polygon-contour,60229327-8e24-48d3-aeb6-6647b2dc8980 sym-or4_dm_4-sym,71ac4017-9c2e-45b9-b319-370479f95cc0 sym-or4_dm_4-text-name,dfae168b-6e29-4c09-9960-fc57d5688796 @@ -479,6 +817,15 @@ sym-or6_4-pin-d,3a032d80-1784-4a9f-a322-b506fd2c3dd9 sym-or6_4-pin-e,d854e639-5e84-46ab-b694-673d409af816 sym-or6_4-pin-f,b96a2f39-5fbb-4834-b7b3-312249a69bf9 sym-or6_4-pin-out,8e93a51d-483a-4e20-ae49-631462f61755 +sym-or6_4-polygon-1-sym,95eaa91c-a122-457e-9b0d-9191e094cd5f +sym-or6_4-polygon-2-sym,d8fb09e1-0177-44e4-aaa3-55f87077ae7b +sym-or6_4-polygon-3-sym,b146fb1c-bcad-42cd-a9a5-4ed79c856679 +sym-or6_4-polygon-4-sym,57dcec83-4200-4770-aa1a-9621ad5ed30f +sym-or6_4-polygon-5-sym,05b04d62-54ba-4a5b-898b-3f8b95115195 +sym-or6_4-polygon-6-sym,1cbfaf86-650c-4ed7-93d8-e6c85befcebf +sym-or6_4-polygon-7-sym,c36f38dc-e932-434e-b2b0-d06155de430c +sym-or6_4-polygon-8-sym,3473f909-2914-4a8c-a830-6a49c86ac45c +sym-or6_4-polygon-9-sym,4b97e780-5026-4c69-8d70-812f214f3e92 sym-or6_4-polygon-contour,99ea9975-a582-43e3-b71b-9865fefcce86 sym-or6_4-sym,44bd2bd4-590d-4213-af20-d759026b96ab sym-or6_4-text-name,daa9f0de-93e9-4023-b63b-95b17739e27c @@ -492,6 +839,17 @@ sym-or8_4-pin-f,f698cf0d-f55e-4525-95d9-a3548e16a8c5 sym-or8_4-pin-g,aa0a725f-9421-42e9-bf1e-85c422e9a203 sym-or8_4-pin-h,b7d141d0-d9bc-484e-aaa2-e7549c5325cc sym-or8_4-pin-out,aa5b04b3-57f2-459c-a696-66b47b18074d +sym-or8_4-polygon-1-sym,0d23d78f-974f-4013-970d-02cb80992fa9 +sym-or8_4-polygon-10-sym,b23e7e5d-de3e-4621-a9db-4a0119a36e74 +sym-or8_4-polygon-11-sym,57401649-5142-4b8e-b5a2-2724b8841983 +sym-or8_4-polygon-2-sym,9588e143-e880-4e45-a8b9-2a0dfe8177a3 +sym-or8_4-polygon-3-sym,b516af53-1de2-471e-9ef6-d50a40650ceb +sym-or8_4-polygon-4-sym,4f29dec3-79af-4556-847e-575284b8dc63 +sym-or8_4-polygon-5-sym,733e1e33-3d78-4afb-a4a0-cafc2627f399 +sym-or8_4-polygon-6-sym,5128aacd-b080-4535-aef1-7709b2dca4ff +sym-or8_4-polygon-7-sym,48e3d681-e807-4e47-b647-4df0904ef4be +sym-or8_4-polygon-8-sym,b155a486-0fe9-4266-9877-e21c837a46e7 +sym-or8_4-polygon-9-sym,0d0ccb1c-f8ce-4beb-a172-7546931adb24 sym-or8_4-polygon-contour,25631fac-647b-4560-be64-d6f4784c17ce sym-or8_4-sym,bcb5c452-057e-42d8-b6bf-b5e825867761 sym-or8_4-text-name,ef1460c5-306d-4ccf-88b2-16b6d6b370ba @@ -499,6 +857,11 @@ sym-or8_4-text-value,408543b0-67ed-483a-9541-281df8e2ce1b sym-xnor_4-pin-a,8694c480-f02a-497a-9bfb-5a82b42df48c sym-xnor_4-pin-b,d7a4432f-7e38-4055-947b-4d3eafe70140 sym-xnor_4-pin-out,25e87fc2-d6ba-462b-a80c-c3eac14c7085 +sym-xnor_4-polygon-1-sym,c59163eb-6c73-4af3-93a7-fef510f3511a +sym-xnor_4-polygon-2-sym,43d4c220-80d7-46fb-886a-cb0fe381deeb +sym-xnor_4-polygon-3-sym,94917140-d919-484e-8e1d-4dff2888adfa +sym-xnor_4-polygon-4-sym,39c1c5b7-0db2-43a9-a6fe-f4823749f6c6 +sym-xnor_4-polygon-5-sym,62c1b0da-67a5-4e6f-9380-eb29bf0f178b sym-xnor_4-polygon-contour,a5baa390-763f-4bf1-bb5d-9743c785dbb3 sym-xnor_4-sym,3ea62b44-4085-4af5-95b0-7691f2ea0119 sym-xnor_4-text-name,157f4dfa-56cf-4b0a-83b2-d2d73e15d491 @@ -506,6 +869,11 @@ sym-xnor_4-text-value,2812d88b-a8fe-4c6d-aa11-c6340db7bf61 sym-xnor_8-pin-a,68e96016-a7b2-46c0-985f-e1a666132e59 sym-xnor_8-pin-b,8bd974a4-081a-4ec5-ac2a-d26aaaf2b13e sym-xnor_8-pin-out,cc7be725-bc76-4928-a373-864ca23e8828 +sym-xnor_8-polygon-1-sym,b1ba9920-4978-4f79-afb7-afa592f8672c +sym-xnor_8-polygon-2-sym,9756b74a-fb0f-4f53-a88a-f80d00156df5 +sym-xnor_8-polygon-3-sym,172a9a43-c5bd-4e35-80eb-102b464dfa88 +sym-xnor_8-polygon-4-sym,6e7a4632-c779-4ba4-a9d5-74b9630390c5 +sym-xnor_8-polygon-5-sym,82f4c252-b3d8-4100-9975-3ab9d4f155b6 sym-xnor_8-polygon-contour,a3fe1ab2-6b5b-4e61-a680-5a9e587fca80 sym-xnor_8-sym,60985adf-d640-470b-b786-b17b0e26137e sym-xnor_8-text-name,9e5d2a41-aa10-4988-bba8-6d7c1bc85883 @@ -513,6 +881,10 @@ sym-xnor_8-text-value,d1fb5e3c-206b-41f3-ade0-a1e8d94a8899 sym-xor_4-pin-a,f463d291-5e21-4f8b-bc1d-620ac23a7f9a sym-xor_4-pin-b,97b646f5-e3ff-4a91-9373-2d9e44975132 sym-xor_4-pin-out,6e169527-6528-4b1b-8fde-a1ff9288d046 +sym-xor_4-polygon-1-sym,92a90d47-a258-4c84-9733-c70a5fa4d4f6 +sym-xor_4-polygon-2-sym,e9db2d69-a340-4657-84f7-1fa7fb684f37 +sym-xor_4-polygon-3-sym,a0487dd7-e103-4dd3-8c30-46541b7cf4a6 +sym-xor_4-polygon-4-sym,b7c6b032-336d-4ab3-b8c2-33c22e378ed2 sym-xor_4-polygon-contour,f786b3de-3564-4a4f-9e02-f466a60881a3 sym-xor_4-sym,6419d6f0-b0f5-4fa5-83d1-410204f35bb5 sym-xor_4-text-name,95a94dcd-2435-4475-b58f-6d2d16c5d29e @@ -520,6 +892,10 @@ sym-xor_4-text-value,fbdaa5f3-75e8-4435-9d64-2c44c6a09ccc sym-xor_8-pin-a,429021a8-e961-4829-8e4f-7a740cb22506 sym-xor_8-pin-b,74345e97-991d-432c-b623-d2d35b365529 sym-xor_8-pin-out,a69eea54-e0e4-4bd9-8241-3a112a9b5280 +sym-xor_8-polygon-1-sym,4c5f9b7f-d1e6-4db5-8f64-54a51142709b +sym-xor_8-polygon-2-sym,1c7d8db6-28cc-450a-989b-d5bd1cfdf59b +sym-xor_8-polygon-3-sym,d296236c-16bd-47f9-9066-72eab290f2d6 +sym-xor_8-polygon-4-sym,882c1e08-ba9a-4248-9336-7f7ff056922e sym-xor_8-polygon-contour,dd1bce53-3c84-43a5-b3bd-c601af180d64 sym-xor_8-sym,9bef141f-de89-444a-8ffa-a5cb05d5dde6 sym-xor_8-text-name,c6721533-3eb5-4647-9753-65895cf4c4f1 diff --git a/Logic/uuid_cache_multiplexor.csv b/Logic/uuid_cache_multiplexor.csv index 40811377..72d41a82 100644 --- a/Logic/uuid_cache_multiplexor.csv +++ b/Logic/uuid_cache_multiplexor.csv @@ -2,6 +2,7 @@ sym-mux2_4-pin-a,ab467da0-2f3e-4012-8f87-26080584a701 sym-mux2_4-pin-b,aba9c265-d0c2-462d-a7a1-9841ad2b242c sym-mux2_4-pin-out,5bccc6ce-6e50-4e75-8c46-56bfe8942e84 sym-mux2_4-pin-sel,f591841c-6b57-4354-ae1f-66660d60c738 +sym-mux2_4-polygon-1-sym,595be1d3-9ed7-466c-88d8-1c99da3d9fac sym-mux2_4-polygon-contour,82765dfb-3939-40c7-aad3-f27cb6f7502d sym-mux2_4-sym,257bf433-93e9-4a14-bd13-a986f0058059 sym-mux2_4-text-name,54a5843a-90c5-4c75-9239-75cf13d33716 @@ -13,6 +14,8 @@ sym-mux4_4-pin-d,319fe8ee-8e39-42e0-a281-75f68ff3b472 sym-mux4_4-pin-out,c2fc4725-77e7-49d7-9dbf-ae0aea8b74f4 sym-mux4_4-pin-sel0,805f4653-65ea-429e-ba60-138081a3b554 sym-mux4_4-pin-sel1,5b6d5cd5-2085-471f-9cfc-ae2db6b738dd +sym-mux4_4-polygon-1-sym,fa5dd79f-d772-4d10-989d-3622e66285e2 +sym-mux4_4-polygon-2-sym,c7144ef6-cffb-4cad-8e16-18f8a6c8d47a sym-mux4_4-polygon-contour,9273e7da-a8ff-4a05-af98-3349a220cff2 sym-mux4_4-sym,cf841298-6626-4623-b819-3a0ac4587c32 sym-mux4_4-text-name,b3f67723-2b1d-41e8-9b8b-fb7600323fbd diff --git a/generate_logic_sym.py b/generate_logic_sym.py index 1960168e..ebb088a8 100644 --- a/generate_logic_sym.py +++ b/generate_logic_sym.py @@ -184,8 +184,7 @@ def generate_sym( def _uuid(identifier: str) -> str: return uuid(category, def_name, identifier) - - uuid_polygon = _uuid('polygon-contour') + polygon_cnt = 1 uuid_text_name = _uuid('text-name') uuid_text_value = _uuid('text-value') sym_name = '{}'.format(def_name) @@ -228,17 +227,27 @@ def _uuid(identifier: str) -> str: if row_type == "POLY": line_width = float(row[1]) * unit fill = row[2] - fill_str = "False" if fill == "F": fill_str = "True" - print('POLY {} '.format( row[1])) - polygon = Polygon( - uuid_polygon, - Layer('sym_outlines'), - Width(line_width), - Fill(False), - GrabArea(fill_str) - ) + uuid_polygon = _uuid('polygon-contour') + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(fill_str) + ) + else: + fill_str = "False" + uuid_polygon = uuid('sym', '{}-polygon-{}'.format(def_name, polygon_cnt), 'sym') + polygon_cnt = polygon_cnt + 1 + polygon = Polygon( + uuid_polygon, + Layer('sym_outlines'), + Width(line_width), + Fill(False), + GrabArea(fill_str) + ) if row_type == "POLYPT": print('POLYPT {} {} {}'.format( row[1], row[2], row[3])) @@ -257,6 +266,8 @@ def _uuid(identifier: str) -> str: high_x = float(row[3]) * unit / scale high_y = float(row[4]) * unit / scale print('Rectangle ') + uuid_polygon = uuid('sym', '{}-polygon-{}'.format(def_name, polygon_cnt), 'sym') + polygon_cnt = polygon_cnt + 1 polygon = Polygon( uuid_polygon, Layer('sym_outlines'), @@ -276,7 +287,8 @@ def _uuid(identifier: str) -> str: pos_x = float(row[2]) * unit / scale pos_y = float(row[3]) * unit / scale dia = float(row[4]) * unit / scale - + uuid_polygon = uuid('sym', '{}-polygon-{}'.format(def_name, polygon_cnt), 'sym') + polygon_cnt = polygon_cnt + 1 print('Circle ') circle = Circle( uuid_polygon, From a10253a207724b8c45161af14165fcd842c236e3 Mon Sep 17 00:00:00 2001 From: ouabache Date: Thu, 9 Apr 2020 11:13:02 -0700 Subject: [PATCH 20/23] changed 1/6 scale from 10 wide to 8 --- Logic/Logic/AND2_6.csv | 12 ++++++------ Logic/Logic/INV_6.csv | 18 +++++++++--------- Logic/Logic/NAND2_6.csv | 12 ++++++------ Logic/Logic/NOR2_6.csv | 12 ++++++------ Logic/Logic/OR2_6.csv | 12 ++++++------ 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Logic/Logic/AND2_6.csv b/Logic/Logic/AND2_6.csv index c428b164..076b57da 100644 --- a/Logic/Logic/AND2_6.csv +++ b/Logic/Logic/AND2_6.csv @@ -10,19 +10,19 @@ POLYPT,-4.00,-3.25,0 POLYPT,-4.00,3.25,0 POLYST POLY,.0622,N -POLYPT,-6.6654,1.3327,0 +POLYPT,-5.332,1.3327,0 POLYPT,-4.00,1.3327,0 POLYST POLY,.0622,N -POLYPT,-6.6654,-1.3327,0 +POLYPT,-5.332,-1.3327,0 POLYPT,-4.00,-1.3327,0 POLYST POLY,.0622,N -POLYPT,6.6654,0,0 +POLYPT,5.332,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,L,-5.000,1.00,0 -PIN,B,L,-5.000,-1.00,0 -PIN,OUT,R,5.000,0,0 +PIN,A,L,-4.000,1.00,0 +PIN,B,L,-4.000,-1.00,0 +PIN,OUT,R,4.000,0,0 TEXT,-4.00,3.00,NAME TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/INV_6.csv b/Logic/Logic/INV_6.csv index f9c1897a..a940e2a0 100644 --- a/Logic/Logic/INV_6.csv +++ b/Logic/Logic/INV_6.csv @@ -2,13 +2,13 @@ SCALE,1.333 DEF,INV_6 KEYWORDS,inverter POLY,.100,F -POLYPT,-2.00,-3.00,0 -POLYPT,-2.00,3.00,0 -POLYPT,4.00,0,0 -POLYPT,-2.00,-3.00,0 +POLYPT,-3.00,-3.00,0 +POLYPT,-3.00,3.00,0 +POLYPT,3.00,0,0 +POLYPT,-3.00,-3.00,0 POLYST -CIRC,.100,4.50,0,1.00 -PIN,A,R,-5.00,0,3.50 -PIN,OUT,L,5.00,0,1.2205 -TEXT,-2.00,3.00,NAME -TEXT,-2.00,-3.00,VALUE \ No newline at end of file +CIRC,.100,3.50,0,1.00 +PIN,A,R,-4.00,0,1.74 +PIN,OUT,L,4.00,0,1.0252 +TEXT,-3.00,3.00,NAME +TEXT,-3.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NAND2_6.csv b/Logic/Logic/NAND2_6.csv index ede6fca1..90d1d1b2 100644 --- a/Logic/Logic/NAND2_6.csv +++ b/Logic/Logic/NAND2_6.csv @@ -10,20 +10,20 @@ POLYPT,-4.00,-3.25,0 POLYPT,-4.00,3.25,0 POLYST POLY,.0622,N -POLYPT,-6.6654,1.3327,0 +POLYPT,-5.332,1.3327,0 POLYPT,-4.00,1.3327,0 POLYST POLY,.0622,N -POLYPT,-6.6654,-1.3327,0 +POLYPT,-5.332,-1.3327,0 POLYPT,-4.00,-1.3327,0 POLYST POLY,.0622,N -POLYPT,6.6654,0,0 +POLYPT,5.332,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0.00,1.00 -PIN,A,L,-5.000,1.00,0 -PIN,B,L,-5.000,-1.00,0 -PIN,OUT,R,5.000,0,0 +PIN,A,L,-4.000,1.00,0 +PIN,B,L,-4.000,-1.00,0 +PIN,OUT,R,4.000,0,0 TEXT,-4.00,3.00,NAME TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/NOR2_6.csv b/Logic/Logic/NOR2_6.csv index 0af04d5a..5520c5c3 100644 --- a/Logic/Logic/NOR2_6.csv +++ b/Logic/Logic/NOR2_6.csv @@ -11,20 +11,20 @@ POLYPT,-4.00,-3.25,65.0 POLYPT,-4.00,3.25,0 POLYST POLY,.0622,N -POLYPT,-6.666,1.333,0 +POLYPT,-5.332,1.333,0 POLYPT,-3.2,1.333,0 POLYST POLY,.0622,N -POLYPT,-6.666,-1.333,0 +POLYPT,-5.332,-1.333,0 POLYPT,-3.2,-1.333,0 POLYST POLY,.0622,N -POLYPT,6.666,0,0 +POLYPT,5.332,0,0 POLYPT,5.00,0,0 POLYST CIRC,.100,4.50,0,1.00 -PIN,A,L,-5.00,1.00,0 -PIN,B,L,-5.00,-1.00,0 -PIN,OUT,R,5.00,0,0 +PIN,A,L,-4.00,1.00,0 +PIN,B,L,-4.00,-1.00,0 +PIN,OUT,R,4.00,0,0 TEXT,-4.00,3.00,NAME TEXT,-4.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/OR2_6.csv b/Logic/Logic/OR2_6.csv index ab998694..556f5336 100644 --- a/Logic/Logic/OR2_6.csv +++ b/Logic/Logic/OR2_6.csv @@ -11,19 +11,19 @@ POLYPT,-4.00,-3.25,65.0 POLYPT,-4.00,3.25,0 POLYST POLY,.0622,N -POLYPT,-6.666,1.333,0 +POLYPT,-5.332,1.333,0 POLYPT,-3.2,1.333,0 POLYST POLY,.0622,N -POLYPT,-6.666,-1.333,0 +POLYPT,-5.332,-1.333,0 POLYPT,-3.2,-1.333,0 POLYST POLY,.0622,N -POLYPT,6.666,0,0 +POLYPT,5.332,0,0 POLYPT,4.00,0,0 POLYST -PIN,A,L,-5.00,1.00,0 -PIN,B,L,-5.00,-1.00,0 -PIN,OUT,R,5.00,0,0 +PIN,A,L,-4.00,1.00,0 +PIN,B,L,-4.00,-1.00,0 +PIN,OUT,R,4.00,0,0 TEXT,-4.00,3.00,NAME TEXT,-4.00,-3.00,VALUE \ No newline at end of file From df2045bf9b0238bc9a1daa9c91bef6185fee8b68 Mon Sep 17 00:00:00 2001 From: John Eaton Date: Tue, 8 Nov 2022 12:26:01 -0800 Subject: [PATCH 21/23] changed python rev and moved name,value field --- Logic/script | 162 +++++++++++++++++++++--------------------- generate_logic_sym.py | 4 +- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/Logic/script b/Logic/script index 9ef2820b..1bf4f5b5 100755 --- a/Logic/script +++ b/Logic/script @@ -1,83 +1,83 @@ rm -r out -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_6 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_dm_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_dm_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND6_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND8_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_6 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_dm_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_dm_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND6_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND8_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_6 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR8_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_6 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_i_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_8 -python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_4 -python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFERTS_4 -python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFERTS_N_4 -python3.7 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_8 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design QQN_RNPN_4 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RNPN_4 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RN_4 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_PN_4 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_P_4 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_R_4 -python3.7 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_6 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_dm_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR6_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR8_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR6_4 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_8 -python3.7 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_8 -python3.7 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ --design MUX2_4 -python3.7 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ --design MUX4_4 -python3.7 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design HALF_ADDER_4 -python3.7 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design FULL_ADDER_4 -python3.7 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design BARREL_SHIFTER4_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_6 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_dm_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND4_dm_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND6_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND8_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_6 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_dm_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND4_dm_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND6_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND8_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_6 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR4_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR8_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_6 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_i_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_8 +python3.9 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_4 +python3.9 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFERTS_4 +python3.9 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFERTS_N_4 +python3.9 ../generate_logic_sym.py --group buffer --directory ./Logic/ --design BUFFER_8 +python3.9 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design QQN_RNPN_4 +python3.9 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RNPN_4 +python3.9 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_RN_4 +python3.9 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_PN_4 +python3.9 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_P_4 +python3.9 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_R_4 +python3.9 ../generate_logic_sym.py --group flipflop --directory ./Logic/ --design DFF_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_6 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND2_dm_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design AND3_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND3_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NAND2_dm_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design INV_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR2_dm_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR3_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR4_dm_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR6_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design NOR8_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR2_dm_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR3_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design OR6_4 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XOR_8 +python3.9 ../generate_logic_sym.py --group gates --directory ./Logic/ --design XNOR_8 +python3.9 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ --design MUX2_4 +python3.9 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ --design MUX4_4 +python3.9 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design HALF_ADDER_4 +python3.9 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design FULL_ADDER_4 +python3.9 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design BARREL_SHIFTER4_4 diff --git a/generate_logic_sym.py b/generate_logic_sym.py index ebb088a8..2f465104 100644 --- a/generate_logic_sym.py +++ b/generate_logic_sym.py @@ -306,9 +306,9 @@ def _uuid(identifier: str) -> str: pos_y = float(row[2]) * unit / scale textfield = row[3] if textfield == "NAME": - text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('left bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) + text = Text(uuid_text_name, Layer('sym_names'), Value('{{NAME}}'), Align('right bottom'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) if textfield == "VALUE": - text = Text(uuid_text_value, Layer('sym_values'), Value('{{VALUE}}'), Align('left top'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) + text = Text(uuid_text_value, Layer('sym_values'), Value('{{VALUE}}'), Align('right top'), Height(sym_text_height), Position(pos_x, pos_y), Rotation(0.0)) symbol.add_text(text) sym_dir_path = path.join(dirpath, uuid_sym) From 79b9004b0c11b1ece6b0c683c4ebbdba1dfacf3c Mon Sep 17 00:00:00 2001 From: John Eaton Date: Tue, 8 Nov 2022 13:55:51 -0800 Subject: [PATCH 22/23] added generic Logic files --- Logic/Boilerplate_Generic.csv | 4 + Logic/Logic/GENERIC10_VA_4.csv | 24 +++ Logic/Logic/GENERIC10_VB_4.csv | 22 ++ Logic/Logic/GENERIC11_VA_4.csv | 23 ++ Logic/Logic/GENERIC12_4.csv | 24 +++ Logic/Logic/GENERIC12_VA_4.csv | 26 +++ Logic/Logic/GENERIC12_VB_4.csv | 26 +++ Logic/Logic/GENERIC12_VC_4.csv | 26 +++ Logic/Logic/GENERIC14_VA_4.csv | 28 +++ Logic/Logic/GENERIC14_VB_4.csv | 28 +++ Logic/Logic/GENERIC4_4.csv | 16 ++ Logic/Logic/GENERIC4_6.csv | 16 ++ Logic/Logic/GENERIC4_8.csv | 16 ++ Logic/Logic/GENERIC5_VA_4.csv | 17 ++ Logic/Logic/GENERIC5_VA_6.csv | 17 ++ Logic/Logic/GENERIC5_VA_8.csv | 17 ++ Logic/Logic/GENERIC5_VB_4.csv | 17 ++ Logic/Logic/GENERIC5_VB_6.csv | 17 ++ Logic/Logic/GENERIC5_VB_8.csv | 17 ++ Logic/Logic/GENERIC6_4.csv | 18 ++ Logic/Logic/GENERIC6_6.csv | 18 ++ Logic/Logic/GENERIC6_8.csv | 18 ++ Logic/Logic/GENERIC8_4.csv | 20 ++ Logic/Logic/GENERIC8_6.csv | 20 ++ Logic/Logic/GENERIC8_8.csv | 20 ++ Logic/Logic/GENERIC9_VA_4.csv | 23 ++ Logic/script | 28 +++ Logic/uuid_cache_Generic.csv | 314 ++++++++++++++++++++++++++++ Logic/uuid_cache_Generic_cmpcat.csv | 25 +++ 29 files changed, 885 insertions(+) create mode 100644 Logic/Boilerplate_Generic.csv create mode 100644 Logic/Logic/GENERIC10_VA_4.csv create mode 100644 Logic/Logic/GENERIC10_VB_4.csv create mode 100644 Logic/Logic/GENERIC11_VA_4.csv create mode 100644 Logic/Logic/GENERIC12_4.csv create mode 100644 Logic/Logic/GENERIC12_VA_4.csv create mode 100644 Logic/Logic/GENERIC12_VB_4.csv create mode 100644 Logic/Logic/GENERIC12_VC_4.csv create mode 100644 Logic/Logic/GENERIC14_VA_4.csv create mode 100644 Logic/Logic/GENERIC14_VB_4.csv create mode 100644 Logic/Logic/GENERIC4_4.csv create mode 100644 Logic/Logic/GENERIC4_6.csv create mode 100644 Logic/Logic/GENERIC4_8.csv create mode 100644 Logic/Logic/GENERIC5_VA_4.csv create mode 100644 Logic/Logic/GENERIC5_VA_6.csv create mode 100644 Logic/Logic/GENERIC5_VA_8.csv create mode 100644 Logic/Logic/GENERIC5_VB_4.csv create mode 100644 Logic/Logic/GENERIC5_VB_6.csv create mode 100644 Logic/Logic/GENERIC5_VB_8.csv create mode 100644 Logic/Logic/GENERIC6_4.csv create mode 100644 Logic/Logic/GENERIC6_6.csv create mode 100644 Logic/Logic/GENERIC6_8.csv create mode 100644 Logic/Logic/GENERIC8_4.csv create mode 100644 Logic/Logic/GENERIC8_6.csv create mode 100644 Logic/Logic/GENERIC8_8.csv create mode 100644 Logic/Logic/GENERIC9_VA_4.csv create mode 100644 Logic/uuid_cache_Generic.csv create mode 100644 Logic/uuid_cache_Generic_cmpcat.csv diff --git a/Logic/Boilerplate_Generic.csv b/Logic/Boilerplate_Generic.csv new file mode 100644 index 00000000..d1951519 --- /dev/null +++ b/Logic/Boilerplate_Generic.csv @@ -0,0 +1,4 @@ +KEYWORDS,generic,ic +CREATE,2020-04-09T00:00:00Z +VERSION,0.1 +AUTHOR,John Eaton diff --git a/Logic/Logic/GENERIC10_VA_4.csv b/Logic/Logic/GENERIC10_VA_4.csv new file mode 100644 index 00000000..9ff02c54 --- /dev/null +++ b/Logic/Logic/GENERIC10_VA_4.csv @@ -0,0 +1,24 @@ +SCALE,1.000 +DEF,Generic IC 10-Pin (Variant A) 1/4 Scale 10x26 PWR +DESCR,Generic 10-pin integrated circuit. +POLY,.100,F +POLYPT,-5.00,13.00,0 +POLYPT,5.00,13.00,0 +POLYPT,5.00,-13.00,0 +POLYPT,-5.00,-13.00,0 +POLYPT,-5.00,13.00,0 +POLYST +PIN,1,R,-6.00,8.00,1.00 +PIN,2,R,-6.00,6.00,1.00 +PIN,3,R,-6.00,4.00,1.00 +PIN,4,R,-6.00,2.00,1.00 +PIN,5,R,-6.00,-2.00,1.00 +PIN,6,R,-6.00,-4.00,1.00 +PIN,7,R,-6.00,-6.00,1.00 +PIN,8,R,-6.00,-8.00,1.00 +PIN,9,L,6.00,-5.00,1.00 +PIN,10,L,6.00,5.00,1.00 +PIN,PWR,D,0.00,14.00,1.00 +PIN,GND,U,0.00,-14.00,1.00 +TEXT,-5.00,13.00,NAME +TEXT,-5.00,-13.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC10_VB_4.csv b/Logic/Logic/GENERIC10_VB_4.csv new file mode 100644 index 00000000..be0fba4c --- /dev/null +++ b/Logic/Logic/GENERIC10_VB_4.csv @@ -0,0 +1,22 @@ +SCALE,1.000 +DEF,Generic IC 10-Pin (Variant B) 1/4 Scale 8x16 +DESCR,Generic 10-pin integrated circuit. +POLY,.100,F +POLYPT,-4.00,8.00,0 +POLYPT,4.00,8.00,0 +POLYPT,4.00,-8.00,0 +POLYPT,-4.00,-8.00,0 +POLYPT,-4.00,8.00,0 +POLYST +PIN,1,R,-6.00,6.00,2.00 +PIN,2,R,-6.00,4.00,2.00 +PIN,3,R,-6.00,0.00,2.00 +PIN,4,R,-6.00,-2.00,2.00 +PIN,5,R,-6.00,-4.00,2.00 +PIN,6,R,-6.00,-6.00,2.00 +PIN,7,L,6.00,-6.00,2.00 +PIN,8,L,6.00,-4.00,2.00 +PIN,9,L,6.00,-2.00,2.00 +PIN,10,L,6.00,0.00,2.00 +TEXT,-4.00,8.00,NAME +TEXT,-4.00,-8.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC11_VA_4.csv b/Logic/Logic/GENERIC11_VA_4.csv new file mode 100644 index 00000000..47b937bb --- /dev/null +++ b/Logic/Logic/GENERIC11_VA_4.csv @@ -0,0 +1,23 @@ +SCALE,1.000 +DEF,Generic IC 11-Pin (Variant A) 1/4 Scale 8x16 +DESCR,Generic 11-pin integrated circuit. +POLY,.100,F +POLYPT,-4.00,8.00,0 +POLYPT,4.00,8.00,0 +POLYPT,4.00,-8.00,0 +POLYPT,-4.00,-8.00,0 +POLYPT,-4.00,8.00,0 +POLYST +PIN,1,R,-6.00,7.00,2.00 +PIN,2,R,-6.00,5.00,2.00 +PIN,3,R,-6.00,3.00,2.00 +PIN,4,R,-6.00,0.00,2.00 +PIN,5,R,-6.00,-2.00,2.00 +PIN,6,R,-6.00,-4.00,2.00 +PIN,7,R,-6.00,-6.00,2.00 +PIN,8,L,6.00,-6.00,2.00 +PIN,9,L,6.00,-4.00,2.00 +PIN,10,L,6.00,-2.00,2.00 +PIN,11,L,6.00,0.00,2.00 +TEXT,-4.00,8.00,NAME +TEXT,-4.00,-8.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC12_4.csv b/Logic/Logic/GENERIC12_4.csv new file mode 100644 index 00000000..ece0251d --- /dev/null +++ b/Logic/Logic/GENERIC12_4.csv @@ -0,0 +1,24 @@ +SCALE,1.000 +DEF,Generic IC 12-Pin 1/4 Scale 8x14 +DESCR,Generic 12-pin integrated circuit. +POLY,.100,F +POLYPT,-4.00,7.00,0 +POLYPT,4.00,7.00,0 +POLYPT,4.00,-7.00,0 +POLYPT,-4.00,-7.00,0 +POLYPT,-4.00,7.00,0 +POLYST +PIN,1,R,-6.00,5.00,2.00 +PIN,2,R,-6.00,3.00,2.00 +PIN,3,R,-6.00,1.00,2.00 +PIN,4,R,-6.00,-1.00,2.00 +PIN,5,R,-6.00,-3.00,2.00 +PIN,6,R,-6.00,-5.00,2.00 +PIN,7,L,6.00,-5.00,2.00 +PIN,8,L,6.00,-3.00,2.00 +PIN,9,L,6.00,-1.00,2.00 +PIN,10,L,6.00,1.00,2.00 +PIN,11,L,6.00,3.00,2.00 +PIN,12,L,6.00,5.00,2.00 +TEXT,-4.00,7.00,NAME +TEXT,-4.00,-7.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC12_VA_4.csv b/Logic/Logic/GENERIC12_VA_4.csv new file mode 100644 index 00000000..88b1a209 --- /dev/null +++ b/Logic/Logic/GENERIC12_VA_4.csv @@ -0,0 +1,26 @@ +SCALE,1.000 +DEF,Generic IC 12-Pin (Variant A) 1/4 Scale 10x26 PWR +DESCR,Generic 12-pin integrated circuit. +POLY,.100,F +POLYPT,-5.00,13.00,0 +POLYPT,5.00,13.00,0 +POLYPT,5.00,-13.00,0 +POLYPT,-5.00,-13.00,0 +POLYPT,-5.00,13.00,0 +POLYST +PIN,1,R,-6.00,10.00,1.00 +PIN,2,R,-6.00,8.00,1.00 +PIN,3,R,-6.00,4.00,1.00 +PIN,4,R,-6.00,2.00,1.00 +PIN,5,R,-6.00,-2.00,1.00 +PIN,6,R,-6.00,-4.00,1.00 +PIN,7,R,-6.00,-8.00,1.00 +PIN,8,R,-6.00,-10.00,1.00 +PIN,9,L,6.00,-9.00,1.00 +PIN,10,L,6.00,-3.00,1.00 +PIN,11,L,6.00,3.00,1.00 +PIN,12,L,6.00,9.00,1.00 +PIN,PWR,D,0.00,14.00,1.00 +PIN,GND,U,0.00,-14.00,1.00 +TEXT,-5.00,13.00,NAME +TEXT,-5.00,-13.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC12_VB_4.csv b/Logic/Logic/GENERIC12_VB_4.csv new file mode 100644 index 00000000..746168dc --- /dev/null +++ b/Logic/Logic/GENERIC12_VB_4.csv @@ -0,0 +1,26 @@ +SCALE,1.000 +DEF,Generic IC 12-Pin (Variant B) 1/4 Scale 10x26 PWR +DESCR,Generic 12-pin integrated circuit. +POLY,.100,F +POLYPT,-5.00,13.00,0 +POLYPT,5.00,13.00,0 +POLYPT,5.00,-13.00,0 +POLYPT,-5.00,-13.00,0 +POLYPT,-5.00,13.00,0 +POLYST +PIN,1,R,-6.00,10.00,1.00 +PIN,2,R,-6.00,8.00,1.00 +PIN,3,R,-6.00,6.00,1.00 +PIN,4,R,-6.00,2.00,1.00 +PIN,5,R,-6.00,0.00,1.00 +PIN,6,R,-6.00,-2.00,1.00 +PIN,7,R,-6.00,-6.00,1.00 +PIN,8,R,-6.00,-8.00,1.00 +PIN,9,R,-6.00,-10.00,1.00 +PIN,10,L,6.00,-8.00,1.00 +PIN,11,L,6.00,0.00,1.00 +PIN,12,L,6.00,8.00,1.00 +PIN,PWR,D,0.00,14.00,1.00 +PIN,GND,U,0.00,-14.00,1.00 +TEXT,-5.00,13.00,NAME +TEXT,-5.00,-13.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC12_VC_4.csv b/Logic/Logic/GENERIC12_VC_4.csv new file mode 100644 index 00000000..692c56a8 --- /dev/null +++ b/Logic/Logic/GENERIC12_VC_4.csv @@ -0,0 +1,26 @@ +SCALE,1.000 +DEF,Generic IC 12-Pin (Variant C) 1/4 Scale 10x26 PWR +DESCR,Generic 12-pin integrated circuit. +POLY,.100,F +POLYPT,-5.00,13.00,0 +POLYPT,5.00,13.00,0 +POLYPT,5.00,-13.00,0 +POLYPT,-5.00,-13.00,0 +POLYPT,-5.00,13.00,0 +POLYST +PIN,1,R,-6.00,10.00,1.00 +PIN,2,R,-6.00,6.00,1.00 +PIN,3,R,-6.00,2.00,1.00 +PIN,4,R,-6.00,-2.00,1.00 +PIN,5,R,-6.00,-6.00,1.00 +PIN,6,R,-6.00,-10.00,1.00 +PIN,7,L,6.00,-10.00,1.00 +PIN,8,L,6.00,-6.00,1.00 +PIN,9,L,6.00,-2.00,1.00 +PIN,10,L,6.00,2.00,1.00 +PIN,11,L,6.00,6.00,1.00 +PIN,12,L,6.00,10.00,1.00 +PIN,PWR,D,0.00,14.00,1.00 +PIN,GND,U,0.00,-14.00,1.00 +TEXT,-5.00,13.00,NAME +TEXT,-5.00,-13.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC14_VA_4.csv b/Logic/Logic/GENERIC14_VA_4.csv new file mode 100644 index 00000000..ee80e3a9 --- /dev/null +++ b/Logic/Logic/GENERIC14_VA_4.csv @@ -0,0 +1,28 @@ +SCALE,1.000 +DEF,Generic IC 14-Pin (Variant A) 1/4 Scale 10x26 PWR +DESCR,Generic 14-pin integrated circuit. +POLY,.100,F +POLYPT,-5.00,13.00,0 +POLYPT,5.00,13.00,0 +POLYPT,5.00,-13.00,0 +POLYPT,-5.00,-13.00,0 +POLYPT,-5.00,13.00,0 +POLYST +PIN,1,R,-6.00,10.00,1.00 +PIN,2,R,-6.00,8.00,1.00 +PIN,3,R,-6.00,6.00,1.00 +PIN,4,R,-6.00,4.00,1.00 +PIN,5,R,-6.00,2.00,1.00 +PIN,6,R,-6.00,0.00,1.00 +PIN,7,R,-6.00,-2.00,1.00 +PIN,8,R,-6.00,-4.00,1.00 +PIN,9,R,-6.00,-6.00,1.0 +PIN,10,R,-6.00,-8.00,1.00 +PIN,11,R,-6.00,-10.00,1.00 +PIN,12,L,6.00,6.00,1.00 +PIN,13,L,6.00,8.00,1.00 +PIN,14,L,6.00,10.00,1.00 +PIN,PWR,D,0.00,14.00,1.00 +PIN,GND,U,0.00,-14.00,1.00 +TEXT,-5.00,13.00,NAME +TEXT,-5.00,-13.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC14_VB_4.csv b/Logic/Logic/GENERIC14_VB_4.csv new file mode 100644 index 00000000..6df95cd2 --- /dev/null +++ b/Logic/Logic/GENERIC14_VB_4.csv @@ -0,0 +1,28 @@ +SCALE,1.000 +DEF,Generic IC 14-Pin (Variant B) 1/4 Scale 10x26 PWR +DESCR,Generic 14-pin integrated circuit. +POLY,.100,F +POLYPT,-5.00,13.00,0 +POLYPT,5.00,13.00,0 +POLYPT,5.00,-13.00,0 +POLYPT,-5.00,-13.00,0 +POLYPT,-5.00,13.00,0 +POLYST +PIN,1,R,-6.00,7.00,1.00 +PIN,2,R,-6.00,5.00,1.00 +PIN,3,R,-6.00,3.00,1.00 +PIN,4,R,-6.00,-1.00,1.00 +PIN,5,R,-6.00,-3.00,1.00 +PIN,6,R,-6.00,-5.00,1.00 +PIN,7,L,6.00,-7.00,1.00 +PIN,8,L,6.00,-5.00,1.00 +PIN,9,L,6.00,-3.00,1.00 +PIN,10,L,6.00,-1.00,1.00 +PIN,11,L,6.00,1.00,1.00 +PIN,12,L,6.00,3.00,1.00 +PIN,13,L,6.00,5.00,1.00 +PIN,14,L,6.00,7.00,1.00 +PIN,PWR,D,0.00,14.00,1.00 +PIN,GND,U,0.00,-14.00,1.00 +TEXT,-5.00,13.00,NAME +TEXT,-5.00,-13.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC4_4.csv b/Logic/Logic/GENERIC4_4.csv new file mode 100644 index 00000000..8da58391 --- /dev/null +++ b/Logic/Logic/GENERIC4_4.csv @@ -0,0 +1,16 @@ +SCALE,1.000 +DEF,Generic IC 4-Pin 1/4 Scale 8x8 +DESCR,Generic 4-pin integrated circuit. +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,1,R,-6.00,2.00,2.00 +PIN,2,R,-6.00,-2.00,2.00 +PIN,3,L,6.00,-2.00,2.00 +PIN,4,L,6.00,2.00,2.00 +TEXT,-4.00,4.00,NAME +TEXT,-4.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC4_6.csv b/Logic/Logic/GENERIC4_6.csv new file mode 100644 index 00000000..0673e27e --- /dev/null +++ b/Logic/Logic/GENERIC4_6.csv @@ -0,0 +1,16 @@ +SCALE,1.000 +DEF,Generic IC 4-Pin 1/6 Scale 6x4 +DESCR,Generic 4-pin integrated circuit. +POLY,.100,F +POLYPT,-3.00,2.00,0 +POLYPT,3.00,2.00,0 +POLYPT,3.00,-2.00,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-3.00,2.00,0 +POLYST +PIN,1,R,-4.00,1.00,1.00 +PIN,2,R,-4.00,-1.00,1.00 +PIN,3,L,4.00,-1.00,1.00 +PIN,4,L,4.00,1.00,1.00 +TEXT,-3.00,2.00,NAME +TEXT,-3.00,-2.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC4_8.csv b/Logic/Logic/GENERIC4_8.csv new file mode 100644 index 00000000..80a11717 --- /dev/null +++ b/Logic/Logic/GENERIC4_8.csv @@ -0,0 +1,16 @@ +SCALE,2.000 +DEF,Generic IC 4-Pin 1/8 Scale 4x4 +DESCR,Generic 4-pin integrated circuit. +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,1,R,-3.00,1.00,1.00 +PIN,2,R,-3.00,-1.00,1.00 +PIN,3,L,3.00,-1.00,1.00 +PIN,4,L,3.00,1.00,1.00 +TEXT,-4.00,4.00,NAME +TEXT,-4.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC5_VA_4.csv b/Logic/Logic/GENERIC5_VA_4.csv new file mode 100644 index 00000000..9c230598 --- /dev/null +++ b/Logic/Logic/GENERIC5_VA_4.csv @@ -0,0 +1,17 @@ +SCALE,1.000 +DEF,Generic IC 5-Pin (Variant A) 1/4 Scale 8x8 +DESCR,Generic 5-pin integrated circuit. three pins on left +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,1,R,-6.00,2.00,2.00 +PIN,2,R,-6.00,0.00,2.00 +PIN,3,R,-6.00,-2.00,2.00 +PIN,4,L,6.00,-2.00,2.00 +PIN,5,L,6.00,2.00,2.00 +TEXT,-4.00,4.00,NAME +TEXT,-4.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC5_VA_6.csv b/Logic/Logic/GENERIC5_VA_6.csv new file mode 100644 index 00000000..953958f4 --- /dev/null +++ b/Logic/Logic/GENERIC5_VA_6.csv @@ -0,0 +1,17 @@ +SCALE,1.000 +DEF,Generic IC 5-Pin (Variant A) 1/6 Scale 6x4 +DESCR,Generic 5-pin integrated circuit. three pins on left +POLY,.100,F +POLYPT,-3.00,2.00,0 +POLYPT,3.00,2.00,0 +POLYPT,3.00,-2.00,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-3.00,2.00,0 +POLYST +PIN,1,R,-4.00,1.00,1.00 +PIN,2,R,-4.00,0.00,1.00 +PIN,3,R,-4.00,-1.00,1.00 +PIN,4,L,4.00,-1.00,1.00 +PIN,5,L,4.00,1.00,1.00 +TEXT,-3.00,2.00,NAME +TEXT,-3.00,-2.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC5_VA_8.csv b/Logic/Logic/GENERIC5_VA_8.csv new file mode 100644 index 00000000..65ffdeb1 --- /dev/null +++ b/Logic/Logic/GENERIC5_VA_8.csv @@ -0,0 +1,17 @@ +SCALE,2.000 +DEF,Generic IC 5-Pin (Variant A) 1/8 Scale 4x4 +DESCR,Generic 5-pin integrated circuit. three pins on left +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,1,R,-3.00,1.00,1.00 +PIN,2,R,-3.00,0.00,1.00 +PIN,3,R,-3.00,-1.00,1.00 +PIN,4,L,3.00,-1.00,1.00 +PIN,5,L,3.00,1.00,1.00 +TEXT,-4.00,4.00,NAME +TEXT,-4.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC5_VB_4.csv b/Logic/Logic/GENERIC5_VB_4.csv new file mode 100644 index 00000000..f52a25de --- /dev/null +++ b/Logic/Logic/GENERIC5_VB_4.csv @@ -0,0 +1,17 @@ +SCALE,1.000 +DEF,Generic IC 5-Pin (Variant B) 1/4 Scale 8x8 +DESCR,Generic 5-pin integrated circuit. three pins on right +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,1,R,-6.00,2.00,2.00 +PIN,2,R,-6.00,-2.00,2.00 +PIN,3,L,6.00,-2.00,2.00 +PIN,4,L,6.00,0.00,2.00 +PIN,5,L,6.00,2.00,2.00 +TEXT,-4.00,4.00,NAME +TEXT,-4.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC5_VB_6.csv b/Logic/Logic/GENERIC5_VB_6.csv new file mode 100644 index 00000000..413fd29c --- /dev/null +++ b/Logic/Logic/GENERIC5_VB_6.csv @@ -0,0 +1,17 @@ +SCALE,1.000 +DEF,Generic IC 5-Pin (Variant B) 1/6 Scale 6x4 +DESCR,Generic 5-pin integrated circuit. three pins on right +POLY,.100,F +POLYPT,-3.00,2.00,0 +POLYPT,3.00,2.00,0 +POLYPT,3.00,-2.00,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-3.00,2.00,0 +POLYST +PIN,1,R,-4.00,1.00,1.00 +PIN,2,R,-4.00,-1.00,1.00 +PIN,3,L,4.00,-1.00,1.00 +PIN,4,L,4.00,0.00,1.00 +PIN,5,L,4.00,1.00,1.00 +TEXT,-3.00,2.00,NAME +TEXT,-3.00,-2.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC5_VB_8.csv b/Logic/Logic/GENERIC5_VB_8.csv new file mode 100644 index 00000000..3c4bfeae --- /dev/null +++ b/Logic/Logic/GENERIC5_VB_8.csv @@ -0,0 +1,17 @@ +SCALE,2.000 +DEF,Generic IC 5-Pin (Variant B) 1/8 Scale 4x4 +DESCR,Generic 5-pin integrated circuit. three pins on right +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,1,R,-3.00,1.00,1.00 +PIN,2,R,-3.00,-1.00,1.00 +PIN,3,L,3.00,-1.00,1.00 +PIN,4,L,3.00,0.00,1.00 +PIN,5,L,3.00,1.00,1.00 +TEXT,-4.00,4.00,NAME +TEXT,-4.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC6_4.csv b/Logic/Logic/GENERIC6_4.csv new file mode 100644 index 00000000..45494aed --- /dev/null +++ b/Logic/Logic/GENERIC6_4.csv @@ -0,0 +1,18 @@ +SCALE,1.000 +DEF,Generic IC 6-Pin 1/4 Scale 8x8 +DESCR,Generic 6-pin integrated circuit. +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,1,R,-6.00,2.00,2.00 +PIN,2,R,-6.00,0.00,2.00 +PIN,3,R,-6.00,-2.00,2.00 +PIN,4,L,6.00,-2.00,2.00 +PIN,5,L,6.00,0.00,2.00 +PIN,6,L,6.00,2.00,2.00 +TEXT,-4.00,4.00,NAME +TEXT,-4.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC6_6.csv b/Logic/Logic/GENERIC6_6.csv new file mode 100644 index 00000000..4a034f45 --- /dev/null +++ b/Logic/Logic/GENERIC6_6.csv @@ -0,0 +1,18 @@ +SCALE,1.000 +DEF,Generic IC 6-Pin 1/6 Scale 6x4 +DESCR,Generic 6-pin integrated circuit. +POLY,.100,F +POLYPT,-3.00,2.00,0 +POLYPT,3.00,2.00,0 +POLYPT,3.00,-2.00,0 +POLYPT,-3.00,-2.00,0 +POLYPT,-3.00,2.00,0 +POLYST +PIN,1,R,-4.00,1.00,1.00 +PIN,2,R,-4.00,0.00,1.00 +PIN,3,R,-4.00,-1.00,1.00 +PIN,4,L,4.00,-1.00,1.00 +PIN,5,L,4.00,0.00,1.00 +PIN,6,L,4.00,1.00,1.00 +TEXT,-3.00,2.00,NAME +TEXT,-3.00,-2.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC6_8.csv b/Logic/Logic/GENERIC6_8.csv new file mode 100644 index 00000000..10ceec84 --- /dev/null +++ b/Logic/Logic/GENERIC6_8.csv @@ -0,0 +1,18 @@ +SCALE,2.000 +DEF,Generic IC 6-Pin 1/8 Scale 4x4 +DESCR,Generic 6-pin integrated circuit. +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,1,R,-3.00,1.00,1.00 +PIN,2,R,-3.00,0.00,1.00 +PIN,3,R,-3.00,-1.00,1.00 +PIN,4,L,3.00,-1.00,1.00 +PIN,5,L,3.00,0.00,1.00 +PIN,6,L,3.00,1.00,1.00 +TEXT,-4.00,4.00,NAME +TEXT,-4.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC8_4.csv b/Logic/Logic/GENERIC8_4.csv new file mode 100644 index 00000000..10759ae4 --- /dev/null +++ b/Logic/Logic/GENERIC8_4.csv @@ -0,0 +1,20 @@ +SCALE,1.000 +DEF,Generic IC 8-Pin 1/4 Scale 8x8 +DESCR,Generic 8-pin integrated circuit. +POLY,.100,F +POLYPT,-4.00,4.00,0 +POLYPT,4.00,4.00,0 +POLYPT,4.00,-4.00,0 +POLYPT,-4.00,-4.00,0 +POLYPT,-4.00,4.00,0 +POLYST +PIN,1,R,-6.00,3.00,2.00 +PIN,2,R,-6.00,1.00,2.00 +PIN,3,R,-6.00,-1.00,2.00 +PIN,4,R,-6.00,-3.00,2.00 +PIN,5,L,6.00,-3.00,2.00 +PIN,6,L,6.00,-1.00,2.00 +PIN,7,L,6.00,1.00,2.00 +PIN,8,L,6.00,3.00,2.00 +TEXT,-4.00,4.00,NAME +TEXT,-4.00,-4.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC8_6.csv b/Logic/Logic/GENERIC8_6.csv new file mode 100644 index 00000000..3280f7b1 --- /dev/null +++ b/Logic/Logic/GENERIC8_6.csv @@ -0,0 +1,20 @@ +SCALE,1.000 +DEF,Generic IC 8-Pin 1/6 Scale 6x5 +DESCR,Generic 8-pin integrated circuit. +POLY,.100,F +POLYPT,-3.00,2.00,0 +POLYPT,3.00,2.00,0 +POLYPT,3.00,-3.00,0 +POLYPT,-3.00,-3.00,0 +POLYPT,-3.00,2.00,0 +POLYST +PIN,1,R,-4.00,1.00,1.00 +PIN,2,R,-4.00,0.00,1.00 +PIN,3,R,-4.00,-1.00,1.00 +PIN,4,R,-4.00,-2.00,1.00 +PIN,5,L,4.00,-2.00,1.00 +PIN,6,L,4.00,-1.00,1.00 +PIN,7,L,4.00,0.00,1.00 +PIN,8,L,4.00,1.00,1.00 +TEXT,-3.00,2.00,NAME +TEXT,-3.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC8_8.csv b/Logic/Logic/GENERIC8_8.csv new file mode 100644 index 00000000..145e2b08 --- /dev/null +++ b/Logic/Logic/GENERIC8_8.csv @@ -0,0 +1,20 @@ +SCALE,1.000 +DEF,Generic IC 8-Pin 1/8 Scale 4x5 +DESCR,Generic 8-pin integrated circuit. +POLY,.100,F +POLYPT,-2.00,2.00,0 +POLYPT,2.00,2.00,0 +POLYPT,2.00,-3.00,0 +POLYPT,-2.00,-3.00,0 +POLYPT,-2.00,2.00,0 +POLYST +PIN,1,R,-3.00,1.00,1.00 +PIN,2,R,-3.00,0.00,1.00 +PIN,3,R,-3.00,-1.00,1.00 +PIN,4,R,-3.00,-2.00,1.00 +PIN,5,L,3.00,-2.00,1.00 +PIN,6,L,3.00,-1.00,1.00 +PIN,7,L,3.00,0.00,1.00 +PIN,8,L,3.00,1.00,1.00 +TEXT,-2.00,2.00,NAME +TEXT,-2.00,-3.00,VALUE \ No newline at end of file diff --git a/Logic/Logic/GENERIC9_VA_4.csv b/Logic/Logic/GENERIC9_VA_4.csv new file mode 100644 index 00000000..4064cb60 --- /dev/null +++ b/Logic/Logic/GENERIC9_VA_4.csv @@ -0,0 +1,23 @@ +SCALE,1.000 +DEF,Generic IC 9-Pin (Variant A) 1/4 Scale 10x20 PWR +DESCR,Generic 9-pin integrated circuit. +POLY,.100,F +POLYPT,-5.00,10.00,0 +POLYPT,5.00,10.00,0 +POLYPT,5.00,-10.00,0 +POLYPT,-5.00,-10.00,0 +POLYPT,-5.00,10.00,0 +POLYST +PIN,1,R,-6.00,7.00,1.00 +PIN,2,R,-6.00,5.00,1.00 +PIN,3,R,-6.00,3.00,1.00 +PIN,4,R,-6.00,1.00,1.00 +PIN,5,R,-6.00,-1.00,1.00 +PIN,6,R,-6.00,-3.00,1.00 +PIN,7,R,-6.00,-5.00,1.00 +PIN,8,R,-6.00,-7.00,1.00 +PIN,9,L,6.00,0.00,1.00 +PIN,PWR,D,0.00,11.00,1.00 +PIN,GND,U,0.00,-11.00,1.00 +TEXT,-5.00,10.00,NAME +TEXT,-5.00,-10.00,VALUE \ No newline at end of file diff --git a/Logic/script b/Logic/script index 1bf4f5b5..feebd942 100755 --- a/Logic/script +++ b/Logic/script @@ -80,4 +80,32 @@ python3.9 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ python3.9 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design HALF_ADDER_4 python3.9 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design FULL_ADDER_4 python3.9 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design BARREL_SHIFTER4_4 +<<<<<<< HEAD +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC4_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC4_6 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC4_8 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC5_VA_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC5_VA_6 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC5_VA_8 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC5_VB_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC5_VB_6 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC5_VB_8 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC6_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC6_6 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC6_8 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC8_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC8_6 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC8_8 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC12_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC12_VA_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC12_VB_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC12_VC_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC9_VA_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC10_VA_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC10_VB_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC11_VA_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC14_VA_4 +python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC14_VB_4 +======= +>>>>>>> df2045bf9b0238bc9a1daa9c91bef6185fee8b68 diff --git a/Logic/uuid_cache_Generic.csv b/Logic/uuid_cache_Generic.csv new file mode 100644 index 00000000..15c98ed8 --- /dev/null +++ b/Logic/uuid_cache_Generic.csv @@ -0,0 +1,314 @@ +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-1,06b018b6-0336-4dde-a7c5-5422e3e6c127 +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-10,23780115-94ca-46aa-a719-93bd29c935bb +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-2,9764c96f-db14-4c67-a2fd-9aa684942f0c +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-3,5bc557a8-5225-41e0-b110-fb66bbebd7dd +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-4,1b6b0e10-d3a4-40c5-9194-52eb0feeced9 +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-5,e306c7db-6998-45c1-88e2-2731c081f34e +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-6,10b4fc70-af04-4216-a62a-441a031c11df +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-7,c53dde75-0f7b-404d-9f11-7c763f329df7 +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-8,67eccd47-a602-44b6-ad36-c7fa803cebf5 +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-9,a54f6cfc-ad43-4956-b8fd-4241f9971f34 +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-gnd,7fc3b397-2ed2-416e-8e94-8818199597ea +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-pin-pwr,cb30c367-d8ef-4da0-9a9c-7c2b9f967919 +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-polygon-contour,6368f6e2-493d-4043-a07b-50c5a7e2a8d2 +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-sym,bdf5c994-ef4e-4508-b5de-10c59c643a5c +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-text-name,45fbdc3c-f2af-4c95-ac5e-507d458a006b +sym-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-text-value,fc962c48-0989-48a4-b19a-2399740c3337 +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-1,f83d3961-d77e-4e4f-b6d7-b1dad617f51d +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-10,ca86a9c4-9380-4759-95fe-3361346e43fd +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-2,e2df8666-25b8-486b-a34c-890661500634 +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-3,6afe11a3-ed32-41c6-aa89-1798436fae2a +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-4,44b2f517-3af4-413b-baae-219cad99848c +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-5,085b347f-4b47-45df-abe2-939b9caceca3 +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-6,2b59253d-86ee-456e-85b8-0b4e82194648 +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-7,ea166793-51a3-484f-b94f-aabe52269181 +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-8,04ed306b-3592-42ae-b3c5-48fd469a81c0 +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-pin-9,be496a98-b1c6-41ae-b193-7e1cc336b772 +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-polygon-contour,ab65a612-73be-4bff-9bee-a0da2e3d242e +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-sym,58763309-5f27-4d4f-8d7a-293d3b1f99a6 +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-text-name,3a722d93-69e9-4c6e-8925-b05db6ed007d +sym-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-text-value,87421ccd-ae2a-4cc0-bfe6-d32639f58fbc +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-1,9767f8d1-416c-4c3f-9c14-8049caaa1e42 +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-10,e1c2ca73-474e-42d8-8bda-06d3bc5115d3 +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-11,983652c0-68d8-4c47-914a-f3534e8b86d3 +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-2,e9dd4f7a-107a-48e2-9e97-4fec853e8f06 +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-3,40f9996c-e15c-4060-9c01-f3bbf327fae3 +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-4,49fe4075-e97a-4b45-bdb2-fadb68680131 +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-5,1b42fb5e-fe3c-4653-bd14-2698532916af +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-6,432f8db2-1ba7-402b-8a36-66634a468ddd +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-7,551de76f-2079-425f-8dc3-fbeca35e1afd +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-8,0843b609-616d-4c55-97c3-9b12dbd15203 +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-pin-9,146f1c79-4c5e-484d-9b10-301a4273e44c +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-polygon-contour,b1de0241-ceb2-40b5-9784-df88c0b3be26 +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-sym,8b917056-4f48-4b14-be64-0a117d2631dd +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-text-name,a45677b5-6247-4a59-9090-4abf8a305019 +sym-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-text-value,08672df1-a101-4d60-9d11-5cb33ff041b9 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-1,34571660-e06a-4448-9e11-01140f489db2 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-10,3433ce5b-a615-4141-a7dc-0f4675e2f41d +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-11,1200d8c2-00c4-45e5-99fe-9f94d3596201 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-12,7a44ebb4-9c34-4609-8773-fbc3be314fad +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-2,ac8e2067-6ab4-41a6-a533-dffab99f9c33 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-3,a4287fc9-b5bb-4e82-adca-49b8befd09e1 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-4,14c28801-6cdc-4edc-80d3-5e94af1c8e73 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-5,a52f04a0-742b-4fc0-a2d3-d2c10b56fa4c +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-6,d88f4e25-55f7-4d7b-a3a0-e413e558b935 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-7,96892d5d-e697-4772-9bd3-ae6bd8522c12 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-8,cae403ea-e3bb-44fd-bbc3-0150ac070ce1 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-9,f17d5d59-bb88-4029-acf6-004bc7019eb6 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-gnd,5b322e2b-cb09-4dbd-bbf5-68a72c8afa17 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-pin-pwr,4220e032-9594-4526-a5db-a9d9f88d4d57 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-polygon-contour,2a454690-f508-43e5-971d-3610ea1a1355 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-sym,24d41ae7-4d9b-4e5b-b54e-95e66e12d2e3 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-text-name,2880fffb-bdc5-4bd6-b29f-30947bc3fb42 +sym-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-text-value,b9948f72-cabf-4a10-94aa-06a7dd52a98c +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-1,01c2d6ca-12cd-4ea1-807b-ad0ade41b559 +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-10,048f006b-87da-409a-a6ae-3cb5a4dae3ec +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-11,2253bd9d-f0cf-4aa1-b8d8-13b0b2d36d00 +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-12,593b5556-4ef4-44ba-ab1e-7646cc420d34 +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-2,b5eac76b-2dcc-4311-ac71-f08ad6dbbcf9 +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-3,d2fc6141-9d09-4fe3-a502-1d5e34c76a1b +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-4,3ff955e4-c0c8-4499-88c5-4109935a90f5 +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-5,f75127d9-3321-44df-90a5-60c2974256ae +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-6,69d34bfd-0529-40fd-b1c2-09a07e10997b +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-7,5d52d4b3-83ee-4fcc-b351-c55bf8690633 +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-8,c946ef9a-040d-40dc-bc51-8e361f188480 +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-9,3d6a452c-b48f-40ba-8945-2a34397f1bee +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-gnd,c7cc4559-7073-4b49-9a63-4987281988c2 +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-pin-pwr,e0e1a910-cf36-4088-a278-4e1fae8543bd +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-polygon-contour,dd039a52-d971-42a8-91c7-36e5a2f1868e +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-sym,035d0506-4f4e-4b8a-b44b-f1ca2c9bdbbc +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-text-name,abcaacd9-5d42-4373-af57-2fc4197389d9 +sym-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-text-value,dd19677b-01fd-48eb-891c-43d479bf099f +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-1,01c8fab0-6dc3-45d1-948b-64cd93e6e076 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-10,2cf2f120-40a1-495b-afe1-273205d373a9 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-11,f1b26292-706d-41cb-8053-e894a717157f +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-12,cf1fd7ba-3c92-4201-85d2-4e8f5c807a85 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-2,ae33296b-69e5-4e55-84c2-b5e563391435 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-3,7c33ad9c-3fc2-4f37-92e8-6a09fc3a2a20 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-4,92bb9220-39a7-4ac3-970c-aee3730b0048 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-5,b58433cb-3c20-4a27-8c11-296f45821a12 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-6,bb26a7c2-2b98-42b9-8f29-a282fab19526 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-7,8924d143-7d97-4650-90d1-efaf60b9e7ee +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-8,23bd72d1-b21e-4d3a-b83b-f004fed799fa +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-9,5ca656cf-16dd-4585-845a-cc1a1a989858 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-gnd,11a4df5d-2bf4-4028-86e0-af791dffca70 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-pin-pwr,3e806294-6e61-4f85-aff2-94a5a17b4751 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-polygon-contour,bb7b61a9-10ea-4f07-8cdf-5d0d9991ef03 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-sym,1ecfe6b3-7566-4872-8b5f-c042e017f754 +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-text-name,4d79108e-258c-4561-911c-3b2309efb9ad +sym-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-text-value,9d1d0182-de23-419f-bc07-33447b53390a +sym-generic~ic~12-pin~1/4~scale~8x14-pin-1,cd1a8332-9d2a-43b3-a025-43b9b8bc7d5d +sym-generic~ic~12-pin~1/4~scale~8x14-pin-10,b7fb3667-ab65-49b5-8d4c-1eb6b81ba663 +sym-generic~ic~12-pin~1/4~scale~8x14-pin-11,cdcf7cab-40e4-46ae-bf0b-d47347483b77 +sym-generic~ic~12-pin~1/4~scale~8x14-pin-12,b9867ec3-e6a6-426e-b1c9-6b9121d30b53 +sym-generic~ic~12-pin~1/4~scale~8x14-pin-2,bc671383-a6d0-4ead-b5fc-026bb8a36af2 +sym-generic~ic~12-pin~1/4~scale~8x14-pin-3,525fb9ad-e176-43a6-b770-a53cc2e68b7a +sym-generic~ic~12-pin~1/4~scale~8x14-pin-4,4dfd5067-f7f9-4beb-b085-ae19a85b1831 +sym-generic~ic~12-pin~1/4~scale~8x14-pin-5,26f78f29-a728-4d71-b9d4-8514a1aaea7a +sym-generic~ic~12-pin~1/4~scale~8x14-pin-6,79f9dd1d-1eff-418c-a03c-4a4362db9c46 +sym-generic~ic~12-pin~1/4~scale~8x14-pin-7,f8f6dbff-0660-40e0-8e4c-1efc858e7257 +sym-generic~ic~12-pin~1/4~scale~8x14-pin-8,389c4b9d-ba88-4385-8f7b-cc456a40d9a7 +sym-generic~ic~12-pin~1/4~scale~8x14-pin-9,614710a3-fb53-43dc-8b20-15cc36a37e49 +sym-generic~ic~12-pin~1/4~scale~8x14-polygon-contour,018d1f62-928d-40b5-8811-ba73f4da006e +sym-generic~ic~12-pin~1/4~scale~8x14-sym,cf92e88f-8d16-4b7d-9df6-8755ecae816d +sym-generic~ic~12-pin~1/4~scale~8x14-text-name,77b5889c-cee0-42a0-83dc-2384235ae9cb +sym-generic~ic~12-pin~1/4~scale~8x14-text-value,d35f5001-6dba-4a74-8be0-2574574976c3 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-1,f9a44aee-b22e-4a4f-898a-e2b8e4ece709 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-10,00983dc2-6238-4d54-b4e9-a6dbcfbc1509 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-11,ffcc9be3-d837-4983-a014-b973bf4810b0 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-12,93c506d3-8ae1-4887-a798-b94820bc44b9 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-13,0bf45bcb-e231-485c-83cf-d519d0e5304d +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-14,af2ef8f7-c39c-44b8-924d-f722ccc9aba7 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-2,b70326ea-ada2-42cd-9f00-89bf96e05508 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-3,d7740198-acc1-44c1-8e89-2676987c4564 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-4,329b1200-3239-4944-a5ba-be928769200a +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-5,ae93540c-8de0-4be2-87d9-d8d68537d6a1 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-6,a4dbcedf-0e4a-4936-96ec-3468431dce77 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-7,377bcebb-34c3-4c07-8408-c54943e9b715 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-8,a21cd4e1-bc12-4883-a08b-22fdb021af24 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-9,5e6ced7d-bea0-43cf-8bc5-1831acb283f7 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-gnd,3715e622-3605-4029-9049-04460b7ec897 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-pin-pwr,7a1ad78a-69ae-4caa-a01d-a7848325b8be +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-polygon-contour,98e64d4f-b27c-4b28-ac9e-4ed5f03d1c6b +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-sym,a3ae6ee2-4116-4b8c-a4f9-f2dd5117cfa9 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-text-name,283bba84-d4d2-4cdf-892b-9e0fe244c406 +sym-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-text-value,de3eae0d-ba3e-47bc-a53e-b87cf87d72b3 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-1,fbd40473-e09b-42a0-9970-25a2f9c33f98 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-10,7831d28b-793b-47b5-bf6d-da9857f4b9be +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-11,6ce19c21-a3bf-4baa-8c7a-97a8419f3295 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-12,e3332ab5-2413-4ebb-871b-8da49d1358d5 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-13,86392a6d-4fc7-419d-a136-2aa19c3b9d61 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-14,d9cc3ace-01c7-4116-af02-8a2378ca5006 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-2,54ed1cc8-ce6c-4da2-a78c-1849c9d0e11d +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-3,8211f539-fb28-4069-8474-37c076aea56e +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-4,0ca4a58d-0819-498c-8aca-5c13b0d45050 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-5,4d97c0d0-7a0c-4405-b4d6-fd29580e0f0e +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-6,3a9b6b46-7265-4df4-b767-6e7bd9db1034 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-7,e018cde1-4d64-4f42-99d0-c278af923468 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-8,dfcf0968-008e-4bf6-bff1-5c92dc48103f +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-9,86a82567-e8f4-4c01-a327-4eb0b52bf8df +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-gnd,9bf90cb3-9e95-48db-9c8d-9295f445474f +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-pin-pwr,358a7968-6e6a-4608-bddf-68f8f9b9b2ce +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-polygon-contour,e95a4721-769d-46eb-9e66-441791313cbe +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-sym,099977bc-92e2-4ad3-b9f1-0fd2f2462d16 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-text-name,06bf5a57-e19c-4386-bf49-20efa1753b66 +sym-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-text-value,c09b07ca-9ea8-4de2-9572-3696d715e9a5 +sym-generic~ic~4-pin~1/4~scale~8x8-pin-1,f6396c8c-cb93-4ba7-b089-5e6f31078a28 +sym-generic~ic~4-pin~1/4~scale~8x8-pin-2,0e73a8e4-1732-45de-bee4-e582808ad01c +sym-generic~ic~4-pin~1/4~scale~8x8-pin-3,f8776d1f-8c81-4f00-89cc-cbb427bd8509 +sym-generic~ic~4-pin~1/4~scale~8x8-pin-4,be1fcb8f-007d-419b-b339-d3115683bb33 +sym-generic~ic~4-pin~1/4~scale~8x8-polygon-contour,97b64133-c676-4485-b0d0-e9113df3f71c +sym-generic~ic~4-pin~1/4~scale~8x8-sym,ed7609bb-c704-4163-8993-7f4ca2032977 +sym-generic~ic~4-pin~1/4~scale~8x8-text-name,e8d13720-6c93-48f5-92e8-102d50b14091 +sym-generic~ic~4-pin~1/4~scale~8x8-text-value,ecd86188-437a-4aa1-83b8-ef9463da0589 +sym-generic~ic~4-pin~1/6~scale~6x4-pin-1,2923b964-cc4c-43f2-a666-09d1867668be +sym-generic~ic~4-pin~1/6~scale~6x4-pin-2,8331edd8-c6a2-41cb-9c34-6ddfaffae700 +sym-generic~ic~4-pin~1/6~scale~6x4-pin-3,a75a5892-e5f6-468e-8713-40437826995e +sym-generic~ic~4-pin~1/6~scale~6x4-pin-4,3dacbe17-8e0e-4f31-afb6-1c89ae7d07b4 +sym-generic~ic~4-pin~1/6~scale~6x4-polygon-contour,4c421c07-d67b-4787-8a26-eaae35ce1ae7 +sym-generic~ic~4-pin~1/6~scale~6x4-sym,9086f90f-34a2-4747-be8f-fa38eadcf2b6 +sym-generic~ic~4-pin~1/6~scale~6x4-text-name,12637245-4f3f-4568-a4e3-a8c165a26643 +sym-generic~ic~4-pin~1/6~scale~6x4-text-value,cf8eb7db-d8e6-43ce-b110-288983c6f39e +sym-generic~ic~4-pin~1/8~scale~4x4-pin-1,a20832f4-94e3-443a-8104-de808a6cff35 +sym-generic~ic~4-pin~1/8~scale~4x4-pin-2,ab856b69-d95b-46fe-b9bc-4b99ed72a2bb +sym-generic~ic~4-pin~1/8~scale~4x4-pin-3,7f7498ed-9523-47df-8294-cad2c86ff8b9 +sym-generic~ic~4-pin~1/8~scale~4x4-pin-4,78937f58-aad5-4c1c-b09a-8a4afeaca329 +sym-generic~ic~4-pin~1/8~scale~4x4-polygon-contour,eed82a8e-f728-4239-a869-cde9aa61fcd6 +sym-generic~ic~4-pin~1/8~scale~4x4-sym,0408c795-f699-4dfe-afee-0678ddb971ef +sym-generic~ic~4-pin~1/8~scale~4x4-text-name,3ee9a163-b03c-4a95-9dd2-9d4b6628d8e0 +sym-generic~ic~4-pin~1/8~scale~4x4-text-value,708f771e-67ec-4753-86a3-9dbfbcb95d29 +sym-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-pin-1,bde870f6-1d39-4894-b7dc-4f6545af316c +sym-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-pin-2,1372783c-613e-402b-abff-4b876b88dccb +sym-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-pin-3,4dffa0b3-d4d3-4b15-bc02-fe391c5ff735 +sym-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-pin-4,6a0ab24d-8ef6-4347-86a0-8812cfdafbe9 +sym-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-pin-5,cb829b2b-1806-4bd3-a39f-c25063cc45fe +sym-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-polygon-contour,35a5ed81-579c-4b31-9490-7e2fdc804dbe +sym-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-sym,d6cb938d-f8f3-4b9e-a703-7a53514630d9 +sym-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-text-name,53fe6d84-5575-4042-a76e-2e68ac07b0b1 +sym-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-text-value,aae31a29-5e3b-45fe-a951-d55006dfbb34 +sym-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-pin-1,bc5cd255-a06b-433b-b555-aa8c35d7e647 +sym-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-pin-2,acb0b62c-425b-4149-8244-dca1bd13ea35 +sym-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-pin-3,26c2e9c8-c12a-4217-8421-ff13412d3d94 +sym-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-pin-4,f6eb619c-10fc-42c2-9c9f-72a2309ea231 +sym-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-pin-5,bd10084c-128a-46af-8d2a-fd018a50ef8c +sym-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-polygon-contour,ca6829f0-9278-4bac-9e3c-4a75046ec0f4 +sym-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-sym,865233fa-0733-4395-ac0e-933c3ba7fc43 +sym-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-text-name,879c15f0-effc-4858-9417-d1078176174d +sym-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-text-value,92312a99-6db9-407e-9b73-abb955175621 +sym-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-pin-1,e92defc6-e399-4298-aaf4-187ad31df3f5 +sym-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-pin-2,2701ae63-11e8-4ef9-a819-f3cee8d086e4 +sym-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-pin-3,0ee67ee7-eef8-4864-a76b-ac018cb30747 +sym-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-pin-4,9183c62c-c934-4ccd-a4fb-8ce4827a3ec6 +sym-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-pin-5,a95383ef-08b8-4cc8-b963-646a1e1c0611 +sym-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-polygon-contour,a0b4fdbe-60ca-4173-8118-1df563dad5a8 +sym-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-sym,4ea5405a-9c0e-4281-80b0-75ec0aac1772 +sym-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-text-name,60f5854b-be64-4a4f-9bd6-2f5f8200b9bd +sym-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-text-value,62a069ad-2b07-40b5-a25c-a56164c6231d +sym-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-pin-1,2cae5d80-0dce-40b0-bb8a-de4b2f174981 +sym-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-pin-2,5864fa28-0961-4498-a616-06a6027fcee8 +sym-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-pin-3,373d37af-a037-4f38-bdab-2cb4bec4029c +sym-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-pin-4,1e4cae32-e1b8-47ac-9f06-b557962af8ce +sym-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-pin-5,926f0333-5ed1-45c9-96b1-632a63062382 +sym-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-polygon-contour,828ca5f3-875c-4d73-8221-f77ea310c236 +sym-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-sym,16d9a8ce-8dd6-4d46-aa1d-fb64b06bd042 +sym-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-text-name,d69ab408-b16a-4433-a441-997bb67079dd +sym-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-text-value,c0c760a1-3338-477f-8b8e-bb1a12cab9f3 +sym-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-pin-1,614ff2b7-423a-4c16-b02e-11ae445827ca +sym-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-pin-2,9b37792e-bbca-4040-bcc2-131af7a0715f +sym-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-pin-3,d6769646-628f-47f4-a97b-62e82ef3886b +sym-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-pin-4,87cb21e4-cfe9-4b88-8c94-ac1820e29edd +sym-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-pin-5,9898541e-26cd-4949-918e-0c969c5bc8c5 +sym-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-polygon-contour,dcf980ec-87b9-4f8d-b6d5-a26cf0463466 +sym-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-sym,4772d9a5-4bd9-4498-acee-9b4328c32b39 +sym-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-text-name,2701baec-9442-4b4d-994f-4887501ad330 +sym-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-text-value,f4f5dc38-0f07-4d2f-bada-7e497d49ee31 +sym-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-pin-1,5ab8f30f-4731-4de5-814d-67bf8edeca17 +sym-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-pin-2,0a650cd5-1cf1-46e4-82c3-de770bbe5586 +sym-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-pin-3,396b1195-88d3-4dfb-bbfd-6cf92459a0ff +sym-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-pin-4,5093e138-7dfe-4868-a009-03a545a9e641 +sym-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-pin-5,d17df81a-68de-466a-9664-249e9b3ce3e8 +sym-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-polygon-contour,05aad79f-76ca-40fa-932d-c78b7161b131 +sym-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-sym,11cf1757-a4be-4951-9dfa-1ab8d8b0d602 +sym-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-text-name,4fa68adb-ac73-417b-8388-ee99139fe13f +sym-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-text-value,ba493e1e-91a1-4fd3-b9e3-612a0b05fddc +sym-generic~ic~6-pin~1/4~scale~8x8-pin-1,58e640e8-7a28-4dce-a160-95a0e4eee60f +sym-generic~ic~6-pin~1/4~scale~8x8-pin-2,7837537d-1a86-47e4-8970-46212735a59a +sym-generic~ic~6-pin~1/4~scale~8x8-pin-3,03f6ac5c-c7a8-4001-9592-e22a8ce32e61 +sym-generic~ic~6-pin~1/4~scale~8x8-pin-4,55c38539-2a41-4d0f-8ce1-830520f9c0bb +sym-generic~ic~6-pin~1/4~scale~8x8-pin-5,6fd0fd16-878a-4605-8fa2-045fe8842c86 +sym-generic~ic~6-pin~1/4~scale~8x8-pin-6,d1bd1c32-4bfa-490e-aaf7-beb342867b42 +sym-generic~ic~6-pin~1/4~scale~8x8-polygon-contour,d9c744a7-596a-4e22-83f6-edce2c5ee150 +sym-generic~ic~6-pin~1/4~scale~8x8-sym,4b1ecb17-afe3-425a-aeef-954f7057908b +sym-generic~ic~6-pin~1/4~scale~8x8-text-name,9630a74b-16ec-4e06-b374-b16ae1c7e448 +sym-generic~ic~6-pin~1/4~scale~8x8-text-value,a50aaa24-7db7-48cb-bfe9-b9c98990af24 +sym-generic~ic~6-pin~1/6~scale~6x4-pin-1,fbeb2e73-a8a6-42f3-a0a0-3d7256397fef +sym-generic~ic~6-pin~1/6~scale~6x4-pin-2,d4a17539-7476-408a-bed8-8b2ca4861019 +sym-generic~ic~6-pin~1/6~scale~6x4-pin-3,c395deca-0442-468a-828c-9da162a707ef +sym-generic~ic~6-pin~1/6~scale~6x4-pin-4,252af3b5-d7e3-42b0-b62d-30ada6d3e230 +sym-generic~ic~6-pin~1/6~scale~6x4-pin-5,c54449c3-47dc-4b62-9ada-bdb42f8a5a82 +sym-generic~ic~6-pin~1/6~scale~6x4-pin-6,8bbea280-350d-49c5-b245-870023c22c19 +sym-generic~ic~6-pin~1/6~scale~6x4-polygon-contour,dd9c74a5-cc8f-4c5d-b740-39a60ed2ad49 +sym-generic~ic~6-pin~1/6~scale~6x4-sym,736ee6f4-25fd-45ce-822e-21603548c427 +sym-generic~ic~6-pin~1/6~scale~6x4-text-name,02629731-32ff-44e1-8557-abaf2a2ddb46 +sym-generic~ic~6-pin~1/6~scale~6x4-text-value,fda9cc63-3d90-413f-9ba3-777de854bc01 +sym-generic~ic~6-pin~1/8~scale~4x4-pin-1,63bec4bd-9278-4ecf-85bd-b81f7f06dcbf +sym-generic~ic~6-pin~1/8~scale~4x4-pin-2,29baa07d-ff9b-45ff-bc21-59997a39819a +sym-generic~ic~6-pin~1/8~scale~4x4-pin-3,e0075135-432c-407b-8d89-7acb63d3283c +sym-generic~ic~6-pin~1/8~scale~4x4-pin-4,e6003aec-12c5-4199-a88c-c59752381d93 +sym-generic~ic~6-pin~1/8~scale~4x4-pin-5,77dc1fee-9899-4f6b-8ac3-7049d9d41e92 +sym-generic~ic~6-pin~1/8~scale~4x4-pin-6,61a37bbf-ed81-45b4-af93-6b401d3aff6b +sym-generic~ic~6-pin~1/8~scale~4x4-polygon-contour,e6e8d86b-0e8a-48fa-a015-f4f750b2cc48 +sym-generic~ic~6-pin~1/8~scale~4x4-sym,96b1c776-3f35-4f2a-857a-903357d7112d +sym-generic~ic~6-pin~1/8~scale~4x4-text-name,06f150dd-5ae1-4362-9227-06e043fa8ed5 +sym-generic~ic~6-pin~1/8~scale~4x4-text-value,a5ad6545-07eb-4554-a8eb-a092bfabb07e +sym-generic~ic~8-pin~1/4~scale~8x8-pin-1,78aae207-51ca-4250-8338-735f9a603269 +sym-generic~ic~8-pin~1/4~scale~8x8-pin-2,e3acc8ff-e1eb-4ddf-bc24-21133f894f8e +sym-generic~ic~8-pin~1/4~scale~8x8-pin-3,c6d9934f-c0ed-45a7-a567-7f89195560b1 +sym-generic~ic~8-pin~1/4~scale~8x8-pin-4,d3d5ad1d-17bd-4b04-87d3-f6ca299a8424 +sym-generic~ic~8-pin~1/4~scale~8x8-pin-5,59f616de-24ea-4d3c-aa2c-081bcaff2dc5 +sym-generic~ic~8-pin~1/4~scale~8x8-pin-6,6950ac73-1980-453f-aff5-96547c449bf0 +sym-generic~ic~8-pin~1/4~scale~8x8-pin-7,a7c4b54a-870f-4c69-9680-c3a89dbbe9c1 +sym-generic~ic~8-pin~1/4~scale~8x8-pin-8,2b687d62-0b94-4dab-9152-cae034c90be7 +sym-generic~ic~8-pin~1/4~scale~8x8-polygon-contour,f9ddbe48-6913-483c-aad1-27c90affac10 +sym-generic~ic~8-pin~1/4~scale~8x8-sym,d2103ac8-128c-4ed8-8d97-58710076719b +sym-generic~ic~8-pin~1/4~scale~8x8-text-name,6c28f5b6-5809-4d07-9c0f-e8cd7a4c2bbd +sym-generic~ic~8-pin~1/4~scale~8x8-text-value,6f6d180f-6ec2-465c-b2c9-d487cb7e9fb7 +sym-generic~ic~8-pin~1/6~scale~6x5-pin-1,c3c7f194-bfa7-47c9-999b-416bd7ad08bc +sym-generic~ic~8-pin~1/6~scale~6x5-pin-2,baa0c87d-ba6c-418d-933f-ab5dfca3d7b4 +sym-generic~ic~8-pin~1/6~scale~6x5-pin-3,86145814-6359-4cdd-b9b1-10d54e9134e6 +sym-generic~ic~8-pin~1/6~scale~6x5-pin-4,0df9d491-d384-4a90-acda-d824fdf505f8 +sym-generic~ic~8-pin~1/6~scale~6x5-pin-5,5540afd5-ea12-4448-85dd-094951a4b245 +sym-generic~ic~8-pin~1/6~scale~6x5-pin-6,e5c88375-9f0f-4b02-99ad-8a99086d05c5 +sym-generic~ic~8-pin~1/6~scale~6x5-pin-7,cfe891cc-c499-4ecf-8944-c48fe1b61640 +sym-generic~ic~8-pin~1/6~scale~6x5-pin-8,3e937649-6a07-4a4b-ba75-6f2c887363a2 +sym-generic~ic~8-pin~1/6~scale~6x5-polygon-contour,217cacc5-cba3-4987-b72d-184914e3e208 +sym-generic~ic~8-pin~1/6~scale~6x5-sym,cf5c1c98-b34d-49dc-9b55-6e8b10ddf313 +sym-generic~ic~8-pin~1/6~scale~6x5-text-name,6b67a60f-0933-4e0f-b046-670655c0017d +sym-generic~ic~8-pin~1/6~scale~6x5-text-value,be1707bd-5962-4f47-ac44-976f80f3733a +sym-generic~ic~8-pin~1/8~scale~4x5-pin-1,2db20dfa-5fdc-47a5-89bf-04929b77dbb1 +sym-generic~ic~8-pin~1/8~scale~4x5-pin-2,6f26def3-ee27-43b0-bfbb-29f6e9302425 +sym-generic~ic~8-pin~1/8~scale~4x5-pin-3,688a7ac0-fc28-4203-b20b-e901cf59609d +sym-generic~ic~8-pin~1/8~scale~4x5-pin-4,84ecd852-2b46-428c-b098-ee7cefbcec67 +sym-generic~ic~8-pin~1/8~scale~4x5-pin-5,a39cc840-e208-4e68-85d3-1bb55c0757f5 +sym-generic~ic~8-pin~1/8~scale~4x5-pin-6,2ecb6340-f67b-4721-8f4d-212ba23e6b95 +sym-generic~ic~8-pin~1/8~scale~4x5-pin-7,1f117202-0be0-424d-a837-9335a74718df +sym-generic~ic~8-pin~1/8~scale~4x5-pin-8,44551fda-c7f0-44ee-a9f7-9d5a33ff0298 +sym-generic~ic~8-pin~1/8~scale~4x5-polygon-contour,cc7e3324-14ac-4c45-8423-a7ba7f0a0a50 +sym-generic~ic~8-pin~1/8~scale~4x5-sym,8ae71dee-46f3-45b0-9485-46752701a810 +sym-generic~ic~8-pin~1/8~scale~4x5-text-name,e662d0a6-330b-484f-9419-230832eb3ec4 +sym-generic~ic~8-pin~1/8~scale~4x5-text-value,6a85ed2b-0758-454e-b9ec-fef9ec0dde3a +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-1,8b29a4e7-0fe6-4130-b4af-49c935b9aa71 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-2,4d0ddeca-cecb-4a7a-a0e8-bf4321903d28 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-3,7773f9ed-7e4f-4155-8f6b-6ee5ab92ab15 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-4,ff991d47-2023-4b2f-bf75-2688101fa1e1 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-5,87fa3c28-633d-474c-a251-29d067a03cca +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-6,1ac18d2d-c212-4cb9-a7ba-fb49e8a6fd1e +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-7,0620931e-c7c4-4917-b337-67a6a675efca +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-8,dd243088-505e-4784-86ae-1932c75b5897 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-9,27233844-7940-4c96-8484-01d190e5fc50 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-gnd,4131c52d-a3b6-4b42-ba60-d93f9e0c8a43 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-pin-pwr,7edf36e8-6e29-4568-92d0-07e87fe43780 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-polygon-contour,6f638107-45b4-4770-82ff-4d524ec21072 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-sym,465a39b9-be45-4386-81a2-37fec0f62a2c +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-text-name,87d5b433-0942-4cfa-b6cd-c4784bea0e95 +sym-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-text-value,08cf69d6-5224-4dec-81ad-e7f38d4842d5 diff --git a/Logic/uuid_cache_Generic_cmpcat.csv b/Logic/uuid_cache_Generic_cmpcat.csv new file mode 100644 index 00000000..740f4332 --- /dev/null +++ b/Logic/uuid_cache_Generic_cmpcat.csv @@ -0,0 +1,25 @@ +cmpcat-generic~ic~10-pin~(variant~a)~1/4~scale~10x26~pwr-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~10-pin~(variant~b)~1/4~scale~8x16-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~11-pin~(variant~a)~1/4~scale~8x16-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~12-pin~(variant~a)~1/4~scale~10x26~pwr-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~12-pin~(variant~b)~1/4~scale~10x26~pwr-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~12-pin~(variant~c)~1/4~scale~10x26~pwr-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~12-pin~1/4~scale~8x14-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~14-pin~(variant~a)~1/4~scale~10x26~pwr-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~14-pin~(variant~b)~1/4~scale~10x26~pwr-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~4-pin~1/4~scale~8x8-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~4-pin~1/6~scale~6x4-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~4-pin~1/8~scale~4x4-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~5-pin~(variant~a)~1/4~scale~8x8-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~5-pin~(variant~a)~1/6~scale~6x4-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~5-pin~(variant~a)~1/8~scale~4x4-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~5-pin~(variant~b)~1/4~scale~8x8-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~5-pin~(variant~b)~1/6~scale~6x4-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~5-pin~(variant~b)~1/8~scale~4x4-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~6-pin~1/4~scale~8x8-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~6-pin~1/6~scale~6x4-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~6-pin~1/8~scale~4x4-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~8-pin~1/4~scale~8x8-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~8-pin~1/6~scale~6x5-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~8-pin~1/8~scale~4x5-cmpcat,8226f987-124b-4776-9084-3821dd51c272 +cmpcat-generic~ic~9-pin~(variant~a)~1/4~scale~10x20~pwr-cmpcat,8226f987-124b-4776-9084-3821dd51c272 From d55814e5647242c3ae82a542e62dd8ae839fdbe5 Mon Sep 17 00:00:00 2001 From: John Eaton Date: Tue, 8 Nov 2022 13:59:54 -0800 Subject: [PATCH 23/23] fixed merge glitch --- Logic/script | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Logic/script b/Logic/script index feebd942..e5bb6643 100755 --- a/Logic/script +++ b/Logic/script @@ -80,7 +80,6 @@ python3.9 ../generate_logic_sym.py --group multiplexor --directory ./Logic/ python3.9 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design HALF_ADDER_4 python3.9 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design FULL_ADDER_4 python3.9 ../generate_logic_sym.py --group Logic --directory ./Logic/ --design BARREL_SHIFTER4_4 -<<<<<<< HEAD python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC4_4 python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC4_6 python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC4_8 @@ -106,6 +105,3 @@ python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC11_VA_4 python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC14_VA_4 python3.9 ../generate_logic_sym.py --group Generic --directory ./Logic/ --design GENERIC14_VB_4 -======= - ->>>>>>> df2045bf9b0238bc9a1daa9c91bef6185fee8b68