Przeglądaj źródła

hardware: Optimize BT pin mapping and add lots of traces (mainly BT).

Mathias Gottschlag 4 lat temu
rodzic
commit
c602c5bb31

+ 252
- 233
hackamp/hardware/bluetooth.kicad_sch
Plik diff jest za duży
Wyświetl plik


+ 39143
- 82591
hackamp/hardware/hackamp.kicad_pcb
Plik diff jest za duży
Wyświetl plik


+ 5
- 1
hackamp/hardware/hackamp.kicad_pro Wyświetl plik

@@ -120,8 +120,12 @@
120 120
       "track_widths": [
121 121
         0.0,
122 122
         0.25,
123
+        0.35,
124
+        0.4,
123 125
         0.5,
124
-        1.0
126
+        1.0,
127
+        2.0,
128
+        3.0
125 129
       ],
126 130
       "via_dimensions": [
127 131
         {

+ 3
- 6
hackamp/hardware/hackamp.kicad_sch Wyświetl plik

@@ -1454,12 +1454,6 @@
1454 1454
     (path "/00000000-0000-0000-0000-00005fa5bd7a/9538ca32-2a66-4b9b-83bc-07e377df3f12"
1455 1455
       (reference "J12") (unit 1) (value "GPIO") (footprint "Connector_PinHeader_2.54mm:PinHeader_2x10_P2.54mm_Vertical")
1456 1456
     )
1457
-    (path "/00000000-0000-0000-0000-00005fa5bd7a/1dbbef67-e1c7-42af-81c5-5484adf37e0f"
1458
-      (reference "L7") (unit 1) (value "600") (footprint "Inductor_SMD:L_0603_1608Metric")
1459
-    )
1460
-    (path "/00000000-0000-0000-0000-00005fa5bd7a/dd9da900-3b5f-43f2-84c8-4f993c3e3484"
1461
-      (reference "L8") (unit 1) (value "600") (footprint "Inductor_SMD:L_0603_1608Metric")
1462
-    )
1463 1457
     (path "/00000000-0000-0000-0000-00005fa5bd7a/00000000-0000-0000-0000-00005fa8a848"
1464 1458
       (reference "R1") (unit 1) (value "1.8k") (footprint "Resistor_SMD:R_0603_1608Metric")
1465 1459
     )
@@ -1517,6 +1511,9 @@
1517 1511
     (path "/00000000-0000-0000-0000-00005fa5bdb1/d054ea03-da9a-467c-ac79-393fdcfc406f"
1518 1512
       (reference "#PWR04") (unit 1) (value "GND") (footprint "")
1519 1513
     )
1514
+    (path "/00000000-0000-0000-0000-00005fa5bdb1/8286a9c3-a188-4588-a430-c07f574ca7ce"
1515
+      (reference "#PWR0105") (unit 1) (value "GND") (footprint "")
1516
+    )
1520 1517
     (path "/00000000-0000-0000-0000-00005fa5bdb1/00000000-0000-0000-0000-00005fb8557b"
1521 1518
       (reference "#PWR0107") (unit 1) (value "GND") (footprint "")
1522 1519
     )

+ 32
- 207
hackamp/hardware/processor.kicad_sch Wyświetl plik

@@ -502,137 +502,6 @@
502 502
         )
503 503
       )
504 504
     )
