Merge branch 'smeighan:master' into master

OnlineDynamic · Dec 11, 2023 · 0a2cfd8 · 0a2cfd8
2 parents e4a6779 + 951c282
commit 0a2cfd8
Show file tree

Hide file tree

Showing 191 changed files with 10,402 additions and 4,296 deletions.
diff --git a/.github/workflows/Ubuntu_CI.yml b/.github/workflows/Ubuntu_CI.yml
@@ -60,7 +60,7 @@ jobs:
       with:
           submodules: 'true'
     - name: Install dependencies
-      run: sudo apt-get update && sudo apt-get install g++ gcc build-essential libgtk-3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev freeglut3-dev libavcodec-dev libavformat-dev libswscale-dev libsdl2-dev libswresample-dev libavutil-dev libavresample-dev libportmidi-dev libzstd-dev libcurl4-openssl-dev libltc-dev liblua5.3-dev wget git cbp2make
+      run: sudo apt-get update && sudo apt-get install g++ gcc build-essential libgtk-3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev freeglut3-dev libavcodec-dev libavformat-dev libswscale-dev libsdl2-dev libswresample-dev libavutil-dev libavresample-dev libportmidi-dev libzstd-dev libwebp-dev libcurl4-openssl-dev libltc-dev liblua5.3-dev wget git cbp2make
     - name: Make
       run: make -j 2
 
diff --git a/.github/workflows/Ubuntu_Window_Release.yml b/.github/workflows/Ubuntu_Window_Release.yml
@@ -14,8 +14,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'true'
-      - run: docker pull debenham/xlights
-      - run: docker run --name buildvm debenham/xlights /bin/bash Recipe.appimage
+      - run: docker pull ghcr.io/xlightssequencer/xlights-build-docker:master
+      - run: docker run --name buildvm ghcr.io/xlightssequencer/xlights-build-docker /bin/bash Recipe.appimage
       - run: 'docker cp buildvm:/xLights/xLights/AppImage/ /tmp/'
       - run: ls -lh /tmp/AppImage
 

diff --git a/.github/workflows/docker_manual.yml b/.github/workflows/docker_manual.yml
@@ -10,8 +10,8 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'true'
-      - run: docker pull debenham/xlights
-      - run: docker run --name buildvm debenham/xlights /bin/bash Recipe.appimage
+      - run: docker pull ghcr.io/xlightssequencer/xlights-build-docker:master
+      - run: docker run --name buildvm ghcr.io/xlightssequencer/xlights-build-docker:master /bin/bash Recipe.appimage
       - run: 'docker cp buildvm:/xLights/xLights/AppImage/ /tmp/'
       - run: ls -lh /tmp/AppImage
 

diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,8 @@ services:
 git:
   depth: 3
 script:
