Seems to be almost done

4 files changed, 78 insertions, 72 deletions

diff --git a/tableconversion.py b/tableconversion.py
index 1dedce1..71b56a5 100644
--- a/tableconversion.py
+++ b/tableconversion.py
@@ -44,7 +44,6 @@ def parse_wireviz_yml(file_path):
             connector2wpin = str(connection[2])
             connector2 = connector2wpin[2:connector2wpin.find("':")]
             connector2pins = connector2wpin[connector2wpin.find(" [")+2:connector2wpin.rfind("]}")].split(",")
-            
             for pins in connector2pins:
                 idcount=idcount+1
                 if pins.count("-") > 0:
@@ -52,7 +51,6 @@ def parse_wireviz_yml(file_path):
                     negativesign=0
                     for pin in pinrange:
                         if str(connectors[connector]['pins']).count(pin) < 1:
-                            print(pin)
                             negativesign=1
                     if not negativesign:
                         for x in range(int(pinrange[0]),int(pinrange[1])+1):
@@ -65,13 +63,17 @@ def parse_wireviz_yml(file_path):
                 ident = str(ord(connector[0]))[:1]+str(ord(str(connectorpinsadjusted[x])[-1]))[-1]+str(ord(str(connector2pinsadjusted[x])[-1]))[-1]+str(ord(wires[bundle]['colors'][x][0]))+str(idcount)[-1]
                 ident = ident.strip(" ")
                 pin1 = connectorpinsadjusted[x]
-                notes = "none"
+                pin2 = connector2pinsadjusted[x]
+                notes = ""
                 if str(connectors[connector]).count("'pinlabels':"):
-                    if str(connectors[connector]['pinlabels']).count(connectorpinsadjusted[x]):
-                        stringarray= [str(x) for x in connectors[connector]['pinlabels']]
-                        print(stringarray)
-                        print(connectorpinsadjusted)
-                        print(stringarray.index(connectorpinsadjusted[x].strip("\"")))
+                    stringarray = list(map(str,connectors[connector]['pinlabels']))
+                    if stringarray.count(connectorpinsadjusted[x][1:-1]):
+                        pin1= connectors[connector]['pins'][stringarray.index(connectorpinsadjusted[x][1:-1])]
+                if str(connectors[connector2.strip("'")]).count("'pinlabels':")and not(str(connector2pinsadjusted[x]).isnumeric()):
+                    stringarray = list(map(str,connectors[connector2]['pinlabels']))
+                    print(connector2pinsadjusted)
+                    if stringarray.count(connector2pinsadjusted[x].strip(" ")[1:-1]):
+                        pin2= connectors[connector2]['pins'][stringarray.index(connector2pinsadjusted[x].strip(" ")[1:-1])]
                 if str(wires[bundle]).find("'notes':") > 0:
                     notes = wires[bundle]['notes']
                 wire_info.append({
@@ -82,7 +84,7 @@ def parse_wireviz_yml(file_path):
                     'Color': wires[bundle]['colors'][x],
                     'Gauge': wires[bundle]['gauge'],
                     'End 2': connector2,
-                    'Pin 2': connector2pinsadjusted[x],
+                    'Pin 2': pin2,
                     'Notes': notes,
                 })
         else:
@@ -90,7 +92,11 @@ def parse_wireviz_yml(file_path):
             for x in range(0,len(connectorpinsadjusted)):
                 ident = str(ord(connector[0]))[:1]+str(ord(str(connectorpinsadjusted[x])[-1]))[-1]+"0"+str(ord(wires[bundle]['colors'][x][0]))+str(idcount)[-1]
                 ident = ident.strip(" ")
-                notes = "none"
+                notes = ""
+                if str(connectors[connector]).count("'pinlabels':"):
+                    stringarray = list(map(str,connectors[connector]['pinlabels']))
+                    if stringarray.count(connectorpinsadjusted[x][1:-1]):
+                        pin1= connectors[connector]['pins'][stringarray.index(connectorpinsadjusted[x][1:-1])]
                 if str(wires[bundle]).find("'notes':") > 0:
                     notes = wires[bundle]['notes']
                 wire_info.append({
@@ -112,7 +118,7 @@ def parse_wireviz_yml(file_path):
     return wire_df
 
 # Path to your WireViz YML file
-file_path = 'wireviz/Choppy_ECU_12FB.yml'
+file_path = 'wireviz/Choppy_ECU_C1.yml'
 wire_table = parse_wireviz_yml(file_path)
 
 # Display the table
diff --git a/wireviz/Choppy_ECU_12FB.csv b/wireviz/Choppy_ECU_12FB.csv
index cb36157..8936f26 100644
--- a/wireviz/Choppy_ECU_12FB.csv
+++ b/wireviz/Choppy_ECU_12FB.csv
@@ -1,32 +1,32 @@
 ,Identifier,End 1,Pin 1,Length,Color,Gauge,End 2,Pin 2,Notes
-0,699711,ECUM,'Extra Out 1',16.5 Inches,GN,18 AWG,ECU1,'B4',none
-1,699712,ECUM,'Extra Out 2',16.5 Inches,GN,18 AWG,ECU1,'C4',none
+0,699711,ECUM,3,16.5 Inches,GN,18 AWG,ECU1,'B4',
+1,699712,ECUM,4,16.5 Inches,GN,18 AWG,ECU1,'C4',
 2,699823,ECUM,1,50 Inches,RD,14 AWG,Coil Pack 1,'E',12 Inch difference between outermost coils.
 3,690824,Coil Pack 2,'E',50 Inches,RD,14 AWG,----,----,12 Inch difference between outermost coils.
 4,690825,Coil Pack 3,'E',50 Inches,RD,14 AWG,----,----,12 Inch difference between outermost coils.
 5,690826,Coil Pack 4,'E',50 Inches,RD,14 AWG,----,----,12 Inch difference between outermost coils.
-6,699717,ECUM,'GND',16.5 Inches,GN,18 AWG,ECU1,'L4',none
-7,659828,ECUM,7,16.5 Inches,RD,14 AWG,ECU1,'M4',none
-8,659829,ECUM,7,40 Inches,RD,18 AWG,Fuel Injector 2,1,none
-9,790820,Fuel Injector 1,1,40 Inches,RD,18 AWG,----,----,none
-10,622711,ECUF,4,27 Inches,GN,14 AWG,MAF Sensor,4,none
+6,699717,ECUM,2,16.5 Inches,GN,18 AWG,ECU1,'L4',
+7,659828,ECUM,7,16.5 Inches,RD,14 AWG,ECU1,'M4',
+8,659829,ECUM,7,40 Inches,RD,18 AWG,Fuel Injector 2,1,
+9,790820,Fuel Injector 1,1,40 Inches,RD,18 AWG,----,----,
+10,622711,ECUF,4,27 Inches,GN,14 AWG,MAF Sensor,4,
 11,669822,ECUM,8,20 Inches,RD,18 AWG,Servo Power,1,Servo Wire is Long Enough
-12,609824,ECUF,12,10 Inches,RD,14 AWG,Fuse Block,'F1-',none
-13,649824,ECUF, 6,10 Inches,RD,14 AWG,Fuse Block, 'F2-',none
-14,699825,ECUF,11,10 Inches,RD,18 AWG,Fuse Block,'F3-',none
-15,819827,Positive Bus Bar,3,10 Inches,RD,14 AWG,Fuse Block,'F1+',none
-16,819827,Positive Bus Bar, 3,10 Inches,RD,14 AWG,Fuse Block, 'F3+',none
-17,820828,Positive Bus Bar,4,170 Inches,RD,14 AWG,KillSwitch,2,none
-18,719829,KillSwitch,3,170 Inches,RD,14 AWG,Fuse Block,'F2+',none
-19,699710,ECUF,'Extra Out 2',37 Inches,GN,18 AWG,Tachometer,'12V',Pre-attached wire is of sufficient length to reach ECU.
-20,691821,ECUM,'12V ECU',21 Inches,RD,18 AWG,LSU,3,none
-21,691662,ECUF,'GND',10 Inches,BK,18 AWG,Negative Bus Bar,3,none
-22,699713,Coil Pack 1,'Head Ground',10 Inches,GY,18 AWG,Engine GND','Engine GND',none
-23,699714,Coil Pack 4,'Head Ground',10 Inches,GY,18 AWG,Engine GND','Engine GND',none
-24,699715,Coil Pack 3,'Head Ground',6 Inches,GY,18 AWG,Engine GND','Engine GND',none
-25,699716,Coil Pack 2,'Head Ground',6 Inches,GY,18 AWG,Engine GND','Engine GND',none
-26,692667,Coil Pack 1,'Battery Ground',60 Inches,BK,18 AWG,Negative Bus Bar,4,none
-27,692668,Coil Pack 2,'Battery Ground',60 Inches,BK,18 AWG,Negative Bus Bar,4,none
-28,692669,Coil Pack 3,'Battery Ground',60 Inches,BK,18 AWG,Negative Bus Bar,4,none
-29,692660,Coil Pack 4,'Battery Ground',60 Inches,BK,18 AWG,Negative Bus Bar,4,none
-30,890661,Servo Power,'GND',20 Inches,BK,18 AWG,Negative Bus Bar,2,none
+12,609824,ECUF,12,10 Inches,RD,14 AWG,Fuse Block,2,
+13,649824,ECUF, 6,10 Inches,RD,14 AWG,Fuse Block,4,
+14,699825,ECUF,11,10 Inches,RD,18 AWG,Fuse Block,6,
+15,819827,Positive Bus Bar,3,10 Inches,RD,14 AWG,Fuse Block,1,
+16,819827,Positive Bus Bar, 3,10 Inches,RD,14 AWG,Fuse Block,5,
+17,820828,Positive Bus Bar,4,170 Inches,RD,14 AWG,KillSwitch,2,
+18,719829,KillSwitch,3,170 Inches,RD,14 AWG,Fuse Block,3,
+19,699710,ECUF,3,37 Inches,GN,18 AWG,Tachometer,A,Pre-attached wire is of sufficient length to reach ECU.
+20,691821,ECUM,7,21 Inches,RD,18 AWG,LSU,3,
+21,691662,ECUF,5,10 Inches,BK,18 AWG,Negative Bus Bar,3,
+22,699713,Coil Pack 1,C,10 Inches,GY,18 AWG,Engine GND','Engine GND',
+23,699714,Coil Pack 4,C,10 Inches,GY,18 AWG,Engine GND','Engine GND',
+24,699715,Coil Pack 3,C,6 Inches,GY,18 AWG,Engine GND','Engine GND',
+25,699716,Coil Pack 2,C,6 Inches,GY,18 AWG,Engine GND','Engine GND',
+26,692667,Coil Pack 1,D,60 Inches,BK,18 AWG,Negative Bus Bar,4,
+27,692668,Coil Pack 2,D,60 Inches,BK,18 AWG,Negative Bus Bar,4,
+28,692669,Coil Pack 3,D,60 Inches,BK,18 AWG,Negative Bus Bar,4,
+29,692660,Coil Pack 4,D,60 Inches,BK,18 AWG,Negative Bus Bar,4,
+30,890661,Servo Power,2,20 Inches,BK,18 AWG,Negative Bus Bar,2,
diff --git a/wireviz/Choppy_ECU_C1.csv b/wireviz/Choppy_ECU_C1.csv
index 3928c2c..f25072e 100644
--- a/wireviz/Choppy_ECU_C1.csv
+++ b/wireviz/Choppy_ECU_C1.csv
@@ -1,28 +1,28 @@
 ,Identifier,End 1,Pin 1,Length,Color,Gauge,End 2,Pin 2,Notes
-0,699661,ECU,'A2',50 Inches,BU,18 AWG,Coil Pack 1,'A',none
-1,699662,ECU,'A3',50 Inches,BU,18 AWG,Coil Pack 2,'A',none
-2,699663,ECU,'B2',50 Inches,BU,18 AWG,Coil Pack 3,'A',none
-3,699664,ECU,'B3',50 Inches,BU,18 AWG,Coil Pack 4,'A',none
-4,690665,ECU,'H1',50 Inches,BU,18 AWG,----,----,none
-5,690666,Coil Pack 1,'B',50 Inches,BU,18 AWG,----,----,none
-6,690667,Coil Pack 2,'B',50 Inches,BU,18 AWG,----,----,none
-7,690668,Coil Pack 3,'B',50 Inches,BU,18 AWG,----,----,none
-8,690669,Coil Pack 4,'B',50 Inches,BU,18 AWG,----,----,none
-9,690710,ECU,'K1',40 Inches,GY,14 AWG,Fuel Injector 1,2,none
-10,690711,ECU,'K2',40 Inches,GY,14 AWG,Fuel Injector 2,2,none
-11,699665,ECU,'F4',21 Inches,BN,18 AWG,LSU,1,none
-12,690715,ECU, 'G4',21 Inches,GN,18 AWG,LSU, 2,none
-13,693895,ECU, 'F3',21 Inches,YE,18 AWG,LSU, 5,none
-14,694875,ECU, 'G3',21 Inches,WH,18 AWG,LSU, 6,none
-15,690666,ECU,'E3',21 Inches,BN,18 AWG,----,----,none
-16,692717,ECU,'D1',21 Inches,GN,18 AWG,LSU,4,none
+0,699661,ECU,'A2',50 Inches,BU,18 AWG,Coil Pack 1,'A',
+1,699662,ECU,'A3',50 Inches,BU,18 AWG,Coil Pack 2,'A',
+2,699663,ECU,'B2',50 Inches,BU,18 AWG,Coil Pack 3,'A',
+3,699664,ECU,'B3',50 Inches,BU,18 AWG,Coil Pack 4,'A',
+4,690665,ECU,'H1',50 Inches,BU,18 AWG,----,----,
+5,690666,Coil Pack 1,'B',50 Inches,BU,18 AWG,----,----,
+6,690667,Coil Pack 2,'B',50 Inches,BU,18 AWG,----,----,
+7,690668,Coil Pack 3,'B',50 Inches,BU,18 AWG,----,----,
+8,690669,Coil Pack 4,'B',50 Inches,BU,18 AWG,----,----,
+9,690710,ECU,'K1',40 Inches,GY,14 AWG,Fuel Injector 1,2,
+10,690711,ECU,'K2',40 Inches,GY,14 AWG,Fuel Injector 2,2,
+11,699665,ECU,'F4',21 Inches,BN,18 AWG,LSU,1,
+12,690715,ECU, 'G4',21 Inches,GN,18 AWG,LSU, 2,
+13,693895,ECU, 'F3',21 Inches,YE,18 AWG,LSU, 5,
+14,694875,ECU, 'G3',21 Inches,WH,18 AWG,LSU, 6,
+15,690666,ECU,'E3',21 Inches,BN,18 AWG,----,----,
+16,692717,ECU,'D1',21 Inches,GN,18 AWG,LSU,4,
 17,699800,ECU,'E2',40 Inches,PK,18 AWG,Veronte 1X CAN Bus,'B',Twisted Pair | ECU to Veronte
 18,699710,ECU, 'E1',40 Inches,GY,18 AWG,Veronte 1X CAN Bus, 'A',Twisted Pair | ECU to Veronte
 19,699660,ECU, 'E3',40 Inches,BKWH,18 AWG,Veronte 1X CAN Bus, 'C',Twisted Pair | ECU to Veronte
-20,690662,ECU,'H1',33.5 Inches,BN,18 AWG,Coolant/Crank Sensor,2,none
-21,699662,ECU, 'F1',33.5 Inches,BK,18 AWG,Coolant/Crank Sensor, 1,none
-22,699665,ECU,'H1',27 Inches,BN,18 AWG,MAF Sensor,'NTC-',none
-23,699665,ECU, 'H1',27 Inches,BN,18 AWG,MAF Sensor, 'GND',none
-24,699665,ECU, 'F2',27 Inches,BK,18 AWG,MAF Sensor, 'NTC+',none
-25,699666,ECU,'K4',37 Inches,BK,18 AWG,Tachometer,'Out',Included cable is of sufficient length.
+20,690662,ECU,'H1',33.5 Inches,BN,18 AWG,Coolant/Crank Sensor,2,
+21,699662,ECU, 'F1',33.5 Inches,BK,18 AWG,Coolant/Crank Sensor, 1,
+22,699665,ECU,'H1',27 Inches,BN,18 AWG,MAF Sensor,1,
+23,699665,ECU, 'H1',27 Inches,BN,18 AWG,MAF Sensor,2,
+24,699665,ECU, 'F2',27 Inches,BK,18 AWG,MAF Sensor,3,
+25,699666,ECU,'K4',37 Inches,BK,18 AWG,Tachometer,C,Included cable is of sufficient length.
 26,690807,ECU,'E3',40 Inches,PK,18 AWG,----,----,Twisted Pair | ECU to Veronte
diff --git a/wireviz/Choppy_ECU_C2.csv b/wireviz/Choppy_ECU_C2.csv
index 40ad985..3f7a01b 100644
--- a/wireviz/Choppy_ECU_C2.csv
+++ b/wireviz/Choppy_ECU_C2.csv
@@ -1,13 +1,13 @@
 ,Identifier,End 1,Pin 1,Length,Color,Gauge,End 2,Pin 2,Notes
-0,699871,ECU,'E2',56 Inches,WH,18 AWG,Knock sensor 1,1,none
-1,690661,ECU, 'E1',56 Inches,BN,18 AWG,Knock sensor 1,2,none
-2,693662,ECU,'F3',27 Inches,BK,18 AWG,MAF Sensor,5,none
-3,699893,ECU,'C1',48 Inches,YE,20 AWG,EGT1,1,none
-4,690823,ECU, 'D1',48 Inches,RD,20 AWG,EGT1,2,none
-5,699894,ECU,'C2',48 Inches,YE,20 AWG,EGT2,1,none
-6,690824,ECU, 'D2',48 Inches,RD,20 AWG,EGT2,2,none
-7,699895,ECU,'C3',52 Inches,YE,20 AWG,CHT1,1,none
-8,690825,ECU, 'D3',52 Inches,RD,20 AWG,CHT1,2,none
-9,699896,ECU,'C4',52 Inches,YE,20 AWG,CHT2,1,none
-10,690826,ECU, 'D4',52 Inches,RD,20 AWG,CHT2,2,none
-11,699667,ECU,'Engine Ground 2',50 Inches,BN,18 AWG,Engine GND','Engine GND',Ring Teriminal to bolt on Engine block
+0,699871,ECU,'E2',56 Inches,WH,18 AWG,Knock sensor 1,1,
+1,690661,ECU, 'E1',56 Inches,BN,18 AWG,Knock sensor 1,2,
+2,693662,ECU,'F3',27 Inches,BK,18 AWG,MAF Sensor,5,
+3,699893,ECU,'C1',48 Inches,YE,20 AWG,EGT1,1,
+4,690823,ECU, 'D1',48 Inches,RD,20 AWG,EGT1,2,
+5,699894,ECU,'C2',48 Inches,YE,20 AWG,EGT2,1,
+6,690824,ECU, 'D2',48 Inches,RD,20 AWG,EGT2,2,
+7,699895,ECU,'C3',52 Inches,YE,20 AWG,CHT1,1,
+8,690825,ECU, 'D3',52 Inches,RD,20 AWG,CHT1,2,
+9,699896,ECU,'C4',52 Inches,YE,20 AWG,CHT2,1,
+10,690826,ECU, 'D4',52 Inches,RD,20 AWG,CHT2,2,
+11,699667,ECU,G4,50 Inches,BN,18 AWG,Engine GND','Engine GND',Ring Teriminal to bolt on Engine block