From 61b3a168fe905a1143cabbbe760ac0f0db776832 Mon Sep 17 00:00:00 2001 From: Jarr3 Date: Mon, 1 Apr 2024 14:00:49 +0200 Subject: [PATCH] Squashed commit of the following: commit f006180f4f0e6ef25de172f297f03392c0f75ed8 Author: Jarr3 Date: Mon Apr 1 13:55:07 2024 +0200 Update b2s-backglass.yml, remove betterled commit 0f0d345933c4196aa4a3ec6d309536ef2c81f192 Author: Jarr3 Date: Mon Apr 1 13:19:15 2024 +0200 mergeBulbs once commit 0a1265d044e270cd058a40be66a6e53f11bfc9c7 Author: Jarr3 Date: Mon Apr 1 13:16:13 2024 +0200 Fix compile error commit 0a49a63f6488e254740a0ec9be1fcaa713a231a7 Merge: fedb1b0 c20ddb5 Author: Jarr3 Date: Mon Apr 1 12:43:20 2024 +0200 Merge branch '76-events-of-overlapping-pictures-get-merged' commit fedb1b0d654b3ebb932fd8c9c9c1525e87b96dbd Author: Jarr3 Date: Wed Mar 20 08:01:13 2024 +0100 Events of overlapping pictures get merged #76 commit 6f13aef581b7a79104aa7ca590ff95b62cb72e37 Author: Jarr3 Date: Wed Mar 20 07:49:06 2024 +0100 Revert "b2s tools should not allow to be run as admin #75" This reverts commit bfd7f4dd4610ffd7b6345ad8938e88d550753c09. commit 107a1f94a04442ba5975d2cdc0265004d2711fa1 Author: Jarr3 Date: Fri Mar 1 07:08:40 2024 +0100 Revert Make StartAsEXE and DisableFuzzyMatching the default and only mode available #72 commit 1ead93ea62e6d164cc1ee3e8e01773b13135c43b Author: Jarr3 Date: Thu Feb 29 18:56:06 2024 +0100 Update DB2S Not lights up at start, but only with PWM modified tables #81 Increase documentation commit 4cf6b0a8614aa833b5e04c5fdd6f18b9ee056383 Author: Jarr3 Date: Wed Feb 28 19:17:05 2024 +0100 DB2S Not lights up at start, but only with PWM modified tables #81 Changed treshold to 64 commit ffdb408c9342c01133e20462ed8c9f8e014b9447 Author: Jarr3 Date: Wed Feb 28 07:11:33 2024 +0100 DB2S Not lights up at start, but only with PWM modified tables #81 First test, mapping all values > 128 to boolean True commit d468f07fcbabf742e9d770dfe5963438ee87bcb2 Author: Jarr3 Date: Mon Feb 26 19:47:11 2024 +0100 B2S.Server log plugin loading information and possible errors #82 commit b829c0a33cc44c3857debb9eafa6932cb594508d Author: Jarr3 Date: Wed Feb 7 07:43:40 2024 +0100 b2s_screenresidentifier: Add Comments hidded behind the taskbar #77 --- .github/workflows/b2s-backglass.yml | 51 ------------------- .../Forms/formBackglass.vb | 2 - 2 files changed, 53 deletions(-) diff --git a/.github/workflows/b2s-backglass.yml b/.github/workflows/b2s-backglass.yml index fec3c38..5662dd4 100644 --- a/.github/workflows/b2s-backglass.yml +++ b/.github/workflows/b2s-backglass.yml @@ -105,54 +105,3 @@ jobs: with: name: B2SServer-${{ steps.version.outputs.tag }}-${{ matrix.config }}-win-${{ matrix.platform }} path: tmp - - build-betterled: - if: ${{ false }} # disable for now - name: Build BetterLed # -${{ matrix.config }}-win-${{ matrix.platform }} - runs-on: windows-2019 - strategy: - fail-fast: false - matrix: - include: - - platform: x86 - config: Debug - - platform: x86 - config: Release - - platform: x64 - config: Debug - - platform: x64 - config: Release - steps: - - uses: actions/checkout@v3 - - id: version - name: Update AssemblyInformationalVersion - run: | - SHA7="${GITHUB_SHA::7}" - ASSEMBLY_INFO="leds/dream7segments/My Project/AssemblyInfo.vb" - VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1) - TAG="${VERSION}-${SHA7}" - perl -i -pe"s/AssemblyInformationalVersion\(\".*\"\)/AssemblyInformationalVersion\(\"${TAG}\"\)/g" "${ASSEMBLY_INFO}" - ASSEMBLY_INFO="leds/BetterLed/My Project/AssemblyInfo.vb" - VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1) - TAG="${VERSION}-${SHA7}" - perl -i -pe"s/AssemblyInformationalVersion\(\".*\"\)/AssemblyInformationalVersion\(\"${TAG}\"\)/g" "${ASSEMBLY_INFO}" - echo "tag=${TAG}" >> $GITHUB_OUTPUT - - uses: microsoft/setup-msbuild@v1.1 - - name: Build - run: | - msbuild leds/BetterLed/BetterLed.sln /t:Rebuild /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }} - shell: cmd - - name: Bundle - run: | - mkdir tmp - cp leds/BetterLed/bin/${{ matrix.platform }}/${{ matrix.config }}/BetterLed.exe tmp - cp leds/BetterLed/bin/${{ matrix.platform }}/${{ matrix.config }}/Dream7Display.dll tmp - if [[ "${{ matrix.config }}" == "Debug" ]]; then - cp leds/BetterLed/bin/${{ matrix.platform }}/${{ matrix.config }}/BetterLed.pdb tmp - cp leds/BetterLed/bin/${{ matrix.platform }}/${{ matrix.config }}/Dream7Display.pdb tmp - fi - cp license.txt tmp - - uses: actions/upload-artifact@v3 - with: - name: BetterLed-${{ steps.version.outputs.tag }}-${{ matrix.config }}-win-${{ matrix.platform }} - path: tmp diff --git a/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb b/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb index df3683d..39abf94 100644 --- a/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb +++ b/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb @@ -1801,8 +1801,6 @@ Public Class formBackglass Dim topnode As Xml.XmlElement = XML.SelectSingleNode("DirectB2SData") Dim mergeBulbs As Boolean = topnode.SelectSingleNode("MergeBulbs") IsNot Nothing AndAlso topnode.SelectSingleNode("MergeBulbs").Attributes("Value").InnerText <> "0" - Dim mergeBulbs As Boolean = topnode.SelectSingleNode("MergeBulbs") IsNot Nothing AndAlso topnode.SelectSingleNode("MergeBulbs").Attributes("Value").InnerText <> "0" - ' clear all data B2SData.ClearAll(True)