Merge branch 'master' of git.wiebel.org:OSS/CANNode

5 years ago · dfab0e57be
12 changed files with 14185 additions and 13934 deletions
--- a/Hardware/kicad/CANNode-cache.lib
+++ b/Hardware/kicad/CANNode-cache.lib
@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# 000_my_lib:DSN-MINI-360
+# CANNode-rescue_DSN-MINI-360-000_my_lib
 #
-DEF 000_my_lib:DSN-MINI-360 MOD 0 40 N Y 1 F N
+DEF CANNode-rescue_DSN-MINI-360-000_my_lib MOD 0 40 N Y 1 F N
 F0 "MOD" 350 -50 50 H V C CNN
-F1 "000_my_lib:DSN-MINI-360" 200 350 50 H V C CNN
+F1 "CANNode-rescue_DSN-MINI-360-000_my_lib" 200 350 50 H V C CNN
 F2 "" 250 150 50 H I C CNN
 F3 "" 250 150 50 H I C CNN
 DRAW
@ -16,77 +16,56 @@ X OUT OUT 500 250 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# 000_my_lib:MAX3032
+# CANNode-rescue_Teensy3.2-teensy
 #
-DEF 000_my_lib:MAX3032 U 0 20 Y Y 1 F N
-F0 "U" -300 750 50 H V L CNN
-F1 "000_my_lib:MAX3032" 100 750 50 H V L CNN
-F2 "Package_SO:SOIC-16_3.9x9.9mm_P1.27mm" -100 -800 50 H I C CNN
-F3 "" 50 -100 50 H I C CNN
-$FPLIST
- TSSOP*4.4x5mm*P0.65mm*
-$ENDFPLIST
+DEF CANNode-rescue_Teensy3.2-teensy U 0 40 Y Y 1 F N
+F0 "U" -700 -850 60 H V C CNN
+F1 "CANNode-rescue_Teensy3.2-teensy" 550 -850 60 H V C CNN
+F2 "" -200 -800 60 H V C CNN
+F3 "" -200 -800 60 H V C CNN
 DRAW
