diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e7d721..fcd90f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,13 +20,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '16' - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.npm key: node-${{ hashFiles('package-lock.json') }} @@ -36,7 +36,7 @@ jobs: - run: npm run test - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: path: ./dist @@ -54,4 +54,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4 diff --git a/.spelling b/.spelling index 21d93d6..e69de29 100644 --- a/.spelling +++ b/.spelling @@ -1 +0,0 @@ -Smallpeice diff --git a/README.md b/README.md index 8e1efb2..3eb6288 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,14 @@ -Smallpeice Rules -================ +# Computing, Electronics and Robotics Rules `master` is the latest version. See `releases` or `tags` for individual years. -Requirements ------------- +## Requirements - `npm` -How to build ------------- +## How to build - Clone. - `npm ci` diff --git a/package-lock.json b/package-lock.json index 1c3b917..04ffba3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "smallpeice-rules", + "name": "cer-rules", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "smallpeice-rules", + "name": "cer-rules", "version": "1.0.0", "dependencies": { "normalize.css": "^8.0.1", diff --git a/package.json b/package.json index 8a28add..cd977ea 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "smallpeice-rules", + "name": "cer-rules", "version": "1.0.0", - "description": "Smallpeice Rules", + "description": "Rules", "private": true, "scripts": { "build": "vite build", @@ -11,13 +11,13 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/sourcebots/smallpeice-rules.git" + "url": "git+https://github.com/roboticsoutreach/cer-rules.git" }, "author": "", "bugs": { - "url": "https://github.com/sourcebots/smallpeice-rules/issues" + "url": "https://github.com/roboticsoutreach/cer-rules/issues" }, - "homepage": "https://github.com/sourcebots/smallpeice-rules#readme", + "homepage": "https://github.com/roboticsoutreach/cer-rules#readme", "dependencies": { "normalize.css": "^8.0.1", "sass": "^1.62.0", diff --git a/sourcebots-art b/sourcebots-art deleted file mode 160000 index a7d9f88..0000000 --- a/sourcebots-art +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a7d9f883a9d5243f4ccb544182b089cf22793724 diff --git a/src/afe-logo.png b/src/afe-logo.png deleted file mode 100644 index 5b81519..0000000 Binary files a/src/afe-logo.png and /dev/null differ diff --git a/src/fig-arena.svg b/src/fig-arena.svg index 51095a5..e2f1615 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -173,16 +173,28 @@ y2="2.715" /> + x2="1.88" + y2="1.88" /> + + + + - - + + - - + + @@ -288,12 +300,11 @@ 1220±100mm - - 1220±100mm + + 1220±100mm - - - 1700±100mm + + 380±100mm 460±20mm @@ -315,10 +326,12 @@ 740±10mm - - 1220±100mm + + + 1220±100mm - + + 750±100mm @@ -354,37 +367,44 @@ x="1.2">Can - 2 + 2 Marker (with ID) + + y2="1.4" /> Scoring Line Inner wall + + + y2="3.8" /> - Rules 2024 — Tin Can Rally | SRO + Rules 2025 — Tin Can Rally | SRO @@ -20,34 +20,23 @@

- Smallpeice Logo - Amazon Future Engineer Logo University of Southampton Logo

Table of Contents

    -
  1. Game Rules
    2. -
  2. Regulations
    3. +
  3. Scoring Rules
    4. +
  4. Robot Design Rules
    5. +
  5. Safety Regulations
  6. Specifications
  7. Competition Structure
-

Game Rules

+

Scoring Rules

  1. The objective of the game, called Tin Can Rally, is to race around a track, avoiding tin cans along the way. -
  2. - Before a match begins, participating teams must: -
      -
    • Present their robot in the staging area, adjacent to the arena, before the scheduled close of staging time. The staging area will be clearly marked on the day. -
    • Attach a robot flag. Robot flags will be provided by match officials in the staging area. -
    • Place their robot in the starting area that they are assigned. The robot must be placed such that it is entirely within this starting area, with no parts overhanging its boundary. Its orientation does not matter. -
    • Vacate the arena before the scheduled start time. At this point there must be no interaction with the robot. -
    • Follow the directions of the match officials. -
    - Teams that fail to comply with these rules – such as by arriving late – may forfeit the match, at the discretion of the match officials.
  3. The game is played between two robots.
  4. @@ -64,64 +53,84 @@

    Game Rules

  5. If a robot passes backwards (i.e: clockwise) over any scoring line it must "undo" these before any further forwards line crossings will be counted.
  6. - If a robot avoids knocking over any cans since its last forward scoring line crossing, the crossing is worth an additional 1 point. + A robot loses 1 point for each can it knocks over.
