Merge pull request #10 from robocup-junior/2025-draft

Final version  of entry rules and main onstage rules

Author: ChristianH99

.github/workflows/build_entry_rules.yml

@@ -11,8 +11,12 @@ jobs:
   build:
     name: build entry rules
     runs-on: ubuntu-20.04
+    
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository with submodules
+        uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - name: build entry rules
         run: |

.github/workflows/build_main_rules.yml

@@ -7,7 +7,6 @@ on:
       - 'preamble.tex'
       - 'committee_list.tex'
 
-
 jobs:
   build:
     name: build main rules

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "general-rules"]
 	path = general-rules
 	url = https://github.com/robocup-junior/general-rules.git
+[submodule "onstage-entry-general-rules"]
+	path = onstage-entry-general-rules
+	url = https://github.com/robocup-junior/onstage-entry-general-rules

build_rules_on_windows.bat

@@ -55,11 +55,13 @@ for /d %%i in (*) do (
             if /i "!folderName!" neq "media" (
                 if /i "!folderName!" neq "rules_documents" (
                     if /i "!folderName!" neq "general-rules" (
-                        if /i "!folderName!" neq "tmp" (
-                            echo [!folderIndex!] %%i
-                            rem Store folder name in array with corresponding index
-                            set "folderArray[!folderIndex!]=%%i"
-                            set /a "folderIndex+=1"
+                        if /i "!folderName!" neq "onstage-entry-general-rules" (
+                            if /i "!folderName!" neq "tmp" (
+                                echo [!folderIndex!] %%i
+                                rem Store folder name in array with corresponding index
+                                set "folderArray[!folderIndex!]=%%i"
+                                set /a "folderIndex+=1"
+                            )
                         )
                     )
                 )

onstage-entry-general-rules

@@ -5,13 +5,13 @@
 %\renewcommand{\topmargin}{-20pt}
 
 \rfoot{Page \textbf{\thepage} of \textbf{\pageref{LastPage}}}
-\lfoot{\textit{DRAFT rules as of \today}}
+\lfoot{\textit{Rules as of \today}}
 \cfoot{}
 
 % First page
 \fancypagestyle{firststyle}{%
   \fancyhf{}
-  \fancyfoot[L]{\textit{DRAFT rules as of \today}}
+  \fancyfoot[L]{\textit{Rules as of \today}}
   \fancyfoot[R]{Page \textbf{\thepage} of \textbf{\pageref{LastPage}}}
 }
 

onstage_entry_rules/header_footer.tex

@@ -1,4 +1,4 @@
-= RoboCupJunior OnStage Entry Rules 2025 - DRAFT
+= RoboCupJunior OnStage Entry Rules 2025
 {docdate}
 :toc: left
 :sectanchors:
@@ -24,9 +24,6 @@ Regional and super-regional tournament organizers may use these rules, make chan
 
 Although it is recomended to apply these rules to teams in the age from 10 to 14 years, the final decision about the admission criteria is up to the local organizers.
 
-//Add line below again once a new version is released
-//Major changes from the 2023 OnStage rules are written in *[red]#red#*.
-
 *The rules, score sheets, and all forms of documentation can be downloaded from the official RoboCupJunior website* (https://junior.robocup.org). Each team has a responsibility to verify the latest version of the offical rules of the specific event it participates in. Teams are encouraged to study all documents in detail.
 
 [discrete]
@@ -45,6 +42,9 @@ RoboCupJunior OnStage invites teams to design, build and program creative and au
 |image:media/OnStage/StagePerfRight.jpg[width=230]
 |===
 
+[[general-rules]]
+include::../onstage-entry-general-rules/general-rules.adoc[]
+
 [[judging-overview]]
 == Judging Overview
 
@@ -54,20 +54,6 @@ Teams should describe their two chosen features in the Poster. In addition, team
 
 For clarification on a teams’ features, please do not hesitate to reach out to the OnStage League committee using the RoboCupJunior Forum.
 
-[[general]]
-== General
-
-It is the responsibility of the participating team(s) and regional representatives to verify the participants' eligibility requirements, which are as follows:
-
-[[team-size-membership]]
-=== Team Size, Membership and age requirement
-
-The team size and age requirements will be specified by the local organizers.
-
-Each team member needs to carry a role within the team. Each participant can join only one team. No members can, be shared between teams and/or leagues.
-
-Please note that age and team size restrictions will apply to international competitions for the main OnStage competition.
-
 [[onstage-performance]]
 == Performance (50% of total score)
 
@@ -129,7 +115,7 @@ Teams are encouraged to *design costumes for their robot*. If a team wants to us
 [[communication-and-localization]]
 === Communication and Localization
 
-Robots are encouraged to communicate with each other during the performance. Suggested and allowed communication protocols are infrared (IR), Bluetooth (LE and classic), ZigBee, RFID or other localization platforms.
+Robots are encouraged to communicate with each other during the performance.
 
 There must be no communication between off-stage and on-stage devices.
 
@@ -169,10 +155,6 @@ Performances should not include violent, military, threatening, or criminal elem
 [[saftety-and-power-considerations]]
 === Safety and Power Considerations
 
-Under no circumstances can *mains electricity* be used during the performance. Every robot should be equipped with some sort of battery power, with a maximum of 15 volts. 
-
-Lithium batteries must be transported or moved in safety bags. 
-
 Participants should design their robot(s) to be a size that they can easily carry by themselves. Robots should be of a weight that team members can carry and lift onto the stage with ease.
 
 To protect participants and comply with occupational health and safety regulations, routines may not include anything that could be considered a projectile, explosions, smoke, or flame, use of water, or any other hazardous substances (contact the committee when in doubt).
@@ -203,12 +185,8 @@ Extra time will not be given for teams with a translator.
 [[onstage-poster]]
 == Poster (10% of total score)
 
-Each team is required to bring a poster. The purpose of the poster is to explain the technology used, as well as to showcase the robots’ software and hardware.
-
 Teams must submit a digital copy of their poster in PDF format (≤ 10 MB).
 
-The size of the poster should be no larger than A1 (60 x 84 cm).
-
 Areas that are useful to be included in the poster are:
 
 - team name and region
@@ -260,11 +238,6 @@ If more than one performance is scheduled, the highest of all performance scores
 
 All aspects will be judged by a panel of at least three officials. At least one of these judges is a RoboCupJunior official who has judged the Technical interview and documentation as well.
 
-[[mentors]]
-== Mentors
-
-Mentors are not allowed in the team work area.
-
 [[additional-information]]
 == Additional information
 

onstage_entry_rules/rules.adoc

@@ -1,3 +1,3 @@
-\title{\vspace{-5ex}RoboCupJunior OnStage Entry Rules 2025 - DRAFT\vspace{-5ex}}
+\title{\vspace{-5ex}RoboCupJunior OnStage Entry Rules 2025\vspace{-5ex}}
 
 \maketitle

onstage_entry_rules/title.tex

@@ -260,19 +260,8 @@ A team whose routine may be deemed inappropriate to any particular group will be
 [[saftety-and-power-considerations]]
 === Safety and Power Considerations
 
-{--Under no circumstances can *mains electricity* be used during the performance. Every robot should be equipped with some sort of battery power, with a maximum of 15 volts.--}
-
 {--Lead-acid batteries are not considered appropriate unless the team has gained permission from the OnStage League Committee *before* attending the competition for a specific reason. Failure to declare batteries may result in disciplinary actions, including deductions.--}
 
-Teams should be aware of the proper handling of {--lithium--} batteries to ensure safety.
-
-Lithium batteries must be transported or moved in safety bags. 
-
-Teams should design their robot in consideration of safety. Relative to the size and capabilities of the robots, teams should consider:
-[compact]
-- Power Management - Cabling, batteries, emergency stop capabilities
-- Electromechanical System Risks - Exposed pinch points, leaks, sharp edges, tripping hazards, appropriate actuators
-
 Participants should design their robot(s) to be a size that they can easily carry by themselves. Robots should be of a weight that team members can carry and lift onto the stage with ease.
 
 Robots with flying capabilities, such as drones, must be inside of a safety net or tied to an object that's weight exceeds the drones maximum lifting capacity. The safety rope or net needs to be made of a material that can not be damaged by the drones rotors and needs to prevent the drone from leaving the boundaries of the stage at any time. No free-flying robots are allowed in the venue. Any team planning to use a flying robot *must* consult with the OnStage League Committee *prior* to coming to the competition.
@@ -351,8 +340,6 @@ Each team is required to submit a Technical Description Poster by the deadline s
 
 Teams must submit a digital copy of their poster in PDF format (≤ 10 MB). 
 
-{--The size of the poster should be no larger than A1 (60 x 84 cm).--}
-
 Areas that are useful to be included in the poster are:
 
 - team name and region
@@ -365,23 +352,6 @@ Areas that are useful to be included in the poster are:
 - a description of the features that should be judged during the performance
 - QR-codes to repositories, videos, or team websites
 
-Teams will be given public space to display their Technical Poster.
-
-[[bill-of-material]]
-=== Bill of material
-
-Each team will be asked to complete a bill of materials including all major components and materials prior to the event.
-
-The list has to include the following:
-[compact]
-- Name / Description (e.g. part number, …)
-- Source
-- Is the component new or has it been used before
-- Is the component part of a kit or has it been developed by the team
-- Price of component
-
-A template will be provided and has to be used for the submission.
-
 [[judging]]
 == Judging