Re-added SDL support as a default instead of X11 (faster)

- LINUX_RENDERER_SDL is default since it's much faster for full frame
  rendering and includes scaling on bigger screens.
- Detect Arm vs Intel to turn on local X rendering vs RGBPanel rendering
- Re-added delay loop in main.cpp for FastLED rendering

Author: marcmerlin

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "rpi-rgb-led-matrix"]
 	path = rpi-rgb-led-matrix
 	url = https://github.com/hzeller/rpi-rgb-led-matrix/
+[submodule "libraries/FastLED_NeoMatrix"]
+	path = libraries/FastLED_NeoMatrix
+	url = https://github.com/marcmerlin/FastLED_NeoMatrix

examples/GFX_Sublime_Demos/Sublime_Demos

@@ -1,8 +1,16 @@
 CUSTOM_LIBS := libraries
 
+# Use SDL instead of X11. It is faster but requires SDL.
+LINUX_RENDERER_SDL = yes
+# SDL is even too fast compared to regular neopixels, so we introduce
+# a configurable delay here
+LINUX_RENDERER_SDL_MAIN_DELAY = 10
+
 ARDUINO_LIBS += SPI
 ARDUINO_LIBS += FastLED
 ARDUINO_LIBS += Framebuffer_GFX
+# LINUX_RENDERER_SDL uses FastLED_NeoMatrix and FastLED
+ARDUINO_LIBS += FastLED_NeoMatrix
 # Comment this out unless you are building for X11 rendering
 ARDUINO_LIBS += FastLED_TFTWrapper_GFX
 # Comment this out unless you are building for RGBPanels on rPi

examples/Makefile

@@ -17,21 +17,27 @@ CFLAGS += -DARDUINO=101 -DSKETCH_FILE=\"$(SKETCH)\"
 CFLAGS += -std=gnu11
 CFLAGS += -lm
 CFLAGS += -DARDUINOONPC
-#CFLAGS += -DFASTLED_SDL $(shell sdl2-config --cflags)
 
 CXXFLAGS += -Wall -Wextra -Wno-unused-parameter
 CXXFLAGS += -DARDUINO=101 -DSKETCH_FILE=\"$(SKETCH)\"
 CXXFLAGS += -Wno-class-memaccess # FastLED does some naughty things
 CXXFLAGS += -std=gnu++11
 CXXFLAGS += -DARDUINOONPC
-#CXXFLAGS += -DFASTLED_SDL $(shell sdl2-config --cflags)
 
 LDFLAGS += -Wl,--gc-sections
 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)
+#pragma message "ARDUINOONPC building on ARM (guessing rPi), will link against rgbmatrix"
 LDFLAGS += -L$(NATIVE_ROOT)/rpi-rgb-led-matrix/lib -lrgbmatrix -lrt
-#LDFLAGS += $(shell sdl2-config --libs)
+else
+ifeq ($(LINUX_RENDERER_SDL),yes)
+CXXFLAGS += -DFASTLED_SDL $(shell sdl2-config --cflags) -DLINUX_RENDERER_SDL -DLINUX_RENDERER_SDL_MAIN_DELAY=$(LINUX_RENDERER_SDL_MAIN_DELAY)
+LDFLAGS += $(shell sdl2-config --libs)
+endif
+endif
 
 DEPDIR := $(BUILD_ROOT)
 DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td
@@ -77,6 +83,7 @@ clean:
 	rm $(TARGET)
 
 print:
+	@echo "LINUX_RENDERER_SDL:\t $(LINUX_RENDERER_SDL)"
 	@echo "BUILD_ROOT:\t $(BUILD_ROOT)"
 	@echo "INCLUDES:\t $(INCLUDES)"
 	@echo "OBJECTS:\t $(OBJECTS)"
@@ -86,7 +93,9 @@ print:
 	@echo "SRC_C   :\t $(SRC_C)"
 	@echo "SRC_CXX :\t $(SRC_CXX)"
 	@echo "SRC_USER:\t $(SRC_USER)"
-	@echo ":\t $(INC_USER_FOLDERS)"
+	@echo "INC_USER_FOLDERS:\t $(INC_USER_FOLDERS)"
+	@echo "CXXFLAGS :\t $(CXXFLAGS)"
+	@echo "LDFLAGS:\t $(LDFLAGS)"
 
 
 $(BUILD_ROOT)/%.o : %.c $(DEPDIR)/%.d

libraries/FastLED_NeoMatrix

@@ -44,6 +44,11 @@ int main()
 	{
 		loop();
 		delayMicroseconds(10); // leave a little bit calculation time to other applications
+#ifdef LINUX_RENDERER_SDL
+		// SDL rendering is much faster than FastLED pixel pushing, so we add a delay to emulate
+		// the delay you'd get from real LEDs like WS2812B
+		delay(LINUX_RENDERER_SDL_MAIN_DELAY);
+#endif
 	}
 
 	//closeScreen();