From 0f87d219db94b4929fd98bdbe35661733e66fe51 Mon Sep 17 00:00:00 2001
From: Persson-dev <sim16.prib@gmail.com>
Date: Wed, 11 Dec 2024 17:12:38 +0100
Subject: [PATCH] =?UTF-8?q?omg=20=C3=A7a=20marche?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 projet_etu.circ | 52 +++++++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/projet_etu.circ b/projet_etu.circ
index 5bdaf97..42a8e40 100644
--- a/projet_etu.circ
+++ b/projet_etu.circ
@@ -44,7 +44,7 @@
       <a name="size" val="20"/>
     </tool>
     <tool name="AND Gate">
-      <a name="facing" val="south"/>
+      <a name="facing" val="north"/>
       <a name="size" val="30"/>
     </tool>
     <tool name="OR Gate">
@@ -332,6 +332,7 @@
     <comp lib="0" loc="(300,200)" name="Tunnel">
       <a name="label" val="Cond"/>
     </comp>
+    <comp lib="0" loc="(340,590)" name="Clock"/>
     <comp lib="0" loc="(350,100)" name="Tunnel">
       <a name="facing" val="east"/>
       <a name="label" val="IR"/>
@@ -685,7 +686,8 @@
     <wire from="(140,390)" to="(140,400)"/>
     <wire from="(140,400)" to="(140,430)"/>
     <wire from="(140,400)" to="(150,400)"/>
-    <wire from="(140,430)" to="(140,460)"/>
+    <wire from="(140,430)" to="(140,440)"/>
+    <wire from="(140,440)" to="(140,460)"/>
     <wire from="(140,520)" to="(140,530)"/>
     <wire from="(140,530)" to="(140,560)"/>
     <wire from="(140,530)" to="(160,530)"/>
@@ -697,7 +699,7 @@
     <wire from="(180,30)" to="(220,30)"/>
     <wire from="(180,50)" to="(210,50)"/>
     <wire from="(180,680)" to="(180,740)"/>
-    <wire from="(180,680)" to="(340,680)"/>
+    <wire from="(180,680)" to="(280,680)"/>
     <wire from="(180,70)" to="(210,70)"/>
     <wire from="(190,350)" to="(220,350)"/>
     <wire from="(190,470)" to="(220,470)"/>
@@ -708,18 +710,19 @@
     <wire from="(240,570)" to="(370,570)"/>
     <wire from="(250,770)" to="(280,770)"/>
     <wire from="(250,790)" to="(280,790)"/>
+    <wire from="(280,540)" to="(280,680)"/>
+    <wire from="(280,540)" to="(350,540)"/>
     <wire from="(310,10)" to="(310,150)"/>
     <wire from="(310,10)" to="(790,10)"/>
     <wire from="(310,150)" to="(790,150)"/>
     <wire from="(340,520)" to="(340,560)"/>
     <wire from="(340,520)" to="(370,520)"/>
-    <wire from="(340,580)" to="(340,680)"/>
-    <wire from="(340,580)" to="(350,580)"/>
+    <wire from="(340,590)" to="(370,590)"/>
     <wire from="(350,100)" to="(360,100)"/>
-    <wire from="(350,560)" to="(350,580)"/>
+    <wire from="(350,540)" to="(350,560)"/>
     <wire from="(350,560)" to="(370,560)"/>
-    <wire from="(350,580)" to="(370,580)"/>
     <wire from="(360,30)" to="(370,30)"/>
+    <wire from="(370,580)" to="(370,590)"/>
     <wire from="(370,600)" to="(370,620)"/>
     <wire from="(400,510)" to="(410,510)"/>
     <wire from="(410,440)" to="(410,450)"/>
@@ -1137,8 +1140,8 @@
       <circ-port dir="in" pin="100,160" x="20" y="50"/>
       <circ-port dir="in" pin="100,180" x="20" y="70"/>
       <circ-port dir="in" pin="100,210" x="20" y="30"/>
-      <circ-port dir="in" pin="160,100" x="60" y="10"/>
-      <circ-port dir="out" pin="160,60" x="110" y="50"/>
+      <circ-port dir="in" pin="150,110" x="60" y="20"/>
+      <circ-port dir="in" pin="150,60" x="60" y="10"/>
       <circ-port dir="out" pin="350,80" x="60" y="100"/>
     </appear>
     <comp lib="0" loc="(100,160)" name="Pin">
@@ -1153,15 +1156,14 @@
       <a name="appearance" val="classic"/>
       <a name="label" val="Fetch"/>
     </comp>
-    <comp lib="0" loc="(160,100)" name="Pin">
-      <a name="appearance" val="classic"/>
-      <a name="label" val="PC"/>
-      <a name="width" val="16"/>
-    </comp>
-    <comp lib="0" loc="(160,60)" name="Pin">
+    <comp lib="0" loc="(150,110)" name="Pin">
       <a name="appearance" val="classic"/>
       <a name="label" val="Input2"/>
-      <a name="output" val="true"/>
+      <a name="width" val="16"/>
+    </comp>
+    <comp lib="0" loc="(150,60)" name="Pin">
+      <a name="appearance" val="classic"/>
+      <a name="label" val="PC"/>
       <a name="width" val="16"/>
     </comp>
     <comp lib="0" loc="(350,80)" name="Pin">
@@ -1174,22 +1176,30 @@
     <comp lib="1" loc="(220,170)" name="XOR Gate">
       <a name="size" val="30"/>
     </comp>
+    <comp lib="1" loc="(280,110)" name="AND Gate">
+      <a name="facing" val="north"/>
+      <a name="negate1" val="true"/>
+      <a name="size" val="30"/>
+    </comp>
     <comp lib="2" loc="(300,80)" name="Multiplexer">
-      <a name="enable" val="true"/>
       <a name="width" val="16"/>
     </comp>
     <wire from="(100,160)" to="(180,160)"/>
     <wire from="(100,180)" to="(180,180)"/>
     <wire from="(100,210)" to="(290,210)"/>
+    <wire from="(150,110)" to="(160,110)"/>
+    <wire from="(150,60)" to="(240,60)"/>
+    <wire from="(160,100)" to="(160,110)"/>
     <wire from="(160,100)" to="(240,100)"/>
-    <wire from="(160,60)" to="(240,60)"/>
-    <wire from="(220,170)" to="(280,170)"/>
+    <wire from="(220,170)" to="(270,170)"/>
     <wire from="(240,60)" to="(240,70)"/>
     <wire from="(240,70)" to="(270,70)"/>
     <wire from="(240,90)" to="(240,100)"/>
     <wire from="(240,90)" to="(270,90)"/>
-    <wire from="(280,100)" to="(280,170)"/>
-    <wire from="(290,100)" to="(290,210)"/>
+    <wire from="(270,140)" to="(270,170)"/>
+    <wire from="(280,100)" to="(280,110)"/>
+    <wire from="(290,140)" to="(290,150)"/>
+    <wire from="(290,150)" to="(290,210)"/>
     <wire from="(300,80)" to="(350,80)"/>
   </circuit>
   <circuit name="GetCst">