Merge pull request #1 from marcmerlin/rPi

marcmerlin · web-flow · commit ba497220db44 · 2020-01-01T13:01:12.000+01:00
Merge Rpi RGBPanel work
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+*.o
+*.a
+*~
+*.so
+build
+.*.swp
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,21 @@
+[submodule "examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos"]
+	path = examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos
+	url = https://github.com/marcmerlin/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos
+[submodule "libraries/LEDMatrix"]
+	path = libraries/LEDMatrix
+	url = https://github.com/marcmerlin/LEDMatrix
+[submodule "libraries/Framebuffer_GFX"]
+	path = libraries/Framebuffer_GFX
+	url = https://github.com/marcmerlin/Framebuffer_GFX
+[submodule "libraries/FastLED"]
+	path = libraries/FastLED
+	url = https://github.com/MarcFork/FastLED
+[submodule "libraries/FastLED_TFTWrapper_GFX"]
+	path = libraries/FastLED_TFTWrapper_GFX
+	url = https://github.com/marcmerlin/FastLED_TFTWrapper_GFX
+[submodule "libraries/FastLED_RPIRGBPanel_GFX"]
+	path = libraries/FastLED_RPIRGBPanel_GFX
+	url = https://github.com/marcmerlin/FastLED_RPIRGBPanel_GFX
+[submodule "rpi-rgb-led-matrix"]
+	path = rpi-rgb-led-matrix
+	url = https://github.com/hzeller/rpi-rgb-led-matrix/
diff --git a/README.md b/README.md
@@ -8,43 +8,64 @@ ArduinoOnPC in used here to run Arduino code on Raspberry Pis to take advantage
 the extra CPU power, extra RAM, etc...  In my specific case, it also allows displaying
 arduino code on the faster and more capable rpi-rgb-led-matrix RGBPanel driver.
 
-
-# Original Project Documentation (meant to be run on PCs for debugging):
+## Original "What?" (when this project was only meant to be run on PCs for debugging):
 With this software you can run an Arduino Sketch on your PC.
 You don't need an Arduino hardware.
 The focus here is mainly on TFTs connected to an Arduino.
 
 This software is made for Linux using the X11 window manager.
 If you want to use it on windows the only current option is a virtual machine.
 
+## Original "Why?" (also when this project was only meant to be run on PCs for debugging):
 
-## Why?
 Some Arduino boards do not have a debugging possibility.
 To find the errors in your sketches it might be usefull to be able to use a debugger.
 Using this tool you can debug your program locally, and develop without having
 to tinker with any additional hardware.
 
-# Installation
+As a reminder this fork is also meant to run Arduino code on rPi.
+
 
-## Requirements
+## Installation / Requirements
 
 You need [gcc](https://gcc.gnu.org/) and [make](https://www.gnu.org/software/make/) installed.
 
-## X11
+The project uses git submodules to include some Arduino libraries. To get them, you have to run
+```
+git submodule init
+git submodule update
+```
+after checking out the repository.
+
+List of libraries imported (git submodule list)
 
-To emulate a TFT this project uses X11. Therefore you have to install X11 support.
+APIs:
+* libraries/FastLED 
+* libraries/LEDMatrix 
+* libraries/Framebuffer_GFX: holds a CRGB framebuffer and bridges to Adafruit GFX APIs
 
-### Debian/Ubuntu
+Drivers:
+* libraries/FastLED_TFTWrapper_GFX: Small wrapper I wrote to display a Framebuffer_GFX framebuffer in ArduinoOnPC's X11 renderer
+* libraries/FastLED_RPIRGBPanel_GFX: Glue driver that feeds a Framebuffer_GFX framebuffer to rpi-rgb-led-matrix to display on RGB Panels on Raspberry Pi (not needed on a PC)
+* rpi-rgb-led-matrix: Henner Zeller's indispensable library to display on RGBPanels on rPi.
 
+Demo code I gathered/ported/sorted by the API they use (FastLED, FastLED::NeoMatrix/Adafruit::GFX, or LEDMatrix):
+* examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos 
+
+If you use FastLED_RPIRGBPanel_GFX, make sure you first build rpi-rgb-led-matrix:
 ```
-sudo apt-get install libx11-dev
+cd rpi-rgb-led-matrix; make
 ```
 
-### Arch Linux
+## X11
 
+To emulate a TFT this project uses X11. Therefore you have to install X11 support, something like:
 ```
+sudo apt-get install libx11-dev
 sudo pacman -Sy libx11
+yum install libx11
 ```
+
 ## Compilation
 
 ### Makefile
diff --git a/examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos b/examples/FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos
@@ -0,0 +1 @@
+Subproject commit bdc279ec2ebcf384fd82e8a30f7257624892774e
diff --git a/examples/GFX_Aurora/Attractor.h b/examples/GFX_Aurora/Attractor.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/Attractor.h
diff --git a/examples/GFX_Aurora/Aurora.ino b/examples/GFX_Aurora/Aurora.ino
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/Aurora.ino
diff --git a/examples/GFX_Aurora/Boid.h b/examples/GFX_Aurora/Boid.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/Boid.h
diff --git a/examples/GFX_Aurora/Drawable.h b/examples/GFX_Aurora/Drawable.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/Drawable.h
diff --git a/examples/GFX_Aurora/Effects.h b/examples/GFX_Aurora/Effects.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/Effects.h
diff --git a/examples/GFX_Aurora/Geometry.h b/examples/GFX_Aurora/Geometry.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/Geometry.h
diff --git a/examples/GFX_Aurora/Makefile b/examples/GFX_Aurora/Makefile
@@ -0,0 +1 @@
+../Makefile
diff --git a/examples/GFX_Aurora/PatternAttract.h b/examples/GFX_Aurora/PatternAttract.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternAttract.h
diff --git a/examples/GFX_Aurora/PatternBounce.h b/examples/GFX_Aurora/PatternBounce.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternBounce.h
diff --git a/examples/GFX_Aurora/PatternCube.h b/examples/GFX_Aurora/PatternCube.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternCube.h
diff --git a/examples/GFX_Aurora/PatternFlock.h b/examples/GFX_Aurora/PatternFlock.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternFlock.h
diff --git a/examples/GFX_Aurora/PatternFlowField.h b/examples/GFX_Aurora/PatternFlowField.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternFlowField.h
diff --git a/examples/GFX_Aurora/PatternIncrementalDrift.h b/examples/GFX_Aurora/PatternIncrementalDrift.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternIncrementalDrift.h
diff --git a/examples/GFX_Aurora/PatternIncrementalDrift2.h b/examples/GFX_Aurora/PatternIncrementalDrift2.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternIncrementalDrift2.h
diff --git a/examples/GFX_Aurora/PatternPendulumWave.h b/examples/GFX_Aurora/PatternPendulumWave.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternPendulumWave.h
diff --git a/examples/GFX_Aurora/PatternRadar.h b/examples/GFX_Aurora/PatternRadar.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternRadar.h
diff --git a/examples/GFX_Aurora/PatternSpiral.h b/examples/GFX_Aurora/PatternSpiral.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternSpiral.h
diff --git a/examples/GFX_Aurora/PatternSpiro.h b/examples/GFX_Aurora/PatternSpiro.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternSpiro.h
diff --git a/examples/GFX_Aurora/PatternSwirl.h b/examples/GFX_Aurora/PatternSwirl.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternSwirl.h
diff --git a/examples/GFX_Aurora/PatternWave.h b/examples/GFX_Aurora/PatternWave.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/PatternWave.h
diff --git a/examples/GFX_Aurora/README.md b/examples/GFX_Aurora/README.md
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/README.md
diff --git a/examples/GFX_Aurora/Vector.h b/examples/GFX_Aurora/Vector.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/Vector.h
diff --git a/examples/GFX_Aurora/attract b/examples/GFX_Aurora/attract
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/attract
diff --git a/examples/GFX_Aurora/bounce b/examples/GFX_Aurora/bounce
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/bounce
diff --git a/examples/GFX_Aurora/cube b/examples/GFX_Aurora/cube
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/cube
diff --git a/examples/GFX_Aurora/flock b/examples/GFX_Aurora/flock
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/flock
diff --git a/examples/GFX_Aurora/flowfield b/examples/GFX_Aurora/flowfield
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/flowfield
diff --git a/examples/GFX_Aurora/incrementaldrift b/examples/GFX_Aurora/incrementaldrift
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/incrementaldrift
diff --git a/examples/GFX_Aurora/incrementaldrift2 b/examples/GFX_Aurora/incrementaldrift2
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/incrementaldrift2
diff --git a/examples/GFX_Aurora/main.h b/examples/GFX_Aurora/main.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/main.h
diff --git a/examples/GFX_Aurora/matrix.h b/examples/GFX_Aurora/matrix.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/matrix.h
diff --git a/examples/GFX_Aurora/neomatrix_config.h b/examples/GFX_Aurora/neomatrix_config.h
@@ -0,0 +1 @@
+../neomatrix_config.h
diff --git a/examples/GFX_Aurora/pendulumwave b/examples/GFX_Aurora/pendulumwave
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/pendulumwave
diff --git a/examples/GFX_Aurora/radar b/examples/GFX_Aurora/radar
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/radar
diff --git a/examples/GFX_Aurora/spiral b/examples/GFX_Aurora/spiral
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/spiral
diff --git a/examples/GFX_Aurora/spiro b/examples/GFX_Aurora/spiro
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/spiro
diff --git a/examples/GFX_Aurora/swirl b/examples/GFX_Aurora/swirl
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/swirl
diff --git a/examples/GFX_Aurora/wave b/examples/GFX_Aurora/wave
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/wave
diff --git a/examples/GFX_FireWorks2/FireWorks2.ino b/examples/GFX_FireWorks2/FireWorks2.ino
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/FastLED/FireWorks2/FireWorks2.ino
diff --git a/examples/GFX_FireWorks2/Makefile b/examples/GFX_FireWorks2/Makefile
@@ -0,0 +1 @@
+../Makefile
diff --git a/examples/GFX_FireWorks2/neomatrix_config.h b/examples/GFX_FireWorks2/neomatrix_config.h
@@ -0,0 +1 @@
+../neomatrix_config.h
diff --git a/examples/GFX_Sublime_Demos/Makefile b/examples/GFX_Sublime_Demos/Makefile
@@ -0,0 +1 @@
+../Makefile
diff --git a/examples/GFX_Sublime_Demos/Sublime_Demos b/examples/GFX_Sublime_Demos/Sublime_Demos
diff --git a/examples/GFX_Sublime_Demos/Sublime_Demos.ino b/examples/GFX_Sublime_Demos/Sublime_Demos.ino
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/FastLED/Sublime_Demos/Sublime_Demos.ino
diff --git a/examples/GFX_Sublime_Demos/neomatrix_config.h b/examples/GFX_Sublime_Demos/neomatrix_config.h
@@ -0,0 +1 @@
+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/FastLED/Sublime_Demos/neomatrix_config.h
diff --git a/examples/Makefile b/examples/Makefile
@@ -0,0 +1,14 @@
+CUSTOM_LIBS := libraries
+
+ARDUINO_LIBS += SPI
+ARDUINO_LIBS += FastLED
+ARDUINO_LIBS += Framebuffer_GFX
+# 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
+ARDUINO_LIBS += FastLED_RPIRGBPanel_GFX
+ARDUINO_LIBS += Adafruit_GFX
+ARDUINO_LIBS += LEDMatrix
+
+BUILD_ROOT := build
+include ../../makeNativeArduino.mk
diff --git a/examples/neomatrix_config.h b/examples/neomatrix_config.h
@@ -0,0 +1 @@
+FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/neomatrix_config.h
diff --git a/libraries/FastLED b/libraries/FastLED
@@ -0,0 +1 @@
+Subproject commit 520a1bb0e99c611c697675e793bc0e66fd631fca
diff --git a/libraries/FastLED_RPIRGBPanel_GFX b/libraries/FastLED_RPIRGBPanel_GFX
@@ -0,0 +1 @@
+Subproject commit 2336e831c24792e7dec7910daace023004c2cf17
diff --git a/libraries/FastLED_TFTWrapper_GFX b/libraries/FastLED_TFTWrapper_GFX
@@ -0,0 +1 @@
+Subproject commit 08b769e4ee6d72e1babb2457d85c7d38681a9051
diff --git a/libraries/Framebuffer_GFX b/libraries/Framebuffer_GFX
@@ -0,0 +1 @@
+Subproject commit c084d99d07863d74f6c624a955cf20521154c0ff
diff --git a/libraries/LEDMatrix b/libraries/LEDMatrix
@@ -0,0 +1 @@
+Subproject commit 597ce703e924d45b2e676d6558c4c74a8ebc6991
diff --git a/makeNativeArduino.mk b/makeNativeArduino.mk
@@ -29,6 +29,8 @@ CXXFLAGS += -DARDUINOONPC
 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/
+LDFLAGS += -L$(NATIVE_ROOT)/rpi-rgb-led-matrix/lib -lrgbmatrix -lrt
 #LDFLAGS += $(shell sdl2-config --libs)
 
 DEPDIR := $(BUILD_ROOT)
@@ -46,6 +48,8 @@ endef
 
 INCLUDES += -I$(SKETCH_ROOT)
 INCLUDES += -I$(NATIVE_ROOT)/src/cores/arduino -I$(NATIVE_ROOT)/src/system
+# comment this out if you arne't using https://github.com/hzeller/rpi-rgb-led-matrix/
+INCLUDES += -I$(NATIVE_ROOT)/rpi-rgb-led-matrix/include
 $(eval $(call add_lib,$(NATIVE_ROOT)/src))
 
 $(foreach lib, $(ARDUINO_LIBS), $(eval $(call add_lib,$(NATIVE_ROOT)/libraries/$(lib))))
diff --git a/rpi-rgb-led-matrix b/rpi-rgb-led-matrix
@@ -0,0 +1 @@
+Subproject commit 74c5b126b253205351c53a11799992db7b104ffb
diff --git a/src/system/depreciated/posixWrapper.c b/src/system/depreciated/posixWrapper.c
diff --git a/src/system/depreciated/posixWrapper.h b/src/system/depreciated/posixWrapper.h
diff --git a/src/system/posixTime.c b/src/system/posixTime.c

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +*.o
 +*.a
 +*~
 +*.so
 +build
 +.*.swp
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../FastLED_NeoMatrix_SmartMatrix_LEDMatrix_GFX_Demos/GFX/Aurora/Attractor.h`