Skip to content

Commit

Permalink
Revert Version
Browse files Browse the repository at this point in the history
  • Loading branch information
WillXuCodes committed Oct 9, 2020
1 parent a60ce46 commit f0a8e09
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions include/api.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 6 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1-dirty.13.d75c687
3.3.0

0 comments on commit f0a8e09

Please sign in to comment.