From 9465046522a2e3508e4c01fa65052de8b2cd1009 Mon Sep 17 00:00:00 2001
From: Nicolas Koch <nkoch@v199.net>
Date: Fri, 28 Nov 2025 22:49:26 -0500
Subject: [PATCH] MCP - Add iCON Pro Audio P1-M and correct Platform M+ - I
 forgot to rename to P1-M on previous commit

---
 libs/surfaces/mackie/device_info.cc      | 11 +++++++++++
 libs/surfaces/mackie/device_info.h       |  2 ++
 share/mcp/p1-m+p1-x.device               | 20 ++++++++++++++++++++
 share/mcp/p1-m.device                    | 20 ++++++++++++++++++++
 share/mcp/p1-x+p1-m.device               | 20 ++++++++++++++++++++
 share/mcp/platform_m+.device             | 12 ++++--------
 share/mcp/platform_m+_platformx+.device  | 10 ++++------
 share/mcp/platform_x+_platform_m+.device | 10 ++++------
 8 files changed, 85 insertions(+), 20 deletions(-)
 create mode 100644 share/mcp/p1-m+p1-x.device
 create mode 100644 share/mcp/p1-m.device
 create mode 100644 share/mcp/p1-x+p1-m.device

diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index 7a0b0e3935..3d6a84b341 100644
--- a/libs/surfaces/mackie/device_info.cc
+++ b/libs/surfaces/mackie/device_info.cc
@@ -366,6 +366,12 @@ DeviceInfo::set_state (const XMLNode& node, int /* version */)
 		_is_platformMp = false;
 	}
 
+	if ((child = node.child ("IsP1M")) != 0) {
+		child->get_property ("value", _is_p1m);
+	} else {
+		_is_p1m = false;
+	}
+
 	if ((child = node.child ("IsP1Nano")) != 0) {
 		child->get_property ("value", _is_p1nano);
 	} else {
@@ -549,6 +555,11 @@ bool DeviceInfo::is_platformMp () const
 	return _is_platformMp;
 }
 