-C 0 -300 14 1 0 0 F
-C 0 300 14 1 0 0 F
-C 75 -500 20 1 0 0 N
-C 75 -200 20 1 0 0 N
-C 75 100 20 1 0 0 N
-C 75 400 20 1 0 0 N
-T 0 -35 450 40 0 1 0 D1 Normal 0 C C
-T 0 -35 150 40 0 1 0 D2 Normal 0 C C
-T 0 -35 -150 40 0 1 0 D3 Normal 0 C C
-T 0 -35 -450 40 0 1 0 D4 Normal 0 C C
-S -350 700 400 -700 1 0 10 f
-P 2 1 0 0 150 -500 95 -500 N
-P 2 1 0 0 150 -200 95 -200 N
-P 2 1 0 0 150 100 95 100 N
-P 2 1 0 0 150 400 95 400 N
-P 3 1 0 0 75 -435 75 -400 150 -400 N
-P 3 1 0 0 75 165 75 200 150 200 N
-P 3 1 0 0 75 465 75 500 150 500 N
-P 2 0 1 0 -100 -450 -200 -450 N
-P 2 0 1 0 -100 -150 -200 -150 N
-P 2 0 1 0 -100 150 -200 150 N
-P 2 0 1 0 -100 450 -200 450 N
-P 2 0 1 0 0 -300 -100 -300 N
-P 2 0 1 0 0 -200 0 -400 N
-P 2 0 1 0 0 300 -100 300 N
-P 2 0 1 0 0 400 0 200 N
-P 2 0 1 0 75 -480 75 -465 N
-P 2 0 1 0 75 -180 75 -165 N
-P 2 0 1 0 75 120 75 135 N
-P 2 0 1 0 75 420 75 435 N
-P 2 0 1 0 350 -400 350 -400 N
-P 3 0 1 0 150 -100 75 -100 75 -135 N
-P 4 1 1 10 -100 -350 -100 -550 100 -450 -100 -350 N
-P 4 1 1 10 -100 -50 -100 -250 100 -150 -100 -50 N
-P 4 1 1 10 -100 250 -100 50 100 150 -100 250 N
-P 4 1 1 10 -100 550 -100 350 100 450 -100 550 N
-X DI1 1 -450 450 100 R 50 50 1 1 I
-X DO3+ 10 500 -100 100 L 50 50 1 1 O
-X DO3- 11 500 -200 100 L 50 50 1 1 O
-X EN34 12 -450 -300 100 R 50 50 1 1 I
-X DO4- 13 500 -500 100 L 50 50 1 1 O
-X DO4+ 14 500 -400 100 L 50 50 1 1 O
-X DI4 15 -450 -450 100 R 50 50 1 1 I
-X VCC 16 0 800 100 D 50 50 1 1 W
-X DO1+ 2 500 500 100 L 50 50 1 1 O
-X DO1- 3 500 400 100 L 50 50 1 1 O
-X EN12 4 -450 300 100 R 50 50 1 1 I
-X DO2- 5 500 100 100 L 50 50 1 1 O
-X DO2+ 6 500 200 100 L 50 50 1 1 O
-X DI2 7 -450 150 100 R 50 50 1 1 I
-X GND 8 0 -800 100 U 50 50 1 1 W
-X DI3 9 -450 -150 100 R 50 50 1 1 I
+S -750 800 750 -800 0 1 0 N
+X GND 1 -950 700 200 R 50 50 1 1 W
+X 8_TX3_DIN 10 -950 -200 200 R 50 50 1 1 B
+X 9_RX2_CS_PWM 11 -950 -300 200 R 50 50 1 1 B
+X 10_TX2_CS_PWM 12 -950 -400 200 R 50 50 1 1 B
+X 11_DOUT 13 -950 -500 200 R 50 50 1 1 B
+X 12_DIN 14 -950 -600 200 R 50 50 1 1 B
+X VBat 15 -350 -1000 200 U 50 50 1 1 W
+X 3.3V 16 -250 -1000 200 U 50 50 1 1 P
+X GND 17 -150 -1000 200 U 50 50 1 1 W
+X Program 18 -50 -1000 200 U 50 50 1 1 I
+X A14/DAC 19 50 -1000 200 U 50 50 1 1 B
+X 0_RX1_Touch 2 -950 600 200 R 50 50 1 1 B
+X 13_LED_SCK 20 950 -600 200 L 50 50 1 1 B
+X 14_A0_SCK 21 950 -500 200 L 50 50 1 1 B
+X 15_A1_CS_Touch 22 950 -400 200 L 50 50 1 1 B
+X 16_A2_SCL0_Touch 23 950 -300 200 L 50 50 1 1 B
+X 17_A3_SDA0_Touch 24 950 -200 200 L 50 50 1 1 B
+X 18_A4_SDA0_Touch 25 950 -100 200 L 50 50 1 1 B
+X 19_A5_SCL0_Touch 26 950 0 200 L 50 50 1 1 B
+X 20_A6_CS_PWM 27 950 100 200 L 50 50 1 1 B
+X 21_A7_RX1_CS_PWM 28 950 200 200 L 50 50 1 1 B
+X 22_A8_Touch_PWM 29 950 300 200 L 50 50 1 1 B
+X 1_TX1_Touch 3 -950 500 200 R 50 50 1 1 B
+X 23_A9_Touch_PWM 30 950 400 200 L 50 50 1 1 B
+X 3.3V_max100mA 31 950 500 200 L 50 50 1 1 w
+X AGND 32 950 600 200 L 50 50 1 1 w
+X Vin 33 950 700 200 L 50 50 1 1 W
+X 2 4 -950 400 200 R 50 50 1 1 B
+X 3_TX_PWM 5 -950 300 200 R 50 50 1 1 B
+X 4_RX_PWM 6 -950 200 200 R 50 50 1 1 B
+X 5_TX1_PWM 7 -950 100 200 R 50 50 1 1 B
+X 6_PWM 8 -950 0 200 R 50 50 1 1 B
+X 7_RX3_DOUT 9 -950 -100 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic:Conn_01x04
+# Connector_Generic_Conn_01x04
 #
-DEF Connector_Generic:Conn_01x04 J 0 40 Y N 1 F N
+DEF Connector_Generic_Conn_01x04 J 0 40 Y N 1 F N
 F0 "J" 0 200 50 H V C CNN
-F1 "Connector_Generic:Conn_01x04" 0 -300 50 H V C CNN
+F1 "Connector_Generic_Conn_01x04" 0 -300 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -105,11 +84,11 @@ X Pin_4 4 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic:Conn_01x10
+# Connector_Generic_Conn_01x10
 #
-DEF Connector_Generic:Conn_01x10 J 0 40 Y N 1 F N
+DEF Connector_Generic_Conn_01x10 J 0 40 Y N 1 F N
 F0 "J" 0 500 50 H V C CNN
-F1 "Connector_Generic:Conn_01x10" 0 -600 50 H V C CNN
+F1 "Connector_Generic_Conn_01x10" 0 -600 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -140,11 +119,11 @@ X Pin_9 9 -200 -400 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic:Conn_02x03_Odd_Even
+# Connector_Generic_Conn_02x03_Odd_Even
 #
-DEF Connector_Generic:Conn_02x03_Odd_Even J 0 40 Y N 1 F N
+DEF Connector_Generic_Conn_02x03_Odd_Even J 0 40 Y N 1 F N
 F0 "J" 50 200 50 H V C CNN
-F1 "Connector_Generic:Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
+F1 "Connector_Generic_Conn_02x03_Odd_Even" 50 -200 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -167,11 +146,11 @@ X Pin_6 6 300 -100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic:Conn_02x04_Odd_Even
+# Connector_Generic_Conn_02x04_Odd_Even
 #
-DEF Connector_Generic:Conn_02x04_Odd_Even J 0 40 Y N 1 F N
+DEF Connector_Generic_Conn_02x04_Odd_Even J 0 40 Y N 1 F N
 F0 "J" 50 200 50 H V C CNN
