Merge pull request #27 from Unreal-Dan/daniel/restructure

Daniel/restructure
OpenSourceLightshows · Jan 20, 2024 · f26b7c8 · f26b7c8
2 parents dd80a4b + f45aac3
commit f26b7c8
Show file tree

Hide file tree

Showing 35 changed files with 8 additions and 385 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,8 +38,10 @@ jobs:
           python-version: '3.x'
       - name: Install Dependencies
         run: make install
+        working-directory: HeliosEmbedded
       - name: Build Binary
         run: make build
+        working-directory: HeliosEmbedded
       - name: Archive production artifacts
         uses: actions/upload-artifact@v3
         with:

diff --git a/Button.cpp → Helios/Button.cpp b/Button.cpp → Helios/Button.cpp
diff --git a/Button.h → Helios/Button.h b/Button.h → Helios/Button.h
diff --git a/ColorConstants.h → Helios/ColorConstants.h b/ColorConstants.h → Helios/ColorConstants.h
diff --git a/Colorset.cpp → Helios/Colorset.cpp b/Colorset.cpp → Helios/Colorset.cpp
diff --git a/Colorset.h → Helios/Colorset.h b/Colorset.h → Helios/Colorset.h
diff --git a/Colortypes.cpp → Helios/Colortypes.cpp b/Colortypes.cpp → Helios/Colortypes.cpp
diff --git a/Colortypes.h → Helios/Colortypes.h b/Colortypes.h → Helios/Colortypes.h
diff --git a/Helios.cpp → Helios/Helios.cpp b/Helios.cpp → Helios/Helios.cpp
diff --git a/Helios.h → Helios/Helios.h b/Helios.h → Helios/Helios.h
diff --git a/HeliosConfig.h → Helios/HeliosConfig.h b/HeliosConfig.h → Helios/HeliosConfig.h
diff --git a/Led.cpp → Helios/Led.cpp b/Led.cpp → Helios/Led.cpp
diff --git a/Led.h → Helios/Led.h b/Led.h → Helios/Led.h
diff --git a/Pattern.cpp → Helios/Pattern.cpp b/Pattern.cpp → Helios/Pattern.cpp
diff --git a/Pattern.h → Helios/Pattern.h b/Pattern.h → Helios/Pattern.h
diff --git a/Patterns.cpp → Helios/Patterns.cpp b/Patterns.cpp → Helios/Patterns.cpp
diff --git a/Patterns.h → Helios/Patterns.h b/Patterns.h → Helios/Patterns.h
diff --git a/Random.cpp → Helios/Random.cpp b/Random.cpp → Helios/Random.cpp
diff --git a/Random.h → Helios/Random.h b/Random.h → Helios/Random.h
diff --git a/Storage.cpp → Helios/Storage.cpp b/Storage.cpp → Helios/Storage.cpp
diff --git a/Storage.h → Helios/Storage.h b/Storage.h → Helios/Storage.h
diff --git a/TimeControl.cpp → Helios/TimeControl.cpp b/TimeControl.cpp → Helios/TimeControl.cpp
diff --git a/TimeControl.h → Helios/TimeControl.h b/TimeControl.h → Helios/TimeControl.h
diff --git a/Timer.cpp → Helios/Timer.cpp b/Timer.cpp → Helios/Timer.cpp
diff --git a/Timer.h → Helios/Timer.h b/Timer.h → Helios/Timer.h
diff --git a/Timings.h → Helios/Timings.h b/Timings.h → Helios/Timings.h
diff --git a/HeliosCLI/Makefile b/HeliosCLI/Makefile
@@ -20,7 +20,7 @@ DEFINES=\
 
 # compiler include paths
 INCLUDES=\
-	-I ../ \
+	-I ../Helios \
 
 # only set them if they're not empty to prevent unnecessary whitespace
 ifneq ($(DEFINES),)
@@ -48,9 +48,9 @@ LIBS=\
 # source files
 # local source files first, other sources after
 ifeq ($(OS),Windows_NT)
-    SRC = $(shell find ../ -type f -name \\*.cpp) 
+    SRC = $(shell find ../Helios -type f -name \\*.cpp) cli_main.cpp
 else
-    SRC = $(shell find ../ -type f -name '*.cpp') 
+    SRC = $(shell find ../Helios -type f -name '*.cpp') cli_main.cpp
 endif
 
 # object files are source files with .c replaced with .o

diff --git a/Makefile → HeliosEmbedded/Makefile b/Makefile → HeliosEmbedded/Makefile
@@ -88,17 +88,17 @@ endif
 
 INCLUDES=\
 	-I $(INCLUDE_DIR) \
-	-I ./
+	-I ../Helios
 
 CFLAGS+=$(INCLUDES)
 
 # Source files
 ifeq ($(OS),Windows_NT) # Windows
 SRCS = \
-       $(shell find . -maxdepth 1 -type f -name '\*.cpp')
+       $(shell find ../Helios -maxdepth 1 -type f -name '\*.cpp') main.cpp
 else # linux
 SRCS = \
-       $(shell find . -maxdepth 1 -type f -name \*.cpp)
+       $(shell find ../Helios -maxdepth 1 -type f -name \*.cpp) main.cpp
 endif
 
 OBJS = $(SRCS:.cpp=.o)

diff --git a/avrdude.conf → HeliosEmbedded/avrdude.conf b/avrdude.conf → HeliosEmbedded/avrdude.conf
diff --git a/avrsize.sh → HeliosEmbedded/avrsize.sh b/avrsize.sh → HeliosEmbedded/avrsize.sh
diff --git a/main.cpp → HeliosEmbedded/main.cpp b/main.cpp → HeliosEmbedded/main.cpp
diff --git a/HeliosVortex.atsln b/HeliosVortex.atsln
diff --git a/HeliosVortex.componentinfo.xml b/HeliosVortex.componentinfo.xml