From 952bb957162238dc0ef6cbb0c3355e1c48959500 Mon Sep 17 00:00:00 2001 From: Marc MERLIN Date: Mon, 20 Jan 2020 18:03:47 +0000 Subject: [PATCH] Better detect arm/rPi, added Table_Mark_Estes demo. --- examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos | 2 +- examples/GFX_Table_Mark_Estes/Makefile | 1 + examples/GFX_Table_Mark_Estes/Table_Mark_Estes.ino | 1 + examples/GFX_Table_Mark_Estes/neomatrix_config.h | 1 + makeNativeArduino.mk | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) create mode 120000 examples/GFX_Table_Mark_Estes/Makefile create mode 120000 examples/GFX_Table_Mark_Estes/Table_Mark_Estes.ino create mode 120000 examples/GFX_Table_Mark_Estes/neomatrix_config.h diff --git a/examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos b/examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos index a54a6ba..0222576 160000 --- a/examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos +++ b/examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos @@ -1 +1 @@ -Subproject commit a54a6ba58ee62fa321b5662a00fb44a68d931b0d +Subproject commit 022257656e2f1beabe327e88bb96747c0fc955f9 diff --git a/examples/GFX_Table_Mark_Estes/Makefile b/examples/GFX_Table_Mark_Estes/Makefile new file mode 120000 index 0000000..d0b0e8e --- /dev/null +++ b/examples/GFX_Table_Mark_Estes/Makefile @@ -0,0 +1 @@ +../Makefile \ No newline at end of file diff --git a/examples/GFX_Table_Mark_Estes/Table_Mark_Estes.ino b/examples/GFX_Table_Mark_Estes/Table_Mark_Estes.ino new file mode 120000 index 0000000..14a05bd --- /dev/null +++ b/examples/GFX_Table_Mark_Estes/Table_Mark_Estes.ino @@ -0,0 +1 @@ +../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/LEDMatrix/Table_Mark_Estes/Table_Mark_Estes.ino \ No newline at end of file diff --git a/examples/GFX_Table_Mark_Estes/neomatrix_config.h b/examples/GFX_Table_Mark_Estes/neomatrix_config.h new file mode 120000 index 0000000..01868a6 --- /dev/null +++ b/examples/GFX_Table_Mark_Estes/neomatrix_config.h @@ -0,0 +1 @@ +../neomatrix_config.h \ No newline at end of file diff --git a/makeNativeArduino.mk b/makeNativeArduino.mk index 106fb98..6253f18 100644 --- a/makeNativeArduino.mk +++ b/makeNativeArduino.mk @@ -29,7 +29,7 @@ LDFLAGS += -L/usr/X11R6/lib -lX11 # include X11 library LDFLAGS += -pthread # include linux thread library # comment this out if you arne't using https://github.com/hzeller/rpi-rgb-led-matrix/ -ifneq ($(shell uname -m),x86_64) +ifneq ($(shell uname -m |grep arm),) #pragma message "ARDUINOONPC building on ARM (guessing rPi), will link against rgbmatrix" LDFLAGS += -L$(NATIVE_ROOT)/rpi-rgb-led-matrix/lib -lrgbmatrix -lrt else