Skip to content

Commit 587a45e

Browse files
authored
Minimum viable SR2024 docs
2 parents 3f43c4b + e15503b commit 587a45e

File tree

92 files changed

+2614
-2475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2614
-2475
lines changed

.spelling

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Plazma
1616
PULLUP
1717
Quarternion
1818
rtui
19+
Arduino
20+
Arduinos
1921
Ruggeduino
2022
Ruggeduinos
2123
Scarzy

.vscode/extensions.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ task :validate_kit_versions do
4848
data = YAML.load_file('_data/kit_versions.yml')
4949
data.each do |entry|
5050
actual = entry.keys.to_set
51-
expected = ['version', 'released', 'changelog'].to_set
51+
expected = ['version', 'released', 'link', 'changelog'].to_set
5252
optional = ['yanked'].to_set
5353
missing = expected - actual - optional
5454
extra = actual - expected - optional

_data/kit_versions.yml

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,12 @@
22
# The format of this file should be like such:
33
# - version: 20xx.y.z
44
# released: 2038-01-19
5+
# link: https://link-to-download.img
56
# changelog:
67
# - Changed something
78
# - Changed another thing too
8-
- version: 2023.2.1
9-
released: 2023-01-07
9+
- version: 2024.1.0
10+
released: 2023-09-14
11+
link: https://github.com/srobo/robot-image/releases/download/2024.1.0/Student.Robotics.OS-image-2024.1.0.img.xz
1012
changelog:
11-
- Fixed issue in camera optimisation that caused JPEG corruption.
12-
- version: 2023.2.0
13-
released: 2023-01-05
14-
yanked: true
15-
changelog:
16-
- Reworked underlying vision library to improve marker detection and distance calculation.
17-
- Added a display of last captured image in web UI.
18-
- version: 2023.1.0
19-
released: 2022-12-01
20-
changelog:
21-
- Added dark theme and WiFi details to web interface.
22-
- Added terminal interface.
23-
- Updated axes for orientations.
24-
- Added frame argument to camera operations.
25-
- Added robot settings error file.
26-
- Added competitor port range (7000-8999) to firewall.
27-
- Updated C270 and B500 camera calibrations.
28-
- Fixed bug where stopping running code didn't work.
29-
- Python packages can now be installed onto the brain board using pip.
30-
- version: 2023.0.0
31-
released: 2022-10-21
32-
changelog:
33-
- Initial release for SR2023.
13+
- Initial release for SR2024.

_data/sidebar_tree.yaml

