merge dev into master

.github/workflows/build-all-on-linux.yaml

@@ -0,0 +1,45 @@
+name: Build all on linux
+on: [push]
+jobs:
+  clone-to-OF_ROOT:
+    runs-on: [self-hosted, Linux]
+    environment: RUNNER-LINUX
+    steps:
+      - name: remove existing clone
+        working-directory: ${{ vars.ADDONS_DIR }}
+        run: |
+          pwd
+          #echo "the commit that dispatched this job-- ${GITHUB_SHA}"
+          if [ -d ofxEmotiBit ]; then
+            echo "Directory exists."
+            rm -rf ofxEmotiBit
+            echo "clone removed"
+          else
+            echo "Directory does not already exist"
+          fi
+      - name: checkout repository
+        uses: actions/checkout@v4  
+      - name: move fresh clone to OF_ROOT
+        run: cp -r ../$(echo ${{ github.repository }} | cut -d '/' -f 2) ${{ vars.ADDONS_DIR }}
+  build-oscilloscope:
+    needs: clone-to-OF_ROOT
+    runs-on: [self-hosted, Linux]
+    environment: RUNNER-LINUX
+    steps: 
+      - name: build using make
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          echo "current working directory" && pwd
+          cd EmotiBitOscilloscope
+          make
+  build-dataparser:
+    needs: clone-to-OF_ROOT
+    runs-on: [self-hosted, Linux]
+    environment: RUNNER-LINUX
+    steps: 
+      - name: build using make
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          echo "current working directory" && pwd
+          cd EmotiBitDataParser
+          make

.github/workflows/build-all-on-macos.yml

@@ -0,0 +1,56 @@
+name: Build all on macos
+on: [push]
+jobs:
+  clone-to-OF_ROOT:
+    runs-on: [self-hosted, macOS]
+    environment: RUNNER-MACOS
+    steps:
+      - name: remove existing clone
+        working-directory: ${{ vars.ADDONS_DIR }}
+        run: |
+          pwd
+          #echo "the commit that dispatched this job-- ${GITHUB_SHA}"
+          if [ -d ofxEmotiBit ]; then
+            echo "Directory exists."
+            rm -rf ofxEmotiBit
+            echo "clone removed"
+          else
+            echo "Directory does not already exist"
+          fi
+      - name: checkout repository
+        uses: actions/checkout@v4  
+      - name: move fresh clone to OF_ROOT
+        run: cp -r ../$(echo ${{ github.repository }} | cut -d '/' -f 2) ${{ vars.ADDONS_DIR }}
+  build-oscilloscope:
+    needs: clone-to-OF_ROOT
+    runs-on: [self-hosted, macOS]
+    environment: RUNNER-MACOS
+    steps: 
+      - name: build using xcode
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          echo "current working directory" && pwd
+          cd EmotiBitOscilloscope
+          xcodebuild -project EmotiBitOscilloscope.xcodeproj -scheme Release-x86_64
+  build-dataparser:
+    needs: clone-to-OF_ROOT
+    runs-on: [self-hosted, macOS]
+    environment: RUNNER-MACOS
+    steps: 
+      - name: build using xcode
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          echo "current working directory" && pwd
+          cd EmotiBitDataParser
+          xcodebuild -project EmotiBitDataParser.xcodeproj -scheme Release
+  build-firmwareinstaller:
+    needs: clone-to-OF_ROOT
+    runs-on: [self-hosted, macOS]
+    environment: RUNNER-MACOS
+    steps: 
+      - name: build using xcode
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          echo "current working directory" && pwd
+          cd EmotiBitFirmwareInstaller
+          xcodebuild -project EmotiBitFirmwareInstaller.xcodeproj -scheme Release

.github/workflows/build-all-on-win.yaml

