Alex/exquis

.github/workflows/gradle.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'microsoft'
     - name: Build with Gradle
       run: ./gradlew check

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "java.format.settings.url": "code-formatting.xml",
+    "java.project.encoding": "warning"
+}

build.gradle

@@ -29,7 +29,7 @@ group = 'com.bitwig.extensions'
 description = 'Bitwig Studio Extensions (Github)'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_16
+    sourceCompatibility = JavaVersion.VERSION_21
 
     jar {
         archiveFileName = 'BitwigControllers.bwextension'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

pom.xml

@@ -26,8 +26,8 @@
 				<configuration>
 					<optimize>true</optimize>
 					<fork>true</fork>
-					<source>16</source>
-					<target>16</target>
+					<source>21</source>
+					<target>21</target>
 					<encoding>UTF-8</encoding>
 					<maxmem>1024m</maxmem>
 				</configuration>

src/main/java/com/bitwig/extensions/controllers/intuitive_instruments/exquis/ExquisControllerExtension.java

@@ -0,0 +1,98 @@
+package com.bitwig.extensions.controllers.intuitive_instruments.exquis;
+
+import com.bitwig.extension.controller.ControllerExtension;
+import com.bitwig.extension.controller.api.AbsoluteHardwareKnob;
+import com.bitwig.extension.controller.api.ControllerHost;
+import com.bitwig.extension.controller.api.MidiIn;
+import com.bitwig.extension.controller.api.MidiOut;
+import com.bitwig.extension.controller.api.NoteInput;
+import com.bitwig.extensions.framework.Layer;
+import com.bitwig.extensions.framework.Layers;
+
+public class ExquisControllerExtension extends ControllerExtension
+{
+   protected ExquisControllerExtension(ExquisControllerExtensionDefinition definition, ControllerHost host)
+   {
+      super(definition, host);
+   }
+
+   @Override
+   public void init()
+   {
+      final var host = getHost();
+
+      mMidiIn = host.getMidiInPort(0);
+      mMidiOut = host.getMidiOutPort(0);
+
+      mNoteInput = mMidiIn.createNoteInput("", "8?????", "9?????", "B?40??", "B?4A??", "D?????", "E?????");
+
+      final String[] bendRanges = { "12", "24", "36", "48", "60", "72", "84", "96" };
+      final var bendRange = host.getPreferences().getEnumSetting("Bend Range", "MIDI", bendRanges, "48");
+      bendRange.addValueObserver(this::setPitchBendRange);
+
+      setPitchBendRange(bendRange.get());
+
+      final var cursorTrack = host.createCursorTrack(0, 0);
+      final var cursorDevice = cursorTrack.createCursorDevice();
+      final var cursorRemoteControlsPage = cursorDevice.createCursorRemoteControlsPage(4);
+
+      final var layers = new Layers(this);
+      final var mainLayer = new Layer(layers, "Main");
+
+      final var hardwareSurface = host.createHardwareSurface();
+      final AbsoluteHardwareKnob[] knobs = new AbsoluteHardwareKnob[4];
+
+      for (int i = 0; i < 4; ++i)
+      {
+         final var parameter = cursorRemoteControlsPage.getParameter(i);
+         parameter.markInterested();
+         parameter.setIndication(true);
+
+         knobs[i] = hardwareSurface.createAbsoluteHardwareKnob(Integer.toString(i + 1));
+         knobs[i].setIndexInGroup(i);
+         knobs[i].setAdjustValueMatcher(mMidiIn.createAbsoluteCCValueMatcher(41 + i));
+
+         mainLayer.bind(knobs[i], parameter);
+      }
+
+      mainLayer.activate();
+   }
+
+   void setPitchBendRange(final String range)
+   {
+      final int pb = Integer.parseInt(range);
+      mNoteInput.setUseExpressiveMidi(true, 0, pb);
+      sendPitchBendRangeRPN(1, pb);
+   }
+
+   void sendPitchBendRangeRPN(final int channel, final int range)
+   {
+      // Set up MPE mode: Zone 1 15 channels
+      mMidiOut.sendMidi(0xB0, 101, 0); // Registered Parameter Number (RPN) - MSB*
+      mMidiOut.sendMidi(0xB0, 100, 6); // Registered Parameter Number (RPN) - LSB*
+      mMidiOut.sendMidi(0xB0, 6, 15);
+      mMidiOut.sendMidi(0xB0, 38, 0);
+
+      // Set up pitch bend sensitivity to "range" semitones (00/00)
+      mMidiOut.sendMidi(0xB1, 100, 0); // Registered Parameter Number (RPN) - LSB*
+      mMidiOut.sendMidi(0xB1, 101, 0); // Registered Parameter Number (RPN) - MSB*
+      mMidiOut.sendMidi(0xB1, 38, 0);
+      mMidiOut.sendMidi(0xB1, 6, range);
+   }
+
+   @Override
+   public void exit()
+   {
+   }
+
+   @Override
+   public void flush()
+   {
+   }
+
+   private MidiIn mMidiIn;
+
+   private MidiOut mMidiOut;
+
+   private NoteInput mNoteInput;
+}

src/main/java/com/bitwig/extensions/controllers/intuitive_instruments/exquis/ExquisControllerExtensionDefinition.java

@@ -0,0 +1,100 @@
+package com.bitwig.extensions.controllers.intuitive_instruments.exquis;
+
+import java.util.UUID;
+
+import com.bitwig.extension.api.PlatformType;
+import com.bitwig.extension.controller.AutoDetectionMidiPortNamesList;
+import com.bitwig.extension.controller.ControllerExtension;
+import com.bitwig.extension.controller.ControllerExtensionDefinition;
+import com.bitwig.extension.controller.api.ControllerHost;
+
+public class ExquisControllerExtensionDefinition extends ControllerExtensionDefinition
+{
+   private final static UUID ID = UUID.fromString("b694f535-f022-416c-b714-f0b5924128f9");
+
+   @Override
+   public String getHardwareVendor()
+   {
+      return "Intuitive Instruments";
+   }
+
+   @Override
+   public String getHardwareModel()
+   {
+      return "Exquis";
+   }
+
+   @Override
+   public int getNumMidiInPorts()
+   {
+      return 1;
+   }
+
+   @Override
+   public int getNumMidiOutPorts()
+   {
+      return 1;
+   }
+
+   @Override
+   public void listAutoDetectionMidiPortNames(
+      final AutoDetectionMidiPortNamesList list,
+      final PlatformType platformType)
+   {
+      final String inputNames[] = new String[1];
+      final String outputNames[] = new String[1];
+
+      switch (platformType)
+      {
+      case LINUX:
+         inputNames[0] = "Exquis MIDI 1";
+         outputNames[0] = "Exquis MIDI 1";
+         break;
+
+      case WINDOWS:
+      case MAC:
+         inputNames[0] = "Exquis";
+         outputNames[0] = "Exquis";
+         break;
+      }
+
+      list.add(inputNames, outputNames);
+   }
+
+   @Override
+   public ControllerExtension createInstance(ControllerHost host)
+   {
+      return new ExquisControllerExtension(this, host);
+   }
+
+   @Override
+   public String getName()
+   {
+      return "Exquis";
+   }
+
+   @Override
+   public String getAuthor()
+   {
+      return "Bitwig";
+   }
+
+   @Override
+   public String getVersion()
+   {
+      return "1.0";
+   }
+
+   @Override
+   public UUID getId()
+   {
+      return ID;
+   }
+
+   @Override
+   public int getRequiredAPIVersion()
+   {
+      return 18;
+   }
+
+}

src/main/resources/META-INF/services/com.bitwig.extension.ExtensionDefinition

@@ -44,6 +44,8 @@ com.bitwig.extensions.controllers.icon.VCastDefinition
 com.bitwig.extensions.controllers.icon.VCastProDefinition
 com.bitwig.extensions.controllers.icon.VCastRxDefinition
 
+com.bitwig.extensions.controllers.intuitive_instruments.exquis.ExquisControllerExtensionDefinition
+
 com.bitwig.extensions.controllers.keith_mcmillen.QuNexusDefinition
 
 com.bitwig.extensions.controllers.kenton.KillaMixMiniExtensionDefinition