Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit f006180
Author: Jarr3 <[email protected]>
Date:   Mon Apr 1 13:55:07 2024 +0200

    Update b2s-backglass.yml, remove betterled

commit 0f0d345
Author: Jarr3 <[email protected]>
Date:   Mon Apr 1 13:19:15 2024 +0200

    mergeBulbs once

commit 0a1265d
Author: Jarr3 <[email protected]>
Date:   Mon Apr 1 13:16:13 2024 +0200

    Fix compile error

commit 0a49a63
Merge: fedb1b0 c20ddb5
Author: Jarr3 <[email protected]>
Date:   Mon Apr 1 12:43:20 2024 +0200

    Merge branch '76-events-of-overlapping-pictures-get-merged'

commit fedb1b0
Author: Jarr3 <[email protected]>
Date:   Wed Mar 20 08:01:13 2024 +0100

    Events of overlapping pictures get merged #76

commit 6f13aef
Author: Jarr3 <[email protected]>
Date:   Wed Mar 20 07:49:06 2024 +0100

    Revert "b2s tools should not allow to be run as admin #75"

    This reverts commit bfd7f4d.

commit 107a1f9
Author: Jarr3 <[email protected]>
Date:   Fri Mar 1 07:08:40 2024 +0100

    Revert Make StartAsEXE and DisableFuzzyMatching the default and only mode available #72

commit 1ead93e
Author: Jarr3 <[email protected]>
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 4cf6b0a
Author: Jarr3 <[email protected]>
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 ffdb408
Author: Jarr3 <[email protected]>
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 d468f07
Author: Jarr3 <[email protected]>
Date:   Mon Feb 26 19:47:11 2024 +0100

    B2S.Server log plugin loading information and possible errors #82

commit b829c0a
Author: Jarr3 <[email protected]>
Date:   Wed Feb 7 07:43:40 2024 +0100

    b2s_screenresidentifier: Add Comments hidded behind the taskbar #77
  • Loading branch information
JockeJarre committed Apr 1, 2024
1 parent 3e3fff1 commit 61b3a16
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 53 deletions.
51 changes: 0 additions & 51 deletions .github/workflows/b2s-backglass.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- 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
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 61b3a16

Please sign in to comment.