⬆️3.2.0-beta.4

EZ-Robotics · Sep 8, 2024 · 2e6a5bf · 2e6a5bf
1 parent 0cf7a6f
commit 2e6a5bf
Show file tree

Hide file tree

Showing 11 changed files with 1,051 additions and 217 deletions.
diff --git a/...mple-Project/[email protected] → ...mple-Project/[email protected] b/...mple-Project/[email protected] → ...mple-Project/[email protected]
diff --git a/EZ-Template-Example-Project/firmware/EZ-Template.a b/EZ-Template-Example-Project/firmware/EZ-Template.a
diff --git a/EZ-Template-Example-Project/include/EZ-Template/drive/drive.hpp b/EZ-Template-Example-Project/include/EZ-Template/drive/drive.hpp
diff --git a/EZ-Template-Example-Project/include/EZ-Template/sdcard.hpp b/EZ-Template-Example-Project/include/EZ-Template/sdcard.hpp
@@ -70,8 +70,34 @@ void limit_switch_lcd_initialize(pros::adi::DigitalIn* right_limit, pros::adi::D
  */
 void limitSwitchTask();
 
+/**
+ * Returns the current blank page that is on.  Negative value means the current page isn't blank.
+ */
 int page_blank_current();
+
+/**
+ * Checks if this blank page is open.  If this page doesn't exist, this will create it.
+ */
 bool page_blank_is_on(int page);
+
+/**
+ * Removes the blank page if it exists, and previous ones.
+ */
+void page_blank_remove(int page);
+
+/**
+ * Removes all blank pages.
+ */
+void page_blank_remove_all();
+
+/**
+ * Removes the current amount of blank pages.
+ */
+int page_blank_amount();
+
+/**
+ * Current amount of blank pages.
+ */
 extern int amount_of_blank_pages;
 }  // namespace as
 }  // namespace ez
diff --git a/EZ-Template-Example-Project/project.pros b/EZ-Template-Example-Project/project.pros
@@ -5,29 +5,29 @@
         "target": "v5",
         "templates": {
             "EZ-Template": {
-                "location": "C:\\Users\\union\\AppData\\Roaming\\PROS\\templates\\[email protected].3",
+                "location": "C:\\Users\\union\\AppData\\Roaming\\PROS\\templates\\[email protected].4",
                 "metadata": {
                     "origin": "local"
                 },
                 "name": "EZ-Template",
                 "py/object": "pros.conductor.templates.local_template.LocalTemplate",
                 "supported_kernels": "^4.1.0",
                 "system_files": [
+                    "include\\EZ-Template\\slew.hpp",
+                    "include\\EZ-Template\\api.hpp",
+                    "include\\EZ-Template\\PID.hpp",
+                    "include\\EZ-Template\\tracking_wheel.hpp",
                     "firmware\\EZ-Template.a",
+                    "include\\EZ-Template\\sdcard.hpp",
                     "include\\EZ-Template\\util.hpp",
-                    "include\\EZ-Template\\auton_selector.hpp",
                     "include\\EZ-Template\\piston.hpp",
-                    "include\\EZ-Template\\sdcard.hpp",
-                    "include\\EZ-Template\\tracking_wheel.hpp",
-                    "include\\EZ-Template\\auton.hpp",
-                    "include\\EZ-Template\\PID.hpp",
                     "include\\EZ-Template\\drive\\drive.hpp",
-                    "include\\EZ-Template\\slew.hpp",
-                    "include\\EZ-Template\\api.hpp"
+                    "include\\EZ-Template\\auton.hpp",
+                    "include\\EZ-Template\\auton_selector.hpp"
                 ],
                 "target": "v5",
                 "user_files": [],
-                "version": "3.2.0-beta.3"
+                "version": "3.2.0-beta.4"
             },
             "kernel": {
                 "location": "C:\\Users\\union\\AppData\\Roaming\\PROS\\templates\\[email protected]",

diff --git a/EZ-Template-Example-Project/src/main.cpp b/EZ-Template-Example-Project/src/main.cpp
@@ -182,6 +182,10 @@ void ez_template_etxras() {
     }
 
     chassis.pid_tuner_iterate();  // Allow PID Tuner to iterate
+  } else {
+    // Remove all blank pages when connected to a comp switch
+    if (ez::as::page_blank_amount() > 0)
+      ez::as::page_blank_remove_all();
   }
 }
 

diff --git a/[email protected] → [email protected] b/[email protected] → [email protected]
diff --git a/[email protected] → [email protected] b/[email protected] → [email protected]
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ EXCLUDE_COLD_LIBRARIES:=
 IS_LIBRARY:=1
 # TODO: CHANGE THIS!
 LIBNAME:=EZ-Template
-VERSION:=3.2.0-beta.3
+VERSION:=3.2.0-beta.4
 # EXCLUDE_SRC_FROM_LIB= $(SRCDIR)/unpublishedfile.c
 # this line excludes opcontrol.c and similar files
 EXCLUDE_SRC_FROM_LIB+=$(foreach file, $(SRCDIR)/autons $(SRCDIR)/main,$(foreach cext,$(CEXTS),$(file).$(cext)) $(foreach cxxext,$(CXXEXTS),$(file).$(cxxext)))

diff --git a/src/main.cpp b/src/main.cpp
@@ -48,7 +48,7 @@ void initialize() {
   // Are you using tracking wheels?  Comment out which ones you're using here!
   // chassis.odom_tracker_right_set(&right_tracker);
   // chassis.odom_tracker_left_set(&left_tracker);
-  // chassis.odom_tracker_back_set(&horiz_tracker);
+  // chassis.odom_tracker_back_set(&horiz_tracker);  // Replace `back` to `front` if your tracker is in the front!
 
   // Configure your chassis controls
   chassis.opcontrol_curve_buttons_toggle(true);  // Enables modifying the controller curve with buttons on the joysticks

diff --git a/version b/version
@@ -1 +1 @@
-3.2.0-beta.3
+3.2.0-beta.4