-F1 "Connector_Generic:Conn_02x04_Odd_Even" 50 -300 50 H V C CNN
+F1 "Connector_Generic_Conn_02x04_Odd_Even" 50 -300 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -198,31 +177,11 @@ X Pin_8 8 300 -200 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device:CP_Small
-#
-DEF Device:CP_Small C 0 10 N N 1 F N
-F0 "C" 10 70 50 H V L CNN
-F1 "Device:CP_Small" 10 -80 50 H V L CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- CP_*
-$ENDFPLIST
-DRAW
-S -60 -12 60 -27 0 1 0 F
-S -60 27 60 12 0 1 0 N
-P 2 0 1 0 -50 60 -30 60 N
-P 2 0 1 0 -40 50 -40 70 N
-X ~ 1 0 100 73 D 50 50 1 1 P
-X ~ 2 0 -100 73 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Device:C_Small
+# Device_C_Small
 #
-DEF Device:C_Small C 0 10 N N 1 F N
+DEF Device_C_Small C 0 10 N N 1 F N
 F0 "C" 10 70 50 H V L CNN
-F1 "Device:C_Small" 10 -80 50 H V L CNN
+F1 "Device_C_Small" 10 -80 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -236,13 +195,16 @@ X ~ 2 0 -100 80 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device:Jumper_NC_Small
+# Device_Jumper_NC_Small
 #
-DEF Device:Jumper_NC_Small JP 0 30 N N 1 F N
+DEF Device_Jumper_NC_Small JP 0 30 N N 1 F N
 F0 "JP" 0 80 50 H V C CNN
-F1 "Device:Jumper_NC_Small" 10 -60 50 H V C CNN
+F1 "Device_Jumper_NC_Small" 10 -60 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SolderJumper*Bridged*
+$ENDFPLIST
 DRAW
 A 0 -10 57 450 1350 0 1 0 N 40 30 -40 30
 C -40 0 20 0 1 0 N
@ -252,11 +214,11 @@ X 2 2 100 0 40 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# Device:R_Small
+# Device_R_Small
 #
-DEF Device:R_Small R 0 10 N N 1 F N
+DEF Device_R_Small R 0 10 N N 1 F N
 F0 "R" 30 20 50 H V L CNN
-F1 "Device:R_Small" 30 -40 50 H V L CNN
+F1 "Device_R_Small" 30 -40 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@ -269,11 +231,35 @@ X ~ 2 0 -100 30 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Interface:PCA9306
+# Interface_CAN_LIN_SN65HVD230
+#
+DEF Interface_CAN_LIN_SN65HVD230 U 0 40 Y Y 1 F N
+F0 "U" -100 400 50 H V R CNN
+F1 "Interface_CAN_LIN_SN65HVD230" -100 300 50 H V R CNN
+F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 0 -500 50 H I C CNN
+F3 "" -100 400 50 H I C CNN
+ALIAS SN65HVD231
+$FPLIST
+ SOIC*3.9x4.9mm*P1.27mm*
+$ENDFPLIST
+DRAW
+S -300 200 300 -300 0 1 10 f
+X D 1 -400 100 100 R 50 50 1 1 I
+X GND 2 0 -400 100 U 50 50 1 1 W
+X VCC 3 0 300 100 D 50 50 1 1 W
+X R 4 -400 0 100 R 50 50 1 1 O
+X Vref 5 -400 -100 100 R 50 50 1 1 O
+X CANL 6 400 -100 100 L 50 50 1 1 B
+X CANH 7 400 0 100 L 50 50 1 1 B
+X Rs 8 -400 -200 100 R 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# Interface_PCA9306
 #
-DEF Interface:PCA9306 U 0 40 Y Y 1 F N
+DEF Interface_PCA9306 U 0 40 Y Y 1 F N
 F0 "U" -300 450 50 H V L CNN
-F1 "Interface:PCA9306" 200 450 50 H V L CNN
+F1 "Interface_PCA9306" 200 450 50 H V L CNN
 F2 "" -400 350 50 H I C CNN
 F3 "" -300 450 50 H I C CNN
 $FPLIST
@ -294,35 +280,11 @@ X EN 8 400 100 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# Interface_CAN_LIN:SN65HVD230
+# Interface_UART_MAX3485
 #
-DEF Interface_CAN_LIN:SN65HVD230 U 0 40 Y Y 1 F N
-F0 "U" -100 400 50 H V R CNN
-F1 "Interface_CAN_LIN:SN65HVD230" -100 300 50 H V R CNN
-F2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" 0 -500 50 H I C CNN
-F3 "" -100 400 50 H I C CNN
-ALIAS SN65HVD231
-$FPLIST
- SOIC*3.9x4.9mm*P1.27mm*
-$ENDFPLIST
-DRAW
-S -300 200 300 -300 0 1 10 f
-X D 1 -400 100 100 R 50 50 1 1 I
-X GND 2 0 -400 100 U 50 50 1 1 W
-X VCC 3 0 300 100 D 50 50 1 1 W
-X R 4 -400 0 100 R 50 50 1 1 O
-X Vref 5 -400 -100 100 R 50 50 1 1 O
-X CANL 6 400 -100 100 L 50 50 1 1 B
-X CANH 7 400 0 100 L 50 50 1 1 B
-X Rs 8 -400 -200 100 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Interface_UART:MAX3485
-#
-DEF Interface_UART:MAX3485 U 0 20 Y Y 1 F N
+DEF Interface_UART_MAX3485 U 0 20 Y Y 1 F N
 F0 "U" -240 450 50 H V C CNN
