From 2a894fcecf7009e5e809daf5e086ef07c0792a98 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 18 Apr 2024 23:10:20 +0100 Subject: [PATCH 01/57] Add line following guide The path is intentionally suboptimal, and long, so it's not the obviously optimal strategy. --- src/fig-arena.svg | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index 0d05bd0..950a279 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -20,6 +20,12 @@ stroke-width: .02; } + .line-follow-guide { + fill: none; + stroke: #AAA; + stroke-width: .01; + } + .arena-wall { fill: none; stroke: #555; @@ -158,12 +164,17 @@ y1="1.22" x2="2.7" y2="2.7" /> + + + + + @@ -343,5 +354,15 @@ class="legend-label" y="2.2" x="5.2">Inner wall + + + Line follow guide From c61bc7ddb51fe1e6fe7d6c3e736cd1ded9a5d531 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 25 Apr 2024 18:04:38 +0100 Subject: [PATCH 02/57] Use thicker black line for scale --- src/fig-arena.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index 950a279..66ab7a3 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -22,8 +22,8 @@ .line-follow-guide { fill: none; - stroke: #AAA; - stroke-width: .01; + stroke: black; + stroke-width: .03; } .arena-wall { From a3c64783e300360384c797fd9e4f64dfcdb220be Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 9 May 2024 21:40:24 +0100 Subject: [PATCH 03/57] Update league points from game points This is only true for 4 robot games --- src/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.html b/src/index.html index 738f2a8..b94160b 100644 --- a/src/index.html +++ b/src/index.html @@ -221,13 +221,13 @@

Matches

  • At the end of a game, league points will be awarded as follows:
      -
    • The team with the most game points will be awarded 8 points towards the competition league. -
    • The team with the second most will be awarded 6. +
    • The team with the most game points will be awarded 4 points towards the competition league. +
    • The team with the second most will be awarded 2.
    • Teams whose robot was not entered into the round, or who were disqualified from the round, will be awarded no points.
  • If a match ends in a tie, robots will be awarded the average of the points that their combined - positions would be awarded, in this case 7 (since this is (8 + 6) ÷ 2). + positions would be awarded, in this case 3 (since this is (4 + 2) ÷ 2).
  • At the end of the leagues, positions in the leagues are used to seed a knockout. This will be used to determine the final 1st, From 4868bedf1a7c0a6350a7da14e14be104e2ec16bf Mon Sep 17 00:00:00 2001 From: Will Barber Date: Fri, 24 May 2024 19:03:40 +0100 Subject: [PATCH 04/57] Started at the direction of match officials --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 738f2a8..91ea5ee 100644 --- a/src/index.html +++ b/src/index.html @@ -53,7 +53,7 @@

    Game Rules

  • Each match lasts for 150 seconds.
  • - Robots will be started by, or at the direction of, match officials. + Robots will be started at the direction of match officials.
  • Game points will be awarded as follows:
      From 27510750e24e58b42300c3fa5b04704e0ae1de0b Mon Sep 17 00:00:00 2001 From: Will Barber Date: Fri, 24 May 2024 19:04:58 +0100 Subject: [PATCH 05/57] Drop the 40 second rule We haven't managed to follow this in years --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 91ea5ee..3a291c9 100644 --- a/src/index.html +++ b/src/index.html @@ -44,7 +44,7 @@

      Game Rules

    1. 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.
    2. Attach a robot flag. Robot flags will be provided by SourceBots officials in the staging area.
    3. 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. -
    4. Vacate the arena 40 seconds before the scheduled start time. During the 40 second period prior to the start of the match there must be no interaction with the robot. +
    5. Vacate the arena before the scheduled start time. At this point there must be no interaction with the robot.
    6. 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 judge. From c3261083a90f853e2a33be71a479603a9efd2cd4 Mon Sep 17 00:00:00 2001 From: Will Barber Date: Fri, 24 May 2024 19:05:44 +0100 Subject: [PATCH 06/57] Clarify crossing a line --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 3a291c9..51a03d4 100644 --- a/src/index.html +++ b/src/index.html @@ -67,7 +67,7 @@

      Game Rules

    7. At the end of each lap - defined as every sixth scoring line crossed in a forward direction - a robot is awarded an additional 4 points above the points it would normally get for the crossing.
    8. - A robot is deemed to have passed a scoring line when the back of the robot passes the line. + A robot is deemed to have passed a scoring line when the whole robot passes the line.
    9. 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.
    10. From b9cb823d8985008d9120defc996445878748dc64 Mon Sep 17 00:00:00 2001 From: Will Barber Date: Fri, 24 May 2024 19:58:09 +0100 Subject: [PATCH 07/57] Add reasonable wall height --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 51a03d4..9e454ab 100644 --- a/src/index.html +++ b/src/index.html @@ -173,7 +173,7 @@

      Arena

    11. The floor of the arena is covered with a closed-loop, short pile carpet.
    12. - The perimeter of the arena floor is delimited by the arena wall, which has a minimum height of 100mm. + The perimeter of the arena floor is delimited by the arena wall, which has a minimum height of 250mm.
    13. Starting areas are 1000 ±50mm squares and will be marked by tape which is considered part of the starting area.
    14. From 17646083a5fcd4d5cd33e9341fe19625d8ecdab3 Mon Sep 17 00:00:00 2001 From: Will Barber Date: Fri, 24 May 2024 20:02:21 +0100 Subject: [PATCH 08/57] Arrange specifications logically --- src/index.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/index.html b/src/index.html index 9e454ab..d5368c9 100644 --- a/src/index.html +++ b/src/index.html @@ -175,13 +175,11 @@

      Arena

    15. The perimeter of the arena floor is delimited by the arena wall, which has a minimum height of 250mm.
    16. - Starting areas are 1000 ±50mm squares and will be marked by tape which is considered part of the starting area. -
    17. - Starting area 1 is at the top of the arena diagram, and area 2 is at the bottom. + The inner walls of the arena have a minimum height of 170mm.
    18. - The green boxes denote a robot in their start locations, shown in yellow. Robots may start anywhere inside their starting area facing any direction. + Starting areas are 1000 ±50mm squares and will be marked by tape which is considered part of the starting area. Robots may start anywhere inside their starting area facing any direction.
    19. - The inner walls of the arena have a minimum height of 170mm. + Starting area 1 is at the top of the arena diagram, and area 2 is at the bottom.
    20. SourceBots reserves the right to have match officials in the arena during games.
    From b663030c4b47d4b23cac84c4e5cbac63a77276a5 Mon Sep 17 00:00:00 2001 From: Will Barber Date: Fri, 24 May 2024 20:05:04 +0100 Subject: [PATCH 09/57] We print the markers They are also clearly just black and white so the point is redundant --- src/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/index.html b/src/index.html index d5368c9..d53e730 100644 --- a/src/index.html +++ b/src/index.html @@ -155,9 +155,6 @@

    Markers

    -

    - The markers can be printed on a black-and-white printer. -

    Sixteen arena wall markers are positioned around the arena as shown in the arena specification. Marker codes are mirrored on each side of the arena.

    From d2a0e60498f54ba27f2ce8a197b1772f3d2dc775 Mon Sep 17 00:00:00 2001 From: Will Barber Date: Fri, 24 May 2024 20:08:33 +0100 Subject: [PATCH 10/57] Ambiguous this --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index d53e730..2ac7177 100644 --- a/src/index.html +++ b/src/index.html @@ -225,7 +225,7 @@

    Matches

    positions would be awarded, in this case 7 (since this is (8 + 6) ÷ 2).
  • At the end of the leagues, positions in the leagues are used to seed a - knockout. This will be used to determine the final 1st, + knockout. The knockouts will be used to determine the final 1st, 2nd and 3rd awards.
  • In the event of a tie in a knockout match, the team that ranked highest in the league will From 1043f2321dab254529bc3ec9d0d793aae558c0fd Mon Sep 17 00:00:00 2001 From: Will Barber Date: Fri, 24 May 2024 20:13:44 +0100 Subject: [PATCH 11/57] Not just the starting size --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 2ac7177..1ac4259 100644 --- a/src/index.html +++ b/src/index.html @@ -186,7 +186,7 @@

    Robot flags

  • 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.
  • - Flags are not counted when considering the starting size of the robot. + Flags are not counted when considering the size of the robot.
  • The identifying part of the robot flag must be visible when attached to the mount.
  • From 01b6955e13c501d9889034d72b4f66c2dc48577a Mon Sep 17 00:00:00 2001 From: Will Barber Date: Fri, 24 May 2024 22:08:04 +0100 Subject: [PATCH 12/57] Refactor regulations Provide a more logical grouping Group safety regs into a sublist Remove redundant regs --- src/index.html | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/src/index.html b/src/index.html index 1ac4259..d37a788 100644 --- a/src/index.html +++ b/src/index.html @@ -90,41 +90,39 @@

    Regulations

  • Teams must conduct themselves within the principles of good sporting conduct.
  • - Any assistance from Smallpeice Trust staff and volunteers is provided without guarantees. + Robots must be fully autonomous. No remote control systems or receivers are permitted.
  • - No remote control systems or radio transmitters or receivers are permitted. + 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 and easily removable. +
    3. + Robots must provide adequate protection to the batteries they use, including + protection from mechanical damage. +
    4. + Robots must have a power switch, obvious and on top, which will completely immobilise + the robot. +
  • While accidental bumps and scrapes are inevitable, the sport is non-contact.
  • - Robots must pass a safety inspection before they can compete. -
  • - Robots must have a mass of less than 10kg. + Robots must not intentionally damage anything inside the arena. + At the discretion of the judge, 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 intentionally damage anything inside the arena. At the discretion of the judge, 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 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 fit within a 500mm ⨉ 500mm ⨉ 500mm cube at the start of each match. + Robots must fit within a 500mm ⨉ 500mm ⨉ 500mm cube.
  • - Robots must fit within a 500mm ⨉ 750mm ⨉ 750mm cube, with one 750mm axis vertical, - at all times during each match. + Robots must have a mass of less than 10kg.
  • Robots must not deliberately drop any part of themselves onto the arena.
  • - Robots must have all electronics securely mounted and easily removable. -
  • - Robots must provide adequate protection to the batteries they use, including - protection from mechanical damage. -
  • - Robots must not have any devices designed to produce noise except where included - in the SourceBots kit. -
  • - Robots must not have any fiducial markers visible to other robots. -
  • - Robots must have a spare USB slot accessible to match officials. -
  • - Robots must have a power switch, obvious and on top, which will completely immobilise - the robot. -
  • - Robots must not have any sharp edges or points. + Any assistance from Smallpeice Trust staff and volunteers is provided without guarantees.
  • Robots must have a flag mounting. From b83ebd58ca592c3cff4f855e62c49f643a47d3cd Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 25 May 2024 09:30:04 +0100 Subject: [PATCH 13/57] Ensure guide is centred to track --- src/fig-arena.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index 66ab7a3..2288765 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -173,7 +173,7 @@ class="start-zone"/> - + From 56c4c8764f953bb8d0bc51894a7833d7a82e3dcb Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 25 May 2024 19:31:15 +0100 Subject: [PATCH 14/57] Fix line following alignment behind robot --- src/fig-arena.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index 2288765..f7c0598 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -173,7 +173,7 @@ class="start-zone"/> - + From b817f146f207af9edd04155912e8e209a11ed3cb Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 25 May 2024 20:59:20 +0100 Subject: [PATCH 15/57] Reduce marker spacing --- src/fig-arena.svg | 77 +++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index f7c0598..c1c913d 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -53,7 +53,7 @@ fill: none; } - .marker { + #marker { stroke: red; stroke-width: 0.04; } @@ -146,6 +146,10 @@ + + + + @@ -201,17 +205,10 @@ - - - - - - - - - - - + + + + @@ -230,29 +227,29 @@ class="arena-wall"/> - 0 - 1 + 0 + 1 - 0 - 1 + 0 + 1 - 2 - 3 + 2 + 3 - 2 - 3 + 2 + 3 - 4 - 5 + 4 + 5 - 4 - 5 + 4 + 5 - 6 + 6 7 - 6 - 7 + 6 + 7 @@ -262,9 +259,9 @@ 1200±100mm - - - 460±10mm + + + 490±10mm 1500±100mm @@ -283,19 +280,19 @@ 300±20mm - - + + - 450±10mm + 490±10mm - - - - 200±10mm + + + + 150±10mm - - - 560±10mm + + + 600±10mm 1200±100mm From 38c0a5d324929af82dd5deac428de3dc54f944d5 Mon Sep 17 00:00:00 2001 From: Will Barber Date: Tue, 25 Jun 2024 08:45:53 +0100 Subject: [PATCH 16/57] Use marker centerlines and correct dimensions (#42) --- src/fig-arena.svg | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index c1c913d..b1d40c4 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -230,8 +230,8 @@ 0 1 - 0 - 1 + 0 + 1 2 3 @@ -242,7 +242,7 @@ 4 5 - 4 + 4 5 6 @@ -253,52 +253,51 @@ - 1200±100mm + 1220±100mm - 1200±100mm + 1220±100mm - - - 490±10mm + + + 610±10mm - 1500±100mm + 1480±100mm - 1200±100mm + 1220±100mm - 1200±100mm + 1220±100mm - 1400±100mm + 1480±100mm 300±20mm - - + + - 490±10mm + 610±10mm 150±10mm - - - 600±10mm + + + 740±10mm - 1200±100mm + 1220±100mm - 1200±100mm 5400±100mm From b4d07db2be45e1738f7234275ed2250c2710d6df Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 18 Jul 2024 20:20:34 +0100 Subject: [PATCH 17/57] Rebrand as SRO (#44) --- src/index.html | 12 ++++++------ src/index.scss | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/index.html b/src/index.html index ab6a65f..dde80ea 100644 --- a/src/index.html +++ b/src/index.html @@ -4,16 +4,16 @@ - Rules 2023 — Tin Can Rally | SourceBots + Rules 2023 — Tin Can Rally | SRO - +
    - - SourceBots + + SRO

    TIN CAN RALLY @@ -176,7 +176,7 @@

    Arena

  • Starting area 1 is at the top of the arena diagram, and area 2 is at the bottom.
  • - SourceBots reserves the right to have match officials in the arena during games. + SRO reserves the right to have match officials in the arena during games.

    Robot flags

    Robot flag @@ -231,7 +231,7 @@

    Matches

    -

    © SourceBots

    +

    © SRO

    diff --git a/src/index.scss b/src/index.scss index 68b8bb5..07eeff4 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1,4 +1,4 @@ -$primary: #4b35b3; +$primary: #02A6F2; $content-width: 900px; html, body { From 0ff128b110bb02def803f1f81b4edd36c3e804f5 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 18 Jul 2024 21:47:58 +0100 Subject: [PATCH 18/57] Drop starting area name --- src/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/index.html b/src/index.html index dde80ea..c9cfeac 100644 --- a/src/index.html +++ b/src/index.html @@ -173,8 +173,6 @@

    Arena

    The inner walls of the arena have a minimum height of 170mm.
  • Starting areas are 1000 ±50mm squares and will be marked by tape which is considered part of the starting area. Robots may start anywhere inside their starting area facing any direction. -
  • - Starting area 1 is at the top of the arena diagram, and area 2 is at the bottom.
  • SRO reserves the right to have match officials in the arena during games. From 28034764cd129dd1f1eaefb7984b4e439da02cc7 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 20 Jul 2024 17:22:18 +0100 Subject: [PATCH 19/57] Cans may or may not be conductive --- src/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/index.html b/src/index.html index c9cfeac..78b1c28 100644 --- a/src/index.html +++ b/src/index.html @@ -196,8 +196,6 @@

    Cans

    Cans are 67mm ±3mm in diameter with a height of 100mm ±5mm.
  • Cans will be arranged as shown in the arena specification. -
  • - Cans are electrically conductive and ferromagnetic.
    From e901c304fca5873fac4be0a9ebc8a651fb6edc28 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 26 Jul 2024 20:47:33 +0100 Subject: [PATCH 20/57] Update missed SourceBots reference Co-authored-by: Sam Martin <82397538+samjmartin04@users.noreply.github.com> --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 78b1c28..620c774 100644 --- a/src/index.html +++ b/src/index.html @@ -42,7 +42,7 @@

    Game Rules

    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 SourceBots officials in the staging area. +
    • Attach a robot flag. Robot flags will be provided by SRO 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. From 69aa5eda5935379ec12fab0287b4e0bd641eda55 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 18 Apr 2024 22:44:44 +0100 Subject: [PATCH 21/57] Change cans to be just obsticles This means teams are less likely to waste time building complex mechanisms to pick them up, and instead focus on driving around. --- src/fig-arena.svg | 34 +++++++++++++++++++++------------- src/index.html | 11 ++--------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index b1d40c4..f75164b 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -154,9 +154,9 @@ - - - + + + + 1220±100mm - - 1220±100mm + + 1220±100mm - - - 1480±100mm + + + 1700±100mm - - - 300±20mm + + 300±20mm @@ -299,6 +299,14 @@ + + + 370±100mm + + + + 370±100mm + 5400±100mm diff --git a/src/index.html b/src/index.html index 620c774..193084e 100644 --- a/src/index.html +++ b/src/index.html @@ -37,7 +37,7 @@

      Table of Contents

      Game Rules

      1. - The objective of the game, called Tin Can Rally, is to race around a track, picking up tin cans along the way. + 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:
          @@ -60,18 +60,11 @@

          Game Rules

        • 1 point is awarded each time a robot crosses a scoring line in the anti-clockwise direction.
        • - Robots can pick up tin cans which are in the track. - For every can a robot is carrying when it crosses a scoring line, the number of points awarded is doubled. -
          - For example, a robot carrying two cans is awarded four points. -
        • - At the end of each lap - defined as every sixth scoring line crossed in a forward direction - a robot is awarded an additional 4 points above the points it would normally get for the crossing. + At the end of each lap - defined as every forward crossing of the scoring line immediately behind the robot's starting area - a robot is awarded an additional 4 points for the crossing.
        • A robot is deemed to have passed a scoring line when the whole robot passes the line.
        • 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. -
        • - At the end of a match, each robot is awarded 2 additional points for each tin can it is carrying.
    • At the end of the match the robot with the most points wins. From 3c56a6ba74b802cb1c1669bb6bdfa7a501d6e80b Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 25 May 2024 09:38:03 +0100 Subject: [PATCH 22/57] Restore starting scoring line This helps with the barrier to entry for getting at least 1 point --- src/fig-arena.svg | 4 ++-- src/index.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index f75164b..778511e 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -154,9 +154,9 @@ Game Rules
    • 1 point is awarded each time a robot crosses a scoring line in the anti-clockwise direction.
    • - At the end of each lap - defined as every forward crossing of the scoring line immediately behind the robot's starting area - a robot is awarded an additional 4 points for the crossing. + At the end of each lap - defined as every subsequent forward crossing of the scoring line immediately in front of the robot's starting area - a robot is awarded an additional 4 points for the crossing.
    • A robot is deemed to have passed a scoring line when the whole robot passes the line.
    • From d4b60d16549916d0895055d034fa63d4bd04bc92 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 25 May 2024 09:46:52 +0100 Subject: [PATCH 23/57] Add missing dimension --- src/fig-arena.svg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index 778511e..2540319 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -277,8 +277,11 @@ 1700±100mm + + 460±20mm + - 300±20mm + 600±20mm From c303d11851f5461df76b28da91cbf085336ee413 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 26 Jul 2024 20:49:47 +0100 Subject: [PATCH 24/57] Fix units and tolerance spelling Units shouldn't be duplicated --- src/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.html b/src/index.html index de584ed..6cf3c0a 100644 --- a/src/index.html +++ b/src/index.html @@ -150,7 +150,7 @@

      Markers

      Sixteen arena wall markers are positioned around the arena as shown in the arena specification. Marker codes are mirrored on each side of the arena.

      - Wall markers are placed such that the bottom of the marker is 20 ±5mm from the arena floor. + Wall markers are placed such that the bottom of the marker is 20±5mm from the arena floor.

      Arena

      Arena diagram @@ -165,7 +165,7 @@

      Arena

    • The inner walls of the arena have a minimum height of 170mm.
    • - Starting areas are 1000 ±50mm squares and will be marked by tape which is considered part of the starting area. Robots may start anywhere inside their starting area facing any direction. + Starting areas are 1000±50mm squares and will be marked by tape which is considered part of the starting area. Robots may start anywhere inside their starting area facing any direction.
    • SRO reserves the right to have match officials in the arena during games. @@ -184,9 +184,9 @@

      Robot flags

      Cans

      1. - Cans are cylindrical metallic containers weighing 350g ±20g. + Cans are cylindrical metallic containers weighing 350±20g.
      2. - Cans are 67mm ±3mm in diameter with a height of 100mm ±5mm. + Cans are 67±3mm in diameter with a height of 100±5mm.
      3. Cans will be arranged as shown in the arena specification.
      From 17346f4e24ca5462ef13649e35c7929f2c299927 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 26 Jul 2024 20:54:04 +0100 Subject: [PATCH 25/57] Mention provided battery box --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 6cf3c0a..27b8bab 100644 --- a/src/index.html +++ b/src/index.html @@ -93,7 +93,7 @@

      Regulations

      Robots must have all electronics securely mounted and easily removable.
    • Robots must provide adequate protection to the batteries they use, including - protection from mechanical damage. + using the provided battery box.
    • Robots must have a power switch, obvious and on top, which will completely immobilise the robot. From 7da996b5f8112455330455dbe60b12b3ebd28966 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 26 Jul 2024 21:10:55 +0100 Subject: [PATCH 26/57] Clarify arena size --- src/index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index 27b8bab..cbf327b 100644 --- a/src/index.html +++ b/src/index.html @@ -156,8 +156,7 @@

      Arena

      Arena diagram
      1. - The above figure represents, to scale, a birds eye view of the arena. The arena is - 5.4m square. + The above figure represents, to scale, a birds eye view of the arena. The arena is a square with side length 5.4m.
      2. The floor of the arena is covered with a closed-loop, short pile carpet.
      3. From 8794d28dbfd63961cc6e7653322e09e7ca4a8145 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 26 Jul 2024 21:20:14 +0100 Subject: [PATCH 27/57] Use mass rather than weight --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index cbf327b..519693b 100644 --- a/src/index.html +++ b/src/index.html @@ -183,7 +183,7 @@

        Robot flags

        Cans

        1. - Cans are cylindrical metallic containers weighing 350±20g. + Cans are cylindrical metallic containers with a mass of 350±20g.
        2. Cans are 67±3mm in diameter with a height of 100±5mm.
        3. From 5592ff3876b6616fc240ceaee390c0fe946860b0 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 26 Jul 2024 21:30:35 +0100 Subject: [PATCH 28/57] Document line follow guide --- src/index.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/index.html b/src/index.html index 519693b..9c5a0a1 100644 --- a/src/index.html +++ b/src/index.html @@ -180,14 +180,12 @@

          Robot flags

        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.
        -

        Cans

        +

        Line follow guide

        1. - Cans are cylindrical metallic containers with a mass of 350±20g. + The line follow guide is marked with tape on the arena floor.
        2. - Cans are 67±3mm in diameter with a height of 100±5mm. -
        3. - Cans will be arranged as shown in the arena specification. + The guide is marked using black take with width 50mm.
    From ad5d359b8d916ce1f19e2189ef2b0392cb6d57b8 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 26 Jul 2024 21:52:01 +0100 Subject: [PATCH 29/57] Update year in title --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 9c5a0a1..bdf5348 100644 --- a/src/index.html +++ b/src/index.html @@ -4,7 +4,7 @@ - Rules 2023 — Tin Can Rally | SRO + Rules 2024 — Tin Can Rally | SRO From 702bd3e0058b003fb54f179f24ed7441489d8bdb Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 26 Jul 2024 21:53:06 +0100 Subject: [PATCH 30/57] Securely mount the battery box --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index bdf5348..0a54dc9 100644 --- a/src/index.html +++ b/src/index.html @@ -93,7 +93,7 @@

    Regulations

    Robots must have all electronics securely mounted and easily removable.
  • Robots must provide adequate protection to the batteries they use, including - using the provided battery box. + using the provided battery box which must be securely mounted to the robot.
  • Robots must have a power switch, obvious and on top, which will completely immobilise the robot. From 553318f0267ef5d07dcf4589f70cf83673980b79 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 27 Jul 2024 14:30:55 +0100 Subject: [PATCH 31/57] Fix typo --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 0a54dc9..73b3a3c 100644 --- a/src/index.html +++ b/src/index.html @@ -185,7 +185,7 @@

    Line follow guide

  • The line follow guide is marked with tape on the arena floor.
  • - The guide is marked using black take with width 50mm. + The guide is marked using black tape with width 50mm.
    • From 0acabb1a3e7961edcb9c426cab353cee24a797d6 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 27 Jul 2024 16:53:27 +0100 Subject: [PATCH 32/57] Update dimensions of line follow guide --- src/fig-arena.svg | 9 ++++++++- src/index.html | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index 2540319..e9edb2c 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -23,7 +23,13 @@ .line-follow-guide { fill: none; stroke: black; - stroke-width: .03; + stroke-width: .012; + } + + .line-follow-guide-back { + fill: none; + stroke: white; + stroke-width: .05; } .arena-wall { @@ -177,6 +183,7 @@ class="start-zone"/> + diff --git a/src/index.html b/src/index.html index 73b3a3c..a4c6181 100644 --- a/src/index.html +++ b/src/index.html @@ -185,7 +185,7 @@

    Line follow guide

  • The line follow guide is marked with tape on the arena floor.
  • - The guide is marked using black tape with width 50mm. + The guide is marked using black tape with width 12±1mm. The black tape is positioned centrally on a piece of white tape with width 50±5mm.
    • From 554b849405da10bb815a1504cf52465a97243cdd Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 27 Jul 2024 18:04:28 +0100 Subject: [PATCH 33/57] Make scoring line size to scale --- src/fig-arena.svg | 12 ++++++------ src/index.html | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index e9edb2c..44f1695 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -52,9 +52,9 @@ .scoring-line { stroke: #333; - stroke-width: 0.015; + stroke-width: 0.05; /*stroke-dasharray: 0.14142135, 0.14142135;*/ - stroke-dasharray: 0.06 0.06; + stroke-dasharray: 0.05 0.03; stroke-dashoffset: -50%; fill: none; } @@ -160,15 +160,15 @@ + y2="2.715" /> Arena The perimeter of the arena floor is delimited by the arena wall, which has a minimum height of 250mm.
  • The inner walls of the arena have a minimum height of 170mm. +
  • + Scoring lines are marked using tape with width 50±5mm.
  • Starting areas are 1000±50mm squares and will be marked by tape which is considered part of the starting area. Robots may start anywhere inside their starting area facing any direction.
  • From 00775827999418574a8307ab96105d0a307d7076 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 27 Jul 2024 18:05:16 +0100 Subject: [PATCH 34/57] Specify the line following guide is always on top --- src/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/index.html b/src/index.html index 8f20ec0..0d1a4fa 100644 --- a/src/index.html +++ b/src/index.html @@ -188,6 +188,8 @@

    Line follow guide

    The line follow guide is marked with tape on the arena floor.
  • The guide is marked using black tape with width 12±1mm. The black tape is positioned centrally on a piece of white tape with width 50±5mm. +
  • + Where the line follow guide passes another taped line, the guide and surrounding contrast will always be on top.
    • From 4c6040419485ca2fa0aade6efa829c1fe7d70f8b Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 28 Jul 2024 15:39:57 +0100 Subject: [PATCH 35/57] Use solid lines for scoring lines --- src/fig-arena.svg | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index 44f1695..8fd6f01 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -53,9 +53,6 @@ .scoring-line { stroke: #333; stroke-width: 0.05; - /*stroke-dasharray: 0.14142135, 0.14142135;*/ - stroke-dasharray: 0.05 0.03; - stroke-dashoffset: -50%; fill: none; } From a96a8f697061d9c122935bfa2399c43b97702649 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 1 Aug 2024 13:54:20 +0100 Subject: [PATCH 36/57] Penalise knocking over cans --- src/fig-arena.svg | 8 ++++---- src/index.html | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index 8fd6f01..ea59b6e 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -191,8 +191,8 @@ - - + + - + 370±100mm - + 370±100mm diff --git a/src/index.html b/src/index.html index 0d1a4fa..44bf1e2 100644 --- a/src/index.html +++ b/src/index.html @@ -58,13 +58,15 @@

    Game Rules

    Game points will be awarded as follows:
    1. - 1 point is awarded each time a robot crosses a scoring line in the anti-clockwise direction. + 3 points are awarded each time a robot crosses a scoring line in the anti-clockwise direction.
    2. - At the end of each lap - defined as every subsequent forward crossing of the scoring line immediately in front of the robot's starting area - a robot is awarded an additional 4 points for the crossing. + At the end of each lap - defined as every subsequent forward crossing of the scoring line immediately in front of the robot's starting area - a robot is awarded an additional 8 points for the crossing.
    3. A robot is deemed to have passed a scoring line when the whole robot passes the line.
    4. 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. +
    5. + If a robot knocks over a can since its last forward scoring line crossing, the next crossing is only worth 1 point.
  • At the end of the match the robot with the most points wins. From 631e85bb6f68a12162ac8cf7173bedad53df85c4 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 1 Aug 2024 14:30:18 +0100 Subject: [PATCH 37/57] Reword can knocking rule to be positive --- src/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index 44bf1e2..8c09242 100644 --- a/src/index.html +++ b/src/index.html @@ -58,7 +58,7 @@

    Game Rules

    Game points will be awarded as follows:
    1. - 3 points are awarded each time a robot crosses a scoring line in the anti-clockwise direction. + 2 points are awarded each time a robot crosses a scoring line in the anti-clockwise direction.
    2. At the end of each lap - defined as every subsequent forward crossing of the scoring line immediately in front of the robot's starting area - a robot is awarded an additional 8 points for the crossing.
    3. @@ -66,7 +66,7 @@

      Game Rules

    4. 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.
    5. - If a robot knocks over a can since its last forward scoring line crossing, the next crossing is only worth 1 point. + If a robot doesn't knock over a can since its last forward scoring line crossing, the crossing is worth an additional 1 point.
  • At the end of the match the robot with the most points wins. From 3c1a2c14e37760d94bbb591a24cf6943aead5884 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 1 Aug 2024 14:38:11 +0100 Subject: [PATCH 38/57] Improve wording around knocking over cans --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 8c09242..8642596 100644 --- a/src/index.html +++ b/src/index.html @@ -66,7 +66,7 @@

    Game Rules

  • 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.
  • - If a robot doesn't knock over a can since its last forward scoring line crossing, the crossing is worth an additional 1 point. + If a robot avoids knocking over any cans since its last forward scoring line crossing, the crossing is worth an additional 1 point.
  • At the end of the match the robot with the most points wins. From db75981bdbbe54324fcf68685713ac1eee5368fc Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 1 Aug 2024 18:22:02 +0100 Subject: [PATCH 39/57] Reduce value of laps 8 is too high --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 8642596..9a9ab2d 100644 --- a/src/index.html +++ b/src/index.html @@ -60,7 +60,7 @@

    Game Rules

  • 2 points are awarded each time a robot crosses a scoring line in the anti-clockwise direction.
  • - At the end of each lap - defined as every subsequent forward crossing of the scoring line immediately in front of the robot's starting area - a robot is awarded an additional 8 points for the crossing. + At the end of each lap - defined as every subsequent forward crossing of the scoring line immediately in front of the robot's starting area - a robot is awarded an additional 4 points for the crossing.
  • A robot is deemed to have passed a scoring line when the whole robot passes the line.
  • From 5d6483fac1edfce0a8dbb4097831f7b931744f8c Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 11:57:33 +0100 Subject: [PATCH 40/57] Simplify assistance from staff definition Co-authored-by: Alistair Lynn --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 9a9ab2d..2b07eab 100644 --- a/src/index.html +++ b/src/index.html @@ -117,7 +117,7 @@

    Regulations

  • Robots must not deliberately drop any part of themselves onto the arena.
  • - Any assistance from Smallpeice Trust staff and volunteers is provided without guarantees. + Any assistance from staff is provided without guarantees.
  • Robots must have a flag mounting. From 58444a291153cf4ac138daa0e02a2c78ff0656b1 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:01:16 +0100 Subject: [PATCH 41/57] Use "match" rather than "SRO" for officials definition Co-authored-by: Alistair Lynn --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 2b07eab..f7728a2 100644 --- a/src/index.html +++ b/src/index.html @@ -42,7 +42,7 @@

    Game Rules

    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 SRO officials in the staging area. +
    • 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. From ecbeb0d372ab000f65da3ada1d747e84fa2ce82f Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:01:59 +0100 Subject: [PATCH 42/57] Simplify definition of passing line Co-authored-by: Alistair Lynn --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index f7728a2..52172fa 100644 --- a/src/index.html +++ b/src/index.html @@ -62,7 +62,7 @@

      Game Rules

    • At the end of each lap - defined as every subsequent forward crossing of the scoring line immediately in front of the robot's starting area - a robot is awarded an additional 4 points for the crossing.
    • - A robot is deemed to have passed a scoring line when the whole robot passes the line. + A robot is deemed to have passed a scoring line when the entire robot has passed the line.
    • 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.
    • From 9dfa105679aaf57c29bd60790809b731b249454e Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:02:31 +0100 Subject: [PATCH 43/57] Require power board on top of robot Co-authored-by: Alistair Lynn --- src/index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index 52172fa..b3601ac 100644 --- a/src/index.html +++ b/src/index.html @@ -97,8 +97,7 @@

      Regulations

      Robots must provide adequate protection to the batteries they use, including using the provided battery box which must be securely mounted to the robot.
    • - Robots must have a power switch, obvious and on top, which will completely immobilise - the robot. + The power board must be mounted on the top of the robot, with its buttons easily accessible.
    • While accidental bumps and scrapes are inevitable, the sport is non-contact. From 19e803028877faebf6304bf3719c897f35c59f4f Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:03:18 +0100 Subject: [PATCH 44/57] Improve alt text of flag diagram Co-authored-by: Alistair Lynn --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index b3601ac..a571824 100644 --- a/src/index.html +++ b/src/index.html @@ -172,7 +172,7 @@

      Arena

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

      Robot flags

      - Robot flag + 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. From f96d8dd135ee4a317ef11e452029968fe29e6367 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:04:11 +0100 Subject: [PATCH 45/57] Use present tense for awarded points Co-authored-by: Alistair Lynn --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index a571824..033f809 100644 --- a/src/index.html +++ b/src/index.html @@ -55,7 +55,7 @@

        Game Rules

      2. Robots will be started at the direction of match officials.
      3. - Game points will be awarded as follows: + Game points are awarded as follows:
        1. 2 points are awarded each time a robot crosses a scoring line in the anti-clockwise direction. From b39e22c255f481b38444f029fb14a8b3cd9639a5 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:05:12 +0100 Subject: [PATCH 46/57] Use millimetres for all measurements Co-authored-by: Alistair Lynn --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 033f809..1f12a58 100644 --- a/src/index.html +++ b/src/index.html @@ -157,7 +157,7 @@

          Arena

          Arena diagram
          1. - The above figure represents, to scale, a birds eye view of the arena. The arena is a square with side length 5.4m. + The above figure represents, to scale, a birds eye view of the arena. The arena is a square with side length 5400mm.
          2. The floor of the arena is covered with a closed-loop, short pile carpet.
          3. From cb53c7c07d226a12865808dc14dbb6704c1cbf98 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 11:52:42 +0100 Subject: [PATCH 47/57] Remove lap bonus points --- src/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/index.html b/src/index.html index 1f12a58..959b0a3 100644 --- a/src/index.html +++ b/src/index.html @@ -59,8 +59,6 @@

            Game Rules

            1. 2 points are awarded each time a robot crosses a scoring line in the anti-clockwise direction. -
            2. - At the end of each lap - defined as every subsequent forward crossing of the scoring line immediately in front of the robot's starting area - a robot is awarded an additional 4 points for the crossing.
            3. A robot is deemed to have passed a scoring line when the entire robot has passed the line.
            4. From 800785f77580493ed0098cd07aae497f5311d794 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 11:54:30 +0100 Subject: [PATCH 48/57] Add alt text to logos --- src/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.html b/src/index.html index 959b0a3..ff8faf3 100644 --- a/src/index.html +++ b/src/index.html @@ -13,16 +13,16 @@
              - SRO + SRO Logo

              TIN CAN RALLY

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

              Table of Contents

              From e309362234d216e3d6ed80cccb25bb7dae279a43 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 11:56:24 +0100 Subject: [PATCH 49/57] Simplify tied points definition --- src/index.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/index.html b/src/index.html index ff8faf3..0b6e83c 100644 --- a/src/index.html +++ b/src/index.html @@ -19,7 +19,7 @@

              TIN CAN RALLY

    • -
    +
    w Smallpeice Logo Amazon Future Engineer Logo University of Southampton Logo @@ -208,8 +208,7 @@

    Matches

  • Teams whose robot was not entered into the round, or who were disqualified from the round, will be awarded no points.
  • - If a match ends in a tie, robots will be awarded the average of the points that their combined - positions would be awarded, in this case 3 (since this is (4 + 2) ÷ 2). + If a match ends in a tie, both robots will be awarded 3 points.
  • At the end of the leagues, positions in the leagues are used to seed a knockout. The knockouts will be used to determine the final 1st, From 3f43475dba686fdfafae6c4bc502432f4b6bc60a Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 11:59:56 +0100 Subject: [PATCH 50/57] Drop judge --- src/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.html b/src/index.html index 0b6e83c..17941b5 100644 --- a/src/index.html +++ b/src/index.html @@ -47,7 +47,7 @@

    Game Rules

  • 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 judge. + Teams that fail to comply with these rules – such as by arriving late – may forfeit the match, at the discretion of the match officials.
  • The game is played between two robots.
  • @@ -79,7 +79,7 @@

    Regulations

  • All robots must be safe.
  • - The judge's decision is final. + Decisions by match officials are final.
  • Teams must conduct themselves within the principles of good sporting conduct.
  • @@ -101,7 +101,7 @@

    Regulations

    While accidental bumps and scrapes are inevitable, the sport is non-contact.
  • Robots must not intentionally damage anything inside the arena. - At the discretion of the judge, teams who deliberately engage in collisions + 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.
  • From cb4dfdcb47bc54ed370cf35fcb0712e46f5188f2 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:00:35 +0100 Subject: [PATCH 51/57] Drop easily removably requirement We better specify how boards should be mounted, and can enforce with mentors. --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 17941b5..52355d0 100644 --- a/src/index.html +++ b/src/index.html @@ -90,7 +90,7 @@

    Regulations

  • Robots must not have any sharp edges or points.
  • - Robots must have all electronics securely mounted and easily removable. + Robots must have all electronics securely mounted.
  • Robots must provide adequate protection to the batteries they use, including using the provided battery box which must be securely mounted to the robot. From f86631b59abe84fb56f93f96fc8aa80b99f0aad0 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:06:13 +0100 Subject: [PATCH 52/57] Drop footer --- src/index.html | 5 +---- src/index.scss | 12 ------------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/index.html b/src/index.html index 52355d0..4dcdca5 100644 --- a/src/index.html +++ b/src/index.html @@ -19,7 +19,7 @@

    TIN CAN RALLY

    -
    w +
    Smallpeice Logo Amazon Future Engineer Logo University of Southampton Logo @@ -218,8 +218,5 @@

    Matches

    go through.
    -
    -

    © SRO

    -
    diff --git a/src/index.scss b/src/index.scss index 07eeff4..7222b83 100644 --- a/src/index.scss +++ b/src/index.scss @@ -72,18 +72,6 @@ section { } } -footer { - background-color: #2a2a2a; - color: white; - padding: 2em 1em; - font-size: 80%; - text-align: center; - - p { - margin: 0; - } -} - h2, h3, h4, h5, h6 { color: $primary; margin: 12px 0; From 06c85b95104238c0f3d7e4849cd64a63a81ab02c Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:28:04 +0100 Subject: [PATCH 53/57] Fix spacing on logos --- src/index.scss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/index.scss b/src/index.scss index 7222b83..4524893 100644 --- a/src/index.scss +++ b/src/index.scss @@ -42,16 +42,14 @@ header { } section#logos { + display: grid; + grid-template-columns: 1fr 1fr 1fr; align-items: center; - justify-content: space-between; - flex-direction: initial; + column-gap: 1rem; img { display: block; - flex-grow: 1; - flex-shrink: 1; width: 100%; - margin: 1em; max-height: 100px; object-fit: contain; From 9054de473554acf372ef13bed6973eec7078df58 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 4 Aug 2024 12:31:49 +0100 Subject: [PATCH 54/57] Use sans-serif font for arena diagram --- src/fig-arena.svg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/fig-arena.svg b/src/fig-arena.svg index ea59b6e..5ef9b10 100644 --- a/src/fig-arena.svg +++ b/src/fig-arena.svg @@ -8,6 +8,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink">