8000 * MCU · git-moss/DrivenByMoss@f944b92 · GitHub
[go: up one dir, main page]
Skip to content

Commit f944b92

Browse files
git-mossgit-moss
committed
* MCU
 * 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.
1 parent 01fd1d5 commit f944b92

29 files changed

+232
-198
lines changed

‎dependency-reduced-pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>de.mossgrabers</groupId>
55
<artifactId>DrivenByMoss</artifactId>
66
<name>DrivenByMoss</name>
7-
<version>26.2.0</version>
7+
<version>26.2.1</version>
88
<licenses>
99
<license>
1010
<name>LGPL-2.1-or-later</name>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<artifactId>DrivenByMoss</artifactId>
77
<packaging>jar</packaging>
88
<name>DrivenByMoss</name>
9-
<version>26.2.0</version>
9+
<version>26.2.1</version>
1010
<properties>
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
</properties>

‎src/main/java/de/mossgrabers/controller/ableton/push/PushConfiguration.java‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -46,93 +46,93 @@ public enum LockState
4646

4747

4848
/** Setting for the ribbon mode. */
49-
public static final Integer RIBBON_MODE = Integer.valueOf (50);
49+
public static final Integer RIBBON_MODE = Integer.valueOf (NEXT_SETTING_ID);
5050
/** Setting for the ribbon mode MIDI CC. */
51-
public static final Integer RIBBON_MODE_CC_VAL = Integer.valueOf (51);
51+
public static final Integer RIBBON_MODE_CC_VAL = Integer.valueOf (NEXT_SETTING_ID + 1);
5252
/** Setting for the ribbon mode note repeat. */
53-
public static final Integer RIBBON_MODE_NOTE_REPEAT = Integer.valueOf (52);
53+
public static final Integer RIBBON_MODE_NOTE_REPEAT = Integer.valueOf (NEXT_SETTING_ID + 2);
5454

5555
/** Setting for the velocity curve. */
56-
public static final Integer VELOCITY_CURVE = Integer.valueOf (53);
56+
public static final Integer VELOCITY_CURVE = Integer.valueOf (NEXT_SETTING_ID + 3);
5757
/** Setting for the Push 1 pad threshold. */
58-
public static final Integer PAD_PUSH1_THRESHOLD = Integer.valueOf (54);
58+
public static final Integer PAD_PUSH1_THRESHOLD = Integer.valueOf (NEXT_SETTING_ID + 4);
5959
/** Setting for the display brightness. */
60-
public static final Integer DISPLAY_BRIGHTNESS = Integer.valueOf (55);
60+
public static final Integer DISPLAY_BRIGHTNESS = Integer.valueOf (NEXT_SETTING_ID + 5);
6161
/** Setting for the pad LED brightness. */
62-
public static final Integer LED_BRIGHTNESS = Integer.valueOf (56);
62+
public static final Integer LED_BRIGHTNESS = Integer.valueOf (NEXT_SETTING_ID + 6);
6363
/** Setting for the Push 2 pad sensitivity. */
64-
public static final Integer PAD_PUSH2_SENSITIVITY = Integer.valueOf (57);
64+
public static final Integer PAD_PUSH2_SENSITIVITY = Integer.valueOf (NEXT_SETTING_ID + 7);
6565
/** Setting for the Push 2 pad gain. */
66-
public static final Integer PAD_PUSH2_GAIN = Integer.valueOf (58);
66+
public static final Integer PAD_PUSH2_GAIN = Integer.valueOf (NEXT_SETTING_ID + 8);
6767
/** Setting for the Push 2 pad dynamics. */
68-
public static final Integer PAD_PUSH2_DYNAMICS = Integer.valueOf (59);
68+
public static final Integer PAD_PUSH2_DYNAMICS = Integer.valueOf (NEXT_SETTING_ID + 9);
6969
/** Setting for the Push 3 pad velocity curve - threshold parameter. */
70-
public static final Integer PAD_PUSH3_THRESHOLD = Integer.valueOf (60);
70+
public static final Integer PAD_PUSH3_THRESHOLD = Integer.valueOf (NEXT_SETTING_ID + 10);
7171
/** Setting for the Push 3 pad velocity curve - drive parameter. */
72-
public static final Integer PAD_PUSH3_DRIVE = Integer.valueOf (61);
72+
public static final Integer PAD_PUSH3_DRIVE = Integer.valueOf (NEXT_SETTING_ID + 11);
7373
/** Setting for the Push 3 pad velocity curve - compand parameter. */
74-
public static final Integer PAD_PUSH3_COMPAND = Integer.valueOf (62);
74+
public static final Integer PAD_PUSH3_COMPAND = Integer.valueOf (NEXT_SETTING_ID + 12);
7575
/** Setting for the Push 3 pad velocity curve - range parameter. */
76-
public static final Integer PAD_PUSH3_RANGE = Integer.valueOf (64);
76+
public static final Integer PAD_PUSH3_RANGE = Integer.valueOf (NEXT_SETTING_ID + 14);
7777

