Skip to content

Commit

Permalink
Version 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gusmanb committed Feb 25, 2023
1 parent 62f215d commit fc05977
Show file tree
Hide file tree
Showing 203 changed files with 94,797 additions and 24,851 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3,683 changes: 2,279 additions & 1,404 deletions Electronics/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.kicad_pcb

Large diffs are not rendered by default.

194 changes: 179 additions & 15 deletions Electronics/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.kicad_sch
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,59 @@
(paper "A4")
(lib_symbols
(symbol "Connector_Generic:Conn_01x03" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
(property "Reference" "J" (id 0) (at 0 5.08 0)
(effects (font (size 1.27 1.27)))
)
(property "Value" "Conn_01x03" (id 1) (at 0 -5.08 0)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_keywords" "connector" (id 4) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(symbol "Conn_01x03_1_1"
(rectangle (start -1.27 -2.413) (end 0 -2.667)
(stroke (width 0.1524) (type default) (color 0 0 0 0))
(fill (type none))
)
(rectangle (start -1.27 0.127) (end 0 -0.127)
(stroke (width 0.1524) (type default) (color 0 0 0 0))
(fill (type none))
)
(rectangle (start -1.27 2.667) (end 0 2.413)
(stroke (width 0.1524) (type default) (color 0 0 0 0))
(fill (type none))
)
(rectangle (start -1.27 3.81) (end 1.27 -3.81)
(stroke (width 0.254) (type default) (color 0 0 0 0))
(fill (type background))
)
(pin passive line (at -5.08 2.54 0) (length 3.81)
(name "Pin_1" (effects (font (size 1.27 1.27))))
(number "1" (effects (font (size 1.27 1.27))))
)
(pin passive line (at -5.08 0 0) (length 3.81)
(name "Pin_2" (effects (font (size 1.27 1.27))))
(number "2" (effects (font (size 1.27 1.27))))
)
(pin passive line (at -5.08 -2.54 0) (length 3.81)
(name "Pin_3" (effects (font (size 1.27 1.27))))
(number "3" (effects (font (size 1.27 1.27))))
)
)
)
(symbol "Connector_Generic:Conn_02x15_Odd_Even" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
(property "Reference" "J" (id 0) (at 1.27 20.32 0)
(effects (font (size 1.27 1.27)))
Expand Down Expand Up @@ -575,7 +628,6 @@
)
)
(junction (at 138.43 71.12) (diameter 0) (color 0 0 0 0)
(uuid 2dc3e3f9-4b13-4051-a201-8af13b42920c)
)
Expand All @@ -585,11 +637,29 @@
(junction (at 156.21 71.12) (diameter 0) (color 0 0 0 0)
(uuid e82a897f-3223-46c5-9c0c-d98c4fd26187)
)
(junction (at 153.67 71.12) (diameter 0) (color 0 0 0 0)
(uuid f5300988-ed64-415e-be65-4b1227a1de96)
)
(no_connect (at 96.52 135.89) (uuid b9714173-2aa4-45da-85ef-660e085355f6))
(no_connect (at 161.29 135.89) (uuid b9714173-2aa4-45da-85ef-660e085355f7))
(no_connect (at 195.58 95.25) (uuid da79270f-bf6a-49ff-a7da-798c59af64ba))
(no_connect (at 195.58 72.39) (uuid da79270f-bf6a-49ff-a7da-798c59af64bb))
(no_connect (at 195.58 77.47) (uuid da79270f-bf6a-49ff-a7da-798c59af64bc))
(no_connect (at 195.58 82.55) (uuid da79270f-bf6a-49ff-a7da-798c59af64bd))
(no_connect (at 195.58 87.63) (uuid da79270f-bf6a-49ff-a7da-798c59af64be))
(no_connect (at 180.34 123.19) (uuid da79270f-bf6a-49ff-a7da-798c59af64bf))
(no_connect (at 177.8 123.19) (uuid da79270f-bf6a-49ff-a7da-798c59af64c0))
(no_connect (at 175.26 123.19) (uuid da79270f-bf6a-49ff-a7da-798c59af64c1))
(wire (pts (xy 148.59 95.25) (xy 160.02 95.25))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 003a88a1-471f-4d7f-9d67-0bf3c5621210)
)
(wire (pts (xy 151.13 71.12) (xy 153.67 71.12))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 0191afd0-5f1a-40c0-8c2c-fc6b4512ec40)
)
(wire (pts (xy 104.14 110.49) (xy 116.84 110.49))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 0b0ae85e-b511-48cf-8367-da02ec847dbe)
Expand Down Expand Up @@ -630,7 +700,7 @@
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 2a248eab-be7c-4e13-b730-16e1efa53a5c)
)
(wire (pts (xy 138.43 71.12) (xy 148.59 71.12))
(wire (pts (xy 138.43 71.12) (xy 143.51 71.12))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 2b7fef5b-1d0d-4860-8f0b-490f59a7beec)
)
Expand Down Expand Up @@ -690,14 +760,14 @@
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 5576cd03-3bad-40c5-9316-1d286895d52a)
)
(wire (pts (xy 130.81 71.12) (xy 138.43 71.12))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 55df5794-59af-467b-8fa9-b8c894689530)
)
(wire (pts (xy 116.84 100.33) (xy 104.14 100.33))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 57d9b2dd-de16-4f80-8a7d-883edca0c9d2)
)
(wire (pts (xy 128.27 71.12) (xy 138.43 71.12))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 5b649954-63b3-4710-8410-8de8989850ed)
)
(wire (pts (xy 195.58 115.57) (xy 207.01 115.57))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 5d129f9b-cf95-4639-aff0-d8b31fa60a65)
Expand Down Expand Up @@ -730,6 +800,10 @@
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 7745ae53-2db5-46b5-a486-e19c0557578e)
)
(wire (pts (xy 149.86 138.43) (xy 161.29 138.43))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 7b20afe5-4ce8-4e8d-8a74-2526b57dc91e)
)
(wire (pts (xy 148.59 100.33) (xy 160.02 100.33))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 7f187460-0c37-48ee-bda6-0919aedf2764)
Expand All @@ -754,14 +828,22 @@
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 8f06c7f3-3dd2-460f-8ba6-a3840d1eb6f0)
)
(wire (pts (xy 160.02 69.85) (xy 156.21 69.85))
(wire (pts (xy 156.21 69.85) (xy 160.02 69.85))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 966ee9ec-860e-45bb-af89-30bda72b2032)
)
(wire (pts (xy 128.27 63.5) (xy 153.67 63.5))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 9866b9d4-eab0-4bdb-9a0c-02f6786feba5)
)
(wire (pts (xy 195.58 102.87) (xy 207.01 102.87))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 9c379c2e-8882-476f-aa0d-71e238f1f256)
)
(wire (pts (xy 153.67 63.5) (xy 153.67 71.12))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 9ec1e25b-c780-4a3c-a344-f8d6281a2d60)
)
(wire (pts (xy 195.58 74.93) (xy 207.01 74.93))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid 9fc454bc-a2fb-45bc-8379-2e3bcd0d9258)
Expand All @@ -778,6 +860,10 @@
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid a26abbfd-50b0-489b-820b-e34020daf7fb)
)
(wire (pts (xy 85.09 138.43) (xy 96.52 138.43))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid a4452b7c-2e39-495d-b582-d01f7cf70643)
)
(wire (pts (xy 116.84 92.71) (xy 104.14 92.71))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid a5098249-f29f-4c9a-8d7c-b64397241a3f)
Expand All @@ -794,6 +880,10 @@
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid a6a06d85-cbea-4322-8d0e-7a6a5cc4320e)
)
(wire (pts (xy 149.86 133.35) (xy 161.29 133.35))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid afaba1e2-ef7a-42f2-9580-4c73c4f4bbcc)
)
(wire (pts (xy 140.97 74.93) (xy 138.43 74.93))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid b02a9474-8f9d-4a90-9ed9-e6e4d33ebd5a)
Expand Down Expand Up @@ -846,10 +936,18 @@
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid cc8caf17-6058-4295-a217-780a8d45a9ad)
)
(wire (pts (xy 153.67 71.12) (xy 156.21 71.12))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid dbadf01b-c575-429d-a316-57833ae53883)
)
(wire (pts (xy 116.84 85.09) (xy 104.14 85.09))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid dcd68724-808b-4823-b988-50b26335fc87)
)
(wire (pts (xy 85.09 133.35) (xy 96.52 133.35))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid dfa2a769-f265-4abf-8a69-63fdf0c35c5f)
)
(wire (pts (xy 195.58 113.03) (xy 207.01 113.03))
(stroke (width 0) (type default) (color 0 0 0 0))
(uuid e41b43b7-423d-47be-bf1a-e08678d3b2f3)
Expand Down Expand Up @@ -923,7 +1021,7 @@
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 34a399f2-f61b-4f97-bbff-bd3a7f5b4067)
)
(label "EXT_T" (at 132.08 71.12 0)
(label "EXT_T" (at 129.54 71.12 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 3690f929-9354-43e6-b8fc-6ef4dd5be152)
)
Expand All @@ -939,6 +1037,10 @@
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 49c84c40-d392-4343-ad58-95b366b1c06a)
)
(label "GND" (at 151.13 138.43 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 4feef6bf-ae7d-409e-a10c-521c8b206dee)
)
(label "GND" (at 149.86 113.03 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 504534a4-6edd-4c3e-9c6c-4e8e10d84ee4)
Expand All @@ -951,6 +1053,10 @@
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 555075d4-782c-4af1-b033-fd76570cffea)
)
(label "EXT_CHAIN" (at 130.81 63.5 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 559f02aa-cafe-4fbe-87b4-6bb2ebe4b156)
)
(label "CHAN_18" (at 115.57 87.63 180)
(effects (font (size 1.27 1.27)) (justify right bottom))
(uuid 5a8b4f1c-1e07-4a63-ad5c-02e4f0ba672c)
Expand All @@ -971,6 +1077,10 @@
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 629d9d63-ed88-4949-9ca3-7b55ddb89000)
)
(label "EXT_CHAIN" (at 151.13 133.35 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 691e2cbe-b26c-4267-8f9b-0ee6a0516aaf)
)
(label "GND" (at 196.85 74.93 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 6c0eb964-7167-4d1e-9d05-29ceb4b708bc)
Expand Down Expand Up @@ -1007,6 +1117,10 @@
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 92407edf-e640-450c-9281-41ac46831b00)
)
(label "EXT_CHAIN" (at 86.36 133.35 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 99ac923f-78c4-4f03-8904-9f70d791f7bc)
)
(label "GND" (at 149.86 74.93 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 9a1055e0-3591-41f2-971c-753e9f824aa4)
Expand Down Expand Up @@ -1051,6 +1165,10 @@
(effects (font (size 1.27 1.27)) (justify right bottom))
(uuid b5f74964-cd41-4272-b51a-5fc89f407081)
)
(label "GND" (at 86.36 138.43 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid ba248b1c-93a1-452e-a951-92d8b621f7ad)
)
(label "CHAN_0" (at 81.28 74.93 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid bf3b72e8-c91f-46b2-a4b4-06d64a243393)
Expand Down Expand Up @@ -1188,21 +1306,41 @@
(pin "9" (uuid 64a5200f-cc41-435d-b160-8e35090ced5b))
)
(symbol (lib_id "Diode:LL4148") (at 152.4 71.12 0) (unit 1)
(symbol (lib_id "Diode:LL4148") (at 147.32 71.12 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 3cad4871-f357-423c-bb38-142f118d87a8)
(property "Reference" "D1" (id 0) (at 152.4 64.77 0))
(property "Value" "" (id 1) (at 152.4 67.31 0))
(property "Footprint" "" (id 2) (at 152.4 75.565 0)
(property "Reference" "D1" (id 0) (at 147.32 64.77 0))
(property "Value" "LL4148" (id 1) (at 147.32 67.31 0))
(property "Footprint" "Diode_SMD:D_MiniMELF" (id 2) (at 147.32 75.565 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "http://www.vishay.com/docs/85557/ll4148.pdf" (id 3) (at 152.4 71.12 0)
(property "Datasheet" "http://www.vishay.com/docs/85557/ll4148.pdf" (id 3) (at 147.32 71.12 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 8d01c4b4-562a-4614-89c1-5389ec45aadb))
(pin "2" (uuid 3bf116e8-393e-4d50-bf5c-f6f2cd6bc27e))
)
(symbol (lib_id "Connector_Generic:Conn_01x03") (at 166.37 135.89 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(uuid 8effd443-b0b6-40d4-943d-96cc25aee3c6)
(property "Reference" "J3" (id 0) (at 168.91 134.6199 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "Conn_01x03" (id 1) (at 168.91 137.1599 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Horizontal" (id 2) (at 166.37 135.89 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 166.37 135.89 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 82e59a42-c476-4a44-afa9-44352baae650))
(pin "2" (uuid e27c78a2-cebb-482a-800a-b65a56c98f27))
(pin "3" (uuid ea9fa722-e327-45f6-9d6b-7b37bebbf94f))
)
(symbol (lib_id "Connector_Generic:Conn_02x15_Odd_Even") (at 96.52 92.71 0) (unit 1)
(in_bom yes) (on_board yes)
(uuid 9b910c7f-2658-4050-ab20-b1c595dbd5ca)
Expand Down Expand Up @@ -1250,8 +1388,8 @@
(in_bom yes) (on_board yes)
(uuid af0af41e-659e-4e99-9b35-33f9dcf2ed42)
(property "Reference" "R1" (id 0) (at 144.78 72.39 90))
(property "Value" "" (id 1) (at 144.78 77.47 90))
(property "Footprint" "" (id 2) (at 144.78 76.708 90)
(property "Value" "100k" (id 1) (at 144.78 77.47 90))
(property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 144.78 76.708 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 144.78 74.93 0)
Expand All @@ -1261,6 +1399,26 @@
(pin "2" (uuid 3f18470f-fa8c-4ac7-8350-3e51bc9e3edf))
)
(symbol (lib_id "Connector_Generic:Conn_01x03") (at 101.6 135.89 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(uuid ff241e45-ad71-468a-af34-530f0c7608e6)
(property "Reference" "J2" (id 0) (at 104.14 134.6199 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "Conn_01x03" (id 1) (at 104.14 137.1599 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Horizontal" (id 2) (at 101.6 135.89 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 101.6 135.89 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 49c767de-a00f-44ca-892a-35681a6ce407))
(pin "2" (uuid 34470289-4440-4673-9391-29f3b63c9d4e))
(pin "3" (uuid dd57d2b3-b428-4b17-b11f-f41dc0dc89df))
)
(sheet_instances
(path "/" (page "1"))
)
Expand All @@ -1272,6 +1430,12 @@
(path "/9b910c7f-2658-4050-ab20-b1c595dbd5ca"
(reference "J1") (unit 1) (value "Conn_02x15_Odd_Even") (footprint "Connector_PinSocket_2.54mm:PinSocket_2x15_P2.54mm_Horizontal")
)
(path "/ff241e45-ad71-468a-af34-530f0c7608e6"
(reference "J2") (unit 1) (value "Conn_01x03") (footprint "Connector_PinSocket_2.54mm:PinSocket_1x03_P2.54mm_Horizontal")
)
(path "/8effd443-b0b6-40d4-943d-96cc25aee3c6"
(reference "J3") (unit 1) (value "Conn_01x03") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Horizontal")
)
(path "/af0af41e-659e-4e99-9b35-33f9dcf2ed42"
(reference "R1") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric")
)
Expand Down
4 changes: 2 additions & 2 deletions Firmware/LogicAnalyzer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pico_generate_pio_header(${PROJECT_NAME}
)

pico_set_program_name(LogicAnalyzer "LogicAnalyzer")
pico_set_program_version(LogicAnalyzer "3.0")
pico_set_program_version(LogicAnalyzer "4.0")


pico_enable_stdio_uart(LogicAnalyzer 0)
Expand All @@ -40,7 +40,7 @@ pico_enable_stdio_usb(LogicAnalyzer 1)
# Regular pico: empty
# Pico W without WiFi support: pico_cyw43_arch_none
# Pico W with WiFi support: pico_cyw43_arch_lwip_poll
# set (CYW_LIB pico_cyw43_arch_lwip_poll)
set (CYW_LIB pico_cyw43_arch_lwip_poll)
# set (CYW_LIB pico_cyw43_arch_none)

# Add any user requested libraries
Expand Down
Empty file.
6 changes: 3 additions & 3 deletions Firmware/LogicAnalyzer/LogicAnalyzer.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,12 @@ void processData(uint8_t* data, uint length, bool fromWiFi)
{
#ifdef BUILD_PICO_W
#ifdef ENABLE_WIFI
sendResponse("LOGIC_ANALYZER_WIFI_V3_5\n", fromWiFi); //Our ID
sendResponse("LOGIC_ANALYZER_WIFI_V4_0\n", fromWiFi); //Our ID
#else
sendResponse("LOGIC_ANALYZER_W_V3_5\n", fromWiFi); //Our ID
sendResponse("LOGIC_ANALYZER_W_V4_0\n", fromWiFi); //Our ID
#endif
#else
sendResponse("LOGIC_ANALYZER_V3_5\n", fromWiFi); //Our ID
sendResponse("LOGIC_ANALYZER_V4_0\n", fromWiFi); //Our ID
#endif
}
break;
Expand Down
Loading

0 comments on commit fc05977

Please sign in to comment.