-F1 "Interface_UART:MAX3485" 30 450 50 H V L CNN
+F1 "Interface_UART_MAX3485" 30 450 50 H V L CNN
 F2 "" 0 -700 50 H I C CNN
 F3 "" 0 50 50 H I C CNN
 ALIAS MAX483E MAX485E MAX487E MAX1487E MAX3485 MAX3483 MAX3486
@ -358,15 +320,15 @@ X VCC 8 0 500 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# Jumper:Jumper_3_Bridged12
+# Jumper_Jumper_3_Bridged12
 #
-DEF Jumper:Jumper_3_Bridged12 JP 0 0 Y N 1 F N
+DEF Jumper_Jumper_3_Bridged12 JP 0 0 Y N 1 F N
 F0 "JP" -100 -100 50 H V C CNN
-F1 "Jumper:Jumper_3_Bridged12" 0 110 50 H V C CNN
+F1 "Jumper_Jumper_3_Bridged12" 0 110 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Jumper*Bridged12*
+ SolderJumper*Bridged12*
 $ENDFPLIST
 DRAW
 A -65 -50 89 1282 518 0 1 0 N -120 20 -10 20
@ -380,33 +342,11 @@ X B 3 250 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Regulator_Linear:LM1117-5.0
-#
-DEF Regulator_Linear:LM1117-5.0 U 0 10 Y Y 1 F N
-F0 "U" -150 125 50 H V C CNN
-F1 "Regulator_Linear:LM1117-5.0" 0 125 50 H V L CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-ALIAS LM1117-2.5 LM1117-3.3 LM1117-5.0 TLV1117-15 TLV1117-18 TLV1117-25 TLV1117-33 TLV1117-50
-$FPLIST
- SOT?223*
- TO?263*
- TO?252*
- TO?220*
-$ENDFPLIST
-DRAW
-S -200 -200 200 75 0 1 10 f
-X GND 1 0 -300 100 U 50 50 1 1 W
-X VO 2 300 0 100 L 50 50 1 1 w
-X VI 3 -300 0 100 R 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# power:+12V
+# power_+12V
 #
-DEF power:+12V #PWR 0 0 Y Y 1 F P
+DEF power_+12V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "power:+12V" 0 140 50 H V C CNN
+F1 "power_+12V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@ -417,11 +357,11 @@ X +12V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# power:+3.3V
+# power_+3.3V
 #
-DEF power:+3.3V #PWR 0 0 Y Y 1 F P
+DEF power_+3.3V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "power:+3.3V" 0 140 50 H V C CNN
+F1 "power_+3.3V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 ALIAS +3.3V
@ -433,11 +373,11 @@ X +3V3 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# power:+5V
+# power_+5V
 #
-DEF power:+5V #PWR 0 0 Y Y 1 F P
+DEF power_+5V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "power:+5V" 0 140 50 H V C CNN
+F1 "power_+5V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@ -448,11 +388,11 @@ X +5V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# power:GND
+# power_GND
 #
-DEF power:GND #PWR 0 0 Y Y 1 F P
+DEF power_GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
-F1 "power:GND" 0 -150 50 H V C CNN
+F1 "power_GND" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@ -461,11 +401,11 @@ X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# power:PWR_FLAG
+# power_PWR_FLAG
 #
-DEF power:PWR_FLAG #FLG 0 0 N N 1 F P
+DEF power_PWR_FLAG #FLG 0 0 N N 1 F P
 F0 "#FLG" 0 75 50 H I C CNN
-F1 "power:PWR_FLAG" 0 150 50 H V C CNN
+F1 "power_PWR_FLAG" 0 150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@ -474,49 +414,4 @@ X pwr 1 0 0 0 U 50 50 0 0 w
 ENDDRAW
 ENDDEF
 #
