Recompile VOSS for 0.1.2 (#98)

purduesigbots · May 15, 2024 · cb55a39 · cb55a39
1 parent 2548c71
commit cb55a39
Show file tree

Hide file tree

Showing 159 changed files with 4,265 additions and 3,349 deletions.
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ EXCLUDE_COLD_LIBRARIES:=
 IS_LIBRARY:=1
 # TODO: CHANGE THIS!
 LIBNAME:=VOSS
-VERSION:=0.1.1
+VERSION:=0.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/[email protected] b/[email protected]
diff --git a/common.mk b/common.mk
@@ -21,7 +21,7 @@ SPACE := $() $()
 COMMA := ,
 
 C_STANDARD?=gnu11
-CXX_STANDARD?=gnu++2a
+CXX_STANDARD?=gnu++20
 
 DEPDIR := .d
 $(shell mkdir -p $(DEPDIR))

diff --git a/firmware/liblvgl.a b/firmware/liblvgl.a
diff --git a/firmware/libpros.a b/firmware/libpros.a
diff --git a/include/api.h b/include/api.h
@@ -41,8 +41,8 @@
 
 #define PROS_VERSION_MAJOR 4
 #define PROS_VERSION_MINOR 0
-#define PROS_VERSION_PATCH 5
-#define PROS_VERSION_STRING "4.0.5"
+#define PROS_VERSION_PATCH 7
+#define PROS_VERSION_STRING "4.0.7"
 
 #include "pros/adi.h"
 #include "pros/colors.h"

diff --git a/include/liblvgl/core/lv_core.mk b/include/liblvgl/core/lv_core.mk
diff --git a/include/liblvgl/core/lv_disp.h b/include/liblvgl/core/lv_disp.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../hal/lv_hal.h"
+#include "liblvgl/hal/lv_hal.h"
 #include "lv_obj.h"
 #include "lv_theme.h"
 

diff --git a/include/liblvgl/core/lv_group.h b/include/liblvgl/core/lv_group.h
@@ -14,12 +14,12 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "../lv_conf_internal.h"
+#include "liblvgl/lv_conf_internal.h"
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "../misc/lv_ll.h"
-#include "../misc/lv_types.h"
+#include "liblvgl/misc/lv_ll.h"
+#include "liblvgl/misc/lv_types.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/core/lv_indev.h b/include/liblvgl/core/lv_indev.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_obj.h"
-#include "../hal/lv_hal_indev.h"
+#include "liblvgl/hal/lv_hal_indev.h"
 #include "lv_group.h"
 
 /*********************

diff --git a/include/liblvgl/core/lv_obj_draw.h b/include/liblvgl/core/lv_obj_draw.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../draw/lv_draw.h"
+#include "liblvgl/draw/lv_draw.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/core/lv_obj_pos.h b/include/liblvgl/core/lv_obj_pos.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../misc/lv_area.h"
+#include "liblvgl/misc/lv_area.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/core/lv_obj_scroll.h b/include/liblvgl/core/lv_obj_scroll.h
@@ -13,9 +13,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../misc/lv_area.h"
-#include "../misc/lv_anim.h"
-#include "../misc/lv_types.h"
+#include "liblvgl/misc/lv_area.h"
+#include "liblvgl/misc/lv_anim.h"
+#include "liblvgl/misc/lv_types.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/core/lv_obj_style.h b/include/liblvgl/core/lv_obj_style.h
@@ -15,7 +15,7 @@ extern "C" {
  *********************/
 #include <stdint.h>
 #include <stdbool.h>
-#include "../misc/lv_bidi.h"
+#include "liblvgl/misc/lv_bidi.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/core/lv_theme.h b/include/liblvgl/core/lv_theme.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *    INCLUDES
  *********************/
-#include "../core/lv_obj.h"
+#include "liblvgl/core/lv_obj.h"
 
 /*********************
  *    DEFINES

diff --git a/include/liblvgl/draw/arm2d/lv_draw_arm2d.mk b/include/liblvgl/draw/arm2d/lv_draw_arm2d.mk
diff --git a/include/liblvgl/draw/arm2d/lv_gpu_arm2d.h b/include/liblvgl/draw/arm2d/lv_gpu_arm2d.h
@@ -13,9 +13,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../misc/lv_color.h"
-#include "../../hal/lv_hal_disp.h"
-#include "../sw/lv_draw_sw.h"
+#include "liblvgl/misc/lv_color.h"
+#include "liblvgl/hal/lv_hal_disp.h"
+#include "liblvgl/draw/sw/lv_draw_sw.h"
 
 #if LV_USE_GPU_ARM2D
 

diff --git a/include/liblvgl/draw/lv_draw.h b/include/liblvgl/draw/lv_draw.h
@@ -13,10 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
+#include "liblvgl/lv_conf_internal.h"
 
-#include "../misc/lv_style.h"
-#include "../misc/lv_txt.h"
+#include "liblvgl/misc/lv_style.h"
+#include "liblvgl/misc/lv_txt.h"
 #include "lv_img_decoder.h"
 #include "lv_img_cache.h"
 
@@ -72,7 +72,6 @@ typedef struct _lv_draw_ctx_t  {
      */
     const lv_area_t * clip_area;
 
-    void (*init_buf)(struct _lv_draw_ctx_t * draw_ctx);
 
     void (*draw_rect)(struct _lv_draw_ctx_t * draw_ctx, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords);
 

diff --git a/include/liblvgl/draw/lv_draw.mk b/include/liblvgl/draw/lv_draw.mk
diff --git a/include/liblvgl/draw/lv_draw_arc.h b/include/liblvgl/draw/lv_draw_arc.h
@@ -13,10 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
-#include "../misc/lv_color.h"
-#include "../misc/lv_area.h"
-#include "../misc/lv_style.h"
+#include "liblvgl/lv_conf_internal.h"
+#include "liblvgl/misc/lv_color.h"
+#include "liblvgl/misc/lv_area.h"
+#include "liblvgl/misc/lv_style.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/draw/lv_draw_img.h b/include/liblvgl/draw/lv_draw_img.h
@@ -15,7 +15,7 @@ extern "C" {
  *********************/
 #include "lv_img_decoder.h"
 #include "lv_img_buf.h"
-#include "../misc/lv_style.h"
+#include "liblvgl/misc/lv_style.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/draw/lv_draw_label.h b/include/liblvgl/draw/lv_draw_label.h
@@ -13,10 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../misc/lv_bidi.h"
-#include "../misc/lv_txt.h"
-#include "../misc/lv_color.h"
-#include "../misc/lv_style.h"
+#include "liblvgl/misc/lv_bidi.h"
+#include "liblvgl/misc/lv_txt.h"
+#include "liblvgl/misc/lv_color.h"
+#include "liblvgl/misc/lv_style.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/draw/lv_draw_layer.h b/include/liblvgl/draw/lv_draw_layer.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
+#include "liblvgl/lv_conf_internal.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/draw/lv_draw_line.h b/include/liblvgl/draw/lv_draw_line.h
@@ -13,10 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
-#include "../misc/lv_color.h"
-#include "../misc/lv_area.h"
-#include "../misc/lv_style.h"
+#include "liblvgl/lv_conf_internal.h"
+#include "liblvgl/misc/lv_color.h"
+#include "liblvgl/misc/lv_area.h"
+#include "liblvgl/misc/lv_style.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/draw/lv_draw_mask.h b/include/liblvgl/draw/lv_draw_mask.h
@@ -15,9 +15,9 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "../misc/lv_area.h"
-#include "../misc/lv_color.h"
-#include "../misc/lv_math.h"
+#include "liblvgl/misc/lv_area.h"
+#include "liblvgl/misc/lv_color.h"
+#include "liblvgl/misc/lv_math.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/draw/lv_draw_rect.h b/include/liblvgl/draw/lv_draw_rect.h
@@ -13,10 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
-#include "../misc/lv_color.h"
-#include "../misc/lv_area.h"
-#include "../misc/lv_style.h"
+#include "liblvgl/lv_conf_internal.h"
+#include "liblvgl/misc/lv_color.h"
+#include "liblvgl/misc/lv_area.h"
+#include "liblvgl/misc/lv_style.h"
 #include "sw/lv_draw_sw_gradient.h"
 
 /*********************

diff --git a/include/liblvgl/draw/lv_draw_transform.h b/include/liblvgl/draw/lv_draw_transform.h
@@ -13,8 +13,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
-#include "../misc/lv_area.h"
+#include "liblvgl/lv_conf_internal.h"
+#include "liblvgl/misc/lv_area.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/draw/lv_img_buf.h b/include/liblvgl/draw/lv_img_buf.h
@@ -14,8 +14,8 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "../misc/lv_color.h"
-#include "../misc/lv_area.h"
+#include "liblvgl/misc/lv_color.h"
+#include "liblvgl/misc/lv_area.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/draw/lv_img_decoder.h b/include/liblvgl/draw/lv_img_decoder.h
@@ -13,13 +13,13 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
+#include "liblvgl/lv_conf_internal.h"
 
 #include <stdint.h>
 #include "lv_img_buf.h"
-#include "../misc/lv_fs.h"
-#include "../misc/lv_types.h"
-#include "../misc/lv_area.h"
+#include "liblvgl/misc/lv_fs.h"
+#include "liblvgl/misc/lv_types.h"
+#include "liblvgl/misc/lv_area.h"
 
 /*********************
  *      DEFINES

diff --git a/include/liblvgl/draw/nxp/lv_draw_nxp.mk b/include/liblvgl/draw/nxp/lv_draw_nxp.mk
diff --git a/include/liblvgl/draw/nxp/pxp/lv_draw_nxp_pxp.mk b/include/liblvgl/draw/nxp/pxp/lv_draw_nxp_pxp.mk