* Akai APC40 / APC40mkII

  * New: Shift mode is automatically closed again if Shift was used in combination with a button.
* Electra One
  * New: The 3rd knob on the bottom row of the transport page controls now the hovered parameter introduced in Bitwig 5.3. It is required to reinstall the template.
* Fire
  * Fixed: Switching Project and Track parameter pages did jump by 8 and not 1.
* Maschine
  * New: The 4D-Encoder can now control the hovered parameter introduced in Bitwig 5.3. Press it to toggle to that function.
* MCU
  * New: The hovered parameter introduced in Bitwig 5.3 can now also be controlled with the master fader.

Author: git-moss

DrivenByMoss-Manual.pdf

@@ -4,7 +4,7 @@
   <groupId>de.mossgrabers</groupId>
   <artifactId>DrivenByMoss</artifactId>
   <name>DrivenByMoss</name>
-  <version>25.1.0</version>
+  <version>25.1.1</version>
   <licenses>
     <license>
       <name>LGPL-2.1-or-later</name>

dependency-reduced-pom.xml

@@ -6,7 +6,7 @@
 	<artifactId>DrivenByMoss</artifactId>
 	<packaging>jar</packaging>
 	<name>DrivenByMoss</name>
-	<version>25.1.0</version>
+	<version>25.1.1</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>

pom.xml

@@ -4,6 +4,9 @@
 
 package de.mossgrabers.controller.akai.apc;
 
+import java.util.Optional;
+import java.util.function.IntSupplier;
+
 import de.mossgrabers.controller.akai.apc.command.continuous.APCPlayPositionCommand;
 import de.mossgrabers.controller.akai.apc.command.continuous.APCTempoCommand;
 import de.mossgrabers.controller.akai.apc.command.trigger.APCBrowserCommand;
@@ -32,6 +35,7 @@
 import de.mossgrabers.controller.akai.apc.view.SessionView;
 import de.mossgrabers.controller.akai.apc.view.ShiftView;
 import de.mossgrabers.framework.command.continuous.KnobRowModeCommand;
+import de.mossgrabers.framework.command.core.TriggerCommand;
 import de.mossgrabers.framework.command.trigger.Direction;
 import de.mossgrabers.framework.command.trigger.FootswitchCommand;
 import de.mossgrabers.framework.command.trigger.application.PaneCommand;
@@ -87,8 +91,6 @@
 import de.mossgrabers.framework.view.TempoView;
 import de.mossgrabers.framework.view.Views;
 
