Skip to content

Commit be4223c

Browse files
Merge branch 'development' into main
2 parents 3378c06 + a957d70 commit be4223c

12 files changed

+8360
-8000
lines changed

Hardware/OpenMowerMainboard/GPS.kicad_sch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,6 @@
905905
)
906906
)
907907
908-
909908
(junction (at 118.11 96.52) (diameter 0) (color 0 0 0 0)
910909
(uuid b8b15b51-8345-4a1d-8ecf-04fc15b9e450)
911910
)

Hardware/OpenMowerMainboard/MyModules.pretty/WT901.kicad_mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
(fp_line (start -7.45 2.499999) (end -7.45 7.5) (layer "F.Fab") (width 0.12) (tstamp 9f385574-248d-49bb-8866-d358753413de))
2727
(fp_line (start -7.45 7.5) (end 7.45 7.5) (layer "F.Fab") (width 0.12) (tstamp ae159030-0423-4a69-97b5-5edcede41312))
2828
(fp_line (start 7.45 7.5) (end 7.45 -7.5) (layer "F.Fab") (width 0.12) (tstamp da04f3f0-c5d1-4887-922b-4ea4a662d726))
29-
(pad "1" thru_hole oval (at -6.35 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp a502cd57-bd3e-4366-9ada-61598eb59137))
30-
(pad "2" thru_hole oval (at -3.81 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp 22bb17ce-2921-4916-a9c6-0854019c8ede))
31-
(pad "3" thru_hole oval (at -1.27 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp 6b410de5-898f-4eab-923a-3bceab206172))
32-
(pad "4" thru_hole oval (at 1.27 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp 757ce66e-3068-45f1-8d0d-862b9134c2a6))
33-
(pad "5" thru_hole oval (at 3.81 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp ced500e8-7eb9-459d-b3c5-2c5724afe055))
34-
(pad "6" thru_hole oval (at 6.35 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp a489be82-9da0-4d48-b9c9-d0ab64ffe1e9))
35-
(pad "7" connect oval (at 6.35 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 3d131b53-9398-409c-a184-fe4cbaf51d7f))
36-
(pad "8" connect oval (at 3.81 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 78f2ac9f-55b7-4523-a313-06c650d23b00))
37-
(pad "9" connect oval (at 1.27 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 9cc99731-3bb1-474f-9855-89aad5c596fb))
38-
(pad "10" connect oval (at -1.27 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 38866133-f31b-4db2-b7c4-22b69fe34807))
39-
(pad "11" connect oval (at -3.81 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 8cbb86f1-a348-4391-9f33-902341e0b6db))
40-
(pad "12" connect oval (at -6.35 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp b7917eef-742d-4826-a0c8-1903631be269))
29+
(pad "a1" thru_hole oval (at -6.35 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp a502cd57-bd3e-4366-9ada-61598eb59137))
30+
(pad "a2" thru_hole oval (at -3.81 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp 22bb17ce-2921-4916-a9c6-0854019c8ede))
31+
(pad "a3" thru_hole oval (at -1.27 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp 6b410de5-898f-4eab-923a-3bceab206172))
32+
(pad "a4" thru_hole oval (at 1.27 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp 757ce66e-3068-45f1-8d0d-862b9134c2a6))
33+
(pad "a5" thru_hole oval (at 3.81 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp ced500e8-7eb9-459d-b3c5-2c5724afe055))
34+
(pad "a6" thru_hole oval (at 6.35 6) (size 1.2 2) (drill 0.8) (layers *.Cu *.Mask) (tstamp a489be82-9da0-4d48-b9c9-d0ab64ffe1e9))
35+
(pad "b1" connect oval (at -6.35 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp b7917eef-742d-4826-a0c8-1903631be269))
36+
(pad "b2" connect oval (at -3.81 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 8cbb86f1-a348-4391-9f33-902341e0b6db))
37+
(pad "b3" connect oval (at -1.27 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 38866133-f31b-4db2-b7c4-22b69fe34807))
38+
(pad "b4" connect oval (at 1.27 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 9cc99731-3bb1-474f-9855-89aad5c596fb))
39+
(pad "b5" connect oval (at 3.81 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 78f2ac9f-55b7-4523-a313-06c650d23b00))
40+
(pad "b6" connect oval (at 6.35 -6) (size 1.2 2) (layers "F.Cu" "F.Mask") (tstamp 3d131b53-9398-409c-a184-fe4cbaf51d7f))
4141
)