Lines changed: 76 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ tree:
44
- url: /
55
title: Introduction
66
- url: /kit/
7-
title: Kits
7+
title: Kit
88
tree:
9-
- url: /kit/assembly
10-
title: Assembly
119
- url: /kit/batteries/
1210
title: Batteries
1311
tree:
@@ -18,92 +16,109 @@ tree:
1816
- url: /kit/brain_board/
1917
title: Brain Board
2018
tree:
21-
- url: /kit/brain_board/updates
22-
title: Updates
19+
- url: /kit/brain_board/robot_os
20+
title: Student Robotics OS
21+
- url: /kit/brain_board/python_libraries
22+
title: Python Libraries
23+
- url: /kit/brain_board/web_interface
24+
title: Web Interface
2325
- url: /kit/brain_board/advanced
2426
title: Advanced
2527
- url: /kit/motor_board
2628
title: Motor Board
2729
- url: /kit/power_board
2830
title: Power Board
29-
- url: /kit/ruggeduino
30-
title: Ruggeduino
3131
- url: /kit/servo_board
3232
title: Servo Board
33-
- url: /kit/safety-regulations
34-
title: Safety Regulations
35-
- url: /kit/wifi
36-
title: WiFi
33+
- url: /kit/arduino
34+
title: Arduino
3735
- url: /programming/
3836
title: Programming
3937
tree:
40-
- url: /programming/getting_code_on_the_robot
41-
title: Getting Code on the Robot
42-
- url: /programming/python/
43-
title: Python
38+
- url: /programming/robot_api/
39+
title: Robot API
4440
tree:
45-
- url: /programming/python/functions
46-
title: Functions
47-
- url: /programming/python/libraries
48-
title: Libraries
49-
- url: /programming/sr/
50-
title: sr
41+
- url: /programming/robot_api/comp_mode
42+
title: Competition Mode
43+
- url: /programming/leds
44+
title: Brain Board LED API
45+
- url: /programming/motors
46+
title: Motor Board API
47+
- url: /programming/power
48+
title: Power Board API
49+
- url: /programming/servos
50+
title: Servo Board API
51+
- url: /programming/vision/
52+
title: Vision
5153
tree:
52-
- url: /programming/sr/cheat_sheet
53-
title: API Quick Reference
54-
- url: /programming/sr/leds/
55-
title: LEDs
56-
- url: /programming/sr/motors/
57-
title: Motors
58-
- url: /programming/sr/power/
59-
title: Power
60-
- url: /programming/sr/ruggeduinos/
61-
title: Ruggeduinos
62-
tree:
63-
- url: /programming/sr/ruggeduinos/custom_firmware
64-
title: Custom Firmware
65-
- url: /programming/sr/servos/
66-
title: Servos
67-
- url: /programming/sr/vision/
68-
title: Vision
69-
tree:
70-
- url: /programming/sr/vision/markers
71-
title: Markers
72-
- url: /programming/editors/
73-
title: Code Editors
54+
- url: /programming/vision/markers
55+
title: Markers
56+
- url: /programming/vision/position
57+
title: Position
58+
- url: /programming/vision/orientation
59+
title: Orientation
60+
- url: /programming/arduino/
61+
title: Arduino API
7462
tree:
75-
- url: /programming/editors/pycharm
76-
title: PyCharm
77-
- url: /programming/editors/vscode
78-
title: Visual Studio Code
63+
- url: /programming/arduino/sr_firmware
64+
title: SR Firmware
65+
- url: /programming/arduino/extended_sr_firmware
66+
title: Extended SR Firmware
67+
- url: /programming/arduino/custom_firmware
68+
title: Custom Firmware
69+
- url: /programming/cheat_sheet
70+
title: API Quick Reference
7971
- url: /rules/
8072
title: Rules
8173
tree:
74+
#- url: /rules/code_of_conduct
75+
# title: Code Of Conduct
76+
#- url: /rules/safety_regulations
77+
# title: Safety Regulations
8278
- url: /rules/archive
8379
title: Game Rules Archive
80+
- url: /tutorials/
81+
title: Tutorials
82+
tree:
83+
- url: /tutorials/assembly
84+
title: Kit Assembly
85+
- url: /tutorials/python
86+
title: An intro to Python
87+
- url: /tutorials/getting_code_on_the_robot
88+
title: Getting Code on the Robot
89+
- url: /tutorials/basic_motor_control
90+
title: Basic Motor Control
91+
- url: /tutorials/editors/
92+
title: Code Editors
93+
tree:
94+
- url: /tutorials/editors/pycharm
95+
title: PyCharm
96+
- url: /tutorials/editors/vscode
97+
title: Visual Studio Code
98+
- url: /tutorials/update_brain
99+
title: Updating your brain board
100+
- url: /tutorials/discord
101+
title: How to use Discord
84102
- url: /simulator/
85103
title: Simulator
86104
tree:
87-
- url: /simulator/programming/
88-
title: Programming
105+
- url: /simulator/simulator_programming
106+
title: Simulator Programming
107+
- url: /simulator/setting_up_simulator
108+
title: Setting up the simulator
109+
- url: /simulator/using_the_simulator
110+
title: Using the simulator
89111
- url: /troubleshooting/
90112
title: Troubleshooting
91113
tree:
92114
- url: /troubleshooting/python
93115
title: Python
94116
- url: /troubleshooting/interactive_troubleshooter
95117
title: Interactive Troubleshooter
96-
- url: /tutorials/
97-
title: Tutorials
118+
- url: /competitor_resources/
119+
title: Resources
98120
tree:
99-
- url: /tutorials/basic_motor_control
100-
title: Basic Motor Control
101-
- url: /tutorials/microgames
121+
- url: /competitor_resources/microgames
102122
title: Microgames
103-
- url: /tutorials/python
104-
title: Python
105-
- url: /team_admin/
106-
title: Team Admin
107-
tree:
108-
- url: /team_admin/discord
109-
title: Discord Server
123+
- url: /competitor_resources/markers
124+
title: Game markers

_includes/updates-list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h2><code>{{ version }} ({{ kit_version.released | date_to_string }})</code></h2
88
{% if kit_version.yanked %}
99
<p>This version is no longer available.</p>
1010
{% else %}
11-
<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">
11+
<a class="kit-download-link" data-version="{{ version }}" href="{{ kit_version.link }}">
1212
Download {{ version }}
1313
</a>
1414
{% endif %}

competitor_resources/index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
layout: page
3+
title: Resources
4+
---
5+
6+
# Resources
7+
8+
The below pages contain downloadable resources that will be needed during development.

competitor_resources/markers.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
layout: page
3+
title: Game markers
4+
---
5+
6+
# Game markers
7+
8+
The game markers are the AprilTags that are located in defined locations around the arena.
9+
For information about what these are check the [vision marker page]({{ site.baseurl}}/programming/vision/markers).
10+
For guidance of where these will be located in the arena, look at this years [rules]({{ site.baseurl}}/rules).
11+
12+
## Download
13+
14+
The markers for the SR2024 competition will be released at Kickstart.

tutorials/microgames.md renamed to competitor_resources/microgames.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@ layout: page
33
title: Microgames
44
---
55

6-
Microgames
7-
==========
6+
# Microgames
87

9-
The microgames are way of getting familiar with your kit through a series of challenges.
8+
The microgames are way of getting familiar with your kit through a series of small challenges.
109

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

13-
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).
11+
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).
12+
13+
14+
## Download
15+
16+
The Microgames for the SR2024 competition will be released at Kickstart.
573 Bytes
Loading

0 commit comments

Comments
 (0)