Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #29

Merged
merged 9 commits into from
Jun 8, 2024
Merged

Dev #29

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added hardware/NFPA-70-excerpt.pdf
Binary file not shown.
20 changes: 12 additions & 8 deletions hardware/color-codes.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
# Color coding scheme

color[^1] | code[^2] | cross-section[^3] | equivalent to | ampacity at 90°C |
---------------:|----------:|------------------:|--------------:|------------------:|
white `#ffffff` | WH | 0,5mm^2 | 21 AWG | 7 Amps |
black `#000000` | BK | 1,5mm^2 | 16 AWG | 18 Amps |
grey `#808080` | GY | 4,0mm^2 | 12 AWG | 30 Amps |
red `#FF0000` | RD | 10,0mm^2 | 8 AWG | 55 Amps |
color[^1] | code[^2] | cross-section[^3] | equivalent to | ampacity at 90°C[^4] |
---------------:|----------:|------------------:|--------------:|---------------------:|
white `#ffffff` | WH | 0,5mm^2 | 21 AWG | 7 Amps |
black `#000000` | BK | 1,5mm^2 | 16 AWG | 18 Amps |
grey `#808080` | GY | 4,0mm^2 | 12 AWG | 30 Amps |
red `#FF0000` | RD | 10,0mm^2 | 8 AWG | 55 Amps |


A quick note about din rails: DIN EN 60715:2018-07 (please add that to the docs leandro)
- TH35 (new naming)
- TS 35 (old name)



[^1]: Ferrule colors according to *DIN 46228*
[^2]: Color abbreviations according to *IEC 60757*
[^3]: Cross-section according to *IEC 60228*


[^4]: Ampacity according to *NFPA 70, Table 310.15(B)(16)*


17 changes: 9 additions & 8 deletions hardware/wiring-diagram-p.mmd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Wiring Diagram: Power"
---
graph LR
graph LR

Primary-Battery --> |10mm<sup>2| Primary-Fuse
Secondary-Battery --> |1,5mm<sup>2| Secondary-Fuse
Expand All @@ -16,19 +16,18 @@ Primary-Relais --> |10mm<sup>2| PD
Secondary-Relais --> |1,5mm<sup>2| SD
subgraph Power-Distribution
direction LR
PD[Primary-Distribution \n & Fusing] --> Servo
SD[Secondary-Distribution \n & Fusing] --> 12V-Rail

PD[Primary-Distribution \n & Protection] --> VPrim
SD[Secondary-Distribution \n & Protection] --> 12V-Rail & 5V-Rail
end

Servo --> |????| Steering
VPrim --> |????| Steering
subgraph Steering
direction LR
Bus-Controller --- Servo#1 --- |????| Servo#2 --- |????| Servo#3 --- |????| Servo#4
end


PD --> |4x 4mm<sup>2| Drive-Train
VPrim--> |4x 4mm<sup>2| Drive-Train
12V-Rail --> |4x 0,5mm<sup>2| Drive-Train
subgraph Drive-Train
direction TB
Expand All @@ -38,10 +37,12 @@ subgraph Drive-Train
ESC#4 --> |4mm<sup>2| Motor#4
end

SD --> |????| Control
5V-Rail --> |????| Control
subgraph Control
test
Raspberry-Pi
end

linkStyle 0,2,3,4,5,7 stroke:red
linkStyle 1,6,8 stroke:yellow

