Merge pull request #4 from mossmann/dev-r1.1.0

r1.1.0
greatscottgadgets · Jul 15, 2023 · 7d585f4 · 7d585f4
2 parents c3e169a + 2f495b9
commit 7d585f4
Show file tree

Hide file tree

Showing 7 changed files with 9,027 additions and 8,877 deletions.
diff --git a/cynthion/clock_pmod.kicad_sch b/cynthion/clock_pmod.kicad_sch
@@ -2054,7 +2054,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 143f9751-81e4-469b-9f79-97e3accd4113)
   )
-  (label "MON.SLOW" (at 161.29 107.95 180)
+  (label "MON.SLOW" (at 161.29 102.87 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 14ba4696-ad1a-4269-b5e3-fb2b78570e72)
   )
@@ -2070,7 +2070,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 32ae466a-5292-4c82-b809-a36e24715422)
   )
-  (label "MON.SCL" (at 161.29 102.87 180)
+  (label "MON.SCL" (at 161.29 110.49 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 4cf13512-879f-4dc6-8f66-afdb09008b32)
   )
@@ -2090,7 +2090,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 82337f45-0eac-43e7-a034-70cbb09c17af)
   )
-  (label "MON.GPIO" (at 161.29 110.49 180)
+  (label "MON.GPIO" (at 161.29 105.41 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 834d3a89-dd94-440f-8448-2aead45be2d0)
   )
@@ -2106,11 +2106,11 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid aeb687d4-8540-456b-95a0-ca53e595bc8c)
   )
-  (label "MON.SDA" (at 161.29 105.41 180)
+  (label "MON.SDA" (at 161.29 113.03 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid b754f96d-01fb-487b-96d3-47edb5612c5f)
   )
-  (label "MON.~{PWRDN}" (at 161.29 113.03 180)
+  (label "MON.~{PWRDN}" (at 161.29 107.95 180)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid c62688e4-cd65-4b03-9226-2cbb9df4c6fa)
   )

diff --git a/cynthion/cynthion.kicad_pcb b/cynthion/cynthion.kicad_pcb
diff --git a/cynthion/cynthion.kicad_pro b/cynthion/cynthion.kicad_pro
@@ -124,8 +124,6 @@
       },
       "track_widths": [
         0.0,
-        0.0889,
-        0.1,
         0.127,
         0.1524,
         0.2032,
@@ -392,38 +390,6 @@
         "via_diameter": 0.4572,
         "via_drill": 0.2032,
         "wire_width": 6.0
-      },
-      {
-        "bus_width": 12.0,
-        "clearance": 0.0889,
-        "diff_pair_gap": 0.127,
-        "diff_pair_via_gap": 0.25,
-        "diff_pair_width": 0.127,
-        "line_style": 0,
-        "microvia_diameter": 0.3048,
-        "microvia_drill": 0.1016,
-        "name": "VBUS sense",
-        "nets": [
-          "/Power Distribution and Monitoring/AUX_VBUS",
-          "/Power Distribution and Monitoring/CONTROL_VBUS",
-          "/Power Distribution and Monitoring/TARGET_A_VBUS",
-          "/Power Distribution and Monitoring/TARGET_C_VBUS",
-          "AUX_VBUS_IN",
-          "CONTROL_VBUS_IN",
-          "GND",
-          "MON.GPIO",
-          "MON.SDA",
-          "MON.SLOW",
-          "MON.~{PWRDN}",
-          "TARGET_A_VBUS_IN",
-          "TARGET_C_VBUS_IN"
-        ],
-        "pcb_color": "rgba(0, 0, 0, 0.000)",
-        "schematic_color": "rgba(0, 0, 0, 0.000)",
-        "track_width": 0.0889,
-        "via_diameter": 0.4572,
-        "via_drill": 0.2032,
-        "wire_width": 6.0
       }
     ],
     "meta": {
@@ -523,7 +489,7 @@
     ]
   ],
   "text_variables": {
-    "DATE": "2023-05-17",
-    "VERSION": "1.0.0"
+    "DATE": "2023-05-18",
+    "VERSION": "1.1.0"
   }
 }
diff --git a/cynthion/cynthion.kicad_sch b/cynthion/cynthion.kicad_sch
@@ -1142,8 +1142,8 @@
     )
   )
 
