diff --git a/corne-cherry/pcb/corne-cherry-cache.lib b/corne-cherry/pcb/corne-cherry-cache.lib index b7c7ecfe97..3bfd8e57c2 100644 --- a/corne-cherry/pcb/corne-cherry-cache.lib +++ b/corne-cherry/pcb/corne-cherry-cache.lib @@ -1,15 +1,15 @@ EESchema-LIBRARY Version 2.4 #encoding utf-8 # -# Connector_Generic:Conn_01x01 +# Connector_Generic_Conn_01x01 # -DEF Connector_Generic:Conn_01x01 J 0 40 Y N 1 F N +DEF Connector_Generic_Conn_01x01 J 0 40 Y N 1 F N F0 "J" 0 100 50 H V C CNN -F1 "Connector_Generic:Conn_01x01" 0 -100 50 H V C CNN +F1 "Connector_Generic_Conn_01x01" 0 -100 50 H V C CNN F2 "" 0 0 50 H I C CNN F3 "" 0 0 50 H I C CNN $FPLIST - Connector*:* + Connector*:*_1x??_* $ENDFPLIST DRAW S -50 5 0 -5 1 1 6 N @@ -18,11 +18,11 @@ X Pin_1 1 -200 0 150 R 50 50 1 1 P ENDDRAW ENDDEF # -# Connector_Generic:Conn_01x03 +# Connector_Generic_Conn_01x03 # -DEF Connector_Generic:Conn_01x03 J 0 40 Y N 1 F N +DEF Connector_Generic_Conn_01x03 J 0 40 Y N 1 F N F0 "J" 0 200 50 H V C CNN -F1 "Connector_Generic:Conn_01x03" 0 -200 50 H V C CNN +F1 "Connector_Generic_Conn_01x03" 0 -200 50 H V C CNN F2 "" 0 0 50 H I C CNN F3 "" 0 0 50 H I C CNN $FPLIST @@ -39,11 +39,11 @@ X Pin_3 3 -200 -100 150 R 50 50 1 1 P 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 @@ -62,11 +62,11 @@ X Pin_4 4 -200 -200 150 R 50 50 1 1 P ENDDRAW ENDDEF # -# Device:D +# Device_D # -DEF Device:D D 0 40 N N 1 F N +DEF Device_D D 0 40 N N 1 F N F0 "D" 0 100 50 H V C CNN -F1 "Device:D" 0 -100 50 H V C CNN +F1 "Device_D" 0 -100 50 H V C CNN F2 "" 0 0 50 H I C CNN F3 "" 0 0 50 H I C CNN $FPLIST @@ -84,13 +84,16 @@ X A 2 150 0 100 L 50 50 1 1 P ENDDRAW ENDDEF # -# Device:Jumper +# Device_Jumper # -DEF Device:Jumper JP 0 30 Y N 1 F N +DEF Device_Jumper JP 0 30 Y N 1 F N F0 "JP" 0 150 50 H V C CNN -F1 "Device:Jumper" 0 -80 50 H V C CNN +F1 "Device_Jumper" 0 -80 50 H V C CNN F2 "" 0 0 50 H I C CNN F3 "" 0 0 50 H I C CNN +$FPLIST + SolderJumper* +$ENDFPLIST DRAW A 0 -26 125 1426 373 0 1 0 N -98 50 99 50 C -100 0 35 0 1 0 N @@ -100,13 +103,16 @@ X 2 2 300 0 165 L 50 50 0 1 P ENDDRAW ENDDEF # -# Device:Jumper_NO_Small +# Device_Jumper_NO_Small # -DEF Device:Jumper_NO_Small JP 0 30 N N 1 F N +DEF Device_Jumper_NO_Small JP 0 30 N N 1 F N F0 "JP" 0 80 50 H V C CNN -F1 "Device:Jumper_NO_Small" 10 -60 50 H V C CNN +F1 "Device_Jumper_NO_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*Open* +$ENDFPLIST DRAW C -40 0 20 0 1 0 N C 40 0 20 0 1 0 N @@ -115,11 +121,11 @@ X 2 2 100 0 40 L 50 50 0 1 P ENDDRAW ENDDEF # -# Device:R +# Device_R # -DEF Device:R R 0 0 N Y 1 F N +DEF Device_R R 0 0 N Y 1 F N F0 "R" 80 0 50 V V C CNN -F1 "Device:R" 0 0 50 V V C CNN +F1 "Device_R" 0 0 50 V V C CNN F2 "" -70 0 50 V I C CNN F3 "" 0 0 50 H I C CNN $FPLIST @@ -132,32 +138,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P ENDDRAW ENDDEF # -# kbd:MJ-4PP-9 +# corne-cherry-rescue_ProMicro-kbd # -DEF kbd:MJ-4PP-9 J 0 40 Y Y 1 F N -F0 "J" 0 150 50 H V C CNN -F1 "kbd:MJ-4PP-9" 0 -150 50 H V C CNN -F2 "" 275 175 50 H I C CNN -F3 "" 275 175 50 H I C CNN -DRAW -S -75 -75 -125 50 0 1 0 N -S 125 100 -150 -100 0 1 12 N -P 3 0 1 0 -100 50 -100 75 125 75 N -P 4 0 1 0 -50 -75 -25 -50 0 -75 125 -75 N -P 4 0 1 0 0 -25 25 0 50 -25 125 -25 N -P 4 0 1 0 50 25 75 50 100 25 125 25 N -X ~ A 200 75 79 L 28 20 1 1 I -X ~ B 200 -75 79 L 28 20 1 1 I -X ~ C 200 -25 79 L 28 20 1 1 I -X ~ D 200 25 79 L 28 20 1 1 I -ENDDRAW -ENDDEF -# -# kbd:ProMicro -# -DEF kbd:ProMicro U 0 40 Y Y 1 F N +DEF corne-cherry-rescue_ProMicro-kbd U 0 40 Y Y 1 F N F0 "U" 0 950 60 H V C CNN -F1 "kbd:ProMicro" 0 -550 60 H V C CNN +F1 "corne-cherry-rescue_ProMicro-kbd" 0 -550 60 H V C CNN F2 "" 100 -1050 60 H V C CNN F3 "" 100 -1050 60 H V C CNN DRAW @@ -189,11 +174,32 @@ X D7 9 -700 -50 200 R 50 50 1 1 B ENDDRAW ENDDEF # -# kbd:SK6812MINI +# kbd_MJ-4PP-9 +# +DEF kbd_MJ-4PP-9 J 0 40 Y Y 1 F N +F0 "J" 0 150 50 H V C CNN +F1 "kbd_MJ-4PP-9" 0 -150 50 H V C CNN +F2 "" 275 175 50 H I C CNN +F3 "" 275 175 50 H I C CNN +DRAW +S -75 -75 -125 50 0 1 0 N +S 125 100 -150 -100 0 1 12 N +P 3 0 1 0 -100 50 -100 75 125 75 N +P 4 0 1 0 -50 -75 -25 -50 0 -75 125 -75 N +P 4 0 1 0 0 -25 25 0 50 -25 125 -25 N +P 4 0 1 0 50 25 75 50 100 25 125 25 N +X ~ A 200 75 79 L 28 20 1 1 I +X ~ B 200 -75 79 L 28 20 1 1 I +X ~ C 200 -25 79 L 28 20 1 1 I +X ~ D 200 25 79 L 28 20 1 1 I +ENDDRAW +ENDDEF +# +# kbd_SK6812MINI # -DEF kbd:SK6812MINI L 0 40 Y Y 1 F N +DEF kbd_SK6812MINI L 0 40 Y Y 1 F N F0 "L" 0 0 51 H V C CNN -F1 "kbd:SK6812MINI" 0 -50 16 H V C CNN +F1 "kbd_SK6812MINI" 0 -50 16 H V C CNN F2 "" 0 0 60 H I C CNN F3 "" 0 0 60 H I C CNN DRAW @@ -205,11 +211,11 @@ X VDD 4 200 100 47 L 28 28 1 1 W ENDDRAW ENDDEF # -# kbd:SW_PUSH +# kbd_SW_PUSH # -DEF kbd:SW_PUSH SW 0 40 N N 1 F N +DEF kbd_SW_PUSH SW 0 40 N N 1 F N F0 "SW" 150 110 50 H V C CNN -F1 "kbd:SW_PUSH" 0 -80 50 H V C CNN +F1 "kbd_SW_PUSH" 0 -80 50 H V C CNN F2 "" 0 0 50 H V C CNN F3 "" 0 0 50 H V C CNN DRAW @@ -220,11 +226,11 @@ X 2 2 300 0 200 L 50 50 0 1 P I 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 @@ -233,11 +239,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 @@ -246,11 +252,11 @@ X pwr 1 0 0 0 U 50 50 0 0 w ENDDRAW ENDDEF # -# power:VCC +# power_VCC # -DEF power:VCC #PWR 0 0 Y Y 1 F P +DEF power_VCC #PWR 0 0 Y Y 1 F P F0 "#PWR" 0 -150 50 H I C CNN -F1 "power:VCC" 0 150 50 H V C CNN +F1 "power_VCC" 0 150 50 H V C CNN F2 "" 0 0 50 H I C CNN F3 "" 0 0 50 H I C CNN DRAW diff --git a/corne-cherry/pcb/corne-cherry-rescue.dcm b/corne-cherry/pcb/corne-cherry-rescue.dcm new file mode 100644 index 0000000000..5f3ed79b79 --- /dev/null +++ b/corne-cherry/pcb/corne-cherry-rescue.dcm @@ -0,0 +1,3 @@ +EESchema-DOCLIB Version 2.0 +# +#End Doc Library diff --git a/corne-cherry/pcb/corne-cherry-rescue.lib b/corne-cherry/pcb/corne-cherry-rescue.lib new file mode 100644 index 0000000000..64313f36ff --- /dev/null +++ b/corne-cherry/pcb/corne-cherry-rescue.lib @@ -0,0 +1,40 @@ +EESchema-LIBRARY Version 2.4 +#encoding utf-8 +# +# ProMicro-kbd +# +DEF ProMicro-kbd U 0 40 Y Y 1 F N +F0 "U" 0 950 60 H V C CNN +F1 "ProMicro-kbd" 0 -550 60 H V C CNN +F2 "" 100 -1050 60 H V C CNN +F3 "" 100 -1050 60 H V C CNN +DRAW +S -500 850 500 -450 0 1 0 N +X TX 1 -700 750 200 R 50 50 1 1 B +X E6 10 -700 -150 200 R 50 50 1 1 B +X B4 11 -700 -250 200 R 50 50 1 1 B +X B5 12 -700 -350 200 R 50 50 1 1 B +X B6 13 700 -350 200 L 50 50 1 1 B +X B2 14 700 -250 200 L 50 50 1 1 B +X B3 15 700 -150 200 L 50 50 1 1 B +X B1 16 700 -50 200 L 50 50 1 1 B +X F7 17 700 50 200 L 50 50 1 1 B +X F6 18 700 150 200 L 50 50 1 1 B +X F5 19 700 250 200 L 50 50 1 1 B +X RX 2 -700 650 200 R 50 50 1 1 B +X F4 20 700 350 200 L 50 50 1 1 B +X VCC 21 700 450 200 L 50 50 1 1 W +X RST 22 700 550 200 L 50 50 1 1 I +X GND 23 700 650 200 L 50 50 1 1 W +X RAW 24 700 750 200 L 50 50 1 1 w +X GND 3 -700 550 200 R 50 50 1 1 W +X GND 4 -700 450 200 R 50 50 1 1 W +X SDA 5 -700 350 200 R 50 50 1 1 B +X SCL 6 -700 250 200 R 50 50 1 1 B +X D4 7 -700 150 200 R 50 50 1 1 B +X C6 8 -700 50 200 R 50 50 1 1 B +X D7 9 -700 -50 200 R 50 50 1 1 B +ENDDRAW +ENDDEF +# +#End Library diff --git a/corne-cherry/pcb/corne-cherry.sch b/corne-cherry/pcb/corne-cherry.sch index e80adc35d9..51e3d62420 100644 --- a/corne-cherry/pcb/corne-cherry.sch +++ b/corne-cherry/pcb/corne-cherry.sch @@ -1,6 +1,5 @@ EESchema Schematic File Version 4 -LIBS:corne-cherry-cache -EELAYER 26 0 +EELAYER 30 0 EELAYER END $Descr A4 11693 8268 encoding utf-8 @@ -15,7 +14,7 @@ Comment3 "" Comment4 "" $EndDescr $Comp -L kbd:ProMicro U1 +L corne-cherry-rescue:ProMicro-kbd U1 U 1 1 5A5E14C2 P 1800 1950 F 0 "U1" H 1800 2900 60 0000 C CNN diff --git a/corne-cherry/pcb/sym-lib-table b/corne-cherry/pcb/sym-lib-table index 9c00ee7ec8..ab0a1cc834 100644 --- a/corne-cherry/pcb/sym-lib-table +++ b/corne-cherry/pcb/sym-lib-table @@ -1,2 +1,3 @@ (sym_lib_table + (lib (name corne-cherry-rescue)(type Legacy)(uri ${KIPRJMOD}/corne-cherry-rescue.lib)(options "")(descr "")) )