merging

Author: Muxite

.clang-format

@@ -15,6 +15,7 @@ BreakBeforeBraces: Allman
 BreakStringLiterals: 'false'
 ColumnLimit: '90'
 Cpp11BracedListStyle: 'true'
+DerivePointerAlignment: 'false'
 IncludeBlocks: Regroup
 IndentCaseLabels: 'true'
 IndentWidth: '4'

docs/getting-started.md

@@ -280,24 +280,12 @@ Now that you're setup, if you can run it on the command line, you can run it in
         - Xbox control allows us to use a connected Xbox controller to control the robots
 4. Run our SimulatedPlayTests in Thunderscope
     - This will launch the visualizer and simulate AI Plays, allowing us to visually see the robots acting according to their roles.
-    1. For legacy C++ tests (#2581) with the visualizer:
-        1. First run Thunderscope configured for receiving protobufs over unix sockets correctly: `./tbots.py run thunderscope_main --visualize_cpp_test`
-        2. Then run `./tbots.py test [some_target_here] --run_sim_in_realtime`
-    2. For PyTests:
-        - With the visualizer: `./tbots.py test [some_target_here] -t`
-        - Without the visualizer: `./tbots.py test [some_target_here]`
-    3. For legacy C++ tests (#2581) without the visualizer:
-        - `./tbots.py test [some_target_here]`
+    - With the visualizer: `./tbots.py test [some_target_here] -t`
+    - Without the visualizer: `./tbots.py test [some_target_here]`
 5. Run our SimulatedTacticTests in Thunderscope:
     - This will launch the visualizer and simulate an AI Tactic on a single robot
-    1. For legacy C++ tests (#2581) with the visualizer:
-        - First, run Thunderscope configured for receiving protobufs over unix sockets correctly: `./tbots.py run thunderscope_main --visualize_cpp_test`
-        - Then run `./tbots.py test [some_target_here] --run_sim_in_realtime`
-    2. For PyTests:
-        - With the visualizer: `./tbots.py test [some_target_here] -t`
-        - Without the visualizer: `./tbots.py test [some_target_here]`
-    3. For legacy C++ tests (#2581) without the visualizer:
-        - `./tbots.py test [some_target_here]`
+    - With the visualizer: `./tbots.py test [some_target_here] -t`
+    - Without the visualizer: `./tbots.py test [some_target_here]`
 
 ## Debugging
 

environment_setup/macos_requirements.txt

@@ -1,7 +1,7 @@
-ansible-lint==24.12.2
+ansible-lint==26.4.0
 pyqtgraph==0.13.7
 thefuzz==0.19.0
-iterfzf==0.5.0.20.0
+iterfzf==1.9.0.67.0
 python-Levenshtein==0.25.1
 psutil==5.9.0
 PyOpenGL==3.1.6
@@ -10,4 +10,3 @@ pyqt-toast-notification==1.3.2
 grpcio-tools==1.71.0
 platformio==6.1.18
 pyqt6==6.9.1
-

environment_setup/setup_software_mac.sh

@@ -51,7 +51,6 @@ print_status_msg "Setting Up Python Environment"
 
 # Create virtual environment
 sudo python3.12 -m venv /opt/tbotspython
-chmod
 source /opt/tbotspython/bin/activate
 
 # Install Python dependencies
@@ -69,6 +68,10 @@ sudo chmod +x "$CURR_DIR/../src/software/autoref/run_autoref.sh"
 sudo cp "$CURR_DIR/../src/software/autoref/DIV_B.txt" "/opt/tbotspython/autoReferee/config/geometry/DIV_B.txt"
 print_status_msg "Finished setting up AutoRef"
 
+print_status_msg "Install clang-format"
+install_clang_format $sys
+print_status_msg "Done installing clang-format"
+
 print_status_msg "Setting up cross compiler for robot software"
 install_cross_compiler $sys
 print_status_msg "Done setting up cross compiler for robot software"

environment_setup/ubuntu24_requirements.txt

@@ -1,4 +1,4 @@
-ansible-lint==25.8.1
+ansible-lint==26.4.0
 pyqtgraph==0.13.7
 thefuzz==0.19.0
 iterfzf==0.5.0.20.0

environment_setup/util.sh

@@ -29,7 +29,11 @@ install_bazel() {
 }
 
 install_clang_format() {
-    ln -s /usr/bin/clang-format-14 /opt/tbotspython/bin/clang-format
+    if is_darwin $1; then
+        ln -s /opt/homebrew/bin/clang-format /opt/tbotspython/bin/clang-format
+    else
+        ln -s /usr/bin/clang-format-14 /opt/tbotspython/bin/clang-format
+    fi
 }
 
 install_cross_compiler() {

scripts/lint_and_format.sh

@@ -25,7 +25,7 @@ function run_clang_format () {
     cd $BAZEL_ROOT_DIR
 
     # Generate extension string
-    # Formatted as -iname *.EXTENSION -o
+    # Formatted as -name *.EXTENSION -o
     EXTENSION_STRING=""
     for value in "${CLANG_FORMAT_EXTENSIONS[@]}"
     do
@@ -35,8 +35,8 @@ function run_clang_format () {
     # Find all the files that we want to format, and pass them to
     # clang-format as arguments
     # We remove the last -o flag from the extension string
-    find $CURR_DIR/../src/ ${EXTENSION_STRING::-2}  \
-        | xargs -I{} -n1000 $CLANG_BIN -i -style=file:$CURR_DIR/../.clang-format
+    find $CURR_DIR/../src ${EXTENSION_STRING% -o} \
+        | xargs $CLANG_BIN -i -style=file:$CURR_DIR/../.clang-format
 
     if [[ "$?" != 0 ]]; then
         printf "\n***Failed to run clang-format over all files!***\n\n"

src/.bazelrc

@@ -75,6 +75,9 @@ build --cxxopt="-DG3_DYNAMIC_LOGGING"
 build --per_file_copt=.*\.pb\.(h|cc|cpp)$@-w
 build --per_file_copt=./external/.*,./bazel-out/.*@-w
 
+# Define Robot Versions
+build --copt="-DCURRENT_ROBOT_VERSION=2026"
+
 ############## External Deps Compatibility ##############
 build --noincompatible_disallow_ctx_resolve_tools
 build --check_direct_dependencies=off

src/MODULE.bazel

@@ -137,12 +137,13 @@ use_repo(
     "boost",
 )
 
-bazel_dep(name = "hedron_compile_commands", version = "1.0.5", dev_dependency = True)
+# Temporary workaround while https://github.com/hedronvision/bazel-compile-commands-extractor/pull/219 is not merged
+bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
 archive_override(
     module_name = "hedron_compile_commands",
-    sha256 = "658122cfb1f25be76ea212b00f5eb047d8e2adc8bcf923b918461f2b1e37cdf2",
-    strip_prefix = "bazel-compile-commands-extractor-4f28899228fb3ad0126897876f147ca15026151e",
-    url = "https://github.com/hedronvision/bazel-compile-commands-extractor/archive/4f28899228fb3ad0126897876f147ca15026151e.tar.gz",
+    sha256 = "ba3feefdf57b6d4c749e3c4abfa86f3673e7db364cb13acfc3496dce6ea801a3",
+    strip_prefix = "bazel-compile-commands-extractor-f5fbd4cee671d8d908f37c83abaf70fba5928fc7",
+    url = "https://github.com/mikael-s-persson/bazel-compile-commands-extractor/archive/f5fbd4cee671d8d908f37c83abaf70fba5928fc7.tar.gz",
 )
 
 bazel_dep(name = "platformio_rules", repo_name = "platformio_rules")

src/cli/cli_params.py

@@ -86,7 +86,6 @@ class DebugBinary(str, Enum):
 ]
 
 EnableThunderscopeOption = Annotated[bool, Option("-t", "--enable_thunderscope")]
-EnableVisualizerOption = Annotated[bool, Option("-v", "--enable_visualizer")]
 StopAIOnStartOption = Annotated[bool, Option("-s", "--stop_ai_on_start")]
 
 JobsOption = Annotated[str, Option("-j", "--jobs")]