+
  • + If a robot has fewer than 0 points at the end of a match, it will be awarded 0 points.
  • At the end of the match the robot with the most points wins.
  • - The arena is a square of the design specified in - the specifications section. + SRO reserves the right to have match officials in the arena during matches. +
  • + The judge's decision is final. +
  • + Teams may not interact with their robot after the start of a match. This includes to restart their robot should it fail to start. Doing so may result in disqualification from the match. +
  • + While accidental bumps and scrapes are inevitable, the sport is non-contact. +
  • + Robots must not deliberately or negligently damage the arena or anything in it. +
  • + A robot will be stopped during a match when it is at risk of severely damaging itself, other robots, the arena, or otherwise poses a safety risk.
    • -

    Regulations

    +

    Robot Design Rules

    +

    + To ensure a fair competition, all teams must adhere to the following regulations. + Violations of these rules, without an exemption, may result in penalties. + These may include deductions of points or outright disqualification. +

    1. - All robots must be safe. -
    2. - Decisions by match officials are final. + All robots must meet all safety regulations.
    3. Teams must conduct themselves within the principles of good sporting conduct.
    4. - Robots must be fully autonomous. No remote control systems or receivers are permitted. + Robots must fit within a 500 mm × 500 mm × 500 mm cube at all times.
    5. - Robots must pass a safety inspection before they can compete. -
        -
      1. - Robots must not have any sharp edges or points. -
      2. - Robots must have all electronics securely mounted. -
      3. - Robots must provide adequate protection to the battery and its wires. -
      4. - A robot's battery must be in the provided battery box, which must be securely mounted. -
      5. - The power board must be mounted on the top of the robot, with its buttons easily accessible. -
      + Robots must have a spare USB slot accessible to match officials.
    6. - While accidental bumps and scrapes are inevitable, the sport is non-contact. + Robots must have a flag mounting that conforms to the flag mount requirements.
    7. - Robots must not intentionally damage anything inside the arena. - At the discretion of match officials, teams who deliberately engage in collisions - or take insufficient precautions against collisions may be penalised, - including disqualification from rounds and deduction of league points. + Robots must not use any remote control systems, radio transmitters or receivers.
    8. - Robots must have a spare USB slot accessible to match officials, - so that a dongle can be connected to enable competition mode on the robot. + Robots must not have any fiducial markers visible to other robots that may confuse other robots.
    9. - Robots must fit within a 500mm ⨉ 500mm ⨉ 500mm cube. + Robots must all wiring tidy and securely mounted. +
    +

    + If you have questions or concerns about the rules and regulations, including applying for an exemption, please ask. +

    +

    Safety Regulations

    +

    + All robots must be safe. To confirm that your robot is safe, a safety inspection will be carried out by SRO prior to the start of the competition event. + Robots must pass a safety inspection before they can enter a physical arena. + In order to pass safety inspection, robots must: +

    +
    1. - Robots must have a mass of less than 10kg. + Have a mass of less than 13 kg. Generally, teams should aim for their robot to be below 10 kg.
    2. - Robots must not deliberately drop any part of themselves onto the arena. + Have all electronics securely mounted with removable fastenings. Cable ties and screws are recommended for this. Please do not affix anything to the boards with glue or double-sided tape. Electronics should be mounted such that they are not easily damaged.
    3. - Any assistance from staff is provided without guarantees. + Wiring must not be at risk of being snagged by mechanisms or other robots. Wires should be mounted with removable fastening to aid development.
    4. - Robots must have a flag mounting. + Provide adequate protection to the batteries they use, including protection from mechanical damage. +
        +
      1. + Only batteries provided or authorised by SRO may be used. +
      2. + The robot may only be powered through the SRO power board. +
      3. + A robot's battery must be in the provided battery box, which must be securely mounted. +
      +
    5. + Have a power switch, which will completely immobilise the robot. It must be accessible and obvious, without disassembling the robot in any way. It should be on the top of the robot. +
    6. + Not have any sharp edges or points.

    - Violations of these regulations will result in penalties, including deductions - of points or outright disqualification. + If you have questions or concerns about the rules and regulations, please ask.

    @@ -170,18 +179,6 @@

    Arena

  • SRO reserves the right to have match officials in the arena during games. -

    Robot flags

    - A small red flag, attached to a flag pole -
      -
    1. - A "robot flag" is a removable identifier that will be attached to a robot throughout a match. It allows spectators to easily associate a robot with its starting area. -
    2. - Flags are not counted when considering the size of the robot. -
    3. - The identifying part of the robot flag must be visible when attached to the mount. -
    4. - The mounting cylinder must be permanently affixed to the main chassis of a robot, and vertical when the robot is in its typical stopped position. -

    Line follow guide

    1. @@ -191,6 +188,29 @@

      Line follow guide

    2. Where the line follow guide passes another taped line, the guide and surrounding contrast will always be on top.
    +

    Flag Mounts

    +

    + A “robot flag” is a removable identifier that will be attached to a robot throughout the match. + It features the zone colour to allow spectators to easily associate a robot with its zone. + Robot flags and mounts will be provided by SRO. + The flag assembly is shown below. +

    +

    + The pole is constructed from 15 mm white PVC piping. + This is what will attach to your flag mount. +

    + A small red flag, attached to a flag pole +

    + To allow flags to be easily used with your robot, your flag mount must conform to the following requirements: +

    +
      +
    1. + The flag mount must be securely affixed to the main chassis of the robot, and hold the flag vertical when the robot is in its typical stopped position. +
    2. + Flags are not counted when considering the size of the robot. +
    3. + The identifying part of the robot flag must be visible when attached to the mount. +

    • Competition Structure

    diff --git a/src/smallpeice_logo.jpg b/src/smallpeice_logo.jpg deleted file mode 100644 index c77485f..0000000 Binary files a/src/smallpeice_logo.jpg and /dev/null differ diff --git a/src/uos-logo.svg b/src/uos-logo.svg index be60f0e..d57a257 100644 --- a/src/uos-logo.svg +++ b/src/uos-logo.svg @@ -1,33 +1,156 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wrangler.jsonc b/wrangler.jsonc new file mode 100644 index 0000000..aaa4cd5 --- /dev/null +++ b/wrangler.jsonc @@ -0,0 +1,9 @@ +{ + "name": "cer-rules", + "compatibility_date": "2025-08-03", + "assets": { + "directory": "./dist" + }, + "workers_dev": true, + "account_id": "50b11a5357bf235d6bd602fa8d9450b6" +}