team2059/dent
2
0
Fork 0
mirror of https://github.com/team2059/Dent synced 2024-12-18 20:52:29 -05:00
Code Issues Releases Wiki Activity

Added extra elevator DIOs

Browse Source
This commit is contained in:
Austen Adler 2015-02-07 13:08:24 -05:00
parent 113f81a0b0
commit aed1db3981
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RobotMap.h
View File

@ -6,7 +6,11 @@
// Elevator // Elevator
#define ELEVATOR_CAN 1 #define ELEVATOR_CAN 1
#define ELEVATOR_BOTTOM_DIO 0 #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 // Drivetrain
#define DRIVE_FRONT_LEFT_CAN 2 #define DRIVE_FRONT_LEFT_CAN 2

2
Subsystems/Elevator.cpp
View File

@ -1,6 +1,6 @@
#include "Elevator.h" #include "Elevator.h"
#include "../RobotMap.h" #include "../RobotMap.h"
Elevator::Elevator()/* : PIDSubsystem("Elevator", kP_real, kI_real, 0.0)*/{ Elevator::Elevator(){
motor=new CANTalon(ELEVATOR_CAN); motor=new CANTalon(ELEVATOR_CAN);
elevatorEncoder=new Encoder(0,1,false); elevatorEncoder=new Encoder(0,1,false);
offset=0; offset=0;

2
Subsystems/Elevator.h
View File

@ -3,7 +3,7 @@
#include "WPILib.h" #include "WPILib.h"
#include "Commands/PIDSubsystem.h" #include "Commands/PIDSubsystem.h"
class Elevator/*: public PIDSubsystem*/{ class Elevator{
private: private:
CANTalon *motor; CANTalon *motor;
Encoder *elevatorEncoder; Encoder *elevatorEncoder;