7878
/** Setting for stopping automation recording on knob release. */
79-
public static final Integer STOP_AUTOMATION_ON_KNOB_RELEASE = Integer.valueOf (65);
79+
public static final Integer STOP_AUTOMATION_ON_KNOB_RELEASE = Integer.valueOf (NEXT_SETTING_ID + 15);
8080
/** Mode debug. */
81-
public static final Integer DEBUG_MODE = Integer.valueOf (66);
81+
public static final Integer DEBUG_MODE = Integer.valueOf (NEXT_SETTING_ID + 16);
8282
/** Push 2 display debug window. */
83-
public static final Integer DEBUG_WINDOW = Integer.valueOf (67);
83+
public static final Integer DEBUG_WINDOW = Integer.valueOf (NEXT_SETTING_ID + 17);
8484

8585
/** Background color of an element. */
86-
public static final Integer COLOR_BACKGROUND = Integer.valueOf (70);
86+
public static final Integer COLOR_BACKGROUND = Integer.valueOf (NEXT_SETTING_ID + 20);
8787
/** Border color of an element. */
88-
public static final Integer COLOR_BORDER = Integer.valueOf (71);
88+
public static final Integer COLOR_BORDER = Integer.valueOf (NEXT_SETTING_ID + 21);
8989
/** Text color of an element. */
90-
public static final Integer COLOR_TEXT = Integer.valueOf (72);
90+
public static final Integer COLOR_TEXT = Integer.valueOf (NEXT_SETTING_ID + 22);
9191
/** Fader color of an element. */
92-
public static final Integer COLOR_FADER = Integer.valueOf (73);
92+
public static final Integer COLOR_FADER = Integer.valueOf (NEXT_SETTING_ID + 23);
9393
/** VU color of an element. */
94-
public static final Integer COLOR_VU = Integer.valueOf (74);
94+
public static final Integer COLOR_VU = Integer.valueOf (NEXT_SETTING_ID + 24);
9595
/** Edit color of an element. */
96-
public static final Integer COLOR_EDIT = Integer.valueOf (75);
96+
public static final Integer COLOR_EDIT = Integer.valueOf (NEXT_SETTING_ID + 25);
9797
/** Record color of an element. */
98-
public static final Integer COLOR_RECORD = Integer.valueOf (76);
98+
public static final Integer COLOR_RECORD = Integer.valueOf (NEXT_SETTING_ID + 26);
9999
/** Solo color of an element. */
100-
public static final Integer COLOR_SOLO = Integer.valueOf (77);
100+
public static final Integer COLOR_SOLO = Integer.valueOf (NEXT_SETTING_ID + 27);
101101
/** Mute color of an element. */
102-
public static final Integer COLOR_MUTE = Integer.valueOf (78);
102+
public static final Integer COLOR_MUTE = Integer.valueOf (NEXT_SETTING_ID + 28);
103103
/** Background color darker of an element. */
104-
public static final Integer COLOR_BACKGROUND_DARKER = Integer.valueOf (79);
104+
public static final Integer COLOR_BACKGROUND_DARKER = Integer.valueOf (NEXT_SETTING_ID + 29);
105105
/** Background color lighter of an element. */
106-
public static final Integer COLOR_BACKGROUND_LIGHTER = Integer.valueOf (80);
106+
public static final Integer COLOR_BACKGROUND_LIGHTER = Integer.valueOf (NEXT_SETTING_ID + 30);
107107

