some revisions

2018-08-19 16:56:22 -07:00
parent 45b7cd9a61
commit 88535700e5
6 changed files with 20782 additions and 21097 deletions
--- a/controller-cache.lib
+++ b/controller-cache.lib
@@ -257,26 +257,6 @@ X DB2 9 -750 -100 300 R 70 70 0 1 P
 ENDDRAW
 ENDDEF
 #
-# GLCD-controler-SchDoc-rescue:SW-PB
-#
-DEF GLCD-controler-SchDoc-rescue:SW-PB PB 0 40 Y Y 1 F N
-F0 "PB" 100 -100 60 H V L BNN
-F1 "GLCD-controler-SchDoc-rescue:SW-PB" 100 -200 60 V V L BNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-A 30 -100 30 900 -1500 1 1 10 N 29 -70 4 -114
-A 30 -100 30 -1500 -300 1 1 10 N 4 -114 55 -115
-A 30 -100 30 -300 900 1 1 10 N 55 -115 29 -70
-A 270 -100 30 900 -1500 1 1 10 N 269 -70 244 -114
-A 270 -100 30 -1500 -300 1 1 10 N 244 -114 295 -115
-A 270 -100 30 -300 900 1 1 10 N 295 -115 269 -70
-P 9 0 1 10 0 -30 0 -40 300 -40 300 -30 190 -30 190 0 110 0 110 -30 0 -30 F
-X P 1 -100 -100 100 R 1 1 0 1 P
-X P 2 400 -100 100 L 1 1 0 1 P
-ENDDRAW
-ENDDEF
-#
 # GLCD-controler-SchDoc-rescue:VCC
 #
 DEF GLCD-controler-SchDoc-rescue:VCC #PWR 0 0 Y Y 1 F P
@@ -292,6 +272,23 @@ X VCC 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+# Switch:SW_Push
+#
+DEF Switch:SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "Switch:SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
 # mic5209:MIC5209
 #
 DEF mic5209:MIC5209 U 0 40 Y Y 1 F N
