From cca1b1f72d845aab2c6d67df96d6f89964358271 Mon Sep 17 00:00:00 2001 From: Stephen Bird Date: Fri, 15 Apr 2016 01:21:22 -0700 Subject: [PATCH 1/3] Add empty button constant --- include/Button.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/Button.h b/include/Button.h index 15e155b..ace3d98 100644 --- a/include/Button.h +++ b/include/Button.h @@ -26,6 +26,11 @@ extern "C" { #endif + +/** + * No button mask + */ +#define BUTTON_MASK_NONE 0x00 /** * Fire button mask. */ From 70a788f73d5ac27bf5e743f344a3e4c6a5d148e8 Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Wed, 20 Apr 2016 09:29:45 -0700 Subject: [PATCH 2/3] fixup libdirs for OS X Signed-off-by: Roman Birg --- make/Base.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/make/Base.mk b/make/Base.mk index 261e01d..473fdce 100644 --- a/make/Base.mk +++ b/make/Base.mk @@ -87,12 +87,18 @@ INCDIRS := -I$(NUVOSDK)/CMSIS/Include \ LDSCRIPT := $(EVICSDK)/linker/linker.ld +ifeq ($(shell uname),Darwin) +LIBDIRS := -L$(ARMGCC)/arm-none-eabi/lib \ + -L$(ARMGCC)/lib/gcc/arm-none-eabi/$(shell arm-none-eabi-gcc -dumpversion) \ + -L$(EVICSDK)/lib +else LIBDIRS := -L$(ARMGCC)/arm-none-eabi/lib \ -L$(ARMGCC)/arm-none-eabi/newlib \ -L$(ARMGCC)/lib/arm-none-eabi/newlib \ -L$(ARMGCC)/gcc/arm-none-eabi/$(GCC_VERSION) \ -L$(ARMGCC)/lib/gcc/arm-none-eabi/$(GCC_VERSION) \ -L$(EVICSDK)/lib +endif CFLAGS += -Wall -mcpu=$(CPU) -mthumb -Os -fdata-sections -ffunction-sections CFLAGS += $(INCDIRS) From 7f4a8c7e5b93a0d1fce84f6a675c991ed841cdee Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Tue, 26 Apr 2016 07:23:36 -0700 Subject: [PATCH 3/3] ignore .idea dir Signed-off-by: Roman Birg --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 05165e5..cfe00e6 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ __pycache__/ .tags .tags_sorted_by_file + +.idea/*