diff --git a/automation/README.md b/.automation/README.md similarity index 100% rename from automation/README.md rename to .automation/README.md diff --git a/automation/cpp_template/.gitignore b/.automation/cpp_template/.gitignore similarity index 100% rename from automation/cpp_template/.gitignore rename to .automation/cpp_template/.gitignore diff --git a/automation/cpp_template/.wpilib/wpilib_preferences.json b/.automation/cpp_template/.wpilib/wpilib_preferences.json similarity index 100% rename from automation/cpp_template/.wpilib/wpilib_preferences.json rename to .automation/cpp_template/.wpilib/wpilib_preferences.json diff --git a/automation/cpp_template/WPILib-License.md b/.automation/cpp_template/WPILib-License.md similarity index 100% rename from automation/cpp_template/WPILib-License.md rename to .automation/cpp_template/WPILib-License.md diff --git a/automation/cpp_template/build.gradle b/.automation/cpp_template/build.gradle similarity index 100% rename from automation/cpp_template/build.gradle rename to .automation/cpp_template/build.gradle diff --git a/automation/cpp_template/gradle/wrapper/gradle-wrapper.jar b/.automation/cpp_template/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from automation/cpp_template/gradle/wrapper/gradle-wrapper.jar rename to .automation/cpp_template/gradle/wrapper/gradle-wrapper.jar diff --git a/automation/cpp_template/gradle/wrapper/gradle-wrapper.properties b/.automation/cpp_template/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from automation/cpp_template/gradle/wrapper/gradle-wrapper.properties rename to .automation/cpp_template/gradle/wrapper/gradle-wrapper.properties diff --git a/automation/cpp_template/gradlew b/.automation/cpp_template/gradlew similarity index 100% rename from automation/cpp_template/gradlew rename to .automation/cpp_template/gradlew diff --git a/automation/cpp_template/gradlew.bat b/.automation/cpp_template/gradlew.bat similarity index 100% rename from automation/cpp_template/gradlew.bat rename to .automation/cpp_template/gradlew.bat diff --git a/automation/cpp_template/settings.gradle b/.automation/cpp_template/settings.gradle similarity index 100% rename from automation/cpp_template/settings.gradle rename to .automation/cpp_template/settings.gradle diff --git a/automation/cpp_template/vendordeps/Phoenix6.json b/.automation/cpp_template/vendordeps/Phoenix6.json similarity index 100% rename from automation/cpp_template/vendordeps/Phoenix6.json rename to .automation/cpp_template/vendordeps/Phoenix6.json diff --git a/automation/cpp_template/vendordeps/WPILibNewCommands.json b/.automation/cpp_template/vendordeps/WPILibNewCommands.json similarity index 100% rename from automation/cpp_template/vendordeps/WPILibNewCommands.json rename to .automation/cpp_template/vendordeps/WPILibNewCommands.json diff --git a/automation/java_template/.gitignore b/.automation/java_template/.gitignore similarity index 100% rename from automation/java_template/.gitignore rename to .automation/java_template/.gitignore diff --git a/automation/java_template/.wpilib/wpilib_preferences.json b/.automation/java_template/.wpilib/wpilib_preferences.json similarity index 100% rename from automation/java_template/.wpilib/wpilib_preferences.json rename to .automation/java_template/.wpilib/wpilib_preferences.json diff --git a/automation/java_template/WPILib-License.md b/.automation/java_template/WPILib-License.md similarity index 100% rename from automation/java_template/WPILib-License.md rename to .automation/java_template/WPILib-License.md diff --git a/automation/java_template/build.gradle b/.automation/java_template/build.gradle similarity index 100% rename from automation/java_template/build.gradle rename to .automation/java_template/build.gradle diff --git a/automation/java_template/gradle/wrapper/gradle-wrapper.jar b/.automation/java_template/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from automation/java_template/gradle/wrapper/gradle-wrapper.jar rename to .automation/java_template/gradle/wrapper/gradle-wrapper.jar diff --git a/automation/java_template/gradle/wrapper/gradle-wrapper.properties b/.automation/java_template/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from automation/java_template/gradle/wrapper/gradle-wrapper.properties rename to .automation/java_template/gradle/wrapper/gradle-wrapper.properties diff --git a/automation/java_template/gradlew b/.automation/java_template/gradlew similarity index 100% rename from automation/java_template/gradlew rename to .automation/java_template/gradlew diff --git a/automation/java_template/gradlew.bat b/.automation/java_template/gradlew.bat similarity index 100% rename from automation/java_template/gradlew.bat rename to .automation/java_template/gradlew.bat diff --git a/automation/java_template/settings.gradle b/.automation/java_template/settings.gradle similarity index 100% rename from automation/java_template/settings.gradle rename to .automation/java_template/settings.gradle diff --git a/automation/java_template/vendordeps/Phoenix6.json b/.automation/java_template/vendordeps/Phoenix6.json similarity index 100% rename from automation/java_template/vendordeps/Phoenix6.json rename to .automation/java_template/vendordeps/Phoenix6.json diff --git a/automation/java_template/vendordeps/WPILibNewCommands.json b/.automation/java_template/vendordeps/WPILibNewCommands.json similarity index 100% rename from automation/java_template/vendordeps/WPILibNewCommands.json rename to .automation/java_template/vendordeps/WPILibNewCommands.json diff --git a/automation/python_template/.gitignore b/.automation/python_template/.gitignore similarity index 100% rename from automation/python_template/.gitignore rename to .automation/python_template/.gitignore diff --git a/automation/python_template/.wpilib/wpilib_preferences.json b/.automation/python_template/.wpilib/wpilib_preferences.json similarity index 100% rename from automation/python_template/.wpilib/wpilib_preferences.json rename to .automation/python_template/.wpilib/wpilib_preferences.json diff --git a/automation/python_template/pyproject.toml b/.automation/python_template/pyproject.toml similarity index 100% rename from automation/python_template/pyproject.toml rename to .automation/python_template/pyproject.toml diff --git a/cpp/Simulation/src/main/cpp/Robot.cpp b/cpp/Simulation/src/main/cpp/Robot.cpp index 3211304f..726c316e 100644 --- a/cpp/Simulation/src/main/cpp/Robot.cpp +++ b/cpp/Simulation/src/main/cpp/Robot.cpp @@ -160,7 +160,7 @@ void Robot::SimulationPeriodic() rightSim.SetReverseLimit(joystick.GetRightTriggerAxis() > 0.5); } -units::meter_t DriveSubsystem::rotationsToMeters(units::turn_t rotations) +units::meter_t Robot::rotationsToMeters(units::turn_t rotations) { /* Every radian of rotation, the wheel travels this many inches */ constexpr auto wheelDistancePerRad = kWheelRadiusInches / 1_rad; @@ -170,7 +170,7 @@ units::meter_t DriveSubsystem::rotationsToMeters(units::turn_t rotations) return gearedRotations * wheelDistancePerRad; } -units::turn_t DriveSubsystem::metersToRotations(units::meter_t meters) +units::turn_t Robot::metersToRotations(units::meter_t meters) { /* Every radian of rotation, the wheel travels this many inches */ constexpr auto wheelDistancePerRad = kWheelRadiusInches / 1_rad; @@ -180,7 +180,7 @@ units::turn_t DriveSubsystem::metersToRotations(units::meter_t meters) return wheelRadians * kGearRatio; } -units::meters_per_second_t DriveSubsystem::rotationsToMetersVel(units::turns_per_second_t rotations) +units::meters_per_second_t Robot::rotationsToMetersVel(units::turns_per_second_t rotations) { /* Every radian of rotation, the wheel travels this many inches */ constexpr auto wheelDistancePerRad = kWheelRadiusInches / 1_rad; @@ -190,7 +190,7 @@ units::meters_per_second_t DriveSubsystem::rotationsToMetersVel(units::turns_per return gearedRotations * wheelDistancePerRad; } -units::turns_per_second_t DriveSubsystem::metersToRotationsVel(units::meters_per_second_t meters) +units::turns_per_second_t Robot::metersToRotationsVel(units::meters_per_second_t meters) { /* Every radian of rotation, the wheel travels this many inches */ constexpr auto wheelDistancePerRad = kWheelRadiusInches / 1_rad; diff --git a/update_template.py b/update_template.py index ce1958b5..d5e767f9 100644 --- a/update_template.py +++ b/update_template.py @@ -11,9 +11,9 @@ # Mapping of templates to target directories TEMPLATE_DIRS: dict[str, str] = { - "./automation/java_template/" : "./java", - "./automation/cpp_template/" : "./cpp", - "./automation/python_template/": "./python" + "./.automation/java_template/" : "./java", + "./.automation/cpp_template/" : "./cpp", + "./.automation/python_template/": "./python" } # List of globs to ignore for deletion