From f0a8e0940ca2bbb4a1da4c9188e1be397f6168cd Mon Sep 17 00:00:00 2001 From: Will Xu Date: Fri, 9 Oct 2020 11:24:01 -0400 Subject: [PATCH] Revert Version --- include/api.h | 4 ++-- src/main.cpp | 7 ++++++- version | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/api.h b/include/api.h index 5da705e43..89ecccbed 100644 --- a/include/api.h +++ b/include/api.h @@ -41,8 +41,8 @@ #define PROS_VERSION_MAJOR 3 #define PROS_VERSION_MINOR 3 -#define PROS_VERSION_PATCH 1 -#define PROS_VERSION_STRING "3.3.1-dirty.13.d75c687" +#define PROS_VERSION_PATCH 0 +#define PROS_VERSION_STRING "3.3.0" #define PROS_ERR (INT32_MAX) #define PROS_ERR_F (INFINITY) diff --git a/src/main.cpp b/src/main.cpp index 2cc89c635..6b488e62a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -73,6 +73,7 @@ void autonomous() {} * operator control task will be stopped. Re-enabling the robot will restart the * task, not resume it from where it left off. */ +using namespace pros::c; void opcontrol() { pros::Controller master(pros::E_CONTROLLER_MASTER); pros::Motor left_mtr(1); @@ -84,7 +85,11 @@ void opcontrol() { (pros::lcd::read_buttons() & LCD_BTN_RIGHT) >> 0); int left = master.get_analog(ANALOG_LEFT_Y); int right = master.get_analog(ANALOG_RIGHT_Y); - + printf("Brightness: %d\n",optical_get_brightness(2)); + printf("LED PWM: %d\n",optical_get_led_pwm(2)); + printf("Proximity: %d\n",optical_get_proximity(2)); + printf("Hue: %d\n",optical_get_hue(2)); + printf("Saturation: %d\n",optical_get_saturation(2)); left_mtr = left; right_mtr = right; pros::delay(20); diff --git a/version b/version index 02c92417e..0fa4ae489 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.3.1-dirty.13.d75c687 \ No newline at end of file +3.3.0 \ No newline at end of file