-  (bus_alias "TYPE_C" (members "SDA" "SCL" "SBU1S" "SBU2S" "~{INT}" "~{FAULT}"))
   (bus_alias "ULPI" (members "DATA[0..7]" "CLK" "DIR" "STP" "NXT" "~{RESET}"))
+  (bus_alias "TYPE_C" (members "SDA" "SCL" "SBU1S" "SBU2S" "~{INT}" "~{FAULT}"))
   (junction (at 76.2 128.27) (diameter 0) (color 0 0 0 0)
     (uuid 01b76df7-fd1d-4696-a018-c17e903f0523)
   )
@@ -4340,6 +4340,9 @@
     (path "/00000000-0000-0000-0000-00005df88884/5839d576-e00c-4487-bf22-ea075cd425c7"
       (reference "#PWR0175") (unit 1) (value "+3V3") (footprint "")
     )
+    (path "/490fda6e-4eae-4b35-a875-405b51914829/50962813-4dfc-4287-a65b-a2a1736e491a"
+      (reference "#PWR0176") (unit 1) (value "+3V3") (footprint "")
+    )
     (path "/00000000-0000-0000-0000-00005da7baf4/00000000-0000-0000-0000-00005db79e95"
       (reference "C1") (unit 1) (value "2.2uF") (footprint "Capacitor_SMD:C_0603_1608Metric")
     )
@@ -5270,12 +5273,6 @@
     (path "/490fda6e-4eae-4b35-a875-405b51914829/cfdc7254-bd8f-408c-87bd-14646d1092b6"
       (reference "TP49") (unit 1) (value "TestPoint") (footprint "TestPoint:TestPoint_Pad_D1.0mm")
     )
-    (path "/490fda6e-4eae-4b35-a875-405b51914829/60001628-c0ef-4f6f-8c85-f208551dbe9d"
-      (reference "TP50") (unit 1) (value "TestPoint") (footprint "TestPoint:TestPoint_Pad_D1.0mm")
-    )
-    (path "/490fda6e-4eae-4b35-a875-405b51914829/f232ea84-615e-4993-8962-08576e32477e"
-      (reference "TP51") (unit 1) (value "TestPoint") (footprint "TestPoint:TestPoint_Pad_D1.0mm")
-    )
     (path "/00000000-0000-0000-0000-00005def5588/190f2fa6-da93-4c58-aa0d-a42e622352d9"
       (reference "TP52") (unit 1) (value "TestPoint") (footprint "TestPoint:TestPoint_Pad_D1.0mm")
     )
@@ -5289,7 +5286,7 @@
       (reference "TP55") (unit 1) (value "TestPoint") (footprint "TestPoint:TestPoint_Pad_D1.0mm")
     )
     (path "/490fda6e-4eae-4b35-a875-405b51914829/d4a612a7-1a24-4a8c-8dfe-6da5c46e1350"
-      (reference "U1") (unit 1) (value "PAC1954") (footprint "luna:WLCSP-16_2.225x2.170mm_Layout4x4_P0.5mm")
+      (reference "U1") (unit 1) (value "PAC1954") (footprint "Package_DFN_QFN:QFN-16-1EP_3x3mm_P0.5mm_EP1.45x1.45mm")
     )
     (path "/00000000-0000-0000-0000-00005dddb747/a2826531-0e7e-407c-a8fc-747461f42ebd"
       (reference "U2") (unit 1) (value "FUSB302B") (footprint "Package_DFN_QFN:WQFN-14-1EP_2.5x2.5mm_P0.5mm_EP1.45x1.45mm")

diff --git a/cynthion/fpga_configuration.kicad_sch b/cynthion/fpga_configuration.kicad_sch
@@ -2146,7 +2146,7 @@
   )
 
   (no_connect (at 247.65 90.17) (uuid 15566aa1-c63c-43b9-b26c-b9c75601d76c))
-  (no_connect (at 247.65 67.31) (uuid 1854ee86-2ce4-4a1a-a4fe-994d06c243c2))
+  (no_connect (at 247.65 87.63) (uuid 1854ee86-2ce4-4a1a-a4fe-994d06c243c2))
   (no_connect (at 247.65 74.93) (uuid 3514d2fa-1f10-41f0-b578-9e44cbcd334d))
   (no_connect (at 247.65 95.25) (uuid 3c05e181-465f-4b2e-b83d-8773ae96581d))
   (no_connect (at 247.65 69.85) (uuid 6bf218b8-60d0-4c16-9d74-f35706aeebe3))
