Merge pull request #95 from fletch3555/rename-examples-for-consistency

rename example project folder names to match java but hyphenated
robotpy · Dec 21, 2023 · 7082531 · 7082531
2 parents 9253953 + 715b524
commit 7082531
Show file tree

Hide file tree

Showing 102 changed files with 56 additions and 77 deletions.
diff --git a/arcade-drive/robot.py → arcadedrive/robot.py b/arcade-drive/robot.py → arcadedrive/robot.py
diff --git a/arcade-drive-xbox-controller/robot.py → arcadedrivexboxcontroller/robot.py b/arcade-drive-xbox-controller/robot.py → arcadedrivexboxcontroller/robot.py
diff --git a/arm-simulation/constants.py → armsimulation/constants.py b/arm-simulation/constants.py → armsimulation/constants.py
diff --git a/arm-simulation/physics.py → armsimulation/physics.py b/arm-simulation/physics.py → armsimulation/physics.py
diff --git a/arm-simulation/robot.py → armsimulation/robot.py b/arm-simulation/robot.py → armsimulation/robot.py
diff --git a/arm-simulation/subsytems/arm.py → armsimulation/subsytems/arm.py b/arm-simulation/subsytems/arm.py → armsimulation/subsytems/arm.py
diff --git a/cscore-quick-vision/robot.py b/cscore-quick-vision/robot.py
diff --git a/differential-drive-bot/drivetrain.py → differentialdrivebot/drivetrain.py b/differential-drive-bot/drivetrain.py → differentialdrivebot/drivetrain.py
diff --git a/differential-drive-bot/robot.py → differentialdrivebot/robot.py b/differential-drive-bot/robot.py → differentialdrivebot/robot.py
diff --git a/digital-communication/robot.py → digitalcommunication/robot.py b/digital-communication/robot.py → digitalcommunication/robot.py
diff --git a/...ffboard/commands/drivedistanceprofiled.py → ...ffboard/commands/drivedistanceprofiled.py b/...ffboard/commands/drivedistanceprofiled.py → ...ffboard/commands/drivedistanceprofiled.py
diff --git a/drive-distance-offboard/constants.py → drivedistanceoffboard/constants.py b/drive-distance-offboard/constants.py → drivedistanceoffboard/constants.py
diff --git a/...e-offboard/examplesmartmotorcontroller.py → ...ceoffboard/examplesmartmotorcontroller.py b/...e-offboard/examplesmartmotorcontroller.py → ...ceoffboard/examplesmartmotorcontroller.py
diff --git a/drive-distance-offboard/robot.py → drivedistanceoffboard/robot.py b/drive-distance-offboard/robot.py → drivedistanceoffboard/robot.py
diff --git a/drive-distance-offboard/robotcontainer.py → drivedistanceoffboard/robotcontainer.py b/drive-distance-offboard/robotcontainer.py → drivedistanceoffboard/robotcontainer.py
diff --git a/...nce-offboard/subsystems/drivesubsystem.py → ...anceoffboard/subsystems/drivesubsystem.py b/...nce-offboard/subsystems/drivesubsystem.py → ...anceoffboard/subsystems/drivesubsystem.py
diff --git a/dutycycle-encoder/robot.py → dutycycleencoder/robot.py b/dutycycle-encoder/robot.py → dutycycleencoder/robot.py
diff --git a/dutycycle-input/robot.py → dutycycleinput/robot.py b/dutycycle-input/robot.py → dutycycleinput/robot.py
diff --git a/elevator-profiled-pid/robot.py → elevatorprofiledpid/robot.py b/elevator-profiled-pid/robot.py → elevatorprofiledpid/robot.py
diff --git a/elevator-simulation/physics.py → elevatorsimulation/physics.py b/elevator-simulation/physics.py → elevatorsimulation/physics.py
diff --git a/elevator-simulation/robot.py → elevatorsimulation/robot.py b/elevator-simulation/robot.py → elevatorsimulation/robot.py
diff --git a/...id-profile/examplesmartmotorcontroller.py → ...oidprofile/examplesmartmotorcontroller.py b/...id-profile/examplesmartmotorcontroller.py → ...oidprofile/examplesmartmotorcontroller.py
diff --git a/elevator-trapezoid-profile/robot.py → elevatortrapezoidprofile/robot.py b/elevator-trapezoid-profile/robot.py → elevatortrapezoidprofile/robot.py
diff --git a/flywheel-bangbang-controller/physics.py → flywheelbangbangcontroller/physics.py b/flywheel-bangbang-controller/physics.py → flywheelbangbangcontroller/physics.py
diff --git a/flywheel-bangbang-controller/robot.py → flywheelbangbangcontroller/robot.py b/flywheel-bangbang-controller/robot.py → flywheelbangbangcontroller/robot.py
diff --git a/frisbee-bot/constants.py → frisbeebot/constants.py b/frisbee-bot/constants.py → frisbeebot/constants.py
diff --git a/frisbee-bot/robot.py → frisbeebot/robot.py b/frisbee-bot/robot.py → frisbeebot/robot.py
diff --git a/frisbee-bot/robotcontainer.py → frisbeebot/robotcontainer.py b/frisbee-bot/robotcontainer.py → frisbeebot/robotcontainer.py
diff --git a/frisbee-bot/subsystems/__init__.py → frisbeebot/subsystems/__init__.py b/frisbee-bot/subsystems/__init__.py → frisbeebot/subsystems/__init__.py
diff --git a/frisbee-bot/subsystems/drivesubsystem.py → frisbeebot/subsystems/drivesubsystem.py b/frisbee-bot/subsystems/drivesubsystem.py → frisbeebot/subsystems/drivesubsystem.py
diff --git a/frisbee-bot/subsystems/shootersubsystem.py → frisbeebot/subsystems/shootersubsystem.py b/frisbee-bot/subsystems/shootersubsystem.py → frisbeebot/subsystems/shootersubsystem.py
diff --git a/game-data/gamedata.md → gamedata/gamedata.md b/game-data/gamedata.md → gamedata/gamedata.md
diff --git a/game-data/robot.py → gamedata/robot.py b/game-data/robot.py → gamedata/robot.py
diff --git a/getting-started/robot.py → gettingstarted/robot.py b/getting-started/robot.py → gettingstarted/robot.py
diff --git a/gyro-drive-commands/commands/turntoangle.py → gyrodrivecommands/commands/turntoangle.py b/gyro-drive-commands/commands/turntoangle.py → gyrodrivecommands/commands/turntoangle.py
diff --git a/...-commands/commands/turntoangleprofiled.py → ...ecommands/commands/turntoangleprofiled.py b/...-commands/commands/turntoangleprofiled.py → ...ecommands/commands/turntoangleprofiled.py
diff --git a/gyro-drive-commands/constants.py → gyrodrivecommands/constants.py b/gyro-drive-commands/constants.py → gyrodrivecommands/constants.py
diff --git a/gyro-drive-commands/robot.py → gyrodrivecommands/robot.py b/gyro-drive-commands/robot.py → gyrodrivecommands/robot.py
diff --git a/gyro-drive-commands/robotcontainer.py → gyrodrivecommands/robotcontainer.py b/gyro-drive-commands/robotcontainer.py → gyrodrivecommands/robotcontainer.py
diff --git a/...ive-commands/subsystems/drivesubsystem.py → ...rivecommands/subsystems/drivesubsystem.py b/...ive-commands/subsystems/drivesubsystem.py → ...rivecommands/subsystems/drivesubsystem.py
diff --git a/gyro-mecanum/robot.py → gyromecanum/robot.py b/gyro-mecanum/robot.py → gyromecanum/robot.py
diff --git a/hatchbot-inlined/commands/autos.py → hatchbotinlined/commands/autos.py b/hatchbot-inlined/commands/autos.py → hatchbotinlined/commands/autos.py
diff --git a/hatchbot-inlined/constants.py → hatchbotinlined/constants.py b/hatchbot-inlined/constants.py → hatchbotinlined/constants.py
diff --git a/hatchbot-inlined/physics.py → hatchbotinlined/physics.py b/hatchbot-inlined/physics.py → hatchbotinlined/physics.py
diff --git a/hatchbot-inlined/robot.py → hatchbotinlined/robot.py b/hatchbot-inlined/robot.py → hatchbotinlined/robot.py
diff --git a/hatchbot-inlined/robotcontainer.py → hatchbotinlined/robotcontainer.py b/hatchbot-inlined/robotcontainer.py → hatchbotinlined/robotcontainer.py
diff --git a/hatchbot-inlined/subsystems/__init__.py → hatchbotinlined/subsystems/__init__.py b/hatchbot-inlined/subsystems/__init__.py → hatchbotinlined/subsystems/__init__.py
diff --git a/...hbot-inlined/subsystems/drivesubsystem.py → hatchbotinlined/subsystems/drivesubsystem.py b/...hbot-inlined/subsystems/drivesubsystem.py → hatchbotinlined/subsystems/drivesubsystem.py
diff --git a/...hbot-inlined/subsystems/hatchsubsystem.py → hatchbotinlined/subsystems/hatchsubsystem.py b/...hbot-inlined/subsystems/hatchsubsystem.py → hatchbotinlined/subsystems/hatchsubsystem.py
diff --git a/hid-rumble/robot.py → hidrumble/robot.py b/hid-rumble/robot.py → hidrumble/robot.py
diff --git a/i2c-communication/robot.py → i2ccommunication/robot.py b/i2c-communication/robot.py → i2ccommunication/robot.py
diff --git a/cscore-intermediate-vision/robot.py → intermediatevision/robot.py b/cscore-intermediate-vision/robot.py → intermediatevision/robot.py
@@ -10,7 +10,9 @@
 
 class MyRobot(wpilib.TimedRobot):
     """
-    This is a good foundation to build your robot code on
+    This is a demo program showing the use of OpenCV to do vision processing. The image is acquired
+    from the USB camera, then a rectangle is put on the image and sent to the dashboard. OpenCV has
+    many methods for different types of processing.
     """
 
     def robotInit(self):