108108
/** Session view options. */
109-
public static final Integer SESSION_VIEW = Integer.valueOf (81);
109+
public static final Integer SESSION_VIEW = Integer.valueOf (NEXT_SETTING_ID + 31);
110110
/** Display scenes or clips. */
111-
public static final Integer DISPLAY_SCENES_CLIPS = Integer.valueOf (82);
111+
public static final Integer DISPLAY_SCENES_CLIPS = Integer.valueOf (NEXT_SETTING_ID + 32);
112112

113113
/** MPE - Per-pad pitchbend. */
114-
public static final Integer PER_PAD_PITCHBEND = Integer.valueOf (83);
114+
public static final Integer PER_PAD_PITCHBEND = Integer.valueOf (NEXT_SETTING_ID + 33);
115115
/** MPE - Pad in-tune location. */
116-
public static final Integer IN_TUNE_LOCATION = Integer.valueOf (84);
116+
public static final Integer IN_TUNE_LOCATION = Integer.valueOf (NEXT_SETTING_ID + 34);
117117
/** MPE - Pad in-tune location width. */
118-
public static final Integer IN_TUNE_WIDTH = Integer.valueOf (85);
118+
public static final Integer IN_TUNE_WIDTH = Integer.valueOf (NEXT_SETTING_ID + 35);
119119
/** MPE - Pad in-tune location height. */
120-
public static final Integer IN_TUNE_SLIDE_HEIGHT = Integer.valueOf (86);
120+
public static final Integer IN_TUNE_SLIDE_HEIGHT = Integer.valueOf (NEXT_SETTING_ID + 36);
121121

122122
/** Audio Interface - Footswitch or CV 1. */
123-
public static final Integer PEDAL_1 = Integer.valueOf (87);
123+
public static final Integer PEDAL_1 = Integer.valueOf (NEXT_SETTING_ID + 37);
124124
/** Audio Interface - Footswitch or CV 2. */
125-
public static final Integer PEDAL_2 = Integer.valueOf (88);
125+
public static final Integer PEDAL_2 = Integer.valueOf (NEXT_SETTING_ID + 38);
126126 /** Audio Interface - Pre-amp type 1. */
127-
public static final Integer PREAMP_TYPE_1 = Integer.valueOf (89);
127+
public static final Integer PREAMP_TYPE_1 = Integer.valueOf (NEXT_SETTING_ID + 39);
128128
/** Audio Interface - Pre-amp type 2. */
129-
public static final Integer PREAMP_TYPE_2 = Integer.valueOf (90);
129+
public static final Integer PREAMP_TYPE_2 = Integer.valueOf (NEXT_SETTING_ID + 40);
130130
/** Audio Interface - Pre-amp gain 1. */
131-
public static final Integer PREAMP_GAIN_1 = Integer.valueOf (91);
131+
public static final Integer PREAMP_GAIN_1 = Integer.valueOf (NEXT_SETTING_ID + 41);
132132
/** Audio Interface - Pre-amp gain 2. */
133-
public static final Integer PREAMP_GAIN_2 = Integer.valueOf (92);
133+
public static final Integer PREAMP_GAIN_2 = Integer.valueOf (NEXT_SETTING_ID + 42);
134134
/** Audio Interface - Output configuration. */
135-
public static final Integer AUDIO_OUTPUTS = Integer.valueOf (93);
135+
public static final Integer AUDIO_OUTPUTS = Integer.valueOf (NEXT_SETTING_ID + 43);
136136

