Skip to content

Commit

Permalink
upgrade PROS 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@theol0403
theol0403 committed Sep 19, 2019
1 parent dc0de76 commit 5af280a
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 108 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ USE_PACKAGE:=0
IS_LIBRARY:=1
# TODO: CHANGE THIS!
LIBNAME:=gif-pros
VERSION:=2.0.0
VERSION:=2.0.1
# EXCLUDE_SRC_FROM_LIB= $(SRCDIR)/unpublishedfile.c
# this line excludes opcontrol.c and similar files
EXCLUDE_SRC_FROM_LIB+=$(foreach file, $(SRCDIR)/opcontrol $(SRCDIR)/initialize $(SRCDIR)/autonomous,$(foreach cext,$(CEXTS),$(file).$(cext)) $(foreach cxxext,$(CXXEXTS),$(file).$(cxxext)))
Expand Down
Binary file modified bin/gif-pros.a
View file
Binary file not shown.
Binary file modified firmware/libpros.a
View file
Binary file not shown.
Binary file added gif-pros@2.0.1.zip
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions include/api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
#endif /* __cplusplus */

#define PROS_VERSION_MAJOR 3
#define PROS_VERSION_MINOR 1
#define PROS_VERSION_PATCH 7
#define PROS_VERSION_STRING "3.1.7-pr166.752"
#define PROS_VERSION_MINOR 2
#define PROS_VERSION_PATCH 0
#define PROS_VERSION_STRING "3.2.0"