diff --git a/cscore-intermediate-vision/vision.py → intermediatevision/vision.py b/cscore-intermediate-vision/vision.py → intermediatevision/vision.py
@@ -5,10 +5,9 @@
 #
 
 #
-# This is a demo program showing CameraServer usage with OpenCV to do image
-# processing. The image is acquired from the USB camera, then a rectangle
-# is put on the image and sent to the dashboard. OpenCV has many methods
-# for different types of processing.
+# This is a demo program showing the use of OpenCV to do vision processing. The image is acquired
+# from the USB camera, then a rectangle is put on the image and sent to the dashboard. OpenCV has
+# many methods for different types of processing.
 #
 # NOTE: This code runs in its own process, so we cannot access the robot here,
 #       nor can we create/use/see wpilib objects
@@ -26,31 +25,31 @@
 def main():
     CS.enableLogging()
 
+    # Get the UsbCamera from CameraServer
     camera = CS.startAutomaticCapture()
-
-    camera.setResolution(320, 240)
+    # Set the resolution
+    camera.setResolution(640, 480)
 
     # Get a CvSink. This will capture images from the camera
     cvSink = CS.getVideo()
-
-    # (optional) Setup a CvSource. This will send images back to the Dashboard
-    outputStream = CS.putVideo("Rectangle", 320, 240)
+    # Setup a CvSource. This will send images back to the Dashboard
+    outputStream = CS.putVideo("Rectangle", 640, 480)
 
     # Allocating new images is very expensive, always try to preallocate
