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.

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

🔖 Release 3.2.1 #200

Merged
merged 59 commits into from
Jan 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
9ca0364
Better errno for registry validation failure, update vision sensor er…
edjubuh Jan 30, 2019
01315cc
✨ Add Makefile-variable for excluding libraries from cold image (#121)
Jerrylum Feb 22, 2019
99dd577
Update vdml_vision.c
edjubuh Feb 26, 2019
44aaee5
Merge branch 'develop' into arcpatch-D266
edjubuh Feb 26, 2019
5aabc29
Merge branch 'arcpatch-D266' of github.com:purduesigbots/pros into ar…
edjubuh Feb 26, 2019
e5700ed
Update vdml_vision.c
edjubuh Feb 26, 2019
6824927
Update vdml_vision.c
edjubuh Feb 26, 2019
db6e101
Update Copyright info to current year
baylessj Mar 3, 2019
7a355c9
Merge pull request #128 from purduesigbots/copyright-update
baylessj Mar 3, 2019
bfefbdf
🐛 Fix cold libraries variable assignment (#129)
baylessj Mar 4, 2019
01f2c79
Apply suggestions from code review
HotelCalifornia Mar 10, 2019
7b865af
Fix whitespace
edjubuh Mar 10, 2019
e4b2505
Fix up errno when mismatch/not connected
edjubuh Mar 10, 2019
64ed114
Fix up errno when mismatch/not connected for ADI
edjubuh Mar 10, 2019
9b2e651
Fix up errno when mismatched/not connected for ADI round 2
edjubuh Mar 10, 2019
afcbc32
Fix up errno when mismatched/not connected for ADI round 3
edjubuh Mar 10, 2019
021f8be
✨ Improve Makefile compile speed (#123)
Jerrylum Mar 11, 2019
59d92c3
Migate kernel makefile to test_output_2 (#130)
edjubuh Mar 11, 2019
ad6c6ff
Fix incorrect port type (#139)
TixoRebel Apr 23, 2019
3fc4099
Add alternate generic serial API and fix generic serial filesystem dr…
TixoRebel May 30, 2019
195dfdb
🐛 Update vision_read_by_sig to be less funky (#124)
edjubuh Jun 10, 2019
42c44df
🚸 Improve error Handling in VDML (#125)
baylessj Jun 10, 2019
338fbd7
🚨 Make things work with GCC 8.3 (#155)
HotelCalifornia Aug 18, 2019
761bbb9
🔧 Enable hot/cold by default (#154)
Octogonapus Aug 19, 2019
b58f8ab
🏗 Combine template source files (#152)
Octogonapus Aug 19, 2019
61eb20a
🐛 Fix multiple ADI bugs and inconsistencies (#151)
TixoRebel Aug 19, 2019
330469c
⬆️ Upgrade LVGL to 5.3 (#144)
HotelCalifornia Aug 19, 2019
6865c59
🤫 Suppress ignored qualifiers when including lvgl (#147)
Octogonapus Aug 24, 2019
65a5845
🔧 Add default `.gitignore` to template (#156)
theol0403 Aug 26, 2019
89e4333
🚸 Add alternate constructor for pros::Task (#158)
jm-spencer Aug 29, 2019
4a00c5e
💚 Update toolchain installation for azure (#163)
HotelCalifornia Sep 1, 2019
6394b23
🚨🔊 Add a better Data Abort Handler (#112)
edjubuh Sep 2, 2019
acda534
🐛 Add default LLEMU init code back to main.cpp (#165)
HotelCalifornia Sep 3, 2019
fde44c4
Bump to 3.2.0
HotelCalifornia Sep 3, 2019
b939502
🔧 Recompile on header change (#167)
nathan-moore Sep 12, 2019
be07299
🐛 Return proper error code for VDML functions that return floating po…
Jerrylum Sep 12, 2019
4a16f44
Fix controller_clear
TixoRebel Sep 12, 2019
44583e5
Check Controller Send Error
TixoRebel Sep 12, 2019
7469a3b
🐛 Fix motor PID functions bug (#162)
Jerrylum Sep 15, 2019
59bde8f
Change controller_clear
TixoRebel Oct 3, 2019
4de3a0a
Add Fallback controller_clear
TixoRebel Oct 10, 2019
c4e646d
Merge branch 'master' into develop
HotelCalifornia Oct 20, 2019
b5613ca
🚸 Implement exception logging to terminal (#179)
theol0403 Oct 26, 2019
f419c5f
Add support for extra Make scripts (#170)
edjubuh Nov 3, 2019
6b1acee
🐛 Remove ambiguous case for constructing pros::Task (#182)
jm-spencer Nov 10, 2019
c5fd109
🚸 Allow tasks to be constructed from any void() callable (#177)
nickmertin Nov 10, 2019
7fa5c61
Merge pull request #169 from TixoRebel/feature/controller-send-error
nathan-moore Nov 21, 2019
a02cefc
🐛 Fix race and an abandoned mutex (#180)
nathan-moore Nov 21, 2019
d5328e1
🐛 Fix clearing controller LCD (#185)
nathan-moore Dec 7, 2019
ae9ecf4
📝 Update copyright (#193)
nathan-moore Jan 8, 2020
89a8e3b
Add missing include directives for <stdbool.h> (#195)
nickmertin Jan 12, 2020
3dcaefe
🔇 Stop warnings for GCC 7.1 ABI change (#190)
Octogonapus Jan 17, 2020
a124885
🐛Fix header tracking of duplicate basename files (#191)
nathan-moore Jan 21, 2020
5d1458b
✨ Add support for VEX Inertial Sensor (#187)
HotelCalifornia Jan 21, 2020
a45c053
enable lv_kb (#198)
HotelCalifornia Jan 21, 2020
8e2a962
✨ Add SD card detection command (#189)
Jerrylum Jan 21, 2020
31841a7
✨ Add a new class method: get_port (#188)
Jerrylum Jan 21, 2020
63e4b4a
💡 Fix ultrasonic docs (#199)
HotelCalifornia Jan 21, 2020
2cf7b0b
Put in temporary file system stubs (#201)
nathan-moore Jan 21, 2020
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ template/
version
cquery_log.txt
compile_commands.json
.ccls-cache/
.ccls
temp.log
temp.errors
.d/
.d/
2 changes: 1 addition & 1 deletion STYLEGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ These should be placed at the very start of a file.
* This file should not be modified by users, since it gets replaced whenever
* a kernel upgrade occurs.
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
17 changes: 10 additions & 7 deletions common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MFLAGS=-mcpu=cortex-a9 -mfpu=neon-fp16 -mfloat-abi=softfp -Os -g
CPPFLAGS=-D_POSIX_THREADS -D_UNIX98_THREAD_MUTEX_ATTRIBUTES
GCCFLAGS=-ffunction-sections -fdata-sections -fdiagnostics-color -funwind-tables

WARNFLAGS+=
WARNFLAGS+=-Wno-psabi

SPACE :=
SPACE +=
Expand All @@ -14,7 +14,8 @@ COMMA := ,
DEPDIR := .d
$(shell mkdir -p $(DEPDIR))
DEPFLAGS = -MT $$@ -MMD -MP -MF $(DEPDIR)/$$*.Td
RENAMEDEPENDENCYFILE = $(VV)mv -f $(DEPDIR)/$$*.Td $(DEPDIR)/$$*.d && touch $$@
MAKEDEPFOLDER = -$(VV)mkdir -p $(DEPDIR)/$$(dir $$(patsubst $(BINDIR)/%, %, $(ROOT)/$$@))
RENAMEDEPENDENCYFILE = -$(VV)mv -f $(DEPDIR)/$$*.Td $$(patsubst $(SRCDIR)/%, $(DEPDIR)/%.d, $(ROOT)/$$<) && touch $$@

LIBRARIES+=$(wildcard $(FWDIR)/*.a)
# Cannot include newlib and libc because not all of the req'd stubs are implemented
Expand Down Expand Up @@ -167,6 +168,8 @@ ifeq ($(USE_PACKAGE),1)
DEFAULT_BIN=$(HOT_BIN)
endif

-include $(wildcard $(FWDIR)/*.mk)

.PHONY: all clean quick

quick: $(DEFAULT_BIN)
Expand Down Expand Up @@ -204,10 +207,10 @@ endif

# if project is a library source, compile the archive and link output.elf against the archive rather than source objects
ifeq ($(IS_LIBRARY),1)
ELF_DEPS=$(filter-out $(call GETALLOBJ,$(EXCLUDE_SRC_FROM_LIB)), $(call GETALLOBJ,$(EXCLUDE_SRCDIRS)))
ELF_DEPS+=$(filter-out $(call GETALLOBJ,$(EXCLUDE_SRC_FROM_LIB)), $(call GETALLOBJ,$(EXCLUDE_SRCDIRS)))
LIBRARIES+=$(LIBAR)
else
ELF_DEPS=$(call GETALLOBJ,$(EXCLUDE_SRCDIRS))
ELF_DEPS+=$(call GETALLOBJ,$(EXCLUDE_SRCDIRS))
endif

$(MONOLITH_BIN): $(MONOLITH_ELF) $(BINDIR)
Expand Down Expand Up @@ -249,7 +252,7 @@ define c_rule
$(BINDIR)/%.$1.o: $(SRCDIR)/%.$1
$(BINDIR)/%.$1.o: $(SRCDIR)/%.$1 $(DEPDIR)/$(basename $1).d
$(VV)mkdir -p $$(dir $$@)
$(VV)mkdir -p $(DEPDIR)/$$(dir $$(patsubst bin/%, %, $$@))
$(MAKEDEPFOLDER)
$$(call test_output_2,Compiled $$< ,$(CC) -c $(INCLUDE) -iquote"$(INCDIR)/$$(dir $$*)" $(CFLAGS) $(EXTRA_CFLAGS) $(DEPFLAGS) -o $$@ $$<,$(OK_STRING))
$(RENAMEDEPENDENCYFILE)
endef
Expand All @@ -259,7 +262,7 @@ define cxx_rule
$(BINDIR)/%.$1.o: $(SRCDIR)/%.$1
$(BINDIR)/%.$1.o: $(SRCDIR)/%.$1 $(DEPDIR)/$(basename %).d
$(VV)mkdir -p $$(dir $$@)
$(VV)mkdir -p $(DEPDIR)/$$(dir $$(patsubst bin/%, %, $$@))
$(MAKEDEPFOLDER)
$$(call test_output_2,Compiled $$< ,$(CXX) -c $(INCLUDE) -iquote"$(INCDIR)/$$(dir $$*)" $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(DEPFLAGS) -o $$@ $$<,$(OK_STRING))
$(RENAMEDEPENDENCYFILE)
endef
Expand All @@ -282,4 +285,4 @@ cxx-sysroot:
$(DEPDIR)/%.d: ;
.PRECIOUS: $(DEPDIR)/%.d

include $(wildcard $(patsubst ./src/%,$(DEPDIR)/%.d,$(basename $(CSRC) $(CXXSRC))))
include $(wildcard $(patsubst $(SRCDIR)/%,$(DEPDIR)/%.d,$(CSRC) $(CXXSRC)))
2 changes: 1 addition & 1 deletion firmware/libv5rts
8 changes: 5 additions & 3 deletions include/api.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* This file should not be modified by users, since it gets replaced whenever
* a kernel upgrade occurs.
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
* All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down Expand Up @@ -41,14 +41,15 @@

#define PROS_VERSION_MAJOR 3
#define PROS_VERSION_MINOR 2
#define PROS_VERSION_PATCH 0
#define PROS_VERSION_STRING "3.2.0"
#define PROS_VERSION_PATCH 1
#define PROS_VERSION_STRING "3.2.1"

#define PROS_ERR (INT32_MAX)
#define PROS_ERR_F (INFINITY)

#include "pros/adi.h"
#include "pros/colors.h"
#include "pros/imu.h"
#include "pros/llemu.h"
#include "pros/misc.h"
#include "pros/motors.h"
Expand All @@ -57,6 +58,7 @@

#ifdef __cplusplus
#include "pros/adi.hpp"
#include "pros/imu.hpp"
#include "pros/llemu.hpp"
#include "pros/misc.hpp"
#include "pros/motors.hpp"
Expand Down
2 changes: 1 addition & 1 deletion include/common/cobs.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* See common/cobs.c for discussion
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
* All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down
2 changes: 1 addition & 1 deletion include/common/gid.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* See common/gid.c for discussion
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
* All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down
2 changes: 1 addition & 1 deletion include/common/linkedlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file defines a linked list implementation that operates on the FreeRTOS
* heap, and is able to generically store function pointers and data
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion include/common/set.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* See common/set.c for discussion
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
* All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down
2 changes: 1 addition & 1 deletion include/common/string.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* See common/string.c for discussion
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
* All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down
2 changes: 1 addition & 1 deletion include/display/lv_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
#define USE_LV_BTNM 1

/*Keyboard (dependencies: lv_btnm)*/
#define USE_LV_KB 0
#define USE_LV_KB 1

/*Check box (dependencies: lv_btn, lv_label)*/
#define USE_LV_CB 1
Expand Down
2 changes: 1 addition & 1 deletion include/kapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* creation of statically allocated FreeRTOS primitives like tasks, semaphores,
* and queues.
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
* All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down
2 changes: 1 addition & 1 deletion include/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Contains common definitions and header files used throughout your PROS
* project.
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
* All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down
11 changes: 6 additions & 5 deletions include/pros/adi.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* This file should not be modified by users, since it gets replaced whenever
* a kernel upgrade occurs.
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -18,6 +18,7 @@
#ifndef _PROS_ADI_H_
#define _PROS_ADI_H_

#include <stdbool.h>
#include <stdint.h>
#ifndef PROS_ERR
#define PROS_ERR (INT32_MAX)
Expand Down Expand Up @@ -576,11 +577,11 @@ int32_t adi_ultrasonic_get(adi_ultrasonic_t ult);
* EADDRINUSE - The port is not configured as an ultrasonic
*
* \param port_ping
* The port connected to the orange OUTPUT cable. This should be in the
* next highest port following port_echo.
* \param port_echo
* The port connected to the yellow INPUT cable. This should be in port
* The port connected to the orange OUTPUT cable. This should be in port
* 1, 3, 5, or 7 ('A', 'C', 'E', 'G').
* \param port_echo
* The port connected to the yellow INPUT cable. This should be in the
* next highest port following port_ping.
*
* \return An adi_ultrasonic_t object to be stored and used for later calls to
* ultrasonic functions
Expand Down
10 changes: 5 additions & 5 deletions include/pros/adi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* This file should not be modified by users, since it gets replaced whenever
* a kernel upgrade occurs.
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down Expand Up @@ -424,11 +424,11 @@ class ADIUltrasonic : private ADIPort {
* ENXIO - The given value is not within the range of ADI Ports.
*
* \param port_ping
* The port connected to the orange OUTPUT cable. This should be in the
* next highest port following port_echo.
* \param port_echo
* The port connected to the yellow INPUT cable. This should be in port
* The port connected to the orange OUTPUT cable. This should be in port
* 1, 3, 5, or 7 ('A', 'C', 'E', 'G').
* \param port_echo
* The port connected to the yellow INPUT cable. This should be in the
* next highest port following port_ping.
*/
ADIUltrasonic(std::uint8_t port_ping, std::uint8_t port_echo);

Expand Down
2 changes: 1 addition & 1 deletion include/pros/api_legacy.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* This file should not be modified by users, since it gets replaced whenever
* a kernel upgrade occurs.
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
* All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down
3 changes: 2 additions & 1 deletion include/pros/apix.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This file should not be modified by users, since it gets replaced whenever
* a kernel upgrade occurs.
*
* Copyright (c) 2017-2019, Purdue University ACM SIGBots.
* Copyright (c) 2017-2020, Purdue University ACM SIGBots.
* All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
Expand Down Expand Up @@ -369,6 +369,7 @@ void queue_reset(queue_t queue);
typedef enum v5_device_e {
E_DEVICE_NONE = 0,
E_DEVICE_MOTOR = 2,
E_DEVICE_IMU = 6,
E_DEVICE_RADIO = 8,
E_DEVICE_VISION = 11,
E_DEVICE_ADI = 12,
Expand Down
2 changes: 1 addition & 1 deletion include/pros/colors.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file should not be modified by users, since it gets replaced whenever
* a kernel upgrade occurs.
*
* Copyright (c) 2017-2019 Purdue University ACM SIGBots.
* Copyright (c) 2017-2020 Purdue University ACM SIGBots.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
Loading