Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

VOSS upgrade PROS kernel to 4.0.7 #98

Merged
merged 1 commit into from
May 15, 2024
Merged

VOSS upgrade PROS kernel to 4.0.7 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
Binary file added [email protected]
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ SPACE := $() $()
COMMA := ,

C_STANDARD?=gnu11
CXX_STANDARD?=gnu++2a
CXX_STANDARD?=gnu++20

DEPDIR := .d
$(shell mkdir -p $(DEPDIR))
Expand Down
Binary file modified firmware/liblvgl.a
View file
Open in desktop
Binary file not shown.
Binary file modified firmware/libpros.a
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions include/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: macro 'PROS_VERSION_PATCH' used to declare a constant; consider using a 'constexpr' constant [cppcoreguidelines-macro-usage]

#define PROS_VERSION_PATCH 7
        ^

#define PROS_VERSION_STRING "4.0.7"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: macro 'PROS_VERSION_STRING' used to declare a constant; consider using a 'constexpr' constant [cppcoreguidelines-macro-usage]

#define PROS_VERSION_STRING "4.0.7"
        ^


#include "pros/adi.h"
#include "pros/colors.h"
Expand Down
20 changes: 0 additions & 20 deletions include/liblvgl/core/lv_core.mk
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_disp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions include/liblvgl/core/lv_group.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_indev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*********************
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_obj_draw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "../draw/lv_draw.h"
#include "liblvgl/draw/lv_draw.h"

/*********************
* DEFINES
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_obj_pos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "../misc/lv_area.h"
#include "liblvgl/misc/lv_area.h"

/*********************
* DEFINES
Expand Down
6 changes: 3 additions & 3 deletions include/liblvgl/core/lv_obj_scroll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_obj_style.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extern "C" {
*********************/
#include <stdint.h>
#include <stdbool.h>
#include "../misc/lv_bidi.h"
#include "liblvgl/misc/lv_bidi.h"

/*********************
* DEFINES
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/core/lv_theme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "../core/lv_obj.h"
#include "liblvgl/core/lv_obj.h"

/*********************
* DEFINES
Expand Down
6 changes: 0 additions & 6 deletions include/liblvgl/draw/arm2d/lv_draw_arm2d.mk
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions include/liblvgl/draw/arm2d/lv_gpu_arm2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions include/liblvgl/draw/lv_draw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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);

Expand Down
25 changes: 0 additions & 25 deletions include/liblvgl/draw/lv_draw.mk
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_draw_arc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/draw/lv_draw_img.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_draw_label.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/liblvgl/draw/lv_draw_layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#include "../lv_conf_internal.h"
#include "liblvgl/lv_conf_internal.h"

/*********************
* DEFINES
Expand Down
8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_draw_line.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/liblvgl/draw/lv_draw_mask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_draw_rect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*********************
Expand Down
4 changes: 2 additions & 2 deletions include/liblvgl/draw/lv_draw_transform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/liblvgl/draw/lv_img_buf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions include/liblvgl/draw/lv_img_decoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions include/liblvgl/draw/nxp/lv_draw_nxp.mk
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions include/liblvgl/draw/nxp/pxp/lv_draw_nxp_pxp.mk
View file
Open in desktop

This file was deleted.

Loading