#define PROS_ERR (INT32_MAX)
#define PROS_ERR_F (INFINITY)
Expand Down
208 changes: 104 additions & 104 deletions project.pros
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,148 +5,148 @@
"target": "v5",
"templates": {
"kernel": {
"location": "C:\\Users\\theol\\AppData\\Roaming\\PROS\\templates\\kernel@3.1.7-pr166.752",
"location": "C:\\Users\\theol\\AppData\\Roaming\\PROS\\templates\\kernel@3.2.0",
"metadata": {
"cold_addr": "58720256",
"cold_output": "bin/cold.package.bin",
"hot_addr": "125829120",
"hot_output": "bin/hot.package.bin",
"origin": "local",
"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_obj.h",
"include/display/lv_objx/lv_lmeter.h",
"include/display/lv_misc/lv_log.h",
"include/display/lv_misc/lv_misc.mk",
"include/display/lv_draw/lv_draw.mk",
"include/display/lv_misc/lv_gc.h",
"include/display/lv_objx/lv_tabview.h",
"include/display/README.md",
"include/display/lv_objx/lv_canvas.h",
"include/pros/motors.h",
"include/display/lv_objx/lv_line.h",
"include/display/lv_objx/lv_mbox.h",
"include/display/lv_objx/lv_roller.h",
"include/display/lv_objx/lv_btnm.h",
"include/display/lv_core/lv_core.mk",
"include/display/lv_objx/lv_slider.h",
"include/display/lv_draw/lv_draw_triangle.h",
"include/display/lvgl.h",
"include/display/lv_conf.h",
"include/display/lv_misc/lv_color.h",
"include/display/lv_objx/lv_list.h",
"include/display/lv_draw/lv_draw_rect.h",
"include/display/lv_misc/lv_mem.h",
"include/display/lv_draw/lv_draw_line.h",
"firmware/v5-common.ld",
"include/display/lv_objx/lv_gauge.h",
"include/display/lv_misc/lv_task.h",
"include/pros/llemu.hpp",
"include/display/lv_themes/lv_theme.h",
"firmware/v5.ld",
"include/display/lv_misc/lv_txt.h",
"include/display/lv_themes/lv_theme_alien.h",
"include/display/lv_core/lv_refr.h",
"include/display/lv_objx/lv_kb.h",
"include/pros/llemu.hpp",
"include/display/lv_objx/lv_tileview.h",
"include/display/lv_misc/lv_ufs.h",
"include/pros/llemu.h",
"include/display/lv_draw/lv_draw_line.h",
"include/display/lv_themes/lv_theme_nemo.h",
"include/display/lv_misc/lv_task.h",
"include/display/lv_objx/lv_objx_templ.h",
"include/display/lv_draw/lv_draw.h",
"include/display/lv_themes/lv_theme_night.h",
"include/pros/apix.h",
"firmware/libm.a",
"include/display/lv_core/lv_style.h",
"include/display/lv_misc/lv_font.h",
"include/display/lv_misc/lv_area.h",
"include/pros/rtos.h",
"include/pros/misc.h",
"include/display/lv_core/lv_group.h",
"include/pros/api_legacy.h",
"include/display/lv_objx/lv_spinbox.h",
"include/api.h",
"include/display/lv_hal/lv_hal.h",
"include/display/lv_version.h",
"firmware/libc.a",
"include/display/lv_core/lv_lang.h",
"include/display/lv_draw/lv_draw_img.h",
"include/display/lv_objx/lv_bar.h",
"include/display/lv_objx/lv_win.h",
"include/display/lv_objx/lv_imgbtn.h",
"include/display/lv_draw/lv_draw_vbasic.h",
"include/pros/adi.h",
"include/display/lv_objx/lv_objx.mk",
"include/display/lv_objx/lv_label.h",
"include/pros/vision.hpp",
"include/pros/vision.h",
"include/pros/rtos.hpp",
"include/pros/colors.h",
"include/display/lv_objx/lv_sw.h",
"firmware/libpros.a",
"common.mk",
"include/display/lv_objx/lv_page.h",
"include/display/lv_objx/lv_table.h",
"include/display/lv_objx/lv_cb.h",
"include/display/lv_hal/lv_hal_indev.h",
"include/display/lv_conf_checker.h",
"include/display/lv_draw/lv_draw_arc.h",
"include/display/lv_objx/lv_led.h",
"include/display/lv_hal/lv_hal_disp.h",
"include/display/lv_misc/lv_fs.h",
"include/display/lv_core/lv_group.h",
"include/display/lv_objx/lv_kb.h",
"include/display/lv_draw/lv_draw_label.h",
"include/display/lv_objx/lv_list.h",
"include/display/lv_draw/lv_draw.h",
"include/display/lv_objx/lv_chart.h",
"include/display/lv_misc/lv_gc.h",
"include/display/lv_misc/lv_ll.h",
"include/display/lv_draw/lv_draw_rect.h",
"include/display/lv_misc/lv_mem.h",
"include/display/lv_objx/lv_ddlist.h",
"include/display/lv_objx/lv_calendar.h",
"include/display/lv_misc/lv_circ.h",
"include/display/lv_core/lv_obj.h",
"include/display/lv_core/lv_lang.h",
"include/pros/adi.hpp",
"include/display/lv_conf_checker.h",
"include/display/licence.txt",
"include/pros/vision.h",
"include/display/lv_core/lv_core.mk",
"include/pros/serial.h",
"include/display/lv_hal/lv_hal_indev.h",
"include/display/lv_objx/lv_preload.h",
"include/display/lv_objx/lv_page.h",
"include/display/lv_objx/lv_lmeter.h",
"include/display/lv_objx/lv_tabview.h",
"include/display/lv_misc/lv_ufs.h",
"include/display/lv_draw/lv_draw_vbasic.h",
"include/display/lv_hal/lv_hal.mk",
"include/display/lv_themes/lv_theme_templ.h",
"include/pros/vision.hpp",
"include/display/lv_objx/lv_arc.h",
"include/display/lv_objx/lv_img.h",
"include/display/lv_objx/lv_mbox.h",
"include/display/lv_themes/lv_theme_material.h",
"include/display/lv_objx/lv_sw.h",
"include/display/lv_objx/lv_gauge.h",
"include/pros/motors.hpp",
"include/display/licence.txt",
"include/display/lv_misc/lv_templ.h",
"include/pros/motors.h",
"include/display/lv_objx/lv_img.h",
"include/display/lv_core/lv_refr.h",
"include/display/lv_draw/lv_draw.mk",
"include/display/lv_core/lv_style.h",
"include/display/lv_fonts/lv_font_builtin.h",
"include/display/lv_themes/lv_theme_default.h",
"include/display/lv_misc/lv_txt.h",
"include/pros/serial.h",
"firmware/libm.a",
"include/display/lv_version.h",
"include/display/lv_misc/lv_anim.h",
"include/display/lv_objx/lv_spinbox.h",
"include/display/lv_draw/lv_draw_rbasic.h",
"include/display/lv_core/lv_indev.h",
"include/display/lv_hal/lv_hal_tick.h",
"include/pros/rtos.h",
"include/display/lv_objx/lv_imgbtn.h",
"include/display/lv_objx/lv_ta.h",
"include/display/lv_themes/lv_theme_default.h",
"include/display/lv_draw/lv_draw_img.h",
"include/display/lv_objx/lv_slider.h",
"include/display/lv_themes/lv_themes.mk",
"include/display/lv_objx/lv_tileview.h",
"include/display/lv_misc/lv_area.h",
"include/display/lv_misc/lv_misc.mk",
"include/pros/misc.h",
"include/display/lv_hal/lv_hal_tick.h",
"include/display/lv_objx/lv_canvas.h",
"include/api.h",
"include/display/lv_conf.h",
"include/display/lv_objx/lv_bar.h",
"include/pros/apix.h",
"include/display/lv_objx/lv_objx_templ.h",
"include/display/lv_objx/lv_table.h",
"include/display/lv_objx/lv_roller.h",
"firmware/libc.a",
"include/display/lv_hal/lv_hal_disp.h",
"include/display/lv_objx/lv_win.h",
"include/display/lv_core/lv_vdb.h",
"include/display/README.md",
"include/display/lv_misc/lv_log.h",
"include/display/lv_objx/lv_line.h",
"include/pros/api_legacy.h",
"include/pros/colors.h",
"firmware/v5-hot.ld",
"include/display/lv_objx/lv_cont.h",
"include/display/lvgl.h",
"include/pros/serial.hpp",
"include/display/lv_objx/lv_chart.h",
"include/display/lv_draw/lv_draw_label.h",
"include/pros/adi.h",
"include/display/lv_misc/lv_anim.h",
"firmware/v5-common.ld",
"include/display/lv_misc/lv_math.h",
"include/display/lv_objx/lv_btn.h",
"include/display/lv_misc/lv_templ.h",
"include/display/lv_misc/lv_circ.h",
"include/display/lv_fonts/lv_fonts.mk",
"include/display/lv_misc/lv_ll.h",
"include/display/lv_hal/lv_hal.mk",
"include/display/lv_themes/lv_theme_material.h",
"include/display/lv_themes/lv_theme_templ.h",
"include/display/lv_misc/lv_font.h",
"include/display/lv_themes/lv_theme_zen.h",
"firmware/v5-hot.ld",
"common.mk",
"include/display/lv_objx/lv_cb.h",
"include/display/lv_objx/lv_calendar.h",
"include/display/lv_misc/lv_symbol_def.h",
"include/display/lv_objx/lv_led.h",
"include/display/lv_misc/lv_color.h",
"include/display/lv_themes/lv_theme_night.h",
"include/display/lv_hal/lv_hal.h",
"include/display/lv_themes/lv_theme_mono.h",
"include/display/lv_objx/lv_objx.mk",
"include/display/lv_themes/lv_theme.h",
"include/pros/llemu.h",
"include/display/lv_themes/lv_themes.mk",
"include/pros/misc.hpp",
"include/display/lv_core/lv_vdb.h",
"include/display/lv_misc/lv_math.h",
"include/display/lv_misc/lv_symbol_def.h",
"include/display/lv_objx/lv_cont.h"
"firmware/libpros.a",
"include/display/lv_draw/lv_draw_arc.h",
"include/display/lv_fonts/lv_fonts.mk",
"include/display/lv_core/lv_indev.h",
"include/display/lv_objx/lv_btnm.h",
"include/display/lv_draw/lv_draw_triangle.h"
],
"target": "v5",
"user_files": [
"Makefile",
"include/main.hpp",
"src/main.cpp",
".gitignore",
"include/main.h",
"include/main.hh",
"src/main.cc",
"include/main.h",
"src/main.c",
"include/main.hh"
".gitignore",
"include/main.hpp"
],
"version": "3.1.7-pr166.752"
"version": "3.2.0"
},
"okapilib": {
"location": "C:\\Users\\theol\\AppData\\Roaming\\PROS\\templates\\okapilib@4.0.0-RC2",
Expand Down

0 comments on commit 5af280a

Please sign in to comment.