-    img = np.zeros(shape=(240, 320, 3), dtype=np.uint8)
+    mat = np.zeros(shape=(480, 640, 3), dtype=np.uint8)
 
     while True:
         # Tell the CvSink to grab a frame from the camera and put it
         # in the source image.  If there is an error notify the output.
-        time, img = cvSink.grabFrame(img)
+        time, mat = cvSink.grabFrame(mat)
         if time == 0:
             # Send the output the error.
             outputStream.notifyError(cvSink.getError())
             # skip the rest of the current iteration
             continue
 
         # Put a rectangle on the image
-        cv2.rectangle(img, (100, 100), (300, 300), (255, 255, 255), 5)
+        cv2.rectangle(mat, (100, 100), (400, 400), (255, 255, 255), 5)
 
         # Give the output stream a new image to display
-        outputStream.putFrame(img)
+        outputStream.putFrame(mat)
diff --git a/magicbot-simple/autonomous/__init__.py → magicbotsimple/autonomous/__init__.py b/magicbot-simple/autonomous/__init__.py → magicbotsimple/autonomous/__init__.py
diff --git a/magicbot-simple/autonomous/two_steps.py → magicbotsimple/autonomous/two_steps.py b/magicbot-simple/autonomous/two_steps.py → magicbotsimple/autonomous/two_steps.py
diff --git a/magicbot-simple/components/__init__.py → magicbotsimple/components/__init__.py b/magicbot-simple/components/__init__.py → magicbotsimple/components/__init__.py
diff --git a/magicbot-simple/components/component1.py → magicbotsimple/components/component1.py b/magicbot-simple/components/component1.py → magicbotsimple/components/component1.py
diff --git a/magicbot-simple/components/component2.py → magicbotsimple/components/component2.py b/magicbot-simple/components/component2.py → magicbotsimple/components/component2.py
diff --git a/magicbot-simple/robot.py → magicbotsimple/robot.py b/magicbot-simple/robot.py → magicbotsimple/robot.py
diff --git a/magicbot-simple/tests/pyfrc_test.py → magicbotsimple/tests/pyfrc_test.py b/magicbot-simple/tests/pyfrc_test.py → magicbotsimple/tests/pyfrc_test.py
diff --git a/mecanum-bot/drivetrain.py → mecanumbot/drivetrain.py b/mecanum-bot/drivetrain.py → mecanumbot/drivetrain.py
diff --git a/mecanum-bot/robot.py → mecanumbot/robot.py b/mecanum-bot/robot.py → mecanumbot/robot.py
diff --git a/mecanum-drive/robot.py → mecanumdrive/robot.py b/mecanum-drive/robot.py → mecanumdrive/robot.py
diff --git a/mecanum-driveXbox/robot.py → mecanumdriveXbox/robot.py b/mecanum-driveXbox/robot.py → mecanumdriveXbox/robot.py
diff --git a/motor-control/robot.py → motorcontrol/robot.py b/motor-control/robot.py → motorcontrol/robot.py
diff --git a/physics-4wheel/src/physics.py → physics4wheel/src/physics.py b/physics-4wheel/src/physics.py → physics4wheel/src/physics.py
diff --git a/physics-4wheel/src/robot.py → physics4wheel/src/robot.py b/physics-4wheel/src/robot.py → physics4wheel/src/robot.py
diff --git a/physics-camsim/src/physics.py → physicscamsim/src/physics.py b/physics-camsim/src/physics.py → physicscamsim/src/physics.py
diff --git a/physics-camsim/src/robot.py → physicscamsim/src/robot.py b/physics-camsim/src/robot.py → physicscamsim/src/robot.py
diff --git a/physics-camsim/tests/pyfrc_test.py → physicscamsim/tests/pyfrc_test.py b/physics-camsim/tests/pyfrc_test.py → physicscamsim/tests/pyfrc_test.py
diff --git a/physics-drive-characterization/.gitignore → physicsdrivecharacterization/.gitignore b/physics-drive-characterization/.gitignore → physicsdrivecharacterization/.gitignore
diff --git a/physics-drive-characterization/README.md → physicsdrivecharacterization/README.md b/physics-drive-characterization/README.md → physicsdrivecharacterization/README.md
diff --git a/physics-mecanum/src/physics.py → physicsmecanum/src/physics.py b/physics-mecanum/src/physics.py → physicsmecanum/src/physics.py
diff --git a/physics-mecanum/src/robot.py → physicsmecanum/src/robot.py b/physics-mecanum/src/robot.py → physicsmecanum/src/robot.py
diff --git a/physics-spi/src/physics.py → physicsspi/src/physics.py b/physics-spi/src/physics.py → physicsspi/src/physics.py
diff --git a/physics-spi/src/robot.py → physicsspi/src/robot.py b/physics-spi/src/robot.py → physicsspi/src/robot.py
diff --git a/potentiometer-pid/robot.py → potentiometerpid/robot.py b/potentiometer-pid/robot.py → potentiometerpid/robot.py
diff --git a/quick-vision/robot.py → quickvision/robot.py b/quick-vision/robot.py → quickvision/robot.py
diff --git a/ramsete/constants.py → ramsetecommand/constants.py b/ramsete/constants.py → ramsetecommand/constants.py
diff --git a/ramsete/physics.py → ramsetecommand/physics.py b/ramsete/physics.py → ramsetecommand/physics.py
diff --git a/ramsete/robot.py → ramsetecommand/robot.py b/ramsete/robot.py → ramsetecommand/robot.py
diff --git a/ramsete/robotcontainer.py → ramsetecommand/robotcontainer.py b/ramsete/robotcontainer.py → ramsetecommand/robotcontainer.py
diff --git a/ramsete/subsystems/__init__.py → ramsetecommand/subsystems/__init__.py b/ramsete/subsystems/__init__.py → ramsetecommand/subsystems/__init__.py
diff --git a/ramsete/subsystems/driveSubsystem.py → ramsetecommand/subsystems/driveSubsystem.py b/ramsete/subsystems/driveSubsystem.py → ramsetecommand/subsystems/driveSubsystem.py
diff --git a/ramsete-controller/drivetrain.py → ramsetecontroller/drivetrain.py b/ramsete-controller/drivetrain.py → ramsetecontroller/drivetrain.py
diff --git a/ramsete-controller/robot.py → ramsetecontroller/robot.py b/ramsete-controller/robot.py → ramsetecontroller/robot.py
diff --git a/run_tests.sh b/run_tests.sh
@@ -5,65 +5,64 @@ cd "$(dirname $0)"
 # Keep this list alphabetically sorted
 BASE_TESTS="
   addressableled
