Updated names in auton_selector.hpp EZ-Robotics#65

docs/Docs/auton_functions.md

@@ -218,7 +218,7 @@ void autonomous() {
   chassis.reset_drive_sensor(); // Reset drive sensors to 0
   chassis.set_drive_brake(MOTOR_BRAKE_HOLD); // Set motors to hold.  This helps autonomous consistency.
 
-  ez::as::auton_selector.call_selected_auton(); // Calls selected auton from autonomous selector.
+  ez::as::auton_selector.selected_auton_call(); // Calls selected auton from autonomous selector.
 }
 ```
 

docs/Docs/auton_selector.md

@@ -83,11 +83,11 @@ void initialize() {
 ---
 
 
-## add_autons();
+## autons_add();
 Adds autonomous routines to the autonomous selector. Uses `ez::screen_print()` to display to the brain.  
 **Prototype**
 ```cpp
-void add_autons(std::vector<Auton> autons);
+void autons_add(std::vector<Auton> autons);
 ```
 
 **Example**
@@ -103,7 +103,7 @@ void auto3() {
 }
 
 void initialize() {
-  ez::as::auton_selector.add_autons({
+  ez::as::auton_selector.autons_add({
     Auton("Autonomous 1\nDoes Something", auto1),
     Auton("Autonomous 2\nDoes Something Else", auto2),
     Auton("Autonomous 3\nDoes Something More", auto3),
@@ -115,17 +115,17 @@ void initialize() {
 ---
 
 
-## print_selected_auton();
+## selected_auton_print();
 Prints the current autonomous mode to the screen.    
 **Prototype**
 ```cpp
-void print_selected_auton();
+void selected_auton_print();
 ```
 
 **Example**
 ```cpp
 void initialize() {
-  ez::as::auton_selector.print_selected_auton(); 
+  ez::as::auton_selector.selected_auton_print(); 
 }
 ```
 
@@ -172,11 +172,11 @@ void initialize() {
 ---
 
 
-## call_selected_auton()
+## selected_auton_call()
 Runs the current autonomous that's selected.    
 **Prototype**
 ```cpp
-void call_selected_auton();
+void selected_auton_call();
 ```
 
 **Example**
@@ -186,7 +186,7 @@ void autonomous() {
   chassis.reset_drive_sensor(); 
   chassis.set_drive_brake(MOTOR_BRAKE_HOLD); 
 
-  ez::as::auton_selector.call_selected_auton(); 
+  ez::as::auton_selector.selected_auton_call(); 
 }
 ```
 

docs/Releases/2.1.0.md

