[bugfixed] problem with multiple x7 devices

letmp · Mar 21, 2023 · 42e0cd9 · 42e0cd9
1 parent bcdf5be
commit 42e0cd9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/language-extensions/sublime/droid-lang/buildscript/scripts/build_win.ps1 b/language-extensions/sublime/droid-lang/buildscript/scripts/build_win.ps1
@@ -36,19 +36,19 @@ If($containsWord -contains $true)
 {
     $fileSysexHead= Get-Content "$PSScriptRoot/../sendmidi/win/sysexhead.txt"
     $fileSysexTail= Get-Content "$PSScriptRoot/../sendmidi/win/sysextail.txt"
+
+    # parse content for the x7 device name
+    $x7deviceToken = "(?<=(# X7 send `")).*(?=`")"
+    $x7device = select-string $x7deviceToken -inputobject $droidcontent
+    if ([string]::IsNullOrWhiteSpace($x7device)) {$x7device = "x7" }
+    else { $x7device = $x7device.Matches.groups[0].value }
 
     # remove tabs, spaces & comments
     $droidcontent = $droidcontent -replace '(^\s+|\s+$)','' -replace '\t+','' -replace '(#)(.*)','' -replace '\s+\r\n+', "`r`n"
 
     # write temporary file
     $fileSysexTmp= "$PSScriptRoot/../sendmidi/tmp.syx"
     Set-Content $fileSysexTmp "$fileSysexHead $droidcontent $fileSysexTail"
-
-    # parse content for the x7 device name
-    $x7deviceToken = "(?<=(# X7 send `")).*(?=`")"
-    $x7device = select-string $x7deviceToken -inputobject $droidcontent
-    if ([string]::IsNullOrWhiteSpace($x7device)) {$x7device = "x7" }
-    else { $x7device = $x7device.Matches.groups[0].value }
 
     # send the content of the temporary file
     Write-Host -ForegroundColor Yellow "Sending data via sysex to device" $x7device

diff --git a/language-extensions/vscode/droid-lang/buildscript/scripts/build_win.ps1 b/language-extensions/vscode/droid-lang/buildscript/scripts/build_win.ps1
@@ -36,19 +36,19 @@ If($containsWord -contains $true)
 {
     $fileSysexHead= Get-Content "$PSScriptRoot/../sendmidi/win/sysexhead.txt"
     $fileSysexTail= Get-Content "$PSScriptRoot/../sendmidi/win/sysextail.txt"
+
+    # parse content for the x7 device name
+    $x7deviceToken = "(?<=(# X7 send `")).*(?=`")"
+    $x7device = select-string $x7deviceToken -inputobject $droidcontent
+    if ([string]::IsNullOrWhiteSpace($x7device)) {$x7device = "x7" }
+    else { $x7device = $x7device.Matches.groups[0].value }
 
     # remove tabs, spaces & comments
     $droidcontent = $droidcontent -replace '(^\s+|\s+$)','' -replace '\t+','' -replace '(#)(.*)','' -replace '\s+\r\n+', "`r`n"
 
     # write temporary file
     $fileSysexTmp= "$PSScriptRoot/../sendmidi/tmp.syx"
     Set-Content $fileSysexTmp "$fileSysexHead $droidcontent $fileSysexTail"
-
-    # parse content for the x7 device name
-    $x7deviceToken = "(?<=(# X7 send `")).*(?=`")"
-    $x7device = select-string $x7deviceToken -inputobject $droidcontent
-    if ([string]::IsNullOrWhiteSpace($x7device)) {$x7device = "x7" }
-    else { $x7device = $x7device.Matches.groups[0].value }
 
     # send the content of the temporary file
     Write-Host -ForegroundColor Yellow "Sending data via sysex to device" $x7device