+bool DeviceInfo::is_p1m () const
+{
+	return _is_p1m;
+}
+
 bool DeviceInfo::is_p1nano () const
 {
 	return _is_p1nano;
diff --git a/libs/surfaces/mackie/device_info.h b/libs/surfaces/mackie/device_info.h
index 0badaa2599..0d930ba9e2 100644
--- a/libs/surfaces/mackie/device_info.h
+++ b/libs/surfaces/mackie/device_info.h
@@ -82,6 +82,7 @@ class DeviceInfo
 	bool is_qcon() const;
 	bool is_v1m() const;
 	bool is_platformMp() const;
+	bool is_p1m() const;
 	bool is_p1nano() const;
 	bool is_proG2() const;
 	bool is_xtouch() const;
@@ -120,6 +121,7 @@ class DeviceInfo
 	bool     _is_qcon;
 	bool     _is_v1m;
 	bool     _is_platformMp;
+	bool     _is_p1m;
 	bool     _is_p1nano;
 	bool	 _is_proG2;
 	bool	 _is_xtouch;
diff --git a/share/mcp/p1-m+p1-x.device b/share/mcp/p1-m+p1-x.device
new file mode 100644
index 0000000000..739f7272b3
--- /dev/null
+++ b/share/mcp/p1-m+p1-x.device
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MackieProtocolDevice>
+  <Name value="iCON Platform M+ with Platform X+ on right"/>
+  <Strips value="8"/>
+  <Extenders value="1"/>
+  <MasterPosition value="1"/>
+  <MasterFader value="yes"/>
+  <TimecodeDisplay value="yes"/>
+  <TwoCharacterDisplay value="no"/>
+  <HasSeparateMeters value="yes"/>
+  <GlobalControls value="yes"/>
+  <JogWheel value="yes"/>
+  <TouchSenseFaders value="yes"/>
+  <LogicControlButtons value="yes"/>
+  <usesIPMIDI value="no"/>
+  <NoHandShake value="yes"/>
+  <IsPlatformMp value="yes"/>
+  <HasQConSecondLCD value="yes"/>
+  <HasQConMasterMeters value="yes"/>
+</MackieProtocolDevice>
diff --git a/share/mcp/p1-m.device b/share/mcp/p1-m.device
new file mode 100644
index 0000000000..41c250441d
--- /dev/null
+++ b/share/mcp/p1-m.device
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MackieProtocolDevice>
+  <Name value="iCON Platform M+"/>
+  <Strips value="8"/>
+  <Extenders value="0"/>
+  <MasterPosition value="0"/>
+  <MasterFader value="yes"/>
+  <TimecodeDisplay value="yes"/>
+  <TwoCharacterDisplay value="no"/>
+  <HasSeparateMeters value="yes"/>
+  <GlobalControls value="yes"/>
+  <JogWheel value="yes"/>
+  <TouchSenseFaders value="yes"/>
+  <LogicControlButtons value="yes"/>
+  <usesIPMIDI value="no"/>
+  <NoHandShake value="yes"/>
+  <IsPlatformMp value="yes"/>
+  <HasQConSecondLCD value="yes"/>
+  <HasQConMasterMeters value="yes"/>
+</MackieProtocolDevice>
diff --git a/share/mcp/p1-x+p1-m.device b/share/mcp/p1-x+p1-m.device
new file mode 100644
index 0000000000..5430cc97a1
--- /dev/null
+++ b/share/mcp/p1-x+p1-m.device
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MackieProtocolDevice>
+  <Name value="iCON Platform M+ with Platform X+ on left"/>
+  <Strips value="8"/>
+  <Extenders value="1"/>
+  <MasterPosition value="2"/>
+  <MasterFader value="yes"/>
+  <TimecodeDisplay value="yes"/>
+  <TwoCharacterDisplay value="no"/>
+  <HasSeparateMeters value="yes"/>
+  <GlobalControls value="yes"/>
+  <JogWheel value="yes"/>
+  <TouchSenseFaders value="yes"/>
+  <LogicControlButtons value="yes"/>
+  <usesIPMIDI value="no"/>
+  <NoHandShake value="yes"/>
+  <IsPlatformMp value="yes"/>
+  <HasQConSecondLCD value="yes"/>
+  <HasQConMasterMeters value="yes"/>
+</MackieProtocolDevice>
diff --git a/share/mcp/platform_m+.device b/share/mcp/platform_m+.device
index 41c250441d..3363eddce3 100644
--- a/share/mcp/platform_m+.device
+++ b/share/mcp/platform_m+.device
@@ -2,19 +2,15 @@
 <MackieProtocolDevice>
   <Name value="iCON Platform M+"/>
   <Strips value="8"/>
+  <MasterFader value="yes"/>
+  <TimecodeDisplay value="no"/>
+  <TwoCharacterDisplay value="no"/>
   <Extenders value="0"/>
   <MasterPosition value="0"/>
-  <MasterFader value="yes"/>
-  <TimecodeDisplay value="yes"/>
-  <TwoCharacterDisplay value="no"/>
-  <HasSeparateMeters value="yes"/>
   <GlobalControls value="yes"/>
   <JogWheel value="yes"/>
   <TouchSenseFaders value="yes"/>
-  <LogicControlButtons value="yes"/>
-  <usesIPMIDI value="no"/>
   <NoHandShake value="yes"/>
+  <HasMeters value="no"/>
   <IsPlatformMp value="yes"/>
-  <HasQConSecondLCD value="yes"/>
-  <HasQConMasterMeters value="yes"/>
 </MackieProtocolDevice>
diff --git a/share/mcp/platform_m+_platformx+.device b/share/mcp/platform_m+_platformx+.device
index 739f7272b3..8b26926b63 100644
--- a/share/mcp/platform_m+_platformx+.device
+++ b/share/mcp/platform_m+_platformx+.device
@@ -5,16 +5,14 @@
   <Extenders value="1"/>
   <MasterPosition value="1"/>
   <MasterFader value="yes"/>
-  <TimecodeDisplay value="yes"/>
+  <TimecodeDisplay value="no"/>
   <TwoCharacterDisplay value="no"/>
-  <HasSeparateMeters value="yes"/>
+  <Extenders value="0"/>
+  <MasterPosition value="0"/>
   <GlobalControls value="yes"/>
   <JogWheel value="yes"/>
   <TouchSenseFaders value="yes"/>
-  <LogicControlButtons value="yes"/>
-  <usesIPMIDI value="no"/>
   <NoHandShake value="yes"/>
+  <HasMeters value="no"/>
   <IsPlatformMp value="yes"/>
-  <HasQConSecondLCD value="yes"/>
-  <HasQConMasterMeters value="yes"/>
 </MackieProtocolDevice>
diff --git a/share/mcp/platform_x+_platform_m+.device b/share/mcp/platform_x+_platform_m+.device
index 5430cc97a1..fd73e44097 100644
--- a/share/mcp/platform_x+_platform_m+.device
+++ b/share/mcp/platform_x+_platform_m+.device
@@ -5,16 +5,14 @@
   <Extenders value="1"/>
   <MasterPosition value="2"/>
   <MasterFader value="yes"/>
-  <TimecodeDisplay value="yes"/>
+  <TimecodeDisplay value="no"/>
   <TwoCharacterDisplay value="no"/>
-  <HasSeparateMeters value="yes"/>
+  <Extenders value="0"/>
+  <MasterPosition value="0"/>
   <GlobalControls value="yes"/>
   <JogWheel value="yes"/>
   <TouchSenseFaders value="yes"/>
-  <LogicControlButtons value="yes"/>
-  <usesIPMIDI value="no"/>
   <NoHandShake value="yes"/>
+  <HasMeters value="no"/>
   <IsPlatformMp value="yes"/>
-  <HasQConSecondLCD value="yes"/>
-  <HasQConMasterMeters value="yes"/>
 </MackieProtocolDevice>