@@ -2736,7 +2736,7 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cbdf2ee4-04d8-4218-a545-15be7229dd45)
   )
-  (wire (pts (xy 247.65 87.63) (xy 233.68 87.63))
+  (wire (pts (xy 247.65 67.31) (xy 236.22 67.31))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid cc6bcdbf-dd57-4f1b-9c44-86bda5f38799)
   )
@@ -3012,27 +3012,27 @@
     (uuid ff223469-9527-48f4-afe6-8e7798eee47e)
   )
 
-  (label "FPGA_TMS" (at 233.68 105.41 0)
+  (label "FPGA_TMS" (at 236.22 105.41 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 00957a7b-cc96-4d0e-9200-3ed337452733)
   )
-  (label "D1" (at 234.95 82.55 0)
+  (label "D1" (at 236.22 82.55 0)
     (effects (font (size 1.1176 1.1176)) (justify left bottom))
     (uuid 054d446e-7d12-4d46-a44d-e55711735e41)
   )
-  (label "~{FPGA_INIT}" (at 233.68 138.43 0)
+  (label "~{FPGA_INIT}" (at 232.41 138.43 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 0cb41c71-0392-4b22-865b-e0c7a855b08a)
   )
   (label "FPGA_TMS" (at 147.32 77.47 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 11131ee6-77e8-4e68-bf11-1be695c6fd6d)
   )
-  (label "D0" (at 234.95 85.09 0)
+  (label "D0" (at 236.22 85.09 0)
     (effects (font (size 1.1176 1.1176)) (justify left bottom))
     (uuid 113bc7fd-e11f-498d-9346-fede85eb1204)
   )
-  (label "D3" (at 234.95 77.47 0)
+  (label "D3" (at 236.22 77.47 0)
     (effects (font (size 1.1176 1.1176)) (justify left bottom))
     (uuid 11f76dac-7535-4cbe-addb-b48c22567bed)
   )
@@ -3052,27 +3052,27 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 57536390-7340-4fb3-a3d7-da086470d08e)
   )
-  (label "FPGA_INT" (at 233.68 87.63 0)
+  (label "FPGA_INT" (at 236.22 67.31 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 61dad835-3ecd-4874-b411-06ace3134582)
   )
-  (label "D2" (at 234.95 80.01 0)
+  (label "D2" (at 236.22 80.01 0)
     (effects (font (size 1.1176 1.1176)) (justify left bottom))
     (uuid 6fede7d4-30cb-4e8a-98d3-a6cdc62e289e)
   )
-  (label "FPGA_DONE" (at 233.68 135.89 0)
+  (label "FPGA_DONE" (at 232.41 135.89 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 700170fe-1afa-418c-ae69-78d61a25e923)
   )
-  (label "FPGA_TDO" (at 233.68 113.03 0)
+  (label "FPGA_TDO" (at 236.22 113.03 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 73c52416-5daf-48e5-bc9c-f5e4a492751e)
   )
   (label "MCU_SWDIO" (at 62.865 72.39 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8031462b-7687-42f4-b809-08649a1f707a)
   )
-  (label "~{FPGA_PROGRAM}" (at 233.68 140.97 0)
+  (label "~{FPGA_PROGRAM}" (at 232.41 140.97 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 808f6c82-4cf3-46c8-937a-769438f8157e)
   )
@@ -3088,7 +3088,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8ed5d803-7d36-47bc-b641-617c85311db3)
   )
-  (label "FPGA_TDI" (at 233.68 110.49 0)
+  (label "FPGA_TDI" (at 236.22 110.49 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 90f4ccb1-12a0-4bd3-ac55-f3efa5de5fdf)
   )
@@ -3100,7 +3100,7 @@
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid c624f425-15ed-42b6-825c-95b2f7346c72)
   )
-  (label "FPGA_TCK" (at 233.68 107.95 0)
+  (label "FPGA_TCK" (at 236.22 107.95 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid d8db2970-c27a-434c-be9e-33c951837fe0)
   )
@@ -3116,7 +3116,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e7fbd7ff-c445-447e-8ec9-4ac7ace481ef)
   )
-  (label "~{CS_DI}" (at 233.68 92.71 0)
+  (label "~{CS_DI}" (at 236.22 92.71 0)
     (effects (font (size 1.1176 1.1176)) (justify left bottom))
     (uuid e90d277a-b885-4bc7-9ffa-15feae9d5b4d)
   )