From 58d0ffff2f298f60fd01e055c6c50a7a96e41297 Mon Sep 17 00:00:00 2001
From: Gabriel Zambrano <gabriel.zambrano@uconn.edu>
Date: Thu, 31 Oct 2024 01:52:15 -0400
Subject: [PATCH] changes

---
 SDPPython/__pycache__/chip.cpython-312.pyc  | Bin 7261 -> 7109 bytes
 SDPPython/__pycache__/chips.cpython-312.pyc | Bin 3778 -> 3775 bytes
 SDPPython/chip.py                           |   6 +-
 SDPPython/chips.py                          | 104 ++++++++++----------
 SDPPython/serialcommunication.py            |   2 +-
 5 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/SDPPython/__pycache__/chip.cpython-312.pyc b/SDPPython/__pycache__/chip.cpython-312.pyc
index f85600185f0e9df860c66e84883c2bb26115556e..faef868c2899abe8bce33cdef060071211f8c03f 100644
GIT binary patch
delta 222
zcmca>anzjeG%qg~0}#BwB$Xa4ypb=9kBb?|1>w&zlmBtZvSc#WGEQD7AV2vqk0{@2
zMv!6#hF}IwrYgtD6WK*4yYTC9++r!n%q!Mpp1hntS634#-@x#Ji-A{og3EOOiT)p$
znS{7H*uJna2#EAobym$#nXf-n|1!VU1rDvv2?B?h7=1S@3mY*q#%vA~S<T28znMu)
zm64U5Rr|BhW*u=sM#i+wb`s2tjJcbgBt@AR3nxcNKa)>nWHkQB03tuRF|#rXeBxtb
P6#LA<!zfxL1atuaj(<4-

delta 365
zcmX?Ve%FHUG%qg~0}$kX;Y()}*~pj0$HfNZG6V7FWs?Kgr6(&3i%(v|Co#E1L^z;^
zA&Uc~8Wp54&S9-(Ea8TUX7RvS2)c%GH6w(V!c+xh1T$zdS2<3e$Sykh7oU!~CTkHp
zP_zhSdJ!jx0GV-%r64n}xJVJm)MUq|V6q;6u8#*$x`E*X7lVw#b!qL3(%Ltq<mT(o
z)W0DqJ6~?5+zn}YsIZ8{bpMI|AGz6txH{Or@G%I8^jCFO%}~3{ued<vBEQ-N4z<lE
z_zy8L25#;aGGb&**t}18H6vs4<}6WFMpkZC_0Lk9r-%tMGG=XFCeF;rSh#tWgeVhZ
n>Er`a&*W1X8I3<OfXGjN%&d$8pZJ&<#XfWJFp3rl0UZbcdFD`U

diff --git a/SDPPython/__pycache__/chips.cpython-312.pyc b/SDPPython/__pycache__/chips.cpython-312.pyc
index dfcd2afbec7bada46f880f94d0040dce7e3c5310..502528bf3818fd6828cbf56d57a71980bd8b70ab 100644
GIT binary patch
delta 136
zcmX>kyI+>~G%qg~0}vRgNT#pf$Xm>*?dcZ~8uF4ED0Yj@KQsiyVF7YpvVsUU5Wx<T
wV|Mp**}RVP6C;c16$Z)4jyx)p`*?RFbAl%S<;g@AK#}$2xXPeZqy;nz0P5W(%>V!Z

delta 119
zcmdlldq|e|G%qg~0}$MM&X>M>BX2RMUS?iFX~|1wpx7<8{L&H-hXu%a$qFLaKm<Ej
pF1;wfG%scIYR*rLlUH-|0r6ERoiq6tPbQjJGRIX0r6Mh$P5>o`C))r3

diff --git a/SDPPython/chip.py b/SDPPython/chip.py
index f59e103..3f8c601 100644
--- a/SDPPython/chip.py
+++ b/SDPPython/chip.py
@@ -70,13 +70,9 @@ def pin_configuration_json(self):
         Returns the pin configuration as a JSON string.
         """
         config = {
-            "chip_number": self.chip_number,
-            "logic_type": self.logic_type,
-            "pin_count": self.pin_count,
-            "description": self.description,
             "pins": self.pin_config
         }
-        return json.dumps(config)
+        return json.dumps(self.pin_config)
 
     def send_pin_configuration(self, uart_port, baudrate=250000):
         """
diff --git a/SDPPython/chips.py b/SDPPython/chips.py
index caaf23d..a6a24e2 100644
--- a/SDPPython/chips.py
+++ b/SDPPython/chips.py
@@ -1,68 +1,68 @@
 from chip import IC74Series
 ic_7400 = IC74Series(chip_number="00", logic_type="NAND",n = 2,description="Quad 2-input NAND gate")
-ic_7400.set_pin(1, "input")
-ic_7400.set_pin(2, "input")
-ic_7400.set_pin(3, "output")
-ic_7400.set_pin(4, "input")
-ic_7400.set_pin(5, "input")
-ic_7400.set_pin(6, "output")
-ic_7400.set_pin(7, "ground")
-ic_7400.set_pin(8, "output")
-ic_7400.set_pin(9, "input")
-ic_7400.set_pin(10, "input")
-ic_7400.set_pin(11, "output")
-ic_7400.set_pin(12, "input")
-ic_7400.set_pin(13, "input")
+ic_7400.set_pin(1, "INPUT")
+ic_7400.set_pin(2, "INPUT")
+ic_7400.set_pin(3, "OUTPUT")
+ic_7400.set_pin(4, "INPUT")
+ic_7400.set_pin(5, "INPUT")
+ic_7400.set_pin(6, "OUTPUT")
+ic_7400.set_pin(7, "GND")
+ic_7400.set_pin(8, "OUTPUT")
+ic_7400.set_pin(9, "INPUT")
+ic_7400.set_pin(10, "INPUT")
+ic_7400.set_pin(11, "OUTPUT")
+ic_7400.set_pin(12, "INPUT")
+ic_7400.set_pin(13, "INPUT")
 ic_7400.set_pin(14, "VCC")
 ic_7400.set_truth_table([1,1,1,0])
 
 ic_7408 = IC74Series(chip_number="08", logic_type="AND",n = 2,description="Quad 2-input AND gate")