-# teensy:Teensy3.2
-#
-DEF teensy:Teensy3.2 U 0 40 Y Y 1 F N
-F0 "U" -700 -850 60 H V C CNN
-F1 "teensy:Teensy3.2" 550 -850 60 H V C CNN
-F2 "" -200 -800 60 H V C CNN
-F3 "" -200 -800 60 H V C CNN
-DRAW
-S -750 800 750 -800 0 1 0 N
-X GND 1 -950 700 200 R 50 50 1 1 W
-X 8_TX3_DIN 10 -950 -200 200 R 50 50 1 1 B
-X 9_RX2_CS_PWM 11 -950 -300 200 R 50 50 1 1 B
-X 10_TX2_CS_PWM 12 -950 -400 200 R 50 50 1 1 B
-X 11_DOUT 13 -950 -500 200 R 50 50 1 1 B
-X 12_DIN 14 -950 -600 200 R 50 50 1 1 B
-X VBat 15 -350 -1000 200 U 50 50 1 1 W
-X 3.3V 16 -250 -1000 200 U 50 50 1 1 P
-X GND 17 -150 -1000 200 U 50 50 1 1 W
-X Program 18 -50 -1000 200 U 50 50 1 1 I
-X A14/DAC 19 50 -1000 200 U 50 50 1 1 B
-X 0_RX1_Touch 2 -950 600 200 R 50 50 1 1 B
-X 13_LED_SCK 20 950 -600 200 L 50 50 1 1 B
-X 14_A0_SCK 21 950 -500 200 L 50 50 1 1 B
-X 15_A1_CS_Touch 22 950 -400 200 L 50 50 1 1 B
-X 16_A2_SCL0_Touch 23 950 -300 200 L 50 50 1 1 B
-X 17_A3_SDA0_Touch 24 950 -200 200 L 50 50 1 1 B
-X 18_A4_SDA0_Touch 25 950 -100 200 L 50 50 1 1 B
-X 19_A5_SCL0_Touch 26 950 0 200 L 50 50 1 1 B
-X 20_A6_CS_PWM 27 950 100 200 L 50 50 1 1 B
-X 21_A7_RX1_CS_PWM 28 950 200 200 L 50 50 1 1 B
-X 22_A8_Touch_PWM 29 950 300 200 L 50 50 1 1 B
-X 1_TX1_Touch 3 -950 500 200 R 50 50 1 1 B
-X 23_A9_Touch_PWM 30 950 400 200 L 50 50 1 1 B
-X 3.3V_max100mA 31 950 500 200 L 50 50 1 1 w
-X AGND 32 950 600 200 L 50 50 1 1 w
-X Vin 33 950 700 200 L 50 50 1 1 W
-X 2 4 -950 400 200 R 50 50 1 1 B
-X 3_TX_PWM 5 -950 300 200 R 50 50 1 1 B
-X 4_RX_PWM 6 -950 200 200 R 50 50 1 1 B
-X 5_TX1_PWM 7 -950 100 200 R 50 50 1 1 B
-X 6_PWM 8 -950 0 200 R 50 50 1 1 B
-X 7_RX3_DOUT 9 -950 -100 200 R 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
 #End Library
--- a/Hardware/kicad/CANNode.kicad_pcb
+++ b/Hardware/kicad/CANNode.kicad_pcb
--- a/Hardware/kicad/CANNode.pdf
+++ b/Hardware/kicad/CANNode.pdf
--- a/Hardware/kicad/CANNode.pro
+++ b/Hardware/kicad/CANNode.pro
@ -1,4 +1,4 @@
-update=Date
+update=Sat Nov 16 21:58:46 2019
 version=1
 last_client=kicad
 [general]
@ -37,7 +37,7 @@ PageLayoutDescrFile=
 PlotDirectoryName=images/
 SubpartIdSeparator=0
 SubpartFirstId=65
-NetFmtName=
+NetFmtName=Pcbnew
 SpiceAjustPassiveValues=0
 LabSize=50
 ERC_TestSimilarLabels=1
