From 503966672263853e1e0c6b38102c37c4da9dce7c Mon Sep 17 00:00:00 2001 From: ary Date: Sat, 9 Sep 2023 15:04:53 -0400 Subject: [PATCH] fix fix the scrim bot because i'm an idiot --- RELENTLESS-Lite/include/arylib/drive/drive.hpp | 6 ------ RELENTLESS-Lite/src/arylib/drive/exit_conditions.cpp | 2 +- RELENTLESS-Lite/src/arylib/drive/user_input.cpp | 12 ++++++++++++ RELENTLESS-Lite/src/main.cpp | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/RELENTLESS-Lite/include/arylib/drive/drive.hpp b/RELENTLESS-Lite/include/arylib/drive/drive.hpp index 86c4777..c411d0f 100644 --- a/RELENTLESS-Lite/include/arylib/drive/drive.hpp +++ b/RELENTLESS-Lite/include/arylib/drive/drive.hpp @@ -1,9 +1,3 @@ -/* -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. -*/ - #pragma once #include diff --git a/RELENTLESS-Lite/src/arylib/drive/exit_conditions.cpp b/RELENTLESS-Lite/src/arylib/drive/exit_conditions.cpp index f99af5f..e42bcc4 100644 --- a/RELENTLESS-Lite/src/arylib/drive/exit_conditions.cpp +++ b/RELENTLESS-Lite/src/arylib/drive/exit_conditions.cpp @@ -4,7 +4,7 @@ License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "ary-lib/util.hpp" +#include "arylib/util.hpp" #include "main.h" using namespace ary; diff --git a/RELENTLESS-Lite/src/arylib/drive/user_input.cpp b/RELENTLESS-Lite/src/arylib/drive/user_input.cpp index ee060ca..32b60cd 100644 --- a/RELENTLESS-Lite/src/arylib/drive/user_input.cpp +++ b/RELENTLESS-Lite/src/arylib/drive/user_input.cpp @@ -5,6 +5,18 @@ double JOYSTICK_TURN_SCALE = 1; double cata_active_brake_kp = 0.1; +void Drive::init_curve_sd() { + // do absolutely nothing +} + +void Drive::save_r_curve_sd() { + // do absolutely nothing +} + +void Drive::save_l_curve_sd() { + // do absolutely nothing +} + // Set curve defaults void Drive::set_curve_default(double left, double right) { left_curve_scale = left; diff --git a/RELENTLESS-Lite/src/main.cpp b/RELENTLESS-Lite/src/main.cpp index d721a3a..f6842c5 100644 --- a/RELENTLESS-Lite/src/main.cpp +++ b/RELENTLESS-Lite/src/main.cpp @@ -59,6 +59,7 @@ void opcontrol() { while (true) { chassis.arcade_standard(ary::SINGLE, ary::DEFAULT); // Flipped single arcade + pros::delay(ary::util::DELAY_TIME);