Merge pull request #408 from mat1jaczyyy/ProMk3FW1.2.1-Portwarning

Launchpad: Support Pro MK3 1.2.1 update (revision 465)
mat1jaczyyy · Oct 20, 2020 · ee6f425 · ee6f425
2 parents a1a2525 + ba66a8e
commit ee6f425
Showing 1 changed file with 4 additions and 40 deletions.
diff --git a/Apollo/Elements/Launchpad.cs b/Apollo/Elements/Launchpad.cs
@@ -146,7 +146,7 @@ public class Launchpad {
         public static PortWarning ProMK3FirmwareUnsupported { get; private set; } = new PortWarning(
             "One or more connected Launchpad Pro MK3s are running an older version of\n" + 
             "the official Novation firmware which is not compatible with \n" +
-            "Apollo Studio due to not having a dedicated Programmer mode.\n\n" +
+            "Apollo Studio due to not having a dedicated Legacy mode.\n\n" +
             "Update these to the latest version of the firmware using the\n" +
             "Launchpad Firmware Utility (or Novation Components) to avoid\n" +
             "any potential issues with Apollo Studio.",
@@ -160,34 +160,6 @@ public class Launchpad {
             )
         );
 
-        public static PortWarning ProMK3FirmwareOld { get; private set; } = new PortWarning(
-            "One or more connected Launchpad Pro MK3s are running an older version of\n" + 
-            "the official Novation firmware. While they will work with Apollo Studio,\n" +
-            "this version is known to cause performance issues and lags.\n\n" +
-            "Update these to the latest version of the firmware using the\n" +
-            "Launchpad Firmware Utility (or Novation Components) to avoid\n" +
-            "any potential issues with Apollo Studio.",
-            new PortWarning.Option(
-                "Launch Components Online",
-                "https://components.novationmusic.com/launchpad-pro-mk3/firmware"
-            ),
-            new PortWarning.Option(
-                "Launch Firmware Utility",
-                "https://fw.mat1jaczyyy.com"
-            )
-        );
-
-        public static PortWarning ProMK3LegacyRGBBroke { get; private set; } = new PortWarning(
-            "One or more connected Launchpad Pro MK3s are running a broken version of\n" + 
-            "the official Novation firmware. While they will work with Apollo Studio,\n" +
-            "this version is known to not render RGB LEDs in Legacy mode.\n\n" +
-            "There is no fix at the moment. You should use Programmer mode.",
-            new PortWarning.Option(
-                "Scream at Novation to fix it",
-                "https://twitter.com/WeAreNovation"
-            )
-        );
-
         public static void DisplayWarnings(Window sender) {
             Dispatcher.UIThread.Post(() => {
                 if (MK2FirmwareOld.DisplayWarning(sender)) return;
@@ -199,9 +171,7 @@ public static void DisplayWarnings(Window sender) {
                 if (XFirmwareStock.DisplayWarning(sender)) return;
                 if (MiniMK3FirmwareOld.DisplayWarning(sender)) return;
                 if (MiniMK3FirmwareStock.DisplayWarning(sender)) return;
-                if (ProMK3FirmwareUnsupported.DisplayWarning(sender)) return;
-                if (ProMK3FirmwareOld.DisplayWarning(sender)) return;
-                ProMK3LegacyRGBBroke.DisplayWarning(sender);
+                ProMK3FirmwareUnsupported.DisplayWarning(sender);
             }, DispatcherPriority.MinValue);
         }
 
@@ -408,16 +378,10 @@ LaunchpadType AttemptIdentify(MidiMessage response) {
                         if (response.Data[9] == 17) // Bootloader
                             return LaunchpadType.Unknown;
 
-                        if (versionInt < 440) { // No Programmer mode
+                        if (versionInt < 465) { // No Legacy mode
                             ProMK3FirmwareUnsupported.Set();
                             return LaunchpadType.Unknown;
                         }
-
-                        if (versionInt < 450) // Old Firmware
-                            ProMK3FirmwareOld.Set();
-
-                        if (versionInt == 464) // Broke Legacy mode
-                            ProMK3LegacyRGBBroke.Set();
 
                         return LaunchpadType.ProMK3;
                 }
@@ -795,7 +759,7 @@ public void HandleNote(byte key, byte vel) {
                 } else if (Type == LaunchpadType.ProMK3) {
                     xy = true;
                     if (key == 124) key = 90;  // Shift key
-                    else if (28 <= key && key <= 35) key -= 27;   // Extra bottom row
+                    else if (12 <= key && key <= 19) key -= 11;  // Extra bottom row
                     else xy = false;
                 }
             }