@@ -0,0 +1,63 @@
+name: Build all on Windows
+on: [push]
+jobs:
+  clone-to-OF_ROOT:
+    runs-on: [self-hosted, Windows]
+    environment: RUNNER-WINDOWS
+    steps:
+      - name: remove existing clone
+        shell: bash
+        working-directory: ${{ vars.ADDONS_DIR }}
+        run: |
+          pwd
+          #echo "the commit that dispatched this job-- ${GITHUB_SHA}"
+          if [ -d ofxEmotiBit ]; then
+            echo "Directory exists."
+            rm -rf ofxEmotiBit
+            echo "clone removed"
+          else
+            echo "Directory does not already exist"
+          fi
+      - name: checkout repository
+        uses: actions/checkout@v4  
+      - name: move fresh clone to OF_ROOT
+        shell: bash
+        run: |
+          echo ${{ github.repository }} | cut -d '/' -f 2
+          cp -r ..\\$(echo ${{ github.repository }} | cut -d '/' -f 2) ${{ vars.ADDONS_DIR }}
+  build-oscilloscope:
+    needs: clone-to-OF_ROOT
+    runs-on: [self-hosted, Windows]
+    environment: RUNNER-WINDOWS
+    steps: 
+      - name: build using MSBuild
+        shell: cmd
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          echo "current working directory" && pwd
+          cd EmotiBitOscilloscope
+          MSBuild EmotiBitOscilloscope.sln -t:Build -p:Configuration=Release 
+  build-dataparser:
+    needs: clone-to-OF_ROOT
+    runs-on: [self-hosted, Windows]
+    environment: RUNNER-WINDOWS
+    steps: 
+      - name: build using MSBuild
+        shell: cmd
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          echo "current working directory" && pwd
+          cd EmotiBitDataParser
+          MSBuild EmotiBitDataParser.sln -t:Build -p:Configuration=Release
+  build-firmwareinstaller:
+    needs: clone-to-OF_ROOT
+    runs-on: [self-hosted, Windows]
+    environment: RUNNER-WINDOWS
+    steps: 
+      - name: build using MSBuild
+        shell: cmd
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          echo "current working directory" && pwd
+          cd EmotiBitFirmwareInstaller
+          MSBuild EmotiBitFirmwareInstaller.sln -t:Build -p:Configuration=Release

.github/workflows/upload-build-artifact-mac.yml

@@ -0,0 +1,27 @@
+name: upload build artifact mac
+on: 
+  workflow_run:
+    workflows: ["Build all on macos"]
+    types:
+      - completed
+    branches:
+      [dev]
+jobs:
+  upload-artifact:
+    runs-on: [self-hosted, macOS]
+    environment: RUNNER-MACOS
+    steps:
+      - name: create stage-release
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: mkdir -p stageRelease/EmotiBitSoftware-macos
+      - name: populate stage release
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          mv EmotiBitOscilloscope/bin/EmotiBitOscilloscope.app stageRelease/EmotiBitSoftware-macos
+          mv EmotiBitDataParser/bin/EmotiBitDataParser.app stageRelease/EmotiBitSoftware-macos
+          mv EmotiBitFirmwareInstaller/bin/EmotiBitFirmwareInstaller.app stageRelease/EmotiBitSoftware-macos
+      - name: upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: EmotiBitSoftware-macos
+          path: ${{ vars.OFXEMOTIBIT_DIR }}/stageRelease/EmotiBitSoftware-macos/

.github/workflows/upload-build-artifact-win.yml

@@ -0,0 +1,62 @@
+name: upload build artifact Windows
+on:
+
+  #workflow_dispatch:
+  workflow_run:
+    workflows: ["Build all on Windows"]
+    types:
+     - completed
+    branches:
+     [dev]
+jobs:
+  build-installer:
+    runs-on: [self-hosted, Windows]
+    environment: RUNNER-WINDOWS
+    steps:
+      - name: build installer project
+        shell: cmd
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          cd EmotiBitInstaller
+          devenv EmotiBitInstaller.sln /Build Release 
+
+  upload-artifact:
+    needs: build-installer
+    runs-on: [self-hosted, Windows]
+    environment: RUNNER-WINDOWS
+    steps:
+      - name: create stage-release
+        shell: bash
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: mkdir -p stageRelease/EmotiBitSoftware-Windows
+      - name: populate stage release
+        shell: bash
+        working-directory: ${{ vars.OFXEMOTIBIT_DIR }}
+        run: |
+          msiInstPath=./EmotiBitInstaller/EmotiBitInstaller/Release/EmotiBitInstaller.msi
+          setupPath=./EmotiBitInstaller/EmotiBitInstaller/Release/setup.exe
+          silabsDriverPath=../../../drivers/CP210x_Windows_Drivers
+          releaseFolder="EmotiBitSoftware-Windows"
+          version=$(grep ./src/ofxEmotiBitVersion.h -e "string ofxEmotiBitVersion" | cut -d '"' -f 2)
+          echo "Staging release for version: $version"
+
+          if [ -f "$msiInstPath" ] || [ -f "$setupPath" ]; then
+            echo "msi and exe files found!"
+            echo "staging release"
+            echo "copying installer files"
+            cp "$msiInstPath" "./stageRelease/$releaseFolder"
+            cp "$setupPath" "./stageRelease/$releaseFolder"
+            for i in $(find ../../../drivers -maxdepth 1 -mindepth 1 -name '*CP210x*' -type d); do
+              dirname=$(basename "$i")
+              worktree="../../../drivers/$dirname"
+              echo "copying $dirname"
+              cp -r "$worktree" "./stageRelease/$releaseFolder"
+            done
+          else
+            echo "installer files not found! Create installer!"
+          fi
+      - name: upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: EmotiBitSoftware-Windows
+          path: ${{ vars.OFXEMOTIBIT_DIR }}\\stageRelease\\EmotiBitSoftware-Windows