-ic_7408.set_pin(1, "input")
-ic_7408.set_pin(2, "input")
-ic_7408.set_pin(3, "output")
-ic_7408.set_pin(4, "input")
-ic_7408.set_pin(5, "input")
-ic_7408.set_pin(6, "output")
-ic_7408.set_pin(7, "ground")
-ic_7408.set_pin(8, "output")
-ic_7408.set_pin(9, "input")
-ic_7408.set_pin(10, "input")
-ic_7408.set_pin(11, "output")
-ic_7408.set_pin(12, "input")
-ic_7408.set_pin(13, "input")
+ic_7408.set_pin(1, "INPUT")
+ic_7408.set_pin(2, "INPUT")
+ic_7408.set_pin(3, "OUTPUT")
+ic_7408.set_pin(4, "INPUT")
+ic_7408.set_pin(5, "INPUT")
+ic_7408.set_pin(6, "OUTPUT")
+ic_7408.set_pin(7, "GND")
+ic_7408.set_pin(8, "OUTPUT")
+ic_7408.set_pin(9, "INPUT")
+ic_7408.set_pin(10, "INPUT")
+ic_7408.set_pin(11, "OUTPUT")
+ic_7408.set_pin(12, "INPUT")
+ic_7408.set_pin(13, "INPUT")
 ic_7408.set_pin(14, "VCC")
 ic_7408.set_truth_table([0,0,0,1])
 
 ic_7432 = IC74Series(chip_number="32", logic_type="OR",n = 2,description="Quad 2-input OR gate")
-ic_7432.set_pin(1, "input")
-ic_7432.set_pin(2, "input")
-ic_7432.set_pin(3, "output")
-ic_7432.set_pin(4, "input")
-ic_7432.set_pin(5, "input")
-ic_7432.set_pin(6, "output")
-ic_7432.set_pin(7, "ground")
-ic_7432.set_pin(8, "output")
-ic_7432.set_pin(9, "input")
-ic_7432.set_pin(10, "input")
-ic_7432.set_pin(11, "output")
-ic_7432.set_pin(12, "input")
-ic_7432.set_pin(13, "input")
+ic_7432.set_pin(1, "INPUT")
+ic_7432.set_pin(2, "INPUT")
+ic_7432.set_pin(3, "OUTPUT")
+ic_7432.set_pin(4, "INPUT")
+ic_7432.set_pin(5, "INPUT")
+ic_7432.set_pin(6, "OUTPUT")
+ic_7432.set_pin(7, "GND")
+ic_7432.set_pin(8, "OUTPUT")
+ic_7432.set_pin(9, "INPUT")
+ic_7432.set_pin(10, "INPUT")
+ic_7432.set_pin(11, "OUTPUT")
+ic_7432.set_pin(12, "INPUT")
+ic_7432.set_pin(13, "INPUT")
 ic_7432.set_pin(14, "VCC")
 ic_7432.set_truth_table([0,1,1,1])
 
 ic_7486 = IC74Series(chip_number="86", logic_type="XOR",n = 2,description="Quad 2-input XOR gate")
-ic_7486.set_pin(1, "input")
-ic_7486.set_pin(2, "input")
-ic_7486.set_pin(3, "output")
-ic_7486.set_pin(4, "input")
-ic_7486.set_pin(5, "input")
-ic_7486.set_pin(6, "output")
-ic_7486.set_pin(7, "ground")
-ic_7486.set_pin(8, "output")
-ic_7486.set_pin(9, "input")
-ic_7486.set_pin(10, "input")
-ic_7486.set_pin(11, "output")
-ic_7486.set_pin(12, "input")
-ic_7486.set_pin(13, "input")
+ic_7486.set_pin(1, "INPUT")
+ic_7486.set_pin(2, "INPUT")
+ic_7486.set_pin(3, "OUTPUT")
+ic_7486.set_pin(4, "INPUT")
+ic_7486.set_pin(5, "INPUT")
+ic_7486.set_pin(6, "OUTPUT")
+ic_7486.set_pin(7, "GND")
+ic_7486.set_pin(8, "OUTPUT")
+ic_7486.set_pin(9, "INPUT")
+ic_7486.set_pin(10, "INPUT")
+ic_7486.set_pin(11, "OUTPUT")
+ic_7486.set_pin(12, "INPUT")
+ic_7486.set_pin(13, "INPUT")
 ic_7486.set_pin(14, "VCC")
 ic_7486.set_truth_table([0,1,1,0])
diff --git a/SDPPython/serialcommunication.py b/SDPPython/serialcommunication.py
index 308248d..277be82 100644
--- a/SDPPython/serialcommunication.py
+++ b/SDPPython/serialcommunication.py
@@ -11,7 +11,7 @@
 
     # Sending data
 message = ic_7400.pin_configuration_json()
-ser.write((message).encode('utf-8'))
+ser.write((message+"\n").encode('utf-8'))
 print(f'Sent: {message}')