-  arcade-drive
-  arcade-drive-xbox-controller
-  arm-simulation
+  arcadedrive
+  arcadedrivexboxcontroller
+  armsimulation
   canpdp
-  hatchbot
-  hatchbot-inlined
-  cscore-intermediate-vision
-  cscore-quick-vision
-  differential-drive-bot
-  digital-communication
-  dutycycle-encoder
-  dutycycle-input
-  elevator-profiled-pid
-  elevator-simulation
-  elevator-trapezoid-profile
+  differentialdrivebot
+  digitalcommunication
+  dutycycleencoder
+  dutycycleinput
+  elevatorprofiledpid
+  elevatorsimulation
+  elevatortrapezoidprofile
   encoder
-  flywheel-bangbang-controller
-  game-data
-  getting-started
+  flywheelbangbangcontroller
+  gamedata
+  gettingstarted
   gyro
-  gyro-mecanum
-  hid-rumble
-  i2c-communication
-  magicbot-simple
-  mecanum-bot
-  mecanum-drive
-  mecanum-driveXbox
+  gyromecanum
+  hatchbot
+  hatchbotinlined
+  hidrumble
+  i2ccommunication
+  intermediatevision
+  magicbotsimple
+  mecanumbot
+  mecanumdrive
+  mecanumdriveXbox
   mechanism2d
