Merge branch 'master' into sim-docs

Author: WillB97

_config.yml

@@ -26,7 +26,7 @@ navigation:
 emails:
   teams: [email protected]
   info: [email protected]
-  kit-support: kit-support@studentrobotics.org
+  kit-support: teams@studentrobotics.org
   accounts: [email protected]
 
 social:

_data/sidebar_tree.yaml

@@ -25,8 +25,6 @@ tree:
       title: Ruggeduino
     - url: /kit/servo_board
       title: Servo Board
-    - url: /kit/wifi
-      title: WiFi
     - url: /kit/safety-regulations
       title: Safety Regulations
   - url: /programming/

kit/brain_board.md

@@ -28,7 +28,7 @@ We recommend using [etcher](https://etcher.io), as it's simple to use, and avail
 
 ![Etcher example]({{ site.baseurl }}/images/content/kit/etcher.png)
 
-<div class="info">
+<div class="info" markdown="1">
 If you choose to use a tool other than Etcher, you may need to extract the `srobo-robot-2022.0.0.img.xz` to `srobo-robot-2022.0.0.img`. There are many tools available for this, e.g. [7-zip](http://www.7-zip.org/).
 </div>
 

kit/index.md

@@ -21,11 +21,6 @@ The boards provided are as follows; more details can be found on their individua
  * [Ruggeduino (including two screw shields)](/docs/kit/ruggeduino)
  * [Servo Board](/docs/kit/servo_board)
 
-The WiFi
--------------------
-
-The kit can be controlled over [WiFi](/docs/kit/wifi). You can use any device to connect to the WiFi.
-
 Ancillary Parts
 ---------------
 

kit/power_board.md

@@ -65,7 +65,7 @@ Controls
 | Control        | Use
 |----------------|----------------------------
 | ON\|OFF        | Turns the power board on, when used in conjunction with an external switch
-| START          | Starts your program (can be used instead of the robot WiFi interface)
+| START          | Starts your program
 
 
 Case Dimensions

kit/wifi.md

@@ -62,7 +62,7 @@ You cannot use this screen when code is running.
 
 ![The robot interface's logs screen]({{ site.baseurl }}/images/content/kit/remote-interface/logs-screen.png)
 
-This screen allows you to see all messages from your code sent by `print`
+This screen allows you to see all messages from your code sent by `print(...)`
 statements (and anything else that outputs to standard output or standard
 error). It will also show messages from the initialisation of the robot's
 hardware, as well as any errors that occurred when running your code.

programming/getting_code_on_the_robot.md

@@ -36,5 +36,5 @@ To re-run your program, simply remove the USB stick and plug it back in again an
 
 ## Robot Logs
 
-When your program runs on the robot, the output of `print(...)` calls and any
-errors which occur are written to a log file on the USB stick as `log.txt`.
+When your program runs on the robot, the output of `print(...)` statements and
+any errors which occur are written to a log file on the USB stick as `log.txt`.

programming/python/libraries.md

@@ -11,69 +11,41 @@ Robot Kit
 
 The following python libraries are installed and available for use in your robot's software:
 
- * [Babel 1.3.3](http://babel.pocoo.org/)
- * [backports 1.0](https://pypi.python.org/pypi/backports/1.0)
- * [backports-ssl_match_hostname 3.4.0.2](https://pypi.python.org/pypi/backports.ssl_match_hostname)
- * [Blivet 0.23.9](http://fedoraproject.org/wiki/Blivet)
- * [chardet 2.0.1](https://pypi.python.org/pypi/chardet)
- * [dateutil 1.5](https://labix.org/python-dateutil)
- * [decorator 3.4.0](https://pypi.python.org/pypi/decorator)
- * [di 0.3](https://apps.fedoraproject.org/packages/python-di)
- * [flask 0.10.1](http://flask.pocoo.org)
- * [hawkey 0.4.18](https://apps.fedoraproject.org/packages/python-hawkey)
- * [iniparse 0.4](http://code.google.com/p/iniparse)
- * [inotify 0.9.4](http://pyinotify.sourceforge.net)
- * [IPy 0.75](http://pypi.python.org/pypi/IPy)
- * [itsdangerous 0.23](http://pythonhosted.org/itsdangerous/)
- * [jinja2 2.7.3](http://jinja.pocoo.org)
- * [Kitchen 1.1.1](https://pypi.python.org/pypi/kitchen)
- * [libcomps 0.1.6](https://github.com/midnightercz/libcomps)
- * [librepo 1.7.5](http://github.com/Tojaj/librepo)
- * [markupsafe 0.18](https://pypi.python.org/pypi/MarkupSafe)
- * [matplotlib 1.3.1](http://matplotlib.org/)
- * [meh 0.27](https://apps.fedoraproject.org/packages/python-meh)
- * [mglob 0.4](https://pypi.python.org/pypi/mglob)
- * [mpmath 0.18](https://code.google.com/p/mpmath/)
- * [nose 1.3.0](http://nose.readthedocs.org/)
- * [nss 0.15.0](https://pypi.python.org/pypi/python-nss)
- * [ntplib 0.3.1](https://pypi.python.org/pypi/ntplib/)
- * [numexpr 2.2.2](https://github.com/pydata/numexpr)
- * [NumPy 1.8.2](http://www.numpy.org/)
- * [pandas 0.10.0](http://pandas.pydata.org/)
- * [pexpect 3.1](http://pexpect.readthedocs.org/en/latest/)
- * [pillow 2.2.1](http://pillow.readthedocs.org/)[^1]
- * [pwquality 1.2.3](https://apps.fedoraproject.org/packages/python-pwquality)
- * [pycurl 7.19.3](http://pycurl.sourceforge.net/)
- * [Pygments 1.6](http://pygments.org/)
- * [pygobject2 2.28.6](https://apps.fedoraproject.org/packages/pygobject2)
- * [pygpgme 0.3](https://pypi.python.org/pypi/pygpgme/0.3)
- * [pykickstart 1.99.48](https://fedoraproject.org/wiki/Pykickstart)[^2]
- * [pyliblzma 0.5.3](https://pypi.python.org/pypi/pyliblzma)
- * [Pyparsing 2.0.1](http://pyparsing.wikispaces.com/)
- * [PyParted 3.9](https://fedorahosted.org/pyparted/)
- * [pySerial 2.6](http://pyserial.sourceforge.net/)
- * [pytalloc 2.1.0](https://apps.fedoraproject.org/packages/pytalloc)
- * [pytz 2012d-5](http://pytz.sourceforge.net/)
- * [pyudev 0.15](https://pyudev.readthedocs.org)
- * [PyUSB 1.0.0](http://pyusb.sourceforge.net/)
- * [pyxattr 0.5.1](http://pyxattr.k1024.org/)
- * [PyXDG 0.25](http://freedesktop.org/wiki/Software/pyxdg)
- * [PyYAML 3.10](http://pyyaml.org/)
- * [SciPy 0.12.1](http://www.scipy.org/)
- * [simplegeneric 0.8](https://pypi.python.org/pypi/simplegeneric)
- * [simplejson 3.5.3](https://pypi.python.org/pypi/simplejson)
- * [six 1.7.3](https://pypi.python.org/pypi/six)
- * [slip 0.6.0](https://fedorahosted.org/python-slip/)
- * [slip-dbus 0.6.0](https://apps.fedoraproject.org/packages/python-slip-dbus)
- * [sssdconfig 1.11.6](https://apps.fedoraproject.org/packages/python-sssdconfig)
- * [SymPy 0.7.5](http://sympy.org/)
- * [tables 3.0.0](https://pypi.python.org/pypi/tables)
- * [Tornado 2.2.1](http://www.tornadoweb.org/)
- * [urlgrabber 3.10.1](http://urlgrabber.baseurl.org)
- * [Werkzeug 0.9.4](http://werkzeug.pocoo.org/)
- * [ZeroMQ 13.0.2](http://zeromq.org/bindings:python)
+* [astoria 0.7.0](https://pypi.org/project/astoria)
+* [cached-property 1.5.2](https://pypi.org/project/cached-property)
+* [click 8.0.1](https://pypi.org/project/click)
+* [cycler 0.10.0](https://pypi.org/project/cycler)
+* [dateutil 2.8.2](https://pypi.org/project/python-dateutil/)
+* dateutil-zoneinfo 2.8.2
+* [dbus-next 0.2.3](https://pypi.org/project/dbus-next)
+* [docopt 0.6.2](https://pypi.org/project/docopt)
+* [gmqtt 0.6.10](https://pypi.org/project/gmqtt)
+* [gpg 1.16.0](https://pypi.org/project/gpg)
+* [iniparse 0.5](https://pypi.org/project/iniparse)
+* [j5 0.13.0](https://pypi.org/project/j5)
+* [j5-zoloto 0.1.0](https://pypi.org/project/j5-zoloto)
+* [kiwisolver 1.3.2](https://pypi.org/project/kiwisolver)
+* [matplotlib 3.4.1](https://pypi.org/project/matplotlib)
+* [numpy 1.21.2](https://pypi.org/project/numpy)
+* opencv 4.5.2
+* [pandas 1.3.3](https://pypi.org/project/pandas)
+* pkg-resources 57.4.0
+* [pydantic 1.8.2](https://pypi.org/project/pydantic)
+* [pygobject 3.40.1](https://pypi.org/project/PyGObject/)
+* [pyparsing 2.4.7](https://pypi.org/project/pyparsing)
+* [pyquaternion 0.9.9](https://pypi.org/project/pyquaternion)
+* [pyserial 3.5](https://pypi.org/project/pyserial)
+* [pytz 2021.1](https://pypi.org/project/pytz)
+* [pyusb 1.2.1](https://pypi.org/project/pyusb)
+* [pyyaml 5.4.1](https://pypi.org/project/PyYAML/)
+* [rpm 4.16.1.3](https://pypi.org/project/rpm)
+* [setuptools 57.4.0](https://pypi.org/project/setuptools)
+* [six 1.16.0](https://pypi.org/project/six)
+* [sr-robot3 2022.0.1](https://pypi.org/project/sr.robot3/)
+* [toml 0.10.2](https://pypi.org/project/toml)
+* [typing-extensions 3.10.0.0](https://pypi.org/project/typing-extensions)
+* [udiskie 2.3.3](https://pypi.org/project/udiskie)
+* udiskie-locale-en-us 2.3.3
+* [zoloto 0.7.1](https://pypi.org/project/zoloto)
 
-[^1]: A maintained fork of [PIL](http://www.pythonware.com/products/pil/)
-[^2]: No relation to our Kickstart event
-
-If you wish to use a library that isn't listed above, get in contact with us on the forums and have a chat with us about it.
+If you wish to use a library that isn't listed above, get in contact with us on Discord and have a chat with us about it.

resources/troubleshooter/data.json

@@ -37,10 +37,6 @@
                 {
                     "answer": "Vision",
                     "nextquestion": "vision"
-                },
-                {
-                    "answer": "IDE",
-                    "nextquestion": "ide"
                 }
             ]
         },
@@ -433,7 +429,7 @@
                 },
                 {
                     "answer": "The camera takes a long time to take a photo.",
-                    "message": "Try reducing the resolution in your code, you'll have to find an optimum resolution for your robot to get the best speed and detail."
+                    "message": "The vision system always takes longer for the first photo. Consider taking a photo when your robot first starts."
                 }
             ]
         },
@@ -442,24 +438,24 @@
             "answers": [
                 {
                     "answer": "Yes",
-                    "message": "Make sure the marker is flat, well-lit and there a visible border around the pattern, and if your robot is moving you should check the camera is not shaking.<br />If you still cannot pickup any markers there could be a problem with your code, consider posting on the <a href=\"/forums\" target=\"_blank\">forums</a>."
+                    "nextquestion": "vision-markers-dont-get-picked-up-good-webcam"
                 },
                 {
                     "answer": "No",
                     "message": "There may be an issue with your Webcam, consider posting on the <a href=\"/forums\" target=\"_blank\">forums</a>."
                 }
             ]
         },
-        "ide": {
-            "question": "Choose the option that best describes your situation.",
+        "vision-markers-dont-get-picked-up-good-webcam": {
+            "question": "Is the marker ID listed in the rules as in use?",
             "answers": [
                 {
-                    "answer": "My code does not check correctly.",
-                    "message": "Click on the 'Error' tab to see detailed explanations of the errors."
+                    "answer": "Yes",
+                    "message": "Make sure the marker is flat, well-lit and there a visible border around the pattern, and if your robot is moving you should check the camera is not shaking.<br />If you still cannot pickup any markers there could be a problem with your code, consider posting on the <a href=\"/forums\" target=\"_blank\">forums</a>."
                 },
                 {
-                    "answer": "My latest code is not exported to the zip file.",
-                    "message": "Make sure you've pressed save before pressing export."
+                    "answer": "No",
+                    "message": "The robot will ignore marker IDs that are not in use for the game. Try using a marker that is listed in the rules."
                 }
             ]
         }

troubleshooting/index.md

@@ -36,9 +36,8 @@ Explain it to someone else
 
 Check the log file for errors
 :   If your program has an error in it, it will stop running or not run at all.
-    Check [the log file](/docs/troubleshooting/python#ReadingTheLogs) either through the
-    robot [WiFi](/docs/kit/wifi) interface or look at the log file on the USB stick to
-    see any error reports.
+    Check [the log file](/docs/troubleshooting/python#ReadingTheLogs) on the USB
+    stick to see any error reports.
 
 Print all the things
 :   Adding `print` statements
@@ -48,10 +47,9 @@ Print all the things
     commonly used for this in electronics hardware, and this is part
     of the reason our boards are covered in them.
 
-    On the robots the output from any `print` statements will end up
+    On the robots the output from any `print(...)` statements will end up
     in [the log file](/docs/troubleshooting/python#ReadingTheLogs), which can
-    be viewed either in the robot [WiFi](/docs/kit/wifi) interface or on
-    the USB stick.
+    be viewed on the USB stick.
 
 Check the docs
 :   It's very easy to end up thinking that you know how something works