@@ -30,7 +30,7 @@ void autonomous() {
   chassis.reset_drive_sensor(); // Reset drive sensors to 0
   chassis.set_drive_brake(MOTOR_BRAKE_HOLD); // Set motors to hold.  This helps autonomous consistency.
 
-  ez::as::auton_selector.call_selected_auton(); // Calls selected auton from autonomous selector.
+  ez::as::auton_selector.selected_auton_call(); // Calls selected auton from autonomous selector.
 }
 ```
 

docs/Tutorials/autons.md

@@ -65,7 +65,7 @@ void initialize() {
   . . . 
 
   // Autonomous Selector using LLEMMU
-  ez::as::auton_selector.add_autons({
+  ez::as::auton_selector.autons_add({
     Auton("Solo AWP\n\nStarting Position: Plat Down", SoloAWP),
     Auton("Score Rings on Amogo\n\nStarting Position: Plat Down", ScoreRingsPlatDown),
     Auton("Neutral Steal\n\nStarting Position: Plat Down", NeutralStealPlatDown),

include/EZ-Template/auton_selector.hpp

@@ -12,12 +12,12 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 using namespace std;
 class AutonSelector {
  public:
-  std::vector<Auton> Autons;
-  int current_auton_page;
+  std::vector<Auton> autons;
+  int auton_page_current;
   int auton_count;
   AutonSelector();
   AutonSelector(std::vector<Auton> autons);
-  void call_selected_auton();
-  void print_selected_auton();
-  void add_autons(std::vector<Auton> autons);
+  void selected_auton_call();
+  void selected_auton_print();
+  void autons_add(std::vector<Auton> autons);
 };

src/EZ-Template/auton_selector.cpp

@@ -8,31 +8,31 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 AutonSelector::AutonSelector() {
   auton_count = 0;
-  current_auton_page = 0;
-  Autons = {};
+  auton_page_current = 0;
+  autons = {};
 }
 
 AutonSelector::AutonSelector(std::vector<Auton> autons) {
   auton_count = autons.size();
-  current_auton_page = 0;
-  Autons = {};
-  Autons.assign(autons.begin(), autons.end());
+  auton_page_current = 0;
+  autons = {};
+  autons.assign(autons.begin(), autons.end());
 }
 
-void AutonSelector::print_selected_auton() {
+void AutonSelector::selected_auton_print() {
   if (auton_count == 0) return;
   for (int i = 0; i < 8; i++)
     pros::lcd::clear_line(i);
-  ez::screen_print("Page " + std::to_string(current_auton_page + 1) + "\n" + Autons[current_auton_page].name);
+  ez::screen_print("Page " + std::to_string(auton_page_current + 1) + "\n" + autons[auton_page_current].name);
 }
 
-void AutonSelector::call_selected_auton() {
+void AutonSelector::selected_auton_call() {
   if (auton_count == 0) return;
-  Autons[current_auton_page].auton_call();
+  autons[auton_page_current].auton_call();
 }
 
-void AutonSelector::add_autons(std::vector<Auton> autons) {
+void AutonSelector::autons_add(std::vector<Auton> autons) {
   auton_count += autons.size();
-  current_auton_page = 0;
-  Autons.assign(autons.begin(), autons.end());
+  auton_page_current = 0;
+  autons.assign(autons.begin(), autons.end());
 }

src/EZ-Template/sdcard.cpp

@@ -16,7 +16,7 @@ void auton_sd_update() {
   if (!ez::util::SD_CARD_ACTIVE) return;
 
   FILE* usd_file_write = fopen("/usd/auto.txt", "w");
-  std::string cp_str = std::to_string(auton_selector.current_auton_page);
+  std::string cp_str = std::to_string(auton_selector.auton_page_current);
   char const* cp_c = cp_str.c_str();
   fputs(cp_c, usd_file_write);
   fclose(usd_file_write);
@@ -31,7 +31,7 @@ void auton_selector_init() {
   if ((as_usd_file_read = fopen("/usd/auto.txt", "r"))) {
     char l_buf[5];
     fread(l_buf, 1, 5, as_usd_file_read);
-    ez::as::auton_selector.current_auton_page = std::stof(l_buf);
+    ez::as::auton_selector.auton_page_current = std::stof(l_buf);
     fclose(as_usd_file_read);
   }
   // If file doesn't exist, create file
@@ -40,28 +40,28 @@ void auton_selector_init() {
     printf("Created auto.txt\n");
   }
 
-  if (ez::as::auton_selector.current_auton_page > ez::as::auton_selector.auton_count - 1 || ez::as::auton_selector.current_auton_page < 0) {
-    ez::as::auton_selector.current_auton_page = 0;
+  if (ez::as::auton_selector.auton_page_current > ez::as::auton_selector.auton_count - 1 || ez::as::auton_selector.auton_page_current < 0) {
+    ez::as::auton_selector.auton_page_current = 0;
     ez::as::auton_sd_update();
   }
 }
 
 void page_up() {
-  if (auton_selector.current_auton_page == auton_selector.auton_count - 1)
-    auton_selector.current_auton_page = 0;
+  if (auton_selector.auton_page_current == auton_selector.auton_count - 1)
+    auton_selector.auton_page_current = 0;
   else
-    auton_selector.current_auton_page++;
+    auton_selector.auton_page_current++;
   auton_sd_update();
-  auton_selector.print_selected_auton();
+  auton_selector.selected_auton_print();
 }
 
 void page_down() {
-  if (auton_selector.current_auton_page == 0)
-    auton_selector.current_auton_page = auton_selector.auton_count - 1;
+  if (auton_selector.auton_page_current == 0)
+    auton_selector.auton_page_current = auton_selector.auton_count - 1;
   else
-    auton_selector.current_auton_page--;
+    auton_selector.auton_page_current--;
   auton_sd_update();
-  auton_selector.print_selected_auton();
+  auton_selector.selected_auton_print();
 }
 
 void initialize() {
@@ -70,7 +70,7 @@ void initialize() {
   ez::as::auton_selector_init();
 
   // Callbacks for auto selector
-  ez::as::auton_selector.print_selected_auton();
+  ez::as::auton_selector.selected_auton_print();
   pros::lcd::register_btn0_cb(ez::as::page_down);
   pros::lcd::register_btn2_cb(ez::as::page_up);
 }