-  motor-control
+  motorcontrol
   physics/src
-  physics-4wheel/src
-  physics-mecanum/src
-  physics-spi/src
-  potentiometer-pid
-  quick-vision
-  ramsete-controller
+  physics4wheel/src
+  physicsmecanum/src
+  physicsspi/src
+  potentiometerpid
+  quickvision
+  ramsetecontroller
   relay
   shuffleboard
   solenoid
-  stateful-autonomous
-  state-space-flywheel
-  tank-drive
-  tank-drive-xbox-controller
+  statefulautonomous
+  statespaceflywheel
+  tankdrive
+  tankdrivexboxcontroller
   timed/src
   ultrasonic
-  ultrasonic-pid
+  ultrasonicpid
 "
 
 IGNORED_TESTS="
   armbot
   armbotoffboard
-  drive-distance-offboard
-  frisbee-bot
-  gyro-drive-commands
-  ramsete
-  scheduler-event-logging
+  drivedistanceoffboard
+  frisbeebot
+  gyrodrivecommands
+  ramsetecommand
+  schedulereventlogging
   selectcommand
   romi
-  physics-camsim/src
+  physicscamsim/src
 "
 
 ALL_TESTS="${BASE_TESTS}"

diff --git a/scheduler-event-logging/constants.py → schedulereventlogging/constants.py b/scheduler-event-logging/constants.py → schedulereventlogging/constants.py
diff --git a/scheduler-event-logging/robot.py → schedulereventlogging/robot.py b/scheduler-event-logging/robot.py → schedulereventlogging/robot.py
diff --git a/scheduler-event-logging/robotcontainer.py → schedulereventlogging/robotcontainer.py b/scheduler-event-logging/robotcontainer.py → schedulereventlogging/robotcontainer.py
diff --git a/stateful-autonomous/autonomous/__init__.py → statefulautonomous/autonomous/__init__.py b/stateful-autonomous/autonomous/__init__.py → statefulautonomous/autonomous/__init__.py
diff --git a/...-autonomous/autonomous/drive_backwards.py → ...lautonomous/autonomous/drive_backwards.py b/...-autonomous/autonomous/drive_backwards.py → ...lautonomous/autonomous/drive_backwards.py
diff --git a/...ul-autonomous/autonomous/drive_forward.py → ...fulautonomous/autonomous/drive_forward.py b/...ul-autonomous/autonomous/drive_forward.py → ...fulautonomous/autonomous/drive_forward.py
diff --git a/...-autonomous/autonomous/feature_example.py → ...lautonomous/autonomous/feature_example.py b/...-autonomous/autonomous/feature_example.py → ...lautonomous/autonomous/feature_example.py
diff --git a/stateful-autonomous/robot.py → statefulautonomous/robot.py b/stateful-autonomous/robot.py → statefulautonomous/robot.py
diff --git a/stateful-autonomous/tests/autonomous_test.py → statefulautonomous/tests/autonomous_test.py b/stateful-autonomous/tests/autonomous_test.py → statefulautonomous/tests/autonomous_test.py
diff --git a/stateful-autonomous/tests/pyfrc_test.py → statefulautonomous/tests/pyfrc_test.py b/stateful-autonomous/tests/pyfrc_test.py → statefulautonomous/tests/pyfrc_test.py
diff --git a/state-space-flywheel/robot.py → statespaceflywheel/robot.py b/state-space-flywheel/robot.py → statespaceflywheel/robot.py
diff --git a/state-space-flywheel/util/units.py → statespaceflywheel/util/units.py b/state-space-flywheel/util/units.py → statespaceflywheel/util/units.py
diff --git a/tank-drive/robot.py → tankdrive/robot.py b/tank-drive/robot.py → tankdrive/robot.py
diff --git a/tank-drive-xbox-controller/robot.py → tankdrivexboxcontroller/robot.py b/tank-drive-xbox-controller/robot.py → tankdrivexboxcontroller/robot.py
diff --git a/ultrasonic-pid/robot.py → ultrasonicpid/robot.py b/ultrasonic-pid/robot.py → ultrasonicpid/robot.py