505
-    (symbol "Device:L_Ferrite" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
506
-      (property "Reference" "L" (id 0) (at -1.27 0 90)
507
-        (effects (font (size 1.27 1.27)))
508
-      )
509
-      (property "Value" "L_Ferrite" (id 1) (at 2.794 0 90)
510
-        (effects (font (size 1.27 1.27)))
511
-      )
512
-      (property "Footprint" "" (id 2) (at 0 0 0)
513
-        (effects (font (size 1.27 1.27)) hide)
514
-      )
515
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
516
-        (effects (font (size 1.27 1.27)) hide)
517
-      )
518
-      (property "ki_keywords" "inductor choke coil reactor magnetic" (id 4) (at 0 0 0)
519
-        (effects (font (size 1.27 1.27)) hide)
520
-      )
521
-      (property "ki_description" "Inductor with ferrite core" (id 5) (at 0 0 0)
522
-        (effects (font (size 1.27 1.27)) hide)
523
-      )
524
-      (property "ki_fp_filters" "Choke_* *Coil* Inductor_* L_*" (id 6) (at 0 0 0)
525
-        (effects (font (size 1.27 1.27)) hide)
526
-      )
527
-      (symbol "L_Ferrite_0_1"
528
-        (arc (start 0 -2.54) (end 0 -1.27) (radius (at 0 -1.905) (length 0.635) (angles -89.9 89.9))
529
-          (stroke (width 0)) (fill (type none))
530
-        )
531
-        (arc (start 0 -1.27) (end 0 0) (radius (at 0 -0.635) (length 0.635) (angles -89.9 89.9))
532
-          (stroke (width 0)) (fill (type none))
533
-        )
534
-        (arc (start 0 0) (end 0 1.27) (radius (at 0 0.635) (length 0.635) (angles -89.9 89.9))
535
-          (stroke (width 0)) (fill (type none))
536
-        )
537
-        (arc (start 0 1.27) (end 0 2.54) (radius (at 0 1.905) (length 0.635) (angles -89.9 89.9))
538
-          (stroke (width 0)) (fill (type none))
539
-        )
540
-        (polyline
541
-          (pts
542
-            (xy 1.016 -2.794)
543
-            (xy 1.016 -2.286)
544
-          )
545
-          (stroke (width 0)) (fill (type none))
546
-        )
547
-        (polyline
548
-          (pts
549
-            (xy 1.016 -1.778)
550
-            (xy 1.016 -1.27)
551
-          )
552
-          (stroke (width 0)) (fill (type none))
553
-        )
554
-        (polyline
555
-          (pts
556
-            (xy 1.016 -0.762)
557
-            (xy 1.016 -0.254)
558
-          )
559
-          (stroke (width 0)) (fill (type none))
560
-        )
561
-        (polyline
562
-          (pts
563
-            (xy 1.016 0.254)
564
-            (xy 1.016 0.762)
565
-          )
566
-          (stroke (width 0)) (fill (type none))
567
-        )
568
-        (polyline
569
-          (pts
570
-            (xy 1.016 1.27)
571
-            (xy 1.016 1.778)
572
-          )
573
-          (stroke (width 0)) (fill (type none))
574
-        )
575
-        (polyline
576
-          (pts
577
-            (xy 1.016 2.286)
578
-            (xy 1.016 2.794)
579
-          )
580
-          (stroke (width 0)) (fill (type none))
581
-        )
582
-        (polyline
583
-          (pts
584
-            (xy 1.524 -2.286)
585
-            (xy 1.524 -2.794)
586
-          )
587
-          (stroke (width 0)) (fill (type none))
588
-        )
589
-        (polyline
590
-          (pts
591
-            (xy 1.524 -1.27)
592
-            (xy 1.524 -1.778)
593
-          )
594
-          (stroke (width 0)) (fill (type none))
595
-        )
596
-        (polyline
597
-          (pts
598
-            (xy 1.524 -0.254)
599
-            (xy 1.524 -0.762)
600
-          )
601
-          (stroke (width 0)) (fill (type none))
602
-        )
603
-        (polyline
604
-          (pts
605
-            (xy 1.524 0.762)
606
-            (xy 1.524 0.254)
607
-          )
608
-          (stroke (width 0)) (fill (type none))
609
-        )
610
-        (polyline
611
-          (pts
612
-            (xy 1.524 1.778)
613
-            (xy 1.524 1.27)
614
-          )
615
-          (stroke (width 0)) (fill (type none))
616
-        )
617
-        (polyline
618
-          (pts
619
-            (xy 1.524 2.794)
620
-            (xy 1.524 2.286)
621
-          )
622
-          (stroke (width 0)) (fill (type none))
623
-        )
624
-      )
625
-      (symbol "L_Ferrite_1_1"
626
-        (pin passive line (at 0 3.81 270) (length 1.27)
627
-          (name "1" (effects (font (size 1.27 1.27))))
628
-          (number "1" (effects (font (size 1.27 1.27))))
629
-        )
630
-        (pin passive line (at 0 -3.81 90) (length 1.27)
631
-          (name "2" (effects (font (size 1.27 1.27))))
632
-          (number "2" (effects (font (size 1.27 1.27))))
633
-        )
634
-      )
635
-    )
636 505
     (symbol "Device:R" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
637 506
       (property "Reference" "R" (id 0) (at 2.032 0 90)
638 507
         (effects (font (size 1.27 1.27)))
@@ -1632,10 +1501,10 @@
1632 1501
   (wire (pts (xy 22.86 236.22) (xy 20.32 236.22))
1633 1502
     (stroke (width 0) (type solid) (color 0 0 0 0))
1634 1503
   )
1635
-  (wire (pts (xy 22.86 236.22) (xy 22.86 238.76))
1504
+  (wire (pts (xy 22.86 238.76) (xy 22.86 236.22))
1636 1505
     (stroke (width 0) (type solid) (color 0 0 0 0))
1637 1506
   )
1638
-  (wire (pts (xy 22.86 238.76) (xy 27.94 238.76))
1507
+  (wire (pts (xy 22.86 238.76) (xy 43.18 238.76))
1639 1508
     (stroke (width 0) (type solid) (color 0 0 0 0))
1640 1509
   )
1641 1510
   (wire (pts (xy 22.86 270.51) (xy 22.86 273.05))
@@ -1647,6 +1516,9 @@
1647 1516
   (wire (pts (xy 22.86 275.59) (xy 22.86 273.05))
1648 1517
     (stroke (width 0) (type solid) (color 0 0 0 0))
1649 1518
   )
1519
+  (wire (pts (xy 22.86 275.59) (xy 43.18 275.59))
1520
+    (stroke (width 0) (type solid) (color 0 0 0 0))
1521
+  )
1650 1522
   (wire (pts (xy 24.13 173.99) (xy 31.75 173.99))
1651 1523
     (stroke (width 0) (type solid) (color 0 0 0 0))
1652 1524
   )
@@ -1659,9 +1531,6 @@
1659 1531
   (wire (pts (xy 26.67 50.8) (xy 31.75 50.8))
1660 1532
     (stroke (width 0) (type solid) (color 0 0 0 0))
1661 1533
   )
1662
-  (wire (pts (xy 27.94 275.59) (xy 22.86 275.59))
1663
-    (stroke (width 0) (type solid) (color 0 0 0 0))
1664
-  )
1665 1534
   (wire (pts (xy 30.48 111.76) (xy 30.48 114.3))
1666 1535
     (stroke (width 0) (type solid) (color 0 0 0 0))
1667 1536
   )
@@ -1743,12 +1612,6 @@
1743 1612
   (wire (pts (xy 33.02 255.27) (xy 30.48 255.27))
1744 1613
     (stroke (width 0) (type solid) (color 0 0 0 0))
1745 1614
   )
1746
-  (wire (pts (xy 35.56 238.76) (xy 43.18 238.76))
1747
-    (stroke (width 0) (type solid) (color 0 0 0 0))
1748
-  )
1749
-  (wire (pts (xy 35.56 275.59) (xy 43.18 275.59))
1750
-    (stroke (width 0) (type solid) (color 0 0 0 0))
1751
-  )
1752 1615
   (wire (pts (xy 38.1 20.32) (xy 38.1 17.78))
1753 1616
     (stroke (width 0) (type solid) (color 0 0 0 0))
1754 1617
   )
@@ -2034,15 +1897,6 @@
2034 1897
   (wire (pts (xy 100.33 121.92) (xy 102.87 121.92))
2035 1898
     (stroke (width 0) (type solid) (color 0 0 0 0))
2036 1899
   )
2037
-  (wire (pts (xy 100.33 124.46) (xy 102.87 124.46))
2038
-    (stroke (width 0) (type solid) (color 0 0 0 0))
2039
-  )
2040
-  (wire (pts (xy 100.33 127) (xy 102.87 127))
2041
-    (stroke (width 0) (type solid) (color 0 0 0 0))
2042
-  )
2043
-  (wire (pts (xy 100.33 129.54) (xy 102.87 129.54))
2044
-    (stroke (width 0) (type solid) (color 0 0 0 0))
2045
-  )
2046 1900
   (wire (pts (xy 100.33 139.7) (xy 102.87 139.7))
2047 1901
     (stroke (width 0) (type solid) (color 0 0 0 0))
2048 1902
   )
@@ -2088,6 +1942,15 @@
2088 1942
   (wire (pts (xy 102.87 86.36) (xy 92.71 86.36))
2089 1943
     (stroke (width 0) (type solid) (color 0 0 0 0))
2090 1944
   )
1945
+  (wire (pts (xy 102.87 124.46) (xy 100.33 124.46))
1946
+    (stroke (width 0) (type solid) (color 0 0 0 0))
1947
+  )
1948
+  (wire (pts (xy 102.87 127) (xy 100.33 127))
1949
+    (stroke (width 0) (type solid) (color 0 0 0 0))
1950
+  )
1951
+  (wire (pts (xy 102.87 129.54) (xy 100.33 129.54))
1952
+    (stroke (width 0) (type solid) (color 0 0 0 0))
1953
+  )
2091 1954
   (wire (pts (xy 102.87 137.16) (xy 100.33 137.16))
2092 1955
     (stroke (width 0) (type solid) (color 0 0 0 0))
2093 1956
   )
@@ -2391,15 +2254,6 @@
2391 2254
   (wire (pts (xy 163.83 165.1) (xy 166.37 165.1))
2392 2255
     (stroke (width 0) (type solid) (color 0 0 0 0))
2393 2256
   )
2394
-  (wire (pts (xy 163.83 180.34) (xy 166.37 180.34))
2395
-    (stroke (width 0) (type solid) (color 0 0 0 0))
2396
-  )
2397
-  (wire (pts (xy 163.83 182.88) (xy 166.37 182.88))
2398
-    (stroke (width 0) (type solid) (color 0 0 0 0))
2399
-  )
2400
-  (wire (pts (xy 163.83 185.42) (xy 166.37 185.42))
2401
-    (stroke (width 0) (type solid) (color 0 0 0 0))
2402
-  )
2403 2257
   (wire (pts (xy 163.83 187.96) (xy 166.37 187.96))
2404 2258
     (stroke (width 0) (type solid) (color 0 0 0 0))
2405 2259
   )
@@ -2460,6 +2314,15 @@
2460 2314
   (wire (pts (xy 166.37 167.64) (xy 163.83 167.64))
2461 2315
     (stroke (width 0) (type solid) (color 0 0 0 0))
2462 2316
   )
2317
+  (wire (pts (xy 166.37 180.34) (xy 163.83 180.34))
2318
+    (stroke (width 0) (type solid) (color 0 0 0 0))
2319
+  )
2320
+  (wire (pts (xy 166.37 182.88) (xy 163.83 182.88))
2321
+    (stroke (width 0) (type solid) (color 0 0 0 0))
2322
+  )
2323
+  (wire (pts (xy 166.37 185.42) (xy 163.83 185.42))
2324
+    (stroke (width 0) (type solid) (color 0 0 0 0))
2325
+  )
2463 2326
   (wire (pts (xy 168.91 20.32) (xy 168.91 22.86))
2464 2327
     (stroke (width 0) (type solid) (color 0 0 0 0))
2465 2328
   )
@@ -2650,19 +2513,19 @@
2650 2513
   (hierarchical_label "VOL15" (shape output) (at 100.33 96.52 180)
2651 2514
     (effects (font (size 1.27 1.27)) (justify right))
2652 2515
   )
2653
-  (hierarchical_label "BT_MFB" (shape output) (at 100.33 119.38 180)
2516
+  (hierarchical_label "BT_P8" (shape input) (at 100.33 119.38 180)
2654 2517
     (effects (font (size 1.27 1.27)) (justify right))
2655 2518
   )
2656
-  (hierarchical_label "BT_SPI{slash}~PCM" (shape output) (at 100.33 121.92 180)
2519
+  (hierarchical_label "BT_P9" (shape input) (at 100.33 121.92 180)
2657 2520
     (effects (font (size 1.27 1.27)) (justify right))
2658 2521
   )
2659
-  (hierarchical_label "BT_P6" (shape output) (at 100.33 124.46 180)
2522
+  (hierarchical_label "BT_P31" (shape input) (at 100.33 124.46 180)
2660 2523
     (effects (font (size 1.27 1.27)) (justify right))
2661 2524
   )
2662
-  (hierarchical_label "BT_P7" (shape output) (at 100.33 127 180)
2525
+  (hierarchical_label "BT_P30" (shape input) (at 100.33 127 180)
2663 2526
     (effects (font (size 1.27 1.27)) (justify right))
2664 2527
   )
2665
-  (hierarchical_label "BT_P8" (shape input) (at 100.33 129.54 180)
2528
+  (hierarchical_label "BT_P29" (shape input) (at 100.33 129.54 180)
2666 2529
     (effects (font (size 1.27 1.27)) (justify right))
2667 2530
   )
2668 2531
   (hierarchical_label "AMP_I2C_SDA" (shape input) (at 100.33 137.16 180)
@@ -2791,13 +2654,13 @@
2791 2654
   (hierarchical_label "BT_I2S_SDO" (shape input) (at 166.37 167.64 0)
2792 2655
     (effects (font (size 1.27 1.27)) (justify left))
2793 2656
   )
2794
-  (hierarchical_label "BT_P31" (shape input) (at 166.37 180.34 0)
2657
+  (hierarchical_label "BT_P6" (shape output) (at 166.37 180.34 0)
2795 2658
     (effects (font (size 1.27 1.27)) (justify left))
2796 2659
   )
2797
-  (hierarchical_label "BT_P30" (shape input) (at 166.37 182.88 0)
2660
+  (hierarchical_label "BT_P7" (shape output) (at 166.37 182.88 0)
2798 2661
     (effects (font (size 1.27 1.27)) (justify left))
2799 2662
   )
2800
-  (hierarchical_label "BT_P29" (shape input) (at 166.37 185.42 0)
2663
+  (hierarchical_label "BT_SPI{slash}~PCM" (shape output) (at 166.37 185.42 0)
2801 2664
     (effects (font (size 1.27 1.27)) (justify left))
2802 2665
   )
2803 2666
   (hierarchical_label "BT_P21" (shape output) (at 166.37 187.96 0)
@@ -2812,7 +2675,7 @@
2812 2675
   (hierarchical_label "BT_P16" (shape output) (at 166.37 195.58 0)
2813 2676
     (effects (font (size 1.27 1.27)) (justify left))
2814 2677
   )
2815
-  (hierarchical_label "BT_P9" (shape input) (at 166.37 198.12 0)
2678
+  (hierarchical_label "BT_MFB" (shape output) (at 166.37 198.12 0)
2816 2679
     (effects (font (size 1.27 1.27)) (justify left))
2817 2680
   )
2818 2681
   (hierarchical_label "HP_DETECT" (shape input) (at 189.23 170.18 0)
@@ -3138,44 +3001,6 @@
3138 3001
     )
3139 3002
   )
3140 3003
 
3141
-  (symbol (lib_id "Device:L_Ferrite") (at 31.75 238.76 90) (unit 1)
3142
-    (in_bom yes) (on_board yes)
3143
-    (uuid "1dbbef67-e1c7-42af-81c5-5484adf37e0f")
3144
-    (property "Reference" "L7" (id 0) (at 31.75 232.41 90))
3145
-    (property "Value" "600" (id 1) (at 31.75 234.95 90))
3146
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 31.75 238.76 0)
3147
-      (effects (font (size 1.27 1.27)) hide)
3148
-    )
3149
-    (property "Datasheet" "~" (id 3) (at 31.75 238.76 0)
3150
-      (effects (font (size 1.27 1.27)) hide)
3151
-    )
3152
-    (property "Mouser" "623-2506036017Y2" (id 4) (at 31.75 238.76 0)
3153
-      (effects (font (size 1.27 1.27)) hide)
3154
-    )
3155
-    (property "Part Name" "Fair-Rite 2506036017Y2" (id 5) (at 31.75 238.76 0)
3156
-      (effects (font (size 1.27 1.27)) hide)
3157
-    )
3158
-  )
3159
-
3160
-  (symbol (lib_id "Device:L_Ferrite") (at 31.75 275.59 90) (unit 1)
3161
-    (in_bom yes) (on_board yes)
3162
-    (uuid "dd9da900-3b5f-43f2-84c8-4f993c3e3484")
3163
-    (property "Reference" "L8" (id 0) (at 31.75 269.24 90))
3164
-    (property "Value" "600" (id 1) (at 31.75 271.78 90))
3165
-    (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (id 2) (at 31.75 275.59 0)
3166
-      (effects (font (size 1.27 1.27)) hide)
3167
-    )
3168
-    (property "Datasheet" "~" (id 3) (at 31.75 275.59 0)
3169
-      (effects (font (size 1.27 1.27)) hide)
3170
-    )
3171
-    (property "Mouser" "623-2506036017Y2" (id 4) (at 31.75 275.59 0)
3172
-      (effects (font (size 1.27 1.27)) hide)
3173
-    )
3174
-    (property "Part Name" "Fair-Rite 2506036017Y2" (id 5) (at 31.75 275.59 0)
3175
-      (effects (font (size 1.27 1.27)) hide)
3176
-    )
3177
-  )
3178
-
3179 3004
   (symbol (lib_id "Device:Crystal_Small") (at 82.55 83.82 90) (unit 1)
3180 3005
     (in_bom yes) (on_board yes)
3181 3006
     (uuid "1a276aa6-b113-4617-8385-287d58f1fd14")

+ 13
- 0
hackamp/hardware/speaker-amp.kicad_sch Wyświetl plik

@@ -957,6 +957,19 @@
957 957
     (stroke (width 0) (type solid) (color 0 0 0 0))
958 958
   )
959 959
 
960
+  (label "SPK_A+" (at 139.7 66.04 180)
961
+    (effects (font (size 1.27 1.27)) (justify right bottom))
962
+  )
963
+  (label "SPK_A-" (at 139.7 68.58 180)
964
+    (effects (font (size 1.27 1.27)) (justify right bottom))
965
+  )
966
+  (label "SPK_B+" (at 139.7 81.28 180)
967
+    (effects (font (size 1.27 1.27)) (justify right bottom))
968
+  )
969
+  (label "SPK_B-" (at 139.7 83.82 180)
970
+    (effects (font (size 1.27 1.27)) (justify right bottom))
971
+  )
972
+
960 973
   (hierarchical_label "~SPK_FAULT" (shape output) (at 58.42 76.2 180)
961 974
     (effects (font (size 1.27 1.27)) (justify right))
962 975
   )

Ładowanie…
Anuluj
Zapisz