--- a/Hardware/kicad/CANNode.sch
+++ b/Hardware/kicad/CANNode.sch
--- a/Hardware/kicad/DiffWS2811/DiffWS2811.kicad_pcb
+++ b/Hardware/kicad/DiffWS2811/DiffWS2811.kicad_pcb
--- a/Hardware/kicad/DiffWS2811/DiffWS2811.pdf
+++ b/Hardware/kicad/DiffWS2811/DiffWS2811.pdf
--- a/Hardware/kicad/DiffWS2811/DiffWS2811.pro
+++ b/Hardware/kicad/DiffWS2811/DiffWS2811.pro
@ -0,0 +1,43 @@
+update=Tue Oct 22 14:04:36 2019
+version=1
+last_client=eeschema
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+[schematic_editor]
+version=1
+PageLayoutDescrFile=
+PlotDirectoryName=
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=
+SpiceAjustPassiveValues=0
+LabSize=50
+ERC_TestSimilarLabels=1
--- a/Hardware/kicad/DiffWS2811/DiffWS2811.sch
+++ b/Hardware/kicad/DiffWS2811/DiffWS2811.sch
@ -0,0 +1,419 @@
+EESchema Schematic File Version 4
+LIBS:DiffWS2811-cache
+EELAYER 26 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L 000_my_lib:DSN-MINI-360 MOD1
+U 1 1 5C0664F1
+P 2900 3550
+F 0 "MOD1" H 2900 3500 50  0000 C CNN
+F 1 "DSN-MINI-360" H 3125 3934 50  0001 C CNN
+F 2 "000_my_footprints:DC-DC" H 3150 3700 50  0001 C CNN
+F 3 "" H 3150 3700 50  0001 C CNN
+	1    2900 3550
+	1    0    0    -1  
+$EndComp
+$Comp
+L Interface_UART:MAX485E U1
+U 1 1 5C06691A
+P 3850 2300
+F 0 "U1" H 4100 1750 50  0000 C CNN
+F 1 "MAX485E" H 3650 1750 50  0000 C CNN
+F 2 "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" H 3850 1600 50  0001 C CNN
+F 3 "https://datasheets.maximintegrated.com/en/ds/MAX1487E-MAX491E.pdf" H 3850 2350 50  0001 C CNN
+	1    3850 2300
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Device:R_Small R1
+U 1 1 5C066BB7
+P 3150 2350
+F 0 "R1" H 3209 2350 50  0000 L CNN
+F 1 "R_Small" H 3209 2305 50  0001 L CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 3150 2350 50  0001 C CNN
+F 3 "~" H 3150 2350 50  0001 C CNN
+	1    3150 2350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector_Generic:Conn_01x04 J1
+U 1 1 5C066D15
+P 2750 2400
+F 0 "J1" H 2670 1975 50  0000 C CNN
+F 1 "Conn_01x04" H 3200 2100 50  0001 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" H 2750 2400 50  0001 C CNN
+F 3 "~" H 2750 2400 50  0001 C CNN
+	1    2750 2400
+	-1   0    0    1   
+$EndComp
+$Comp
+L Connector_Generic:Conn_01x03 J2
+U 1 1 5C066E44
+P 4850 2200
+F 0 "J2" H 4930 2196 50  0000 L CNN
+F 1 "Conn_01x03" H 4930 2151 50  0001 L CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" H 4850 2200 50  0001 C CNN
+F 3 "~" H 4850 2200 50  0001 C CNN
+	1    4850 2200
+	1    0    0    1   
+$EndComp
+$Comp
+L Device:C_Small C1
+U 1 1 5C066F30
+P 4150 3350
+F 0 "C1" H 4242 3396 50  0000 L CNN
+F 1 "C_Small" H 4242 3305 50  0001 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4150 3350 50  0001 C CNN
+F 3 "~" H 4150 3350 50  0001 C CNN
+	1    4150 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:Jumper_NO_Small JP1
+U 1 1 5C066FFC
+P 3100 3200
+F 0 "JP1" H 3100 3385 50  0000 C CNN
+F 1 "Jumper" H 3100 3294 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm" H 3100 3200 50  0001 C CNN
+F 3 "~" H 3100 3200 50  0001 C CNN
+	1    3100 3200
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0101
+U 1 1 5C0670C6
+P 3000 2550
+F 0 "#PWR0101" H 3000 2300 50  0001 C CNN
+F 1 "GND" H 3005 2377 50  0001 C CNN
+F 2 "" H 3000 2550 50  0001 C CNN
+F 3 "" H 3000 2550 50  0001 C CNN
+	1    3000 2550
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:VCC #PWR0102
+U 1 1 5C067142
+P 3850 1750
+F 0 "#PWR0102" H 3850 1600 50  0001 C CNN
+F 1 "VCC" H 4000 1800 50  0000 C CNN
+F 2 "" H 3850 1750 50  0001 C CNN
+F 3 "" H 3850 1750 50  0001 C CNN
+	1    3850 1750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:-VSW #PWR0103
+U 1 1 5C06719C
+P 3000 2150
+F 0 "#PWR0103" H 3000 2250 50  0001 C CNN
+F 1 "-VSW" H 3015 2323 50  0000 C CNN
+F 2 "" H 3000 2150 50  0001 C CNN
+F 3 "" H 3000 2150 50  0001 C CNN
+	1    3000 2150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0104
+U 1 1 5C067280
+P 3100 3700
+F 0 "#PWR0104" H 3100 3450 50  0001 C CNN
+F 1 "GND" H 3105 3527 50  0001 C CNN
+F 2 "" H 3100 3700 50  0001 C CNN
+F 3 "" H 3100 3700 50  0001 C CNN
+	1    3100 3700
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:-VSW #PWR0106
+U 1 1 5C0672B2
+P 2750 3150
+F 0 "#PWR0106" H 2750 3250 50  0001 C CNN
+F 1 "-VSW" H 2765 3323 50  0000 C CNN
+F 2 "" H 2750 3150 50  0001 C CNN
+F 3 "" H 2750 3150 50  0001 C CNN
+	1    2750 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:VCC #PWR0107
+U 1 1 5C0672DA
+P 3450 3150
+F 0 "#PWR0107" H 3450 3000 50  0001 C CNN
+F 1 "VCC" H 3467 3323 50  0000 C CNN
+F 2 "" H 3450 3150 50  0001 C CNN
+F 3 "" H 3450 3150 50  0001 C CNN
+	1    3450 3150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3850 1750 3850 1800
+Wire Wire Line
+	2750 3150 2750 3200
+Wire Wire Line
+	2750 3200 2900 3200
+Wire Wire Line
+	3200 3200 3300 3200
+Wire Wire Line
+	3450 3200 3450 3150
+Wire Wire Line
+	3450 3200 3450 3300
+Connection ~ 3450 3200
+Wire Wire Line
+	2800 3300 2750 3300
+Connection ~ 2750 3200
+Wire Wire Line
+	2950 2200 3000 2200
+Wire Wire Line
+	3000 2200 3000 2150
+Wire Wire Line
+	2950 2500 3000 2500
+Wire Wire Line
+	3000 2500 3000 2550
+Wire Wire Line
+	2950 2400 3050 2400
+Wire Wire Line
+	3050 2400 3050 2500
+Wire Wire Line
+	3050 2500 3150 2500
+Wire Wire Line
+	3150 2500 3150 2450
+Wire Wire Line
+	3150 2250 3150 2200
+Wire Wire Line
+	3150 2200 3050 2200
+Wire Wire Line
+	3050 2200 3050 2300
+Wire Wire Line
+	3050 2300 2950 2300
+Wire Wire Line
+	3450 2200 3150 2200
+Connection ~ 3150 2200
+Wire Wire Line
+	3450 2500 3150 2500
+Connection ~ 3150 2500
+$Comp
+L power:VCC #PWR0108
+U 1 1 5C069637
+P 4150 3150
+F 0 "#PWR0108" H 4150 3000 50  0001 C CNN
+F 1 "VCC" H 4300 3200 50  0000 C CNN
+F 2 "" H 4150 3150 50  0001 C CNN
+F 3 "" H 4150 3150 50  0001 C CNN
+	1    4150 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0109
+U 1 1 5C069650
+P 4150 3550
+F 0 "#PWR0109" H 4150 3300 50  0001 C CNN
+F 1 "GND" H 4155 3377 50  0001 C CNN
+F 2 "" H 4150 3550 50  0001 C CNN
+F 3 "" H 4150 3550 50  0001 C CNN
+	1    4150 3550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4150 3150 4150 3200
+Wire Wire Line
+	4150 3450 4150 3500
+$Comp
+L power:GND #PWR0110
+U 1 1 5C06A0D9
+P 3850 2950
+F 0 "#PWR0110" H 3850 2700 50  0001 C CNN
+F 1 "GND" H 3855 2777 50  0001 C CNN
+F 2 "" H 3850 2950 50  0001 C CNN
+F 3 "" H 3850 2950 50  0001 C CNN
+	1    3850 2950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3850 2900 3850 2950
+$Comp
+L power:GND #PWR0111
+U 1 1 5C06A85A
+P 4300 2550
+F 0 "#PWR0111" H 4300 2300 50  0001 C CNN
+F 1 "GND" H 4305 2377 50  0001 C CNN
+F 2 "" H 4300 2550 50  0001 C CNN
+F 3 "" H 4300 2550 50  0001 C CNN
+	1    4300 2550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4250 2400 4300 2400
+Wire Wire Line
+	4300 2400 4300 2500
+Wire Wire Line
+	4300 2500 4250 2500
+Wire Wire Line
+	4300 2300 4300 2400
+Wire Wire Line
+	4300 2300 4250 2300
+Connection ~ 4300 2400
+Wire Wire Line
+	4300 2500 4300 2550
+Connection ~ 4300 2500
+$Comp
+L power:VCC #PWR0112
+U 1 1 5C06BD25
+P 4600 2050
+F 0 "#PWR0112" H 4600 1900 50  0001 C CNN
+F 1 "VCC" H 4750 2100 50  0000 C CNN
+F 2 "" H 4600 2050 50  0001 C CNN
+F 3 "" H 4600 2050 50  0001 C CNN
+	1    4600 2050
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0113
+U 1 1 5C06CC4B
+P 4600 2350
+F 0 "#PWR0113" H 4600 2100 50  0001 C CNN
+F 1 "GND" H 4605 2177 50  0001 C CNN
+F 2 "" H 4600 2350 50  0001 C CNN
+F 3 "" H 4600 2350 50  0001 C CNN
+	1    4600 2350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4650 2200 4500 2200
+Wire Wire Line
+	4650 2100 4600 2100
+Wire Wire Line
+	4600 2100 4600 2050
+Wire Wire Line
+	4650 2300 4600 2300
+Wire Wire Line
+	4600 2300 4600 2350
+$Comp
+L Device:R_Small R2
+U 1 1 5C06E1D6
+P 4400 2200
+F 0 "R2" V 4296 2200 50  0000 C CNN
+F 1 "R_Small" V 4295 2200 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4400 2200 50  0001 C CNN
+F 3 "~" H 4400 2200 50  0001 C CNN
+	1    4400 2200
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	4250 2200 4300 2200
+$Comp
+L power:PWR_FLAG #FLG0101
+U 1 1 5C07179E
+P 2900 3150
+F 0 "#FLG0101" H 2900 3225 50  0001 C CNN
+F 1 "PWR_FLAG" H 2900 3324 50  0001 C CNN
+F 2 "" H 2900 3150 50  0001 C CNN
+F 3 "~" H 2900 3150 50  0001 C CNN
+	1    2900 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:PWR_FLAG #FLG0102
+U 1 1 5C071EE6
+P 3300 3150
+F 0 "#FLG0102" H 3300 3225 50  0001 C CNN
+F 1 "PWR_FLAG" H 3300 3324 50  0001 C CNN
+F 2 "" H 3300 3150 50  0001 C CNN
+F 3 "~" H 3300 3150 50  0001 C CNN
+	1    3300 3150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3300 3150 3300 3200
+Connection ~ 3300 3200
+Wire Wire Line
+	3300 3200 3450 3200
+Wire Wire Line
+	2900 3150 2900 3200
+Connection ~ 2900 3200
+Wire Wire Line
+	2900 3200 3000 3200
+Wire Wire Line
+	2750 3200 2750 3300
+$Comp
+L power:PWR_FLAG #FLG0103
+U 1 1 5C07505B
+P 3350 3600
+F 0 "#FLG0103" H 3350 3675 50  0001 C CNN
+F 1 "PWR_FLAG" H 3350 3774 50  0001 C CNN
+F 2 "" H 3350 3600 50  0001 C CNN
+F 3 "~" H 3350 3600 50  0001 C CNN
+	1    3350 3600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3400 3300 3450 3300
+Wire Wire Line
+	3100 3700 3100 3650
+Wire Wire Line
+	3350 3600 3350 3700
+Wire Wire Line
+	3350 3700 3100 3700
+Connection ~ 3100 3700
+$Comp
+L Device:C_Small C2
+U 1 1 5C07E1E5
+P 4400 3350
+F 0 "C2" H 4492 3396 50  0000 L CNN
+F 1 "C_Small" H 4492 3305 50  0001 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 4400 3350 50  0001 C CNN
+F 3 "~" H 4400 3350 50  0001 C CNN
+	1    4400 3350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4150 3200 4400 3200
+Wire Wire Line
+	4400 3200 4400 3250
+Connection ~ 4150 3200
+Wire Wire Line
+	4150 3200 4150 3250
+Wire Wire Line
+	4400 3450 4400 3500
+Wire Wire Line
+	4400 3500 4150 3500
+Connection ~ 4150 3500
+Wire Wire Line
+	4150 3500 4150 3550
+$Comp
+L Device:CP_Small C3
+U 1 1 5C07F5DF
+P 4600 3350
+F 0 "C3" H 4688 3396 50  0000 L CNN
+F 1 "CP_Small" H 4688 3305 50  0000 L CNN
+F 2 "Capacitor_SMD:CP_Elec_3x5.4" H 4600 3350 50  0001 C CNN
+F 3 "~" H 4600 3350 50  0001 C CNN
+	1    4600 3350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 3200 4600 3200
+Wire Wire Line
+	4600 3200 4600 3250
+Connection ~ 4400 3200
+Wire Wire Line
+	4600 3450 4600 3500
+Wire Wire Line
+	4600 3500 4400 3500
+Connection ~ 4400 3500
+Text Label 3300 2200 0    50   ~ 0
+D+
+Text Label 3300 2500 0    50   ~ 0
+D-
+$EndSCHEMATC
--- a/Hardware/kicad/DiffWS2811/DiffWS2811_min.kicad_pcb
+++ b/Hardware/kicad/DiffWS2811/DiffWS2811_min.kicad_pcb
--- a/Hardware/kicad/DiffWS2811/DiffWS2811_min.pro
+++ b/Hardware/kicad/DiffWS2811/DiffWS2811_min.pro
@ -0,0 +1,33 @@
+update=22/05/2015 07:44:53
+version=1
+last_client=kicad
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
--- a/src/CANNode.cpp
+++ b/src/CANNode.cpp
@ -1,4 +1,4 @@
-#include <Arduino.h>
+// #include <Arduino.h>

 // -------------------------------------------------------------
 // CANNode for Teensy 3.1/3.2