EmotiBitDataParser/EmotiBitDataParser.vcxproj

@@ -105,10 +105,6 @@
     <ClCompile Include="..\..\ofxJSON\src\ofxJSONElement.cpp" />
     <ClCompile Include="src\main.cpp" />
     <ClCompile Include="src\ofApp.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxBiquadFilter\src\ofxBiquadFilter.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxBiquadFilter\src\ofxBiquadFilterInstance.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxEmotiBit\src\EmotiBitTestingHelper.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxEmotiBit\src\EmotiBitWiFiHost.cpp" />
     <ClCompile Include="..\..\..\addons\ofxGui\src\ofxBaseGui.cpp" />
     <ClCompile Include="..\..\..\addons\ofxGui\src\ofxButton.cpp" />
     <ClCompile Include="..\..\..\addons\ofxGui\src\ofxColorPicker.cpp" />
@@ -119,21 +115,7 @@
     <ClCompile Include="..\..\..\addons\ofxGui\src\ofxSlider.cpp" />
     <ClCompile Include="..\..\..\addons\ofxGui\src\ofxSliderGroup.cpp" />
     <ClCompile Include="..\..\..\addons\ofxGui\src\ofxToggle.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxNetworkUtils.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPClient.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPManager.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPServer.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxUDPManager.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxPoco\src\ofxXmlPoco.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxNetworkUtils\libs\ofxNetworkUtils\src\IPAddressRange.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxNetworkUtils\libs\ofxNetworkUtils\src\NetworkInterfaceListener.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxNetworkUtils\libs\ofxNetworkUtils\src\NetworkUtils.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxOscilloscope\src\ofxOscilloscope.cpp" />
     <ClCompile Include="..\..\..\addons\ofxThreadedLogger\src\ofxThreadedLogger.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxXmlSettings\src\ofxXmlSettings.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxml.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlerror.cpp" />
-    <ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlparser.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\EmotiBit_XPlat_Utils\src\EmotiBitComms.h" />
@@ -143,12 +125,6 @@
     <ClInclude Include="..\..\ofxJSON\src\ofxJSON.h" />
     <ClInclude Include="..\..\ofxJSON\src\ofxJSONElement.h" />
     <ClInclude Include="src\ofApp.h" />
-    <ClInclude Include="..\..\..\addons\ofxBiquadFilter\src\ofxBiquadFilter.h" />
-    <ClInclude Include="..\..\..\addons\ofxBiquadFilter\src\ofxBiquadFilterInstance.h" />
-    <ClInclude Include="..\..\..\addons\ofxEmotiBit\src\ArduinoString.h" />
-    <ClInclude Include="..\..\..\addons\ofxEmotiBit\src\DoubleBuffer.h" />
-    <ClInclude Include="..\..\..\addons\ofxEmotiBit\src\EmotiBitTestingHelper.h" />
-    <ClInclude Include="..\..\..\addons\ofxEmotiBit\src\EmotiBitWiFiHost.h" />
     <ClInclude Include="..\..\..\addons\ofxEmotiBit\src\ofxEmotiBitVersion.h" />
     <ClInclude Include="..\..\..\addons\ofxGui\src\ofxBaseGui.h" />
     <ClInclude Include="..\..\..\addons\ofxGui\src\ofxButton.h" />
@@ -162,23 +138,7 @@
     <ClInclude Include="..\..\..\addons\ofxGui\src\ofxSlider.h" />
     <ClInclude Include="..\..\..\addons\ofxGui\src\ofxSliderGroup.h" />
     <ClInclude Include="..\..\..\addons\ofxGui\src\ofxToggle.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxNetwork.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxNetworkUtils.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxTCPClient.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxTCPManager.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxTCPServer.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxTCPSettings.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxUDPManager.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxUDPSettings.h" />
-    <ClInclude Include="..\..\..\addons\ofxPoco\src\ofxXmlPoco.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetworkUtils\src\ofxNetworkUtils.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetworkUtils\libs\ofxNetworkUtils\include\ofx\Net\IPAddressRange.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetworkUtils\libs\ofxNetworkUtils\include\ofx\Net\NetworkInterfaceListener.h" />
-    <ClInclude Include="..\..\..\addons\ofxNetworkUtils\libs\ofxNetworkUtils\include\ofx\Net\NetworkUtils.h" />
-    <ClInclude Include="..\..\..\addons\ofxOscilloscope\src\ofxOscilloscope.h" />
     <ClInclude Include="..\..\..\addons\ofxThreadedLogger\src\ofxThreadedLogger.h" />
-    <ClInclude Include="..\..\..\addons\ofxXmlSettings\src\ofxXmlSettings.h" />
-    <ClInclude Include="..\..\..\addons\ofxXmlSettings\libs\tinyxml.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(OF_ROOT)\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj">