* Maschine

  * New: Shift+ARRANGE(R)/IDEAS activates Edit layout.
* Maschine Mk2/Studio
  * New: CHORDS mode can now be accessed as well. To support it the behaviour of the PAD MODE button has been changed. Press it multiple times to toggle between PAD MODE, KEYBOARD and CHORDS mode. Use Shift+PAD MODE to access the settings of the respective mode.
* MCU
  * New: Added new setting *Encoder Knob Slow Down* which allows to slow down the main encoder.
  * New: Renamed option *Off* to *None* for the settings 'Main display', 'Has a second display', 'VU Meters' and 'Display Colors'.
  * Fixed: VU meters can be toggled on/off with *Global View* again.

Author: git-moss

DrivenByMoss-Manual.pdf

@@ -4,7 +4,7 @@
   <groupId>de.mossgrabers</groupId>
   <artifactId>DrivenByMoss</artifactId>
   <name>DrivenByMoss</name>
-  <version>26.2.1</version>
+  <version>26.3.0</version>
   <licenses>
     <license>
       <name>LGPL-2.1-or-later</name>
@@ -35,7 +35,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.14.0</version>
+        <version>3.14.1</version>
         <executions>
           <execution>
             <id>default-testCompile</id>
@@ -68,7 +68,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -156,7 +156,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
-        <version>2.19.0</version>
+        <version>2.19.1</version>
         <configuration>
           <ignoredVersions>.*-M.*,.*-alpha.*,.*-beta.*,.*-ea.*,.*-rc.*</ignoredVersions>
           <generateBackupPoms>false</generateBackupPoms>
@@ -165,7 +165,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <executions>
           <execution>
             <id>add-third-party</id>
@@ -204,7 +204,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
       </plugin>
     </plugins>
   </build>

dependency-reduced-pom.xml

@@ -6,7 +6,7 @@
 	<artifactId>DrivenByMoss</artifactId>
 	<packaging>jar</packaging>
 	<name>DrivenByMoss</name>
-	<version>26.2.1</version>
+	<version>26.3.0</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -45,12 +45,12 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.17.0</version>
+			<version>5.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna-platform</artifactId>
-			<version>5.17.0</version>
+			<version>5.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>purejavahidapi</groupId>
@@ -104,7 +104,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.14.0</version>
+				<version>3.14.1</version>
 				<configuration>
 					<fork>true</fork>
 					<source>21</source>
@@ -141,7 +141,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -233,7 +233,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.19.0</version>
+				<version>2.19.1</version>
 				<configuration>
 					<ignoredVersions>.*-M.*,.*-alpha.*,.*-beta.*,.*-ea.*,.*-rc.*</ignoredVersions>
 					<generateBackupPoms>false</generateBackupPoms>
@@ -244,7 +244,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>2.6.0</version>
+				<version>2.7.0</version>
 				<configuration>
 					<sortArtifactByName>true</sortArtifactByName>
 					<licenseMerges>
@@ -291,7 +291,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.3</version>
+				<version>3.5.4</version>
 			</plugin>
 
 		</plugins>

pom.xml

@@ -412,6 +412,7 @@ public void init (final ISettingsUI globalSettings, final ISettingsUI documentSe
         this.activateZoomStateSetting (globalSettings);
         this.activateChannelTouchSetting (globalSettings);
         this.activateKnobSpeedSetting (globalSettings);
+        this.activateEncoderKnobSpeedSetting (globalSettings);
     }
 
 

src/main/java/de/mossgrabers/controller/mackie/mcu/MCUConfiguration.java

@@ -83,6 +83,7 @@
 import de.mossgrabers.framework.controller.hardware.BindType;
 import de.mossgrabers.framework.controller.hardware.IHwFader;
 import de.mossgrabers.framework.controller.hardware.IHwRelativeKnob;
+import de.mossgrabers.framework.controller.valuechanger.IValueChanger;
 import de.mossgrabers.framework.controller.valuechanger.RelativeEncoding;
 import de.mossgrabers.framework.controller.valuechanger.SignedBit2RelativeValueChanger;
 import de.mossgrabers.framework.daw.IApplication;