-import java.util.Optional;
-
 
 /**
  * Support for the Akai APC40 mkI and APC40 mkII controllers.
@@ -97,7 +99,8 @@
  */
 public class APCControllerSetup extends AbstractControllerSetup<APCControlSurface, APCConfiguration>
 {
-    private final boolean isMkII;
+    private final boolean      isMkII;
+    private APCTapTempoCommand tapTempoCommand;
 
 
     /**
@@ -217,7 +220,8 @@ protected void registerTriggerCommands ()
         this.addButton (ButtonID.SHIFT, "SHIFT", new ToggleShiftViewCommand<> (this.model, surface), APCControlSurface.APC_BUTTON_SHIFT);
         this.addButton (ButtonID.PLAY, "PLAY", new PlayCommand<> (this.model, surface), APCControlSurface.APC_BUTTON_PLAY, t::isPlaying, ColorManager.BUTTON_STATE_OFF, ColorManager.BUTTON_STATE_ON);
         this.addButton (ButtonID.RECORD, "RECORD", new APCRecordCommand (this.model, surface), APCControlSurface.APC_BUTTON_RECORD, t::isRecording, ColorManager.BUTTON_STATE_OFF, ColorManager.BUTTON_STATE_ON);
-        this.addButton (ButtonID.TAP_TEMPO, "TEMPO", new APCTapTempoCommand (this.model, surface), APCControlSurface.APC_BUTTON_TAP_TEMPO);
+        this.tapTempoCommand = new APCTapTempoCommand (this.model, surface);
+        this.addButton (ButtonID.TAP_TEMPO, "TEMPO", this.tapTempoCommand, APCControlSurface.APC_BUTTON_TAP_TEMPO);
         this.addButton (ButtonID.QUANTIZE, this.isMkII ? "DEV.LOCK" : "REC QUANTIZATION", new APCQuantizeCommand (this.model, surface), APCControlSurface.APC_BUTTON_REC_QUANT, () -> surface.isPressed (ButtonID.QUANTIZE) ? 1 : 0, ColorManager.BUTTON_STATE_OFF, ColorManager.BUTTON_STATE_ON);
         this.addButton (ButtonID.MASTERTRACK, "MASTER", new MasterCommand<> (this.model, surface), APCControlSurface.APC_BUTTON_MASTER, this.model.getMasterTrack ()::isSelected, ColorManager.BUTTON_STATE_OFF, ColorManager.BUTTON_STATE_ON);
         // Note: the stop-all-clips button has no LED
@@ -316,7 +320,7 @@ protected void registerContinuousCommands ()
         this.addFader (ContinuousID.FADER_MASTER, "Master", null, BindType.CC, APCControlSurface.APC_KNOB_MASTER_LEVEL).bind (this.model.getMasterTrack ().getVolumeParameter ());
         this.addFader (ContinuousID.CROSSFADER, "Crossfader", null, BindType.CC, APCControlSurface.APC_KNOB_CROSSFADER, false).bind (this.model.getTransport ().getCrossfadeParameter ());
 
-        final Timeout timeout = ((APCTapTempoCommand) surface.getButton (ButtonID.TAP_TEMPO).getCommand ()).getTimeout ();
+        final Timeout timeout = this.tapTempoCommand.getTimeout ();
         this.addRelativeKnob (ContinuousID.PLAY_POSITION, "Play Position", new APCPlayPositionCommand (this.model, surface, timeout), APCControlSurface.APC_KNOB_CUE_LEVEL);
 
         for (int i = 0; i < 8; i++)
@@ -775,4 +779,28 @@ private boolean getButtonState (final int index, final int button)
                 return false;
         }
     }
+
+
+    /** {@inheritDoc} */
+    @Override
+    protected void addButton (final APCControlSurface surface, final ButtonID buttonID, final String label, final TriggerCommand command, final int midiInputChannel, final int midiOutputChannel, final int midiControl, final int value, final boolean hasLight, final IntSupplier supplier, final String... colorIds)
+    {
+        // Wrap all commands to automatically close the shift mode, if shift was used in combination
+        // with a button outside of the grid
+
+        final TriggerCommand shiftModeCloserCommand = buttonID == ButtonID.SHIFT ? command : (event, velocity) -> {
+
+            if (surface.isShiftPressed () && event == ButtonEvent.DOWN)
+            {
+                final ViewManager viewManager = surface.getViewManager ();
+                if (viewManager.getActiveID () == Views.SHIFT)
+                    viewManager.restore ();
+            }
+
+            command.execute (event, velocity);
+
+        };
+
+        super.addButton (surface, buttonID, label, shiftModeCloserCommand, midiInputChannel, midiOutputChannel, midiControl, value, hasLight, supplier, colorIds);
+    }
 }

resources/Electra.One/DrivenByMoss.eproj

@@ -169,7 +169,7 @@ public int getPadSaturation ()
 
     /**
      * Should the SELECT knob control the last touched parameter?
-     * 
+     *
      * @return True to control
      */
     public boolean isControlLastParam ()

src/main/java/de/mossgrabers/controller/akai/apc/APCControllerSetup.java

@@ -39,6 +39,7 @@ public FireUserMode (final FireControlSurface surface, final IModel model)
         super (surface, model, false, ContinuousID.createSequentialList (ContinuousID.KNOB1, 4), surface::isShiftPressed, false);
 
         this.notifyPageChange = false;
+        this.isAlternativeFunction = () -> false;
 
         this.projectParameterProvider = new FourKnobProvider<> (surface, new BankParameterProvider (model.getProject ().getParameterBank ()), ButtonID.ALT);
         this.trackParameterProvider = new FourKnobProvider<> (surface, new BankParameterProvider (model.getCursorTrack ().getParameterBank ()), ButtonID.ALT);

src/main/java/de/mossgrabers/controller/akai/fire/FireConfiguration.java

@@ -70,6 +70,7 @@ protected void createModel ()
 
         ms.enableMainDrumDevice (false);
         ms.enableDevice (DeviceID.EQ);
+        ms.setWantsFocusedParameter (true);
 
         ms.setNumTracks (5);
         ms.setHasFlatTrackList (true);

src/main/java/de/mossgrabers/controller/akai/fire/mode/FireUserMode.java

@@ -19,6 +19,7 @@
 import de.mossgrabers.framework.daw.data.IMasterTrack;
 import de.mossgrabers.framework.daw.data.ISlot;
 import de.mossgrabers.framework.daw.data.bank.IMarkerBank;
+import de.mossgrabers.framework.parameter.IFocusedParameter;
 import de.mossgrabers.framework.parameter.PlayPositionParameter;
 import de.mossgrabers.framework.parameter.TempoParameter;
 import de.mossgrabers.framework.parameterprovider.special.CombinedParameterProvider;