137137
/** Use ribbon for pitch bend. */
138138
public static final int RIBBON_MODE_PITCH = 0;

‎src/main/java/de/mossgrabers/controller/akai/acvs/ACVSConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
package de.mossgrabers.controller.akai.acvs;
66

7+
import java.util.List;
8+
79
import de.mossgrabers.framework.configuration.AbstractConfiguration;
810
import de.mossgrabers.framework.configuration.IEnumSetting;
911
import de.mossgrabers.framework.configuration.ISettingsUI;
1012
import de.mossgrabers.framework.controller.valuechanger.IValueChanger;
1113
import de.mossgrabers.framework.daw.IHost;
1214
import de.mossgrabers.framework.daw.midi.ArpeggiatorMode;
1315

14-
import java.util.List;
15-
1616

1717
/**
1818
* The configuration settings for AVCS devices.
@@ -22,7 +22,7 @@
2222
public class ACVSConfiguration extends AbstractConfiguration
2323
{
2424
/** Setting for launching clips or scenes. */
25-
public static final Integer LAUNCH_CLIPS_OR_SCENES = Integer.valueOf (50);
25+
public static final Integer LAUNCH_CLIPS_OR_SCENES = Integer.valueOf (NEXT_SETTING_ID);
2626

2727
private static final String [] SCENE_CLIPS_OPTIONS =
2828
{

‎src/main/java/de/mossgrabers/controller/akai/apcmini/APCminiConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
public class APCminiConfiguration extends AbstractConfiguration
2525
{
2626
/** Default function of the faders. */
27-
public static final Integer FADER_CTRL = Integer.valueOf (50);
27+
public static final Integer FADER_CTRL = Integer.valueOf (NEXT_SETTING_ID);
2828
/** Default function of the track buttons. */
29-
public static final Integer SOFT_KEYS = Integer.valueOf (51);
29+
public static final Integer SOFT_KEYS = Integer.valueOf (NEXT_SETTING_ID + 1);
3030
/** The pad brightness. */
31-
public static final Integer PAD_BRIGHTNESS = Integer.valueOf (52);
31+
public static final Integer PAD_BRIGHTNESS = Integer.valueOf (NEXT_SETTING_ID + 2);
3232

3333
private static final List<String> FADER_CTRL_OPTIONS = List.of ("Volume", "Pan", "Send 1", "Send 2", "Send 3", "Send 4", "Send 5", "Send 6", "Send 7", "Send 8", "Device");
3434

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public class FireConfiguration extends AbstractConfiguration
3535
};
3636

3737
/** Setting for the pad brightness. */
38-
public static final Integer PAD_BRIGHTNESS = Integer.valueOf (50);
38+
public static final Integer PAD_BRIGHTNESS = Integer.valueOf (NEXT_SETTING_ID);
3939
/** Setting for the pad color saturation. */
40-
public static final Integer PAD_SATURATION = Integer.valueOf (51);
40+
public static final Integer PAD_SATURATION = Integer.valueOf (NEXT_SETTING_ID + 1);
4141

4242
private int padBrightness = 100;
4343
private int padSaturation = 100;

‎src/main/java/de/mossgrabers/controller/electra/one/ElectraOneConfiguration.java‎

Lines changed: 1 addition & 1 deletion 38BA
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
public class ElectraOneConfiguration extends AbstractConfiguration
2525
{
2626
/** A knob touch combination configuration change. */
27-
public static final Integer KNOB_TOUCH_COMBINATION_COMMANDS = Integer.valueOf (50);
27+
public static final Integer KNOB_TOUCH_COMBINATION_COMMANDS = Integer.valueOf (NEXT_SETTING_ID);
2828

2929
private static final String CATEGORY_ASSIGNABLE_BUTTONS = "Assignable button touches";
3030

‎src/main/java/de/mossgrabers/controller/faderfox/ec4/EC4Configuration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
public class EC4Configuration extends AbstractConfiguration
2424
{
2525
/** Display log state. */
26-
public static final Integer SETUP_SLOT = Integer.valueOf (50);
26+
public static final Integer SETUP_SLOT = Integer.valueOf (NEXT_SETTING_ID);
2727

2828
private static final String [] SETUP_SLOTS = new String []
2929
{

‎src/main/java/de/mossgrabers/controller/gamepad/GamepadConfiguration.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@
44

55
package de.mossgrabers.controller.gamepad;
66

7+
import java.util.ArrayList;
8+
import java.util.EnumMap;
9+
import java.util.List;
10+
import java.util.Map;
11+
12+
import com.studiohartman.jamepad.ControllerAxis;
13+
import com.studiohartman.jamepad.ControllerButton;
14+
import com.studiohartman.jamepad.ControllerIndex;
15+
import com.studiohartman.jamepad.ControllerManager;
16+
import com.studiohartman.jamepad.ControllerUnpluggedException;
17+
718
import de.mossgrabers.framework.configuration.AbstractConfiguration;
819
import de.mossgrabers.framework.configuration.IEnumSetting;
920
import de.mossgrabers.framework.configuration.ISettingsUI;
@@ -14,17 +25,6 @@
1425
import de.mossgrabers.framework.daw.midi.MidiConstants;
1526
import de.mossgrabers.framework.scale.Scales;
1627

17-
import com.studiohartman.jamepad.ControllerAxis;
18-
import com.studiohartman.jamepad.ControllerButton;
19-
import com.studiohartman.jamepad.ControllerIndex;
20-
import com.studiohartman.jamepad.ControllerManager;
21-
import com.studiohartman.jamepad.ControllerUnpluggedException;
22-
23-
import java.util.ArrayList;
24-
import java.util.EnumMap;
25-
import java.util.List;
26-
import java.util.Map;
27-
2828

2929
/**
3030
* The configuration settings for a Gamepad.
@@ -76,7 +76,7 @@ public class GamepadConfiguration extends AbstractConfiguration
7676
public static final int FUNCTION_RANGE_CENTER_64_FLIP = 2;
7777

7878
/** A different gamepad was selected. */
79-
public static final Integer SELECTED_GAMEPAD = Integer.valueOf (50);
79+
public static final Integer SELECTED_GAMEPAD = Integer.valueOf (NEXT_SETTING_ID);
8080

8181
private static final String NOT_AVAILABLE = "<Not available>";
8282
private static final String CATEGORY_GAMEPAD = "Gamepad";

‎src/main/java/de/mossgrabers/controller/generic/GenericFlexiConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ public class GenericFlexiConfiguration extends AbstractConfiguration
5757
private static final String TAG_COMMAND = "COMMAND";
5858

5959
/** Export signal. */
60-
public static final Integer BUTTON_SAVE = Integer.valueOf (50);
60+
public static final Integer BUTTON_SAVE = Integer.valueOf (NEXT_SETTING_ID);
6161
/** Import signal. */
62-
public static final Integer BUTTON_LOAD = Integer.valueOf (51);
62+
public static final Integer BUTTON_LOAD = Integer.valueOf (NEXT_SETTING_ID + 1);
6363
/** Enable MMC. */
64-
public static final Integer ENABLE_MMC = Integer.valueOf (52);
64+
public static final Integer ENABLE_MMC = Integer.valueOf (NEXT_SETTING_ID + 2);
6565
/** The selected mode. */
66-
public static final Integer SELECTED_MODE = Integer.valueOf (53);
66+
public static final Integer SELECTED_MODE = Integer.valueOf (NEXT_SETTING_ID + 3);
6767

6868
private static final String CATEGORY_KEYBOARD = "Keyboard / Pads (requires restart)";
6969
private static final String CATEGORY_OPTIONS = "Options";

0 commit comments

Comments
 (0)
0