Skip to content

Commit d08169e

Browse files
committed
fix quotes
1 parent fb833d9 commit d08169e

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

menus.py

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -754,23 +754,23 @@ def decodeFunc(self,inVar, funcName):
754754
s += " ) "
755755
elif funcName == "DFlipFlop":
756756
s ="("
757-
s += inVar[0]['val'] + " & CLK & " + inVar[3]["iset"] + " & " + inVar[2]["irst"] + " | !" + inVar[3]["iset"]
757+
s += inVar[0]['val'] + " & CLK & " + inVar[3]['iset'] + " & " + inVar[2]['irst'] + " | !" + inVar[3]['iset']
758758
s += " ) "
759759
elif funcName == "JKFlipFlop":
760-
if inVar[4].get("iK"):
761-
K = f"!{inVar[4]["iK"]}"
760+
if inVar[4].get('iK'):
761+
K = f"!{inVar[4]['iK']}"
762762
else: K = inVar[4]["K"]
763-
if inVar[1].get("clk"):
764-
CLK = f"{inVar[1]["clk"]} "
765-
else: CLK = f"!{inVar[3]["iclk"]} "
766-
if inVar[3].get("iset"):
767-
set = f"!{inVar[3]["iset"]}"
768-
iset = f"{inVar[3]["iset"]}"
769-
rst = f"!{inVar[2]["irst"]}"
763+
if inVar[1].get('clk'):
764+
CLK = f"{inVar[1]['clk']} "
765+
else: CLK = f"!{inVar[3]['iclk']} "
766+
if inVar[3].get('iset'):
767+
set = f"!{inVar[3]['iset']}"
768+
iset = f"{inVar[3]['iset']}"
769+
rst = f"!{inVar[2]['irst']}"
770770
else:
771-
set = f"!{inVar[2]["iset"]}"
772-
iset = f"{inVar[2]["iset"]}"
773-
rst = f"!{inVar[1]["irst"]}"
771+
set = f"!{inVar[2]['iset']}"
772+
iset = f"{inVar[2]['iset']}"
773+
rst = f"!{inVar[1]['irst']}"
774774
sT =f"T{self.varTempNum} = "
775775
sT += "((" + inVar[0]['J'] + f" & !T{self.varTempNum}_precedant) | (!{K} & T{self.varTempNum}_precedant)) & {set} & {rst} & CLK | {iset} "
776776
sT += " ); "
@@ -892,14 +892,14 @@ def checkCloseCircuit(self, ioOut, params={}):
892892
constKey = "enb"
893893
for c in chipInInvReset:
894894
if c == inFunc:
895-
constKey = "irst"
895+
constKey = 'irst'
896896
for c in chipInInvSet:
897897
if c == inFunc:
898-
constKey = "iset"
898+
constKey = 'iset'
899899

900900
for c in chipInInvClk:
901901
if c == inFunc:
902-
constKey = "iclk"
902+
constKey = 'iclk'
903903
for c in chipInJ:
904904
if c == inFunc:
905905
constKey = "J"
@@ -908,7 +908,7 @@ def checkCloseCircuit(self, ioOut, params={}):
908908
constKey = "K"
909909
for c in chipInInvK:
910910
if c == inFunc:
911-
constKey = "iK"
911+
constKey = 'iK'
912912
if self.is_linked_to(self.pwrP, inFunc):
913913
inFuncConst += [{constKey:pos, "num":n, "numO":no}]
914914
else: inFuncConst += [{constKey:neg, "num":n, "numO":no}]
@@ -930,17 +930,17 @@ def checkCloseCircuit(self, ioOut, params={}):
930930
constKey = "enb"
931931
for c in chipInInvReset:
932932
if c == inFunc:
933-
constKey = "irst"
933+
constKey = 'irst'
934934
for c in chipInInvSet:
935935
if c == inFunc:
936-
constKey = "iset"
936+
constKey = 'iset'
937937
for c in chipInClock:
938938
if c == inFunc:
939-
constKey = "clk"
939+
constKey = 'clk'
940940

941941
for c in chipInInvClk:
942942
if c == inFunc:
943-
constKey = "iclk"
943+
constKey = 'iclk'
944944
for c in chipInJ:
945945
if c == inFunc:
946946
constKey = "J"
@@ -949,7 +949,7 @@ def checkCloseCircuit(self, ioOut, params={}):
949949
constKey = "K"
950950
for c in chipInInvK:
951951
if c == inFunc:
952-
constKey = "iK"
952+
constKey = 'iK'
953953
#inFuncConst += [{constKey:self.mcu_pin[f"I{id[4:]}"], "num":n, "numO":no}] # [self.mcu_pin[f"I{id[4:]}"]] # ici ajouter n
954954
inFuncConst += [{constKey:f"I{n+1}", "num":n, "numO":no}] # [self.mcu_pin[f"I{id[4:]}"]] # ici ajouter n
955955
findIn = True
@@ -971,17 +971,17 @@ def checkCloseCircuit(self, ioOut, params={}):
971971
constKey = "enb"
972972
for c in chipInInvReset:
973973
if c == inFunc:
974-
constKey = "irst"
974+
constKey = 'irst'
975975
for c in chipInInvSet:
976976
if c == inFunc:
977-
constKey = "iset"
977+
constKey = 'iset'
978978
for c in chipInClock:
979979
if c == inFunc:
980-
constKey = "clk"
980+
constKey = 'clk'
981981

982982
for c in chipInInvClk:
983983
if c == inFunc:
984-
constKey = "iclk"
984+
constKey = 'iclk'
985985
for c in chipInJ:
986986
if c == inFunc:
987987
constKey = "J"
@@ -990,7 +990,7 @@ def checkCloseCircuit(self, ioOut, params={}):
990990
constKey = "K"
991991
for c in chipInInvK:
992992
if c == inFunc:
993-
constKey = "iK"
993+
constKey = 'iK'
994994
#inFuncConst += [{constKey:self.mcu_pin[f"I{id[4:]}"], "num":n, "numO":no}]
995995
inFuncConst += [{constKey:f"I{n+1}", "num":n, "numO":no}]
996996
findIn = True

0 commit comments

Comments
 (0)