Skip to content

Commit

Permalink
Merge pull request #200 from purduesigbots/release/3.2.1
Browse files Browse the repository at this point in the history
🔖 Release 3.2.1
  • Loading branch information
HotelCalifornia authored Jan 21, 2020
2 parents ab99a33 + 2cf7b0b commit 2bb7003
Show file tree
Hide file tree
Showing 91 changed files with 1,048 additions and 134 deletions.
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

0 comments on commit 2bb7003

Please sign in to comment.