move mask time setting to the left in the GUI

corrados · May 4, 2023 · 65763bf · 65763bf
1 parent 211183d
commit 65763bf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/tools/edrumulus_gui.py b/tools/edrumulus_gui.py
@@ -51,9 +51,9 @@
 pad_names    = ["snare", "kick", "hi-hat", "ctrl", "crash", "tom1", "ride", "tom2", "tom3"]
 pad_types    = ["PD120", "PD80R",  "PD8", "FD8", "VH12", "VH12CTRL", "KD7", "TP80",     "CY6",    "CY8", "DIABOLO12", \
                 "CY5",   "HD1TOM", "PD6", "KD8", "PDX8", "KD120",    "PD5", "PDA120LS", "PDX100", "KT10"]
-cmd_names    = ["type", "thresh", "sens", "pos thres", "pos sens", "rim thres", "curve", "spike", "rim/pos", "note", "note rim", "cross", "mask"]
-cmd_val      = [   102,      103,    104,         105,        106,         107,     109,     110,       111,    112,        113,     114,    118]
-cmd_val_rng  = [    20,       31,     31,          31,         31,          31,       4,       4,         3,    127,        127,      31,     63]
+cmd_names    = ["type", "thresh", "sens", "pos thres", "pos sens", "rim thres", "mask", "curve", "spike", "rim/pos", "note", "note rim", "cross"]
+cmd_val      = [   102,      103,    104,         105,        106,         107,    118,     109,     110,       111,    112,        113,     114]
+cmd_val_rng  = [    20,       31,     31,          31,         31,          31,     63,       4,       4,         3,    127,        127,      31]
 database     = [0] * len(cmd_val)
 hi_hat_ctrl  = 0  # current hi-hat control value
 sel_pad                 = 0
@@ -107,7 +107,7 @@ def process_user_input(ch):
 
 def parse_cmd_param(cmd):
   # check for "pad type" and "curve type" special cases, otherwise convert integer in string
-  return pad_types[database[cmd]] if cmd == 0 else curve_types[database[cmd]] if cmd == 6 else str(database[cmd])
+  return pad_types[database[cmd]] if cmd == 0 else curve_types[database[cmd]] if cmd == 7 else str(database[cmd])
 
 def signal_handler(sig, frame):
   global SIGINT_received

diff --git a/tools/settings/trigger_settings.txt b/tools/settings/trigger_settings.txt
@@ -4,114 +4,114 @@
 0,105,26
 0,106,11
 0,107,15
+0,118,7
 0,109,0
 0,110,4
 0,111,3
 0,112,38
 0,113,40
 0,114,0
-0,118,7
 1,102,6
 1,103,15
 1,104,6
 1,105,9
 1,106,14
 1,107,12
+1,118,12
 1,109,4
 1,110,4
 1,111,0
 1,112,36
 1,113,36
 1,114,0
-1,118,12
 2,102,13
 2,103,10
 2,104,4
 2,105,9
 2,106,14
 2,107,12
+2,118,6
 2,109,0
 2,110,4
 2,111,0
 2,112,22
 2,113,22
 2,114,0
-2,118,6
 3,102,3
 3,103,4
 3,104,0
 3,105,9
 3,106,14
 3,107,12
+3,118,6
 3,109,0
 3,110,4
 3,111,0
 3,112,44
 3,113,44
 3,114,0
-3,118,6
 4,102,8
 4,103,17
 4,104,7
 4,105,9
 4,106,14
 4,107,30
+4,118,6
 4,109,0
 4,110,4
 4,111,1
 4,112,49
 4,113,55
 4,114,7
-4,118,6
 5,102,7
 5,103,16
 5,104,8
 5,105,22
 5,106,23
 5,107,12
+5,118,6
 5,109,0
 5,110,4
 5,111,3
 5,112,48
 5,113,50
 5,114,7
-5,118,6
 6,102,2
 6,103,12
 6,104,3
 6,105,26
 6,106,11
 6,107,16
+6,118,7
 6,109,0
 6,110,4
 6,111,3
 6,112,51
 6,113,53
 6,114,7
-6,118,7
 7,102,7
 7,103,8
 7,104,8
 7,105,22
 7,106,23
 7,107,12
+7,118,6
 7,109,0
 7,110,4
 7,111,3
 7,112,45
 7,113,47
 7,114,0
-7,118,6
 8,102,7
 8,103,8
 8,104,8
 8,105,22
 8,106,23
 8,107,12
+8,118,6
 8,109,0
 8,110,4
 8,111,3
 8,112,43
 8,113,58
 8,114,0
-8,118,6