That-One-Nerd/ary-over-under
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve my skill issue

Browse Source 
#pragma once
This commit is contained in:
ary 2023-10-10 10:21:37 -04:00
parent 8a00af52a2
commit 6ea107bf4e
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RELENTLESS/include/globals.hpp
View File

@ -1,8 +1,5 @@
#include "main.h" #include "main.h"
#include "okapi/api.hpp" #include "Wings.h"
#include "lemlib/api.hpp"
#include "ary-lib/drive/drive.hpp"
#include "wings.h"
#define TRACK_WIDTH 11.5 #define TRACK_WIDTH 11.5
#define PLACEHOLDER_TC_OFFSET 2.5 #define PLACEHOLDER_TC_OFFSET 2.5
@ -36,6 +33,8 @@ namespace globals {
extern pros::ADIDigitalOut left_wing_piston; extern pros::ADIDigitalOut left_wing_piston;
extern pros::ADIDigitalOut right_wing_piston; extern pros::ADIDigitalOut right_wing_piston;
extern Wings wings;
extern lemlib::TrackingWheel vert_tracking_wheel; extern lemlib::TrackingWheel vert_tracking_wheel;
extern lemlib::TrackingWheel horiz_tracking_wheel; extern lemlib::TrackingWheel horiz_tracking_wheel;

2
RELENTLESS/include/superstructure.hpp
View File

@ -1,6 +1,4 @@
#include "main.h" #include "main.h"
#include "ary-lib/api.hpp"
#include "globals.hpp"
#define DRIVE_SPEED 110 #define DRIVE_SPEED 110
#define TURN_SPEED 90 #define TURN_SPEED 90

1
RELENTLESS/include/wings.h
View File

@ -1,3 +1,4 @@
#pragma once
#ifndef _Wings_h #ifndef _Wings_h
#define _Wings_h_ #define _Wings_h_

2
RELENTLESS/src/globals.cpp
View File

@ -26,6 +26,8 @@ namespace globals {
pros::ADIDigitalOut left_wing_piston('C'); pros::ADIDigitalOut left_wing_piston('C');
pros::ADIDigitalOut right_wing_piston('B'); pros::ADIDigitalOut right_wing_piston('B');
Wings wings;
lemlib::Drivetrain_t chassis_odom { lemlib::Drivetrain_t chassis_odom {
&left_drive, &left_drive,
&right_drive, &right_drive,

6
RELENTLESS/src/superstructure.cpp
View File

@ -165,13 +165,11 @@ namespace superstruct {
void wingsControl() { void wingsControl() {
if (globals::master.get_digital_new_press(DIGITAL_L2)) { if (globals::master.get_digital_new_press(DIGITAL_L2)) {
left_wing_piston.set_value(1); wings.open();
right_wing_piston.set_value(1);
} }
if (globals::master.get_digital_new_press(DIGITAL_L1)) { if (globals::master.get_digital_new_press(DIGITAL_L1)) {
left_wing_piston.set_value(0); wings.close();
right_wing_piston.set_value(0);
} }
} }
} }

2
RELENTLESS/src/wings.cpp
View File

@ -1,5 +1,5 @@
#include "main.h" #include "main.h"
#include "wings.h" #include "Wings.h"
using namespace globals; using namespace globals;