From aed1db3981f776a581bfa93905cd562c00978cdd Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Sat, 7 Feb 2015 13:08:24 -0500 Subject: [PATCH] Added extra elevator DIOs --- RobotMap.h | 6 +++++- Subsystems/Elevator.cpp | 2 +- Subsystems/Elevator.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/RobotMap.h b/RobotMap.h index 1bf5363..da8ce10 100644 --- a/RobotMap.h +++ b/RobotMap.h @@ -6,7 +6,11 @@ // Elevator #define ELEVATOR_CAN 1 #define ELEVATOR_BOTTOM_DIO 0 -#define ELEVATOR_TOP_DIO 1 +#define ELEVATOR_COLELCT_TOTE_DIO 1 +#define ELEVATOR_READY_TOTE_DIO 2 +#define ELEVATOR_COLELCT_CAN_DIO 3 +#define ELEVATOR_READY_CAN_DIO 4 +#define ELEVATOR_TOP_DIO 5 // Drivetrain #define DRIVE_FRONT_LEFT_CAN 2 diff --git a/Subsystems/Elevator.cpp b/Subsystems/Elevator.cpp index 1e18c3e..1616321 100644 --- a/Subsystems/Elevator.cpp +++ b/Subsystems/Elevator.cpp @@ -1,6 +1,6 @@ #include "Elevator.h" #include "../RobotMap.h" -Elevator::Elevator()/* : PIDSubsystem("Elevator", kP_real, kI_real, 0.0)*/{ +Elevator::Elevator(){ motor=new CANTalon(ELEVATOR_CAN); elevatorEncoder=new Encoder(0,1,false); offset=0; diff --git a/Subsystems/Elevator.h b/Subsystems/Elevator.h index 072f8e3..1d8a771 100644 --- a/Subsystems/Elevator.h +++ b/Subsystems/Elevator.h @@ -3,7 +3,7 @@ #include "WPILib.h" #include "Commands/PIDSubsystem.h" -class Elevator/*: public PIDSubsystem*/{ +class Elevator{ private: CANTalon *motor; Encoder *elevatorEncoder;