diff --git a/RELENTLESS-Lite/gif-pros-asset@1.0.1.zip b/RELENTLESS-Lite/gif-pros-asset@1.0.1.zip new file mode 100644 index 0000000..f11b24c Binary files /dev/null and b/RELENTLESS-Lite/gif-pros-asset@1.0.1.zip differ diff --git a/RELENTLESS-Lite/include/api.h b/RELENTLESS-Lite/include/api.h index 7e92319..9ddcdac 100644 --- a/RELENTLESS-Lite/include/api.h +++ b/RELENTLESS-Lite/include/api.h @@ -77,4 +77,6 @@ #include "pros/link.hpp" #endif +#include "asset.h" + #endif // _PROS_API_H_ diff --git a/RELENTLESS-Lite/include/asset.h b/RELENTLESS-Lite/include/asset.h new file mode 100644 index 0000000..682e510 --- /dev/null +++ b/RELENTLESS-Lite/include/asset.h @@ -0,0 +1,88 @@ +#pragma once + +#ifndef _ASSET_H_ +#define _ASSET_H_ + +#include "api.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef V5_API_H_ + +typedef struct __attribute__((__packed__)) _v5_image { + uint16_t width; + uint16_t height; + uint32_t *data; + uint32_t *p; +} v5_image; + +uint32_t vexImageBmpRead(const uint8_t *ibuf, v5_image *oBuf, uint32_t maxw, uint32_t maxh); +uint32_t vexImagePngRead(const uint8_t *ibuf, v5_image *oBuf, uint32_t maxw, uint32_t maxh, uint32_t ibuflen); +void vexDisplayCopyRect(int32_t x1, int32_t y1, int32_t x2, int32_t y2, uint32_t *pSrc, int32_t srcStride); + +#endif + +typedef struct __attribute__((__packed__)) _asset { + uint8_t *buf; + size_t size; +} asset; + +#ifdef __cplusplus +} +#endif + +#ifdef __cplusplus + +#define ASSET(x) \ + extern "C" { \ + extern uint8_t _binary_static_##x##_start[], _binary_static_##x##_size[]; \ + static asset x = {_binary_static_##x##_start, (size_t)_binary_static_##x##_size}; \ + } + +#else + +#define ASSET(x) \ + extern uint8_t _binary_static_##x##_start[], _binary_static_##x##_size[]; \ + static asset x = {_binary_static_##x##_start, (size_t)_binary_static_##x##_size}; + +#endif + +#define DECODE_PNG(var, asset, width, height) \ + var.data = new uint32_t[width * height]; \ + vexImagePngRead(asset.buf, &var, width, height, asset.size); + +#define DECODE_BMP(var, asset, width, height) \ + var.data = new uint32_t[width * height]; \ + vexImageBmpRead(asset.buf, &var, width, height); + + +static void draw_image(int x, int y, v5_image *image) { + int x2 = x + image->width - 1; + int y2 = y + image->height - 1; + vexDisplayCopyRect(x, y, x2, y2, image->data, x2 - x + 1); +} + +static void draw_image(lv_obj_t *canvas, int x, int y, v5_image *image) { + int start_x = x; + int start_y = y; + + for (int i = 0; i < image->height; i++) { + for (int j = 0; j < image->width; j++) { + lv_color_t c = lv_color_hex(image->data[i * image->width + j]); + lv_color_t d = lv_canvas_get_px(canvas, start_x + j, start_y + i); + + float a_float = c.alpha / 2.55 / 100; + float a_m_float = 1 - a_float; + + d.red = d.red * a_m_float + c.red * a_float; + d.green = d.green * a_m_float + c.green * a_float; + d.blue = d.blue * a_m_float + c.blue * a_float; + + lv_canvas_set_px(canvas, start_x + j, start_y + i, d); + } + } +} + +#endif // _ASSET_H_ diff --git a/RELENTLESS/include/gif-pros/gifclass.hpp b/RELENTLESS-Lite/include/gif-pros/gifclass.hpp similarity index 100% rename from RELENTLESS/include/gif-pros/gifclass.hpp rename to RELENTLESS-Lite/include/gif-pros/gifclass.hpp diff --git a/RELENTLESS/include/gif-pros/gifdec.h b/RELENTLESS-Lite/include/gif-pros/gifdec.h similarity index 98% rename from RELENTLESS/include/gif-pros/gifdec.h rename to RELENTLESS-Lite/include/gif-pros/gifdec.h index ab03013..293801e 100644 --- a/RELENTLESS/include/gif-pros/gifdec.h +++ b/RELENTLESS-Lite/include/gif-pros/gifdec.h @@ -55,4 +55,4 @@ void gd_close_gif(gd_GIF *gif); } #endif -#endif /* GIFDEC_H */ \ No newline at end of file +#endif /* GIFDEC_H */ diff --git a/RELENTLESS-Lite/include/main.h b/RELENTLESS-Lite/include/main.h index 8b06e1d..288056e 100644 --- a/RELENTLESS-Lite/include/main.h +++ b/RELENTLESS-Lite/include/main.h @@ -35,12 +35,11 @@ #define PROS_USE_LITERALS #include "api.h" -#include "lemlib/api.hpp" -#include "arylib/api.hpp" + /** * You should add more #includes here */ -#include "okapi/api.hpp" +//#include "okapi/api.hpp" //#include "pros/api_legacy.h" /** diff --git a/RELENTLESS-Lite/project.pros b/RELENTLESS-Lite/project.pros index 71f930e..58d07b1 100644 --- a/RELENTLESS-Lite/project.pros +++ b/RELENTLESS-Lite/project.pros @@ -1,340 +1,476 @@ { - "py/object": "pros.conductor.project.Project", - "py/state": { - "project_name": "RELENTLESS-Lite", - "target": "v5", - "templates": { - "LemLib": { - "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\LemLib@0.4.7", - "metadata": { - "origin": "local" - }, - "name": "LemLib", - "py/object": "pros.conductor.templates.local_template.LocalTemplate", - "supported_kernels": "^3.8.0", - "system_files": [ - "firmware\\LemLib.a", - "include\\lemlib\\chassis\\odom.hpp", - "include\\lemlib\\pose.hpp", - "include\\lemlib\\util.hpp", - "include\\lemlib\\chassis\\trackingWheel.hpp", - "include\\lemlib\\pid.hpp", - "include\\lemlib\\api.hpp", - "include\\lemlib\\logger.hpp", - "include\\lemlib\\chassis\\chassis.hpp" - ], + "py/object": "pros.conductor.project.Project", + "py/state": { + "project_name": "RELENTLESS-Lite", "target": "v5", - "user_files": [], - "version": "0.4.7" - }, - "kernel": { - "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\kernel@3.8.0", - "metadata": { - "cold_addr": "58720256", - "cold_output": "bin/cold.package.bin", - "hot_addr": "125829120", - "hot_output": "bin/hot.package.bin", - "origin": "pros-mainline", - "output": "bin/monolith.bin" + "templates": { + "LemLib": { + "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\LemLib@0.4.7", + "metadata": { + "origin": "local" + }, + "name": "LemLib", + "py/object": "pros.conductor.templates.local_template.LocalTemplate", + "supported_kernels": "^3.8.0", + "system_files": [ + "firmware\\LemLib.a", + "include\\lemlib\\chassis\\odom.hpp", + "include\\lemlib\\pose.hpp", + "include\\lemlib\\util.hpp", + "include\\lemlib\\chassis\\trackingWheel.hpp", + "include\\lemlib\\pid.hpp", + "include\\lemlib\\api.hpp", + "include\\lemlib\\logger.hpp", + "include\\lemlib\\chassis\\chassis.hpp" + ], + "target": "v5", + "user_files": [], + "version": "0.4.7" + }, + "gif-pros-asset": { + "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\gif-pros-asset@1.0.1", + "metadata": { + "origin": "local" + }, + "name": "gif-pros-asset", + "py/object": "pros.conductor.templates.local_template.LocalTemplate", + "supported_kernels": "^3.8.0", + "system_files": [ + "include\\display\\lv_core\\lv_style.h", + "include\\pros\\optical.h", + "include\\pros\\llemu.hpp", + "include\\display\\lv_conf.h", + "include\\display\\lv_misc\\lv_templ.h", + "include\\display\\lv_objx\\lv_canvas.h", + "include\\display\\lvgl.h", + "include\\display\\lv_objx\\lv_lmeter.h", + "include\\display\\lv_misc\\lv_font.h", + "include\\display\\lv_objx\\lv_slider.h", + "include\\pros\\serial.hpp", + "include\\display\\lv_draw\\lv_draw_vbasic.h", + "include\\api.h", + "include\\display\\lv_core\\lv_group.h", + "include\\display\\lv_objx\\lv_spinbox.h", + "include\\display\\lv_draw\\lv_draw_triangle.h", + "include\\display\\lv_hal\\lv_hal_tick.h", + "include\\display\\lv_objx\\lv_calendar.h", + "include\\pros\\ext_adi.h", + "include\\display\\lv_draw\\lv_draw_rbasic.h", + "include\\display\\lv_draw\\lv_draw_arc.h", + "include\\display\\lv_objx\\lv_mbox.h", + "include\\display\\lv_objx\\lv_btn.h", + "include\\pros\\rtos.hpp", + "include\\display\\lv_version.h", + "include\\pros\\rtos.h", + "include\\gif-pros\\gifclass.hpp", + "include\\pros\\gps.hpp", + "include\\display\\lv_draw\\lv_draw_rect.h", + "include\\display\\lv_objx\\lv_label.h", + "include\\display\\lv_objx\\lv_preload.h", + "include\\display\\lv_themes\\lv_theme_default.h", + "include\\display\\lv_misc\\lv_ufs.h", + "include\\pros\\colors.h", + "include\\display\\lv_objx\\lv_win.h", + "include\\display\\lv_objx\\lv_gauge.h", + "include\\pros\\rotation.h", + "include\\display\\lv_themes\\lv_theme_zen.h", + "include\\display\\lv_themes\\lv_theme.h", + "include\\display\\lv_draw\\lv_draw_label.h", + "include\\display\\lv_objx\\lv_kb.h", + "include\\display\\lv_core\\lv_obj.h", + "include\\display\\lv_objx\\lv_line.h", + "include\\pros\\vision.h", + "include\\pros\\screen.hpp", + "include\\display\\lv_themes\\lv_theme_nemo.h", + "include\\display\\lv_core\\lv_refr.h", + "include\\display\\lv_objx\\lv_btnm.h", + "include\\display\\lv_objx\\lv_led.h", + "include\\display\\lv_draw\\lv_draw.h", + "include\\pros\\distance.h", + "include\\display\\lv_objx\\lv_arc.h", + "include\\display\\lv_misc\\lv_color.h", + "include\\display\\lv_misc\\lv_math.h", + "include\\display\\lv_objx\\lv_cont.h", + "include\\display\\lv_objx\\lv_objx_templ.h", + "include\\display\\lv_objx\\lv_imgbtn.h", + "include\\display\\lv_misc\\lv_mem.h", + "include\\gif-pros\\gifdec.h", + "include\\display\\lv_objx\\lv_bar.h", + "include\\display\\lv_fonts\\lv_font_builtin.h", + "include\\pros\\misc.h", + "include\\pros\\gps.h", + "include\\display\\lv_objx\\lv_roller.h", + "include\\pros\\apix.h", + "include\\display\\lv_themes\\lv_theme_templ.h", + "include\\pros\\imu.hpp", + "include\\display\\lv_misc\\lv_gc.h", + "include\\display\\lv_misc\\lv_txt.h", + "include\\display\\lv_core\\lv_lang.h", + "include\\display\\lv_objx\\lv_ddlist.h", + "include\\display\\lv_objx\\lv_table.h", + "include\\display\\lv_themes\\lv_theme_mono.h", + "include\\display\\lv_objx\\lv_list.h", + "include\\display\\lv_themes\\lv_theme_material.h", + "include\\pros\\rotation.hpp", + "include\\asset.h", + "include\\pros\\colors.hpp", + "include\\display\\lv_objx\\lv_cb.h", + "include\\display\\lv_misc\\lv_symbol_def.h", + "include\\display\\lv_objx\\lv_page.h", + "include\\display\\lv_core\\lv_indev.h", + "include\\pros\\vision.hpp", + "include\\pros\\api_legacy.h", + "include\\main.h", + "include\\pros\\adi.h", + "include\\display\\lv_misc\\lv_anim.h", + "firmware\\gif-pros-asset.a", + "include\\pros\\screen.h", + "include\\display\\lv_hal\\lv_hal_indev.h", + "include\\display\\lv_themes\\lv_theme_night.h", + "include\\display\\lv_draw\\lv_draw_img.h", + "include\\display\\lv_misc\\lv_log.h", + "include\\pros\\optical.hpp", + "include\\pros\\imu.h", + "include\\pros\\distance.hpp", + "include\\display\\lv_conf_checker.h", + "include\\pros\\motors.h", + "include\\pros\\llemu.h", + "include\\display\\lv_misc\\lv_area.h", + "include\\display\\lv_objx\\lv_sw.h", + "include\\pros\\link.h", + "include\\display\\lv_misc\\lv_task.h", + "include\\display\\lv_draw\\lv_draw_line.h", + "include\\pros\\link.hpp", + "include\\display\\lv_hal\\lv_hal_disp.h", + "include\\pros\\adi.hpp", + "include\\display\\lv_core\\lv_vdb.h", + "include\\pros\\serial.h", + "include\\display\\lv_objx\\lv_chart.h", + "include\\display\\lv_hal\\lv_hal.h", + "include\\display\\lv_objx\\lv_tileview.h", + "include\\display\\lv_themes\\lv_theme_alien.h", + "include\\pros\\error.h", + "include\\display\\lv_misc\\lv_ll.h", + "include\\display\\lv_objx\\lv_img.h", + "include\\display\\lv_objx\\lv_tabview.h", + "include\\pros\\misc.hpp", + "include\\display\\lv_objx\\lv_ta.h", + "include\\pros\\motors.hpp", + "include\\display\\lv_misc\\lv_circ.h", + "include\\display\\lv_misc\\lv_fs.h" + ], + "target": "v5", + "user_files": [], + "version": "1.0.1" + }, + "kernel": { + "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\kernel@3.8.0", + "metadata": { + "cold_addr": "58720256", + "cold_output": "bin/cold.package.bin", + "hot_addr": "125829120", + "hot_output": "bin/hot.package.bin", + "origin": "pros-mainline", + "output": "bin/monolith.bin" + }, + "name": "kernel", + "py/object": "pros.conductor.templates.local_template.LocalTemplate", + "supported_kernels": null, + "system_files": [ + "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/display/lv_fonts/lv_fonts.mk", + "include/display/lv_misc/lv_symbol_def.h", + "include/display/lv_hal/lv_hal.mk", + "include/display/lv_themes/lv_theme_night.h", + "include/display/lv_draw/lv_draw_triangle.h", + "include/pros/optical.hpp", + "include/display/lv_draw/lv_draw_vbasic.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_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/distance.h", + "include/display/lv_objx/lv_list.h", + "include/pros/vision.h", + "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_objx/lv_calendar.h", + "firmware/libm.a", + "include/display/lv_conf.h", + "include/display/lv_objx/lv_sw.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/pros/imu.hpp", + "include/display/lv_objx/lv_table.h", + "include/pros/screen.hpp", + "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_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/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_conf_checker.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/display/lv_objx/lv_arc.h", + "include/pros/link.h", + "include/display/lv_objx/lv_preload.h", + "include/display/lv_misc/lv_area.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.cc", + ".gitignore", + "Makefile", + "src/main.cpp", + "src/main.c", + "include/main.hpp", + "include/main.hh", + "include/main.h" + ], + "version": "3.8.0" + }, + "okapilib": { + "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\okapilib@4.8.0", + "metadata": { + "origin": "pros-mainline" + }, + "name": "okapilib", + "py/object": "pros.conductor.templates.local_template.LocalTemplate", + "supported_kernels": "^3.3.1", + "system_files": [ + "include/okapi/api/odometry/odomMath.hpp", + "include/okapi/squiggles/physicalmodel/physicalmodel.hpp", + "include/okapi/api/chassis/model/threeEncoderXDriveModel.hpp", + "include/okapi/api/chassis/model/hDriveModel.hpp", + "include/okapi/api/chassis/model/readOnlyChassisModel.hpp", + "include/okapi/api/device/button/buttonBase.hpp", + "include/okapi/api/units/QAngularJerk.hpp", + "include/okapi/api/control/iterative/iterativeController.hpp", + "include/okapi/api/control/controllerInput.hpp", + "include/okapi/squiggles/math/quinticpolynomial.hpp", + "include/okapi/api/device/rotarysensor/continuousRotarySensor.hpp", + "include/okapi/api/control/async/asyncPositionController.hpp", + "include/okapi/api/filter/passthroughFilter.hpp", + "include/okapi/api/device/rotarysensor/rotarySensor.hpp", + "include/okapi/api/odometry/stateMode.hpp", + "include/okapi/impl/device/controller.hpp", + "include/okapi/api/units/QTime.hpp", + "include/okapi/api/control/util/controllerRunner.hpp", + "include/okapi/api/units/QTorque.hpp", + "include/okapi/impl/device/rotarysensor/IMU.hpp", + "include/okapi/api/control/util/pidTuner.hpp", + "include/okapi/impl/util/timeUtilFactory.hpp", + "include/okapi/api/device/motor/abstractMotor.hpp", + "include/okapi/impl/device/button/controllerButton.hpp", + "include/okapi/impl/device/rotarysensor/integratedEncoder.hpp", + "include/okapi/impl/device/rotarysensor/adiEncoder.hpp", + "include/okapi/api/filter/composableFilter.hpp", + "include/okapi/api/chassis/model/xDriveModel.hpp", + "include/okapi/squiggles/geometry/pose.hpp", + "include/okapi/api/odometry/twoEncoderOdometry.hpp", + "include/okapi/api/util/timeUtil.hpp", + "firmware/squiggles.mk", + "include/okapi/api/control/async/asyncPosPidController.hpp", + "include/okapi/impl/control/util/controllerRunnerFactory.hpp", + "include/okapi/impl/chassis/controller/chassisControllerBuilder.hpp", + "include/okapi/api/control/closedLoopController.hpp", + "include/okapi/squiggles/math/utils.hpp", + "include/okapi/api/control/async/asyncVelIntegratedController.hpp", + "include/okapi/api/units/QLength.hpp", + "include/okapi/impl/device/motor/motor.hpp", + "include/okapi/api/odometry/odometry.hpp", + "include/okapi/api/units/RQuantity.hpp", + "include/okapi/api/units/QArea.hpp", + "include/okapi/api/filter/filter.hpp", + "include/okapi/api/device/button/abstractButton.hpp", + "include/okapi/api/units/QPressure.hpp", + "include/okapi/api/control/async/asyncLinearMotionProfileController.hpp", + "include/okapi/api/control/util/flywheelSimulator.hpp", + "include/okapi/api/util/logging.hpp", + "include/okapi/api/chassis/model/threeEncoderSkidSteerModel.hpp", + "include/okapi/api/filter/emaFilter.hpp", + "include/okapi/impl/device/controllerUtil.hpp", + "include/okapi/api/util/mathUtil.hpp", + "include/okapi/api/filter/averageFilter.hpp", + "include/okapi/api/control/iterative/iterativeVelocityController.hpp", + "include/okapi/api/odometry/point.hpp", + "include/okapi/api/control/async/asyncController.hpp", + "include/okapi/impl/control/async/asyncMotionProfileControllerBuilder.hpp", + "include/okapi/api/coreProsAPI.hpp", + "include/okapi/api/units/QSpeed.hpp", + "include/okapi/impl/control/util/pidTunerFactory.hpp", + "include/okapi/api/units/QAngle.hpp", + "include/okapi/api/control/async/asyncVelocityController.hpp", + "include/okapi/api/odometry/threeEncoderOdometry.hpp", + "include/okapi/api/filter/velMath.hpp", + "include/okapi/api/control/async/asyncPosIntegratedController.hpp", + "include/okapi/squiggles/constraints.hpp", + "include/okapi/api/filter/filteredControllerInput.hpp", + "include/okapi/api/chassis/controller/chassisControllerPid.hpp", + "include/okapi/api/control/iterative/iterativePositionController.hpp", + "include/okapi/api/control/offsettableControllerInput.hpp", + "include/okapi/squiggles/squiggles.hpp", + "include/okapi/api/units/QAngularSpeed.hpp", + "include/okapi/api/control/iterative/iterativePosPidController.hpp", + "include/okapi/squiggles/physicalmodel/tankmodel.hpp", + "include/okapi/impl/util/rate.hpp", + "include/okapi/api/filter/medianFilter.hpp", + "include/okapi/impl/device/rotarysensor/potentiometer.hpp", + "include/okapi/api/control/iterative/iterativeVelPidController.hpp", + "include/okapi/squiggles/geometry/profilepoint.hpp", + "include/okapi/impl/device/button/adiButton.hpp", + "include/okapi/impl/control/async/asyncVelControllerBuilder.hpp", + "include/okapi/api/filter/demaFilter.hpp", + "include/okapi/api/units/RQuantityName.hpp", + "include/okapi/api/control/util/pathfinderUtil.hpp", + "include/okapi/api/util/abstractTimer.hpp", + "include/okapi/api.hpp", + "include/okapi/impl/control/async/asyncPosControllerBuilder.hpp", + "include/okapi/api/chassis/controller/chassisScales.hpp", + "include/okapi/api/units/QMass.hpp", + "include/okapi/impl/device/rotarysensor/adiGyro.hpp", + "include/okapi/impl/util/configurableTimeUtilFactory.hpp", + "include/okapi/api/control/util/settledUtil.hpp", + "include/okapi/impl/control/iterative/iterativeControllerFactory.hpp", + "include/okapi/impl/util/timer.hpp", + "include/okapi/api/chassis/controller/defaultOdomChassisController.hpp", + "include/okapi/impl/device/motor/motorGroup.hpp", + "include/okapi/api/control/async/asyncWrapper.hpp", + "include/okapi/squiggles/io.hpp", + "include/okapi/api/filter/ekfFilter.hpp", + "include/okapi/api/control/async/asyncMotionProfileController.hpp", + "include/okapi/squiggles/geometry/controlvector.hpp", + "include/okapi/impl/device/distanceSensor.hpp", + "include/okapi/api/control/controllerOutput.hpp", + "include/okapi/api/units/QVolume.hpp", + "include/okapi/squiggles/spline.hpp", + "include/okapi/api/units/QJerk.hpp", + "include/okapi/api/chassis/controller/chassisController.hpp", + "include/okapi/squiggles/physicalmodel/passthroughmodel.hpp", + "include/okapi/api/units/QAngularAcceleration.hpp", + "include/okapi/api/chassis/controller/chassisControllerIntegrated.hpp", + "include/okapi/impl/device/adiUltrasonic.hpp", + "include/okapi/impl/device/opticalSensor.hpp", + "include/okapi/api/units/QForce.hpp", + "include/okapi/api/util/supplier.hpp", + "include/okapi/api/chassis/controller/odomChassisController.hpp", + "include/okapi/impl/filter/velMathFactory.hpp", + "include/okapi/api/control/iterative/iterativeMotorVelocityController.hpp", + "include/okapi/api/control/async/asyncVelPidController.hpp", + "include/okapi/api/odometry/odomState.hpp", + "include/okapi/api/chassis/model/chassisModel.hpp", + "include/okapi/api/units/QFrequency.hpp", + "include/okapi/impl/device/rotarysensor/rotationSensor.hpp", + "include/okapi/api/util/abstractRate.hpp", + "include/okapi/impl/device/motor/adiMotor.hpp", + "include/okapi/api/units/QAcceleration.hpp", + "include/okapi/api/chassis/model/skidSteerModel.hpp", + "firmware/okapilib.a" + ], + "target": "v5", + "user_files": [], + "version": "4.8.0" + } }, - "name": "kernel", - "py/object": "pros.conductor.templates.local_template.LocalTemplate", - "supported_kernels": null, - "system_files": [ - "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/display/lv_fonts/lv_fonts.mk", - "include/display/lv_misc/lv_symbol_def.h", - "include/display/lv_hal/lv_hal.mk", - "include/display/lv_themes/lv_theme_night.h", - "include/display/lv_draw/lv_draw_triangle.h", - "include/pros/optical.hpp", - "include/display/lv_draw/lv_draw_vbasic.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_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/distance.h", - "include/display/lv_objx/lv_list.h", - "include/pros/vision.h", - "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_objx/lv_calendar.h", - "firmware/libm.a", - "include/display/lv_conf.h", - "include/display/lv_objx/lv_sw.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/pros/imu.hpp", - "include/display/lv_objx/lv_table.h", - "include/pros/screen.hpp", - "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_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/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_conf_checker.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/display/lv_objx/lv_arc.h", - "include/pros/link.h", - "include/display/lv_objx/lv_preload.h", - "include/display/lv_misc/lv_area.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.cc", - ".gitignore", - "Makefile", - "src/main.cpp", - "src/main.c", - "include/main.hpp", - "include/main.hh", - "include/main.h" - ], - "version": "3.8.0" - }, - "okapilib": { - "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\okapilib@4.8.0", - "metadata": { - "origin": "pros-mainline" - }, - "name": "okapilib", - "py/object": "pros.conductor.templates.local_template.LocalTemplate", - "supported_kernels": "^3.3.1", - "system_files": [ - "include/okapi/api/odometry/odomMath.hpp", - "include/okapi/squiggles/physicalmodel/physicalmodel.hpp", - "include/okapi/api/chassis/model/threeEncoderXDriveModel.hpp", - "include/okapi/api/chassis/model/hDriveModel.hpp", - "include/okapi/api/chassis/model/readOnlyChassisModel.hpp", - "include/okapi/api/device/button/buttonBase.hpp", - "include/okapi/api/units/QAngularJerk.hpp", - "include/okapi/api/control/iterative/iterativeController.hpp", - "include/okapi/api/control/controllerInput.hpp", - "include/okapi/squiggles/math/quinticpolynomial.hpp", - "include/okapi/api/device/rotarysensor/continuousRotarySensor.hpp", - "include/okapi/api/control/async/asyncPositionController.hpp", - "include/okapi/api/filter/passthroughFilter.hpp", - "include/okapi/api/device/rotarysensor/rotarySensor.hpp", - "include/okapi/api/odometry/stateMode.hpp", - "include/okapi/impl/device/controller.hpp", - "include/okapi/api/units/QTime.hpp", - "include/okapi/api/control/util/controllerRunner.hpp", - "include/okapi/api/units/QTorque.hpp", - "include/okapi/impl/device/rotarysensor/IMU.hpp", - "include/okapi/api/control/util/pidTuner.hpp", - "include/okapi/impl/util/timeUtilFactory.hpp", - "include/okapi/api/device/motor/abstractMotor.hpp", - "include/okapi/impl/device/button/controllerButton.hpp", - "include/okapi/impl/device/rotarysensor/integratedEncoder.hpp", - "include/okapi/impl/device/rotarysensor/adiEncoder.hpp", - "include/okapi/api/filter/composableFilter.hpp", - "include/okapi/api/chassis/model/xDriveModel.hpp", - "include/okapi/squiggles/geometry/pose.hpp", - "include/okapi/api/odometry/twoEncoderOdometry.hpp", - "include/okapi/api/util/timeUtil.hpp", - "firmware/squiggles.mk", - "include/okapi/api/control/async/asyncPosPidController.hpp", - "include/okapi/impl/control/util/controllerRunnerFactory.hpp", - "include/okapi/impl/chassis/controller/chassisControllerBuilder.hpp", - "include/okapi/api/control/closedLoopController.hpp", - "include/okapi/squiggles/math/utils.hpp", - "include/okapi/api/control/async/asyncVelIntegratedController.hpp", - "include/okapi/api/units/QLength.hpp", - "include/okapi/impl/device/motor/motor.hpp", - "include/okapi/api/odometry/odometry.hpp", - "include/okapi/api/units/RQuantity.hpp", - "include/okapi/api/units/QArea.hpp", - "include/okapi/api/filter/filter.hpp", - "include/okapi/api/device/button/abstractButton.hpp", - "include/okapi/api/units/QPressure.hpp", - "include/okapi/api/control/async/asyncLinearMotionProfileController.hpp", - "include/okapi/api/control/util/flywheelSimulator.hpp", - "include/okapi/api/util/logging.hpp", - "include/okapi/api/chassis/model/threeEncoderSkidSteerModel.hpp", - "include/okapi/api/filter/emaFilter.hpp", - "include/okapi/impl/device/controllerUtil.hpp", - "include/okapi/api/util/mathUtil.hpp", - "include/okapi/api/filter/averageFilter.hpp", - "include/okapi/api/control/iterative/iterativeVelocityController.hpp", - "include/okapi/api/odometry/point.hpp", - "include/okapi/api/control/async/asyncController.hpp", - "include/okapi/impl/control/async/asyncMotionProfileControllerBuilder.hpp", - "include/okapi/api/coreProsAPI.hpp", - "include/okapi/api/units/QSpeed.hpp", - "include/okapi/impl/control/util/pidTunerFactory.hpp", - "include/okapi/api/units/QAngle.hpp", - "include/okapi/api/control/async/asyncVelocityController.hpp", - "include/okapi/api/odometry/threeEncoderOdometry.hpp", - "include/okapi/api/filter/velMath.hpp", - "include/okapi/api/control/async/asyncPosIntegratedController.hpp", - "include/okapi/squiggles/constraints.hpp", - "include/okapi/api/filter/filteredControllerInput.hpp", - "include/okapi/api/chassis/controller/chassisControllerPid.hpp", - "include/okapi/api/control/iterative/iterativePositionController.hpp", - "include/okapi/api/control/offsettableControllerInput.hpp", - "include/okapi/squiggles/squiggles.hpp", - "include/okapi/api/units/QAngularSpeed.hpp", - "include/okapi/api/control/iterative/iterativePosPidController.hpp", - "include/okapi/squiggles/physicalmodel/tankmodel.hpp", - "include/okapi/impl/util/rate.hpp", - "include/okapi/api/filter/medianFilter.hpp", - "include/okapi/impl/device/rotarysensor/potentiometer.hpp", - "include/okapi/api/control/iterative/iterativeVelPidController.hpp", - "include/okapi/squiggles/geometry/profilepoint.hpp", - "include/okapi/impl/device/button/adiButton.hpp", - "include/okapi/impl/control/async/asyncVelControllerBuilder.hpp", - "include/okapi/api/filter/demaFilter.hpp", - "include/okapi/api/units/RQuantityName.hpp", - "include/okapi/api/control/util/pathfinderUtil.hpp", - "include/okapi/api/util/abstractTimer.hpp", - "include/okapi/api.hpp", - "include/okapi/impl/control/async/asyncPosControllerBuilder.hpp", - "include/okapi/api/chassis/controller/chassisScales.hpp", - "include/okapi/api/units/QMass.hpp", - "include/okapi/impl/device/rotarysensor/adiGyro.hpp", - "include/okapi/impl/util/configurableTimeUtilFactory.hpp", - "include/okapi/api/control/util/settledUtil.hpp", - "include/okapi/impl/control/iterative/iterativeControllerFactory.hpp", - "include/okapi/impl/util/timer.hpp", - "include/okapi/api/chassis/controller/defaultOdomChassisController.hpp", - "include/okapi/impl/device/motor/motorGroup.hpp", - "include/okapi/api/control/async/asyncWrapper.hpp", - "include/okapi/squiggles/io.hpp", - "include/okapi/api/filter/ekfFilter.hpp", - "include/okapi/api/control/async/asyncMotionProfileController.hpp", - "include/okapi/squiggles/geometry/controlvector.hpp", - "include/okapi/impl/device/distanceSensor.hpp", - "include/okapi/api/control/controllerOutput.hpp", - "include/okapi/api/units/QVolume.hpp", - "include/okapi/squiggles/spline.hpp", - "include/okapi/api/units/QJerk.hpp", - "include/okapi/api/chassis/controller/chassisController.hpp", - "include/okapi/squiggles/physicalmodel/passthroughmodel.hpp", - "include/okapi/api/units/QAngularAcceleration.hpp", - "include/okapi/api/chassis/controller/chassisControllerIntegrated.hpp", - "include/okapi/impl/device/adiUltrasonic.hpp", - "include/okapi/impl/device/opticalSensor.hpp", - "include/okapi/api/units/QForce.hpp", - "include/okapi/api/util/supplier.hpp", - "include/okapi/api/chassis/controller/odomChassisController.hpp", - "include/okapi/impl/filter/velMathFactory.hpp", - "include/okapi/api/control/iterative/iterativeMotorVelocityController.hpp", - "include/okapi/api/control/async/asyncVelPidController.hpp", - "include/okapi/api/odometry/odomState.hpp", - "include/okapi/api/chassis/model/chassisModel.hpp", - "include/okapi/api/units/QFrequency.hpp", - "include/okapi/impl/device/rotarysensor/rotationSensor.hpp", - "include/okapi/api/util/abstractRate.hpp", - "include/okapi/impl/device/motor/adiMotor.hpp", - "include/okapi/api/units/QAcceleration.hpp", - "include/okapi/api/chassis/model/skidSteerModel.hpp", - "firmware/okapilib.a" - ], - "target": "v5", - "user_files": [], - "version": "4.8.0" - } - }, - "upload_options": { - "description": "the scrim bot!", - "slot": 1, - "icon": "planet" + "upload_options": { + "description": "the scrim bot!", + "icon": "planet", + "slot": 1 + } } - } } \ No newline at end of file diff --git a/RELENTLESS/gif-pros-asset@1.0.1.zip b/RELENTLESS/gif-pros-asset@1.0.1.zip new file mode 100644 index 0000000..f11b24c Binary files /dev/null and b/RELENTLESS/gif-pros-asset@1.0.1.zip differ diff --git a/RELENTLESS/gif-pros@2.1.1.zip b/RELENTLESS/gif-pros@2.1.1.zip deleted file mode 100644 index 66a088c..0000000 Binary files a/RELENTLESS/gif-pros@2.1.1.zip and /dev/null differ diff --git a/RELENTLESS/project.pros b/RELENTLESS/project.pros index 4bdcf75..acd6567 100644 --- a/RELENTLESS/project.pros +++ b/RELENTLESS/project.pros @@ -27,23 +27,6 @@ "user_files": [], "version": "0.4.7" }, - "gif-pros": { - "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\gif-pros@2.1.1", - "metadata": { - "origin": "local" - }, - "name": "gif-pros", - "py/object": "pros.conductor.templates.local_template.LocalTemplate", - "supported_kernels": "^3.2.0", - "system_files": [ - "include\\gif-pros\\gifdec.h", - "firmware\\gif-pros.a", - "include\\gif-pros\\gifclass.hpp" - ], - "target": "v5", - "user_files": [], - "version": "2.1.1" - }, "kernel": { "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\kernel@3.8.0", "metadata": {