summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw1/hw1.net415
-rw-r--r--hw1/hw1.pdfbin158507 -> 161890 bytes
-rw-r--r--hw1/hw1.pro2
-rw-r--r--hw1/hw1.sch171
4 files changed, 376 insertions, 212 deletions
diff --git a/hw1/hw1.net b/hw1/hw1.net
index 85d7f92..ea7a9d0 100644
--- a/hw1/hw1.net
+++ b/hw1/hw1.net
@@ -1,7 +1,7 @@
(export (version D)
(design
(source /home/karlp/src/libopencm3-tests/hw1/hw1.sch)
- (date "Sun 17 Dec 2017 10:17:06 PM GMT")
+ (date "Wed 27 Dec 2017 04:13:06 PM GMT")
(tool "Eeschema 4.0.6")
(sheet (number 1) (name /) (tstamps /)
(title_block
@@ -117,9 +117,9 @@
(libsource (lib karlp-klibs) (part MIC550x-3.3YM5))
(sheetpath (names /) (tstamps /))
(tstamp 59F7B611))
- (comp (ref J1)
+ (comp (ref P11)
(value CONN_01X06)
- (footprint Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm)
+ (footprint Socket_Strips:Socket_Strip_Straight_1x06_Pitch2.54mm)
(libsource (lib conn) (part CONN_01X06))
(sheetpath (names /) (tstamps /))
(tstamp 59F7E088))
@@ -137,13 +137,13 @@
(tstamp 5A0F8EF5))
(comp (ref JP1)
(value Jumper_NC_Small)
- (footprint Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm)
+ (footprint Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm)
(libsource (lib device) (part Jumper_NC_Small))
(sheetpath (names /) (tstamps /))
(tstamp 5A0F91B9))
(comp (ref JP2)
(value Jumper_NC_Small)
- (footprint Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm)
+ (footprint Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm)
(libsource (lib device) (part Jumper_NC_Small))
(sheetpath (names /) (tstamps /))
(tstamp 5A0F9269))
@@ -185,22 +185,70 @@
(tstamp 5A137455))
(comp (ref JP3)
(value Jumper_NC_Small)
- (footprint Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm)
+ (footprint Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm)
(libsource (lib device) (part Jumper_NC_Small))
(sheetpath (names /) (tstamps /))
(tstamp 5A36E60E))
- (comp (ref J3)
+ (comp (ref J1)
(value CONN_01X02)
(footprint Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm)
(libsource (lib conn) (part CONN_01X02))
(sheetpath (names /) (tstamps /))
(tstamp 5A36EBE0))
(comp (ref J2)
- (value CONN_01X01_MALE)
- (footprint Wire_Pads:SolderWirePad_single_0-8mmDrill)
- (libsource (lib conn) (part CONN_01X01_MALE))
+ (value TEST_1P)
+ (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
+ (libsource (lib conn) (part TEST_1P))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A43D04F))
+ (comp (ref J3)
+ (value TEST_1P)
+ (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
+ (libsource (lib conn) (part TEST_1P))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A43D328))
+ (comp (ref J4)
+ (value TEST_1P)
+ (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
+ (libsource (lib conn) (part TEST_1P))
(sheetpath (names /) (tstamps /))
- (tstamp 5A36F13B)))
+ (tstamp 5A43D40B))
+ (comp (ref J5)
+ (value TEST_1P)
+ (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
+ (libsource (lib conn) (part TEST_1P))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A43D49D))
+ (comp (ref J7)
+ (value TEST_1P)
+ (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
+ (libsource (lib conn) (part TEST_1P))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A43EE7B))
+ (comp (ref J8)
+ (value TEST_1P)
+ (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
+ (libsource (lib conn) (part TEST_1P))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A43F060))
+ (comp (ref J9)
+ (value TEST_1P)
+ (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
+ (libsource (lib conn) (part TEST_1P))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A43F0E2))
+ (comp (ref J10)
+ (value TEST_1P)
+ (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
+ (libsource (lib conn) (part TEST_1P))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A43FB1F))
+ (comp (ref J11)
+ (value TEST_1P)
+ (footprint Measurement_Points:Measurement_Point_Round-TH_Small)
+ (libsource (lib conn) (part TEST_1P))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A43FBC5)))
(libparts
(libpart (lib device) (part C)
(description "Unpolarized capacitor")
@@ -224,13 +272,6 @@
(field (name Value) CONN_01X01))
(pins
(pin (num 1) (name P1) (type passive))))
- (libpart (lib conn) (part CONN_01X01_MALE)
- (description "Generic Male Connector, single row, 01x01, pin header")
- (fields
- (field (name Reference) J)
- (field (name Value) CONN_01X01_MALE))
- (pins
- (pin (num 1) (name 1) (type passive))))
(libpart (lib conn) (part CONN_01X02)
(description "Connector, single row, 01x02, pin header")
(footprints
@@ -428,6 +469,13 @@
(pin (num 46) (name PB9/DAC_EXTI9/I2C1_SDA/TIM11_CH1/TIM4_CH4) (type BiDi))
(pin (num 47) (name VSS) (type power_in))
(pin (num 48) (name VDD) (type power_in))))
+ (libpart (lib conn) (part TEST_1P)
+ (description point)
+ (fields
+ (field (name Reference) J)
+ (field (name Value) TEST_1P))
+ (pins
+ (pin (num 1) (name 1) (type passive))))
(libpart (lib hw1-rescue) (part USB_OTG-RESCUE-hw1)
(footprints
(fp USB*))
@@ -442,235 +490,242 @@
(pin (num 5) (name GND) (type power_in))
(pin (num 6) (name shield) (type passive)))))
(libraries
+ (library (logical hw1-rescue)
+ (uri /home/karlp/src/libopencm3-tests/hw1/hw1-rescue.lib))
(library (logical device)
(uri /usr/share/kicad/library/device.lib))
(library (logical conn)
(uri /usr/share/kicad/library/conn.lib))
- (library (logical hw1-rescue)
- (uri /home/karlp/src/libopencm3-tests/hw1/hw1-rescue.lib))
- (library (logical stm32)
- (uri /usr/share/kicad/library/stm32.lib))
(library (logical karlp-klibs)
- (uri /home/karlp/src/libopencm3-tests/hw1/karlp-klibs.lib)))
+ (uri /home/karlp/src/libopencm3-tests/hw1/karlp-klibs.lib))
+ (library (logical stm32)
+ (uri /usr/share/kicad/library/stm32.lib)))
(nets
- (net (code 1) (name /SPI_MOSI)
- (node (ref U1) (pin 28))
- (node (ref P3) (pin 4))
- (node (ref P9) (pin 5)))
+ (net (code 1) (name /ADC_IN1)
+ (node (ref P2) (pin 3))
+ (node (ref U1) (pin 16)))
(net (code 2) (name "Net-(U2-Pad4)")
(node (ref U2) (pin 4)))
(net (code 3) (name /ADC_IN2)
(node (ref U1) (pin 17)))
- (net (code 4) (name /ADC_IN1)
- (node (ref U1) (pin 16))
- (node (ref P2) (pin 3)))
+ (net (code 4) (name /SPI_MOSI)
+ (node (ref U1) (pin 28))
+ (node (ref P3) (pin 4))
+ (node (ref P9) (pin 5)))
(net (code 5) (name /SPI_MISO)
+ (node (ref U1) (pin 27))
(node (ref P9) (pin 6))
- (node (ref P3) (pin 5))
- (node (ref U1) (pin 27)))
+ (node (ref P3) (pin 5)))
(net (code 6) (name /SPI_SCK)
- (node (ref P9) (pin 7))
+ (node (ref U1) (pin 26))
(node (ref P3) (pin 6))
- (node (ref U1) (pin 26)))
+ (node (ref P9) (pin 7)))
(net (code 7) (name /SPI_CS)
+ (node (ref P9) (pin 8))
(node (ref P3) (pin 3))
- (node (ref U1) (pin 25))
- (node (ref P9) (pin 8)))
+ (node (ref U1) (pin 25)))
(net (code 8) (name /UART_RX_OUT)
(node (ref P4) (pin 2))
- (node (ref P9) (pin 4))
- (node (ref U1) (pin 13)))
+ (node (ref U1) (pin 13))
+ (node (ref P9) (pin 4)))
(net (code 9) (name /UART_TX_OUT)
(node (ref P4) (pin 1))
- (node (ref U1) (pin 12))
- (node (ref P9) (pin 3)))
- (net (code 10) (name "Net-(P9-Pad9)")
- (node (ref P9) (pin 9)))
- (net (code 11) (name +5V)
- (node (ref U2) (pin 3))
- (node (ref U2) (pin 1))
+ (node (ref P9) (pin 3))
+ (node (ref U1) (pin 12)))
+ (net (code 10) (name +5V)
(node (ref C7) (pin 1))
+ (node (ref U2) (pin 1))
+ (node (ref U2) (pin 3))
(node (ref P10) (pin 1)))
- (net (code 12) (name "Net-(P10-Pad6)")
+ (net (code 11) (name "Net-(P10-Pad6)")
(node (ref P10) (pin 6)))
- (net (code 13) (name "Net-(P10-Pad4)")
+ (net (code 12) (name "Net-(P10-Pad4)")
(node (ref P10) (pin 4)))
+ (net (code 13) (name /NRST)
+ (node (ref C1) (pin 2))
+ (node (ref P11) (pin 5))
+ (node (ref U1) (pin 7)))
(net (code 14) (name /I2C_SCL)
- (node (ref P9) (pin 2))
(node (ref JP2) (pin 1))
- (node (ref P2) (pin 6))
- (node (ref U1) (pin 45)))
+ (node (ref P9) (pin 2))
+ (node (ref U1) (pin 45))
+ (node (ref P2) (pin 6)))
(net (code 15) (name /I2C_SDA)
(node (ref U1) (pin 46))
- (node (ref P9) (pin 1))
+ (node (ref JP1) (pin 1))
(node (ref P2) (pin 5))
- (node (ref JP1) (pin 1)))
- (net (code 16) (name "Net-(U1-Pad40)")
- (node (ref U1) (pin 40)))
- (net (code 17) (name /NRST)
- (node (ref J1) (pin 5))
- (node (ref U1) (pin 7))
- (node (ref C1) (pin 2)))
- (net (code 18) (name /SWCLK)
- (node (ref J1) (pin 2))
+ (node (ref P9) (pin 1)))
+ (net (code 16) (name "Net-(P9-Pad9)")
+ (node (ref P9) (pin 9)))
+ (net (code 17) (name /SWCLK)
+ (node (ref P11) (pin 2))
(node (ref U1) (pin 37)))
- (net (code 19) (name /SWDIO)
- (node (ref J1) (pin 4))
+ (net (code 18) (name /SWDIO)
+ (node (ref P11) (pin 4))
(node (ref U1) (pin 34)))
- (net (code 20) (name /SWO)
- (node (ref J1) (pin 6))
- (node (ref U1) (pin 39)))
+ (net (code 19) (name /SWO)
+ (node (ref U1) (pin 39))
+ (node (ref P11) (pin 6)))
+ (net (code 20) (name "Net-(U1-Pad40)")
+ (node (ref U1) (pin 40)))
(net (code 21) (name "Net-(U1-Pad2)")
(node (ref U1) (pin 2)))
(net (code 22) (name "Net-(U1-Pad3)")
(node (ref U1) (pin 3)))
(net (code 23) (name "Net-(U1-Pad4)")
(node (ref U1) (pin 4)))
- (net (code 24) (name "Net-(U1-Pad19)")
- (node (ref U1) (pin 19)))
- (net (code 25) (name "Net-(U1-Pad18)")
- (node (ref U1) (pin 18)))
- (net (code 26) (name +3V3)
- (node (ref U2) (pin 5))
- (node (ref R2) (pin 1))
- (node (ref C5) (pin 1))
- (node (ref C4) (pin 1))
- (node (ref U1) (pin 9))
- (node (ref U1) (pin 24))
- (node (ref U1) (pin 36))
- (node (ref U1) (pin 48))
- (node (ref C2) (pin 1))
- (node (ref JP3) (pin 1))
- (node (ref J1) (pin 1))
- (node (ref C8) (pin 1))
- (node (ref C3) (pin 1))
- (node (ref R1) (pin 1)))
+ (net (code 24) (name "Net-(C9-Pad1)")
+ (node (ref C9) (pin 1))
+ (node (ref U1) (pin 5))
+ (node (ref Y1) (pin 1)))
+ (net (code 25) (name "Net-(JP3-Pad2)")
+ (node (ref JP3) (pin 2))
+ (node (ref P1) (pin 4)))
+ (net (code 26) (name "Net-(P1-Pad5)")
+ (node (ref P1) (pin 5)))
(net (code 27) (name "Net-(Y1-Pad4)")
(node (ref Y1) (pin 4)))
(net (code 28) (name "Net-(Y1-Pad2)")
(node (ref Y1) (pin 2)))
- (net (code 29) (name /VLCD)
+ (net (code 29) (name "Net-(J3-Pad1)")
+ (node (ref J3) (pin 1))
+ (node (ref U1) (pin 19)))
+ (net (code 30) (name "Net-(J11-Pad1)")
+ (node (ref U1) (pin 11))
+ (node (ref J11) (pin 1)))
+ (net (code 31) (name "Net-(J10-Pad1)")
+ (node (ref U1) (pin 10))
+ (node (ref J10) (pin 1)))
+ (net (code 32) (name "Net-(J9-Pad1)")
+ (node (ref J9) (pin 1))
+ (node (ref U1) (pin 31)))
+ (net (code 33) (name "Net-(J8-Pad1)")
+ (node (ref J8) (pin 1))
+ (node (ref U1) (pin 30)))
+ (net (code 34) (name "Net-(J7-Pad1)")
+ (node (ref U1) (pin 29))
+ (node (ref J7) (pin 1)))
+ (net (code 35) (name "Net-(J5-Pad1)")
+ (node (ref J5) (pin 1))
+ (node (ref U1) (pin 22)))
+ (net (code 36) (name "Net-(J4-Pad1)")
+ (node (ref U1) (pin 21))
+ (node (ref J4) (pin 1)))
+ (net (code 37) (name "Net-(J2-Pad1)")
+ (node (ref U1) (pin 18))
+ (node (ref J2) (pin 1)))
+ (net (code 38) (name "Net-(P3-Pad9)")
+ (node (ref P3) (pin 9)))
+ (net (code 39) (name "Net-(P3-Pad10)")
+ (node (ref P3) (pin 10)))
+ (net (code 40) (name "Net-(C10-Pad1)")
+ (node (ref U1) (pin 6))
+ (node (ref Y1) (pin 3))
+ (node (ref C10) (pin 1)))
+ (net (code 41) (name "Net-(JP2-Pad2)")
+ (node (ref R2) (pin 2))
+ (node (ref JP2) (pin 2)))
+ (net (code 42) (name "Net-(JP1-Pad2)")
+ (node (ref JP1) (pin 2))
+ (node (ref R1) (pin 2)))
+ (net (code 43) (name "Net-(U1-Pad41)")
+ (node (ref U1) (pin 41)))
+ (net (code 44) (name "Net-(U1-Pad42)")
+ (node (ref U1) (pin 42)))
+ (net (code 45) (name "Net-(U1-Pad43)")
+ (node (ref U1) (pin 43)))
+ (net (code 46) (name "Net-(U1-Pad38)")
+ (node (ref U1) (pin 38)))
+ (net (code 47) (name /VLCD)
(node (ref U1) (pin 1))
(node (ref C6) (pin 2)))
- (net (code 30) (name GND)
- (node (ref U1) (pin 23))
- (node (ref P9) (pin 10))
+ (net (code 48) (name +3V3)
+ (node (ref U1) (pin 36))
+ (node (ref U1) (pin 24))
+ (node (ref C2) (pin 1))
+ (node (ref P11) (pin 1))
+ (node (ref C5) (pin 1))
+ (node (ref C4) (pin 1))
+ (node (ref C3) (pin 1))
+ (node (ref U2) (pin 5))
+ (node (ref R2) (pin 1))
+ (node (ref C8) (pin 1))
+ (node (ref U1) (pin 48))
+ (node (ref U1) (pin 9))
+ (node (ref JP3) (pin 1))
+ (node (ref R1) (pin 1)))
+ (net (code 49) (name GND)
+ (node (ref P10) (pin 5))
(node (ref P1) (pin 6))
- (node (ref U1) (pin 35))
(node (ref P1) (pin 7))
- (node (ref C4) (pin 2))
+ (node (ref P11) (pin 3))
+ (node (ref P9) (pin 10))
(node (ref U1) (pin 47))
(node (ref U2) (pin 2))
- (node (ref C5) (pin 2))
- (node (ref P10) (pin 5))
(node (ref C1) (pin 1))
- (node (ref C10) (pin 2))
- (node (ref C9) (pin 2))
+ (node (ref C3) (pin 2))
+ (node (ref C5) (pin 2))
+ (node (ref C4) (pin 2))
+ (node (ref P3) (pin 7))
(node (ref U1) (pin 8))
+ (node (ref U1) (pin 35))
+ (node (ref U1) (pin 44))
+ (node (ref U1) (pin 23))
+ (node (ref C9) (pin 2))
+ (node (ref C10) (pin 2))
(node (ref C7) (pin 2))
(node (ref C8) (pin 2))
- (node (ref C3) (pin 2))
- (node (ref C6) (pin 1))
- (node (ref J1) (pin 3))
- (node (ref P3) (pin 7))
- (node (ref C2) (pin 2)))
- (net (code 31) (name "Net-(U1-Pad20)")
- (node (ref U1) (pin 20)))
- (net (code 32) (name "Net-(P3-Pad9)")
- (node (ref P3) (pin 9)))
- (net (code 33) (name "Net-(P3-Pad10)")
- (node (ref P3) (pin 10)))
- (net (code 34) (name "Net-(C10-Pad1)")
- (node (ref Y1) (pin 3))
- (node (ref C10) (pin 1))
- (node (ref U1) (pin 6)))
- (net (code 35) (name "Net-(C9-Pad1)")
- (node (ref Y1) (pin 1))
- (node (ref C9) (pin 1))
- (node (ref U1) (pin 5)))
- (net (code 36) (name "Net-(J2-Pad1)")
- (node (ref J2) (pin 1))
- (node (ref U1) (pin 44)))
- (net (code 37) (name /Vin)
+ (node (ref C2) (pin 2))
+ (node (ref C6) (pin 1)))
+ (net (code 50) (name /Vin)
(node (ref P1) (pin 8)))
- (net (code 38) (name "Net-(JP3-Pad2)")
- (node (ref JP3) (pin 2))
- (node (ref P1) (pin 4)))
- (net (code 39) (name "Net-(P1-Pad5)")
- (node (ref P1) (pin 5)))
- (net (code 40) (name "Net-(U1-Pad11)")
- (node (ref U1) (pin 11)))
- (net (code 41) (name "Net-(U1-Pad41)")
- (node (ref U1) (pin 41)))
- (net (code 42) (name "Net-(U1-Pad42)")
- (node (ref U1) (pin 42)))
- (net (code 43) (name "Net-(U1-Pad43)")
- (node (ref U1) (pin 43)))
- (net (code 44) (name "Net-(U1-Pad21)")
- (node (ref U1) (pin 21)))
- (net (code 45) (name "Net-(U1-Pad22)")
- (node (ref U1) (pin 22)))
- (net (code 46) (name "Net-(U1-Pad38)")
- (node (ref U1) (pin 38)))
- (net (code 47) (name "Net-(U1-Pad31)")
- (node (ref U1) (pin 31)))
- (net (code 48) (name "Net-(U1-Pad30)")
- (node (ref U1) (pin 30)))
- (net (code 49) (name "Net-(U1-Pad29)")
- (node (ref U1) (pin 29)))
- (net (code 50) (name "Net-(U1-Pad10)")
- (node (ref U1) (pin 10)))
- (net (code 51) (name "Net-(JP2-Pad2)")
- (node (ref R2) (pin 2))
- (node (ref JP2) (pin 2)))
- (net (code 52) (name "Net-(JP1-Pad2)")
- (node (ref R1) (pin 2))
- (node (ref JP1) (pin 2)))
- (net (code 53) (name /AREF)
+ (net (code 51) (name /AREF)
(node (ref P3) (pin 8)))
- (net (code 54) (name /USB_DM)
- (node (ref U1) (pin 32))
- (node (ref J3) (pin 2))
- (node (ref P10) (pin 2)))
- (net (code 55) (name "/6(**)")
+ (net (code 52) (name "Net-(U1-Pad20)")
+ (node (ref U1) (pin 20)))
+ (net (code 53) (name "/6(**)")
(node (ref P4) (pin 7)))
- (net (code 56) (name /RESET_OUT)
+ (net (code 54) (name /RESET_OUT)
(node (ref P1) (pin 3)))
- (net (code 57) (name /IOREF)
+ (net (code 55) (name /IOREF)
(node (ref P1) (pin 2)))
- (net (code 58) (name "Net-(P1-Pad1)")
+ (net (code 56) (name "Net-(P1-Pad1)")
(node (ref P1) (pin 1)))
- (net (code 59) (name "/9(**)")
+ (net (code 57) (name "/9(**)")
(node (ref P3) (pin 2)))
- (net (code 60) (name /8)
+ (net (code 58) (name /8)
(node (ref P3) (pin 1)))
- (net (code 61) (name /7)
+ (net (code 59) (name /7)
(node (ref P4) (pin 8)))
- (net (code 62) (name "/5(**)")
+ (net (code 60) (name "/5(**)")
(node (ref P4) (pin 6)))
- (net (code 63) (name /4)
+ (net (code 61) (name /4)
(node (ref P4) (pin 5)))
- (net (code 64) (name "/3(**)")
+ (net (code 62) (name "/3(**)")
(node (ref P4) (pin 4)))
- (net (code 65) (name /2)
+ (net (code 63) (name /2)
(node (ref P4) (pin 3)))
- (net (code 66) (name /DAC2_OUT)
- (node (ref U1) (pin 15))
- (node (ref P2) (pin 2)))
- (net (code 67) (name "Net-(P8-Pad1)")
+ (net (code 64) (name "Net-(P8-Pad1)")
(node (ref P8) (pin 1)))
- (net (code 68) (name "Net-(P7-Pad1)")
+ (net (code 65) (name "Net-(P7-Pad1)")
(node (ref P7) (pin 1)))
- (net (code 69) (name "Net-(P6-Pad1)")
+ (net (code 66) (name "Net-(P6-Pad1)")
(node (ref P6) (pin 1)))
- (net (code 70) (name "Net-(P5-Pad1)")
+ (net (code 67) (name "Net-(P5-Pad1)")
(node (ref P5) (pin 1)))
- (net (code 71) (name /A3)
+ (net (code 68) (name /A3)
(node (ref P2) (pin 4)))
- (net (code 72) (name /DAC1_OUT)
- (node (ref P2) (pin 1))
- (node (ref U1) (pin 14)))
- (net (code 73) (name /USB_DP)
- (node (ref U1) (pin 33))
+ (net (code 69) (name /DAC2_OUT)
+ (node (ref P2) (pin 2))
+ (node (ref U1) (pin 15)))
+ (net (code 70) (name /DAC1_OUT)
+ (node (ref U1) (pin 14))
+ (node (ref P2) (pin 1)))
+ (net (code 71) (name /USB_DP)
+ (node (ref J1) (pin 1))
(node (ref P10) (pin 3))
- (node (ref J3) (pin 1))))) \ No newline at end of file
+ (node (ref U1) (pin 33)))
+ (net (code 72) (name /USB_DM)
+ (node (ref U1) (pin 32))
+ (node (ref P10) (pin 2))
+ (node (ref J1) (pin 2))))) \ No newline at end of file
diff --git a/hw1/hw1.pdf b/hw1/hw1.pdf
index 2f015f4..cca2782 100644
--- a/hw1/hw1.pdf
+++ b/hw1/hw1.pdf
Binary files differ
diff --git a/hw1/hw1.pro b/hw1/hw1.pro
index 8242726..8298c7b 100644
--- a/hw1/hw1.pro
+++ b/hw1/hw1.pro
@@ -1,4 +1,4 @@
-update=Fri 17 Nov 2017 10:53:59 PM GMT
+update=Sun 17 Dec 2017 10:35:50 PM GMT
version=1
last_client=kicad
[pcbnew]
diff --git a/hw1/hw1.sch b/hw1/hw1.sch
index 532cf81..a23f1ce 100644
--- a/hw1/hw1.sch
+++ b/hw1/hw1.sch
@@ -552,8 +552,6 @@ Wire Wire Line
2550 4400 1350 4400
Wire Wire Line
1050 4400 900 4400
-NoConn ~ 2550 5700
-NoConn ~ 2550 5800
NoConn ~ 2550 5500
NoConn ~ 2550 5400
NoConn ~ 2550 5300
@@ -743,12 +741,12 @@ Wire Wire Line
7700 10150 7700 9950
Connection ~ 7700 9950
$Comp
-L CONN_01X06 J1
+L CONN_01X06 P11
U 1 1 59F7E088
P 6850 1300
-F 0 "J1" H 6850 1650 50 0000 C CNN
+F 0 "P11" H 6850 1650 50 0000 C CNN
F 1 "CONN_01X06" V 6950 1300 50 0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 6850 1300 50 0001 C CNN
+F 2 "Socket_Strips:Socket_Strip_Straight_1x06_Pitch2.54mm" H 6850 1300 50 0001 C CNN
F 3 "" H 6850 1300 50 0001 C CNN
1 6850 1300
-1 0 0 -1
@@ -793,14 +791,7 @@ Text Label 7100 1550 0 60 ~ 0
SWO
Text Notes 6700 850 0 60 ~ 0
STLink compatible debug
-NoConn ~ 9750 5700
-NoConn ~ 9750 5800
-NoConn ~ 9750 6500
-NoConn ~ 9750 6600
-NoConn ~ 9750 6700
NoConn ~ 9750 7200
-NoConn ~ 2550 6800
-NoConn ~ 2550 6700
NoConn ~ 2550 6400
NoConn ~ 2550 6300
NoConn ~ 2550 6200
@@ -859,7 +850,7 @@ U 1 1 5A0F91B9
P 10600 10050
F 0 "JP1" H 10600 10130 50 0000 C CNN
F 1 "Jumper_NC_Small" H 10610 9990 50 0000 C CNN
-F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10600 10050 50 0001 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 10600 10050 50 0001 C CNN
F 3 "" H 10600 10050 50 0001 C CNN
1 10600 10050
0 -1 -1 0
@@ -870,7 +861,7 @@ U 1 1 5A0F9269
P 10900 10050
F 0 "JP2" H 10900 10130 50 0000 C CNN
F 1 "Jumper_NC_Small" H 10910 9990 50 0000 C CNN
-F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10900 10050 50 0001 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 10900 10050 50 0001 C CNN
F 3 "" H 10900 10050 50 0001 C CNN
1 10900 10050
0 -1 -1 0
@@ -899,9 +890,8 @@ Wire Wire Line
Wire Wire Line
12500 2400 12400 2400
NoConn ~ 12400 2400
-NoConn ~ 2550 5900
Text Notes 2950 4600 0 39 ~ 0
-We're using debugger only here\n(but be safe)
+Bootloader wut?
$Comp
L C C6
U 1 1 5A0FB867
@@ -1022,7 +1012,7 @@ U 1 1 5A36E60E
P 12050 2000
F 0 "JP3" H 12050 2080 50 0000 C CNN
F 1 "Jumper_NC_Small" H 12060 1940 50 0000 C CNN
-F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 12050 2000 50 0001 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 12050 2000 50 0001 C CNN
F 3 "" H 12050 2000 50 0001 C CNN
1 12050 2000
1 0 0 -1
@@ -1037,10 +1027,10 @@ Wire Wire Line
Wire Wire Line
11800 2000 11800 1550
$Comp
-L CONN_01X02 J3
+L CONN_01X02 J1
U 1 1 5A36EBE0
P 4850 2350
-F 0 "J3" H 4850 2500 50 0000 C CNN
+F 0 "J1" H 4850 2500 50 0000 C CNN
F 1 "CONN_01X02" V 4950 2350 50 0000 C CNN
F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 4850 2350 50 0001 C CNN
F 3 "" H 4850 2350 50 0001 C CNN
@@ -1049,19 +1039,8 @@ F 3 "" H 4850 2350 50 0001 C CNN
$EndComp
Text Notes 4550 2700 0 60 ~ 0
Probe points, for\nbus tracing USB
-$Comp
-L CONN_01X01_MALE J2
-U 1 1 5A36F13B
-P 2150 4600
-F 0 "J2" H 2150 4675 50 0000 C CNN
-F 1 "CONN_01X01_MALE" H 2150 4500 50 0000 C CNN
-F 2 "Wire_Pads:SolderWirePad_single_0-8mmDrill" H 2150 4600 50 0001 C CNN
-F 3 "" H 2150 4600 50 0001 C CNN
- 1 2150 4600
- 1 0 0 -1
-$EndComp
Wire Wire Line
- 2550 4600 2450 4600
+ 2550 4600 2200 4600
Wire Wire Line
1450 4900 1450 5300
Wire Wire Line
@@ -1078,4 +1057,134 @@ Wire Wire Line
Connection ~ 1750 5100
NoConn ~ 13300 1300
NoConn ~ 13300 1400
+$Comp
+L GND #PWR022
+U 1 1 5A43A55C
+P 2200 4600
+F 0 "#PWR022" H 2200 4350 50 0001 C CNN
+F 1 "GND" H 2200 4450 50 0000 C CNN
+F 2 "" H 2200 4600 50 0000 C CNN
+F 3 "" H 2200 4600 50 0000 C CNN
+ 1 2200 4600
+ 1 0 0 -1
+$EndComp
+$Comp
+L TEST_1P J2
+U 1 1 5A43D04F
+P 2500 5700
+F 0 "J2" H 2500 5970 50 0000 C CNN
+F 1 "TEST_1P" H 2500 5900 50 0000 C CNN
+F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 2700 5700 50 0001 C CNN
+F 3 "" H 2700 5700 50 0001 C CNN
+ 1 2500 5700
+ 0 -1 -1 0
+$EndComp
+$Comp
+L TEST_1P J3
+U 1 1 5A43D328
+P 2300 5800
+F 0 "J3" H 2300 6070 50 0000 C CNN
+F 1 "TEST_1P" H 2300 6000 50 0000 C CNN
+F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 2500 5800 50 0001 C CNN
+F 3 "" H 2500 5800 50 0001 C CNN
+ 1 2300 5800
+ 0 -1 -1 0
+$EndComp
+$Comp
+L TEST_1P J4
+U 1 1 5A43D40B
+P 2250 6700
+F 0 "J4" H 2250 6970 50 0000 C CNN
+F 1 "TEST_1P" H 2250 6900 50 0000 C CNN
+F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 2450 6700 50 0001 C CNN
+F 3 "" H 2450 6700 50 0001 C CNN
+ 1 2250 6700
+ 0 -1 -1 0
+$EndComp
+$Comp
+L TEST_1P J5
+U 1 1 5A43D49D
+P 2100 6800
+F 0 "J5" H 2100 7070 50 0000 C CNN
+F 1 "TEST_1P" H 2100 7000 50 0000 C CNN
+F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 2300 6800 50 0001 C CNN
+F 3 "" H 2300 6800 50 0001 C CNN
+ 1 2100 6800
+ 0 -1 -1 0
+$EndComp
+Wire Wire Line
+ 2500 5700 2550 5700
+Wire Wire Line
+ 2550 5800 2300 5800
+Wire Wire Line
+ 2550 6700 2250 6700
+Wire Wire Line
+ 2550 6800 2100 6800
+$Comp
+L TEST_1P J7
+U 1 1 5A43EE7B
+P 10100 6500
+F 0 "J7" H 10100 6770 50 0000 C CNN
+F 1 "TEST_1P" H 10100 6700 50 0000 C CNN
+F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10300 6500 50 0001 C CNN
+F 3 "" H 10300 6500 50 0001 C CNN
+ 1 10100 6500
+ 0 1 1 0
+$EndComp
+$Comp
+L TEST_1P J8
+U 1 1 5A43F060
+P 10250 6600
+F 0 "J8" H 10250 6870 50 0000 C CNN
+F 1 "TEST_1P" H 10250 6800 50 0000 C CNN
+F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10450 6600 50 0001 C CNN
+F 3 "" H 10450 6600 50 0001 C CNN
+ 1 10250 6600
+ 0 1 1 0
+$EndComp
+$Comp
+L TEST_1P J9
+U 1 1 5A43F0E2
+P 10400 6700
+F 0 "J9" H 10400 6970 50 0000 C CNN
+F 1 "TEST_1P" H 10400 6900 50 0000 C CNN
+F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10600 6700 50 0001 C CNN
+F 3 "" H 10600 6700 50 0001 C CNN
+ 1 10400 6700
+ 0 1 1 0
+$EndComp
+Wire Wire Line
+ 9750 6500 10100 6500
+Wire Wire Line
+ 9750 6600 10250 6600
+Wire Wire Line
+ 9750 6700 10400 6700
+$Comp
+L TEST_1P J10
+U 1 1 5A43FB1F
+P 10300 5700
+F 0 "J10" H 10300 5970 50 0000 C CNN
+F 1 "TEST_1P" H 10300 5900 50 0000 C CNN
+F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10500 5700 50 0001 C CNN
+F 3 "" H 10500 5700 50 0001 C CNN
+ 1 10300 5700
+ 0 1 1 0
+$EndComp
+$Comp
+L TEST_1P J11
+U 1 1 5A43FBC5
+P 10500 5800
+F 0 "J11" H 10500 6070 50 0000 C CNN
+F 1 "TEST_1P" H 10500 6000 50 0000 C CNN
+F 2 "Measurement_Points:Measurement_Point_Round-TH_Small" H 10700 5800 50 0001 C CNN
+F 3 "" H 10700 5800 50 0001 C CNN
+ 1 10500 5800
+ 0 1 1 0
+$EndComp
+Wire Wire Line
+ 9750 5700 10300 5700
+Wire Wire Line
+ 9750 5800 10500 5800
+Text Notes 5900 5400 0 60 ~ 0
+no need for rtc\nthis is the host board
$EndSCHEMATC