diff --git a/.gitignore b/.gitignore index be253a5..e303e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,4 @@ compile_commands.json temp.log temp.errors *.ini -.d/ - -# PROS Templates Artifacts -*.zip \ No newline at end of file +.d/ \ No newline at end of file diff --git a/ARMS@3.1.1.zip b/ARMS@3.1.1.zip new file mode 100644 index 0000000..73e2f25 Binary files /dev/null and b/ARMS@3.1.1.zip differ diff --git a/ARMS@3.1.2.zip b/ARMS@3.1.2.zip new file mode 100644 index 0000000..9be1bbe Binary files /dev/null and b/ARMS@3.1.2.zip differ diff --git a/Makefile b/Makefile index e4527d2..1aac65c 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ EXCLUDE_COLD_LIBRARIES:= IS_LIBRARY:=1 LIBNAME:=ARMS -VERSION:=3.1.1 +VERSION:=3.1.2 # EXCLUDE_SRC_FROM_LIB= $(SRCDIR)/unpublishedfile.c # this line excludes opcontrol.c and similar files EXCLUDE_SRC_FROM_LIB+=$(foreach file, $(SRCDIR)/main,$(foreach cext,$(CEXTS),$(file).$(cext)) $(foreach cxxext,$(CXXEXTS),$(file).$(cxxext))) diff --git a/common.mk b/common.mk index ed334eb..10ab5d3 100644 --- a/common.mk +++ b/common.mk @@ -280,7 +280,7 @@ $(VV)mkdir -p $(dir $(LDTIMEOBJ)) @# The shell command $$(($$(date +%s)+($$(date +%-z)/100*3600))) fetches the current @# unix timestamp, and then adds the UTC timezone offset to account for time zones. -$(call test_output_2,Adding timestamp ,echo 'const int _PROS_COMPILE_TIMESTAMP_INT = $(shell echo $$(($$(date +%s)+($$(date +%-z)/100*3600)))); char const * const _PROS_COMPILE_TIMESTAMP = __DATE__ " " __TIME__; char const * const _PROS_COMPILE_DIRECTORY = "$(shell pwd | tail -c 23)";' | $(CC) -c -x c $(CFLAGS) $(EXTRA_CFLAGS) -o $(LDTIMEOBJ) -,$(OK_STRING)) +$(call test_output_2,Adding timestamp ,echo 'const int _PROS_COMPILE_TIMESTAMP_INT = $(shell echo $$(($$(date +%s)+($$(date +%-z)/100*3600)))); char const * const _PROS_COMPILE_TIMESTAMP = __DATE__ " " __TIME__; char const * const _PROS_COMPILE_DIRECTORY = "$(wildcard $(shell pwd | tail -c 23))";' | $(CC) -c -x c $(CFLAGS) $(EXTRA_CFLAGS) -o $(LDTIMEOBJ) -,$(OK_STRING)) endef # these rules are for build-compile-commands, which just print out sysroot information diff --git a/firmware/libpros.a b/firmware/libpros.a index c70fad5..0539990 100644 Binary files a/firmware/libpros.a and b/firmware/libpros.a differ diff --git a/include/api.h b/include/api.h index 5292beb..7e92319 100644 --- a/include/api.h +++ b/include/api.h @@ -8,7 +8,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * All rights reserved. * * This Source Code Form is subject to the terms of the Mozilla Public @@ -40,9 +40,9 @@ #endif /* __cplusplus */ #define PROS_VERSION_MAJOR 3 -#define PROS_VERSION_MINOR 7 -#define PROS_VERSION_PATCH 2 -#define PROS_VERSION_STRING "3.7.2" +#define PROS_VERSION_MINOR 8 +#define PROS_VERSION_PATCH 0 +#define PROS_VERSION_STRING "3.8.0" #include "pros/adi.h" #include "pros/colors.h" diff --git a/include/pros/adi.h b/include/pros/adi.h index c06176a..8f0f556 100644 --- a/include/pros/adi.h +++ b/include/pros/adi.h @@ -8,7 +8,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/adi.hpp b/include/pros/adi.hpp index 6dc99ef..c2fd258 100644 --- a/include/pros/adi.hpp +++ b/include/pros/adi.hpp @@ -8,7 +8,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 @@ -494,10 +494,13 @@ class ADIEncoder : private ADIPort { * sensor with the removable cover side up, and the "bottom" wire from * the encoder sensor * \param reverse - * If "true", the sensor will count in theopposite direction + * If "true", the sensor will count in the opposite direction */ ADIEncoder(ext_adi_port_tuple_t port_tuple, bool reversed = false); + // Delete copy constructor to prevent a compilation error from the constructor above. + ADIEncoder(ADIEncoder &) = delete; + /** * Sets the encoder value to zero. * diff --git a/include/pros/api_legacy.h b/include/pros/api_legacy.h index 068f7e8..deb7d22 100644 --- a/include/pros/api_legacy.h +++ b/include/pros/api_legacy.h @@ -10,7 +10,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * All rights reserved. * * This Source Code Form is subject to the terms of the Mozilla Public diff --git a/include/pros/apix.h b/include/pros/apix.h index 8e7d306..876a98c 100644 --- a/include/pros/apix.h +++ b/include/pros/apix.h @@ -12,7 +12,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * All rights reserved. * * This Source Code Form is subject to the terms of the Mozilla Public diff --git a/include/pros/distance.h b/include/pros/distance.h index b7feda1..783da8f 100644 --- a/include/pros/distance.h +++ b/include/pros/distance.h @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/error.h b/include/pros/error.h index 8485978..a7e4e54 100644 --- a/include/pros/error.h +++ b/include/pros/error.h @@ -6,7 +6,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/ext_adi.h b/include/pros/ext_adi.h index 48e7909..f75ee05 100644 --- a/include/pros/ext_adi.h +++ b/include/pros/ext_adi.h @@ -8,7 +8,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/gps.h b/include/pros/gps.h index 1af417b..1b2e7e7 100644 --- a/include/pros/gps.h +++ b/include/pros/gps.h @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/gps.hpp b/include/pros/gps.hpp index 0d8b731..fce40c2 100644 --- a/include/pros/gps.hpp +++ b/include/pros/gps.hpp @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/imu.h b/include/pros/imu.h index 59116ee..f5a1cdc 100644 --- a/include/pros/imu.h +++ b/include/pros/imu.h @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/imu.hpp b/include/pros/imu.hpp index 84272b0..99b28c8 100644 --- a/include/pros/imu.hpp +++ b/include/pros/imu.hpp @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/link.h b/include/pros/link.h index f370b7e..212834c 100644 --- a/include/pros/link.h +++ b/include/pros/link.h @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/link.hpp b/include/pros/link.hpp index d44c6bd..d6c18f3 100644 --- a/include/pros/link.hpp +++ b/include/pros/link.hpp @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2021, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/llemu.h b/include/pros/llemu.h index 4cb792b..8a6d757 100644 --- a/include/pros/llemu.h +++ b/include/pros/llemu.h @@ -13,7 +13,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/llemu.hpp b/include/pros/llemu.hpp index 8818edd..a4834e0 100644 --- a/include/pros/llemu.hpp +++ b/include/pros/llemu.hpp @@ -13,7 +13,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/misc.h b/include/pros/misc.h index 0b6c923..16cba55 100644 --- a/include/pros/misc.h +++ b/include/pros/misc.h @@ -10,7 +10,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * All rights reservered. * * This Source Code Form is subject to the terms of the Mozilla Public diff --git a/include/pros/misc.hpp b/include/pros/misc.hpp index 2415c2f..7fcb4b5 100644 --- a/include/pros/misc.hpp +++ b/include/pros/misc.hpp @@ -10,7 +10,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * All rights reservered. * * This Source Code Form is subject to the terms of the Mozilla Public diff --git a/include/pros/motors.h b/include/pros/motors.h index 51ee02f..7371092 100644 --- a/include/pros/motors.h +++ b/include/pros/motors.h @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/motors.hpp b/include/pros/motors.hpp index 77abcc8..1092599 100644 --- a/include/pros/motors.hpp +++ b/include/pros/motors.hpp @@ -461,6 +461,7 @@ class Motor { * * \return The motor's voltage in mV or PROS_ERR_F if the operation failed, * setting errno. + * */ virtual std::int32_t get_voltage(void) const; @@ -859,8 +860,11 @@ class Motor { class Motor_Group { public: - explicit Motor_Group(const std::initializer_list motors); - explicit Motor_Group(const std::vector motor_ports); + Motor_Group(const std::initializer_list motors); + explicit Motor_Group(const std::vector& motors); + explicit Motor_Group(const std::initializer_list motor_ports); + explicit Motor_Group(const std::vector motor_ports); // Pass by value to preserve ABI + /****************************************************************************/ /** Motor Group movement functions **/ /** **/ @@ -1014,12 +1018,144 @@ class Motor_Group { * failed, setting errno. */ std::int32_t brake(void); + + /* + * Gets the voltages delivered to the motors in millivolts. + * + * This function uses the following values of errno when an error state is + * reached: + * ENODEV - The port cannot be configured as a motor + * EACCESS - The Motor group mutex can't be taken or given + * + * \return The voltage of the motor in millivolts or PROS_ERR_F if the operation + * failed, setting errno. + * + * \b Example + * \code + * void opcontrol() { + * pros::Motor_Group motors({1, 2}); + * std::vector voltages; + * while (true) { + * voltages = motors.get_voltages(); + * + * for (uint32_t i = 0; i < voltages.size(); i++) { + * printf("Voltages: %ld\n", voltages[i]); + * } + * pros::delay(20); + * } + * } + * \endcode + * + */ + std::vector get_voltages(void); + + /* + * Get the voltage limits of the motors set by the user. + * + * This function uses the following values of errno when an error state is + * reached: + * ENODEV - The port cannot be configured as a motor + * EACCESS - The Motor group mutex can't be taken or given + * + * \return The voltage limit of the motor in millivolts or PROS_ERR_F if the operation + * failed, setting errno. + * + * \b Example + * \code + * void opcontrol() { + * pros::Motor_Group motors({1, 2}); + * std::vector voltage_limits; + * while (true) { + * voltage_limits = motors.get_voltage_limits(); + * + * for (uint32_t i = 0; i < voltage_limits.size(); i++) { + * printf("Voltage Limits: %ld\n", voltage_limits[i]); + * } + * pros::delay(20); + * } + * } + * \endcode + */ + std::vector get_voltage_limits(void); + + /* + * Gets the raw encoder positions of a motor group at a given timestamp. + * + * This function uses the following values of errno when an error state is + * reached: + * ENODEV - The port cannot be configured as a motor + * EACCESS - The Motor group mutex can't be taken or given + * + * \return A vector of the raw encoder positions of the motors in the motor group + * based on the timestamps passed in. If a timestamp is not found for a motor, the + * value at that index will be PROS_ERR. + * + * \b Example + * \code + * void opcontrol() { + * pros::Motor_Group motors({1, 2}); + * std::vector timestamps; + * std::vector positions; + * std::uint32_t temp = 0; + * std::uint32_t temp2 = 0; + * timestamps.push_back(&temp); + * timestamps.push_back(&temp2); + * + * while (true) { + * positions = motors.get_raw_positions(timestamps); + * + * printf("Position: %ld, Time: %ln\n", positions[0], timestamps[0]); + * printf("Position: %ld, Time: %ln\n", positions[1], timestamps[1]); + * + * pros::delay(20); + * } + * } + * \endcode + */ + std::vector get_raw_positions(std::vector ×tamps); /****************************************************************************/ /** Motor configuration functions **/ /** **/ /** These functions let programmers configure the behavior of motor groups **/ /****************************************************************************/ + /** + * Indexes Motor in the Motor_Group in the same way as an array. + * + * This function uses the following values of errno when an error state is + * reached: + * ENXIO - Out of bounds on indexing the motor groups. + * + * \param i + * The index value in the motor group. + * + * \return the appropriate Motor reference or the erno if the operation + * failed + */ + pros::Motor& operator[](int i); + + + /** + * Indexes Motor in the Motor_Group. + * + * This function uses the following values of errno when an error state is + * reached: + * Throws an std::out_of_range error when indexing out of range + * + * \param i + * The index value in the motor group. + * + * \return the appropriate Motor reference. + */ + pros::Motor& at(int i); + + /** + * Indexes Motor in the Motor_Group in the same way as an array. + * + * \return the size of the vector containing motors + */ + std::int32_t size(); + /** * Sets the position for the motor in its encoder units. * @@ -1318,6 +1454,19 @@ class Motor_Group { * E_MOTOR_ENCODER_INVALID if the operation failed. */ std::vector get_encoder_units(void); + + /** + * Gets the encoder units that were set for each motor. + * + * This function uses the following values of errno when an error state is + * reached: + * ENODEV - The port cannot be configured as a motor + * EACCESS - The Motor group mutex can't be taken or given + * + * \return The vector filled with motors' temperature in degrees Celsius or PROS_ERR_F if the + * operation failed, setting errno. + */ + virtual std::vector get_temperatures(void); private: std::vector _motors; diff --git a/include/pros/optical.h b/include/pros/optical.h index c3cace9..9dd1c1b 100644 --- a/include/pros/optical.h +++ b/include/pros/optical.h @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 @@ -265,6 +265,39 @@ int32_t optical_enable_gesture(uint8_t port); */ int32_t optical_disable_gesture(uint8_t port); +/** + * Get integration time (update rate) of the optical sensor in milliseconds, with + * minimum time being + * + * This function uses the following values of errno when an error state is + * reached: + * ENXIO - The given value is not within the range of V5 ports (1-21). + * ENODEV - The port cannot be configured as an Optical Sensor + * + * \param port + * The V5 Optical Sensor port number from 1-21 + * \return Integration time in milliseconds if the operation is successful + * or PROS_ERR if the operation failed, setting errno. + */ +double optical_get_integration_time(uint8_t port); + +/** + * Set integration time (update rate) of the optical sensor in milliseconds. + * + * This function uses the following values of errno when an error state is + * reached: + * ENXIO - The given value is not within the range of V5 ports (1-21). + * ENODEV - The port cannot be configured as an Optical Sensor + * + * \param port + * The V5 Optical Sensor port number from 1-21 + * \param time + * The desired integration time in milliseconds + * \return 1 if the operation is successful or PROS_ERR if the operation failed, + * setting errno. + */ +int32_t optical_set_integration_time(uint8_t port, double time); + #ifdef __cplusplus } } diff --git a/include/pros/optical.hpp b/include/pros/optical.hpp index 783520d..006108d 100644 --- a/include/pros/optical.hpp +++ b/include/pros/optical.hpp @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 @@ -41,6 +41,8 @@ class Optical { */ explicit Optical(const std::uint8_t port); + explicit Optical(std::uint8_t port, double time); + /** * Get the detected color hue * @@ -219,6 +221,36 @@ class Optical { */ virtual std::int32_t disable_gesture(); + /** + * Set integration time (update rate) of the optical sensor in milliseconds, with + * minimum time being 3 ms and maximum time being 712 ms. Default is 100 ms, with the + * optical sensor communciating with the V5 brain every 20 ms. + * + * This function uses the following values of errno when an error state is + * reached: + * ENXIO - The given value is not within the range of V5 ports (1-21). + * ENODEV - The port cannot be configured as an Optical Sensor + * + * \return 1 if the operation is successful or PROS_ERR_F if the operation failed, + * setting errno. + */ + double get_integration_time(); + + /** + * Get integration time (update rate) of the optical sensor in milliseconds. + * + * This function uses the following values of errno when an error state is + * reached: + * ENXIO - The given value is not within the range of V5 ports (1-21). + * ENODEV - The port cannot be configured as an Optical Sensor + * + * \param time + * The desired integration time in milliseconds + * \return Integration time in milliseconds if the operation is successful + * or PROS_ERR if the operation failed, setting errno. + */ + std::int32_t set_integration_time(double time); + /** * Gets the port number of the Optical Sensor. * diff --git a/include/pros/rotation.h b/include/pros/rotation.h index 197936a..8daf2fd 100644 --- a/include/pros/rotation.h +++ b/include/pros/rotation.h @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/rotation.hpp b/include/pros/rotation.hpp index c53ab7b..a063eda 100644 --- a/include/pros/rotation.hpp +++ b/include/pros/rotation.hpp @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/rtos.h b/include/pros/rtos.h index 3afdb24..c076734 100644 --- a/include/pros/rtos.h +++ b/include/pros/rtos.h @@ -10,7 +10,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * All rights reserved. * * This Source Code Form is subject to the terms of the Mozilla Public diff --git a/include/pros/rtos.hpp b/include/pros/rtos.hpp index 0cd0d6c..2505f1d 100644 --- a/include/pros/rtos.hpp +++ b/include/pros/rtos.hpp @@ -10,7 +10,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * All rights reserved. * * This Source Code Form is subject to the terms of the Mozilla Public diff --git a/include/pros/screen.h b/include/pros/screen.h index 4cffe76..8076daa 100644 --- a/include/pros/screen.h +++ b/include/pros/screen.h @@ -5,7 +5,7 @@ * * Contains user calls to the v5 screen for touching and displaying graphics. * - * \copyright (c) 2017-2021, Purdue University ACM SIGBots. + * \copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/screen.hpp b/include/pros/screen.hpp index 3aecd18..d7f6c08 100644 --- a/include/pros/screen.hpp +++ b/include/pros/screen.hpp @@ -5,7 +5,7 @@ * * Contains user calls to the v5 screen for touching and displaying graphics. * - * \copyright (c) 2017, Purdue University ACM SIGBots. + * \copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/serial.h b/include/pros/serial.h index 6db69cd..357aa10 100644 --- a/include/pros/serial.h +++ b/include/pros/serial.h @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * * 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 diff --git a/include/pros/vision.h b/include/pros/vision.h index 8464b6c..33918c7 100644 --- a/include/pros/vision.h +++ b/include/pros/vision.h @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * All rights reserved. * * This Source Code Form is subject to the terms of the Mozilla Public diff --git a/include/pros/vision.hpp b/include/pros/vision.hpp index eeb0046..e40af9b 100644 --- a/include/pros/vision.hpp +++ b/include/pros/vision.hpp @@ -9,7 +9,7 @@ * This file should not be modified by users, since it gets replaced whenever * a kernel upgrade occurs. * - * Copyright (c) 2017-2022, Purdue University ACM SIGBots. + * \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots. * All rights reserved. * * This Source Code Form is subject to the terms of the Mozilla Public diff --git a/project.pros b/project.pros index d6d49cb..fc113d1 100644 --- a/project.pros +++ b/project.pros @@ -5,7 +5,7 @@ "target": "v5", "templates": { "kernel": { - "location": "C:\\Users\\btdav\\AppData\\Roaming\\PROS\\templates\\kernel@3.7.2", + "location": "C:\\Users\\stump\\AppData\\Roaming\\PROS\\templates\\kernel@3.8.0", "metadata": { "cold_addr": "58720256", "cold_output": "bin/cold.package.bin", @@ -18,152 +18,152 @@ "py/object": "pros.conductor.templates.local_template.LocalTemplate", "supported_kernels": null, "system_files": [ - "include/display/lv_themes/lv_theme.h", - "include/pros/llemu.hpp", - "include/display/lv_objx/lv_line.h", - "include/display/lv_core/lv_indev.h", - "include/pros/gps.hpp", - "include/display/lv_objx/lv_label.h", + "include/display/lv_core/lv_vdb.h", + "include/display/lv_core/lv_core.mk", + "include/display/lv_misc/lv_math.h", + "include/display/lv_objx/lv_tabview.h", + "include/display/lv_misc/lv_color.h", "include/display/lv_hal/lv_hal_indev.h", - "include/pros/serial.hpp", - "include/display/lv_objx/lv_mbox.h", - "include/display/lv_misc/lv_font.h", - "include/display/lv_misc/lv_gc.h", - "include/display/lv_themes/lv_theme_templ.h", - "include/display/lv_objx/lv_preload.h", - "include/display/lv_hal/lv_hal_tick.h", - "include/display/lv_objx/lv_spinbox.h", - "include/display/lv_draw/lv_draw_rbasic.h", - "include/pros/optical.hpp", + "include/display/lv_fonts/lv_fonts.mk", "include/display/lv_misc/lv_symbol_def.h", - "include/display/lv_misc/lv_misc.mk", - "include/display/lv_misc/lv_txt.h", - "common.mk", + "include/display/lv_hal/lv_hal.mk", "include/display/lv_themes/lv_theme_night.h", - "include/pros/rotation.hpp", + "include/display/lv_draw/lv_draw_triangle.h", + "include/pros/optical.hpp", "include/display/lv_draw/lv_draw_vbasic.h", - "include/display/lv_hal/lv_hal.h", - "include/display/lv_misc/lv_templ.h", + "include/display/lv_objx/lv_objx_templ.h", + "include/display/lv_core/lv_refr.h", "include/pros/link.hpp", - "include/display/lv_objx/lv_list.h", - "include/display/lv_misc/lv_ll.h", - "include/pros/serial.h", - "include/pros/apix.h", - "include/display/lv_misc/lv_ufs.h", - "include/display/lv_themes/lv_theme_nemo.h", - "include/pros/colors.h", + "include/display/lv_objx/lv_btnm.h", + "include/display/lv_objx/lv_cb.h", + "firmware/v5-common.ld", + "include/pros/ext_adi.h", + "include/pros/rotation.h", + "include/display/lv_objx/lv_spinbox.h", + "include/display/lv_misc/lv_circ.h", + "include/display/lv_misc/lv_mem.h", + "include/display/lv_objx/lv_page.h", + "include/display/lv_objx/lv_ddlist.h", + "include/display/lv_core/lv_group.h", + "include/display/lvgl.h", "include/display/lv_objx/lv_chart.h", - "include/pros/optical.h", - "include/pros/misc.h", - "include/pros/error.h", "include/pros/distance.h", - "include/display/lv_draw/lv_draw.h", - "include/display/lv_objx/lv_lmeter.h", - "include/display/lv_themes/lv_theme_zen.h", - "include/display/lv_core/lv_group.h", - "include/display/lv_misc/lv_anim.h", - "include/display/lv_objx/lv_objx_templ.h", - "firmware/libpros.a", - "include/display/lv_objx/lv_win.h", - "include/display/lv_themes/lv_theme_mono.h", - "include/display/lv_objx/lv_ddlist.h", - "include/display/lv_objx/lv_img.h", - "include/display/lv_misc/lv_task.h", + "include/display/lv_objx/lv_list.h", "include/pros/vision.h", - "include/display/lv_draw/lv_draw_rect.h", - "include/display/lv_misc/lv_circ.h", - "include/display/lv_draw/lv_draw_label.h", - "include/pros/rtos.hpp", - "include/display/lv_objx/lv_imgbtn.h", - "include/display/lvgl.h", - "include/pros/motors.hpp", - "include/display/licence.txt", - "include/pros/colors.hpp", - "include/display/lv_hal/lv_hal.mk", - "include/display/lv_themes/lv_themes.mk", "include/pros/misc.hpp", + "include/display/lv_draw/lv_draw.h", + "include/display/lv_objx/lv_label.h", + "include/display/lv_misc/lv_font.h", + "include/display/lv_draw/lv_draw_img.h", + "include/display/lv_misc/lv_log.h", + "include/display/lv_misc/lv_templ.h", + "include/pros/llemu.h", + "include/display/lv_objx/lv_btn.h", "include/display/lv_fonts/lv_font_builtin.h", - "include/display/lv_core/lv_core.mk", - "include/display/lv_objx/lv_roller.h", - "include/display/lv_objx/lv_slider.h", - "include/display/lv_misc/lv_math.h", - "include/pros/motors.h", - "include/pros/ext_adi.h", + "include/display/lv_objx/lv_calendar.h", + "firmware/libm.a", + "include/display/lv_conf.h", "include/display/lv_objx/lv_sw.h", - "include/display/lv_themes/lv_theme_material.h", - "include/display/lv_draw/lv_draw_triangle.h", - "include/display/lv_themes/lv_theme_default.h", - "include/display/lv_misc/lv_mem.h", - "include/display/lv_objx/lv_tabview.h", - "include/display/lv_objx/lv_bar.h", - "include/pros/imu.h", - "include/display/lv_objx/lv_btn.h", - "include/pros/link.h", - "firmware/v5-hot.ld", - "include/display/lv_version.h", + "include/display/lv_draw/lv_draw_rect.h", + "include/display/lv_objx/lv_cont.h", + "include/pros/vision.hpp", + "include/display/lv_objx/lv_mbox.h", "include/pros/adi.hpp", - "include/display/lv_objx/lv_cb.h", + "include/pros/imu.hpp", + "include/display/lv_objx/lv_table.h", "include/pros/screen.hpp", - "include/display/lv_conf.h", + "include/display/lv_draw/lv_draw_label.h", + "include/display/lv_misc/lv_txt.h", + "include/pros/api_legacy.h", + "include/display/lv_objx/lv_lmeter.h", + "include/display/lv_themes/lv_theme_templ.h", + "include/pros/apix.h", + "include/display/lv_draw/lv_draw.mk", + "include/display/lv_themes/lv_theme_alien.h", + "include/pros/colors.hpp", + "include/display/lv_objx/lv_img.h", "firmware/libc.a", - "include/display/lv_objx/lv_objx.mk", - "include/display/lv_objx/lv_calendar.h", - "include/display/lv_draw/lv_draw_img.h", - "include/display/lv_objx/lv_led.h", + "include/display/lv_themes/lv_theme_zen.h", + "include/display/lv_themes/lv_theme_material.h", + "include/display/lv_draw/lv_draw_arc.h", + "include/display/lv_themes/lv_theme_mono.h", + "include/display/lv_themes/lv_themes.mk", + "include/display/lv_objx/lv_slider.h", + "include/pros/serial.h", + "include/display/lv_themes/lv_theme.h", + "include/display/README.md", "include/display/lv_objx/lv_canvas.h", + "include/pros/misc.h", + "include/display/lv_misc/lv_fs.h", + "include/pros/rtos.h", + "include/display/lv_core/lv_indev.h", + "include/pros/motors.hpp", + "include/display/lv_core/lv_style.h", + "include/display/lv_version.h", + "include/display/lv_core/lv_lang.h", "include/api.h", - "include/pros/distance.hpp", - "include/display/lv_objx/lv_ta.h", - "include/display/lv_draw/lv_draw_line.h", - "include/display/lv_misc/lv_color.h", - "include/display/lv_themes/lv_theme_alien.h", + "include/display/lv_objx/lv_gauge.h", + "include/pros/rtos.hpp", + "include/display/lv_hal/lv_hal_disp.h", + "include/pros/motors.h", + "include/display/lv_objx/lv_led.h", + "include/display/lv_draw/lv_draw_rbasic.h", "include/display/lv_objx/lv_kb.h", - "include/display/lv_core/lv_vdb.h", "include/display/lv_conf_checker.h", - "include/display/lv_objx/lv_gauge.h", - "firmware/v5.ld", - "include/display/lv_draw/lv_draw.mk", - "include/display/lv_misc/lv_fs.h", - "firmware/libm.a", - "include/pros/llemu.h", - "include/display/lv_draw/lv_draw_arc.h", - "include/pros/imu.hpp", - "include/display/README.md", - "include/pros/gps.h", - "include/pros/rotation.h", - "include/pros/rtos.h", + "include/display/lv_hal/lv_hal.h", + "include/display/lv_draw/lv_draw_line.h", + "include/pros/gps.hpp", + "include/display/lv_objx/lv_objx.mk", + "include/display/lv_objx/lv_win.h", "include/display/lv_core/lv_obj.h", - "include/pros/screen.h", - "firmware/v5-common.ld", - "include/display/lv_objx/lv_cont.h", "include/display/lv_objx/lv_arc.h", - "include/display/lv_objx/lv_page.h", - "include/pros/adi.h", - "include/display/lv_core/lv_refr.h", - "include/display/lv_objx/lv_btnm.h", - "include/pros/api_legacy.h", - "include/pros/vision.hpp", - "include/display/lv_misc/lv_log.h", - "include/display/lv_objx/lv_tileview.h", - "include/display/lv_fonts/lv_fonts.mk", - "include/display/lv_objx/lv_table.h", - "include/display/lv_core/lv_lang.h", - "include/display/lv_core/lv_style.h", + "include/pros/link.h", + "include/display/lv_objx/lv_preload.h", "include/display/lv_misc/lv_area.h", - "include/display/lv_hal/lv_hal_disp.h" + "include/display/lv_misc/lv_ll.h", + "include/pros/optical.h", + "include/pros/serial.hpp", + "include/pros/screen.h", + "include/display/lv_themes/lv_theme_nemo.h", + "include/pros/llemu.hpp", + "firmware/libpros.a", + "include/display/lv_misc/lv_gc.h", + "include/display/lv_misc/lv_anim.h", + "include/display/lv_objx/lv_line.h", + "include/pros/distance.hpp", + "include/pros/rotation.hpp", + "include/pros/error.h", + "include/display/lv_objx/lv_tileview.h", + "include/pros/gps.h", + "include/display/lv_misc/lv_task.h", + "include/pros/imu.h", + "firmware/v5-hot.ld", + "include/display/lv_misc/lv_misc.mk", + "include/pros/colors.h", + "common.mk", + "include/display/lv_objx/lv_roller.h", + "include/display/lv_objx/lv_bar.h", + "include/display/lv_themes/lv_theme_default.h", + "firmware/v5.ld", + "include/display/lv_misc/lv_ufs.h", + "include/display/lv_hal/lv_hal_tick.h", + "include/display/licence.txt", + "include/display/lv_objx/lv_ta.h", + "include/display/lv_objx/lv_imgbtn.h", + "include/pros/adi.h" ], "target": "v5", "user_files": [ - "src/main.cpp", + "src/main.cc", + ".gitignore", "Makefile", - "include/main.hh", + "src/main.cpp", "src/main.c", - "include/main.h", - "src/main.cc", "include/main.hpp", - ".gitignore" + "include/main.hh", + "include/main.h" ], - "version": "3.7.2" + "version": "3.8.0" } }, "upload_options": {}