Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gaz20004 committed Oct 31, 2024
1 parent 03c8b6d commit 58d0fff
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 58 deletions.
Binary file modified SDPPython/__pycache__/chip.cpython-312.pyc
Binary file not shown.
Binary file modified SDPPython/__pycache__/chips.cpython-312.pyc
Binary file not shown.
6 changes: 1 addition & 5 deletions SDPPython/chip.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
104 changes: 52 additions & 52 deletions SDPPython/chips.py
Original file line number Diff line number Diff line change
@@ -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])
2 changes: 1 addition & 1 deletion SDPPython/serialcommunication.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}')


Expand Down

0 comments on commit 58d0fff

Please sign in to comment.