@@ -73,7 +74,7 @@ emptyParameterProvider5, new FixedParameterProvider (new TempoParameter (model.g
                 // Row 5
                 new EmptyParameterProvider (1), new FixedParameterProvider (this.transport.getMetronomeVolumeParameter ()), new FixedParameterProvider (this.project.getCueVolumeParameter ()), new EmptyParameterProvider (3),
                 // Row 6
-                emptyParameterProvider6));
+                new EmptyParameterProvider (2), new FixedParameterProvider (this.model.getFocusedParameter ().get ()), new EmptyParameterProvider (3)));
     }
 
 
@@ -245,6 +246,10 @@ public void updateDisplay ()
 
         // Row 6
         this.pageCache.updateColor (5, 1, this.transport.isMetronomeOn () ? ElectraOneColorManager.METRONOME_ON : ElectraOneColorManager.METRONOME_OFF);
+        final Optional<IFocusedParameter> focusedParameter = this.model.getFocusedParameter ();
+        final int paramValue = focusedParameter.isPresent () ? focusedParameter.get ().getValue () : 0;
+        final String paramStr = focusedParameter.isPresent () ? focusedParameter.get ().getDisplayedValue () : "";
+        this.pageCache.updateValue (5, 2, paramValue, StringUtils.optimizeName (StringUtils.fixASCII (paramStr), 15));
         this.pageCache.updateColor (5, 3, this.transport.isArrangerOverdub () ? ElectraOneColorManager.AUTO_MODE_ON : ElectraOneColorManager.AUTO_MODE_OFF);
         this.pageCache.updateColor (5, 4, this.launchMarkers ? ElectraOneColorManager.MARKER_LAUNCH_ON : ElectraOneColorManager.MARKER_LAUNCH_OFF);
 

src/main/java/de/mossgrabers/controller/electra/one/ElectraOneControllerSetup.java

@@ -122,6 +122,8 @@ public enum VUMeterStyle
     public static final Integer       PIN_FXTRACKS_TO_LAST_CONTROLLER       = Integer.valueOf (66);
     /** Support X-Touch display back-light colors. */
     public static final Integer       X_TOUCH_DISPLAY_COLORS                = Integer.valueOf (67);
+    /** A button/foot-switch assignment has changed. */
+    public static final Integer       ASSIGNABLE_BUTTONS                    = Integer.valueOf (68);
 
     /** Use a Function button to switch to previous mode. */
     public static final int           FOOTSWITCH_PREV_MODE                  = 15;
@@ -144,9 +146,11 @@ public enum VUMeterStyle
     /** Use a Function button to switch to next channel. */
     public static final int           NEXT_CHANNEL                          = 24;
     /** Toggle between the encoder knob behavior and controlling the last selected parameter. */
-    public static final int           CONTROL_LAST_PARAM                    = 25;
+    public static final int           CONTROL_LAST_PARAM_ENCODER            = 25;
+    /** Toggle between the master fader behavior and controlling the last selected parameter. */
+    public static final int           CONTROL_LAST_PARAM_MASTER_FADER       = 26;
     /** Use a Function button to execute an action. */
-    public static final int           FOOTSWITCH_ACTION                     = 26;
+    public static final int           FOOTSWITCH_ACTION                     = 27;
 
     private static final String       CATEGORY_EXTENDER_SETUP               = "Extender Setup (requires restart)";
     private static final String       CATEGORY_SEGMENT_DISPLAY              = "Segment Display";
@@ -203,7 +207,8 @@ public enum VUMeterStyle
         "Device on/off",
         "Channel Prev",
         "Channel Next",
-        "Last hovered/clicked parameter",
+        "Last parameter (encoder)",
+        "Last parameter (master fader)",
         "Action"
     };
 
@@ -727,7 +732,12 @@ private void activateAssignableSettings (final ISettingsUI settingsUI)
         {
             final int pos = i;
             final IEnumSetting assignableSetting = settingsUI.getEnumSetting (ASSIGNABLE_BUTTON_NAMES[i], CATEGORY_ASSIGNABLE_BUTTONS, ASSIGNABLE_VALUES, ASSIGNABLE_VALUES[ASSIGNABLE_BUTTON_DEFAULTS[i]]);
-            assignableSetting.addValueObserver (value -> this.assignableFunctions[pos] = lookupIndex (ASSIGNABLE_VALUES, value));
+            assignableSetting.addValueObserver (value -> {
+
+                this.assignableFunctions[pos] = lookupIndex (ASSIGNABLE_VALUES, value);
+                this.notifyObservers (ASSIGNABLE_BUTTONS);
+
+            });
 
             final IActionSetting actionSetting = settingsUI.getActionSetting (ASSIGNABLE_BUTTON_NAMES[i] + " - Action", CATEGORY_ASSIGNABLE_BUTTONS);
             actionSetting.addValueObserver (value -> this.assignableFunctionActions[pos] = actionSetting.get ());