Skip to content

Commit

Permalink
Merge pull request greatscottgadgets#97 from mossmann/r0.4
Browse files Browse the repository at this point in the history
LUNA hardware r0.4
  • Loading branch information
ktemkin authored Mar 16, 2021
2 parents 30fd520 + 449ba7e commit 0a03935
Show file tree
Hide file tree
Showing 15 changed files with 7,378 additions and 5,610 deletions.
8 changes: 4 additions & 4 deletions hardware/libraries/fpgas_and_processors.lib
Original file line number Diff line number Diff line change
Expand Up @@ -270,20 +270,20 @@ X D3/PB9A N7 1050 -850 200 L 50 50 8 1 B
X HOLDN/DI/PB15A N8 1050 -1450 200 L 50 50 8 1 B
X MCLK/SCLK/CCLK N9 1050 -2500 200 L 50 50 8 1 B
X CFG_1 P10 1050 -2800 200 L 50 50 8 1 I
X D4/MOSI2/PB6B P7 1050 -750 200 L 50 50 8 1 B
X D4/COPI2/PB6B P7 1050 -750 200 L 50 50 8 1 B
X CS1N/PB13B P8 1050 -1350 200 L 50 50 8 1 B
X DONE P9 1050 -3150 200 L 50 50 8 1 B
X CFG_2 R10 1050 -2900 200 L 50 50 8 1 I
X TDI R11 1050 -2150 200 L 50 50 8 1 I
X D6/PB4B R6 1050 -550 200 L 50 50 8 1 B
X D5/MISO2/PB6A R7 1050 -650 200 L 50 50 8 1 B
X D5/CIPO2/PB6A R7 1050 -650 200 L 50 50 8 1 B
X SN/CSN/PB13A R8 1050 -1250 200 L 50 50 8 1 B
X PROGRAMN R9 1050 -3350 200 L 50 50 8 1 B
X TCK T10 1050 -2050 200 L 50 50 8 1 I
X TMS T11 1050 -1950 200 L 50 50 8 1 I
X D7/PB4A T6 1050 -450 200 L 50 50 8 1 B
X D1/MOSI/PB11A T7 1050 -1050 200 L 50 50 8 1 B
X D0/MOSI/PB11B T8 1050 -1150 200 L 50 50 8 1 B
X D1/COPI/PB11A T7 1050 -1050 200 L 50 50 8 1 B
X D0/COPI/PB11B T8 1050 -1150 200 L 50 50 8 1 B
X INITN T9 1050 -3250 200 L 50 50 8 1 B
ENDDRAW
ENDDEF
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
(module X2-DFN1210-8_1.2x1mm_P0.3mm (layer F.Cu) (tedit 6034086F)
(descr "X2-DFN1210-8_1.2x1mm_P0.3mm Pitch0.3mm https://www.diodes.com/assets/Package-Files/X2-DFN1210-8.pdf")
(tags "X2-DFN1210-8 1.2x1mm Pitch0.3mm")
(attr smd)
(fp_text reference REF** (at 0 -1.5) (layer F.SilkS)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_text value X2-DFN1210-8_1.2x1mm_P0.3mm (at 0 1.5) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -0.2 -0.6) (end -0.5 -0.3) (layer F.Fab) (width 0.1))
(fp_line (start 0.5 0.6) (end -0.5 0.6) (layer F.Fab) (width 0.1))
(fp_line (start 0.5 -0.6) (end -0.2 -0.6) (layer F.Fab) (width 0.1))
(fp_line (start -0.95 -0.75) (end 0.95 -0.75) (layer F.CrtYd) (width 0.05))
(fp_line (start -0.95 0.75) (end -0.95 -0.75) (layer F.CrtYd) (width 0.05))
(fp_line (start 0.95 0.75) (end -0.95 0.75) (layer F.CrtYd) (width 0.05))
(fp_line (start 0.95 -0.75) (end 0.95 0.75) (layer F.CrtYd) (width 0.05))
(fp_line (start 0.5 0.675) (end -0.5 0.675) (layer F.SilkS) (width 0.12))
(fp_line (start 0.5 -0.675) (end -0.7 -0.675) (layer F.SilkS) (width 0.12))
(fp_line (start -0.5 0.6) (end -0.5 -0.3) (layer F.Fab) (width 0.1))
(fp_line (start 0.5 -0.6) (end 0.5 0.6) (layer F.Fab) (width 0.1))
(fp_text user %R (at 0 0 90) (layer F.Fab)
(effects (font (size 0.3 0.3) (thickness 0.05)))
)
(pad 1 smd rect (at -0.4375 -0.45 270) (size 0.15 0.725) (layers F.Cu F.Paste F.Mask))
(pad 2 smd rect (at -0.4375 -0.15 270) (size 0.15 0.725) (layers F.Cu F.Paste F.Mask))
(pad 3 smd rect (at -0.4375 0.15 270) (size 0.15 0.725) (layers F.Cu F.Paste F.Mask))
(pad 4 smd rect (at -0.4375 0.45 270) (size 0.15 0.725) (layers F.Cu F.Paste F.Mask))
(pad 5 smd rect (at 0.4375 0.45 270) (size 0.15 0.725) (layers F.Cu F.Paste F.Mask))
(pad 6 smd rect (at 0.4375 0.15 270) (size 0.15 0.725) (layers F.Cu F.Paste F.Mask))
(pad 7 smd rect (at 0.4375 -0.15 270) (size 0.15 0.725) (layers F.Cu F.Paste F.Mask))
(pad 8 smd rect (at 0.4375 -0.45 270) (size 0.15 0.725) (layers F.Cu F.Paste F.Mask))
(model ${KISYS3DMOD}/Package_SON.3dshapes/X2SON-8_1.4x1mm_P0.35mm.wrl
(at (xyz 0 0 0))
(scale (xyz 1 0.857 1))
(rotate (xyz 0 0 0))
)
)
20 changes: 20 additions & 0 deletions hardware/libraries/support_hardware.lib
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
EESchema-LIBRARY Version 2.4
#encoding utf-8
#
# 74AUP2G126
#
DEF 74AUP2G126 U 0 40 Y Y 2 L N
F0 "U" -100 150 50 H V C CNN
F1 "74AUP2G126" 0 -150 50 H V C CNN
F2 "" 0 0 50 H I C CNN
F3 "" 0 0 50 H I C CNN
DRAW
P 4 0 1 10 -150 100 -150 -100 100 0 -150 100 N
X ~ 1 0 150 105 D 50 50 1 1 I
X ~ 2 -250 0 100 R 50 50 1 1 I
X ~ 4 100 -50 0 D 50 50 1 1 W
X ~ 6 200 0 100 L 50 50 1 1 T
X ~ 8 100 50 0 D 50 50 1 1 W
X ~ 3 200 0 100 L 50 50 2 1 T
X ~ 5 -250 0 100 R 50 50 2 1 I
X ~ 7 0 150 105 D 50 50 2 1 I
ENDDRAW
ENDDEF
#
# AP2152
#
DEF AP2152 U 0 40 Y Y 1 F N
Expand Down
2 changes: 1 addition & 1 deletion hardware/rev0/clock_pmod.sch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $Descr A4 11693 8268
encoding utf-8
Sheet 8 9
Title "LUNA: Clock and PMOD"
Date "2021-01-12"
Date "2021-03-10"
Rev "r0"
Comp "Copyright 2019-2021 Great Scott Gadgets"
Comment1 "Katherine J. Temkin"
Expand Down
61 changes: 49 additions & 12 deletions hardware/rev0/fpga_configuration.sch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $Descr A4 11693 8268
encoding utf-8
Sheet 4 9
Title "LUNA: Configuration / Dev / Debug Section"
Date "2021-01-12"
Date "2021-03-10"
Rev "r0"
Comp "Copyright 2019-2021 Great Scott Gadgets"
Comment1 "Katherine J. Temkin"
Expand Down Expand Up @@ -924,7 +924,6 @@ F 6 "FTSH-105-01-F-D-K" H 5350 6700 50 0001 C CNN "Part Number"
1 5350 6700
-1 0 0 -1
$EndComp
NoConn ~ 2550 4750
$Comp
L power:GND #PWR0131
U 1 1 60198439
Expand Down Expand Up @@ -970,6 +969,7 @@ F 3 "~" H 2450 5050 50 0001 C CNN
F 4 "Tag-Connect" H 2450 5050 50 0001 C CNN "Manufacturer"
F 5 "DNP" H 2450 5050 50 0001 C CNN "Note"
F 6 "TC2030-IDC" H 2450 5050 50 0001 C CNN "Part Number"
F 7 "TC2030-CTX" H 2450 5050 50 0001 C CNN "Substitution"
1 2450 5050
0 -1 -1 0
$EndComp
Expand Down Expand Up @@ -1251,10 +1251,10 @@ P 4600 3450
AR Path="/5DCD9772/5FFED8BB" Ref="R?" Part="1"
AR Path="/5DCAA6D2/5FFED8BB" Ref="R8" Part="1"
F 0 "R8" V 4550 3250 50 0000 C CNN
F 1 "1K" V 4600 3450 50 0000 C CNN
F 1 "2.2K" V 4600 3450 50 0000 C CNN
F 2 "Resistor_SMD:R_0402_1005Metric" V 4530 3450 50 0001 C CNN
F 3 "~" H 4600 3450 50 0001 C CNN
F 4 "GENERIC-RES-0402-1K" H 4600 3450 50 0001 C CNN "Part Number"
F 4 "GENERIC-RES-0402-2.2K" H 4600 3450 50 0001 C CNN "Part Number"
F 5 "any equivalent" H 4600 3450 50 0001 C CNN "Substitution"
1 4600 3450
0 1 1 0
Expand All @@ -1266,10 +1266,10 @@ P 4600 3550
AR Path="/5DCD9772/60003542" Ref="R?" Part="1"
AR Path="/5DCAA6D2/60003542" Ref="R9" Part="1"
F 0 "R9" V 4550 3350 50 0000 C CNN
F 1 "1K" V 4600 3550 50 0000 C CNN
F 1 "2.2K" V 4600 3550 50 0000 C CNN
F 2 "Resistor_SMD:R_0402_1005Metric" V 4530 3550 50 0001 C CNN
F 3 "~" H 4600 3550 50 0001 C CNN
F 4 "GENERIC-RES-0402-1K" H 4600 3550 50 0001 C CNN "Part Number"
F 4 "GENERIC-RES-0402-2.2K" H 4600 3550 50 0001 C CNN "Part Number"
F 5 "any equivalent" H 4600 3550 50 0001 C CNN "Substitution"
1 4600 3550
0 1 1 0
Expand All @@ -1281,10 +1281,10 @@ P 4600 3650
AR Path="/5DCD9772/60003831" Ref="R?" Part="1"
AR Path="/5DCAA6D2/60003831" Ref="R10" Part="1"
F 0 "R10" V 4550 3450 50 0000 C CNN
F 1 "1K" V 4600 3650 50 0000 C CNN
F 1 "2.2K" V 4600 3650 50 0000 C CNN
F 2 "Resistor_SMD:R_0402_1005Metric" V 4530 3650 50 0001 C CNN
F 3 "~" H 4600 3650 50 0001 C CNN
F 4 "GENERIC-RES-0402-1K" H 4600 3650 50 0001 C CNN "Part Number"
F 4 "GENERIC-RES-0402-2.2K" H 4600 3650 50 0001 C CNN "Part Number"
F 5 "any equivalent" H 4600 3650 50 0001 C CNN "Substitution"
1 4600 3650
0 1 1 0
Expand All @@ -1297,11 +1297,13 @@ AR Path="/6001DCF6" Ref="R?" Part="1"
AR Path="/5DA7BAF4/6001DCF6" Ref="R?" Part="1"
AR Path="/5DCAA6D2/6001DCF6" Ref="R7" Part="1"
F 0 "R7" V 4650 3150 50 0000 C CNN
F 1 "2.2K" V 4600 3350 50 0000 C CNN
F 1 "5.5K" V 4600 3350 50 0000 C CNN
F 2 "Resistor_SMD:R_0402_1005Metric" V 4530 3350 50 0001 C CNN
F 3 "~" H 4600 3350 50 0001 C CNN
F 4 "GENERIC-RES-0402-2.2K" H 4600 3350 50 0001 C CNN "Part Number"
F 4 "ERJ-2RKF5491X" H 4600 3350 50 0001 C CNN "Part Number"
F 5 "any equivalent" H 4600 3350 50 0001 C CNN "Substitution"
F 6 "RES SMD 5.49K OHM 1% 1/10W 0402" H 4600 3350 50 0001 C CNN "Description"
F 7 "Panasonic" H 4600 3350 50 0001 C CNN "Manufacturer"
1 4600 3350
0 1 -1 0
$EndComp
Expand All @@ -1313,12 +1315,47 @@ AR Path="/6002A83C" Ref="R?" Part="1"
AR Path="/5DA7BAF4/6002A83C" Ref="R?" Part="1"
AR Path="/5DCAA6D2/6002A83C" Ref="R11" Part="1"
F 0 "R11" V 4650 3750 50 0000 C CNN
F 1 "2.2K" V 4600 3950 50 0000 C CNN
F 1 "5.5K" V 4600 3950 50 0000 C CNN
F 2 "Resistor_SMD:R_0402_1005Metric" V 4530 3950 50 0001 C CNN
F 3 "~" H 4600 3950 50 0001 C CNN
F 4 "GENERIC-RES-0402-2.2K" H 4600 3950 50 0001 C CNN "Part Number"
F 4 "ERJ-2RKF5491X" H 4600 3950 50 0001 C CNN "Part Number"
F 5 "any equivalent" H 4600 3950 50 0001 C CNN "Substitution"
F 6 "RES SMD 5.49K OHM 1% 1/10W 0402" H 4600 3950 50 0001 C CNN "Description"
F 7 "Panasonic" H 4600 3950 50 0001 C CNN "Manufacturer"
1 4600 3950
0 1 -1 0
$EndComp
$Comp
L power:+5V #PWR?
U 1 1 604E0BAD
P 2550 4250
AR Path="/604E0BAD" Ref="#PWR?" Part="1"
AR Path="/5DCAA6D2/604E0BAD" Ref="#PWR0136" Part="1"
F 0 "#PWR0136" H 2550 4100 50 0001 C CNN
F 1 "+5V" V 2450 4200 50 0000 L CNN
F 2 "" H 2550 4250 50 0001 C CNN
F 3 "" H 2550 4250 50 0001 C CNN
1 2550 4250
1 0 0 -1
$EndComp
$Comp
L Device:D_Schottky D?
U 1 1 604E0BB6
P 2550 4500
AR Path="/604E0BB6" Ref="D?" Part="1"
AR Path="/5DCAA6D2/604E0BB6" Ref="D9" Part="1"
F 0 "D9" H 2550 4600 50 0000 C CNN
F 1 "PMEG4010ESBYL" H 2450 4650 50 0001 C CNN
F 2 "Diode_SMD:D_0402_1005Metric" H 2550 4500 50 0001 C CNN
F 3 "~" H 2550 4500 50 0001 C CNN
F 4 "Nexperia" H 2550 4500 50 0001 C CNN "Manufacturer"
F 5 "PMEG4010ESBYL" H 2550 4500 50 0001 C CNN "Part Number"
F 6 "DIODE SCHOTTKY 40V 1A DSN1006-2" H 2550 4500 50 0001 C CNN "Description"
1 2550 4500
0 1 1 0
$EndComp
Wire Wire Line
2550 4250 2550 4350
Wire Wire Line
2550 4750 2550 4650
$EndSCHEMATC
Loading

0 comments on commit 0a03935

Please sign in to comment.