mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-20 00:51:42 +00:00
Move CameraServer and WPILib headers into their own folder
The old headers were moved into folders because doing so avoids polluting the system include directories. Folder names were also normalized to lowercase.
This commit is contained in:
committed by
Peter Johnson
parent
31ced30c1e
commit
d89b7dd412
@@ -7,15 +7,16 @@
|
||||
|
||||
#include "OI.h"
|
||||
|
||||
#include "Commands/Collect.h"
|
||||
#include "Commands/DriveForward.h"
|
||||
#include "Commands/LowGoal.h"
|
||||
#include "Commands/SetCollectionSpeed.h"
|
||||
#include "Commands/SetPivotSetpoint.h"
|
||||
#include "Commands/Shoot.h"
|
||||
#include "SmartDashboard/SmartDashboard.h"
|
||||
#include "Subsystems/Collector.h"
|
||||
#include "Subsystems/Pivot.h"
|
||||
#include <frc/smartdashboard/SmartDashboard.h>
|
||||
|
||||
#include "commands/Collect.h"
|
||||
#include "commands/DriveForward.h"
|
||||
#include "commands/LowGoal.h"
|
||||
#include "commands/SetCollectionSpeed.h"
|
||||
#include "commands/SetPivotSetpoint.h"
|
||||
#include "commands/Shoot.h"
|
||||
#include "subsystems/Collector.h"
|
||||
#include "subsystems/Pivot.h"
|
||||
|
||||
OI::OI() {
|
||||
m_r1.WhenPressed(new LowGoal());
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include <Commands/Scheduler.h>
|
||||
#include <LiveWindow/LiveWindow.h>
|
||||
#include <SmartDashboard/SmartDashboard.h>
|
||||
#include <frc/commands/Scheduler.h>
|
||||
#include <frc/livewindow/LiveWindow.h>
|
||||
#include <frc/smartdashboard/SmartDashboard.h>
|
||||
|
||||
DriveTrain Robot::drivetrain;
|
||||
Pivot Robot::pivot;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/CheckForHotGoal.h"
|
||||
#include "commands/CheckForHotGoal.h"
|
||||
|
||||
#include "Robot.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/CloseClaw.h"
|
||||
#include "commands/CloseClaw.h"
|
||||
|
||||
#include "Robot.h"
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/Collect.h"
|
||||
#include "commands/Collect.h"
|
||||
|
||||
#include "Commands/CloseClaw.h"
|
||||
#include "Commands/SetCollectionSpeed.h"
|
||||
#include "Commands/SetPivotSetpoint.h"
|
||||
#include "Commands/WaitForBall.h"
|
||||
#include "Robot.h"
|
||||
#include "commands/CloseClaw.h"
|
||||
#include "commands/SetCollectionSpeed.h"
|
||||
#include "commands/SetPivotSetpoint.h"
|
||||
#include "commands/WaitForBall.h"
|
||||
|
||||
Collect::Collect() {
|
||||
AddSequential(new SetCollectionSpeed(Collector::kForward));
|
||||
@@ -5,15 +5,15 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/DriveAndShootAutonomous.h"
|
||||
#include "commands/DriveAndShootAutonomous.h"
|
||||
|
||||
#include "Commands/CheckForHotGoal.h"
|
||||
#include "Commands/CloseClaw.h"
|
||||
#include "Commands/DriveForward.h"
|
||||
#include "Commands/SetPivotSetpoint.h"
|
||||
#include "Commands/Shoot.h"
|
||||
#include "Commands/WaitForPressure.h"
|
||||
#include "Robot.h"
|
||||
#include "commands/CheckForHotGoal.h"
|
||||
#include "commands/CloseClaw.h"
|
||||
#include "commands/DriveForward.h"
|
||||
#include "commands/SetPivotSetpoint.h"
|
||||
#include "commands/Shoot.h"
|
||||
#include "commands/WaitForPressure.h"
|
||||
|
||||
DriveAndShootAutonomous::DriveAndShootAutonomous() {
|
||||
AddSequential(new CloseClaw());
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/DriveForward.h"
|
||||
#include "commands/DriveForward.h"
|
||||
|
||||
#include <cmath>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/DriveWithJoystick.h"
|
||||
#include "commands/DriveWithJoystick.h"
|
||||
|
||||
#include "Robot.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/ExtendShooter.h"
|
||||
#include "commands/ExtendShooter.h"
|
||||
|
||||
#include "Robot.h"
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/LowGoal.h"
|
||||
#include "commands/LowGoal.h"
|
||||
|
||||
#include "Commands/ExtendShooter.h"
|
||||
#include "Commands/SetCollectionSpeed.h"
|
||||
#include "Commands/SetPivotSetpoint.h"
|
||||
#include "Robot.h"
|
||||
#include "commands/ExtendShooter.h"
|
||||
#include "commands/SetCollectionSpeed.h"
|
||||
#include "commands/SetPivotSetpoint.h"
|
||||
|
||||
LowGoal::LowGoal() {
|
||||
AddSequential(new SetPivotSetpoint(Pivot::kLowGoal));
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/OpenClaw.h"
|
||||
#include "commands/OpenClaw.h"
|
||||
|
||||
#include "Robot.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/SetCollectionSpeed.h"
|
||||
#include "commands/SetCollectionSpeed.h"
|
||||
|
||||
#include "Robot.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/SetPivotSetpoint.h"
|
||||
#include "commands/SetPivotSetpoint.h"
|
||||
|
||||
#include "Robot.h"
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/Shoot.h"
|
||||
#include "commands/Shoot.h"
|
||||
|
||||
#include "Commands/ExtendShooter.h"
|
||||
#include "Commands/OpenClaw.h"
|
||||
#include "Commands/SetCollectionSpeed.h"
|
||||
#include "Commands/WaitForPressure.h"
|
||||
#include "Robot.h"
|
||||
#include "commands/ExtendShooter.h"
|
||||
#include "commands/OpenClaw.h"
|
||||
#include "commands/SetCollectionSpeed.h"
|
||||
#include "commands/WaitForPressure.h"
|
||||
|
||||
Shoot::Shoot() {
|
||||
AddSequential(new WaitForPressure());
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/WaitForBall.h"
|
||||
#include "commands/WaitForBall.h"
|
||||
|
||||
#include "Robot.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Commands/WaitForPressure.h"
|
||||
#include "commands/WaitForPressure.h"
|
||||
|
||||
#include "Robot.h"
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Subsystems/Collector.h"
|
||||
#include "subsystems/Collector.h"
|
||||
|
||||
#include <LiveWindow/LiveWindow.h>
|
||||
#include <frc/livewindow/LiveWindow.h>
|
||||
|
||||
Collector::Collector() : frc::Subsystem("Collector") {
|
||||
// Put everything to the LiveWindow for testing.
|
||||
@@ -5,13 +5,13 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Subsystems/DriveTrain.h"
|
||||
#include "subsystems/DriveTrain.h"
|
||||
|
||||
#include <cmath>
|
||||
|
||||
#include <Joystick.h>
|
||||
#include <frc/Joystick.h>
|
||||
|
||||
#include "Commands/DriveWithJoystick.h"
|
||||
#include "commands/DriveWithJoystick.h"
|
||||
|
||||
DriveTrain::DriveTrain() : frc::Subsystem("DriveTrain") {
|
||||
// AddChild("Front Left CIM", m_frontLeftCIM);
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Subsystems/Pivot.h"
|
||||
#include "subsystems/Pivot.h"
|
||||
|
||||
Pivot::Pivot() : frc::PIDSubsystem("Pivot", 7.0, 0.0, 8.0) {
|
||||
SetAbsoluteTolerance(0.005);
|
||||
@@ -5,9 +5,9 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Subsystems/Pneumatics.h"
|
||||
#include "subsystems/Pneumatics.h"
|
||||
|
||||
#include <SmartDashboard/SmartDashboard.h>
|
||||
#include <frc/smartdashboard/SmartDashboard.h>
|
||||
|
||||
Pneumatics::Pneumatics() : frc::Subsystem("Pneumatics") {
|
||||
AddChild("Pressure Sensor", m_pressureSensor);
|
||||
@@ -5,7 +5,7 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Subsystems/Shooter.h"
|
||||
#include "subsystems/Shooter.h"
|
||||
|
||||
Shooter::Shooter() : Subsystem("Shooter") {
|
||||
// Put everything to the LiveWindow for testing.
|
||||
@@ -5,9 +5,9 @@
|
||||
/* the project. */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "Triggers/DoubleButton.h"
|
||||
#include "triggers/DoubleButton.h"
|
||||
|
||||
#include <Joystick.h>
|
||||
#include <frc/Joystick.h>
|
||||
|
||||
DoubleButton::DoubleButton(frc::Joystick* joy, int button1, int button2)
|
||||
: m_joy(*joy) {
|
||||
@@ -7,10 +7,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Buttons/JoystickButton.h>
|
||||
#include <Joystick.h>
|
||||
#include <frc/Joystick.h>
|
||||
#include <frc/buttons/JoystickButton.h>
|
||||
|
||||
#include "Triggers/DoubleButton.h"
|
||||
#include "triggers/DoubleButton.h"
|
||||
|
||||
class OI {
|
||||
public:
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Command.h>
|
||||
#include <IterativeRobot.h>
|
||||
#include <SmartDashboard/SendableChooser.h>
|
||||
#include <frc/IterativeRobot.h>
|
||||
#include <frc/commands/Command.h>
|
||||
#include <frc/smartdashboard/SendableChooser.h>
|
||||
|
||||
#include "Commands/DriveAndShootAutonomous.h"
|
||||
#include "Commands/DriveForward.h"
|
||||
#include "OI.h"
|
||||
#include "Subsystems/Collector.h"
|
||||
#include "Subsystems/DriveTrain.h"
|
||||
#include "Subsystems/Pivot.h"
|
||||
#include "Subsystems/Pneumatics.h"
|
||||
#include "Subsystems/Shooter.h"
|
||||
#include "commands/DriveAndShootAutonomous.h"
|
||||
#include "commands/DriveForward.h"
|
||||
#include "subsystems/Collector.h"
|
||||
#include "subsystems/DriveTrain.h"
|
||||
#include "subsystems/Pivot.h"
|
||||
#include "subsystems/Pneumatics.h"
|
||||
#include "subsystems/Shooter.h"
|
||||
|
||||
class Robot : public frc::IterativeRobot {
|
||||
public:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Command.h>
|
||||
#include <frc/commands/Command.h>
|
||||
|
||||
/**
|
||||
* This command looks for the hot goal and waits until it's detected or timed
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/InstantCommand.h>
|
||||
#include <frc/commands/InstantCommand.h>
|
||||
|
||||
/**
|
||||
* Close the claw.
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/CommandGroup.h>
|
||||
#include <frc/commands/CommandGroup.h>
|
||||
|
||||
/**
|
||||
* Get the robot set to collect balls.
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/CommandGroup.h>
|
||||
#include <frc/commands/CommandGroup.h>
|
||||
|
||||
/**
|
||||
* Drive over the line and then shoot the ball. If the hot goal is not detected,
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Command.h>
|
||||
#include <frc/commands/Command.h>
|
||||
|
||||
/**
|
||||
* This command drives the robot over a given distance with simple proportional
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Command.h>
|
||||
#include <frc/commands/Command.h>
|
||||
|
||||
/**
|
||||
* This command allows PS3 joystick to drive the robot. It is always running
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/TimedCommand.h>
|
||||
#include <frc/commands/TimedCommand.h>
|
||||
|
||||
/**
|
||||
* Extend the shooter and then retract it after a second.
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/CommandGroup.h>
|
||||
#include <frc/commands/CommandGroup.h>
|
||||
|
||||
/**
|
||||
* Spit the ball out into the low goal assuming that the robot is in front of
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Command.h>
|
||||
#include <frc/commands/Command.h>
|
||||
|
||||
/**
|
||||
* Opens the claw
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/InstantCommand.h>
|
||||
#include <frc/commands/InstantCommand.h>
|
||||
|
||||
/**
|
||||
* This command sets the collector rollers spinning at the given speed. Since
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Command.h>
|
||||
#include <frc/commands/Command.h>
|
||||
|
||||
/**
|
||||
* Moves the pivot to a given angle. This command finishes when it is within
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/CommandGroup.h>
|
||||
#include <frc/commands/CommandGroup.h>
|
||||
|
||||
/**
|
||||
* Shoot the ball at the current angle.
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Command.h>
|
||||
#include <frc/commands/Command.h>
|
||||
|
||||
/**
|
||||
* Wait until the collector senses that it has the ball. This command does
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Command.h>
|
||||
#include <frc/commands/Command.h>
|
||||
|
||||
/**
|
||||
* Wait until the pneumatics are fully pressurized. This command does nothing
|
||||
@@ -7,10 +7,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Subsystem.h>
|
||||
#include <DigitalInput.h>
|
||||
#include <Solenoid.h>
|
||||
#include <Spark.h>
|
||||
#include <frc/DigitalInput.h>
|
||||
#include <frc/Solenoid.h>
|
||||
#include <frc/Spark.h>
|
||||
#include <frc/commands/Subsystem.h>
|
||||
|
||||
/**
|
||||
* The Collector subsystem has one motor for the rollers, a limit switch for
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AnalogGyro.h>
|
||||
#include <Commands/Subsystem.h>
|
||||
#include <Drive/DifferentialDrive.h>
|
||||
#include <Encoder.h>
|
||||
#include <Spark.h>
|
||||
#include <SpeedControllerGroup.h>
|
||||
#include <frc/AnalogGyro.h>
|
||||
#include <frc/Encoder.h>
|
||||
#include <frc/Spark.h>
|
||||
#include <frc/SpeedControllerGroup.h>
|
||||
#include <frc/commands/Subsystem.h>
|
||||
#include <frc/drive/DifferentialDrive.h>
|
||||
|
||||
namespace frc {
|
||||
class Joystick;
|
||||
@@ -7,10 +7,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AnalogPotentiometer.h>
|
||||
#include <Commands/PIDSubsystem.h>
|
||||
#include <DigitalInput.h>
|
||||
#include <Spark.h>
|
||||
#include <frc/AnalogPotentiometer.h>
|
||||
#include <frc/DigitalInput.h>
|
||||
#include <frc/Spark.h>
|
||||
#include <frc/commands/PIDSubsystem.h>
|
||||
|
||||
/**
|
||||
* The Pivot subsystem contains the Van-door motor and the pot for PID control
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AnalogInput.h>
|
||||
#include <Commands/Subsystem.h>
|
||||
#include <Compressor.h>
|
||||
#include <frc/AnalogInput.h>
|
||||
#include <frc/Compressor.h>
|
||||
#include <frc/commands/Subsystem.h>
|
||||
|
||||
/**
|
||||
* The Pneumatics subsystem contains the compressor and a pressure sensor.
|
||||
@@ -7,10 +7,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Commands/Subsystem.h>
|
||||
#include <DigitalInput.h>
|
||||
#include <DoubleSolenoid.h>
|
||||
#include <Solenoid.h>
|
||||
#include <frc/DigitalInput.h>
|
||||
#include <frc/DoubleSolenoid.h>
|
||||
#include <frc/Solenoid.h>
|
||||
#include <frc/commands/Subsystem.h>
|
||||
|
||||
/**
|
||||
* The Shooter subsystem handles shooting. The mechanism for shooting is
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Buttons/Trigger.h>
|
||||
#include <frc/buttons/Trigger.h>
|
||||
|
||||
namespace frc {
|
||||
class Joystick;
|
||||
Reference in New Issue
Block a user