From a051ff03d416679f5e915172385f88587a18dc86 Mon Sep 17 00:00:00 2001 From: Ben Kuper Date: Tue, 27 Aug 2024 13:05:36 -0400 Subject: [PATCH] 2.0 stable --- BenTo.jucer | 2 +- Builds/LinuxMakefile/Makefile | 4 +- Builds/MacOSX/BenTo.xcodeproj/project.pbxproj | 4 +- Builds/MacOSX/Info-App.plist | 4 +- .../MacOSX_CI/BenTo.xcodeproj/project.pbxproj | 4 +- Builds/MacOSX_CI/Info-App.plist | 4 +- Builds/Raspberry/Makefile | 4 +- Builds/Raspberry64/Makefile | 4 +- Builds/VisualStudio2022_CI/BenTo_App.vcxproj | 8 +- Builds/VisualStudio2022_CI/resources.rc | 6 +- .../Bentuino/.vscode/c_cpp_properties.json | 97 ++++++++++--------- Firmware/Bentuino/platformio.ini | 28 +++++- .../components/ledstrip/FXComponent.cpp | 4 +- .../components/ledstrip/FXComponent.h | 5 +- .../layers/playback/LedStripPlaybackLayer.cpp | 7 +- .../layers/playback/LedStripPlaybackLayer.h | 2 + .../components/ledstrip/LedStripComponent.h | 5 +- JuceLibraryCode/JuceHeader.h | 2 +- 18 files changed, 120 insertions(+), 74 deletions(-) diff --git a/BenTo.jucer b/BenTo.jucer index cd628a47..46355748 100644 --- a/BenTo.jucer +++ b/BenTo.jucer @@ -1,7 +1,7 @@ diff --git a/Builds/LinuxMakefile/Makefile b/Builds/LinuxMakefile/Makefile index 685f84b0..833056c7 100644 --- a/Builds/LinuxMakefile/Makefile +++ b/Builds/LinuxMakefile/Makefile @@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -m64 endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=2.0.0b7" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=2.0.0" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := BenTo @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -m64 endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=2.0.0b7" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=2.0.0" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := BenTo diff --git a/Builds/MacOSX/BenTo.xcodeproj/project.pbxproj b/Builds/MacOSX/BenTo.xcodeproj/project.pbxproj index e4d42fa2..3c0f2fba 100644 --- a/Builds/MacOSX/BenTo.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/BenTo.xcodeproj/project.pbxproj @@ -1680,7 +1680,7 @@ "DEBUG=1", "FILMSTRO_USE_FFMPEG=0", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=2.0.0b7", + "JUCE_APP_VERSION=2.0.0", "JUCE_APP_VERSION_HEX=0x20000", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", @@ -1792,7 +1792,7 @@ "NDEBUG=1", "FILMSTRO_USE_FFMPEG=0", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=2.0.0b7", + "JUCE_APP_VERSION=2.0.0", "JUCE_APP_VERSION_HEX=0x20000", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", diff --git a/Builds/MacOSX/Info-App.plist b/Builds/MacOSX/Info-App.plist index 32ba9a2e..0c802ee3 100644 --- a/Builds/MacOSX/Info-App.plist +++ b/Builds/MacOSX/Info-App.plist @@ -23,9 +23,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 2.0.0b7 + 2.0.0 CFBundleVersion - 2.0.0b7 + 2.0.0 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/Builds/MacOSX_CI/BenTo.xcodeproj/project.pbxproj b/Builds/MacOSX_CI/BenTo.xcodeproj/project.pbxproj index 9431b093..b9a108a2 100644 --- a/Builds/MacOSX_CI/BenTo.xcodeproj/project.pbxproj +++ b/Builds/MacOSX_CI/BenTo.xcodeproj/project.pbxproj @@ -1729,7 +1729,7 @@ "FILMSTRO_USE_FFMPEG=0", "JUCE_COREGRAPHICS_DRAW_ASYNC=1", "JUCER_XCODE_MAC_2F3811D6=1", - "JUCE_APP_VERSION=2.0.0b7", + "JUCE_APP_VERSION=2.0.0", "JUCE_APP_VERSION_HEX=0x20000", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", @@ -1794,7 +1794,7 @@ "FILMSTRO_USE_FFMPEG=0", "JUCE_COREGRAPHICS_DRAW_ASYNC=1", "JUCER_XCODE_MAC_2F3811D6=1", - "JUCE_APP_VERSION=2.0.0b7", + "JUCE_APP_VERSION=2.0.0", "JUCE_APP_VERSION_HEX=0x20000", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", diff --git a/Builds/MacOSX_CI/Info-App.plist b/Builds/MacOSX_CI/Info-App.plist index c8bb7579..6dbf47d7 100644 --- a/Builds/MacOSX_CI/Info-App.plist +++ b/Builds/MacOSX_CI/Info-App.plist @@ -23,9 +23,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 2.0.0b7 + 2.0.0 CFBundleVersion - 2.0.0b7 + 2.0.0 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/Builds/Raspberry/Makefile b/Builds/Raspberry/Makefile index dfd03def..f349b1a1 100644 --- a/Builds/Raspberry/Makefile +++ b/Builds/Raspberry/Makefile @@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=armv8-a endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=2.0.0b7" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I/usr/include/freetype2 -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=2.0.0" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I/usr/include/freetype2 -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := BenTo @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=armv8-a endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=2.0.0b7" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I/usr/include/freetype2 -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=2.0.0" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I/usr/include/freetype2 -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := BenTo diff --git a/Builds/Raspberry64/Makefile b/Builds/Raspberry64/Makefile index 439aeb73..968b99b9 100644 --- a/Builds/Raspberry64/Makefile +++ b/Builds/Raspberry64/Makefile @@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=2.0.0b7" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I/usr/include/freetype2 -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=2.0.0" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I/usr/include/freetype2 -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := BenTo @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=2.0.0b7" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I/usr/include/freetype2 -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DFILMSTRO_USE_FFMPEG=0" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=2.0.0" "-DJUCE_APP_VERSION_HEX=0x20000" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../Modules -I../../JUCE/modules -I/usr/include/freetype2 -I../../Source -I../../External/asio -I../../External/serial/include -I../../External/servus/include -I../../External/ffmpeg/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := BenTo diff --git a/Builds/VisualStudio2022_CI/BenTo_App.vcxproj b/Builds/VisualStudio2022_CI/BenTo_App.vcxproj index 28f700ba..bf407a50 100644 --- a/Builds/VisualStudio2022_CI/BenTo_App.vcxproj +++ b/Builds/VisualStudio2022_CI/BenTo_App.vcxproj @@ -66,7 +66,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\Modules;..\..\JUCE\modules;D:\Softwares\JUCE\modules;../../Source;../../External/asio;../../External/serial/include;../../External/servus/include;../../External/ffmpeg/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=2.0.0b7;JUCE_APP_VERSION_HEX=0x20000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=2.0.0;JUCE_APP_VERSION_HEX=0x20000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -80,7 +80,7 @@ ..\..\JuceLibraryCode;..\..\Modules;..\..\JUCE\modules;D:\Softwares\JUCE\modules;../../Source;../../External/asio;../../External/serial/include;../../External/servus/include;../../External/ffmpeg/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=2.0.0b7;JUCE_APP_VERSION_HEX=0x20000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=2.0.0;JUCE_APP_VERSION_HEX=0x20000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\BenTo.exe @@ -114,7 +114,7 @@ Full None ..\..\JuceLibraryCode;..\..\Modules;..\..\JUCE\modules;D:\Softwares\JUCE\modules;../../Source;../../External/asio;../../External/serial/include;../../External/servus/include;../../External/ffmpeg/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=2.0.0b7;JUCE_APP_VERSION_HEX=0x20000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=2.0.0;JUCE_APP_VERSION_HEX=0x20000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDLL true NotUsing @@ -128,7 +128,7 @@ ..\..\JuceLibraryCode;..\..\Modules;..\..\JUCE\modules;D:\Softwares\JUCE\modules;../../Source;../../External/asio;../../External/serial/include;../../External/servus/include;../../External/ffmpeg/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=2.0.0b7;JUCE_APP_VERSION_HEX=0x20000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=2.0.0;JUCE_APP_VERSION_HEX=0x20000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\BenTo.exe diff --git a/Builds/VisualStudio2022_CI/resources.rc b/Builds/VisualStudio2022_CI/resources.rc index 1d0341b4..8834a99b 100644 --- a/Builds/VisualStudio2022_CI/resources.rc +++ b/Builds/VisualStudio2022_CI/resources.rc @@ -9,16 +9,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,0,0b7,0 +FILEVERSION 2,0,0,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "BenTo\0" - VALUE "FileVersion", "2.0.0b7\0" + VALUE "FileVersion", "2.0.0\0" VALUE "ProductName", "BenTo\0" - VALUE "ProductVersion", "2.0.0b7\0" + VALUE "ProductVersion", "2.0.0\0" END END diff --git a/Firmware/Bentuino/.vscode/c_cpp_properties.json b/Firmware/Bentuino/.vscode/c_cpp_properties.json index bf96572c..c086497f 100644 --- a/Firmware/Bentuino/.vscode/c_cpp_properties.json +++ b/Firmware/Bentuino/.vscode/c_cpp_properties.json @@ -11,33 +11,33 @@ "D:/Projects/Dev/BenTo/Firmware/Bentuino/include", "D:/Projects/Dev/BenTo/Firmware/Bentuino/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/SD_MMC/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/FastAccelStepper/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/WebSockets/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/FastAccelStepper/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/WebSockets/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/WiFiClientSecure/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/Ethernet/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/ESP Async WebServer/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/AsyncTCP/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/ArtnetWifi/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/ESP32Servo/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/SimplexNoise", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Wasm3/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/arduino-timer/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit DotStar", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/ESP Async WebServer/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/AsyncTCP/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/ArtnetWifi/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/ESP32Servo/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/SimplexNoise", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Wasm3/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/arduino-timer/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit DotStar", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/OSC", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/OSC", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/SD/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/SPIFFS/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/ArduinoJson/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/ArduinoJson/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/Preferences/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit BNO055", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit BNO055/utility", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit Unified Sensor", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit BusIO", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit BNO055", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit BNO055/utility", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit Unified Sensor", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit BusIO", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/SPI/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit NeoPixel", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit NeoPixel", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/newlib/platform_include", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/freertos/include", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/freertos/include/esp_additions/freertos", @@ -264,33 +264,33 @@ "D:/Projects/Dev/BenTo/Firmware/Bentuino/include", "D:/Projects/Dev/BenTo/Firmware/Bentuino/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/SD_MMC/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/FastAccelStepper/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/WebSockets/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/FastAccelStepper/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/WebSockets/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/WiFiClientSecure/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/Ethernet/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/ESP Async WebServer/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/AsyncTCP/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/ArtnetWifi/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/ESP32Servo/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/SimplexNoise", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Wasm3/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/arduino-timer/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit DotStar", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/ESP Async WebServer/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/AsyncTCP/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/ArtnetWifi/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/ESP32Servo/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/SimplexNoise", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Wasm3/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/arduino-timer/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit DotStar", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/OSC", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/OSC", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/SD/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/SPIFFS/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/ArduinoJson/src", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/ArduinoJson/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/Preferences/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit BNO055", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit BNO055/utility", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit Unified Sensor", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit BusIO", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit BNO055", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit BNO055/utility", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit Unified Sensor", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit BusIO", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/SPI/src", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src", - "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/phonetuino/Adafruit NeoPixel", + "D:/Projects/Dev/BenTo/Firmware/Bentuino/.pio/libdeps/generic/Adafruit NeoPixel", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/newlib/platform_include", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/freertos/include", "C:/Users/bkupe/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/freertos/include/esp_additions/freertos", @@ -514,7 +514,7 @@ }, "defines": [ "PLATFORMIO=60115", - "ARDUINO_FEATHER_ESP32", + "ARDUINO_ESP32_DEV", "ARDUINO_BENTUINO", "USE_SERIAL", "USE_SERVER", @@ -524,15 +524,24 @@ "CONFIG_ASYNC_TCP_USE_WDT=0", "USE_WIFI", "USE_OSC", + "BENTUINO_GENERIC", "USE_IO", - "IO_MAX_COUNT=6", - "USE_POWER", - "POWER_KEEP_PIN=12", - "POWER_WAKEUP_BUTTON=36", - "POWER_WAKEUP_BUTTON_STATE=true", - "USE_BUTTON", - "BUTTON_MAX_COUNT=4", - "BUTTON_DEFAULT_PIN=36", + "IO_MAX_COUNT=4", + "IO_DEFAULT_PIN=35", + "IO_DEFAULT_MODE=IOComponent::PinMode::A_INPUT", + "USE_LEDSTRIP", + "USE_STREAMING", + "LEDSTRIP_MAX_COUNT=1", + "LED_DEFAULT_EN_PIN=27", + "LED_DEFAULT_DATA_PIN=33", + "LED_DEFAULT_CLK_PIN=-1", + "LED_DEFAULT_COUNT=32", + "LED_MAX_COUNT=1000", + "LED_DEFAULT_TYPE=WS2812B", + "LED_DEFAULT_COLOR_ORDER=GRB", + "LED_DEFAULT_INVERT_DIRECTION=false", + "LED_DEFAULT_BRIGHTNESS=0.5f", + "LED_MAX_BRIGHTNESS=0.4f", "HAVE_CONFIG_H", "MBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\"", "UNITY_INCLUDE_CONFIG_H", @@ -546,7 +555,7 @@ "F_CPU=240000000L", "ARDUINO=10812", "ARDUINO_VARIANT=\"esp32\"", - "ARDUINO_BOARD=\"Adafruit ESP32 Feather\"", + "ARDUINO_BOARD=\"Espressif ESP32 Dev Module\"", "ARDUINO_PARTITION_huge_app", "" ], diff --git a/Firmware/Bentuino/platformio.ini b/Firmware/Bentuino/platformio.ini index de5ad682..637e36d4 100644 --- a/Firmware/Bentuino/platformio.ini +++ b/Firmware/Bentuino/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = phonetuino +default_envs = generic [bentuino] platform = espressif32@~5.0.0 @@ -62,6 +62,30 @@ build_flags = -D USE_WIFI -D USE_OSC + +[env:generic] +extends = bentuino +build_flags = + ${bentuino.build_flags} + -D BENTUINO_GENERIC + -D USE_IO + -D IO_MAX_COUNT=4 + -D IO_DEFAULT_PIN=35 + -D IO_DEFAULT_MODE=IOComponent::PinMode::A_INPUT + -D USE_LEDSTRIP + -D USE_STREAMING + -D LEDSTRIP_MAX_COUNT=1 + -D LED_DEFAULT_EN_PIN=27 + -D LED_DEFAULT_DATA_PIN=33 + -D LED_DEFAULT_CLK_PIN=-1 + -D LED_DEFAULT_COUNT=80 + -D LED_MAX_COUNT=1000 + -D LED_DEFAULT_TYPE=WS2812B + -D LED_DEFAULT_COLOR_ORDER=GRB + -D LED_DEFAULT_INVERT_DIRECTION=false + -D LED_DEFAULT_BRIGHTNESS=0.5f + -D LED_MAX_BRIGHTNESS=0.4f + [env:creatorclub] extends = bentuino build_flags = @@ -296,7 +320,7 @@ board = featheresp32 build_flags = ${bentuino.build_flags} -D USE_IO - -D IO_MAX_COUNT=6 + -D IO_MAX_COUNT=8 -D USE_POWER -D POWER_KEEP_PIN=12 -D POWER_WAKEUP_BUTTON=36 diff --git a/Firmware/Bentuino/src/Component/components/ledstrip/FXComponent.cpp b/Firmware/Bentuino/src/Component/components/ledstrip/FXComponent.cpp index 473411ef..7306f76d 100644 --- a/Firmware/Bentuino/src/Component/components/ledstrip/FXComponent.cpp +++ b/Firmware/Bentuino/src/Component/components/ledstrip/FXComponent.cpp @@ -1,4 +1,5 @@ +#ifdef USE_FX #ifndef FX_SWAP_UPSIDE_DOWN #define FX_SWAP_UPSIDE_DOWN 0 #endif @@ -138,4 +139,5 @@ void FXComponent::reset() SetParam(staticOffset, 0); SetParam(offsetSpeed, 0); SetParam(isolationSpeed, 0); -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Firmware/Bentuino/src/Component/components/ledstrip/FXComponent.h b/Firmware/Bentuino/src/Component/components/ledstrip/FXComponent.h index 40ed6204..d1a4a751 100644 --- a/Firmware/Bentuino/src/Component/components/ledstrip/FXComponent.h +++ b/Firmware/Bentuino/src/Component/components/ledstrip/FXComponent.h @@ -1,3 +1,4 @@ +#ifdef USE_FX class FXComponent : public Component { public: @@ -79,4 +80,6 @@ class FXComponent : public Component FillOSCQueryInternalEnd; String getTypeString() const override { return "fx"; } -}; \ No newline at end of file +}; + +#endif \ No newline at end of file diff --git a/Firmware/Bentuino/src/Component/components/ledstrip/Layer/layers/playback/LedStripPlaybackLayer.cpp b/Firmware/Bentuino/src/Component/components/ledstrip/Layer/layers/playback/LedStripPlaybackLayer.cpp index b713495a..a56ca9a1 100644 --- a/Firmware/Bentuino/src/Component/components/ledstrip/Layer/layers/playback/LedStripPlaybackLayer.cpp +++ b/Firmware/Bentuino/src/Component/components/ledstrip/Layer/layers/playback/LedStripPlaybackLayer.cpp @@ -21,7 +21,10 @@ bool LedStripPlaybackLayer::initInternal(JsonObject o) prevTimeMs = 0; timeSinceLastSeek = 0; timeToSeek = 0; + +#ifdef USE_SCRIPT activeScriptIndex = -1; +#endif return true; } @@ -291,8 +294,10 @@ void LedStripPlaybackLayer::stop() isPlaying = false; curTimeMs = 0; prevTimeMs = 0; - // showBlackFrame(); +// showBlackFrame(); +#ifdef USE_SCRIPT activeScriptIndex = -1; +#endif sendEvent(Stopped); } diff --git a/Firmware/Bentuino/src/Component/components/ledstrip/Layer/layers/playback/LedStripPlaybackLayer.h b/Firmware/Bentuino/src/Component/components/ledstrip/Layer/layers/playback/LedStripPlaybackLayer.h index c5014436..cba71a35 100644 --- a/Firmware/Bentuino/src/Component/components/ledstrip/Layer/layers/playback/LedStripPlaybackLayer.h +++ b/Firmware/Bentuino/src/Component/components/ledstrip/Layer/layers/playback/LedStripPlaybackLayer.h @@ -30,11 +30,13 @@ class LedStripPlaybackLayer : public LedStripLayer long timeSinceLastSeek; float timeToSeek; // used to limit seeking +#ifdef USE_SCRIPTS int numScripts; String scripts[PLAYBACK_MAX_SCRIPTS]; float scriptStartTimes[PLAYBACK_MAX_SCRIPTS]; float scriptEndTimes[PLAYBACK_MAX_SCRIPTS]; int activeScriptIndex; +#endif bool initInternal(JsonObject o) override; void updateInternal() override; diff --git a/Firmware/Bentuino/src/Component/components/ledstrip/LedStripComponent.h b/Firmware/Bentuino/src/Component/components/ledstrip/LedStripComponent.h index f57746e6..12680c76 100644 --- a/Firmware/Bentuino/src/Component/components/ledstrip/LedStripComponent.h +++ b/Firmware/Bentuino/src/Component/components/ledstrip/LedStripComponent.h @@ -37,8 +37,10 @@ class LedStripComponent : public Component , systemLayer(this) #endif +#ifdef USE_FX , fx(this) +#endif { } @@ -178,7 +180,6 @@ DeclareScriptFunctionReturn1(LedStripManagerComponent, get, uint32_t, uint32_t) DeclareScriptFunctionVoid3(LedStripManagerComponent, setBlendMode, uint32_t, uint32_t, uint32_t) { return items[0]->userLayers[(int)arg2]->setBlendMode((LedStripLayer::BlendMode)arg3); } #endif -void addItemInternal(int index){}; - +void addItemInternal(int index) {}; EndDeclareComponent \ No newline at end of file diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h index 673db1bb..5ed1c6c2 100644 --- a/JuceLibraryCode/JuceHeader.h +++ b/JuceLibraryCode/JuceHeader.h @@ -60,7 +60,7 @@ namespace ProjectInfo { const char* const projectName = "BenTo"; const char* const companyName = ""; - const char* const versionString = "2.0.0b7"; + const char* const versionString = "2.0.0"; const int versionNumber = 0x20000; } #endif