commit fa11eaa16504358e904e6acbe573974d86b7ac0b
parent 69582b77baacb8e91d73218c0f342befc9a5b336
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Wed, 17 Apr 2024 18:51:25 +0200
Merge branch 'oss/osirus' into oss/osTIrus
# Conflicts:
# source/virusLib/microcontroller.cpp
Diffstat:
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/changelog.txt b/doc/changelog.txt
@@ -23,12 +23,12 @@ Patch Manager:
Osirus/OsTIrus:
+- [Imp] Adjusted default Master Volume to 92 to match the TI hardware in USB mode
+
- [Fix] Plugin may crash if a patch data source folder contains files not belonging to presets
OsTIrus:
-- [Imp] Adjusted default Master Volume to 92 to match the TI hardware in USB mode
-
- [Fix] Midi indicators on parts blocked mouse clicks, making it difficult to select a part
- [Fix] Added missing Reverb Predelay knob if predelay clock is set to Off
- [Fix] Removed invalid entry in Arp clock selection
diff --git a/source/jucePlugin/parameterDescriptions_C.json b/source/jucePlugin/parameterDescriptions_C.json
@@ -373,7 +373,7 @@
{"page":114, "class":"Global", "index":124, "name":"Global Channel", "min":0, "max":15, "isPublic":true, "isDiscrete":true, "isBool":false},
{"page":114, "class":"Global", "index":125, "name":"Led Mode", "min":0, "max":2, "isPublic":false, "isDiscrete":true, "isBool":false},
{"page":114, "class":"Global", "index":126, "name":"LCD Contrast", "min":0, "max":127, "isPublic":false, "isDiscrete":false, "isBool":false},
- {"page":114, "class":"Global", "index":127, "name":"Master Volume", "min":0, "max":127, "isPublic":false, "isDiscrete":false, "isBool":false}
+ {"page":114, "class":"Global", "index":127, "name":"Master Volume", "min":0, "max":127, "isPublic":true, "isDiscrete":false, "isBool":false}
],
"regions":
[
diff --git a/source/virusLib/microcontroller.cpp b/source/virusLib/microcontroller.cpp
@@ -231,7 +231,7 @@ void Microcontroller::sendInitControlCommands()
sendControlCommand(GLOBAL_CHANNEL, 0x0); // Set global midi channel to 0
sendControlCommand(MIDI_CONTROL_LOW_PAGE, 0x1); // Enable midi CC to edit parameters on page A
sendControlCommand(MIDI_CONTROL_HIGH_PAGE, 0x0); // Disable poly pressure to edit parameters on page B
- sendControlCommand(MASTER_VOLUME, 92); // Set master volume to 92, we tested it against a USB-connected TI and this is the perfect match
+ sendControlCommand(MASTER_VOLUME, 92); // Set master volume to 92, this matches the Virus TI in USB mode
sendControlCommand(MASTER_TUNE, 64); // Set master tune to 0
sendControlCommand(DEVICE_ID, OMNI_DEVICE_ID); // Set device ID to Omni
}