@@ -170,6 +171,7 @@ public class MCUControllerSetup extends AbstractControllerSetup<MCUControlSurfac
     private final int []                                          faderValues      = new int [32];
     private int                                                   masterFaderValue = -1;
     private final int                                             numMCUDevices;
+    private IValueChanger                                         encoderValueChanger;
     private JogWheelCommand<MCUControlSurface, MCUConfiguration>  jogWheelCommand  = null;
     private MasterVolumeMode<MCUControlSurface, MCUConfiguration> masterVolumeMode;
 
@@ -195,6 +197,7 @@ public MCUControllerSetup (final IHost host, final ISetupFactory factory, final
 
         this.colorManager = new MCUColorManager ();
         this.valueChanger = new SignedBit2RelativeValueChanger (16241 + 1, 10);
+        this.encoderValueChanger = new SignedBit2RelativeValueChanger (16241 + 1, 10);
         this.configuration = new MCUConfiguration (host, this.valueChanger, numMCUDevices, factory.getArpeggiatorModes ());
     }
 
@@ -446,7 +449,7 @@ protected void registerTriggerCommands ()
 
             if (this.configuration.getDeviceType (index) == MCUDeviceType.MAIN)
             {
-                this.jogWheelCommand = new JogWheelCommand<> (this.model, surface);
+                this.jogWheelCommand = new JogWheelCommand<> (this.model, surface, this.encoderValueChanger);
 
                 // Navigation
                 final MCUWindCommand rewindCommand = new MCUWindCommand (this.model, surface, false);

src/main/java/de/mossgrabers/controller/mackie/mcu/MCUControllerSetup.java

@@ -186,7 +186,7 @@ public class MaschineJamControlSurface extends AbstractMaschineControlSurface<Ma
      *
      * @param host The host
      * @param colorManager The color manager
-     * @param maschine The maschine description
+     * @param data.maschine The maschine description
      * @param configuration The configuration
      * @param output The MIDI output
      * @param input The MIDI input

src/main/java/de/mossgrabers/controller/ni/maschine/jam/controller/MaschineJamControlSurface.java

@@ -23,9 +23,12 @@
 import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.AddDeviceCommand;
 import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.KeyboardCommand;
 import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.MaschineCursorCommand;
+import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.MaschineEncoderPressCommand;
+import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.MaschineMk2PlayViewSwitchCommand;
 import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.MaschineSelectButtonCommand;
 import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.MaschineSendSelectCommand;
 import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.MaschineStopCommand;
+import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.MaschineTapMetroCommand;
 import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.PadModeCommand;
 import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.PageCommand;
 import de.mossgrabers.controller.ni.maschine.mk3.command.trigger.ProjectButtonCommand;
@@ -82,7 +85,6 @@
 import de.mossgrabers.framework.command.trigger.transport.ConfiguredRecordCommand;
 import de.mossgrabers.framework.command.trigger.transport.MetronomeCommand;
 import de.mossgrabers.framework.command.trigger.transport.PlayCommand;
-import de.mossgrabers.framework.command.trigger.transport.TapTempoCommand;
 import de.mossgrabers.framework.command.trigger.transport.ToggleLoopCommand;
 import de.mossgrabers.framework.command.trigger.view.ToggleShiftViewCommand;
 import de.mossgrabers.framework.command.trigger.view.ViewMultiSelectCommand;
@@ -157,7 +159,7 @@ public class MaschineControllerSetup extends AbstractControllerSetup<MaschineCon
      * @param factory The factory
      * @param globalSettings The global settings
      * @param documentSettings The document (project) specific settings
-     * @param maschine The specific maschine model
+     * @param maschine The specific Maschine model
      */
     public MaschineControllerSetup (final IHost host, final ISetupFactory factory, final ISettingsUI globalSettings, final ISettingsUI documentSettings, final Maschine maschine)
     {
@@ -313,6 +315,7 @@ protected void registerTriggerCommands ()
         final ModeManager modeManager = surface.getModeManager ();
         final ViewManager viewManager = surface.getViewManager ();
         final ITransport t = this.model.getTransport ();
+        this.mainKnobCommand = new MainKnobRowModeCommand (this.model, surface);
 
         this.addButton (ButtonID.SHIFT, "SHIFT", new ToggleShiftViewCommand<> (this.model, surface), this.maschine == Maschine.STUDIO ? MaschineControlSurface.NAVIGATE_BACK : -1, () -> viewManager.isActive (Views.SHIFT) || surface.isShiftPressed ());
 
@@ -324,19 +327,7 @@ protected void registerTriggerCommands ()
         this.addButton (ButtonID.STOP, "STOP", new MaschineStopCommand (this.model, surface), MaschineControlSurface.STOP, () -> !t.isPlaying ());
         this.addButton (ButtonID.LOOP, "LOOP", new ToggleLoopCommand<> (this.model, surface), MaschineControlSurface.RESTART, t::isLoop);
         this.addButton (ButtonID.DELETE, "ERASE", NopCommand.INSTANCE, MaschineControlSurface.ERASE);
-        final MetronomeCommand<MaschineControlSurface, MaschineConfiguration> metroCommand = new MetronomeCommand<> (this.model, surface, false);
-        final TapTempoCommand<MaschineControlSurface, MaschineConfiguration> tapTempoCommand = new TapTempoCommand<> (this.model, surface);
-        this.addButton (ButtonID.TAP_TEMPO, "TAP/METRO", (event, velocity) -> {
-            if (event != ButtonEvent.UP)
-                return;
-            if (surface.isShiftPressed ())
-            {
-                surface.setStopConsumed ();
-                metroCommand.executeNormal (event);
-            }
-            else
-                tapTempoCommand.execute (ButtonEvent.DOWN, velocity);
-        }, MaschineControlSurface.TAP_METRO, t::isMetronomeOn);
+        this.addButton (ButtonID.TAP_TEMPO, "TAP/METRO", new MaschineTapMetroCommand (this.model, surface), MaschineControlSurface.TAP_METRO, t::isMetronomeOn);
 
         this.addButton (ButtonID.FLIP, this.maschine == Maschine.STUDIO || this.maschine == Maschine.MK2 ? "GRID" : "FOLLOW", (event, velocity) -> {
             if (event != ButtonEvent.UP)
@@ -373,24 +364,7 @@ protected void shiftedFunction ()
         this.addButton (ButtonID.F2, "MOD", new RibbonCommand (this.model, surface, RIBBON_MODES_CC), MaschineControlSurface.MOD, () -> this.isRibbonMode (new HashSet<> (RIBBON_MODES_CC)));
         this.addButton (ButtonID.F3, "PERFORM", new RibbonCommand (this.model, surface, RIBBON_MODES_MASTER_VOLUME), MaschineControlSurface.PERFORM, () -> this.isRibbonMode (new HashSet<> (RIBBON_MODES_MASTER_VOLUME)));
         this.addButton (ButtonID.F4, "NOTES", new RibbonCommand (this.model, surface, RIBBON_MODES_NOTE_REPEAT), MaschineControlSurface.NOTES, () -> this.isRibbonMode (new HashSet<> (RIBBON_MODES_NOTE_REPEAT)));
-
-        this.addButton (ButtonID.FADER_TOUCH_1, "ENCODER PRESS", (event, velocity) -> {
-
-            if (event != ButtonEvent.DOWN)
-                return;
-
-            if (modeManager.getActiveID () == Modes.BROWSER)
-            {
-                this.model.getBrowser ().stopBrowsing (true);
-                modeManager.restore ();
-            }
-            else
-            {
-                this.mainKnobCommand.toggleControlLastParamActive ();
-                surface.getDisplay ().notify ("Last Param: " + (this.mainKnobCommand.isControlLastParamActive () ? " ON" : "OFF"));
-            }
-
-        }, MaschineControlSurface.ENCODER_PUSH);
+        this.addButton (ButtonID.FADER_TOUCH_1, "ENCODER PRESS", new MaschineEncoderPressCommand (this.model, surface, this.mainKnobCommand), MaschineControlSurface.ENCODER_PUSH);
 
         // Encoder Modes
         this.addButton (ButtonID.VOLUME, "VOLUME", new VolumePanSendCommand (this.model, surface), MaschineControlSurface.VOLUME, () -> Modes.isTrackMode (modeManager.getActiveID ()));
@@ -444,7 +418,7 @@ protected boolean getCommit ()
         this.addButton (ButtonID.ACCENT, "ACCENT", new ToggleFixedVelCommand (this.model, surface), MaschineControlSurface.FIXED_VEL, this.configuration::isAccentActive);
 
         this.addButton (ButtonID.SCENE1, "SCENE", new ViewMultiSelectCommand<> (this.model, surface, Views.SCENE_PLAY), MaschineControlSurface.SCENE, () -> viewManager.isActive (Views.SCENE_PLAY));
-        this.addButton (ButtonID.CLIP, "PATTERN", new ViewMultiSelectCommand<> (this.model, surface, Views.SESSION), MaschineControlSurface.PATTERN, () -> viewManager.isActive (Views.CLIP_LENGTH));
+        this.addButton (ButtonID.CLIP, "PATTERN", new ViewMultiSelectCommand<> (this.model, surface, Views.SESSION), MaschineControlSurface.PATTERN, () -> viewManager.isActive (Views.CLIP_LENGTH, Views.SESSION));
         this.addButton (ButtonID.NOTE, "EVENTS", new ModeSelectCommand<> (this.model, surface, Modes.NOTE, true), MaschineControlSurface.EVENTS, () -> modeManager.isActive (Modes.NOTE));
         this.addButton (ButtonID.TOGGLE_DEVICE, this.maschine == Maschine.STUDIO || this.maschine == Maschine.MK2 ? "NAVIGATE" : "VARIATION", new ViewMultiSelectCommand<> (this.model, surface, Views.DEVICE), MaschineControlSurface.VARIATION, () -> viewManager.isActive (Views.DEVICE));
         this.addButton (ButtonID.DUPLICATE, "DUPLICATE", NopCommand.INSTANCE, MaschineControlSurface.DUPLICATE);
@@ -476,13 +450,20 @@ protected boolean getCommit ()
             this.addButton (ButtonID.MUTE, "MUTE", new ViewMultiSelectCommand<> (this.model, surface, Views.TRACK_MUTE), MaschineControlSurface.MUTE, () -> viewManager.isActive (Views.TRACK_MUTE));
         }
 
-        final KeyboardCommand keyboardCommand = new KeyboardCommand (this.model, surface);
-        this.addButton (ButtonID.ROW1_1, "PAD MODE", new PadModeCommand (keyboardCommand, this.model, surface), MaschineControlSurface.PAD_MODE, () -> viewManager.isActive (Views.DRUM));
-        this.addButton (ButtonID.ROW1_2, "KEYBOARD", keyboardCommand, MaschineControlSurface.KEYBOARD, () -> viewManager.isActive (Views.PLAY));
-        this.addButton (ButtonID.ROW1_3, "CHORDS", (event, velocity) -> {
-            if (velocity == 0)
-                ((PlayView) viewManager.get (Views.PLAY)).toggleChordMode ();
-        }, MaschineControlSurface.CHORDS, ((PlayView) viewManager.get (Views.PLAY))::isChordMode);
+        if (this.maschine == Maschine.MK2 || this.maschine == Maschine.STUDIO)
+        {
+            this.addButton (ButtonID.ROW1_1, "PAD MODE", new MaschineMk2PlayViewSwitchCommand (this.model, surface), MaschineControlSurface.PAD_MODE, () -> viewManager.isActive (Views.DRUM, Views.PLAY));
+        }
+        else
+        {
+            final KeyboardCommand keyboardCommand = new KeyboardCommand (this.model, surface);
+            this.addButton (ButtonID.ROW1_1, "PAD MODE", new PadModeCommand (keyboardCommand, this.model, surface), MaschineControlSurface.PAD_MODE, () -> viewManager.isActive (Views.DRUM));
+            this.addButton (ButtonID.ROW1_2, "KEYBOARD", keyboardCommand, MaschineControlSurface.KEYBOARD, () -> viewManager.isActive (Views.PLAY));
+            this.addButton (ButtonID.ROW1_3, "CHORDS", (event, velocity) -> {
+                if (velocity == 0)
+                    ((PlayView) viewManager.get (Views.PLAY)).toggleChordMode ();
+            }, MaschineControlSurface.CHORDS, ((PlayView) viewManager.get (Views.PLAY))::isChordMode);
+        }
 
         final DrumView drumView = (DrumView) viewManager.get (Views.DRUM);
         this.addButton (ButtonID.ROW1_4, "STEP", (event, velocity) -> {
@@ -683,7 +664,6 @@ protected void registerContinuousCommands ()
         final ModeManager modeManager = surface.getModeManager ();
         final ViewManager viewManager = surface.getViewManager ();
 
-        this.mainKnobCommand = new MainKnobRowModeCommand (this.model, surface);
         final IHwRelativeKnob knob = this.addRelativeKnob (ContinuousID.MASTER_KNOB, "Encoder", this.mainKnobCommand, MaschineControlSurface.ENCODER);
         knob.bindTouch ( (event, velocity) -> {
             final IMode mode = modeManager.getActive ();

src/main/java/de/mossgrabers/controller/ni/maschine/mk3/MaschineControllerSetup.java

@@ -0,0 +1,61 @@
+// Written by Jürgen Moßgraber - mossgrabers.de
+// (c) 2017-2025
+// Licensed under LGPLv3 - http://www.gnu.org/licenses/lgpl-3.0.txt
+
+package de.mossgrabers.controller.ni.maschine.mk3.command.trigger;
+
+import de.mossgrabers.controller.ni.maschine.mk3.MaschineConfiguration;
+import de.mossgrabers.controller.ni.maschine.mk3.command.continuous.MainKnobRowModeCommand;
+import de.mossgrabers.controller.ni.maschine.mk3.controller.MaschineControlSurface;
+import de.mossgrabers.framework.command.core.AbstractTriggerCommand;
+import de.mossgrabers.framework.daw.IModel;
+import de.mossgrabers.framework.featuregroup.ModeManager;
+import de.mossgrabers.framework.mode.Modes;
+import de.mossgrabers.framework.utils.ButtonEvent;
+
+
+/**
+ * Command to handle pressing the main encoder button.
+ *
+ * @author Jürgen Moßgraber
+ */
+public class MaschineEncoderPressCommand extends AbstractTriggerCommand<MaschineControlSurface, MaschineConfiguration>
+{
+    final MainKnobRowModeCommand mainKnobCommand;
+
+
+    /**
+     * Constructor.
+     *
+     * @param model The model
+     * @param surface The surface
+     * @param mainKnobCommand
+     */
+    public MaschineEncoderPressCommand (final IModel model, final MaschineControlSurface surface, final MainKnobRowModeCommand mainKnobCommand)
+    {
+        super (model, surface);
+
+        this.mainKnobCommand = mainKnobCommand;
+    }
+
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute (final ButtonEvent event, final int velocity)
+    {
+        if (event != ButtonEvent.DOWN)
+            return;
+
+        final ModeManager modeManager = this.surface.getModeManager ();
+        if (modeManager.getActiveID () == Modes.BROWSER)
+        {
+            this.model.getBrowser ().stopBrowsing (true);
+            modeManager.restore ();
+        }
+        else
+        {
+            this.mainKnobCommand.toggleControlLastParamActive ();
+            this.surface.getDisplay ().notify ("Last Param: " + (this.mainKnobCommand.isControlLastParamActive () ? " ON" : "OFF"));
+        }
+    }
+}