@ -14,8 +14,8 @@

 // For Node definition:

-//#include "Node_1_def.h" // Dachstuhl
-#include "Node_2_def.h" // Werkstatt
+#include "Node_1_def.h" // Dachstuhl
+//#include "Node_2_def.h" // Werkstatt
 //#include "Node_3_def.h" // Keller

 // Metro ticks in ms
@ -142,7 +142,7 @@ int CAN_send(uint8_t prio, uint8_t dst, uint8_t cmd, uint8_t* data, uint8_t data
  txmsg.id = forgeid(prio, dst, cmd, type);
  txmsg.len = data_size;
  for (uint8_t i = 0; i < txmsg.len; i++) { txmsg.buf[i] = data[i]; }
-  CANbus.write(txmsg);
+  return CANbus.write(txmsg);
 //  txmsg.buf[0]++;
 //  txmsg.len = 0;
 }
@ -153,7 +153,7 @@ int CAN_send(uint8_t prio, uint8_t dst, uint8_t cmd, uint8_t data, uint8_t type=
  txmsg.id = forgeid(prio, dst, cmd, type);
  txmsg.len = 1;
  txmsg.buf[0] = data;
-  CANbus.write(txmsg);
+  return CANbus.write(txmsg);
 //  txmsg.buf[0]++;
 //  txmsg.len = 0;
 }