--- a/controller.kicad_pcb
+++ b/controller.kicad_pcb
--- a/controller.net
+++ b/controller.net
@@ -1,7 +1,7 @@
 (export (version D)
  (design
    (source "/home/salfter/reprapdiscount-full-graphic-lcd-controller/GLCD controller.sch")
-    (date "Thu 16 Aug 2018 10:57:41 PM PDT")
+    (date "Sun 19 Aug 2018 04:54:22 PM PDT")
    (tool "Eeschema 5.0.0")
    (sheet (number 1) (name /) (tstamps /)
      (title_block
@@ -86,10 +86,11 @@
      (tstamp 5B7596A8))
    (comp (ref PB1)
      (value STOP)
+      (footprint Button_Switch_THT:SW_PUSH_6mm)
      (fields
        (field (name "Qty Per Unit") 1)
        (field (name "Subs OK?") y))
-      (libsource (lib GLCD-controler-SchDoc-rescue) (part SW-PB) (description ""))
+      (libsource (lib Switch) (part SW_Push) (description "Push button switch, generic, two pins"))
      (sheetpath (names /) (tstamps /))
      (tstamp 5B7596A7))
    (comp (ref EN1)
@@ -353,13 +354,14 @@
        (pin (num 17) (name Rst) (type passive))
        (pin (num 19) (name A+) (type passive))
        (pin (num 20) (name K-) (type passive))))
-    (libpart (lib GLCD-controler-SchDoc-rescue) (part SW-PB)
+    (libpart (lib Switch) (part SW_Push)
+      (description "Push button switch, generic, two pins")
      (fields
-        (field (name Reference) PB)
-        (field (name Value) SW-PB))
+        (field (name Reference) SW)
+        (field (name Value) SW_Push))
      (pins
-        (pin (num 1) (name P) (type passive))
-        (pin (num 2) (name P) (type passive))))
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))))
    (libpart (lib mic5209) (part MIC5209)
      (fields
        (field (name Reference) U)
@@ -382,24 +384,30 @@
      (uri /usr/share/kicad/symbols/Device.lib))
    (library (logical GLCD-controler-SchDoc-rescue)
      (uri /home/salfter/reprapdiscount-full-graphic-lcd-controller/libs/conversion.lib))
+    (library (logical Switch)
+      (uri /usr/share/kicad/symbols/Switch.lib))
    (library (logical mic5209)
      (uri /home/salfter/reprapdiscount-full-graphic-lcd-controller/libs/mic5209.lib)))
  (nets
-    (net (code 1) (name "Net-(SD1-Pad5)")
-      (node (ref SD1) (pin 5))
-      (node (ref U1) (pin 10)))
-    (net (code 2) (name "Net-(SD1-Pad8)")
+    (net (code 1) (name "Net-(SD1-Pad8)")
      (node (ref SD1) (pin 8)))
-    (net (code 3) (name "Net-(SD1-Pad9)")
+    (net (code 2) (name "Net-(SD1-Pad9)")
      (node (ref SD1) (pin 9)))
-    (net (code 4) (name SD_DET)
-      (node (ref EXP2) (pin 7))
-      (node (ref SD1) (pin WRITE)))
-    (net (code 5) (name "Net-(SD1-PadCARD)")
+    (net (code 3) (name SD_DET)
+      (node (ref SD1) (pin WRITE))
+      (node (ref EXP2) (pin 7)))
+    (net (code 4) (name "Net-(SD1-PadCARD)")
      (node (ref SD1) (pin CARD)))
+    (net (code 5) (name 3V3)
+      (node (ref C3) (pin 2))
+      (node (ref C4) (pin 2))
+      (node (ref U2) (pin 3))
+      (node (ref C2) (pin 2))
+      (node (ref U1) (pin 1))
+      (node (ref SD1) (pin 4)))
    (net (code 6) (name "Net-(GLCD1-Pad19)")
-      (node (ref RBL1) (pin 2))
-      (node (ref GLCD1) (pin 19)))
+      (node (ref GLCD1) (pin 19))
+      (node (ref RBL1) (pin 2)))
    (net (code 7) (name "Net-(PZ1-PadN)")
      (node (ref PZ1) (pin N))
      (node (ref Q1) (pin 3)))
@@ -409,76 +417,72 @@
      (node (ref U1) (pin 4)))
    (net (code 10) (name "Net-(U1-Pad6)")
      (node (ref U1) (pin 6)))
-    (net (code 11) (name GND)
-      (node (ref U2) (pin 2))
-      (node (ref C2) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref EXP2) (pin 9))
-      (node (ref C3) (pin 1))
-      (node (ref EXP1) (pin 9))
-      (node (ref GLCD1) (pin 1))
-      (node (ref U2) (pin 4))
-      (node (ref PB1) (pin 2))
-      (node (ref GLCD1) (pin 20))
-      (node (ref EN1) (pin 4))
-      (node (ref GLCD1) (pin 15))
-      (node (ref EN1) (pin 2))
-      (node (ref SD1) (pin 6))
-      (node (ref SD1) (pin G1))
-      (node (ref SD1) (pin G2))
-      (node (ref SD1) (pin G4))
-      (node (ref SD1) (pin G3))
-      (node (ref Q1) (pin 2))
-      (node (ref U1) (pin 8))
-      (node (ref C4) (pin 1))
-      (node (ref SD1) (pin 3))
-      (node (ref U1) (pin 7))
-      (node (ref U1) (pin 5))
-      (node (ref U1) (pin 3)))
-    (net (code 12) (name "PB3_(MISO)")
-      (node (ref SD1) (pin 7))
-      (node (ref EXP2) (pin 1)))
-    (net (code 13) (name "Net-(SD1-Pad2)")
-      (node (ref U1) (pin 12))
-      (node (ref SD1) (pin 2)))
-    (net (code 14) (name "Net-(SD1-Pad1)")
+    (net (code 11) (name "Net-(SD1-Pad5)")
+      (node (ref U1) (pin 10))
+      (node (ref SD1) (pin 5)))
+    (net (code 12) (name VCC)
+      (node (ref U2) (pin 1))
+      (node (ref EXP1) (pin 10))
+      (node (ref C1) (pin 2))
+      (node (ref RBL1) (pin 1))
+      (node (ref GLCD1) (pin 2))
+      (node (ref GLCD1) (pin 17))
+      (node (ref PZ1) (pin P)))
+    (net (code 13) (name "PB3_(MISO)")
+      (node (ref EXP2) (pin 1))
+      (node (ref SD1) (pin 7)))
+    (net (code 14) (name "Net-(SD1-Pad2)")
+      (node (ref SD1) (pin 2))
+      (node (ref U1) (pin 12)))
+    (net (code 15) (name "Net-(SD1-Pad1)")
      (node (ref SD1) (pin 1))
      (node (ref U1) (pin 15)))
-    (net (code 15) (name VCC)
-      (node (ref RBL1) (pin 1))
-      (node (ref EXP1) (pin 10))
-      (node (ref U2) (pin 1))
-      (node (ref C1) (pin 2))
-      (node (ref PZ1) (pin P))
-      (node (ref GLCD1) (pin 2))
-      (node (ref GLCD1) (pin 17)))
-    (net (code 16) (name KILL)
+    (net (code 16) (name GND)
+      (node (ref GLCD1) (pin 1))
+      (node (ref U2) (pin 4))
+      (node (ref Q1) (pin 2))
+      (node (ref GLCD1) (pin 20))
+      (node (ref GLCD1) (pin 15))
+      (node (ref SD1) (pin 3))
+      (node (ref C2) (pin 1))
+      (node (ref U2) (pin 2))
+      (node (ref EXP1) (pin 9))
+      (node (ref SD1) (pin G1))
+      (node (ref SD1) (pin G2))
+      (node (ref SD1) (pin G3))
+      (node (ref SD1) (pin G4))
+      (node (ref C4) (pin 1))
+      (node (ref SD1) (pin 6))
+      (node (ref U1) (pin 3))
+      (node (ref U1) (pin 5))
+      (node (ref U1) (pin 7))
+      (node (ref C3) (pin 1))
+      (node (ref U1) (pin 8))
+      (node (ref EN1) (pin 4))
+      (node (ref EN1) (pin 2))
+      (node (ref PB1) (pin 2))
+      (node (ref C1) (pin 1))
+      (node (ref EXP2) (pin 9)))
+    (net (code 17) (name KILL)
      (node (ref EXP2) (pin 10)))
-    (net (code 17) (name "PB1_(SCK)")
-      (node (ref U1) (pin 9))
-      (node (ref EXP2) (pin 2)))
-    (net (code 18) (name BTN_EN2)
+    (net (code 18) (name "PB1_(SCK)")
+      (node (ref EXP2) (pin 2))
+      (node (ref U1) (pin 9)))
+    (net (code 19) (name BTN_EN2)
      (node (ref EN1) (pin 3))
      (node (ref EXP2) (pin 3)))
-    (net (code 19) (name SD_CSEL)
-      (node (ref EXP2) (pin 4))
-      (node (ref U1) (pin 14)))
-    (net (code 20) (name BTN_EN1)
+    (net (code 20) (name SD_CSEL)
+      (node (ref U1) (pin 14))
+      (node (ref EXP2) (pin 4)))
+    (net (code 21) (name BTN_EN1)
      (node (ref EN1) (pin 1))
      (node (ref EXP2) (pin 5)))
-    (net (code 21) (name "PB2_(MOSI)")
+    (net (code 22) (name "PB2_(MOSI)")
      (node (ref EXP2) (pin 6))
      (node (ref U1) (pin 11)))
-    (net (code 22) (name RESET)
-      (node (ref EXP2) (pin 8))
-      (node (ref PB1) (pin 1)))
-    (net (code 23) (name 3V3)
-      (node (ref U1) (pin 1))
-      (node (ref C4) (pin 2))
-      (node (ref C3) (pin 2))
-      (node (ref C2) (pin 2))
-      (node (ref SD1) (pin 4))
-      (node (ref U2) (pin 3)))
+    (net (code 23) (name RESET)
+      (node (ref PB1) (pin 1))
+      (node (ref EXP2) (pin 8)))
    (net (code 24) (name "Net-(GLCD1-Pad13)")
      (node (ref GLCD1) (pin 13)))
    (net (code 25) (name "Net-(GLCD1-Pad11)")
@@ -493,33 +497,33 @@
      (node (ref GLCD1) (pin 9)))
    (net (code 30) (name "Net-(GLCD1-Pad10)")
      (node (ref GLCD1) (pin 10)))
-    (net (code 31) (name "Net-(GLCD1-Pad8)")
-      (node (ref GLCD1) (pin 8)))
-    (net (code 32) (name LCDE)
-      (node (ref EXP1) (pin 3))
-      (node (ref GLCD1) (pin 5)))
-    (net (code 33) (name "Net-(EN1-Pad7)")
-      (node (ref EN1) (pin 7)))
-    (net (code 34) (name "Net-(Q1-Pad1)")
-      (node (ref R1) (pin 2))
-      (node (ref Q1) (pin 1)))
-    (net (code 35) (name Beeper)
+    (net (code 31) (name Beeper)
      (node (ref EXP1) (pin 1))
      (node (ref R1) (pin 1)))
-    (net (code 36) (name BTN_ENC)
-      (node (ref EXP1) (pin 2))
-      (node (ref EN1) (pin 5)))
-    (net (code 37) (name LCDRS)
+    (net (code 32) (name "Net-(GLCD1-Pad8)")
+      (node (ref GLCD1) (pin 8)))
+    (net (code 33) (name "Net-(Q1-Pad1)")
+      (node (ref R1) (pin 2))
+      (node (ref Q1) (pin 1)))
+    (net (code 34) (name BTN_ENC)
+      (node (ref EN1) (pin 5))
+      (node (ref EXP1) (pin 2)))
+    (net (code 35) (name LCDE)
+      (node (ref EXP1) (pin 3))
+      (node (ref GLCD1) (pin 5)))
+    (net (code 36) (name LCDRS)
      (node (ref EXP1) (pin 4))
      (node (ref GLCD1) (pin 4)))
-    (net (code 38) (name LCD4)
+    (net (code 37) (name LCD4)
      (node (ref EXP1) (pin 5))
      (node (ref GLCD1) (pin 6)))
-    (net (code 39) (name LCD5)
+    (net (code 38) (name LCD5)
      (node (ref EXP1) (pin 6)))
-    (net (code 40) (name LCD6)
+    (net (code 39) (name LCD6)
      (node (ref EXP1) (pin 7)))
-    (net (code 41) (name LCD7)
+    (net (code 40) (name LCD7)
      (node (ref EXP1) (pin 8)))
-    (net (code 42) (name "Net-(EN1-Pad6)")
-      (node (ref EN1) (pin 6)))))
+    (net (code 41) (name "Net-(EN1-Pad6)")
+      (node (ref EN1) (pin 6)))
+    (net (code 42) (name "Net-(EN1-Pad7)")
+      (node (ref EN1) (pin 7)))))
--- a/controller.sch
+++ b/controller.sch
@@ -325,16 +325,16 @@ F 6 "y" H 300 -2500 50  0001 C CNN "Subs OK?"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GLCD-controler-SchDoc-rescue:SW-PB PB1
+L Switch:SW_Push PB1
 U 1 1 5B7596A7
-P 4850 5000
-F 0 "PB1" V 4950 5100 60  0000 L BNN
-F 1 "STOP" V 5050 5100 60  0000 L BNN
-F 2 "" H 5050 5100 60  0000 C CNN
-F 3 "" H 5050 5100 60  0000 C CNN
-F 4 "1" H -850 -700 50  0001 C CNN "Qty Per Unit"
-F 5 "y" H -850 -700 50  0001 C CNN "Subs OK?"
-	1    4850 5000
+P 4750 5150
+F 0 "PB1" V 4850 5250 60  0000 L BNN
+F 1 "STOP" V 4950 5250 60  0000 L BNN
+F 2 "Button_Switch_THT:SW_PUSH_6mm" H 4950 5250 60  0001 C CNN
+F 3 "" H 4950 5250 60  0000 C CNN
+F 4 "1" H -950 -550 50  0001 C CNN "Qty Per Unit"
+F 5 "y" H -950 -550 50  0001 C CNN "Subs OK?"
+	1    4750 5150
 	0    1    1    0   
 $EndComp
 $Comp
@@ -797,4 +797,8 @@ Connection ~ 1700 2600
 Wire Wire Line
 	1700 2700 1700 2800
 Connection ~ 1700 2700
+Wire Wire Line
+	4750 4900 4750 4950
+Wire Wire Line
+	4750 5350 4750 5400
 $EndSCHEMATC
--- a/models/CUI_CPE-164.stp
+++ b/models/CUI_CPE-164.stp
--- a/models/CUI_CPE-164.wrl
+++ b/models/CUI_CPE-164.wrl