%% PD[Primary-Distribution \n & Fusing] --> Servo
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.
15 changes: 1 addition & 14 deletions kicad/power-distribution/power-distribution.kicad_prl
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,6 @@
"version": 3
},
"project": {
"files": [
{
"name": "power-distribution.kicad_sch",
"open": true,
"window": {
"display": 0,
"maximized": false,
"pos_x": 75,
"pos_y": 391,
"size_x": 2582,
"size_y": 1550
}
}
]
"files": []
}
}
2 changes: 1 addition & 1 deletion kicad/power-distribution/power-distribution.kicad_pro
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
"version": 1
},
"net_format_name": "",
"page_layout_descr_file": "C:\\Users\\leand\\Desktop\\R2M\\PE\\kicad\\template.kicad_wks",
"page_layout_descr_file": "",
"plot_directory": "",
"spice_current_sheet_as_root": false,
"spice_external_command": "spice \"%I\"",
Expand Down
209 changes: 202 additions & 7 deletions kicad/power-distribution/power-distribution.kicad_sch
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,204 @@
(generator_version "8.0")
(uuid "69571923-9525-47f2-bc7b-90210c31c06c")
(paper "A4")
(lib_symbols)
(title_block
(title "Power Distribution")
(date "2024-05-12")
(rev "A")
(company "Rover to Mars (R2M)")
(comment 1 "Leandro Ebner")
(comment 3 "Ravensburg-Weingarten University")
)
(lib_symbols
(symbol "power:+BATT"
(power)
(pin_numbers hide)
(pin_names
(offset 0) hide)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(property "Reference" "#PWR"
(at 0 -3.81 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Value" "+BATT"
(at 0 3.556 0)
(effects
(font
(size 1.27 1.27)
)
)
)
(property "Footprint" ""
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Datasheet" ""
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Description" "Power symbol creates a global label with name \"+BATT\""
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "ki_keywords" "global power battery"
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(symbol "+BATT_0_1"
(polyline
(pts
(xy -0.762 1.27) (xy 0 2.54)
)
(stroke
(width 0)
(type default)
)
(fill
(type none)
)
)
(polyline
(pts
(xy 0 0) (xy 0 2.54)
)
(stroke
(width 0)
(type default)
)
(fill
(type none)
)
)
(polyline
(pts
(xy 0 2.54) (xy 0.762 1.27)
)
(stroke
(width 0)
(type default)
)
(fill
(type none)
)
)
)
(symbol "+BATT_1_1"
(pin power_in line
(at 0 0 90)
(length 0)
(name "~"
(effects
(font
(size 1.27 1.27)
)
)
)
(number "1"
(effects
(font
(size 1.27 1.27)
)
)
)
)
)
)
)
(symbol
(lib_id "power:+BATT")
(at 55.88 68.58 0)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(dnp no)
(fields_autoplaced yes)
(uuid "a7c75874-b2cf-46e0-9b45-fcd1d0c9a6b7")
(property "Reference" "#PWR01"
(at 55.88 72.39 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Value" "+BATT"
(at 55.88 63.5 0)
(effects
(font
(size 1.27 1.27)
)
)
)
(property "Footprint" ""
(at 55.88 68.58 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Datasheet" ""
(at 55.88 68.58 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Description" "Power symbol creates a global label with name \"+BATT\""
(at 55.88 68.58 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(pin "1"
(uuid "26d5f3b7-1c0e-4dab-af44-b66d493e0d09")
)
(instances
(project "power-distribution"
(path "/69571923-9525-47f2-bc7b-90210c31c06c"
(reference "#PWR01")
(unit 1)
)
)
)
)
(sheet
(at 36.83 99.06)
(at 83.82 52.07)
(size 12.7 3.81)
(fields_autoplaced yes)
(stroke
Expand All @@ -18,7 +213,7 @@
)
(uuid "99badf10-0534-4ab3-8c31-1d9955ef5a25")
(property "Sheetname" "primary-pd"
(at 36.83 98.3484 0)
(at 83.82 51.3584 0)
(effects
(font
(size 1.27 1.27)
Expand All @@ -27,7 +222,7 @@
)
)
(property "Sheetfile" "primary-pd.kicad_sch"
(at 36.83 103.4546 0)
(at 83.82 56.4646 0)
(effects
(font
(size 1.27 1.27)
Expand All @@ -44,7 +239,7 @@
)
)
(sheet
(at 68.58 99.06)
(at 104.14 50.8)
(size 12.7 3.81)
(fields_autoplaced yes)
(stroke
Expand All @@ -56,7 +251,7 @@
)
(uuid "a6451e8e-5a31-4105-a64e-5eb2e305427c")
(property "Sheetname" "secondary-pd"
(at 68.58 98.3484 0)
(at 104.14 50.0884 0)
(effects
(font
(size 1.27 1.27)
Expand All @@ -65,7 +260,7 @@
)
)
(property "Sheetfile" "secondary-pd.kicad_sch"
(at 68.58 103.4546 0)
(at 104.14 55.1946 0)
(effects
(font
(size 1.27 1.27)
Expand Down
8 changes: 8 additions & 0 deletions kicad/power-distribution/primary-pd.kicad_sch
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,13 @@
(generator_version "8.0")
(uuid "2224324f-e56c-472d-ab42-929f2e0b8e1c")
(paper "A4")
(title_block
(title "Power Distribution")
(date "2024-05-12")
(rev "A")
(company "Rover to Mars (R2M)")
(comment 1 "Leandro Ebner")
(comment 3 "Ravensburg-Weingarten University")
)
(lib_symbols)
)
8 changes: 8 additions & 0 deletions kicad/power-distribution/secondary-pd.kicad_sch
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,13 @@
(generator_version "8.0")
(uuid "f6a0586f-6af3-46b9-9d5e-ea9c9d5336fa")
(paper "A4")
(title_block
(title "Power Distribution")
(date "2024-05-12")
(rev "A")
(company "Rover to Mars (R2M)")
(comment 1 "Leandro Ebner")
(comment 3 "Ravensburg-Weingarten University")
)
(lib_symbols)
)
1 change: 0 additions & 1 deletion kicad/power-distribution/~power-distribution.kicad_sch.lck

This file was deleted.

Binary file added kicad/r2m-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kicad/rwu-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading