diff --git a/HVN-ON-EARTH/include/main.h b/HVN-ON-EARTH/include/main.h index 22fa5a1..6c42df5 100644 --- a/HVN-ON-EARTH/include/main.h +++ b/HVN-ON-EARTH/include/main.h @@ -36,9 +36,6 @@ #include "api.h" -/** - * You should add more #includes here - */ #include "ary-lib/api.hpp" #include "lemlib/api.hpp" @@ -48,9 +45,13 @@ #include "wings.h" #include "Timer.h" -#include "asset.h" #include "gif-pros/gifclass.hpp" #include "okapi/api.hpp" + +/** + * You should add more #includes here + */ +//#include "okapi/api.hpp" //#include "pros/api_legacy.h" /** diff --git a/HVN-ON-EARTH/gif-pros-asset@1.0.1.zip b/HVN-ON-EARTH/libbest@1.0.0.zip similarity index 53% rename from HVN-ON-EARTH/gif-pros-asset@1.0.1.zip rename to HVN-ON-EARTH/libbest@1.0.0.zip index 3a6c56c..117318a 100644 Binary files a/HVN-ON-EARTH/gif-pros-asset@1.0.1.zip and b/HVN-ON-EARTH/libbest@1.0.0.zip differ diff --git a/HVN-ON-EARTH/project.pros b/HVN-ON-EARTH/project.pros index f68c539..37e1511 100644 --- a/HVN-ON-EARTH/project.pros +++ b/HVN-ON-EARTH/project.pros @@ -27,142 +27,6 @@ "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\\pros\\link.h", - "include\\display\\lv_misc\\lv_ll.h", - "include\\display\\lv_objx\\lv_cb.h", - "include\\display\\lv_objx\\lv_slider.h", - "include\\display\\lv_objx\\lv_ddlist.h", - "include\\display\\lv_themes\\lv_theme_material.h", - "include\\display\\lvgl.h", - "include\\display\\lv_misc\\lv_math.h", - "include\\pros\\llemu.hpp", - "include\\display\\lv_misc\\lv_color.h", - "include\\display\\lv_draw\\lv_draw_rbasic.h", - "include\\pros\\optical.hpp", - "include\\display\\lv_core\\lv_lang.h", - "include\\pros\\llemu.h", - "include\\gif-pros\\gifdec.h", - "include\\api.h", - "include\\pros\\colors.h", - "include\\display\\lv_misc\\lv_area.h", - "include\\pros\\misc.hpp", - "include\\display\\lv_draw\\lv_draw_arc.h", - "include\\pros\\apix.h", - "include\\display\\lv_themes\\lv_theme_nemo.h", - "include\\display\\lv_themes\\lv_theme_zen.h", - "include\\display\\lv_draw\\lv_draw_img.h", - "include\\display\\lv_misc\\lv_anim.h", - "include\\pros\\screen.hpp", - "include\\display\\lv_hal\\lv_hal_indev.h", - "include\\display\\lv_draw\\lv_draw_rect.h", - "include\\display\\lv_misc\\lv_ufs.h", - "include\\display\\lv_objx\\lv_arc.h", - "include\\display\\lv_objx\\lv_calendar.h", - "include\\gif-pros\\gifclass.hpp", - "include\\display\\lv_conf.h", - "include\\pros\\error.h", - "include\\display\\lv_fonts\\lv_font_builtin.h", - "include\\pros\\vision.hpp", - "include\\pros\\ext_adi.h", - "include\\display\\lv_misc\\lv_task.h", - "include\\pros\\rotation.h", - "include\\pros\\colors.hpp", - "include\\display\\lv_version.h", - "include\\display\\lv_objx\\lv_cont.h", - "include\\display\\lv_themes\\lv_theme_mono.h", - "include\\pros\\gps.h", - "include\\pros\\motors.h", - "include\\display\\lv_core\\lv_indev.h", - "include\\display\\lv_objx\\lv_sw.h", - "include\\display\\lv_objx\\lv_ta.h", - "include\\display\\lv_misc\\lv_fs.h", - "include\\display\\lv_hal\\lv_hal.h", - "include\\display\\lv_objx\\lv_img.h", - "include\\display\\lv_objx\\lv_chart.h", - "include\\display\\lv_objx\\lv_btnm.h", - "include\\display\\lv_objx\\lv_spinbox.h", - "include\\pros\\api_legacy.h", - "include\\display\\lv_objx\\lv_btn.h", - "include\\display\\lv_objx\\lv_win.h", - "include\\display\\lv_objx\\lv_imgbtn.h", - "include\\display\\lv_objx\\lv_bar.h", - "include\\display\\lv_objx\\lv_objx_templ.h", - "include\\display\\lv_objx\\lv_line.h", - "include\\pros\\screen.h", - "include\\display\\lv_objx\\lv_label.h", - "include\\pros\\optical.h", - "include\\display\\lv_draw\\lv_draw_label.h", - "include\\pros\\imu.hpp", - "include\\pros\\link.hpp", - "include\\pros\\misc.h", - "include\\display\\lv_themes\\lv_theme_alien.h", - "include\\display\\lv_conf_checker.h", - "include\\display\\lv_core\\lv_obj.h", - "include\\pros\\distance.hpp", - "include\\display\\lv_draw\\lv_draw_triangle.h", - "include\\display\\lv_objx\\lv_preload.h", - "include\\display\\lv_objx\\lv_kb.h", - "include\\display\\lv_core\\lv_vdb.h", - "include\\display\\lv_misc\\lv_gc.h", - "include\\display\\lv_themes\\lv_theme_templ.h", - "include\\display\\lv_themes\\lv_theme_night.h", - "include\\display\\lv_misc\\lv_mem.h", - "include\\display\\lv_objx\\lv_tabview.h", - "firmware\\gif-pros-asset.a", - "include\\display\\lv_misc\\lv_symbol_def.h", - "include\\pros\\serial.hpp", - "include\\display\\lv_misc\\lv_circ.h", - "include\\display\\lv_hal\\lv_hal_tick.h", - "include\\display\\lv_draw\\lv_draw.h", - "include\\pros\\gps.hpp", - "include\\pros\\adi.h", - "include\\pros\\adi.hpp", - "include\\pros\\rotation.hpp", - "include\\display\\lv_objx\\lv_canvas.h", - "include\\pros\\motors.hpp", - "include\\display\\lv_misc\\lv_templ.h", - "include\\display\\lv_misc\\lv_font.h", - "include\\display\\lv_draw\\lv_draw_vbasic.h", - "include\\main.h", - "include\\display\\lv_draw\\lv_draw_line.h", - "include\\asset.h", - "include\\display\\lv_objx\\lv_tileview.h", - "include\\display\\lv_misc\\lv_log.h", - "include\\display\\lv_core\\lv_group.h", - "include\\display\\lv_objx\\lv_led.h", - "include\\display\\lv_core\\lv_style.h", - "include\\pros\\vision.h", - "include\\display\\lv_objx\\lv_mbox.h", - "include\\pros\\rtos.h", - "include\\display\\lv_themes\\lv_theme_default.h", - "include\\pros\\serial.h", - "include\\display\\lv_core\\lv_refr.h", - "include\\pros\\rtos.hpp", - "include\\display\\lv_objx\\lv_gauge.h", - "include\\pros\\distance.h", - "include\\display\\lv_hal\\lv_hal_disp.h", - "include\\display\\lv_objx\\lv_table.h", - "include\\display\\lv_objx\\lv_lmeter.h", - "include\\pros\\imu.h", - "include\\display\\lv_misc\\lv_txt.h", - "include\\display\\lv_objx\\lv_page.h", - "include\\display\\lv_objx\\lv_roller.h", - "include\\display\\lv_themes\\lv_theme.h", - "include\\display\\lv_objx\\lv_list.h" - ], - "target": "v5", - "user_files": [], - "version": "1.0.1" - }, "kernel": { "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\kernel@3.8.0", "metadata": { @@ -324,6 +188,142 @@ ], "version": "3.8.0" }, + "libbest": { + "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\libbest@1.0.0", + "metadata": { + "origin": "local" + }, + "name": "libbest", + "py/object": "pros.conductor.templates.local_template.LocalTemplate", + "supported_kernels": "^3.8.0", + "system_files": [ + "include\\display\\lv_draw\\lv_draw_rect.h", + "include\\display\\lv_hal\\lv_hal_indev.h", + "include\\display\\lv_themes\\lv_theme_templ.h", + "include\\pros\\serial.hpp", + "include\\display\\lv_misc\\lv_ufs.h", + "include\\pros\\colors.h", + "include\\pros\\rotation.hpp", + "include\\display\\lv_objx\\lv_line.h", + "include\\display\\lv_core\\lv_lang.h", + "include\\display\\lv_objx\\lv_btnm.h", + "include\\pros\\error.h", + "include\\display\\lv_objx\\lv_roller.h", + "include\\display\\lv_draw\\lv_draw_rbasic.h", + "include\\display\\lv_objx\\lv_page.h", + "include\\display\\lv_conf.h", + "include\\display\\lv_misc\\lv_anim.h", + "include\\pros\\api_legacy.h", + "include\\display\\lv_objx\\lv_led.h", + "include\\pros\\gps.hpp", + "include\\display\\lv_conf_checker.h", + "include\\display\\lv_misc\\lv_math.h", + "include\\display\\lv_core\\lv_refr.h", + "include\\pros\\vision.hpp", + "include\\display\\lv_misc\\lv_txt.h", + "include\\display\\lv_draw\\lv_draw_triangle.h", + "include\\display\\lv_core\\lv_style.h", + "include\\display\\lv_objx\\lv_bar.h", + "include\\pros\\llemu.hpp", + "include\\display\\lv_objx\\lv_chart.h", + "include\\pros\\llemu.h", + "include\\display\\lv_objx\\lv_label.h", + "include\\display\\lv_themes\\lv_theme_default.h", + "include\\display\\lv_misc\\lv_templ.h", + "include\\pros\\misc.hpp", + "include\\display\\lv_themes\\lv_theme_mono.h", + "include\\display\\lv_objx\\lv_btn.h", + "include\\display\\lv_objx\\lv_arc.h", + "include\\asset.h", + "include\\display\\lv_misc\\lv_symbol_def.h", + "include\\display\\lv_objx\\lv_list.h", + "include\\display\\lv_objx\\lv_canvas.h", + "include\\display\\lvgl.h", + "include\\display\\lv_themes\\lv_theme_alien.h", + "include\\pros\\screen.h", + "include\\display\\lv_hal\\lv_hal_tick.h", + "include\\display\\lv_core\\lv_vdb.h", + "include\\display\\lv_objx\\lv_ddlist.h", + "include\\main.h", + "include\\display\\lv_draw\\lv_draw_vbasic.h", + "include\\pros\\link.hpp", + "include\\pros\\screen.hpp", + "include\\display\\lv_objx\\lv_tileview.h", + "include\\display\\lv_themes\\lv_theme_night.h", + "firmware\\libbest.a", + "include\\display\\lv_objx\\lv_sw.h", + "include\\pros\\rtos.h", + "include\\display\\lv_objx\\lv_cb.h", + "include\\gif-pros\\gifdec.h", + "include\\display\\lv_core\\lv_indev.h", + "include\\pros\\adi.hpp", + "include\\display\\lv_objx\\lv_preload.h", + "include\\display\\lv_misc\\lv_ll.h", + "include\\pros\\motors.h", + "include\\display\\lv_objx\\lv_img.h", + "include\\pros\\distance.h", + "include\\display\\lv_version.h", + "include\\display\\lv_core\\lv_obj.h", + "include\\display\\lv_objx\\lv_kb.h", + "include\\display\\lv_themes\\lv_theme_nemo.h", + "include\\display\\lv_objx\\lv_ta.h", + "include\\pros\\imu.hpp", + "include\\display\\lv_objx\\lv_mbox.h", + "include\\display\\lv_misc\\lv_log.h", + "include\\display\\lv_misc\\lv_circ.h", + "include\\display\\lv_objx\\lv_objx_templ.h", + "include\\pros\\rotation.h", + "include\\display\\lv_fonts\\lv_font_builtin.h", + "include\\display\\lv_misc\\lv_fs.h", + "include\\pros\\optical.hpp", + "include\\pros\\link.h", + "include\\pros\\adi.h", + "include\\display\\lv_draw\\lv_draw_arc.h", + "include\\display\\lv_draw\\lv_draw_line.h", + "include\\pros\\rtos.hpp", + "include\\api.h", + "include\\display\\lv_objx\\lv_table.h", + "include\\display\\lv_objx\\lv_win.h", + "include\\display\\lv_objx\\lv_spinbox.h", + "include\\display\\lv_themes\\lv_theme_zen.h", + "include\\display\\lv_misc\\lv_color.h", + "include\\display\\lv_hal\\lv_hal.h", + "include\\pros\\imu.h", + "include\\display\\lv_misc\\lv_task.h", + "include\\display\\lv_misc\\lv_mem.h", + "include\\display\\lv_misc\\lv_area.h", + "include\\pros\\motors.hpp", + "include\\pros\\serial.h", + "include\\pros\\distance.hpp", + "include\\display\\lv_objx\\lv_slider.h", + "include\\gif-pros\\gifclass.hpp", + "include\\display\\lv_objx\\lv_gauge.h", + "include\\pros\\colors.hpp", + "include\\display\\lv_hal\\lv_hal_disp.h", + "include\\display\\lv_misc\\lv_font.h", + "include\\display\\lv_themes\\lv_theme.h", + "include\\display\\lv_objx\\lv_imgbtn.h", + "include\\display\\lv_objx\\lv_tabview.h", + "include\\display\\lv_draw\\lv_draw_img.h", + "include\\display\\lv_themes\\lv_theme_material.h", + "include\\display\\lv_objx\\lv_cont.h", + "include\\pros\\gps.h", + "include\\display\\lv_misc\\lv_gc.h", + "include\\display\\lv_draw\\lv_draw_label.h", + "include\\display\\lv_draw\\lv_draw.h", + "include\\display\\lv_objx\\lv_calendar.h", + "include\\pros\\optical.h", + "include\\pros\\vision.h", + "include\\display\\lv_objx\\lv_lmeter.h", + "include\\pros\\apix.h", + "include\\pros\\ext_adi.h", + "include\\pros\\misc.h", + "include\\display\\lv_core\\lv_group.h" + ], + "target": "v5", + "user_files": [], + "version": "1.0.0" + }, "okapilib": { "location": "C:\\Users\\cjans\\AppData\\Roaming\\PROS\\templates\\okapilib@4.8.0", "metadata": { diff --git a/HVN-ON-EARTH/src/main.cpp b/HVN-ON-EARTH/src/main.cpp index ede4ab3..aedd7fe 100644 --- a/HVN-ON-EARTH/src/main.cpp +++ b/HVN-ON-EARTH/src/main.cpp @@ -63,7 +63,7 @@ void autonomous() { } void opcontrol() { - //Gif gif(chip_gif, lv_scr_act()); + Gif gif(chip_gif, lv_scr_act()); disableActiveBrake(); opControlInit(); // Configure the chassis for driver control