-  - docker pull debenham/xlights
-  - docker run --name buildvm debenham/xlights /bin/bash Recipe.appimage
+  - docker pull docker pull ghcr.io/xlightssequencer/xlights-build-docker:master
+  - docker run --name buildvm ghcr.io/xlightssequencer/xlights-build-docker /bin/bash Recipe.appimage
 after_success:
   - docker cp buildvm:/xLights/xLights/AppImage/ /tmp/
   - ls -lh /tmp/*

diff --git a/README.linux b/README.linux
@@ -65,11 +65,12 @@ Instructions for other Linux distributions will vary.
      libcurl4-openssl-dev
      libltc-dev
      liblua5.3-dev
+     libwebp-dev
      cbp2make (optional but recommended if compiling from git)
 
      Example command to install packages on Ubuntu
 
-     sudo apt-get install g++ gcc build-essential libgtk-3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev freeglut3-dev libavcodec-dev libavformat-dev libswscale-dev libsdl2-dev libavutil-dev libportmidi-dev libzstd-dev libcurl4-openssl-dev libltc-dev liblua5.3-dev wget git cbp2make
+     sudo apt-get install g++ gcc build-essential libgtk-3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev freeglut3-dev libavcodec-dev libavformat-dev libswscale-dev libsdl2-dev libavutil-dev libportmidi-dev libzstd-dev libwebp-dev libcurl4-openssl-dev libltc-dev liblua5.3-dev wget git cbp2make
 
      Example commands to install packages on Fedora 38
 
@@ -88,7 +89,7 @@ Instructions for other Linux distributions will vary.
     Install other packages:
 
      sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-     sudo dnf install gcc-c++ gtk3-devel gstreamer1-devel gstreamer1-plugins-base-devel freeglut-devel gstreamer1-plugins-bad-free-devel ffmpeg-devel SDL2-devel portmidi-devel libzstd-devel curl-devel libltc-devel lua-devel
+     sudo dnf install gcc-c++ gtk3-devel gstreamer1-devel gstreamer1-plugins-base-devel freeglut-devel gstreamer1-plugins-bad-free-devel ffmpeg-devel SDL2-devel portmidi-devel libzstd-devel libwebp-devel curl-devel libltc-devel lua-devel
 
      Note: newer versions of libportmidi combined the .so files. Easiest workaround is to add a sym link to the combine .so file:
         sudo ln -s /usr/lib64/libportmidi.so /usr/lib64/libporttime.so

diff --git a/README.txt b/README.txt
@@ -11,6 +11,83 @@ Issue Tracker is found here: www.github.com/smeighan/xLights/issues
 
 XLIGHTS/NUTCRACKER RELEASE NOTES
 ---------------------------------
+   -- bug (scott)     Fix Import Dialog Groups Blue turning white.
+2023.22 Dec 5, 2023
+   -- enh (claudio)   Add virtual matrix to xSchedule using RGBW data
+   -- enh (lutz)      Add palette shift buttons
+   -- enh (scott)     Add cycles and scale to ripple effect
+   -- enh (scott)     Add set smart remote and increment to visualiser
+   -- enh (scott)     Add importing submodels as states
+   -- enh (scott)     Add more controller connection property setting to the visualiser
+   -- enh (keith)     Show progress in batch render including number left to render
+   -- enh (keith)     Add model aliases used to improve automap and handling opening sequences with model names that have changed
+   -- enh (keith)     Add an adjust effect - primarily for use on DMX effects to modify results without changing the underlying effects
+   -- enh (keith)     Add support for non-zig zagging trees with multiple strands but one string
+   -- enh (dartunder) Add bulk edit to clear shadow models
+   -- bug (dartunder) Fix 3 point model dimensions incorrect
+   -- bug (keith)     Fix Falcon V4 upload without full xlights control should not override port brightness
+   -- bug (keith)     Fix layout model locking menu items inconsistently available
+   -- bug (keith)     Fix Falcon V4/V5 reversed not uploading correctly
+   -- bug (keith)     Fix click on import effect count column does not sort by effect count
+   -- bug (keith)     Fix servo effect incompletely resets parameters
+   -- bug (keith)     Fix Eseq playback on xSchedule
+   -- bug (keith)     Fix default superstring to RGB handling
+   -- bug (scott)     Fix FPP compatible audio file types incomplete
+   -- bug (scott)     Fix missing bulk edit from some face effect properties
+   -- bug (dkulp)     Fix 4GB+ uncompressed FSEQ files
+   -- bug (dkulp)     Fix crash on player only controllers
+   -- bug (dkulp)     Fix OSX font crash
+2023.21 Nov 25, 2023
+   -- enh (dkulp) Allow upload of config to inactive controllers
+   -- enh (scott) Add More Right Click Options to Multi-Controller Upload, Save/Load Selected
+   -- enh (scott) FPP Connect - Add Falcon V5 Support
+   -- enh (keith) Downgrade sketch effect image missing to warning and allow suppression of the warning in preferences.
+   -- enh (scott) FPP Connect - add Genius FSEQ upload
+   -- bug (dkulp) FPP Connect - fix crash with discovery/fpp connect if "Player Only" controller configured
+   -- bug (billnapier) Remove invisible unicode character in AlphxPix 4 settings
+   -- bug (dkulp) Fix Faces on models from Base show directory will always trigger the "dirty" flag
+   -- bug (keith) Fix copy on empty cell overwrites clipboard
+   -- bug (dkulp) Retry FSEQ upload on errors (up to three times)
+   -- bug (scott) HinkxPix won't allow assignment to smart receiver 3-9
+   -- bug (dartunder) Fix face blink effect
+   -- bug (keith) Fix eyes closed not mapping correctly
+   -- bug (keith) Fix PixLite config retrieval
+2023.20 Nov 15, 2023
+   -- enh (scott) FPP Connect - Remove ancient FPP 1.x upload via mounted USB
+   -- enh (scott) FPP Connect - Add ability to upload Proxy Controller IPs
+   -- enh (MrPierreB) Selectively Offset parameters on remap of dmx channels
+   -- enh (keith) Add a quick way to make a block of ports a dumb receiver
+   -- enh (kylegrymonprez)  Adding ability to adjust the frequency of the "Auto" eye blink
+   -- enh (degracode ) Allow the Setup tab's Activate, Activate in xLights, Deactivate, and Unlink From Base menu items to be used when multiple controllers are selected
+   -- enh (keith) Add option to remove placeholders from submodels
+   -- enh (scott) Make ModelChainDialog growable
+   -- enh (dartunder) Show fpp connect results in status bar
+   -- bug (djulien) Allow Preview to be selected when showing 3D models
+   -- bug (dartunder) Fix delete warning for locked models, delete all models including locked after confirmation dialog.
+   -- bug (dkulp) FPP String upload: don't upload "DUMMY" entries
+   -- bug (keith) Show smart remotes as 0-15 on HinksPix
+   -- bug (dartunder) Fix undo for replace model command
+   -- bug (scott) Fix alphapix upload
+   -- bug (keith) Fix crash in Check Sequence in liquid effect
+2023.19 Nov 4, 2023
+   -- enh (keith) Add webp image support
+   -- enh (dartunder) Add warning and make it easier to see that a model had a shadow model in visualizer
+   -- bug (Daniel Hacquebord) Fix dark mode for shadow models in visualizer
+   -- bug (scott) Fix AlphaPix upload
+   -- bug (keith) Fix crash with liquid effect on large models
+   -- bug (scott) LUA Script: Select Sequences and deselect highlighted does nothing
+   -- bug (dkulp) FPP Connect: not uploading serial outputs from FPP Connect (worked fine from controller page)
+   -- bug (dkulp) FPP Connect: not able to upload to FPP instances with UI password set
+   -- bug (dkulp) Fix crash on MacOS with RotoZoom if GPU is busy
+   -- bug (dkulp) Workaround some other common crashes, but underlying cause of crash still under investigation
+2023.18 Oct 21, 2023
+   -- enh (dkulp) FPP Connect - query and media in parallel
+   -- bug (scott) Custom Model Export - Export Default Render Buffer as Submodel
+   -- bug (scott) Fix Submodel Dialog Sizing Issues
+   -- bug (dartunder) FPP upload - fix e1.31 priority not being set if universes are all the same size
+   -- bug (scott) HinksPix - fix folder and filter selector
+   -- bug (dkulp) FPP Connect - attempt to fix some FPP Connect issues by remove "Expect: Continue" headers
+   -- bug (robfallone) Fix OpenGL crash on startup with some mesh objects
 2023.17 Oct 16, 2023
    -- enh (dkulp) Add monitor attribute for controllers, FPP upload of co-universes will set priority/monitoring/deDup settings
    -- enh (Kyle Grymonprez) Add Node Count to model tooltips

diff --git a/build_scripts/msw/xLights_common.iss b/build_scripts/msw/xLights_common.iss
@@ -3,5 +3,5 @@
 
 #define MyTitleName "xLights" 
 #define Year 2023
-#define Version 17
+#define Version 22
 #define Other ""
diff --git a/controllers/fpp.xcontroller b/controllers/fpp.xcontroller
@@ -229,6 +229,7 @@
         <Variant Name="24 Output DPI" ID="DPIPixels-24" Base="FPP:FPPStringDPIPiHat">
             <MaxPixelPort>24</MaxPixelPort>
             <MaxSerialPort>1</MaxSerialPort>
+            <SupportsVirtualMatrix/>
             <SupportsLEDPanelMatrix/>
             <fppSerialPort1>ttyAMA0</fppSerialPort1>
         </Variant>

diff --git a/controllers/holidaycoro.xcontroller b/controllers/holidaycoro.xcontroller
@@ -10,7 +10,7 @@
 			<MaxPixelPort>4</MaxPixelPort>
 			<MaxSerialPort>1</MaxSerialPort>
 			<MaxSerialPortChannels>512</MaxSerialPortChannels>
-			<MaxPixelPortChannels>2040‬</MaxPixelPortChannels>
+			<MaxPixelPortChannels>2040</MaxPixelPortChannels>
 			<AllInputUniversesMustBeSameSize/>
             <NeedsFullUniverseForSerial/>
 			<SupportsAutoLayout/>

diff --git a/controllers/scott.xcontroller b/controllers/scott.xcontroller
@@ -10,6 +10,13 @@
             <fpp>1</fpp>
             <fpp1>17,16</fpp1>
         </Variant>
+        <Variant Name="PI W" ID="PB16_2_PI" Base="FPP:FPPStringDPIPiHat">
+            <MaxPixelPort>16</MaxPixelPort>
+            <MaxSerialPort>1</MaxSerialPort>ttyS1
+            <fppSerialPort1>ttyS1</fppSerialPort1>
+            <fpp>1</fpp>
+            <fpp1>17,-1</fpp1>
+        </Variant>
     </Controller>
     <Controller Name="PB16v2">
         <Variant Name="No Expansion" ID="PB16v2" Base="FPP:FPPStringCapeTTYs">
@@ -28,6 +35,14 @@
             <fppSerialPort1>ttyS1</fppSerialPort1>
             <fppSerialPort2>ttyS2</fppSerialPort2>
         </Variant>
+        <Variant Name="PI W" ID="PB16v2_2_PI" Base="FPP:FPPStringDPIPiHat">
+            <MaxPixelPort>20</MaxPixelPort>
+            <MaxSerialPort>1</MaxSerialPort>ttyS1
+            <fppSerialPort1>ttyS1</fppSerialPort1>
+            <fpp>1</fpp>
+            <fpp1>17,4</fpp1>
+            <fpp2>21,-1</fpp2>
+        </Variant>
     </Controller>
     <Controller Name="BBB16">
         <Variant Name="No Expansion" ID="BBB16" Base="FPP:FPPStringCapeTTYs">
@@ -87,4 +102,49 @@
             <fppSerialPort2>ttyS2</fppSerialPort2>
         </Variant>
     </Controller>
+    <Controller Name="PB8DMX">
+        <Variant Name="" ID="PB8DMX" Base="FPP:FPPStringCape">
+            <MaxPixelPort>0</MaxPixelPort>
+            <MaxSerialPort>8</MaxSerialPort>
+        </Variant>
+    </Controller>
+    <Controller Name="Pi_Zero_W_16">
+        <Variant Name="" ID="Pi_Zero_W_16" Base="FPP:FPPStringDPIPiHat">
+            <MaxPixelPort>24</MaxPixelPort>
+            <MaxSerialPort>0</MaxSerialPort>
+            <fpp>1</fpp>
+            <fpp1>17,4</fpp1>
+            <fpp2>21,4</fpp2>
+            <fpp3>25,-1</fpp3>
+        </Variant>
+    </Controller>
+    <Controller Name="Pi_Zero_24_Diff">
+        <Variant Name="" ID="Pi_Zero_24_Diff" Base="FPP:FPPStringDPIPiHat">
+            <MaxPixelPort>24</MaxPixelPort>
+            <MaxSerialPort>0</MaxSerialPort>
+            <fpp>1</fpp>
+            <fpp1>5,4</fpp1>
+            <fpp2>9,4</fpp2>
+            <fpp3>13,4</fpp3>
+            <fpp4>17,4</fpp4>
+            <fpp5>21,4</fpp5>
+            <fpp6>25,-1</fpp6>
+        </Variant>
+    </Controller>
+    <Controller Name="Pi_Zero_Expansion">
+        <Variant Name="" ID="Pi_Zero_Expansion" Base="FPP:FPPStringDPIPiHat">
+            <MaxPixelPort>16</MaxPixelPort>
+            <MaxSerialPort>0</MaxSerialPort>
+            <fpp>1</fpp>
+            <fpp1>17,-1</fpp1>
+        </Variant>
+    </Controller>
+    <Controller Name="Pi_Expansion">
+        <Variant Name="" ID="Pi_Expansion" Base="FPP:FPPStringDPIPiHat">
+            <MaxPixelPort>16</MaxPixelPort>
+            <MaxSerialPort>0</MaxSerialPort>
+            <fpp>1</fpp>
+            <fpp1>17,-1</fpp1>
+        </Variant>
+    </Controller>
 </Vendor>
diff --git a/dependencies.txt b/dependencies.txt
@@ -179,7 +179,7 @@ Usage:       read/write of v2 FSEQ files
 Link:        https://github.com/facebook/zstd
 Source:      https://github.com/facebook/zstd
 Last Pulled:
-Version:	 [latest version available as at Jan 2021 is 1.4.8 released Dec 2020 ... I doubt this is the version we are using]
+Version:	 [latest version available as at Dec 2023 is 1.5.5]
 License:     BSD
 Strategy:    zstd.h header added to xLights repository, static libraries added to lib for OSX/Windows
 

diff --git a/include/adjust16.xpm b/include/adjust16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static const char *adjust16_xpm[] = {
+"16 16 2 1",
+" 	c #FFFFFF",
+".	c #000000",
+"                ",
+"    .           ",
+"..  ..          ",
+" .. ..          ",
+"  ....          ",
+"    ...         ",
+"      ..        ",
+"       ..       ",
+"        ..      ",
+"         ..     ",
+"          ..    ",
+"           ..   ",
+"            ..  ",
+"                ",
+"                ",
+"                "};
diff --git a/include/adjust24.xpm b/include/adjust24.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static const char *adjust24_xpm[] = {
+"24 24 2 1",
+" 	c #FFFFFF",
+".	c #000000",
+"                        ",
+"                        ",
+"      .  .           .. ",
+"       .  .        ..   ",
+"   .      .        .  . ",
+"   ..  .          .  .  ",
+"   . ..   .      . ..   ",
+"   .      .     . .     ",
+"    .      .   . .      ",
+"     ....   . . .       ",
+"         .   ...        ",
+"          .   ..        ",
+"         . .   .        ",
+"         .  .   .       ",
+"       .     .   .      ",
+"      .     ...   .     ",
+"     . .   .   .   .    ",
+"    . .  . .    .   .   ",
+"   . .  . .      .   .  ",
+"   .   . .        .   . ",
+"   .    .          .   .",
+"    .  .            .   ",
+"                        ",
+"                        "};
diff --git a/include/adjust32.xpm b/include/adjust32.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static const char *adjust32_xpm[] = {
+"32 32 2 1",
+" 	c #FFFFFF",
+".	c #000000",
+"                                ",
+"                                ",
+"       ....                  .. ",
+"        .  ..              .. ..",
+"         .   .            ..  . ",
+"          .  ..          .   .. ",
+"    ..    ..  .          .   .  ",
+"    ...  ..   .         .   .   ",
+"    . .. .    .        .. ..    ",
+"    .  ..     .       .  .      ",
+"     .        ..     .. .       ",
+"     ..        ..   .  .        ",
+"      ......    .. .. .         ",
+"            .    ..  .          ",
+"             .    ...           ",
+"             ..    ..           ",
+"            .  .    ..          ",
+"            .   .    ..         ",
+"          ...    .    ..        ",
+"         .        .    ..       ",
+"        .       ....    ..      ",
+"       .  .    .    .    ..     ",
+"      .  .     .     .    ..    ",
+"     .  .  .. ..      .    ..   ",
+"    .  .  .. ..        .    ..  ",
+"    .    .. ..          .    .. ",
+"    .   .. ..            .    . ",
+"    .     ..              .    .",
+"     .   ..                .  . ",
+"      ...                   ... ",
+"                                ",
+"                                "};