Hardware/OpenMowerMainboard/OpenMowerMainboard.kibot.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ preflight:
66
run_erc: true
77

88
filters:
9-
- filter: 'SIP32509DT has 2 VOUTs'
9+
- filter: SIP32509DT has 2 VOUTs
1010
error: 'pin_to_pin'
1111
regex: 'Symbol U3'
12+
- filter: WT901 and MPU9250 are mutually exclusive sitting in one physical space
13+
error: 'courtyards_overlap'
14+
regex: 'Footprint WT901'
1215

1316
set_text_variables:
1417
- name: 'git_version'

Hardware/OpenMowerMainboard/OpenMowerMainboard.kicad_pcb

Lines changed: 7712 additions & 7820 deletions
Large diffs are not rendered by default.

Hardware/OpenMowerMainboard/OpenMowerMainboard.kicad_sch

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2275,6 +2275,12 @@
22752275
(path "/ea926745-863d-461e-9df3-dbf32112727b/3935cc4c-fd83-4144-a6f3-151fe6ee58c5"
22762276
(reference "#FLG0102") (unit 1) (value "PWR_FLAG") (footprint "")
22772277
)
2278+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/ade4ba95-bb29-4aa9-87dc-359f17a9ae9e"
2279+
(reference "#PWR02") (unit 1) (value "+3.3V") (footprint "")
2280+
)
2281+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/34ca760c-2a3c-4ceb-b90e-7d9fac8eabb1"
2282+
(reference "#PWR03") (unit 1) (value "+3.3V") (footprint "")
2283+
)
22782284
(path "/00000000-0000-0000-0000-000061040c60/00000000-0000-0000-0000-00006105dd51"
22792285
(reference "#PWR0101") (unit 1) (value "GND") (footprint "")
22802286
)
@@ -2290,12 +2296,6 @@
22902296
(path "/00000000-0000-0000-0000-000061040c60/00000000-0000-0000-0000-00006105dd93"
22912297
(reference "#PWR0105") (unit 1) (value "GND") (footprint "")
22922298
)
2293-
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/7fe21906-ad4b-4ec4-887d-be617ea907ee"
2294-
(reference "#PWR0106") (unit 1) (value "+5V") (footprint "")
2295-
)
2296-
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/794603ce-3e91-4ec0-acf0-222d1b79c674"
2297-
(reference "#PWR0107") (unit 1) (value "GND") (footprint "")
2298-
)
22992299
(path "/00000000-0000-0000-0000-000061040c60/3e1c4d9d-6fcf-4de0-994d-a29d1c10cdf1"
23002300
(reference "#PWR0108") (unit 1) (value "GND") (footprint "")
23012301
)
@@ -2512,6 +2512,18 @@
25122512
(path "/c4934db8-1638-4ac4-bd06-84d03b3fc106/f003affc-4283-4f1b-b85a-370da5ed5113"
25132513
(reference "#PWR0182") (unit 1) (value "GND") (footprint "")
25142514
)
2515+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/102cd287-2696-48b2-b786-61688cbb9c3c"
2516+
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
2517+
)
2518+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/4e707cab-2e0f-475e-a62e-4076cdf28bd5"
2519+
(reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
2520+
)
2521+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/73be5863-35ba-4e6d-8c8e-cde91de501b5"
2522+
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
2523+
)
2524+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/8d27188f-f7d1-4d3b-9fdd-6f6f49b40b07"
2525+
(reference "#PWR?") (unit 1) (value "+3.3V") (footprint "")
2526+
)
25152527
(path "/989a400d-9ce2-403e-a19e-ad0a758fe27c/e63a8013-6cf4-4d9b-bd93-9a34f164f50f"
25162528
(reference "C1") (unit 1) (value "100nF") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
25172529
)
@@ -2902,6 +2914,12 @@
29022914
(path "/c4934db8-1638-4ac4-bd06-84d03b3fc106/2e0a1b74-c101-4700-a813-5fe3514b579d"
29032915
(reference "JP9") (unit 1) (value "SolderJumper_2_Open") (footprint "Jumper:SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm")
29042916
)
2917+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/5a317b66-4d6f-45a2-818c-493292b02178"
2918+
(reference "JP10") (unit 1) (value "I2C_OR_TTL") (footprint "Jumper:SolderJumper-3_P1.3mm_Bridged12_Pad1.0x1.5mm")
2919+
)
2920+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/09f49870-24e4-4fa5-acbe-1e38749776ed"
2921+
(reference "JP11") (unit 1) (value "I2C_OR_TTL") (footprint "Jumper:SolderJumper-3_P1.3mm_Bridged12_Pad1.0x1.5mm")
2922+
)
29052923
(path "/ea926745-863d-461e-9df3-dbf32112727b/37b9c720-0c02-41f5-8880-c0bb97743a0d"
29062924
(reference "L1") (unit 1) (value "4.7uH 5A") (footprint "Inductor_SMD:L_Vishay_IHLP-2525")
29072925
)
@@ -2968,12 +2986,18 @@
29682986
(path "/7936fd08-09c5-4aba-8422-c848060d3b9f/42ad3914-b5f2-442a-b4be-a68250126d06"
29692987
(reference "R13") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
29702988
)
2989+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/dacf5d87-8489-47ef-aa9b-6d1a4b4f0758"
2990+
(reference "R14") (unit 1) (value "4k7") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
2991+
)
29712992
(path "/00000000-0000-0000-0000-000061040c60/a8bfe435-ed69-44cd-900a-618dba71e373/00000000-0000-0000-0000-0000613371b4"
29722993
(reference "R15") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
29732994
)
29742995
(path "/00000000-0000-0000-0000-000061040c60/a8bfe435-ed69-44cd-900a-618dba71e373/00000000-0000-0000-0000-0000613371be"
29752996
(reference "R16") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
29762997
)
2998+
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/eb13fa51-f7ca-4d9d-bd13-14ea6dd5c52d"
2999+
(reference "R17") (unit 1) (value "4k7") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
3000+
)
29773001
(path "/ecf4e879-2155-47ff-a552-04fe15db6414"
29783002
(reference "R18") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
29793003
)
@@ -3077,7 +3101,7 @@
30773101
(reference "U11") (unit 1) (value "Pico") (footprint "PicoW:Raspberry_Pi_Pico_SMT_THT")
30783102
)
30793103
(path "/df7e4e30-b8d5-4f4b-a24f-39298e982d26/a8a623e2-4c2d-4c7c-97a1-d8b8fae36dda"
3080-
(reference "WT901") (unit 1) (value "Conn_01x06_Female") (footprint "MyModules:WT901")
3104+
(reference "WT901") (unit 1) (value "Conn_02x06_Female") (footprint "MyModules:WT901")
30813105
)
30823106
(path "/00000000-0000-0000-0000-00006109dce5/e38beda4-d634-4f57-8d18-f2ee3381c381"
30833107
(reference "XA1") (unit 1) (value "Arduino_Uno_Shield") (footprint "MyModules:Arduino_Uno_Shield")

Hardware/OpenMowerMainboard/RaspberryPi.kicad_sch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,6 @@
995995
)
996996
)
997997
998-
999998
(junction (at 93.98 49.53) (diameter 0) (color 0 0 0 0)
1000999
(uuid 35bb30cb-9134-4cde-9cf2-4012be009511)
10011000
)

Hardware/OpenMowerMainboard/RobotConnectors.kicad_sch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,6 @@
11931193
)
11941194
)
11951195
1196-
11971196
(junction (at 185.42 116.205) (diameter 0) (color 0 0 0 0)
11981197
(uuid 0a3a58f4-2bb9-4cb3-845f-000ff382a9f7)
11991198
)

Hardware/OpenMowerMainboard/dcdc.kicad_sch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@
636636
)
637637
)
638638
639-
640639
(junction (at 63.5 116.84) (diameter 0) (color 0 0 0 0)
641640
(uuid 0566b5a5-d564-445b-b00e-9b4220e38ac8)
642641
)

0 commit comments

Comments
 (0)