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

Minimum viable SR2024 docs #521

Merged
merged 108 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
deeafb7
slight tweak to power board
8BitJosh Aug 26, 2023
3754776
Update servo numbers for new FW, rewrite for ease of understanding
8BitJosh Aug 26, 2023
10d110c
Specify L2 is reserved
8BitJosh Aug 26, 2023
187f0b8
Update power board image to label brain port (L2)
8BitJosh Aug 26, 2023
7f85080
Update diagram to label status leds
8BitJosh Aug 26, 2023
6e282c6
motor board - talk about status LEDs now in FW
8BitJosh Aug 26, 2023
6df90bc
SR2024 - Update Section - Servo board
8BitJosh Aug 27, 2023
f7d9cc8
Merge pull request #486 from srobo/jp-motor-board
8BitJosh Aug 27, 2023
6eaf212
Remove power board note stating individual outputs
8BitJosh Aug 27, 2023
f8090ce
Add notes about the fan
8BitJosh Aug 27, 2023
5842f26
Merge pull request #484 from srobo/jp-power-board
8BitJosh Aug 27, 2023
7802bb7
sidebar rules
8BitJosh Aug 27, 2023
00e4023
sidebar kit section
8BitJosh Aug 27, 2023
e7bcdd6
sidebar programming section
8BitJosh Aug 27, 2023
2e6431d
sidebar - simulator and resources
8BitJosh Aug 27, 2023
40d9846
Fix links in interactive troubleshooter
8BitJosh Aug 27, 2023
1da26c0
Fix broken links
8BitJosh Aug 27, 2023
10e01b9
Sidebar Shuffle
8BitJosh Aug 27, 2023
5807727
Update content for ease of reading and clarity
8BitJosh Aug 28, 2023
b6777d9
KCH board API page update
8BitJosh Aug 28, 2023
0442894
standardize on robot. rather than R.
8BitJosh Aug 28, 2023
a6d0fef
SR2024 - Update Section - Brain board LEDs
8BitJosh Aug 28, 2023
b3a0a47
First parse at top level vision page
8BitJosh Aug 30, 2023
2623a65
Add images to orientation page
8BitJosh Aug 30, 2023
fa8ad3e
Merge pull request #490 from srobo/jdp-arduino-update
8BitJosh Aug 31, 2023
860d1dc
Update power board API
8BitJosh Aug 31, 2023
eac0ae9
Update servo board content
8BitJosh Aug 31, 2023
ea96370
fix servo board code typo
8BitJosh Aug 31, 2023
d3deba0
Motor board page update - simplify for clarity
8BitJosh Aug 31, 2023
0d216db
Updates for style consistency
8BitJosh Aug 31, 2023
6c0ee29
Style consistency
8BitJosh Aug 31, 2023
a40db43
Review comments
8BitJosh Sep 1, 2023
b3e9be8
Review fixes
8BitJosh Sep 1, 2023
6657f59
Remove explicit Note import
8BitJosh Sep 1, 2023
a98f278
Jekyll auto creates internal links to headers
8BitJosh Sep 1, 2023
9f2bb46
Jekyll auto creates internal links to headers
8BitJosh Sep 1, 2023
21bf83d
Servo extended servo range
8BitJosh Sep 1, 2023
e8b0ee9
remove !
8BitJosh Sep 1, 2023
61ebb2c
Duplicate log line for consistency
8BitJosh Sep 1, 2023
e96a2a5
SR2024 - Update Section - Power board API
8BitJosh Sep 2, 2023
7e4fcac
SR2024 - Update Section - Motor board API
8BitJosh Sep 2, 2023
82988bd
Update brain board pages
8BitJosh Sep 2, 2023
67d1412
robot instead of R
8BitJosh Sep 2, 2023
05f7e1f
vision orientation page
8BitJosh Sep 3, 2023
a4aa897
review comments - brain board
8BitJosh Sep 4, 2023
613f909
Review tweaks
8BitJosh Sep 4, 2023
28399ee
SR2024 - Update Section - Brain board
8BitJosh Sep 4, 2023
4843684
Review tweaks - servo API
8BitJosh Sep 4, 2023
d02d1ff
SR2024 - Update Section - Servo board API
8BitJosh Sep 4, 2023
cb8f759
Update vision pages
8BitJosh Sep 4, 2023
bac4f7c
review tweaks
8BitJosh Sep 4, 2023
b702522
SR2024 - Update Section - Vision
8BitJosh Sep 4, 2023
9647235
Fix vision code typo
8BitJosh Sep 6, 2023
d396e0a
Merge pull request #501 from srobo/jdp-tweak-vision
8BitJosh Sep 6, 2023
a045a99
Update top level kit page
8BitJosh Sep 7, 2023
41f0f40
SR2024 - Update Section - Kit
8BitJosh Sep 8, 2023
f14575e
Update intro page
8BitJosh Sep 9, 2023
9ddbebe
Update warning box to be less passive
8BitJosh Sep 9, 2023
77dc7ad
SR2024 - Update Section - Introduction
8BitJosh Sep 9, 2023
0b09b9a
Update robot API page - Add comp mode page
8BitJosh Sep 9, 2023
7d76b11
remove references to print wifi creds
8BitJosh Sep 9, 2023
4514f16
Merge pull request #505 from srobo/jdp-web-details
8BitJosh Sep 9, 2023
ff294f7
Update page on python libraries
8BitJosh Sep 9, 2023
20f052f
Fix broken link on simulator page
8BitJosh Sep 9, 2023
df73f21
opencv is not in the simulator
8BitJosh Sep 9, 2023
52c1b81
Update Python & Webots versions the simulator uses
PeterJCLaw Sep 9, 2023
c850300
Review comments
8BitJosh Sep 9, 2023
f27c4b2
Merge pull request #506 from srobo/jdp-python-libs
8BitJosh Sep 9, 2023
3426014
First parse at updating arduino API pages
8BitJosh Sep 10, 2023
c229fc7
battery page formatting
8BitJosh Sep 10, 2023
1e11100
Fix incorrect links and details on path
8BitJosh Sep 11, 2023
0aacf26
battery page markdown formatting
8BitJosh Sep 11, 2023
0dc3f3a
Talk about list_ports()
8BitJosh Sep 11, 2023
1bbabbe
update programming page
8BitJosh Sep 11, 2023
fa122a7
SR2024 - Update Section - Robot API
8BitJosh Sep 12, 2023
8ac64fc
SR2024 - Update Section - Programming
8BitJosh Sep 12, 2023
33a3875
Review comments
8BitJosh Sep 12, 2023
5121c6c
review tweak arduino
8BitJosh Sep 13, 2023
95a659f
SR2024 - Update Section - Arduino API
8BitJosh Sep 13, 2023
5b4b72e
Update cheat sheet
8BitJosh Sep 13, 2023
a91deb9
Update battery page
8BitJosh Sep 15, 2023
7558777
page formatting
8BitJosh Sep 15, 2023
ec1cf5f
Update img release for this years initial image release (#513)
8BitJosh Sep 16, 2023
ca0874f
Kit assembly page, minor tweaks
8BitJosh Sep 17, 2023
f39defe
an intro to python page
8BitJosh Sep 17, 2023
dc1df78
tutorial - getting code on your robot
8BitJosh Sep 17, 2023
be99a1c
Tutorial - basic movement
8BitJosh Sep 17, 2023
bf1e30a
SR2024 - Update Section - Batteries
8BitJosh Sep 17, 2023
b0b73fa
Review tweaks
8BitJosh Sep 17, 2023
0e461b3
SR2024 - Update Section - API Quick Reference
8BitJosh Sep 17, 2023
f749325
vision tweaks for clarity
8BitJosh Sep 17, 2023
26a2a98
Merge pull request #516 from srobo/jdp-vision-page-tweaks
8BitJosh Sep 17, 2023
3b52165
Merge branch 'simulator-versions' into sr2024
PeterJCLaw Sep 17, 2023
dcf378d
Document battery charger barrel size (#512)
RealOrangeOne Sep 18, 2023
afac331
top level tutorial page
8BitJosh Sep 18, 2023
ed31277
tweak sidebar
8BitJosh Sep 18, 2023
37ad6ad
Merge remote-tracking branch 'origin/main' into sr2024
8BitJosh Sep 18, 2023
c0d75bd
change to use jpg instead of png (#518)
8BitJosh Sep 18, 2023
2f77c3f
review tweaks
8BitJosh Sep 18, 2023
da1c123
review comments
8BitJosh Sep 18, 2023
835a06a
Some code
8BitJosh Sep 18, 2023
f8dad10
Merge pull request #517 from srobo/Tutorials-update
8BitJosh Sep 18, 2023
4738184
Change wifi -> web interface
8BitJosh Sep 19, 2023
46309f5
Move simulator to its own section
8BitJosh Sep 19, 2023
7a1bc1a
Move discord to tutorials section
8BitJosh Sep 19, 2023
db546ef
Create placeholder info for the resources pages
8BitJosh Sep 19, 2023
c0a40ab
Fix broken links
8BitJosh Sep 19, 2023
e15503b
Merge pull request #520 from srobo/jdp-multipage-tweaks
8BitJosh Sep 20, 2023
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
2 changes: 2 additions & 0 deletions .spelling
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Plazma
PULLUP
Quarternion
rtui
Arduino
Arduinos
Ruggeduino
Ruggeduinos
Scarzy
Expand Down
20 changes: 0 additions & 20 deletions .vscode/extensions.json

This file was deleted.

2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ task :validate_kit_versions do
data = YAML.load_file('_data/kit_versions.yml')
data.each do |entry|
actual = entry.keys.to_set
expected = ['version', 'released', 'changelog'].to_set
expected = ['version', 'released', 'link', 'changelog'].to_set
optional = ['yanked'].to_set
missing = expected - actual - optional
extra = actual - expected - optional
Expand Down
30 changes: 5 additions & 25 deletions _data/kit_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,12 @@
# The format of this file should be like such:
# - version: 20xx.y.z
# released: 2038-01-19
# link: https://link-to-download.img
# changelog:
# - Changed something
# - Changed another thing too
- version: 2023.2.1
released: 2023-01-07
- version: 2024.1.0
released: 2023-09-14
link: https://github.com/srobo/robot-image/releases/download/2024.1.0/Student.Robotics.OS-image-2024.1.0.img.xz
changelog:
- Fixed issue in camera optimisation that caused JPEG corruption.
- version: 2023.2.0
released: 2023-01-05
yanked: true
changelog:
- Reworked underlying vision library to improve marker detection and distance calculation.
- Added a display of last captured image in web UI.
- version: 2023.1.0
released: 2022-12-01
changelog:
- Added dark theme and WiFi details to web interface.
- Added terminal interface.
- Updated axes for orientations.
- Added frame argument to camera operations.
- Added robot settings error file.
- Added competitor port range (7000-8999) to firewall.
- Updated C270 and B500 camera calibrations.
- Fixed bug where stopping running code didn't work.
- Python packages can now be installed onto the brain board using pip.
- version: 2023.0.0
released: 2022-10-21
changelog:
- Initial release for SR2023.
- Initial release for SR2024.
137 changes: 76 additions & 61 deletions _data/sidebar_tree.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ tree:
- url: /
title: Introduction
- url: /kit/
title: Kits
title: Kit
tree:
- url: /kit/assembly
title: Assembly
- url: /kit/batteries/
title: Batteries
tree:
Expand All @@ -18,92 +16,109 @@ tree:
- url: /kit/brain_board/
title: Brain Board
tree:
- url: /kit/brain_board/updates
title: Updates
- url: /kit/brain_board/robot_os
title: Student Robotics OS
- url: /kit/brain_board/python_libraries
title: Python Libraries
- url: /kit/brain_board/web_interface
title: Web Interface
- url: /kit/brain_board/advanced
title: Advanced
- url: /kit/motor_board
title: Motor Board
- url: /kit/power_board
title: Power Board
- url: /kit/ruggeduino
title: Ruggeduino
- url: /kit/servo_board
title: Servo Board
- url: /kit/safety-regulations
title: Safety Regulations
- url: /kit/wifi
title: WiFi
- url: /kit/arduino
title: Arduino
- url: /programming/
title: Programming
tree:
- url: /programming/getting_code_on_the_robot
title: Getting Code on the Robot
- url: /programming/python/
title: Python
- url: /programming/robot_api/
title: Robot API
tree:
- url: /programming/python/functions
title: Functions
- url: /programming/python/libraries
title: Libraries
- url: /programming/sr/
title: sr
- url: /programming/robot_api/comp_mode
title: Competition Mode
- url: /programming/leds
title: Brain Board LED API
- url: /programming/motors
title: Motor Board API
- url: /programming/power
title: Power Board API
- url: /programming/servos
title: Servo Board API
- url: /programming/vision/
title: Vision
tree:
- url: /programming/sr/cheat_sheet
title: API Quick Reference
- url: /programming/sr/leds/
title: LEDs
- url: /programming/sr/motors/
title: Motors
- url: /programming/sr/power/
title: Power
- url: /programming/sr/ruggeduinos/
title: Ruggeduinos
tree:
- url: /programming/sr/ruggeduinos/custom_firmware
title: Custom Firmware
- url: /programming/sr/servos/
title: Servos
- url: /programming/sr/vision/
title: Vision
tree:
- url: /programming/sr/vision/markers
title: Markers
- url: /programming/editors/
title: Code Editors
- url: /programming/vision/markers
title: Markers
- url: /programming/vision/position
title: Position
- url: /programming/vision/orientation
title: Orientation
- url: /programming/arduino/
title: Arduino API
tree:
- url: /programming/editors/pycharm
title: PyCharm
- url: /programming/editors/vscode
title: Visual Studio Code
- url: /programming/arduino/sr_firmware
title: SR Firmware
- url: /programming/arduino/extended_sr_firmware
title: Extended SR Firmware
- url: /programming/arduino/custom_firmware
title: Custom Firmware
- url: /programming/cheat_sheet
title: API Quick Reference
- url: /rules/
title: Rules
tree:
#- url: /rules/code_of_conduct
# title: Code Of Conduct
#- url: /rules/safety_regulations
# title: Safety Regulations
- url: /rules/archive
title: Game Rules Archive
- url: /tutorials/
title: Tutorials
tree:
- url: /tutorials/assembly
title: Kit Assembly
- url: /tutorials/python
title: An intro to Python
- url: /tutorials/getting_code_on_the_robot
title: Getting Code on the Robot
- url: /tutorials/basic_motor_control
title: Basic Motor Control
- url: /tutorials/editors/
title: Code Editors
tree:
- url: /tutorials/editors/pycharm
title: PyCharm
- url: /tutorials/editors/vscode
title: Visual Studio Code
- url: /tutorials/update_brain
title: Updating your brain board
- url: /tutorials/discord
title: How to use Discord
- url: /simulator/
title: Simulator
tree:
- url: /simulator/programming/
title: Programming
- url: /simulator/simulator_programming
title: Simulator Programming
- url: /simulator/setting_up_simulator
title: Setting up the simulator
- url: /simulator/using_the_simulator
title: Using the simulator
- url: /troubleshooting/
title: Troubleshooting
tree:
- url: /troubleshooting/python
title: Python
- url: /troubleshooting/interactive_troubleshooter
title: Interactive Troubleshooter
- url: /tutorials/
title: Tutorials
- url: /competitor_resources/
title: Resources
tree:
- url: /tutorials/basic_motor_control
title: Basic Motor Control
- url: /tutorials/microgames
- url: /competitor_resources/microgames
title: Microgames
- url: /tutorials/python
title: Python
- url: /team_admin/
title: Team Admin
tree:
- url: /team_admin/discord
title: Discord Server
- url: /competitor_resources/markers
title: Game markers
2 changes: 1 addition & 1 deletion _includes/updates-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2><code>{{ version }} ({{ kit_version.released | date_to_string }})</code></h2
{% if kit_version.yanked %}
<p>This version is no longer available.</p>
{% else %}
<a class="kit-download-link" data-version="{{ version }}" href="https://github.com/srobo/robot-image/releases/download/v{{ version }}/srobo-image-robot-{{ version }}.img.xz">
<a class="kit-download-link" data-version="{{ version }}" href="{{ kit_version.link }}">
Download {{ version }}
</a>
{% endif %}
Expand Down
8 changes: 8 additions & 0 deletions competitor_resources/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
layout: page
title: Resources
---

# Resources

The below pages contain downloadable resources that will be needed during development.
14 changes: 14 additions & 0 deletions competitor_resources/markers.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
layout: page
title: Game markers
---

# Game markers

The game markers are the AprilTags that are located in defined locations around the arena.
For information about what these are check the [vision marker page]({{ site.baseurl}}/programming/vision/markers).
For guidance of where these will be located in the arena, look at this years [rules]({{ site.baseurl}}/rules).

## Download

The markers for the SR2024 competition will be released at Kickstart.
13 changes: 8 additions & 5 deletions tutorials/microgames.md → competitor_resources/microgames.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ layout: page
title: Microgames
---

Microgames
==========
# Microgames

The microgames are way of getting familiar with your kit through a series of challenges.
The microgames are way of getting familiar with your kit through a series of small challenges.

Here is a link to the [Microgames](https://studentrobotics.org/microgames).

We recommend you work through them as a team, so you can learn from each other. If you have any issues, just ask us on [Discord](/docs/team_admin/discord).
We recommend you work through them as a team, so you can learn from each other. If you have any issues, just ask us on [Discord](/docs/tutorials/discord).


## Download

The Microgames for the SR2024 competition will be released at Kickstart.
Binary file modified images/content/kit/mcv4b_board_diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading