Revised and finished 1X and CEX, general touchups.

1 files changed, 103 insertions, 35 deletions

diff --git a/wireviz/Choppy_IB_1X.yml b/wireviz/Choppy_IB_1X.yml
index 2f2ed41..e4b79a4 100644
--- a/wireviz/Choppy_IB_1X.yml
+++ b/wireviz/Choppy_IB_1X.yml
@@ -1,8 +1,8 @@
 templates: # defining templates to be used later on
   - &AP_mate
-    type: FMW.LM.368.XLC
+    type: FGW.LM.368.XLCT
     pinlabels: [I/O1, I/O2, I/O3, I/O4, I/O5, I/O6, I/O7, I/O8, GND, I/O9, I/O10, I/O11, I/O12, I/O13, I/O14, I/O15, I/O16,
-    GND, RS 232 TX,RS 232 RX,GND,Analog 4,Analog 5,GND, CanA P, CanA N,No Connect, CANB_P, CANB_N, GND, I2C_CLK, I2C_DATA,
+    GND, RS 232 TX,RS 232 RX,GND,Analog 4,Analog 5,GND, CanA P, CanA N,GND, CANB_P, CANB_N, GND, I2C_CLK, I2C_DATA,
     GND, 3.3V, GND, 5V, GND, ANALOG_1, ANALOG_2, ANALOG_3, GND, FTS1_OUT, FTS2_OUT, GND, V_ARB_TX, V_ARB_RX,
     GND, V_ARB_VCC, FTS3_OUT_MPU, OUT_RS485_P, OUT_RS485_N, IN_RS845_N, IN_RS845_P, RS485_GND, EQEP_A, EQEP_B, EQEP_S, EQEP_I,
     GND, V_USB_DP, V_USB_DN, V_USB_ID, FTS_OUT_MPU, FTS2_OUT_MPU, GND, GND, VCC, VCC]
@@ -16,15 +16,15 @@ templates: # defining templates to be used later on
         qty_multiplier: pincount # multipier for quantity (number of populated pins)
         manufacturer: LEMO # set manufacter name
   - &CEX_mate
-    type: FMW.LM.368.XLC
+    type: FMW.LM.368.XLCT
   - &con_i2c
     pinlabels: [GND, +5V, SCL, SDA]
   - &Servo
     type: Amphenol C091 M16 flange-mount male metal receptacle, 12-pin
     #pinlabels: [IN1+, IN1-, IN2+, IN2-, DIO1, DIO2, CAN_P, GND, CAN_N, TRX-, GND, TRX+]
     #pins: [A, B, C, D, E, F, G, H, J, K, L, M]
-    pinlabels: [CANP,CANN]
-    pins: [G, J]
+    pinlabels: [CANP,GND,CANN]
+    pins: [G,H,J]
   - &VPX_j2
     pinlabels: [Switch input 1, Switch input 2, Switch input 3, Switch input 4, Switch input 5, Switch input 6, Switch input 7, Switch input 8, Switch input 9, Switch input 10, Starter annun input, Aux batt voltage input, Flap up switch, Flap down switch, Roll trim left input, Roll trim right input, Pitch trim up input, Pitch trim down input]
     pins: [1,2,3,4,5,6,7,8,9,10,11,12,14,15,16,17,18,19]
@@ -57,7 +57,7 @@ templates: # defining templates to be used later on
 connectors:
   Veronte 1X:
     <<: *AP_mate # copying items from the template
-    notes: Veronte 1X
+    notes: Only GND need be 58! Others may be short!
   VP-X J2:
     <<: *VPX_j2
   # VP-X J8:
@@ -103,12 +103,12 @@ connectors:
   Radar:
     type: DTM04-4P
     notes: Mates with DTM06-4S
-    pinlabels: [CAN_L, CAN_H] 
+    pinlabels: [GND,CAN_L, CAN_H,VCC] 
     pins: [1,2,3,4]
     image:
       src: images\DTM04-4P.png
   Resistor:
-    type: Temp
+    type: 120-ohm
     pinlabels: [CAN_L, CAN_H]
   S: &splice  # generic autogenerated splice
     style: simple
@@ -126,15 +126,15 @@ connectors:
   #   <<: *relay
   # ACS relay:
   #   <<: *relay
-  shield1:
-    pinlabels: [Shield]
-  shield2:
-    pinlabels: [Shield]
+  # shield1:
+  #   pinlabels: [Shield]
+  # shield2:
+  #   pinlabels: [Shield]
 
 cables:
   W1:
     <<: *wire
-    length: 1 Inch
+    length: 4 "
     colors: [BKWH,BKBN]
     shield: true
     notes: Twisted Pair
@@ -144,7 +144,7 @@ cables:
   #   colors: [BK, RD, WH]
   W3:
     <<: *wire
-    length: 0.3 TBD
+    length: 156.5 "
     colors: [PKWH,BNPK]
     shield: true
     notes: Twisted Pair
@@ -154,20 +154,31 @@ cables:
   #   colors: [BK, RD]
   W6:
     <<: *wire
-    length: 40 Inches
-    colors: [GNYE,GNPK,PKYE]
+    length: 5 "
+    colors: [GNGY,GNYE,GNPK]
+    shield: true
+  W61:
+    <<: *wire
+    length: 19 "
+    colors: [YE,GN,BK]
+    shield: true
+  W62:
+    <<: *wire
+    length: 16 "
+    colors: [YE,GN,BK]
     shield: true
     notes: Twisted Pair | Veronte to ECU
   W7:
     <<: *wire
-    length: 13 Inches
+    length: 13 "
     colors: [BU,RD,BK]
     shield: true
     notes: Twisted Pair | Veronte to CEX
   W8:
     <<: *wire
-    length: 0.3
-    colors: [WH,YE,GY,PK,BU,RD,BK,VT,PKGY,BURD,GNWH,GNBN,YEWH,BNYE,GYWH,BNGY,BUWH,BUBN,RDWH,RDBN,GNGY,WH,BN,GN,YE,GY,PK,BU,RD,BK,VT,PKGY,BURD,GNWH,GNBN,YEWH,BNYE,GYWH,BNGY,PKWH,BNPK,BUWH,BUBN,RDWH,RDBN,BKWH,BKBN,GNGY,GNYE,GNPK,PKYE,WH,BN,GN,YE,GY,PK,BU,RD]
+    length: 58 "
+    notes: Only GND need be 58! Others may be short!
+    colors: [WH,YE,GY,PK,BU,RD,BK,VT,PKGY,BURD,GNWH,GNBN,YEWH,BNYE,GYWH,BNGY,BUWH,BUBN,RDWH,RDBN,PKYE,WH,BN,GN,YE,GY,PK,BU,RD,BK,VT,PKGY,BURD,GNWH,GNBN,YEWH,BNYE,GYWH,BNGY,PKWH,BNPK,BUWH,BUBN,RDWH,RDBN,BKWH,BKBN,GNGY,GNYE,GNPK,PKYE,WH,BN,GN,YE,GY,PK,BU,RD]
   # W7: 
   #   <<: *wire
   #   length: 0.3
@@ -186,13 +197,13 @@ cables:
   #   colors: [BK, WH, GN]
   W11: 
     <<: *wire
-    length: 73 Inches
+    length: 3 "
     colors: [YE, GN]
     shield: true
     notes: Twisted Pair
   W12: 
     <<: *wire
-    length: 73 Inches
+    length: 130 "
     colors: [YE, GN]
     shield: true
     notes: Twisted Pair
@@ -202,7 +213,7 @@ cables:
   #   colors: [GN]
   W13:
     <<: *wire
-    length: 75.5 Inches
+    length: 65 "
     colors: [BN,GN]
   # W14:
   #   <<: *logic_wire
@@ -210,25 +221,25 @@ cables:
   #   colors: [RD]
   W15: 
     <<: *wire
-    length: 12 Inches
+    length: 12 "
     colors: [YE, GN]
     shield: true
     notes: Twisted Pair
   W16: 
     <<: *wire
-    length: 6 Inches
+    length: 7 "
     colors: [YE, GN]
     shield: true
     notes: Twisted Pair
   W17: 
     <<: *wire
-    length: 6 Inches
+    length: 7 "
     colors: [YE, GN]
     shield: true
     notes: Twisted Pair
   W18: 
     <<: *wire
-    length: 170 Inches
+    length: 156.5 "
     colors: [YE, GN]
     shield: true
     notes: Twisted Pair | (Tail Mounted?)
@@ -236,12 +247,12 @@ cables:
 
 connections:
   -
-    - Veronte 1X: [1,4-8,10-17,22-23,27,31-32,34,36,38-40,42-43,45-46,48-58,60-64,67-68]
+    - Veronte 1X: [1,4-8,10-17,22-23,30,31-32,34,36,38-40,42-43,45-46,48-58,60-64,67-68]
     - W8: [1-6,8-15,18-19,21-23,25,27,29-31,33-34,36-37,39-49,51-55,58-59]
   -
-    - Veronte 1X: [9,18,21,24,33,35,37,41,44,47,59,65-66]
-    - W8: [7,16-17,20,24,26,28,32,35,38,50,56-57]
-    - [GND,GND,GND,GND,GND,GND,GND,GND,GND,GND,GND,GND,GND]
+    - Veronte 1X: [9,18,21,24,30,33,35,37,41,44,47,59,65-66]
+    - W8: [7,16-17,20,21,24,26,28,32,35,38,50,56-57]
+    - [GND,GND,GND,GND,GND,GND,GND,GND,GND,GND,GND,GND,GND,GND]
   -
     - Veronte 1X: [25-26]
     - W1: [1-2]
@@ -277,16 +288,23 @@ connections:
     - W7: [1-3]
     - CEX: [7-9]
   -
-    - W6: [1-2]
+    - W61: [1-2]
     - [S,S]
     - W12: [1-2]
-    - Radar: [2,1]
+    - Radar: [3,2]
   -
-    - Veronte 1X: [28-30]
-    - W6: [1-3]
+    - Veronte 1X: [27-29]
+    - W6: [3,1,2]
+    - [S,S,S]
+    - W61: [1-3]
+
+  -
+    - W61: [1-3]
+    - [S,S,S]
+    - W62: [1-3]
     - ECU CAN Bus: [A,B,C]
   -
-    - W6: [1-2] 
+    - W61: [1-2] 
     - [S, S]
     - W11: [1-2]
     - Resistor: [2,1]
@@ -294,6 +312,56 @@ connections:
     - Veronte 1X: [2-3]
     - W13: [1-2]
     - VP-X J2: [1-2]
+  -
+    - W6: s
+    - [S]
+    - W61: s
+  -
+    - W6: s
+    - [S]
+    - W7: s
+    - CEX: [7]
+  -
+    - W61: s
+    - [S]
+    - W12: s
+    - Radar: [1]
+  -
+    - W61: s
+    - [S]
+    - W11: s
+  -
+    - W61: s
+    - [S]
+    - W62: s
+    - ECU CAN Bus: [C]
+  -
+    - Veronte 1X: [27]
+    - W6: s
+  -
+    - Veronte 1X: [24]
+    - W1: s
+  -
+    - W1: s
+    - [S]
+    - W17: s
+    - Swash3: [H]
+  -
+    - W1: s
+    - [S]
+    - W16: s
+    - Swash2: [H]
+  -
+    - W1: s
+    - [S]
+    - W18: s
+    - Yaw: [H]
+  -
+    - W1: s
+    - [S]
+    - W15: s
+    - Swash1: [H]
+
   # -
   #   - W6: s
   #   - shield1: [1]