Dateien hochladen nach „“

UI.hpp

@@ -4144,7 +4144,7 @@ void UI_func_seq_vel_editor(uint8_t param)
           seq_active_track = constrain(seq_active_track - 1, 0, 9);
       }
     }
-    else if (seq_active_function == 1) {
+    else if (seq_active_function == 1 && seq_content_type[seq_active_track] < 2 ) { //if is Drum or normal Instrument Track
       if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()))
       {
         if (LCDML.BT_checkDown())
@@ -4152,6 +4152,14 @@ void UI_func_seq_vel_editor(uint8_t param)
         else if (LCDML.BT_checkUp())
           seq_vel[seq_active_track][seq_menu - 1] = constrain(seq_vel[seq_active_track][seq_menu - 1] - 1, 0, 127);
       }
+    } else if (seq_active_function == 1 && seq_content_type[seq_active_track] > 1 ) {
+      if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()))
+      {
+        if (LCDML.BT_checkDown())
+          seq_vel[seq_active_track][seq_menu - 1] = constrain(seq_vel[seq_active_track][seq_menu - 1] + 1, 200, 205);
+        else if (LCDML.BT_checkUp())
+          seq_vel[seq_active_track][seq_menu - 1] = constrain(seq_vel[seq_active_track][seq_menu - 1] - 1, 200, 205);
+      }
     }
     if (LCDML.BT_checkEnter())  //handle button presses during menu >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     {
@@ -4171,6 +4179,8 @@ void UI_func_seq_vel_editor(uint8_t param)
     }
     //button check end <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
+ if ( seq_content_type[seq_active_track] > 1 && seq_vel[seq_active_track][seq_menu - 1]<200) seq_vel[seq_active_track][seq_menu - 1]=200;
+ 
     if (seq_menu == 0) {
       lcd.setCursor(4, 0);
       lcd.print("--- ---  ");
@@ -4212,12 +4222,24 @@ void UI_func_seq_vel_editor(uint8_t param)
           lcd.show(0, 8, 5, seq_find_drum_name_from_note( seq_data[seq_active_track][seq_menu - 1]) );
         } else
         {
-          lcd.print(noteNames[seq_data[seq_active_track][seq_menu - 1] % 12 ][0] );
-          if (noteNames[seq_data[seq_active_track][seq_menu - 1] % 12 ][1] != '\0' ) {
-            lcd.print(noteNames[seq_data[seq_active_track][seq_menu - 1] % 12 ][1] );
+          if (seq_content_type[seq_active_track] < 2)
+          {
+            lcd.print(noteNames[seq_data[seq_active_track][seq_menu - 1] % 12 ][0] );
+            if (noteNames[seq_data[seq_active_track][seq_menu - 1] % 12 ][1] != '\0' ) {
+              lcd.print(noteNames[seq_data[seq_active_track][seq_menu - 1] % 12 ][1] );
+            }
+            lcd.print( (seq_data[seq_active_track][seq_menu - 1] / 12) - 1);
+            lcd.print(" ");
+          }
+          else {
+                 if (seq_vel[seq_active_track][seq_menu - 1] == 200) lcd.print("Maj" );
+            else if (seq_vel[seq_active_track][seq_menu - 1] == 201) lcd.print("Min" );
+            else if (seq_vel[seq_active_track][seq_menu - 1] == 202) lcd.print("Sev" );
+            else if (seq_vel[seq_active_track][seq_menu - 1] == 203) lcd.print("Aug" );
+            else if (seq_vel[seq_active_track][seq_menu - 1] == 204) lcd.print("Dim" );
+            else if (seq_vel[seq_active_track][seq_menu - 1] == 205) lcd.print("Mj7" );
+
           }
-          lcd.print( (seq_data[seq_active_track][seq_menu - 1] / 12) - 1);
-          lcd.print(" ");
         }
       }
       else