diff --git a/.gitignore b/.gitignore
index 9edb018..b56e6ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,10 +89,16 @@ local.properties
[Dd]ebug/
[Rr]elease/
x64/
+x86/
+Win32/
build/
[Bb]in/
[Oo]bj/
+# External libraries (not NuGet)
+ExtLibraries/
+
+
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
@@ -244,4 +250,4 @@ pip-log.txt
*.suo
SCJMapper-V2.suo
*.suo
-/.vs/SCJMapper-V2/v15/Server/sqlite3
+/.vs/SCJMapper-V2/v15/Server/sqlite3
\ No newline at end of file
diff --git a/AApp/FormMain.cs b/AApp/FormMain.cs
index 5714094..b77bfc8 100644
--- a/AApp/FormMain.cs
+++ b/AApp/FormMain.cs
@@ -1158,11 +1158,17 @@ namespace SCJMapper_V2
private void meShowLayoutDialog_Click( object sender, EventArgs e )
{
- timer1.Enabled = false; // must be off while a modal window is shown, else DX gets crazy
- var LAYOUT = new FormLayout { ActionList = m_AT.ReportActionsSItemText() };
- LAYOUT.ShowDialog( this );
- LAYOUT = null; // get rid and create a new one next time..
- timer1.Enabled = true;
+ // sanity check for the layout folder
+ if (! Directory.Exists( TheUser.LayoutsDir ) ) {
+ MessageBox.Show( this, $"Layout folder is missing - should be: {TheUser.LayoutsDir}" );
+ }
+ else {
+ timer1.Enabled = false; // must be off while a modal window is shown, else DX gets crazy
+ var LAYOUT = new FormLayout { ActionList = m_AT.ReportActionsSItemText( ) };
+ LAYOUT.ShowDialog( this );
+ LAYOUT = null; // get rid and create a new one next time..
+ timer1.Enabled = true;
+ }
}
diff --git a/Cassini_Logo_Icon.ico b/Cassini_Logo_Icon.ico
new file mode 100644
index 0000000..66df3d6
Binary files /dev/null and b/Cassini_Logo_Icon.ico differ
diff --git a/Docx/SCJMapper_QGuide V2.35beta.pdf b/Docx/SCJMapper_QGuide V2.46beta.pdf
similarity index 63%
rename from Docx/SCJMapper_QGuide V2.35beta.pdf
rename to Docx/SCJMapper_QGuide V2.46beta.pdf
index de9e65c..31e8b3f 100644
Binary files a/Docx/SCJMapper_QGuide V2.35beta.pdf and b/Docx/SCJMapper_QGuide V2.46beta.pdf differ
diff --git a/Docx/SCJMapper_QGuide V2.x.pub b/Docx/SCJMapper_QGuide V2.x.pub
index 30e2c1d..754f3e8 100644
Binary files a/Docx/SCJMapper_QGuide V2.x.pub and b/Docx/SCJMapper_QGuide V2.x.pub differ
diff --git a/Layout/ActionItemList.cs b/Layout/ActionItemList.cs
index 2f7dfee..d843bed 100644
--- a/Layout/ActionItemList.cs
+++ b/Layout/ActionItemList.cs
@@ -78,19 +78,53 @@ namespace SCJMapper_V2.Layout
///
/// Get the Devices contained in the List
///
- public List Devices
+ public Dictionary Devices
{
get {
- var list = new List( );
+ var list = new Dictionary( );
foreach ( var si in this ) {
- if ( !list.Contains( si.DeviceName ) ) {
- list.Add( si.DeviceName );
+ if ( !list.ContainsKey( si.InputTypeNumber ) ) {
+ list.Add( si.InputTypeNumber, si.DeviceName );
}
}
return list;
}
}
+ ///
+ /// Get the Joystick Devices contained in the List
+ ///
+ public Dictionary JsDevices
+ {
+ get {
+ var list = new Dictionary( );
+ foreach ( var si in this ) {
+ if (si.InputTypeLetter == "J" ) {
+ if ( !list.ContainsKey( si.InputTypeNumber ) ) {
+ list.Add( si.InputTypeNumber, si.DeviceName );
+ }
+ }
+ }
+ return list;
+ }
+ }
+
+ ///
+ /// Override the current JS guids with the given one
+ ///
+ /// A list of GUIDs
+ public void OverrideJsDevices (List guids )
+ {
+ for (int aiidx=0; aiidx= ai.InputTypeNumber ) {
+ this[aiidx].DeviceProdGuid = guids[ai.InputTypeNumber - 1]; // the guid list is 0 based, jsN is 1 based..
+ }
+ }
+ }
+ }
}
}
diff --git a/Layout/DeviceFile.cs b/Layout/DeviceFile.cs
index f7b987d..4150110 100644
--- a/Layout/DeviceFile.cs
+++ b/Layout/DeviceFile.cs
@@ -172,8 +172,10 @@ namespace SCJMapper_V2.Layout
get {
var ret = new List( );
foreach ( string s in DeviceProdGuid ) {
- string pv = s.Substring( 1, 8 ).ToLowerInvariant( ); // this is "{12345678-0000-0000 etc}
- ret.Add( pv );
+ if ( s.Length >= 9 ) {
+ string pv = s.Substring( 1, 8 ).ToLowerInvariant( ); // this is "{12345678-0000-0000 etc}
+ ret.Add( pv );
+ }
}
return ret;
}
diff --git a/Layout/FormLayout.Designer.cs b/Layout/FormLayout.Designer.cs
index 909b4fd..65f97b4 100644
--- a/Layout/FormLayout.Designer.cs
+++ b/Layout/FormLayout.Designer.cs
@@ -34,6 +34,9 @@
this.pnlInput = new System.Windows.Forms.Panel();
this.btClose = new System.Windows.Forms.Button();
this.pnlDebug = new System.Windows.Forms.Panel();
+ this.label2 = new System.Windows.Forms.Label();
+ this.cbxJs4 = new System.Windows.Forms.ComboBox();
+ this.btActivateDevices = new System.Windows.Forms.Button();
this.cbxJs3 = new System.Windows.Forms.ComboBox();
this.cbxJs2 = new System.Windows.Forms.ComboBox();
this.cbxJs1 = new System.Windows.Forms.ComboBox();
@@ -84,11 +87,11 @@
this.tlPanel.Location = new System.Drawing.Point(0, 0);
this.tlPanel.Name = "tlPanel";
this.tlPanel.RowCount = 4;
- this.tlPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 80F));
+ this.tlPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 106F));
this.tlPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tlPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 75F));
this.tlPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 80F));
- this.tlPanel.Size = new System.Drawing.Size(1271, 681);
+ this.tlPanel.Size = new System.Drawing.Size(1209, 681);
this.tlPanel.TabIndex = 0;
//
// chkLbActionGroups
@@ -101,11 +104,11 @@
this.chkLbActionGroups.HideSelection = false;
this.chkLbActionGroups.HoverSelection = true;
this.chkLbActionGroups.LabelWrap = false;
- this.chkLbActionGroups.Location = new System.Drawing.Point(3, 83);
+ this.chkLbActionGroups.Location = new System.Drawing.Point(3, 109);
this.chkLbActionGroups.MultiSelect = false;
this.chkLbActionGroups.Name = "chkLbActionGroups";
this.chkLbActionGroups.ShowGroups = false;
- this.chkLbActionGroups.Size = new System.Drawing.Size(174, 124);
+ this.chkLbActionGroups.Size = new System.Drawing.Size(174, 117);
this.chkLbActionGroups.TabIndex = 5;
this.chkLbActionGroups.UseCompatibleStateImageBehavior = false;
this.chkLbActionGroups.View = System.Windows.Forms.View.Details;
@@ -121,18 +124,19 @@
this.chkLbActionMaps.HideSelection = false;
this.chkLbActionMaps.HoverSelection = true;
this.chkLbActionMaps.LabelWrap = false;
- this.chkLbActionMaps.Location = new System.Drawing.Point(3, 213);
+ this.chkLbActionMaps.Location = new System.Drawing.Point(3, 232);
this.chkLbActionMaps.MultiSelect = false;
this.chkLbActionMaps.Name = "chkLbActionMaps";
this.chkLbActionMaps.ShowGroups = false;
this.chkLbActionMaps.ShowItemToolTips = true;
- this.chkLbActionMaps.Size = new System.Drawing.Size(174, 384);
+ this.chkLbActionMaps.Size = new System.Drawing.Size(174, 365);
this.chkLbActionMaps.TabIndex = 6;
this.chkLbActionMaps.UseCompatibleStateImageBehavior = false;
this.chkLbActionMaps.View = System.Windows.Forms.View.Details;
//
// pnlInput
//
+ this.pnlInput.BackColor = System.Drawing.Color.DarkGray;
this.tlPanel.SetColumnSpan(this.pnlInput, 2);
this.pnlInput.Controls.Add(this.btClose);
this.pnlInput.Controls.Add(this.pnlDebug);
@@ -142,7 +146,7 @@
this.pnlInput.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnlInput.Location = new System.Drawing.Point(3, 3);
this.pnlInput.Name = "pnlInput";
- this.pnlInput.Size = new System.Drawing.Size(1265, 74);
+ this.pnlInput.Size = new System.Drawing.Size(1203, 100);
this.pnlInput.TabIndex = 1;
//
// btClose
@@ -157,7 +161,10 @@
//
// pnlDebug
//
- this.pnlDebug.BackColor = System.Drawing.Color.Honeydew;
+ this.pnlDebug.BackColor = System.Drawing.Color.DarkGray;
+ this.pnlDebug.Controls.Add(this.label2);
+ this.pnlDebug.Controls.Add(this.cbxJs4);
+ this.pnlDebug.Controls.Add(this.btActivateDevices);
this.pnlDebug.Controls.Add(this.cbxJs3);
this.pnlDebug.Controls.Add(this.cbxJs2);
this.pnlDebug.Controls.Add(this.cbxJs1);
@@ -166,43 +173,70 @@
this.pnlDebug.Controls.Add(this.label1);
this.pnlDebug.Controls.Add(this.btCreateDbgList);
this.pnlDebug.Dock = System.Windows.Forms.DockStyle.Right;
- this.pnlDebug.Location = new System.Drawing.Point(748, 0);
+ this.pnlDebug.Location = new System.Drawing.Point(742, 0);
this.pnlDebug.Name = "pnlDebug";
- this.pnlDebug.Size = new System.Drawing.Size(517, 74);
+ this.pnlDebug.Size = new System.Drawing.Size(461, 100);
this.pnlDebug.TabIndex = 7;
- this.pnlDebug.Visible = false;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(3, 76);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(22, 13);
+ this.label2.TabIndex = 19;
+ this.label2.Text = "Js4";
+ //
+ // cbxJs4
+ //
+ this.cbxJs4.FormattingEnabled = true;
+ this.cbxJs4.Location = new System.Drawing.Point(31, 73);
+ this.cbxJs4.Name = "cbxJs4";
+ this.cbxJs4.Size = new System.Drawing.Size(243, 21);
+ this.cbxJs4.Sorted = true;
+ this.cbxJs4.TabIndex = 18;
+ //
+ // btActivateDevices
+ //
+ this.btActivateDevices.Location = new System.Drawing.Point(280, 3);
+ this.btActivateDevices.Name = "btActivateDevices";
+ this.btActivateDevices.Size = new System.Drawing.Size(74, 90);
+ this.btActivateDevices.TabIndex = 17;
+ this.btActivateDevices.Text = "Activate Changed Devices";
+ this.btActivateDevices.UseVisualStyleBackColor = true;
+ this.btActivateDevices.Click += new System.EventHandler(this.btActivateDevices_Click);
//
// cbxJs3
//
this.cbxJs3.FormattingEnabled = true;
- this.cbxJs3.Location = new System.Drawing.Point(42, 49);
+ this.cbxJs3.Location = new System.Drawing.Point(31, 50);
this.cbxJs3.Name = "cbxJs3";
- this.cbxJs3.Size = new System.Drawing.Size(376, 21);
+ this.cbxJs3.Size = new System.Drawing.Size(243, 21);
this.cbxJs3.Sorted = true;
this.cbxJs3.TabIndex = 16;
//
// cbxJs2
//
this.cbxJs2.FormattingEnabled = true;
- this.cbxJs2.Location = new System.Drawing.Point(42, 26);
+ this.cbxJs2.Location = new System.Drawing.Point(31, 27);
this.cbxJs2.Name = "cbxJs2";
- this.cbxJs2.Size = new System.Drawing.Size(376, 21);
+ this.cbxJs2.Size = new System.Drawing.Size(243, 21);
this.cbxJs2.Sorted = true;
this.cbxJs2.TabIndex = 15;
//
// cbxJs1
//
this.cbxJs1.FormattingEnabled = true;
- this.cbxJs1.Location = new System.Drawing.Point(42, 3);
+ this.cbxJs1.Location = new System.Drawing.Point(31, 4);
this.cbxJs1.Name = "cbxJs1";
- this.cbxJs1.Size = new System.Drawing.Size(376, 21);
+ this.cbxJs1.Size = new System.Drawing.Size(243, 21);
this.cbxJs1.Sorted = true;
this.cbxJs1.TabIndex = 14;
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(14, 52);
+ this.label4.Location = new System.Drawing.Point(3, 53);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(22, 13);
this.label4.TabIndex = 13;
@@ -211,7 +245,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(14, 29);
+ this.label3.Location = new System.Drawing.Point(3, 30);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(22, 13);
this.label3.TabIndex = 12;
@@ -220,7 +254,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(14, 6);
+ this.label1.Location = new System.Drawing.Point(3, 7);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(22, 13);
this.label1.TabIndex = 11;
@@ -228,11 +262,11 @@
//
// btCreateDbgList
//
- this.btCreateDbgList.Location = new System.Drawing.Point(424, 9);
+ this.btCreateDbgList.Location = new System.Drawing.Point(378, 4);
this.btCreateDbgList.Name = "btCreateDbgList";
- this.btCreateDbgList.Size = new System.Drawing.Size(74, 56);
+ this.btCreateDbgList.Size = new System.Drawing.Size(74, 89);
this.btCreateDbgList.TabIndex = 10;
- this.btCreateDbgList.Text = "Create Debug List";
+ this.btCreateDbgList.Text = "Create Test Items List";
this.btCreateDbgList.UseVisualStyleBackColor = true;
this.btCreateDbgList.Click += new System.EventHandler(this.btCreateDbgList_Click);
//
@@ -240,10 +274,11 @@
//
this.pictureBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.BackgroundImage")));
this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand;
this.pictureBox1.Location = new System.Drawing.Point(3, 3);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(82, 71);
+ this.pictureBox1.Size = new System.Drawing.Size(82, 90);
this.pictureBox1.TabIndex = 6;
this.pictureBox1.TabStop = false;
this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
@@ -275,10 +310,10 @@
this.drawPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.drawPanel.Controls.Add(this.gbxColors);
this.drawPanel.Dock = System.Windows.Forms.DockStyle.Fill;
- this.drawPanel.Location = new System.Drawing.Point(183, 83);
+ this.drawPanel.Location = new System.Drawing.Point(183, 109);
this.drawPanel.Name = "drawPanel";
this.tlPanel.SetRowSpan(this.drawPanel, 3);
- this.drawPanel.Size = new System.Drawing.Size(1085, 595);
+ this.drawPanel.Size = new System.Drawing.Size(1023, 569);
this.drawPanel.TabIndex = 2;
//
// gbxColors
@@ -460,12 +495,12 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1271, 681);
+ this.ClientSize = new System.Drawing.Size(1209, 681);
this.Controls.Add(this.tlPanel);
this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(770, 720);
+ this.MinimumSize = new System.Drawing.Size(1225, 720);
this.Name = "FormLayout";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Device Layout";
@@ -519,5 +554,8 @@
private System.Windows.Forms.ComboBox cbxJs1;
private System.Windows.Forms.ComboBox cbxJs3;
private System.Windows.Forms.ComboBox cbxJs2;
+ private System.Windows.Forms.Button btActivateDevices;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.ComboBox cbxJs4;
}
}
\ No newline at end of file
diff --git a/Layout/FormLayout.cs b/Layout/FormLayout.cs
index 8d2d24f..9032649 100644
--- a/Layout/FormLayout.cs
+++ b/Layout/FormLayout.cs
@@ -20,6 +20,9 @@ namespace SCJMapper_V2.Layout
{
public partial class FormLayout : Form
{
+ // logger
+ private static readonly log4net.ILog log = log4net.LogManager.GetLogger( System.Reflection.MethodBase.GetCurrentMethod( ).DeclaringType );
+
// Graphics
private DrawPanel m_dPanel = new DrawPanel( ); // draw panel
private DrawPanel m_sPanel = new DrawPanel( ); // show panel
@@ -37,14 +40,76 @@ namespace SCJMapper_V2.Layout
return File.Exists( "DEBUG_LAYOUT.txt" );
}
- public FormLayout()
+ private bool m_checkAllToggle = true;
+ private void CheckAllGroups()
{
- InitializeComponent( );
+ // select all groups
+ for ( int i = 0; i < chkLbActionGroups.Items.Count; i++ ) {
+ chkLbActionGroups.Items[i].Checked = m_checkAllToggle;
+ }
+ m_checkAllToggle = !m_checkAllToggle; // toggle
+ }
- // Show Debug items at startup
- if ( IsDebug( ) ) pnlDebug.Visible = true;
+ #region JsCombo stuff
+
+ private void LoadJsCombos()
+ {
+
+ cbxJs1.Items.Clear( ); cbxJs2.Items.Clear( ); cbxJs3.Items.Clear( ); cbxJs4.Items.Clear( );
+ cbxJs1.Items.Add( new Device.DeviceDescriptor( ) { DevName = " Js1 Not Used", DevGuid = "{99999991-0000-0000-000000000000}" } );
+ cbxJs2.Items.Add( new Device.DeviceDescriptor( ) { DevName = " Js2 Not Used", DevGuid = "{99999992-0000-0000-000000000000}" } );
+ cbxJs3.Items.Add( new Device.DeviceDescriptor( ) { DevName = " Js3 Not Used", DevGuid = "{99999993-0000-0000-000000000000}" } );
+ cbxJs4.Items.Add( new Device.DeviceDescriptor( ) { DevName = " Js4 Not Used", DevGuid = "{99999994-0000-0000-000000000000}" } );
+ if ( m_devices == null ) return;
+
+ // get all devices know in the layout folder
+ foreach ( var dev in m_devices ) {
+ cbxJs1.Items.Add( dev ); cbxJs2.Items.Add( dev ); cbxJs3.Items.Add( dev ); cbxJs4.Items.Add( dev );
+ }
+ cbxJs1.SelectedIndex = 0; cbxJs2.SelectedIndex = 0; cbxJs3.SelectedIndex = 0; cbxJs4.SelectedIndex = 0;
}
+ private int JsIndexOf(ComboBox.ObjectCollection objs, string sought )
+ {
+ for (int i=0; i usedDeviceDict)
+ {
+ cbxJs1.SelectedIndex = 0; cbxJs2.SelectedIndex = 0; cbxJs3.SelectedIndex = 0; cbxJs4.SelectedIndex = 0;
+ int i = 0;
+ foreach ( var kv in usedDeviceDict ) {
+ switch ( kv.Key ) {
+ case 1:
+ i = JsIndexOf( cbxJs1.Items, kv.Value );
+ if ( i >= 0 ) cbxJs1.SelectedIndex = i;
+ break;
+ case 2:
+ i = JsIndexOf( cbxJs2.Items, kv.Value );
+ if ( i >= 0 ) cbxJs2.SelectedIndex = i;
+ break;
+
+ case 3:
+ i = JsIndexOf( cbxJs3.Items, kv.Value );
+ if ( i >= 0 ) cbxJs3.SelectedIndex = i;
+ break;
+ case 4:
+ i = JsIndexOf( cbxJs4.Items, kv.Value );
+ if ( i >= 0 ) cbxJs4.SelectedIndex = i;
+ break;
+ default: break;
+ }
+ }
+ }
+
+ #endregion
+
///
/// Local to support the handling
///
@@ -61,8 +126,23 @@ namespace SCJMapper_V2.Layout
// the item index is shared with the checkbox list in the GUI
private List m_chkLbActionMaps = new List( );
+ #region Main Form Handling
+
+ public FormLayout()
+ {
+ InitializeComponent( );
+
+ // Show Debug items at startup
+ if ( IsDebug( ) ) {
+ log.DebugFormat( "Layout - Debug Mode ON" );
+ pnlDebug.Visible = true;
+ }
+ }
+
private void FormLayout_Load( object sender, EventArgs e )
{
+ log.DebugFormat( "Layout - Form Loading" );
+
Tx.LocalizeControlTree( this );
AppSettings.Instance.Reload( );
@@ -75,23 +155,26 @@ namespace SCJMapper_V2.Layout
// Action Groups
// Main dialog
+ log.DebugFormat( "Layout - Form Loading - Loading Action Groups" );
chkLbActionGroups.Items.Clear( );
chkLbActionGroups.Columns.Add( "Actiongroups", chkLbActionMaps.Width );
- foreach ( var s in ActionGroups.ActionGroupNames( ) ) {
+ foreach ( var s in ActionGroupNames( ) ) {
var item = chkLbActionGroups.Items.Add( s );
item.ForeColor = MapProps.GroupColor( GroupNameToGroup( s ) ).ForeColor;
item.BackColor = MapProps.GroupColor( GroupNameToGroup( s ) ).BackColor;
}
// color settings
+ log.DebugFormat( "Layout - Form Loading - Loading Color Settings" );
chkLbActionGroupsColor.Items.Clear( );
chkLbActionGroupsColor.Columns.Add( "Actiongroups", chkLbActionMaps.Width );
- foreach ( var s in ActionGroups.ActionGroupNames( ) ) {
+ foreach ( var s in ActionGroupNames( ) ) {
var item = chkLbActionGroupsColor.Items.Add( s );
item.ForeColor = MapProps.GroupColor( GroupNameToGroup( s ) ).ForeColor;
item.BackColor = MapProps.GroupColor( GroupNameToGroup( s ) ).BackColor;
}
// Action Maps
+ log.DebugFormat( "Layout - Form Loading - Loading Action Maps" );
chkLbActionMaps.Items.Clear( ); m_chkLbActionMaps.Clear( );
chkLbActionMaps.Columns.Add( "Actionmaps", chkLbActionMaps.Width );
foreach ( EGroup g in Enum.GetValues( typeof( EGroup ) ) ) {
@@ -112,22 +195,38 @@ namespace SCJMapper_V2.Layout
}
// Layouts
+ log.DebugFormat( "Layout - Form Loading - Loading Layouts" );
m_layouts = new Layouts( );
foreach ( var l in m_layouts ) {
+ log.DebugFormat( " + {0}", l.Filename );
cbxLayouts.Items.Add( l );
}
- if ( cbxLayouts.Items.Count > 0 ) cbxLayouts.SelectedIndex = 0;
+ if ( cbxLayouts.Items.Count > 0 ) {
+ cbxLayouts.SelectedIndex = 0;
+ m_devices = m_layouts.Devices( );
+ log.DebugFormat( "Layout - Form Loading - Mappable devices found in templates" );
+ foreach ( var dev in m_devices ) {
+ log.DebugFormat( " + {0} - {1}", dev.DevName, dev.DevGuid );
+ }
+ }
+ else {
+ log.WarnFormat( "Layout - Form Loading - no layout files found " );
+ MessageBox.Show( this, "Could not find any layout templates !??" );
+ }
// Draw Panel
// drawPanel.Controls.Add( m_dPanel );
// m_dPanel.Top = 0; m_dPanel.Left = 0;
+ log.DebugFormat( "Layout - Form Loading - Add Draw Panel" );
this.Controls.Add( m_dPanel );
m_dPanel.Top = 0; m_dPanel.Left = this.Width + 2000; // out of view
m_dPanel.Visible = false;
m_dPanel.AutoSize = true;
m_dPanel.BackgroundImageLayout = ImageLayout.None;
m_dPanel.BackColor = Color.SpringGreen;
- m_dPanel.BackgroundImageResized = ( cbxLayouts.SelectedItem as DeviceLayout ).Image;
+ if ( cbxLayouts.SelectedItem is DeviceLayout ) {
+ m_dPanel.BackgroundImageResized = ( cbxLayouts.SelectedItem as DeviceLayout ).Image;
+ }
m_dPanel.Paint += M_dPanel_Paint;
@@ -137,28 +236,17 @@ namespace SCJMapper_V2.Layout
m_sPanel.Dock = DockStyle.Fill;
m_sPanel.BackgroundImageLayout = ImageLayout.Zoom;
- if ( IsDebug( ) ) {
- // get an empty on top
- cbxJs1.Items.Add( new Device.DeviceDescriptor( ) );
- cbxJs2.Items.Add( new Device.DeviceDescriptor( ) );
- cbxJs3.Items.Add( new Device.DeviceDescriptor( ) );
- // get all devices know in the layout folder
- m_devices = m_layouts.Devices( );
- foreach ( var dev in m_devices ) {
- cbxJs1.Items.Add( dev );
- cbxJs2.Items.Add( dev );
- cbxJs3.Items.Add( dev );
- }
- cbxJs1.SelectedIndex = 0;
- cbxJs2.SelectedIndex = 0;
- cbxJs3.SelectedIndex = 0;
- }
+ LoadJsCombos( );
+ SetJsCombos( ActionList.JsDevices );
+ CheckAllGroups( ); // Default is all ON now
+ log.DebugFormat( "Layout - Form Loading - End - Resfresh Panel and show" );
RefreshPanel( );
}
private void FormLayout_FormClosing( object sender, FormClosingEventArgs e )
{
+ log.DebugFormat( "Layout - Form Closing" );
// don't record minimized, maximized forms
if ( this.WindowState == FormWindowState.Normal ) {
AppSettings.Instance.FormLayoutSize = this.Size;
@@ -167,7 +255,7 @@ namespace SCJMapper_V2.Layout
AppSettings.Instance.Save( );
}
-
+ #endregion
#region dPanel Events
@@ -209,10 +297,18 @@ namespace SCJMapper_V2.Layout
///
private void Populate()
{
+ log.DebugFormat( "Layout - Populate()" );
+
bool errorShown = false;
// for all actions found from action tree
m_displayList.Clear( );
+ if ( !( cbxLayouts.SelectedItem is DeviceLayout ) ) {
+ log.WarnFormat( "Layout - Populate() - invalid selected layout.." );
+ return;
+ }
+ log.DebugFormat( "Layout - Populate - Map: {0}", ( cbxLayouts.SelectedItem as DeviceLayout ).DeviceController.MapName );
+
( cbxLayouts.SelectedItem as DeviceLayout ).DeviceController.CreateShapes( );
foreach ( var actItem in ActionList ) {
// matches the selected device
@@ -225,7 +321,7 @@ namespace SCJMapper_V2.Layout
shape.DispText = actItem.ModdedDispText;
shape.TextColor = MapProps.MapForeColor( actItem.ActionMap );
shape.BackColor = MapProps.MapBackColor( actItem.ActionMap );
- if ( shape is ShapeKey ) {
+ if ( shape is ShapeKey ) {
// kbd map
( shape as ShapeKey ).SCGameKey = actItem.MainControl;
}
@@ -233,7 +329,9 @@ namespace SCJMapper_V2.Layout
}
else {
// Display elements exhausted...
- if ( ! errorShown ) {
+ if ( !errorShown ) {
+ log.DebugFormat( "Layout - Populate - number of shapes exhausted for device: {0}", actItem.DeviceName );
+
string msg = $"No more display elements left for device: {actItem.DeviceName}";
msg += $"\n\nTry to use a smaller font to show all actions!";
MessageBox.Show( msg, "Layout - Cannot show all actions", MessageBoxButtons.OK, MessageBoxIcon.Warning );
@@ -243,6 +341,7 @@ namespace SCJMapper_V2.Layout
}
}
}
+ log.DebugFormat( "Layout - Populate() - Done" );
}
// Event Handlers
@@ -257,6 +356,7 @@ namespace SCJMapper_V2.Layout
{
m_displayList.Clear( );
m_dPanel.BackgroundImageResized = ( cbxLayouts.SelectedItem as DeviceLayout ).Image;
+ log.DebugFormat( "Layout - Selected Layout: {0}", ( cbxLayouts.SelectedItem as DeviceLayout ).Filename );
RefreshPanel( );
}
@@ -286,6 +386,7 @@ namespace SCJMapper_V2.Layout
b.Save( SFD.FileName, ImageFormat.Png );
}
else {
+ log.DebugFormat( "Layout - SaveFile - unknown file format: {0}", ext.ToLowerInvariant( ) );
MessageBox.Show( "Unkown fileformat - use jpg or png please", "Save Image Error", MessageBoxButtons.OK, MessageBoxIcon.Error );
}
@@ -385,14 +486,9 @@ namespace SCJMapper_V2.Layout
lblTest.Font = new Font( lblTest.Font.FontFamily, tbFontSize.Value ); ;
}
- private bool m_checkAllToggle = true;
private void pictureBox1_DoubleClick( object sender, EventArgs e )
{
- // select all groups
- for ( int i = 0; i < chkLbActionGroups.Items.Count; i++ ) {
- chkLbActionGroups.Items[i].Checked = m_checkAllToggle;
- }
- m_checkAllToggle = !m_checkAllToggle; // toggle
+ CheckAllGroups( );
}
private void btClose_Click( object sender, EventArgs e )
@@ -405,19 +501,31 @@ namespace SCJMapper_V2.Layout
#region DEBUG LIST
private DbgActionItemList DBG_LIST = null;
+
+ private void btActivateDevices_Click( object sender, EventArgs e )
+ {
+ var guids = new List( );
+ if ( !string.IsNullOrEmpty( ( cbxJs1.SelectedItem as Device.DeviceDescriptor ).DevGuid ) ) guids.Add( ( cbxJs1.SelectedItem as Device.DeviceDescriptor ).DevGuid );
+ if ( !string.IsNullOrEmpty( ( cbxJs2.SelectedItem as Device.DeviceDescriptor ).DevGuid ) ) guids.Add( ( cbxJs2.SelectedItem as Device.DeviceDescriptor ).DevGuid );
+ if ( !string.IsNullOrEmpty( ( cbxJs3.SelectedItem as Device.DeviceDescriptor ).DevGuid ) ) guids.Add( ( cbxJs3.SelectedItem as Device.DeviceDescriptor ).DevGuid );
+ if ( !string.IsNullOrEmpty( ( cbxJs4.SelectedItem as Device.DeviceDescriptor ).DevGuid ) ) guids.Add( ( cbxJs4.SelectedItem as Device.DeviceDescriptor ).DevGuid );
+ ActionList.OverrideJsDevices( guids ); // inject in current Action Items
+ }
+
private void btCreateDbgList_Click( object sender, EventArgs e )
{
DBG_LIST = new DbgActionItemList( );
- List guids = new List( );
+ var guids = new List( );
if ( !string.IsNullOrEmpty( ( cbxJs1.SelectedItem as Device.DeviceDescriptor ).DevGuid ) ) guids.Add( ( cbxJs1.SelectedItem as Device.DeviceDescriptor ).DevGuid );
if ( !string.IsNullOrEmpty( ( cbxJs2.SelectedItem as Device.DeviceDescriptor ).DevGuid ) ) guids.Add( ( cbxJs2.SelectedItem as Device.DeviceDescriptor ).DevGuid );
if ( !string.IsNullOrEmpty( ( cbxJs3.SelectedItem as Device.DeviceDescriptor ).DevGuid ) ) guids.Add( ( cbxJs3.SelectedItem as Device.DeviceDescriptor ).DevGuid );
+ if ( !string.IsNullOrEmpty( ( cbxJs4.SelectedItem as Device.DeviceDescriptor ).DevGuid ) ) guids.Add( ( cbxJs4.SelectedItem as Device.DeviceDescriptor ).DevGuid );
DBG_LIST.CreateDebugList( guids.ToArray( ) );
- ActionList = DBG_LIST.DbgList;
+ ActionList = DBG_LIST.DbgList; // create an artificial ActionItems List
}
-
#endregion
+
}
}
diff --git a/README.md b/README.md
index 599b3ec..c1d6615 100644
--- a/README.md
+++ b/README.md
@@ -1,54 +1,50 @@
-SCJMapper-V2
-============
-
-SC Joystick Mapper (.Net 4.5.2; using sharpDX/OpenTK wrapper)
-this should work with Win7, Win8.x Win 10 out of the box
-
+# SCJMapper-V2
+
+SC Joystick Mapper (.Net 4.5.2; using sharpDX/OpenTK wrapper)
+this should work with Win7, Win8.x Win 10 out of the box
+
On RSI Spectrum see https://robertsspaceindustries.com/spectrum/community/SC/forum/51473/thread/scjmapper-news-and-updates
-
-
+
Built using Windows Forms - Issues with display scaling may be encountered - set display scaling to 100%.
-
-using sharpDX 2.6.3 .net wrapper (http://sharpdx.org/)
-
-Use References to:
-DirectX11-net40\SharpDX.dll
-DirectX11-net40\SharpDX.DirectInput.dll
-
-using OpenTK.1.1.1589.5942 .net wrapper (http://www.opentk.com/)
-NET40\OpenTK.dll
-NET40\OpenTK.GLControl.dll
-
-using ZstdNet 1.3.1 (https://www.nuget.org/packages/ZstdNet/)
-
-using log4net.dll
-
-Built with VisualStudio 2017 Community free version
-
-
-# Credits
-
-Device Layout Images and Maps:
-
+
+using sharpDX 2.6.3 .net wrapper (http://sharpdx.org/)
+
+Use References to:
+* DirectX11-net40\SharpDX.dll
+* DirectX11-net40\SharpDX.DirectInput.dll
+
+using OpenTK.1.1.1589.5942 .net wrapper (http://www.opentk.com/)
+* NET40\OpenTK.dll
+* NET40\OpenTK.GLControl.dll
+
+using ZstdNet 1.3.1 (https://www.nuget.org/packages/ZstdNet/)
+
+using log4net.dll
+
+Built with VisualStudio 2017 Community free version
+
+
+## Credits
+
+Device Layout Images and Maps:
https://github.com/richardbuckle/EDRefCard
-
-
-DDS Skydome Images:
-
-Canyon, Highway, Shiodome, BigSight, LA Heliport:
-
-http://www.hdrlabs.com/sibl/archive.html
-sIBL Archive - Free HDRI sets for smart Image-Based Lighting
-
-Sunset
-https://commons.wikimedia.org/wiki/File:Afterglow_of_a_sunset.jpg
-This file is licensed under the Creative Commons Attribution 2.0 Generic license.
-At Toyomi fishermen's wharf, Tokyo.
-Author: Author Masato OHTA
-
-SC_Area18, _GrimHex, _DyingStar, _BrokenMoon, _Kareah
+
+
+DDS Skydome Images:
+Canyon, Highway, Shiodome, BigSight, LA Heliport:
+http://www.hdrlabs.com/sibl/archive.html
+sIBL Archive - Free HDRI sets for smart Image-Based Lighting
+
+Sunset
+https://commons.wikimedia.org/wiki/File:Afterglow_of_a_sunset.jpg
+This file is licensed under the Creative Commons Attribution 2.0 Generic license.
+
+At Toyomi fishermen's wharf, Tokyo.
+Author: Author Masato OHTA
+
+SC_Area18, _GrimHex, _DyingStar, _BrokenMoon, _Kareah
by Rellim (SC handle)
-
-OutThere1 and 3 made with Spacescape:
-http://alexcpeterson.com/spacescape
-
+
+OutThere1 and 3 made with Spacescape:
+http://alexcpeterson.com/spacescape
+
diff --git a/ReadMe.txt b/ReadMe.txt
index 54ea350..d1d494e 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -4,21 +4,24 @@ SC Joystick Mapper V 2.46 - Build 81 BETA
Contains 14 files + graphics:
SCJMapper.exe The program (V2.46)
-SCJMapper.exe.config Program config (V2.46) - MUST be in the same folder as the Exe file
-de\SCJMapper.resources.dll German language (V2.45) - MUST be in the same folder as the Exe file
-fr\SCJMapper.resources.dll French language (V2.45) - MUST be in the same folder as the Exe file
-Storage\*.scj Folder for collected assets (V2.35) - MUST be in the same folder as the Exe file
-PTU_Storage\*.scj Folder for collected PTU (V2.37) - MUST be in the same folder as the Exe file
-SharpDX.DirectInput.dll Managed DirectInput Assembly - MUST be in the same folder as the Exe file
-SharpDX.dll Managed DirectX Assembly - MUST be in the same folder as the Exe file
-OpenTK.dll Managed OpenGL Assembly - MUST be in the same folder as the Exe file
-OpenTK.GLControl.dll Managed OpenGL Assembly - MUST be in the same folder as the Exe file
-ZstdNet.dll Managed Zip Assembly (v2.33) - MUST be in the same folder as the Exe file
-x64\libzstd.dll Native dll for ZstdNet (v2.33) - MUST be in the same folder as the Exe file
-x86\libzstd.dll Native dll for ZstdNet (v2.33) - MUST be in the same folder as the Exe file
-log4net.dll Managed Logging Assembly - MUST be in the same folder as the Exe file
-log4net.config.OFF Config file for logging - To use it - rename as log4net.config and run the program
- then look for trace.log in the same folder
+
+- The following files and folders MUST be in the same folder as the Exe file
+SCJMapper.exe.config Program config (V2.46)
+de\SCJMapper.resources.dll German language (V2.45)
+fr\SCJMapper.resources.dll French language (V2.45)
+Storage\*.scj Folder for collected assets (V2.35)
+PTU_Storage\*.scj Folder for collected PTU (V2.37)
+SharpDX.DirectInput.dll Managed DirectInput Assembly
+SharpDX.dll Managed DirectX Assembly
+OpenTK.dll Managed OpenGL Assembly
+OpenTK.GLControl.dll Managed OpenGL Assembly
+ZstdNet.dll Managed Zip Assembly (v2.33)
+x64\libzstd.dll Native dll for ZstdNet (v2.33)
+x86\libzstd.dll Native dll for ZstdNet (v2.33)
+log4net.dll Managed Logging Assembly
+log4net.config.OFF Config file for logging
+ then look for trace.log in the same folder
+
SCJMapper_QGuide V2.35beta.pdf Quick Guide (v2.35)
ReadMe.txt This file
diff --git a/SCJMapper-V2.csproj b/SCJMapper-V2.csproj
index 0afdfd0..9fde73d 100644
--- a/SCJMapper-V2.csproj
+++ b/SCJMapper-V2.csproj
@@ -54,8 +54,7 @@
false
-
-
+ Cassini_Logo_Icon.ico
SCJMapper_V2.Program
@@ -414,7 +413,6 @@
Always
-
DS_ActionMaps.xsd
@@ -460,6 +458,7 @@
+
@@ -472,7 +471,6 @@
-
diff --git a/graphics/layouts/MapToolbox.xlsx b/graphics/layouts/MapToolbox.xlsx
index cf04527..2cb9c3b 100644
Binary files a/graphics/layouts/MapToolbox.xlsx and b/graphics/layouts/MapToolbox.xlsx differ
diff --git a/graphics/layouts/chcombat.json b/graphics/layouts/chcombat.json
index ff8b733..47eacea 100644
--- a/graphics/layouts/chcombat.json
+++ b/graphics/layouts/chcombat.json
@@ -8,23 +8,23 @@
"DeviceProdGuid": ["{C0F4068E-0000-0000-0000-504944564944}",
"{00F4068E-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1974, "Y":854, "Width":592, "Height":54, "Cmt": "Primary trigger"},
- { "Input": "button2", "Type": "Digital", "X":2984, "Y":944, "Width":832, "Height":54, "Cmt": "Thumb button"},
- { "Input": "button3", "Type": "Digital", "X":2964, "Y":654, "Width":832, "Height":54, "Cmt": "Top button"},
- { "Input": "button4", "Type": "Digital", "X":2084, "Y":1159, "Width":592, "Height":54, "Cmt": "Pinky trigger"},
- { "Input": "button5", "Type": "Digital", "X":1754, "Y":234, "Width":892, "Height":54, "Cmt": "Side trigger"},
- { "Input": "button6", "Type": "Digital", "X":1664, "Y":334, "Width":892, "Height":54, "Cmt": "Top trigger"},
- { "Input": "button7", "Type": "Digital", "X":1689, "Y":464, "Width":832, "Height":54, "Cmt": "PoV hat up"},
- { "Input": "button8", "Type": "Digital", "X":1689, "Y":520, "Width":832, "Height":54, "Cmt": "PoV hat right"},
- { "Input": "button9", "Type": "Digital", "X":1689, "Y":576, "Width":832, "Height":54, "Cmt": "PoV hat down"},
- { "Input": "button10", "Type": "Digital", "X":1689, "Y":632, "Width":832, "Height":54, "Cmt": "PoV hat left"},
- { "Input": "hat1_up", "Type": "Digital", "X":2964, "Y":212, "Width":832, "Height":54, "Cmt": "Right hat up"},
- { "Input": "hat1_right", "Type": "Digital", "X":2964, "Y":268, "Width":832, "Height":54, "Cmt": "Right hat right"},
- { "Input": "hat1_down", "Type": "Digital", "X":2964, "Y":324, "Width":832, "Height":54, "Cmt": "Right hat down"},
- { "Input": "hat1_left", "Type": "Digital", "X":2964, "Y":380, "Width":832, "Height":54, "Cmt": "Right hat left"},
- { "Input": "x", "Type": "Analogue", "X":3124, "Y":1168, "Width":692, "Height":54, "Cmt": "Stick X axis"},
- { "Input": "y", "Type": "Analogue", "X":3124, "Y":1112, "Width":692, "Height":54, "Cmt": "Stick Y axis"},
- { "Input": "z", "Type": "Analogue", "X":2254, "Y":1894, "Width":692, "Height":54, "Cmt": "Wheel on left of base"}
+ { "Input" : "button1", "Type" : "Digital", "X" : 1974, "Y" : 854, "Width" : 591, "Height" : 53, "Cmt" : "Primary trigger" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 2984, "Y" : 944, "Width" : 830, "Height" : 53, "Cmt" : "Thumb button" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 2964, "Y" : 654, "Width" : 830, "Height" : 53, "Cmt" : "Top button" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 2084, "Y" : 1159, "Width" : 591, "Height" : 53, "Cmt" : "Pinky trigger" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 1754, "Y" : 234, "Width" : 891, "Height" : 53, "Cmt" : "Side trigger" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 1664, "Y" : 334, "Width" : 891, "Height" : 53, "Cmt" : "Top trigger" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 1689, "Y" : 464, "Width" : 831, "Height" : 53, "Cmt" : "PoV hat up" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 1689, "Y" : 520, "Width" : 831, "Height" : 53, "Cmt" : "PoV hat right" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 1689, "Y" : 576, "Width" : 831, "Height" : 53, "Cmt" : "PoV hat down" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 1689, "Y" : 632, "Width" : 831, "Height" : 53, "Cmt" : "PoV hat left" },
+ { "Input" : "hat1_up", "Type" : "Digital", "X" : 2964, "Y" : 212, "Width" : 831, "Height" : 53, "Cmt" : "Right hat up" },
+ { "Input" : "hat1_right", "Type" : "Digital", "X" : 2964, "Y" : 268, "Width" : 831, "Height" : 53, "Cmt" : "Right hat right" },
+ { "Input" : "hat1_down", "Type" : "Digital", "X" : 2964, "Y" : 324, "Width" : 831, "Height" : 53, "Cmt" : "Right hat down" },
+ { "Input" : "hat1_left", "Type" : "Digital", "X" : 2964, "Y" : 380, "Width" : 831, "Height" : 53, "Cmt" : "Right hat left" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 3124, "Y" : 1170, "Width" : 691, "Height" : 51, "Cmt" : "X-Axis" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 3124, "Y" : 1114, "Width" : 691, "Height" : 53, "Cmt" : "Y-Axis" },
+ { "Input" : "z", "Type" : "Analogue", "X" : 2254, "Y" : 1894, "Width" : 691, "Height" : 53, "Cmt" : "Wheel on left of base" }
]
},
{
@@ -32,29 +32,29 @@
"DeviceName": "CH Pro Throttle 1",
"DeviceProdGuid": ["{00F1068E-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1114, "Y":966, "Width":832, "Height":54, "Cmt": "Castle hat right"},
- { "Input": "button2", "Type": "Digital", "X":1114, "Y":1022, "Width":832, "Height":54, "Cmt": "Castle hat down"},
- { "Input": "button3", "Type": "Digital", "X":1114, "Y":1078, "Width":832, "Height":54, "Cmt": "Castle hat left"},
- { "Input": "button4", "Type": "Digital", "X":1114, "Y":910, "Width":832, "Height":54, "Cmt": "Castle hat up"},
- { "Input": "button5", "Type": "Digital", "X":1189, "Y":1696, "Width":1032, "Height":54, "Cmt": "Bottom hat right"},
- { "Input": "button6", "Type": "Digital", "X":1189, "Y":1752, "Width":1032, "Height":54, "Cmt": "Bottom hat down"},
- { "Input": "button7", "Type": "Digital", "X":1189, "Y":1808, "Width":1032, "Height":54, "Cmt": "Bottom hat left"},
- { "Input": "button8", "Type": "Digital", "X":1189, "Y":1640, "Width":1032, "Height":54, "Cmt": "Bottom hat up"},
- { "Input": "button9", "Type": "Digital", "X":1198, "Y":1275, "Width":832, "Height":54, "Cmt": "Rear hat down"},
- { "Input": "button10", "Type": "Digital", "X":1198, "Y":1219, "Width":832, "Height":54, "Cmt": "Rear hat right"},
- { "Input": "button11", "Type": "Digital", "X":1198, "Y":1163, "Width":832, "Height":54, "Cmt": "Rear hat up"},
- { "Input": "button12", "Type": "Digital", "X":1198, "Y":1331, "Width":832, "Height":54, "Cmt": "Rear hat left"},
- { "Input": "button13", "Type": "Digital", "X":1261, "Y":1549, "Width":932, "Height":54, "Cmt": "Mouse button"},
- { "Input": "button14", "Type": "Digital", "X":1042, "Y":814, "Width":892, "Height":54, "Cmt": "Right back"},
- { "Input": "button15", "Type": "Digital", "X":904, "Y":724, "Width":892, "Height":54, "Cmt": "Middle back"},
- { "Input": "button16", "Type": "Digital", "X":684, "Y":634, "Width":892, "Height":54, "Cmt": "Left back"},
- { "Input": "hat1_up", "Type": "Digital", "X":132, "Y":1896, "Width":932, "Height":54, "Cmt": "PoV hat up (looks like witch hat)"},
- { "Input": "hat1_right", "Type": "Digital", "X":132, "Y":1952, "Width":932, "Height":54, "Cmt": "PoV hat right (looks like witch hat)"},
- { "Input": "hat1_down", "Type": "Digital", "X":132, "Y":2008, "Width":932, "Height":54, "Cmt": "PoV hat down (looks like witch hat)"},
- { "Input": "hat1_left", "Type": "Digital", "X":132, "Y":1840, "Width":932, "Height":54, "Cmt": "PoV hat left (looks like witch hat)"},
- { "Input": "x", "Type": "Analogue", "X":1261, "Y":1493, "Width":932, "Height":54, "Cmt": "Mouse X axis"},
- { "Input": "y", "Type": "Analogue", "X":1261, "Y":1437, "Width":932, "Height":54, "Cmt": "Mouse Y axis"},
- { "Input": "z", "Type": "Analogue", "X":80, "Y":714, "Width":692, "Height":54, "Cmt": "Throttle"}
+ { "Input" : "button1", "Type" : "Digital", "X" : 1114, "Y" : 966, "Width" : 831, "Height" : 53, "Cmt" : "Castle hat right" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 1114, "Y" : 1022, "Width" : 831, "Height" : 53, "Cmt" : "Castle hat down" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 1114, "Y" : 1078, "Width" : 831, "Height" : 53, "Cmt" : "Castle hat left" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 1114, "Y" : 910, "Width" : 831, "Height" : 53, "Cmt" : "Castle hat up" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 1189, "Y" : 1696, "Width" : 1031, "Height" : 53, "Cmt" : "Bottom hat right" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 1189, "Y" : 1752, "Width" : 1031, "Height" : 53, "Cmt" : "Bottom hat down" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 1189, "Y" : 1808, "Width" : 1031, "Height" : 53, "Cmt" : "Bottom hat left" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 1189, "Y" : 1640, "Width" : 1031, "Height" : 53, "Cmt" : "Bottom hat up" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 1198, "Y" : 1275, "Width" : 831, "Height" : 53, "Cmt" : "Rear hat down" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 1198, "Y" : 1219, "Width" : 831, "Height" : 53, "Cmt" : "Rear hat right" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 1198, "Y" : 1163, "Width" : 831, "Height" : 53, "Cmt" : "Rear hat up" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 1198, "Y" : 1331, "Width" : 831, "Height" : 53, "Cmt" : "Rear hat left" },
+ { "Input" : "button13", "Type" : "Digital", "X" : 1261, "Y" : 1550, "Width" : 931, "Height" : 52, "Cmt" : "Mouse button" },
+ { "Input" : "button14", "Type" : "Digital", "X" : 1042, "Y" : 814, "Width" : 891, "Height" : 53, "Cmt" : "Right back" },
+ { "Input" : "button15", "Type" : "Digital", "X" : 904, "Y" : 724, "Width" : 891, "Height" : 53, "Cmt" : "Middle back" },
+ { "Input" : "button16", "Type" : "Digital", "X" : 684, "Y" : 634, "Width" : 891, "Height" : 53, "Cmt" : "Left back" },
+ { "Input" : "hat1_up", "Type" : "Digital", "X" : 132, "Y" : 1840, "Width" : 931, "Height" : 53, "Cmt" : "PoV hat up (looks like witch hat)" },
+ { "Input" : "hat1_right", "Type" : "Digital", "X" : 132, "Y" : 1896, "Width" : 931, "Height" : 53, "Cmt" : "PoV hat right (looks like witch hat)" },
+ { "Input" : "hat1_down", "Type" : "Digital", "X" : 132, "Y" : 1952, "Width" : 931, "Height" : 53, "Cmt" : "PoV hat down (looks like witch hat)" },
+ { "Input" : "hat1_left", "Type" : "Digital", "X" : 132, "Y" : 2008, "Width" : 931, "Height" : 53, "Cmt" : "PoV hat left (looks like witch hat)" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 1261, "Y" : 1494, "Width" : 931, "Height" : 53, "Cmt" : "Mouse X-Axis" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 1261, "Y" : 1437, "Width" : 931, "Height" : 54, "Cmt" : "Mouse Y-Axis" },
+ { "Input" : "z", "Type" : "Analogue", "X" : 80, "Y" : 714, "Width" : 691, "Height" : 53, "Cmt" : "Throttle Z-Axis" }
]
}
]
diff --git a/graphics/layouts/chfighter.json b/graphics/layouts/chfighter.json
index aa20941..9e2f832 100644
--- a/graphics/layouts/chfighter.json
+++ b/graphics/layouts/chfighter.json
@@ -9,30 +9,29 @@
"{C0F3068E-0000-0000-0000-504944564944}",
"{C010068E-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input" : "button1" , "Type" : "Digital" , "X" : 1974 , "Y" : 854 , "Width" : 592 , "Height" : 54 , "Cmt" : "Primary trigger" },
- { "Input" : "button2" , "Type" : "Digital" , "X" : 1664 , "Y" : 334 , "Width" : 892 , "Height" : 54 , "Cmt" : "Top trigger" },
- { "Input" : "button3" , "Type" : "Digital" , "X" : 1754 , "Y" : 234 , "Width" : 892 , "Height" : 54 , "Cmt" : "Side trigger" },
- { "Input" : "button4" , "Type" : "Digital" , "X" : 2084 , "Y" : 1159 , "Width" : 592 , "Height" : 54 , "Cmt" : "Pinky trigger" },
- { "Input" : "button5" , "Type" : "Digital" , "X" : 1689 , "Y" : 464 , "Width" : 832 , "Height" : 54 , "Cmt" : "Left hat up" },
- { "Input" : "button6" , "Type" : "Digital" , "X" : 1689 , "Y" : 520 , "Width" : 832 , "Height" : 54 , "Cmt" : "Left hat right" },
- { "Input" : "button7" , "Type" : "Digital" , "X" : 1689 , "Y" : 576 , "Width" : 832 , "Height" : 54 , "Cmt" : "Left hat down" },
- { "Input" : "button8" , "Type" : "Digital" , "X" : 1689 , "Y" : 632 , "Width" : 832 , "Height" : 54 , "Cmt" : "Left hat left" },
- { "Input" : "button9" , "Type" : "Digital" , "X" : 2994 , "Y" : 494 , "Width" : 832 , "Height" : 54 , "Cmt" : "Castle hat up" },
- { "Input" : "button10" , "Type" : "Digital" , "X" : 2994 , "Y" : 550 , "Width" : 832 , "Height" : 54 , "Cmt" : "Castle hat right" },
- { "Input" : "button11" , "Type" : "Digital" , "X" : 2994 , "Y" : 606 , "Width" : 832 , "Height" : 54 , "Cmt" : "Castle hat down" },
- { "Input" : "button12" , "Type" : "Digital" , "X" : 2994 , "Y" : 662 , "Width" : 832 , "Height" : 54 , "Cmt" : "Castle hat left" },
- { "Input" : "button13" , "Type" : "Digital" , "X" : 3058 , "Y" : 810 , "Width" : 772 , "Height" : 54 , "Cmt" : "Thumb hat up" },
- { "Input" : "button14" , "Type" : "Digital" , "X" : 3058 , "Y" : 866 , "Width" : 772 , "Height" : 54 , "Cmt" : "Thumb hat right" },
- { "Input" : "button15" , "Type" : "Digital" , "X" : 3058 , "Y" : 922 , "Width" : 772 , "Height" : 54 , "Cmt" : "Thumb hat down" },
- { "Input" : "button16" , "Type" : "Digital" , "X" : 3058 , "Y" : 978 , "Width" : 772 , "Height" : 54 , "Cmt" : "Thumb hat left" },
- { "Input" : "hat1_up" , "Type" : "Digital" , "X" : 2964 , "Y" : 212 , "Width" : 832 , "Height" : 54 , "Cmt" : "POV hat up (looks like witch hat)" },
- { "Input" : "hat1_right" , "Type" : "Digital" , "X" : 2964 , "Y" : 268 , "Width" : 832 , "Height" : 54 , "Cmt" : "POV hat right (looks like witch hat)" },
- { "Input" : "hat1_down" , "Type" : "Digital" , "X" : 2964 , "Y" : 324 , "Width" : 832 , "Height" : 54 , "Cmt" : "POV hat down (looks like witch hat)" },
- { "Input" : "hat1_left" , "Type" : "Digital" , "X" : 2964 , "Y" : 380 , "Width" : 832 , "Height" : 54 , "Cmt" : "POV hat left (looks like witch hat)" },
- { "Input" : "x" , "Type" : "Analogue" , "X" : 3124 , "Y" : 1112 , "Width" : 692 , "Height" : 54 , "Cmt" : "Stick X axis" },
- { "Input" : "y" , "Type" : "Analogue" , "X" : 3124 , "Y" : 1168 , "Width" : 692 , "Height" : 54 , "Cmt" : "Stick Y axis" },
- { "Input" : "z" , "Type" : "Analogue" , "X" : 2254 , "Y" : 1894 , "Width" : 692 , "Height" : 54 , "Cmt" : "Wheel on left of base" }
-
+ { "Input": "button1", "Type": "Digital", "X":1974, "Y":854, "Width":591, "Height":53, "Cmt": "Primary trigger"},
+ { "Input": "button2", "Type": "Digital", "X":1664, "Y":334, "Width":891, "Height":53, "Cmt": "Top trigger"},
+ { "Input": "button3", "Type": "Digital", "X":1754, "Y":234, "Width":891, "Height":53, "Cmt": "Side trigger"},
+ { "Input": "button4", "Type": "Digital", "X":2084, "Y":1159, "Width":591, "Height":53, "Cmt": "Pinky trigger"},
+ { "Input": "button5", "Type": "Digital", "X":1689, "Y":464, "Width":831, "Height":53, "Cmt": "Left hat up"},
+ { "Input": "button6", "Type": "Digital", "X":1689, "Y":520, "Width":831, "Height":53, "Cmt": "Left hat right"},
+ { "Input": "button7", "Type": "Digital", "X":1689, "Y":576, "Width":831, "Height":53, "Cmt": "Left hat down"},
+ { "Input": "button8", "Type": "Digital", "X":1689, "Y":632, "Width":831, "Height":53, "Cmt": "Left hat left"},
+ { "Input": "button9", "Type": "Digital", "X":2994, "Y":494, "Width":831, "Height":53, "Cmt": "Castle hat up"},
+ { "Input": "button10", "Type": "Digital", "X":2994, "Y":550, "Width":831, "Height":53, "Cmt": "Castle hat right"},
+ { "Input": "button11", "Type": "Digital", "X":2994, "Y":606, "Width":831, "Height":53, "Cmt": "Castle hat down"},
+ { "Input": "button12", "Type": "Digital", "X":2994, "Y":662, "Width":831, "Height":53, "Cmt": "Castle hat left"},
+ { "Input": "button13", "Type": "Digital", "X":3058, "Y":810, "Width":771, "Height":53, "Cmt": "Thumb hat up"},
+ { "Input": "button14", "Type": "Digital", "X":3058, "Y":866, "Width":771, "Height":53, "Cmt": "Thumb hat right"},
+ { "Input": "button15", "Type": "Digital", "X":3058, "Y":922, "Width":771, "Height":53, "Cmt": "Thumb hat down"},
+ { "Input": "button16", "Type": "Digital", "X":3058, "Y":978, "Width":771, "Height":53, "Cmt": "Thumb hat left"},
+ { "Input": "hat1_up", "Type": "Digital", "X":2964, "Y":212, "Width":831, "Height":53, "Cmt": "POV hat up (looks like witch hat)"},
+ { "Input": "hat1_right", "Type": "Digital", "X":2964, "Y":268, "Width":831, "Height":53, "Cmt": "POV hat right (looks like witch hat)"},
+ { "Input": "hat1_down", "Type": "Digital", "X":2964, "Y":324, "Width":831, "Height":53, "Cmt": "POV hat down (looks like witch hat)"},
+ { "Input": "hat1_left", "Type": "Digital", "X":2964, "Y":380, "Width":831, "Height":53, "Cmt": "POV hat left (looks like witch hat)"},
+ { "Input": "x", "Type": "Analogue", "X":3124, "Y":1170, "Width":691, "Height":51, "Cmt": "Stick X axis"},
+ { "Input": "y", "Type": "Analogue", "X":3124, "Y":1114, "Width":691, "Height":53, "Cmt": "Stick Y axis"},
+ { "Input": "z", "Type": "Analogue", "X":2254, "Y":1894, "Width":691, "Height":53, "Cmt": "Wheel on left of base"}
]
},
{
@@ -40,29 +39,29 @@
"DeviceName": "CH Pro Throttle 1",
"DeviceProdGuid": ["{00F1068E-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1114, "Y":966, "Width":832, "Height":54, "Cmt": "Castle hat right"},
- { "Input": "button2", "Type": "Digital", "X":1114, "Y":1022, "Width":832, "Height":54, "Cmt": "Castle hat down"},
- { "Input": "button3", "Type": "Digital", "X":1114, "Y":1078, "Width":832, "Height":54, "Cmt": "Castle hat left"},
- { "Input": "button4", "Type": "Digital", "X":1114, "Y":910, "Width":832, "Height":54, "Cmt": "Castle hat up"},
- { "Input": "button5", "Type": "Digital", "X":1189, "Y":1696, "Width":1032, "Height":54, "Cmt": "Bottom hat right"},
- { "Input": "button6", "Type": "Digital", "X":1189, "Y":1752, "Width":1032, "Height":54, "Cmt": "Bottom hat down"},
- { "Input": "button7", "Type": "Digital", "X":1189, "Y":1808, "Width":1032, "Height":54, "Cmt": "Bottom hat left"},
- { "Input": "button8", "Type": "Digital", "X":1189, "Y":1640, "Width":1032, "Height":54, "Cmt": "Bottom hat up"},
- { "Input": "button9", "Type": "Digital", "X":1198, "Y":1275, "Width":832, "Height":54, "Cmt": "Rear hat down"},
- { "Input": "button10", "Type": "Digital", "X":1198, "Y":1219, "Width":832, "Height":54, "Cmt": "Rear hat right"},
- { "Input": "button11", "Type": "Digital", "X":1198, "Y":1163, "Width":832, "Height":54, "Cmt": "Rear hat up"},
- { "Input": "button12", "Type": "Digital", "X":1198, "Y":1331, "Width":832, "Height":54, "Cmt": "Rear hat left"},
- { "Input": "button13", "Type": "Digital", "X":1261, "Y":1549, "Width":932, "Height":54, "Cmt": "Mouse button"},
- { "Input": "button14", "Type": "Digital", "X":1042, "Y":814, "Width":892, "Height":54, "Cmt": "Right back"},
- { "Input": "button15", "Type": "Digital", "X":904, "Y":724, "Width":892, "Height":54, "Cmt": "Middle back"},
- { "Input": "button16", "Type": "Digital", "X":684, "Y":634, "Width":892, "Height":54, "Cmt": "Left back"},
- { "Input": "hat1_up", "Type": "Digital", "X":132, "Y":1896, "Width":932, "Height":54, "Cmt": "PoV hat up (looks like witch hat)"},
- { "Input": "hat1_right", "Type": "Digital", "X":132, "Y":1952, "Width":932, "Height":54, "Cmt": "PoV hat right (looks like witch hat)"},
- { "Input": "hat1_down", "Type": "Digital", "X":132, "Y":2008, "Width":932, "Height":54, "Cmt": "PoV hat down (looks like witch hat)"},
- { "Input": "hat1_left", "Type": "Digital", "X":132, "Y":1840, "Width":932, "Height":54, "Cmt": "PoV hat left (looks like witch hat)"},
- { "Input": "x", "Type": "Analogue", "X":1261, "Y":1493, "Width":932, "Height":54, "Cmt": "Mouse X axis"},
- { "Input": "y", "Type": "Analogue", "X":1261, "Y":1437, "Width":932, "Height":54, "Cmt": "Mouse Y axis"},
- { "Input": "z", "Type": "Analogue", "X":80, "Y":714, "Width":692, "Height":54, "Cmt": "Throttle"}
+ { "Input": "button1", "Type": "Digital", "X":1114, "Y":966, "Width":831, "Height":53, "Cmt": "Castle hat right"},
+ { "Input": "button2", "Type": "Digital", "X":1114, "Y":1022, "Width":831, "Height":53, "Cmt": "Castle hat down"},
+ { "Input": "button3", "Type": "Digital", "X":1114, "Y":1078, "Width":831, "Height":53, "Cmt": "Castle hat left"},
+ { "Input": "button4", "Type": "Digital", "X":1114, "Y":910, "Width":831, "Height":53, "Cmt": "Castle hat up"},
+ { "Input": "button5", "Type": "Digital", "X":1189, "Y":1696, "Width":1031, "Height":53, "Cmt": "Bottom hat right"},
+ { "Input": "button6", "Type": "Digital", "X":1189, "Y":1752, "Width":1031, "Height":53, "Cmt": "Bottom hat down"},
+ { "Input": "button7", "Type": "Digital", "X":1189, "Y":1808, "Width":1031, "Height":53, "Cmt": "Bottom hat left"},
+ { "Input": "button8", "Type": "Digital", "X":1189, "Y":1640, "Width":1031, "Height":53, "Cmt": "Bottom hat up"},
+ { "Input": "button9", "Type": "Digital", "X":1198, "Y":1219, "Width":831, "Height":53, "Cmt": "Rear hat down"},
+ { "Input": "button10", "Type": "Digital", "X":1198, "Y":1275, "Width":831, "Height":53, "Cmt": "Rear hat right"},
+ { "Input": "button11", "Type": "Digital", "X":1198, "Y":1331, "Width":831, "Height":53, "Cmt": "Rear hat up"},
+ { "Input": "button12", "Type": "Digital", "X":1198, "Y":1163, "Width":831, "Height":53, "Cmt": "Rear hat left"},
+ { "Input": "button13", "Type": "Digital", "X":1261, "Y":1550, "Width":931, "Height":52, "Cmt": "Mouse button"},
+ { "Input": "button14", "Type": "Digital", "X":1042, "Y":814, "Width":891, "Height":53, "Cmt": "Right back"},
+ { "Input": "button15", "Type": "Digital", "X":904, "Y":724, "Width":891, "Height":53, "Cmt": "Middle back"},
+ { "Input": "button16", "Type": "Digital", "X":684, "Y":634, "Width":891, "Height":53, "Cmt": "Left back"},
+ { "Input": "hat1_up", "Type": "Digital", "X":132, "Y":1840, "Width":931, "Height":53, "Cmt": "PoV hat up (looks like witch hat)"},
+ { "Input": "hat1_right", "Type": "Digital", "X":132, "Y":1896, "Width":931, "Height":53, "Cmt": "PoV hat right (looks like witch hat)"},
+ { "Input": "hat1_down", "Type": "Digital", "X":132, "Y":1952, "Width":931, "Height":53, "Cmt": "PoV hat down (looks like witch hat)"},
+ { "Input": "hat1_left", "Type": "Digital", "X":132, "Y":2008, "Width":931, "Height":53, "Cmt": "PoV hat left (looks like witch hat)"},
+ { "Input": "x", "Type": "Analogue", "X":1261, "Y":1494, "Width":931, "Height":53, "Cmt": "Mouse X axis"},
+ { "Input": "y", "Type": "Analogue", "X":1261, "Y":1437, "Width":931, "Height":54, "Cmt": "Mouse Y axis"},
+ { "Input": "z", "Type": "Analogue", "X":80, "Y":714, "Width":691, "Height":53, "Cmt": "Throttle"}
]
}
]
diff --git a/graphics/layouts/chproflightquadrant.json b/graphics/layouts/chproflightquadrant.json
index 9a8b01d..38c1c85 100644
--- a/graphics/layouts/chproflightquadrant.json
+++ b/graphics/layouts/chproflightquadrant.json
@@ -7,15 +7,15 @@
"DeviceName": "CH Pro Flight Throttle Quadrant",
"DeviceProdGuid": ["{0C2D06A3-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":354, "Y":1484, "Width":932, "Height":54, "Cmt": "Switch 1 up"},
- { "Input": "button2", "Type": "Digital", "X":354, "Y":1540, "Width":932, "Height":54, "Cmt": "Switch 1 down"},
- { "Input": "button3", "Type": "Digital", "X":1474, "Y":1754, "Width":932, "Height":54, "Cmt": "Switch 2 up"},
- { "Input": "button4", "Type": "Digital", "X":1474, "Y":1810, "Width":932, "Height":54, "Cmt": "Switch 2 down"},
- { "Input": "button5", "Type": "Digital", "X":2614, "Y":1484, "Width":932, "Height":54, "Cmt": "Switch 3 up"},
- { "Input": "button6", "Type": "Digital", "X":2614, "Y":1540, "Width":932, "Height":54, "Cmt": "Switch 3 down"},
- { "Input": "x", "Type": "Analogue", "X":554, "Y":564, "Width":932, "Height":54, "Cmt": "Throttle 1"},
- { "Input": "y", "Type": "Analogue", "X":1474, "Y":324, "Width":932, "Height":54, "Cmt": "Throttle 2"},
- { "Input": "z", "Type": "Analogue", "X":2414, "Y":564, "Width":932, "Height":54, "Cmt": "Throttle 3"}
+ { "Input" : "button1", "Type" : "Digital", "X" : 354, "Y" : 1484, "Width" : 931, "Height" : 53, "Cmt" : "Switch 1 up"},
+ { "Input" : "button2", "Type" : "Digital", "X" : 354, "Y" : 1540, "Width" : 931, "Height" : 53, "Cmt" : "Switch 1 down"},
+ { "Input" : "button3", "Type" : "Digital", "X" : 1474, "Y" : 1754, "Width" : 931, "Height" : 53, "Cmt" : "Switch 2 up"},
+ { "Input" : "button4", "Type" : "Digital", "X" : 1474, "Y" : 1810, "Width" : 931, "Height" : 53, "Cmt" : "Switch 2 down"},
+ { "Input" : "button5", "Type" : "Digital", "X" : 2614, "Y" : 1484, "Width" : 931, "Height" : 53, "Cmt" : "Switch 3 up"},
+ { "Input" : "button6", "Type" : "Digital", "X" : 2614, "Y" : 1540, "Width" : 931, "Height" : 53, "Cmt" : "Switch 3 down"},
+ { "Input" : "x", "Type" : "Analogue", "X" : 554, "Y" : 564, "Width" : 931, "Height" : 53, "Cmt" : "X-Axis Throttle 1" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 1474, "Y" : 324, "Width" : 931, "Height" : 53, "Cmt" : "Y-Axis Throttle 2" },
+ { "Input" : "z", "Type" : "Analogue", "X" : 2414, "Y" : 564, "Width" : 931, "Height" : 53, "Cmt" : "Z-Axis Throttle 3" }
]
}
]
diff --git a/graphics/layouts/cobram5.json b/graphics/layouts/cobram5.json
index cbff820..6139e48 100644
--- a/graphics/layouts/cobram5.json
+++ b/graphics/layouts/cobram5.json
@@ -8,36 +8,36 @@
"DeviceProdGuid": ["{560311C0-0000-0000-0000-504944564944}",
"{560511C0-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":64, "Y":1273, "Width":1392, "Height":54, "Cmt": "Primary trigger"},
- { "Input": "button2", "Type": "Digital", "X":2264, "Y":922, "Width":1392, "Height":54, "Cmt": "Secondary trigger"},
- { "Input": "button3", "Type": "Digital", "X":124, "Y":1124, "Width":1332, "Height":54, "Cmt": "NAV left red button"},
- { "Input": "button4", "Type": "Digital", "X":2324, "Y":734, "Width":1332, "Height":54, "Cmt": "NAV right red button"},
- { "Input": "button5", "Type": "Digital", "X":184, "Y":722, "Width":1272, "Height":54, "Cmt": "NAV witch hat left"},
- { "Input": "button6", "Type": "Digital", "X":184, "Y":554, "Width":1272, "Height":54, "Cmt": "NAV witch hat up"},
- { "Input": "button7", "Type": "Digital", "X":184, "Y":610, "Width":1272, "Height":54, "Cmt": "NAV witch hat right"},
- { "Input": "button8", "Type": "Digital", "X":184, "Y":666, "Width":1272, "Height":54, "Cmt": "NAV witch hat down"},
- { "Input": "button9", "Type": "Digital", "X":124, "Y":1414, "Width":1332, "Height":54, "Cmt": "NAV pinky trigger"},
- { "Input": "button10", "Type": "Digital", "X":124, "Y":1064, "Width":1332, "Height":54, "Cmt": "BVR left red button"},
- { "Input": "button11", "Type": "Digital", "X":2324, "Y":674, "Width":1332, "Height":54, "Cmt": "BVR right red button"},
- { "Input": "button12", "Type": "Digital", "X":184, "Y":492, "Width":1272, "Height":54, "Cmt": "BVR witch hat left"},
- { "Input": "button13", "Type": "Digital", "X":184, "Y":324, "Width":1272, "Height":54, "Cmt": "BVR witch hat up"},
- { "Input": "button14", "Type": "Digital", "X":184, "Y":380, "Width":1272, "Height":54, "Cmt": "BVR witch hat right"},
- { "Input": "button15", "Type": "Digital", "X":184, "Y":436, "Width":1272, "Height":54, "Cmt": "BVR witch hat down"},
- { "Input": "button16", "Type": "Digital", "X":124, "Y":1354, "Width":1332, "Height":54, "Cmt": "BVR pinky trigger"},
- { "Input": "button17", "Type": "Digital", "X":124, "Y":1184, "Width":1332, "Height":54, "Cmt": "VIS left red button"},
- { "Input": "button18", "Type": "Digital", "X":2324, "Y":794, "Width":1332, "Height":54, "Cmt": "VIS right red button"},
- { "Input": "button19", "Type": "Digital", "X":184, "Y":952, "Width":1272, "Height":54, "Cmt": "VIS witch hat left"},
- { "Input": "button20", "Type": "Digital", "X":184, "Y":784, "Width":1272, "Height":54, "Cmt": "VIS witch hat up"},
- { "Input": "button21", "Type": "Digital", "X":184, "Y":840, "Width":1272, "Height":54, "Cmt": "VIS witch hat right"},
- { "Input": "button22", "Type": "Digital", "X":184, "Y":896, "Width":1272, "Height":54, "Cmt": "VIS witch hat down"},
- { "Input": "button23", "Type": "Digital", "X":124, "Y":1474, "Width":1332, "Height":54, "Cmt": "VIS pinky trigger"},
- { "Input": "hat1_up", "Type": "Digital", "X":1864, "Y":324, "Width":1932, "Height":54, "Cmt": "PoV up"},
- { "Input": "hat1_right", "Type": "Digital", "X":1864, "Y":380, "Width":1932, "Height":54, "Cmt": "PoV right"},
- { "Input": "hat1_down", "Type": "Digital", "X":1864, "Y":436, "Width":1932, "Height":54, "Cmt": "PoV down"},
- { "Input": "hat1_left", "Type": "Digital", "X":1864, "Y":492, "Width":1932, "Height":54, "Cmt": "PoV left"},
- { "Input": "x", "Type": "Analogue", "X":2324, "Y":1080, "Width":1332, "Height":54, "Cmt": ""},
- { "Input": "y", "Type": "Analogue", "X":2324, "Y":1024, "Width":1332, "Height":54, "Cmt": ""},
- { "Input": "rotz", "Type": "Analogue", "X":2324, "Y":1136, "Width":1332, "Height":54, "Cmt": ""}
+ { "Input": "button1", "Type": "Digital", "X":64, "Y":1273, "Width":1391, "Height":53, "Cmt": "Primary trigger"},
+ { "Input": "button2", "Type": "Digital", "X":2264, "Y":922, "Width":1391, "Height":53, "Cmt": "Secondary trigger"},
+ { "Input": "button3", "Type": "Digital", "X":124, "Y":1126, "Width":1331, "Height":49, "Cmt": "NAV left red button"},
+ { "Input": "button4", "Type": "Digital", "X":2324, "Y":736, "Width":1331, "Height":49, "Cmt": "NAV right red button"},
+ { "Input": "button5", "Type": "Digital", "X":184, "Y":722, "Width":1271, "Height":53, "Cmt": "NAV witch hat left"},
+ { "Input": "button6", "Type": "Digital", "X":184, "Y":554, "Width":1271, "Height":53, "Cmt": "NAV witch hat up"},
+ { "Input": "button7", "Type": "Digital", "X":184, "Y":610, "Width":1271, "Height":53, "Cmt": "NAV witch hat right"},
+ { "Input": "button8", "Type": "Digital", "X":184, "Y":666, "Width":1271, "Height":53, "Cmt": "NAV witch hat down"},
+ { "Input": "button9", "Type": "Digital", "X":124, "Y":1416, "Width":1331, "Height":49, "Cmt": "NAV pinky trigger"},
+ { "Input": "button10", "Type": "Digital", "X":124, "Y":1064, "Width":1331, "Height":51, "Cmt": "BVR left red button"},
+ { "Input": "button11", "Type": "Digital", "X":2324, "Y":674, "Width":1331, "Height":51, "Cmt": "BVR right red button"},
+ { "Input": "button12", "Type": "Digital", "X":184, "Y":492, "Width":1271, "Height":53, "Cmt": "BVR witch hat left"},
+ { "Input": "button13", "Type": "Digital", "X":184, "Y":324, "Width":1271, "Height":53, "Cmt": "BVR witch hat up"},
+ { "Input": "button14", "Type": "Digital", "X":184, "Y":380, "Width":1271, "Height":53, "Cmt": "BVR witch hat right"},
+ { "Input": "button15", "Type": "Digital", "X":184, "Y":436, "Width":1271, "Height":53, "Cmt": "BVR witch hat down"},
+ { "Input": "button16", "Type": "Digital", "X":124, "Y":1354, "Width":1331, "Height":51, "Cmt": "BVR pinky trigger"},
+ { "Input": "button17", "Type": "Digital", "X":124, "Y":1186, "Width":1331, "Height":51, "Cmt": "VIS left red button"},
+ { "Input": "button18", "Type": "Digital", "X":2324, "Y":796, "Width":1331, "Height":51, "Cmt": "VIS right red button"},
+ { "Input": "button19", "Type": "Digital", "X":184, "Y":952, "Width":1271, "Height":53, "Cmt": "VIS witch hat left"},
+ { "Input": "button20", "Type": "Digital", "X":184, "Y":784, "Width":1271, "Height":53, "Cmt": "VIS witch hat up"},
+ { "Input": "button21", "Type": "Digital", "X":184, "Y":840, "Width":1271, "Height":53, "Cmt": "VIS witch hat right"},
+ { "Input": "button22", "Type": "Digital", "X":184, "Y":896, "Width":1271, "Height":53, "Cmt": "VIS witch hat down"},
+ { "Input": "button23", "Type": "Digital", "X":124, "Y":1476, "Width":1331, "Height":51, "Cmt": "VIS pinky trigger"},
+ { "Input": "hat1_up", "Type": "Digital", "X":1864, "Y":324, "Width":1931, "Height":53, "Cmt": "PoV up"},
+ { "Input": "hat1_right", "Type": "Digital", "X":1864, "Y":380, "Width":1931, "Height":53, "Cmt": "PoV right"},
+ { "Input": "hat1_down", "Type": "Digital", "X":1864, "Y":436, "Width":1931, "Height":53, "Cmt": "PoV down"},
+ { "Input": "hat1_left", "Type": "Digital", "X":1864, "Y":492, "Width":1931, "Height":53, "Cmt": "PoV left"},
+ { "Input": "rotz", "Type": "Analogue", "X":2324, "Y":1137, "Width":1331, "Height":52, "Cmt": "RotZ-Axis" },
+ { "Input": "x", "Type": "Analogue", "X":2324, "Y":1081, "Width":1331, "Height":53, "Cmt": "X-Axis" },
+ { "Input": "y", "Type": "Analogue", "X":2324, "Y":1024, "Width":1331, "Height":54, "Cmt": "Y-Axis" }
]
}
]
diff --git a/graphics/layouts/cougar-mfd-left.right.json b/graphics/layouts/cougar-mfd-left.right.json
new file mode 100644
index 0000000..2e830cf
--- /dev/null
+++ b/graphics/layouts/cougar-mfd-left.right.json
@@ -0,0 +1,76 @@
+{
+ "MapName" : "5: Cougar MFD (left - right)",
+ "MapImage" : "cougar-mfd.jpg",
+ "InputDevices" : [
+ {
+ "InputType" : "J",
+ "DeviceName" : "Cougar MFD Panel Left Side",
+ "DeviceProdGuid" : ["{B351044F-0000-0000-0000-000000000000}"],
+ "Controls" : [
+ { "Input" : "button1", "Type" : "Digital", "X" : 134, "Y" : 604, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 239, "Y" : 464, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 644, "Y" : 324, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 1054, "Y" : 464, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 1161, "Y" : 604, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 1424, "Y" : 932, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 1424, "Y" : 1040, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 1424, "Y" : 1148, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 1424, "Y" : 1256, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 1424, "Y" : 1364, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 1161, "Y" : 1694, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 1054, "Y" : 1834, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button13", "Type" : "Digital", "X" : 644, "Y" : 1974, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button14", "Type" : "Digital", "X" : 239, "Y" : 1834, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button15", "Type" : "Digital", "X" : 134, "Y" : 1694, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button16", "Type" : "Digital", "X" : 24, "Y" : 1364, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button17", "Type" : "Digital", "X" : 24, "Y" : 1256, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button18", "Type" : "Digital", "X" : 24, "Y" : 1148, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button19", "Type" : "Digital", "X" : 24, "Y" : 1040, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button20", "Type" : "Digital", "X" : 24, "Y" : 932, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button21", "Type" : "Digital", "X" : 1484, "Y" : 762, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button22", "Type" : "Digital", "X" : 1484, "Y" : 844, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button23", "Type" : "Digital", "X" : 1484, "Y" : 1472, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button24", "Type" : "Digital", "X" : 1484, "Y" : 1554, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button25", "Type" : "Digital", "X" : 84, "Y" : 1472, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button26", "Type" : "Digital", "X" : 84, "Y" : 1554, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button27", "Type" : "Digital", "X" : 84, "Y" : 762, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button28", "Type" : "Digital", "X" : 84, "Y" : 844, "Width" : 391, "Height" : 79, "Cmt" : "" }
+ ]
+ },
+ {
+ "InputType" : "J",
+ "DeviceName" : "Cougar MFD Panel Right Side",
+ "DeviceProdGuid" : ["{B352044F-0000-0000-0000-000000000000}"],
+ "Controls" : [
+ { "Input" : "button1", "Type" : "Digital", "X" : 2068, "Y" : 604, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 2173, "Y" : 464, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 2578, "Y" : 324, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 2988, "Y" : 464, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 3095, "Y" : 604, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 3358, "Y" : 932, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 3358, "Y" : 1040, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 3358, "Y" : 1148, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 3358, "Y" : 1256, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 3358, "Y" : 1364, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 3095, "Y" : 1694, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 2988, "Y" : 1834, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button13", "Type" : "Digital", "X" : 2578, "Y" : 1974, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button14", "Type" : "Digital", "X" : 2173, "Y" : 1834, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button15", "Type" : "Digital", "X" : 2068, "Y" : 1694, "Width" : 591, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button16", "Type" : "Digital", "X" : 1958, "Y" : 1364, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button17", "Type" : "Digital", "X" : 1958, "Y" : 1256, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button18", "Type" : "Digital", "X" : 1958, "Y" : 1148, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button19", "Type" : "Digital", "X" : 1958, "Y" : 1040, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button20", "Type" : "Digital", "X" : 1958, "Y" : 932, "Width" : 451, "Height" : 99, "Cmt" : "" },
+ { "Input" : "button21", "Type" : "Digital", "X" : 3418, "Y" : 762, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button22", "Type" : "Digital", "X" : 3418, "Y" : 844, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button23", "Type" : "Digital", "X" : 3418, "Y" : 1472, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button24", "Type" : "Digital", "X" : 3418, "Y" : 1554, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button25", "Type" : "Digital", "X" : 2018, "Y" : 1472, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button26", "Type" : "Digital", "X" : 2018, "Y" : 1554, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button27", "Type" : "Digital", "X" : 2018, "Y" : 762, "Width" : 391, "Height" : 79, "Cmt" : "" },
+ { "Input" : "button28", "Type" : "Digital", "X" : 2018, "Y" : 844, "Width" : 391, "Height" : 79, "Cmt" : "" }
+ ]
+ }
+ ]
+}
diff --git a/graphics/layouts/cougar-mfd.jpg b/graphics/layouts/cougar-mfd.jpg
new file mode 100644
index 0000000..3bf9f0e
Binary files /dev/null and b/graphics/layouts/cougar-mfd.jpg differ
diff --git a/graphics/layouts/extreme3dpro.json b/graphics/layouts/extreme3dpro.json
index 1409431..d650fa1 100644
--- a/graphics/layouts/extreme3dpro.json
+++ b/graphics/layouts/extreme3dpro.json
@@ -7,26 +7,26 @@
"DeviceName": "Logitech Extreme 3DPro",
"DeviceProdGuid": ["{C215046D-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":474, "Y":904, "Width":1092, "Height":54, "Cmt": "Primary trigger" },
- { "Input": "button2", "Type": "Digital", "X":474, "Y":1004, "Width":1092, "Height":54, "Cmt": "Side trigger" },
- { "Input": "button3", "Type": "Digital", "X":424, "Y":784, "Width":1092, "Height":54, "Cmt": "Bottom-left button" },
- { "Input": "button4", "Type": "Digital", "X":2124, "Y":784, "Width":1092, "Height":54, "Cmt": "Bottom-right button" },
- { "Input": "button5", "Type": "Digital", "X":424, "Y":654, "Width":1092, "Height":54, "Cmt": "Top-left button" },
- { "Input": "button6", "Type": "Digital", "X":2124, "Y":654, "Width":1092, "Height":54, "Cmt": "Top-right button" },
- { "Input": "button7", "Type": "Digital", "X":244, "Y":1434, "Width":542, "Height":108, "Cmt": "Left bank top-left button" },
- { "Input": "button8", "Type": "Digital", "X":794, "Y":1434, "Width":542, "Height":108, "Cmt": "Left bank top-right button" },
- { "Input": "button9", "Type": "Digital", "X":244, "Y":1550, "Width":542, "Height":108, "Cmt": "Left bank middle-left button" },
- { "Input": "button10", "Type": "Digital", "X":794, "Y":1550, "Width":542, "Height":108, "Cmt": "Left bank middle-right button" },
- { "Input": "button11", "Type": "Digital", "X":244, "Y":1666, "Width":542, "Height":108, "Cmt": "Left bank bottom-left button" },
- { "Input": "button12", "Type": "Digital", "X":794, "Y":1666, "Width":542, "Height":108, "Cmt": "Left bank bottom-right button" },
- { "Input": "hat1_up", "Type": "Digital", "X":864, "Y":374, "Width":1932, "Height":54, "Cmt": "PoV hat up" },
- { "Input": "hat1_right", "Type": "Digital", "X":864, "Y":430, "Width":1932, "Height":54, "Cmt": "PoV hat right" },
- { "Input": "hat1_down", "Type": "Digital", "X":864, "Y":486, "Width":1932, "Height":54, "Cmt": "PoV hat down" },
- { "Input": "hat1_left", "Type": "Digital", "X":864, "Y":542, "Width":1932, "Height":54, "Cmt": "PoV hat left" },
- { "Input": "rotz", "Type": "Analogue", "X":2357, "Y":980, "Width":1132, "Height":54, "Cmt": "Stick twist" },
- { "Input": "slider1", "Type": "Analogue", "X":2864, "Y":1574, "Width":832, "Height":54, "Cmt": "Stick throttle slider" },
- { "Input": "x", "Type": "Analogue", "X":2357, "Y":924, "Width":1132, "Height":54, "Cmt": "Stick pitch" },
- { "Input": "y", "Type": "Analogue", "X":2357, "Y":868, "Width":1132, "Height":54, "Cmt": "Stick roll" }
+ { "Input": "button1", "Type": "Digital", "X":474, "Y":904, "Width":1091, "Height":53, "Cmt": "Primary trigger" },
+ { "Input": "button2", "Type": "Digital", "X":474, "Y":1004, "Width":1091, "Height":53, "Cmt": "Side trigger" },
+ { "Input": "button3", "Type": "Digital", "X":424, "Y":784, "Width":1091, "Height":53, "Cmt": "Bottom-left button" },
+ { "Input": "button4", "Type": "Digital", "X":2124, "Y":784, "Width":1091, "Height":53, "Cmt": "Bottom-right button" },
+ { "Input": "button5", "Type": "Digital", "X":424, "Y":654, "Width":1091, "Height":53, "Cmt": "Top-left button" },
+ { "Input": "button6", "Type": "Digital", "X":2124, "Y":654, "Width":1091, "Height":53, "Cmt": "Top-right button" },
+ { "Input": "button7", "Type": "Digital", "X":244, "Y":1434, "Width":541, "Height":107, "Cmt": "Left bank top-left button" },
+ { "Input": "button8", "Type": "Digital", "X":794, "Y":1434, "Width":541, "Height":107, "Cmt": "Left bank top-right button" },
+ { "Input": "button9", "Type": "Digital", "X":244, "Y":1550, "Width":541, "Height":107, "Cmt": "Left bank middle-left button" },
+ { "Input": "button10", "Type": "Digital", "X":794, "Y":1550, "Width":541, "Height":107, "Cmt": "Left bank middle-right button" },
+ { "Input": "button11", "Type": "Digital", "X":244, "Y":1666, "Width":541, "Height":107, "Cmt": "Left bank bottom-left button" },
+ { "Input": "button12", "Type": "Digital", "X":794, "Y":1666, "Width":541, "Height":107, "Cmt": "Left bank bottom-right button" },
+ { "Input": "hat1_up", "Type": "Digital", "X":864, "Y":374, "Width":1931, "Height":53, "Cmt": "PoV hat up" },
+ { "Input": "hat1_right", "Type": "Digital", "X":864, "Y":430, "Width":1931, "Height":53, "Cmt": "PoV hat right" },
+ { "Input": "hat1_down", "Type": "Digital", "X":864, "Y":486, "Width":1931, "Height":53, "Cmt": "PoV hat down" },
+ { "Input": "hat1_left", "Type": "Digital", "X":864, "Y":542, "Width":1931, "Height":53, "Cmt": "PoV hat left" },
+ { "Input": "rotz", "Type": "Analogue", "X":2357, "Y":981, "Width":1131, "Height":52, "Cmt": "Stick twist" },
+ { "Input": "x", "Type": "Analogue", "X":2357, "Y":925, "Width":1131, "Height":53, "Cmt": "Stick pitch" },
+ { "Input": "y", "Type": "Analogue", "X":2357, "Y":868, "Width":1131, "Height":54, "Cmt": "Stick roll" },
+ { "Input": "slider1", "Type": "Analogue", "X":2864, "Y":1574, "Width":831, "Height":53, "Cmt": "Stick throttle slider" }
]
}
]
diff --git a/graphics/layouts/fly5.json b/graphics/layouts/fly5.json
index 395ef5f..643ea4e 100644
--- a/graphics/layouts/fly5.json
+++ b/graphics/layouts/fly5.json
@@ -8,28 +8,28 @@
"DeviceProdGuid": ["{13020738-0000-0000-0000-504944564944}",
"{083606A3-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":684, "Y":794, "Width":1092, "Height":54, "Cmt": "Primary trigger" },
- { "Input": "button2", "Type": "Digital", "X":734, "Y":874, "Width":1092, "Height":54, "Cmt": "Bottom-left button" },
- { "Input": "button3", "Type": "Digital", "X":2414, "Y":744, "Width":1092, "Height":54, "Cmt": "Bottom-right button" },
- { "Input": "button4", "Type": "Digital", "X":624, "Y":704, "Width":1092, "Height":54, "Cmt": "Top-left button" },
- { "Input": "button5", "Type": "Digital", "X":2414, "Y":594, "Width":1092, "Height":54, "Cmt": "Top-right button" },
- { "Input": "button6", "Type": "Digital", "X":584, "Y":1847, "Width":1092, "Height":54, "Cmt": "Bottom bank first button" },
- { "Input": "button7", "Type": "Digital", "X":734, "Y":1927, "Width":1092, "Height":54, "Cmt": "Bottom bank second button" },
- { "Input": "button8", "Type": "Digital", "X":884, "Y":2007, "Width":1092, "Height":54, "Cmt": "Bottom bank third button" },
- { "Input": "button9", "Type": "Digital", "X":1034, "Y":2090, "Width":1092, "Height":54, "Cmt": "Bottom bank fourth button" },
- { "Input": "button10", "Type": "Digital", "X":304, "Y":1604, "Width":1092, "Height":54, "Cmt": "Rear left button" },
- { "Input": "button11", "Type": "Digital", "X":664, "Y":1204, "Width":1092, "Height":54, "Cmt": "Rear right button" },
- { "Input": "button12", "Type": "Digital", "X":2474, "Y":864, "Width":1132, "Height":54, "Cmt": "Scroll wheel up" },
- { "Input": "button13", "Type": "Digital", "X":2474, "Y":920, "Width":1132, "Height":54, "Cmt": "Scroll wheel down" },
- { "Input": "button14", "Type": "Digital", "X":2594, "Y":1504, "Width":1092, "Height":54, "Cmt": "Base button" },
- { "Input": "hat1_up", "Type": "Digital", "X":990, "Y":304, "Width":1932, "Height":54, "Cmt": "PoV hat up" },
- { "Input": "hat1_right", "Type": "Digital", "X":990, "Y":360, "Width":1932, "Height":54, "Cmt": "PoV hat right" },
- { "Input": "hat1_down", "Type": "Digital", "X":990, "Y":416, "Width":1932, "Height":54, "Cmt": "PoV hat down" },
- { "Input": "hat1_left", "Type": "Digital", "X":990, "Y":472, "Width":1932, "Height":54, "Cmt": "PoV hat left" },
- { "Input": "rotz", "Type": "Analogue", "X":2484, "Y":1136, "Width":1132, "Height":54, "Cmt": "Stick twist" },
- { "Input": "x", "Type": "Analogue", "X":2484, "Y":1080, "Width":1132, "Height":54, "Cmt": "Stick roll" },
- { "Input": "y", "Type": "Analogue", "X":2484, "Y":1024, "Width":1132, "Height":54, "Cmt": "Stick pitch" },
- { "Input": "z", "Type": "Analogue", "X":264, "Y":1404, "Width":1032, "Height":54, "Cmt": "Throttle" }
+ { "Input": "button1", "Type": "Digital", "X":684, "Y":794, "Width":1091, "Height":53, "Cmt": "Primary trigger" },
+ { "Input": "button2", "Type": "Digital", "X":734, "Y":874, "Width":1091, "Height":53, "Cmt": "Bottom-left button" },
+ { "Input": "button3", "Type": "Digital", "X":2414, "Y":744, "Width":1091, "Height":53, "Cmt": "Bottom-right button" },
+ { "Input": "button4", "Type": "Digital", "X":624, "Y":704, "Width":1091, "Height":53, "Cmt": "Top-left button" },
+ { "Input": "button5", "Type": "Digital", "X":2414, "Y":594, "Width":1091, "Height":53, "Cmt": "Top-right button" },
+ { "Input": "button6", "Type": "Digital", "X":1034, "Y":2090, "Width":1091, "Height":53, "Cmt": "Bottom bank first button" },
+ { "Input": "button7", "Type": "Digital", "X":884, "Y":2007, "Width":1091, "Height":53, "Cmt": "Bottom bank second button" },
+ { "Input": "button8", "Type": "Digital", "X":734, "Y":1927, "Width":1091, "Height":53, "Cmt": "Bottom bank third button" },
+ { "Input": "button9", "Type": "Digital", "X":584, "Y":1847, "Width":1091, "Height":53, "Cmt": "Bottom bank fourth button" },
+ { "Input": "button10", "Type": "Digital", "X":304, "Y":1604, "Width":1091, "Height":53, "Cmt": "Rear left button" },
+ { "Input": "button11", "Type": "Digital", "X":664, "Y":1204, "Width":1091, "Height":53, "Cmt": "Rear right button" },
+ { "Input": "button12", "Type": "Digital", "X":2474, "Y":864, "Width":1131, "Height":54, "Cmt": "Scroll wheel up" },
+ { "Input": "button13", "Type": "Digital", "X":2474, "Y":921, "Width":1131, "Height":52, "Cmt": "Scroll wheel down" },
+ { "Input": "button14", "Type": "Digital", "X":2594, "Y":1504, "Width":1091, "Height":53, "Cmt": "Base button" },
+ { "Input": "hat1_up", "Type": "Digital", "X":990, "Y":304, "Width":1931, "Height":53, "Cmt": "PoV hat up" },
+ { "Input": "hat1_right", "Type": "Digital", "X":990, "Y":360, "Width":1931, "Height":53, "Cmt": "PoV hat right" },
+ { "Input": "hat1_down", "Type": "Digital", "X":990, "Y":416, "Width":1931, "Height":53, "Cmt": "PoV hat down" },
+ { "Input": "hat1_left", "Type": "Digital", "X":990, "Y":472, "Width":1931, "Height":53, "Cmt": "PoV hat left" },
+ { "Input": "rotz", "Type": "Analogue", "X":2484, "Y":1137, "Width":1131, "Height":52, "Cmt": "Stick twist" },
+ { "Input": "x", "Type": "Analogue", "X":2484, "Y":1081, "Width":1131, "Height":53, "Cmt": "Stick roll" },
+ { "Input": "y", "Type": "Analogue", "X":2484, "Y":1024, "Width":1131, "Height":54, "Cmt": "Stick pitch" },
+ { "Input": "z", "Type": "Analogue", "X":264, "Y":1404, "Width":1031, "Height":53, "Cmt": "Throttle" }
]
}
]
diff --git a/graphics/layouts/g940.json b/graphics/layouts/g940.json
index d8b35d7..006766b 100644
--- a/graphics/layouts/g940.json
+++ b/graphics/layouts/g940.json
@@ -7,26 +7,26 @@
"DeviceName": "Logitech G940 Stick",
"DeviceProdGuid": ["{C2A8046D-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":2034, "Y":604, "Width":652, "Height":54, "Cmt": "Primary trigger half-press"},
- { "Input": "button2", "Type": "Digital", "X":2044, "Y":424, "Width":642, "Height":108, "Cmt": "Fire button"},
- { "Input": "button3", "Type": "Digital", "X":2124, "Y":234, "Width":642, "Height":108, "Cmt": "S1 button"},
- { "Input": "button4", "Type": "Digital", "X":3064, "Y":496, "Width":752, "Height":54, "Cmt": "S2 button"},
- { "Input": "button5", "Type": "Digital", "X":3064, "Y":584, "Width":752, "Height":54, "Cmt": "S3 button"},
- { "Input": "button6", "Type": "Digital", "X":2044, "Y":764, "Width":642, "Height":108, "Cmt": "S4 button"},
- { "Input": "button7", "Type": "Digital", "X":2044, "Y":1018, "Width":642, "Height":108, "Cmt": "S5 button"},
- { "Input": "button8", "Type": "Digital", "X":2954, "Y":386, "Width":832, "Height":54, "Cmt": "Ministick button"},
- { "Input": "slider2", "Type": "Analogue", "X":2954, "Y":330, "Width":832, "Height":54, "Cmt": "Ministick X"},
- { "Input": "slider1", "Type": "Analogue", "X":2954, "Y":274, "Width":832, "Height":54, "Cmt": "Ministick Y"},
- { "Input": "button9", "Type": "Digital", "X":2034, "Y":660, "Width":652, "Height":54, "Cmt": "Primary trigger full-press"},
- { "Input": "hat1_up", "Type": "Digital", "X":3124, "Y":694, "Width":692, "Height":54, "Cmt": "POV hat up"},
- { "Input": "hat1_right", "Type": "Digital", "X":3124, "Y":750, "Width":692, "Height":54, "Cmt": "POV hat right"},
- { "Input": "hat1_down", "Type": "Digital", "X":3124, "Y":806, "Width":692, "Height":54, "Cmt": "POV hat down"},
- { "Input": "hat1_left", "Type": "Digital", "X":3124, "Y":862, "Width":692, "Height":54, "Cmt": "POV hat left"},
- { "Input": "x", "Type": "Analogue", "X":3144, "Y":1060, "Width":672, "Height":54, "Cmt": "Stick X axis"},
- { "Input": "y", "Type": "Analogue", "X":3144, "Y":1004, "Width":672, "Height":54, "Cmt": "Stick Y axis"},
- { "Input": "rotx", "Type": "Analogue", "X":3084, "Y":1824, "Width":592, "Height":54, "Cmt": "Trim 2"},
- { "Input": "roty", "Type": "Analogue", "X":3224, "Y":1744, "Width":592, "Height":54, "Cmt": "Trim 3"},
- { "Input": "rotz", "Type": "Analogue", "X":2934, "Y":1904, "Width":592, "Height":54, "Cmt": "Trim 1"}
+ { "Input": "button1", "Type": "Digital", "X":2034, "Y":604, "Width":651, "Height":53, "Cmt": "Primary trigger half-press"},
+ { "Input": "button2", "Type": "Digital", "X":2044, "Y":424, "Width":641, "Height":107, "Cmt": "Fire button"},
+ { "Input": "button3", "Type": "Digital", "X":2124, "Y":234, "Width":641, "Height":107, "Cmt": "S1 button"},
+ { "Input": "button4", "Type": "Digital", "X":3064, "Y":496, "Width":751, "Height":53, "Cmt": "S2 button"},
+ { "Input": "button5", "Type": "Digital", "X":3064, "Y":584, "Width":751, "Height":53, "Cmt": "S3 button"},
+ { "Input": "button6", "Type": "Digital", "X":2044, "Y":764, "Width":641, "Height":107, "Cmt": "S4 button"},
+ { "Input": "button7", "Type": "Digital", "X":2044, "Y":1018, "Width":641, "Height":107, "Cmt": "S5 button"},
+ { "Input": "button8", "Type": "Digital", "X":2954, "Y":387, "Width":831, "Height":52, "Cmt": "Ministick button"},
+ { "Input": "button9", "Type": "Digital", "X":2034, "Y":660, "Width":651, "Height":53, "Cmt": "Primary trigger full-press"},
+ { "Input": "hat1_up", "Type": "Digital", "X":3124, "Y":694, "Width":690, "Height":53, "Cmt": "POV hat up"},
+ { "Input": "hat1_right", "Type": "Digital", "X":3124, "Y":750, "Width":690, "Height":53, "Cmt": "POV hat right"},
+ { "Input": "hat1_down", "Type": "Digital", "X":3124, "Y":806, "Width":690, "Height":53, "Cmt": "POV hat down"},
+ { "Input": "hat1_left", "Type": "Digital", "X":3124, "Y":862, "Width":690, "Height":53, "Cmt": "POV hat left"},
+ { "Input": "rotx", "Type": "Analogue", "X":2934, "Y":1904, "Width":591, "Height":53, "Cmt": "Trim 2"},
+ { "Input": "roty", "Type": "Analogue", "X":3084, "Y":1824, "Width":591, "Height":53, "Cmt": "Trim 3"},
+ { "Input": "rotz", "Type": "Analogue", "X":3224, "Y":1744, "Width":591, "Height":53, "Cmt": "Trim 1"},
+ { "Input": "x", "Type": "Analogue", "X":3144, "Y":1061, "Width":671, "Height":52, "Cmt": "Stick X axis"},
+ { "Input": "y", "Type": "Analogue", "X":3144, "Y":1004, "Width":671, "Height":54, "Cmt": "Stick Y axis"},
+ { "Input": "slider1", "Type": "Analogue", "X":2954, "Y":274, "Width":831, "Height":54, "Cmt": "Ministick Y"},
+ { "Input": "slider2", "Type": "Analogue", "X":2954, "Y":331, "Width":831, "Height":53, "Cmt": "Ministick X"}
]
},
{
diff --git a/graphics/layouts/g940pedals.json b/graphics/layouts/g940pedals.json
index 41a4903..2b73795 100644
--- a/graphics/layouts/g940pedals.json
+++ b/graphics/layouts/g940pedals.json
@@ -7,9 +7,9 @@
"DeviceName": "Logitech G940 Pedals",
"DeviceProdGuid": ["{C2AA046D-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "x", "Type": "Digital", "X":2264, "Y":588, "Width":1332, "Height":162, "Cmt": "Right pedal (unconfirmed)"},
- { "Input": "y", "Type": "Digital", "X":164, "Y":588, "Width":1332, "Height":162, "Cmt": "Left pedal (unconfirmed)"},
- { "Input": "rotx", "Type": "Analogue", "X":1208, "Y":331, "Width":1332, "Height":162, "Cmt": "Rudder"}
+ { "Input" : "rotx", "Type" : "Analogue", "X" : 1208, "Y" : 331, "Width" : 1331, "Height" : 161, "Cmt" : "Rudder" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 2264, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Right pedal (unconfirmed)" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 164, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Left pedal (unconfirmed)" }
]
}
]
diff --git a/graphics/layouts/gladiator.json b/graphics/layouts/gladiator.json
index 5603edf..ce6a8d1 100644
--- a/graphics/layouts/gladiator.json
+++ b/graphics/layouts/gladiator.json
@@ -7,47 +7,47 @@
"DeviceName": "VKB Gladiator",
"DeviceProdGuid": ["{0121231D-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":204, "Y":1524, "Width":992, "Height":54, "Cmt": "Flaps up"},
- { "Input": "button2", "Type": "Digital", "X":254, "Y":1624, "Width":992, "Height":54, "Cmt": "Flaps down"},
- { "Input": "button3", "Type": "Digital", "X":784, "Y":1904, "Width":992, "Height":54, "Cmt": "A1"},
- { "Input": "button4", "Type": "Digital", "X":2524, "Y":1514, "Width":992, "Height":54, "Cmt": "A2"},
- { "Input": "button5", "Type": "Digital", "X":2464, "Y":1424, "Width":992, "Height":54, "Cmt": "A3"},
- { "Input": "button6", "Type": "Digital", "X":1144, "Y":1994, "Width":992, "Height":54, "Cmt": "B1"},
- { "Input": "button7", "Type": "Digital", "X":2484, "Y":1814, "Width":992, "Height":54, "Cmt": "B2"},
- { "Input": "button8", "Type": "Digital", "X":2564, "Y":1604, "Width":992, "Height":54, "Cmt": "B3"},
- { "Input": "button9", "Type": "Digital", "X":2244, "Y":1994, "Width":992, "Height":54, "Cmt": "C1"},
- { "Input": "button10", "Type": "Digital", "X":2414, "Y":1904, "Width":992, "Height":54, "Cmt": "C2"},
- { "Input": "button11", "Type": "Digital", "X":2624, "Y":1694, "Width":992, "Height":54, "Cmt": "C3"},
- { "Input": "button12", "Type": "Digital", "X":2274, "Y":1254, "Width":1192, "Height":54, "Cmt": "Engine start"},
- { "Input": "button13", "Type": "Digital", "X":2204, "Y":1114, "Width":1192, "Height":54, "Cmt": "Eject"},
- { "Input": "button14", "Type": "Digital", "X":2184, "Y":584, "Width":1472, "Height":54, "Cmt": "Primary trigger (mode 1"},
- { "Input": "button15", "Type": "Digital", "X":2184, "Y":640, "Width":1472, "Height":56, "Cmt": "Primary trigger (mode 1"},
- { "Input": "button16", "Type": "Digital", "X":2184, "Y":704, "Width":1472, "Height":54, "Cmt": "Primary trigger (mode 2"},
- { "Input": "button17", "Type": "Digital", "X":2184, "Y":760, "Width":1472, "Height":56, "Cmt": "Primary trigger (mode 2"},
- { "Input": "button18", "Type": "Digital", "X":2124, "Y":304, "Width":1472, "Height":54, "Cmt": "Thumb trigger (mode 1"},
- { "Input": "button19", "Type": "Digital", "X":2124, "Y":360, "Width":1472, "Height":56, "Cmt": "Thumb trigger (mode 1"},
- { "Input": "button20", "Type": "Digital", "X":2124, "Y":424, "Width":1472, "Height":54, "Cmt": "Thumb trigger (mode 2"},
- { "Input": "button21", "Type": "Digital", "X":2124, "Y":480, "Width":1472, "Height":56, "Cmt": "Thumb trigger (mode 2"},
- { "Input": "hat1_up", "Type": "Digital", "X":274, "Y":304, "Width":1112, "Height":54, "Cmt": "POV hat up (mode 1"},
- { "Input": "button22", "Type": "Digital", "X":274, "Y":360, "Width":1112, "Height":54, "Cmt": "POV hat up (mode 1"},
- { "Input": "hat1_down", "Type": "Digital", "X":274, "Y":526, "Width":1112, "Height":52, "Cmt": "POV hat down (mode 1"},
- { "Input": "button23", "Type": "Digital", "X":274, "Y":580, "Width":1112, "Height":54, "Cmt": "POV hat down (mode 1"},
- { "Input": "hat1_left", "Type": "Digital", "X":274, "Y":636, "Width":1112, "Height":52, "Cmt": "POV hat left (mode 1"},
- { "Input": "button24", "Type": "Digital", "X":274, "Y":690, "Width":1112, "Height":66, "Cmt": "POV hat left (mode 1"},
- { "Input": "hat1_right", "Type": "Digital", "X":274, "Y":416, "Width":1112, "Height":52, "Cmt": "POV hat right (mode 1"},
- { "Input": "button25", "Type": "Digital", "X":274, "Y":470, "Width":1112, "Height":54, "Cmt": "POV hat right (mode 1"},
- { "Input": "hat2_up", "Type": "Digital", "X":274, "Y":764, "Width":1112, "Height":54, "Cmt": "POV hat up (mode 2"},
- { "Input": "button26", "Type": "Digital", "X":274, "Y":820, "Width":1112, "Height":54, "Cmt": "POV hat up (mode 2"},
- { "Input": "hat2_down", "Type": "Digital", "X":274, "Y":986, "Width":1112, "Height":52, "Cmt": "POV hat down (mode 2"},
- { "Input": "button27", "Type": "Digital", "X":274, "Y":1040, "Width":1112, "Height":54, "Cmt": "POV hat down (mode 2"},
- { "Input": "hat2_left", "Type": "Digital", "X":274, "Y":1096, "Width":1112, "Height":52, "Cmt": "POV hat left (mode 2"},
- { "Input": "button28", "Type": "Digital", "X":274, "Y":1150, "Width":1112, "Height":66, "Cmt": "POV hat left (mode 2"},
- { "Input": "hat2_right", "Type": "Digital", "X":274, "Y":876, "Width":1112, "Height":52, "Cmt": "POV hat right (mode 2"},
- { "Input": "button29", "Type": "Digital", "X":274, "Y":930, "Width":1112, "Height":54, "Cmt": "POV hat right (mode 2"},
- { "Input": "x", "Type": "Analogue", "X":2164, "Y":910, "Width":1532, "Height":54, "Cmt": "Roll"},
- { "Input": "y", "Type": "Analogue", "X":2164, "Y":854, "Width":1532, "Height":54, "Cmt": "Pitch"},
- { "Input": "rotx", "Type": "Analogue", "X":2164, "Y":966, "Width":1532, "Height":54, "Cmt": "Yaw"},
- { "Input": "z", "Type": "Analogue", "X":564, "Y":1402, "Width":832, "Height":54, "Cmt": "Throttle"}
+ { "Input": "button1", "Type": "Digital", "X":204, "Y":1524, "Width":991, "Height":53, "Cmt": "Flaps up"},
+ { "Input": "button2", "Type": "Digital", "X":254, "Y":1624, "Width":991, "Height":53, "Cmt": "Flaps down"},
+ { "Input": "button3", "Type": "Digital", "X":784, "Y":1904, "Width":991, "Height":53, "Cmt": "A1"},
+ { "Input": "button4", "Type": "Digital", "X":2524, "Y":1514, "Width":991, "Height":53, "Cmt": "A2"},
+ { "Input": "button5", "Type": "Digital", "X":2464, "Y":1424, "Width":991, "Height":53, "Cmt": "A3"},
+ { "Input": "button6", "Type": "Digital", "X":1144, "Y":1994, "Width":991, "Height":53, "Cmt": "B1"},
+ { "Input": "button7", "Type": "Digital", "X":2484, "Y":1814, "Width":991, "Height":53, "Cmt": "B2"},
+ { "Input": "button8", "Type": "Digital", "X":2564, "Y":1604, "Width":991, "Height":53, "Cmt": "B3"},
+ { "Input": "button9", "Type": "Digital", "X":2244, "Y":1994, "Width":991, "Height":53, "Cmt": "C1"},
+ { "Input": "button10", "Type": "Digital", "X":2414, "Y":1904, "Width":991, "Height":53, "Cmt": "C2"},
+ { "Input": "button11", "Type": "Digital", "X":2624, "Y":1694, "Width":991, "Height":53, "Cmt": "C3"},
+ { "Input": "button12", "Type": "Digital", "X":2274, "Y":1254, "Width":1191, "Height":53, "Cmt": "Engine start"},
+ { "Input": "button13", "Type": "Digital", "X":2204, "Y":1114, "Width":1191, "Height":53, "Cmt": "Eject"},
+ { "Input": "button14", "Type": "Digital", "X":2184, "Y":584, "Width":1471, "Height":53, "Cmt": "Primary trigger (mode 1"},
+ { "Input": "button15", "Type": "Digital", "X":2184, "Y":640, "Width":1471, "Height":55, "Cmt": "Primary trigger (mode 1"},
+ { "Input": "button16", "Type": "Digital", "X":2184, "Y":704, "Width":1471, "Height":53, "Cmt": "Primary trigger (mode 2"},
+ { "Input": "button17", "Type": "Digital", "X":2184, "Y":760, "Width":1471, "Height":55, "Cmt": "Primary trigger (mode 2"},
+ { "Input": "button18", "Type": "Digital", "X":2124, "Y":304, "Width":1471, "Height":53, "Cmt": "Thumb trigger (mode 1"},
+ { "Input": "button19", "Type": "Digital", "X":2124, "Y":360, "Width":1471, "Height":55, "Cmt": "Thumb trigger (mode 1"},
+ { "Input": "button20", "Type": "Digital", "X":2124, "Y":424, "Width":1471, "Height":53, "Cmt": "Thumb trigger (mode 2"},
+ { "Input": "button21", "Type": "Digital", "X":2124, "Y":480, "Width":1471, "Height":55, "Cmt": "Thumb trigger (mode 2"},
+ { "Input": "button22", "Type": "Digital", "X":274, "Y":360, "Width":1111, "Height":53, "Cmt": "POV hat up (mode 1"},
+ { "Input": "button23", "Type": "Digital", "X":274, "Y":581, "Width":1111, "Height":52, "Cmt": "POV hat down (mode 1"},
+ { "Input": "button24", "Type": "Digital", "X":274, "Y":691, "Width":1111, "Height":64, "Cmt": "POV hat left (mode 1"},
+ { "Input": "button25", "Type": "Digital", "X":274, "Y":471, "Width":1111, "Height":52, "Cmt": "POV hat right (mode 1"},
+ { "Input": "button26", "Type": "Digital", "X":274, "Y":820, "Width":1111, "Height":53, "Cmt": "POV hat up (mode 2"},
+ { "Input": "button27", "Type": "Digital", "X":274, "Y":1041, "Width":1111, "Height":52, "Cmt": "POV hat down (mode 2"},
+ { "Input": "button28", "Type": "Digital", "X":274, "Y":1151, "Width":1111, "Height":64, "Cmt": "POV hat left (mode 2"},
+ { "Input": "button29", "Type": "Digital", "X":274, "Y":931, "Width":1111, "Height":52, "Cmt": "POV hat right (mode 2"},
+ { "Input": "hat1_up", "Type": "Digital", "X":274, "Y":304, "Width":1111, "Height":53, "Cmt": "POV hat up (mode 1"},
+ { "Input": "hat1_right", "Type": "Digital", "X":274, "Y":416, "Width":1111, "Height":52, "Cmt": "POV hat right (mode 1"},
+ { "Input": "hat1_down", "Type": "Digital", "X":274, "Y":526, "Width":1111, "Height":52, "Cmt": "POV hat down (mode 1"},
+ { "Input": "hat1_left", "Type": "Digital", "X":274, "Y":636, "Width":1111, "Height":52, "Cmt": "POV hat left (mode 1"},
+ { "Input": "hat2_up", "Type": "Digital", "X":274, "Y":764, "Width":1111, "Height":53, "Cmt": "POV hat up (mode 2"},
+ { "Input": "hat2_right", "Type": "Digital", "X":274, "Y":876, "Width":1111, "Height":52, "Cmt": "POV hat right (mode 2"},
+ { "Input": "hat2_down", "Type": "Digital", "X":274, "Y":986, "Width":1111, "Height":52, "Cmt": "POV hat down (mode 2"},
+ { "Input": "hat2_left", "Type": "Digital", "X":274, "Y":1096, "Width":1111, "Height":52, "Cmt": "POV hat left (mode 2"},
+ { "Input": "rotx", "Type": "Analogue", "X":2164, "Y":967, "Width":1531, "Height":52, "Cmt": "Yaw"},
+ { "Input": "x", "Type": "Analogue", "X":2164, "Y":911, "Width":1531, "Height":53, "Cmt": "Roll"},
+ { "Input": "y", "Type": "Analogue", "X":2164, "Y":854, "Width":1531, "Height":54, "Cmt": "Pitch"},
+ { "Input": "z", "Type": "Analogue", "X":564, "Y":1402, "Width":831, "Height":53, "Cmt": "Throttle"}
]
}
]
diff --git a/graphics/layouts/hotas4.json b/graphics/layouts/hotas4.json
index 2cf345f..875d70c 100644
--- a/graphics/layouts/hotas4.json
+++ b/graphics/layouts/hotas4.json
@@ -8,27 +8,27 @@
"DeviceProdGuid": ["{B67C044F-0000-0000-0000-504944564944}",
"{B67B044F-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1394, "Y":614, "Width":1082, "Height":54, "Cmt": "Stick primary trigger"},
- { "Input": "button2", "Type": "Digital", "X":2114, "Y":264, "Width":1192, "Height":54, "Cmt": "Stick L1 button"},
- { "Input": "button3", "Type": "Digital", "X":2954, "Y":544, "Width":792, "Height":108, "Cmt": "Stick R3 button"},
- { "Input": "button4", "Type": "Digital", "X":2754, "Y":374, "Width":832, "Height":108, "Cmt": "Stick L3 button"},
- { "Input": "button5", "Type": "Digital", "X":950, "Y":734, "Width":592, "Height":108, "Cmt": "Throttle square"},
- { "Input": "button6", "Type": "Digital", "X":950, "Y":898, "Width":592, "Height":108, "Cmt": "Throttle cross"},
- { "Input": "button7", "Type": "Digital", "X":950, "Y":1046, "Width":592, "Height":108, "Cmt": "Throttle circle"},
- { "Input": "button8", "Type": "Digital", "X":1044, "Y":1374, "Width":592, "Height":108, "Cmt": "Throttle triangle"},
- { "Input": "button9", "Type": "Digital", "X":1628, "Y":710, "Width":832, "Height":54, "Cmt": "Throttle R2 button"},
- { "Input": "button10", "Type": "Digital", "X":1928, "Y":790, "Width":532, "Height":108, "Cmt": "Throttle L2 button"},
- { "Input": "button11", "Type": "Digital", "X":284, "Y":2044, "Width":592, "Height":54, "Cmt": "Throttle SE button"},
- { "Input": "button12", "Type": "Digital", "X":984, "Y":2044, "Width":592, "Height":54, "Cmt": "Throttle ST button"},
- { "Input": "hat1_up", "Type": "Digital", "X":994, "Y":354, "Width":1532, "Height":54, "Cmt": "PoV hat up"},
- { "Input": "hat1_right", "Type": "Digital", "X":994, "Y":410, "Width":1532, "Height":54, "Cmt": "PoV hat right"},
- { "Input": "hat1_down", "Type": "Digital", "X":994, "Y":466, "Width":1532, "Height":54, "Cmt": "PoV hat down"},
- { "Input": "hat1_left", "Type": "Digital", "X":994, "Y":522, "Width":1532, "Height":54, "Cmt": "PoV hat left"},
- { "Input": "rotz", "Type": "Analogue", "X":3018, "Y":1988, "Width":792, "Height":108, "Cmt": "Stick twist"},
- { "Input": "x", "Type": "Analogue", "X":3018, "Y":1878, "Width":792, "Height":108, "Cmt": "Stick left/right"},
- { "Input": "y", "Type": "Analogue", "X":3018, "Y":1768, "Width":792, "Height":108, "Cmt": "Stick up/down"},
- { "Input": "z", "Type": "Analogue", "X":96, "Y":736, "Width":692, "Height":54, "Cmt": "Throttle"},
- { "Input": "slider1", "Type": "Analogue", "X":1114, "Y":1504, "Width":932, "Height":108, "Cmt": "Throttle rocker"}
+ { "Input": "button1", "Type": "Digital", "X":2954, "Y":544, "Width":791, "Height":107, "Cmt": "Stick primary trigger"},
+ { "Input": "button2", "Type": "Digital", "X":2114, "Y":264, "Width":1191, "Height":53, "Cmt": "Stick L1 button"},
+ { "Input": "button3", "Type": "Digital", "X":1394, "Y":614, "Width":1081, "Height":53, "Cmt": "Stick R3 button"},
+ { "Input": "button4", "Type": "Digital", "X":2754, "Y":374, "Width":831, "Height":107, "Cmt": "Stick L3 button"},
+ { "Input": "button5", "Type": "Digital", "X":950, "Y":734, "Width":591, "Height":99, "Cmt": "Throttle square"},
+ { "Input": "button6", "Type": "Digital", "X":950, "Y":898, "Width":591, "Height":99, "Cmt": "Throttle cross"},
+ { "Input": "button7", "Type": "Digital", "X":950, "Y":1046, "Width":591, "Height":99, "Cmt": "Throttle circle"},
+ { "Input": "button8", "Type": "Digital", "X":1044, "Y":1374, "Width":591, "Height":99, "Cmt": "Throttle triangle"},
+ { "Input": "button9", "Type": "Digital", "X":1628, "Y":710, "Width":831, "Height":53, "Cmt": "Throttle R2 button"},
+ { "Input": "button10", "Type": "Digital", "X":1928, "Y":790, "Width":531, "Height":99, "Cmt": "Throttle L2 button"},
+ { "Input": "button11", "Type": "Digital", "X":284, "Y":2044, "Width":591, "Height":53, "Cmt": "Throttle SE button"},
+ { "Input": "button12", "Type": "Digital", "X":984, "Y":2044, "Width":591, "Height":53, "Cmt": "Throttle ST button"},
+ { "Input": "hat1_up", "Type": "Digital", "X":994, "Y":354, "Width":1531, "Height":53, "Cmt": "PoV hat up"},
+ { "Input": "hat1_right", "Type": "Digital", "X":994, "Y":410, "Width":1531, "Height":53, "Cmt": "PoV hat right"},
+ { "Input": "hat1_down", "Type": "Digital", "X":994, "Y":466, "Width":1531, "Height":53, "Cmt": "PoV hat down"},
+ { "Input": "hat1_left", "Type": "Digital", "X":994, "Y":522, "Width":1531, "Height":53, "Cmt": "PoV hat left"},
+ { "Input": "rotz", "Type": "Analogue", "X":3018, "Y":1988, "Width":791, "Height":107, "Cmt": "Stick twist"},
+ { "Input": "x", "Type": "Analogue", "X":3018, "Y":1878, "Width":791, "Height":107, "Cmt": "Stick left/right"},
+ { "Input": "y", "Type": "Analogue", "X":3018, "Y":1768, "Width":791, "Height":107, "Cmt": "Stick up/down"},
+ { "Input": "z", "Type": "Analogue", "X":96, "Y":736, "Width":691, "Height":53, "Cmt": "Throttle"},
+ { "Input": "slider1", "Type": "Analogue", "X":1114, "Y":1504, "Width":931, "Height":99, "Cmt": "Throttle rocker"}
]
}
]
diff --git a/graphics/layouts/hotasx.json b/graphics/layouts/hotasx.json
index 578b5b5..7682ca8 100644
--- a/graphics/layouts/hotasx.json
+++ b/graphics/layouts/hotasx.json
@@ -7,27 +7,27 @@
"DeviceName": "ThrustMaster TFlight HOTASX",
"DeviceProdGuid": ["{B108044f-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1394, "Y":614, "Width":1082, "Height":54, "Cmt": "Stick primary trigger"},
- { "Input": "button2", "Type": "Digital", "X":2114, "Y":264, "Width":1192, "Height":54, "Cmt": "Stick L1 button"},
- { "Input": "button3", "Type": "Digital", "X":2954, "Y":544, "Width":792, "Height":108, "Cmt": "Stick R3 button"},
- { "Input": "button4", "Type": "Digital", "X":2754, "Y":374, "Width":832, "Height":108, "Cmt": "Stick L3 button"},
- { "Input": "button5", "Type": "Digital", "X":950, "Y":734, "Width":592, "Height":108, "Cmt": "Throttle square"},
- { "Input": "button6", "Type": "Digital", "X":950, "Y":898, "Width":592, "Height":108, "Cmt": "Throttle cross"},
- { "Input": "button7", "Type": "Digital", "X":950, "Y":1046, "Width":592, "Height":108, "Cmt": "Throttle circle"},
- { "Input": "button8", "Type": "Digital", "X":1044, "Y":1374, "Width":592, "Height":108, "Cmt": "Throttle triangle"},
- { "Input": "button9", "Type": "Digital", "X":1628, "Y":710, "Width":832, "Height":54, "Cmt": "Throttle R2 button"},
- { "Input": "button10", "Type": "Digital", "X":1928, "Y":790, "Width":532, "Height":108, "Cmt": "Throttle L2 button"},
- { "Input": "button11", "Type": "Digital", "X":284, "Y":2004, "Width":592, "Height":54, "Cmt": "Throttle SE button"},
- { "Input": "button12", "Type": "Digital", "X":984, "Y":2004, "Width":592, "Height":54, "Cmt": "Throttle ST button"},
- { "Input": "hat1_up", "Type": "Digital", "X":994, "Y":354, "Width":1532, "Height":54, "Cmt": "PoV hat up"},
- { "Input": "hat1_right", "Type": "Digital", "X":994, "Y":410, "Width":1532, "Height":54, "Cmt": "PoV hat right"},
- { "Input": "hat1_down", "Type": "Digital", "X":994, "Y":466, "Width":1532, "Height":54, "Cmt": "PoV hat down"},
- { "Input": "hat1_left", "Type": "Digital", "X":994, "Y":522, "Width":1532, "Height":54, "Cmt": "PoV hat left"},
- { "Input": "rotz", "Type": "Analogue", "X":3018, "Y":947, "Width":792, "Height":108, "Cmt": "Stick twist"},
- { "Input": "x", "Type": "Analogue", "X":3018, "Y":837, "Width":792, "Height":108, "Cmt": "Stick left/right"},
- { "Input": "y", "Type": "Analogue", "X":3018, "Y":727, "Width":792, "Height":108, "Cmt": "Stick up/down"},
- { "Input": "z", "Type": "Analogue", "X":96, "Y":736, "Width":692, "Height":54, "Cmt": "Throttle"},
- { "Input": "slider1", "Type": "Analogue", "X":1114, "Y":1504, "Width":932, "Height":108, "Cmt": "Throttle rocker"}
+ { "Input": "button1", "Type": "Digital", "X":1394, "Y":614, "Width":1081, "Height":53, "Cmt": "Stick primary trigger"},
+ { "Input": "button2", "Type": "Digital", "X":2114, "Y":264, "Width":1191, "Height":53, "Cmt": "Stick L1 button"},
+ { "Input": "button3", "Type": "Digital", "X":2954, "Y":544, "Width":791, "Height":107, "Cmt": "Stick R3 button"},
+ { "Input": "button4", "Type": "Digital", "X":2754, "Y":374, "Width":831, "Height":107, "Cmt": "Stick L3 button"},
+ { "Input": "button5", "Type": "Digital", "X":950, "Y":734, "Width":591, "Height":99, "Cmt": "Throttle square"},
+ { "Input": "button6", "Type": "Digital", "X":950, "Y":898, "Width":591, "Height":99, "Cmt": "Throttle cross"},
+ { "Input": "button7", "Type": "Digital", "X":950, "Y":1046, "Width":591, "Height":99, "Cmt": "Throttle circle"},
+ { "Input": "button8", "Type": "Digital", "X":1044, "Y":1374, "Width":591, "Height":99, "Cmt": "Throttle triangle"},
+ { "Input": "button9", "Type": "Digital", "X":1628, "Y":710, "Width":831, "Height":53, "Cmt": "Throttle R2 button"},
+ { "Input": "button10", "Type": "Digital", "X":1928, "Y":790, "Width":531, "Height":99, "Cmt": "Throttle L2 button"},
+ { "Input": "button11", "Type": "Digital", "X":284, "Y":2004, "Width":591, "Height":53, "Cmt": "Throttle SE button"},
+ { "Input": "button12", "Type": "Digital", "X":984, "Y":2004, "Width":591, "Height":53, "Cmt": "Throttle ST button"},
+ { "Input": "hat1_up", "Type": "Digital", "X":994, "Y":354, "Width":1531, "Height":53, "Cmt": "PoV hat up"},
+ { "Input": "hat1_right", "Type": "Digital", "X":994, "Y":410, "Width":1531, "Height":53, "Cmt": "PoV hat right"},
+ { "Input": "hat1_down", "Type": "Digital", "X":994, "Y":466, "Width":1531, "Height":53, "Cmt": "PoV hat down"},
+ { "Input": "hat1_left", "Type": "Digital", "X":994, "Y":522, "Width":1531, "Height":53, "Cmt": "PoV hat left"},
+ { "Input": "rotz", "Type": "Analogue", "X":3018, "Y":947, "Width":791, "Height":107, "Cmt": "Stick twist"},
+ { "Input": "x", "Type": "Analogue", "X":3018, "Y":837, "Width":791, "Height":107, "Cmt": "Stick left/right"},
+ { "Input": "y", "Type": "Analogue", "X":3018, "Y":727, "Width":791, "Height":107, "Cmt": "Stick up/down"},
+ { "Input": "z", "Type": "Analogue", "X":96, "Y":736, "Width":691, "Height":53, "Cmt": "Throttle"},
+ { "Input": "slider1", "Type": "Analogue", "X":1114, "Y":1504, "Width":931, "Height":99, "Cmt": "Throttle rocker"}
]
}
]
diff --git a/graphics/layouts/proflightcombatpedals.json b/graphics/layouts/proflightcombatpedals.json
index 1d3a342..995e0a5 100644
--- a/graphics/layouts/proflightcombatpedals.json
+++ b/graphics/layouts/proflightcombatpedals.json
@@ -7,9 +7,9 @@
"DeviceName": "Saitek ProFlight Combat Rudder Pedals",
"DeviceProdGuid": ["{076406A3-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "x", "Type": "Digital", "X":164, "Y":588, "Width":1332, "Height":162, "Cmt":"Left pedal"},
- { "Input": "y", "Type": "Digital", "X":2264, "Y":588, "Width":1332, "Height":162, "Cmt":"Right pedal"},
- { "Input": "rotz", "Type": "Analogue", "X":1208, "Y":331, "Width":1332, "Height":162, "Cmt":"Rudder"}
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 1208, "Y" : 331, "Width" : 1331, "Height" : 161, "Cmt" : "Rudder" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 164, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Left pedal" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 2264, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Right pedal" }
]
}
]
diff --git a/graphics/layouts/proflightpedals.json b/graphics/layouts/proflightpedals.json
index 39bf791..f9a73ea 100644
--- a/graphics/layouts/proflightpedals.json
+++ b/graphics/layouts/proflightpedals.json
@@ -8,9 +8,9 @@
"DeviceProdGuid": ["{076306A3-0000-0000-0000-504944564944}",
"{076506A3-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "x", "Type": "Digital", "X":164, "Y":588, "Width":1332, "Height":162, "Cmt":"Left pedal"},
- { "Input": "y", "Type": "Digital", "X":2264, "Y":588, "Width":1332, "Height":162, "Cmt":"Right pedal"},
- { "Input": "rotz", "Type": "Analogue", "X":1208, "Y":331, "Width":1332, "Height":162, "Cmt":"Rudder"}
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 1208, "Y" : 331, "Width" : 1331, "Height" : 161, "Cmt" : "Rudder" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 164, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Left pedal" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 2264, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Right pedal" }
]
}
]
diff --git a/graphics/layouts/sidepanelcontroldeck.json b/graphics/layouts/sidepanelcontroldeck.json
index 0f12777..8d19b55 100644
--- a/graphics/layouts/sidepanelcontroldeck.json
+++ b/graphics/layouts/sidepanelcontroldeck.json
@@ -7,40 +7,40 @@
"DeviceName": "Saitek Side Panel Control Deck",
"DeviceProdGuid": ["{22180738-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":34, "Y":584, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button2", "Type": "Digital", "X":634, "Y":584, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button3", "Type": "Digital", "X":1234, "Y":584, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button4", "Type": "Digital", "X":2629, "Y":584, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button5", "Type": "Digital", "X":3229, "Y":584, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button6", "Type": "Digital", "X":34, "Y":646, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button7", "Type": "Digital", "X":634, "Y":646, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button8", "Type": "Digital", "X":1234, "Y":646, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button9", "Type": "Digital", "X":2629, "Y":646, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button10", "Type": "Digital", "X":3229, "Y":646, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button11", "Type": "Digital", "X":34, "Y":884, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button12", "Type": "Digital", "X":34, "Y":946, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button13", "Type": "Digital", "X":634, "Y":884, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button14", "Type": "Digital", "X":634, "Y":946, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button15", "Type": "Digital", "X":1234, "Y":884, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button16", "Type": "Digital", "X":1234, "Y":946, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button17", "Type": "Digital", "X":2629, "Y":884, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button18", "Type": "Digital", "X":3229, "Y":884, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button19", "Type": "Digital", "X":2629, "Y":946, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button20", "Type": "Digital", "X":3229, "Y":946, "Width":592, "Height":54, "Cmt":""},
- { "Input": "button21", "Type": "Digital", "X":2624, "Y":1132, "Width":992, "Height":54, "Cmt":""},
- { "Input": "button22", "Type": "Digital", "X":2624, "Y":1222, "Width":992, "Height":54, "Cmt":""},
- { "Input": "button23", "Type": "Digital", "X":2624, "Y":1284, "Width":992, "Height":54, "Cmt":""},
- { "Input": "button24", "Type": "Digital", "X":2624, "Y":1344, "Width":992, "Height":54, "Cmt":""},
- { "Input": "button25", "Type": "Digital", "X":1060, "Y":1371, "Width":772, "Height":54, "Cmt": "Scroll wheel press"},
- { "Input": "button26", "Type": "Digital", "X":1060, "Y":1259, "Width":772, "Height":54, "Cmt":""},
- { "Input": "button27", "Type": "Digital", "X":1060, "Y":1315, "Width":772, "Height":54, "Cmt":""},
- { "Input": "button28", "Type": "Digital", "X":835, "Y":1160, "Width":992, "Height":54, "Cmt": "Stick red button"},
- { "Input": "x", "Type": "Analogue", "X":695, "Y":1556, "Width":1132, "Height":108, "Cmt":""},
- { "Input": "y", "Type": "Analogue", "X":695, "Y":1666, "Width":1132, "Height":108, "Cmt":""},
- { "Input": "z", "Type": "Analogue", "X":695, "Y":1776, "Width":1132, "Height":108, "Cmt":""},
- { "Input": "rotx", "Type": "Analogue", "X":2685, "Y":1556, "Width":1132, "Height":108, "Cmt":""},
- { "Input": "roty", "Type": "Analogue", "X":2685, "Y":1666, "Width":1132, "Height":108, "Cmt":""},
- { "Input": "rotz", "Type": "Analogue", "X":2685, "Y":1776, "Width":1132, "Height":108, "Cmt":""}
+ { "Input" : "button1", "Type" : "Digital", "X" : 34, "Y" : 584, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 634, "Y" : 584, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 1234, "Y" : 584, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 2629, "Y" : 584, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 3229, "Y" : 584, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 34, "Y" : 646, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 634, "Y" : 646, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 1234, "Y" : 646, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 2629, "Y" : 646, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 3229, "Y" : 646, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 34, "Y" : 884, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 34, "Y" : 946, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button13", "Type" : "Digital", "X" : 634, "Y" : 884, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button14", "Type" : "Digital", "X" : 634, "Y" : 946, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button15", "Type" : "Digital", "X" : 1234, "Y" : 884, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button16", "Type" : "Digital", "X" : 1234, "Y" : 946, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button17", "Type" : "Digital", "X" : 2629, "Y" : 884, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button18", "Type" : "Digital", "X" : 3229, "Y" : 884, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button19", "Type" : "Digital", "X" : 2629, "Y" : 946, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button20", "Type" : "Digital", "X" : 3229, "Y" : 946, "Width" : 591, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button21", "Type" : "Digital", "X" : 2624, "Y" : 1132, "Width" : 991, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button22", "Type" : "Digital", "X" : 2624, "Y" : 1222, "Width" : 991, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button23", "Type" : "Digital", "X" : 2624, "Y" : 1284, "Width" : 991, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button24", "Type" : "Digital", "X" : 2624, "Y" : 1346, "Width" : 991, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button25", "Type" : "Digital", "X" : 1060, "Y" : 1372, "Width" : 771, "Height" : 52, "Cmt" : "Scroll wheel press" },
+ { "Input" : "button26", "Type" : "Digital", "X" : 1060, "Y" : 1259, "Width" : 771, "Height" : 54, "Cmt" : "" },
+ { "Input" : "button27", "Type" : "Digital", "X" : 1060, "Y" : 1316, "Width" : 771, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button28", "Type" : "Digital", "X" : 835, "Y" : 1160, "Width" : 991, "Height" : 53, "Cmt" : "Stick red button" },
+ { "Input" : "rotx", "Type" : "Analogue", "X" : 2685, "Y" : 1556, "Width" : 1131, "Height" : 107, "Cmt" : "Mode2 RotX-Axis" },
+ { "Input" : "roty", "Type" : "Analogue", "X" : 2685, "Y" : 1666, "Width" : 1131, "Height" : 107, "Cmt" : "Mode2 RotY-Axis" },
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 2685, "Y" : 1776, "Width" : 1131, "Height" : 107, "Cmt" : "Mode2 RotZ-Axis" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 697, "Y" : 1556, "Width" : 1131, "Height" : 107, "Cmt" : "Mode1 X-Axis" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 697, "Y" : 1666, "Width" : 1131, "Height" : 107, "Cmt" : "Mode1 Y-Axis" },
+ { "Input" : "z", "Type" : "Analogue", "X" : 697, "Y" : 1776, "Width" : 1131, "Height" : 107, "Cmt" : "Mode1 Z-Axis" }
]
}
]
diff --git a/graphics/layouts/slawbf109pedals.json b/graphics/layouts/slawbf109pedals.json
index 97eef65..62883ca 100644
--- a/graphics/layouts/slawbf109pedals.json
+++ b/graphics/layouts/slawbf109pedals.json
@@ -7,9 +7,9 @@
"DeviceName": "Slaw BF-109 Pedals",
"DeviceProdGuid": ["{001104D8-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "x", "Type": "Digital", "X":164, "Y":588, "Width":1332, "Height":162, "Cmt":"Left pedal (unconfirmed)"},
- { "Input": "y", "Type": "Digital", "X":2264, "Y":588, "Width":1332, "Height":162, "Cmt":"Right pedal (unconfirmed)"},
- { "Input": "rotz", "Type": "Analogue", "X":1208, "Y":331, "Width":1332, "Height":162, "Cmt":"Rudder"}
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 1208, "Y" : 331, "Width" : 1331, "Height" : 161, "Cmt" : "Rudder" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 164, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Left pedal (unconfirmed)" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 2264, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Right pedal (unconfirmed)" }
]
}
]
diff --git a/graphics/layouts/stickx.json b/graphics/layouts/stickx.json
index f88a281..13c04c9 100644
--- a/graphics/layouts/stickx.json
+++ b/graphics/layouts/stickx.json
@@ -7,26 +7,26 @@
"DeviceName": "ThrustMaster T.Flight X",
"DeviceProdGuid": ["{B106044F-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":684, "Y":822, "Width":1092, "Height":54, "Cmt": "Primary trigger"},
- { "Input": "button2", "Type": "Digital", "X":2204, "Y":744, "Width":1092, "Height":54, "Cmt": "Secondary trigger"},
- { "Input": "button3", "Type": "Digital", "X":2124, "Y":564, "Width":1092, "Height":54, "Cmt": "Button 3"},
- { "Input": "button4", "Type": "Digital", "X":2174, "Y":654, "Width":1092, "Height":54, "Cmt": "Button 4"},
- { "Input": "button5", "Type": "Digital", "X":474, "Y":1564, "Width":1092, "Height":54, "Cmt": "Button 5"},
- { "Input": "button6", "Type": "Digital", "X":544, "Y":1424, "Width":1092, "Height":54, "Cmt": "Button 6"},
- { "Input": "button7", "Type": "Digital", "X":584, "Y":1266, "Width":1092, "Height":54, "Cmt": "Button 7"},
- { "Input": "button8", "Type": "Digital", "X":584, "Y":1204, "Width":1092, "Height":54, "Cmt": "Button 8"},
- { "Input": "button9", "Type": "Digital", "X":554, "Y":1704, "Width":1092, "Height":54, "Cmt": "Button 9"},
- { "Input": "button10", "Type": "Digital", "X":554, "Y":1766, "Width":1092, "Height":54, "Cmt": "Button 10"},
- { "Input": "button11", "Type": "Digital", "X":2824, "Y":1428, "Width":692, "Height":54, "Cmt": "Button 11"},
- { "Input": "button12", "Type": "Digital", "X":2824, "Y":1338, "Width":692, "Height":54, "Cmt": "Button 12"},
- { "Input": "hat1_up", "Type": "Digital", "X":990, "Y":304, "Width":1932, "Height":54, "Cmt": "PoV hat up"},
- { "Input": "hat1_right", "Type": "Digital", "X":990, "Y":360, "Width":1932, "Height":54, "Cmt": "PoV hat right"},
- { "Input": "hat1_down", "Type": "Digital", "X":990, "Y":416, "Width":1932, "Height":54, "Cmt": "PoV hat down"},
- { "Input": "hat1_left", "Type": "Digital", "X":990, "Y":472, "Width":1932, "Height":54, "Cmt": "PoV hat left"},
- { "Input": "rotz", "Type": "Analogue", "X":2364, "Y":966, "Width":1132, "Height":54, "Cmt": "Stick twist"},
- { "Input": "slider1", "Type": "Analogue", "X":2584, "Y":1833, "Width":892, "Height":54, "Cmt": "Throttle axis"},
- { "Input": "x", "Type": "Analogue", "X":2364, "Y":910, "Width":1132, "Height":54, "Cmt": "Stick left/right"},
- { "Input": "y", "Type": "Analogue", "X":2364, "Y":854, "Width":1132, "Height":54, "Cmt": "Stick up/down"}
+ { "Input" : "button1", "Type" : "Digital", "X" : 684, "Y" : 822, "Width" : 1091, "Height" : 53, "Cmt" : "Prim Trigger" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 2204, "Y" : 744, "Width" : 1091, "Height" : 53, "Cmt" : "Top Middle Trigger" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 2124, "Y" : 564, "Width" : 1091, "Height" : 53, "Cmt" : "R.Side Trigger" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 2174, "Y" : 654, "Width" : 1091, "Height" : 53, "Cmt" : "Top Left Trigger" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 474, "Y" : 1564, "Width" : 1091, "Height" : 53, "Cmt" : "Base Left Bottom" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 544, "Y" : 1424, "Width" : 1091, "Height" : 53, "Cmt" : "Base Left Top" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 584, "Y" : 1266, "Width" : 1091, "Height" : 53, "Cmt" : "Base Neck Left 3rd" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 584, "Y" : 1204, "Width" : 1091, "Height" : 53, "Cmt" : "Base Neck Left last" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 554, "Y" : 1704, "Width" : 1091, "Height" : 53, "Cmt" : "Base Neck Left 2nd" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 554, "Y" : 1766, "Width" : 1091, "Height" : 53, "Cmt" : "Base Neck Left 1st" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 2824, "Y" : 1428, "Width" : 691, "Height" : 53, "Cmt" : "Base Neck Right 1st" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 2824, "Y" : 1338, "Width" : 691, "Height" : 53, "Cmt" : "Base Neck Right last" },
+ { "Input" : "hat1_up", "Type" : "Digital", "X" : 990, "Y" : 304, "Width" : 1931, "Height" : 53, "Cmt" : "POV1 up" },
+ { "Input" : "hat1_right", "Type" : "Digital", "X" : 990, "Y" : 360, "Width" : 1931, "Height" : 53, "Cmt" : "POV1 right" },
+ { "Input" : "hat1_down", "Type" : "Digital", "X" : 990, "Y" : 416, "Width" : 1931, "Height" : 53, "Cmt" : "POV1 down" },
+ { "Input" : "hat1_left", "Type" : "Digital", "X" : 990, "Y" : 472, "Width" : 1931, "Height" : 53, "Cmt" : "POV1 left" },
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 2364, "Y" : 967, "Width" : 1131, "Height" : 52, "Cmt" : "Joy Twist" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 2364, "Y" : 911, "Width" : 1131, "Height" : 53, "Cmt" : "Joy X-Axis" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 2364, "Y" : 854, "Width" : 1131, "Height" : 54, "Cmt" : "Joy Y-Axis" },
+ { "Input" : "slider1", "Type" : "Analogue", "X" : 2584, "Y" : 1833, "Width" : 891, "Height" : 52, "Cmt" : "Throttle" }
]
}
]
diff --git a/graphics/layouts/t16000m-OLD.json b/graphics/layouts/t16000m-OLD.json
new file mode 100644
index 0000000..814c3a0
--- /dev/null
+++ b/graphics/layouts/t16000m-OLD.json
@@ -0,0 +1,37 @@
+{
+ "MapName" : "2: T.16000M (right hand Joystick)",
+ "MapImage" : "t16000m.jpg",
+ "InputDevices" :[
+ {
+ "InputType": "J",
+ "DeviceName": "T.16000M Joystick ",
+ "DeviceProdGuid": ["{B10A044F-0000-0000-0000-504944564944}"],
+ "Controls": [
+ { "Input": "button1", "Type": "Digital", "X":2124, "Y":624, "Width":1092, "Height":54, "Cmt": "Primary trigger" },
+ { "Input": "button2", "Type": "Digital", "X":474, "Y":624, "Width":1092, "Height":54, "Cmt": "Bottom button" },
+ { "Input": "button3", "Type": "Digital", "X":474, "Y":494, "Width":1092, "Height":54, "Cmt": "Left-hand button" },
+ { "Input": "button4", "Type": "Digital", "X":2124, "Y":494, "Width":1092, "Height":54, "Cmt": "Right-hand button" },
+ { "Input": "button5", "Type": "Digital", "X":24, "Y":1104, "Width":542, "Height":108, "Cmt": "Left bank top-left button" },
+ { "Input": "button6", "Type": "Digital", "X":574, "Y":1104, "Width":542, "Height":108, "Cmt": "Left bank top-middle button" },
+ { "Input": "button7", "Type": "Digital", "X":1124, "Y":1104, "Width":542, "Height":108, "Cmt": "Left bank top-right button" },
+ { "Input": "button8", "Type": "Digital", "X":1124, "Y":1220, "Width":542, "Height":108, "Cmt": "Left bank bottom-right button" },
+ { "Input": "button9", "Type": "Digital", "X":574, "Y":1220, "Width":542, "Height":108, "Cmt": "Left bank bottom-middle button" },
+ { "Input": "button10", "Type": "Digital", "X":24, "Y":1220, "Width":542, "Height":108, "Cmt": "Left bank bottom-left button" },
+ { "Input": "button11", "Type": "Digital", "X":3264, "Y":1104, "Width":542, "Height":108, "Cmt": "Right bank top-right button" },
+ { "Input": "button12", "Type": "Digital", "X":2714, "Y":1104, "Width":542, "Height":108, "Cmt": "Right bank top-middle button" },
+ { "Input": "button13", "Type": "Digital", "X":2164, "Y":1104, "Width":542, "Height":108, "Cmt": "Right bank top-left button" },
+ { "Input": "button14", "Type": "Digital", "X":2164, "Y":1220, "Width":542, "Height":108, "Cmt": "Right bank bottom-left button" },
+ { "Input": "button15", "Type": "Digital", "X":2714, "Y":1220, "Width":542, "Height":108, "Cmt": "Right bank bottom-middle button" },
+ { "Input": "button16", "Type": "Digital", "X":3264, "Y":1220, "Width":542, "Height":108, "Cmt": "Right bank bottom-right button" },
+ { "Input": "hat1_up", "Type": "Digital", "X":1542, "Y":214, "Width":1532, "Height":54, "Cmt": "PoV hat up" },
+ { "Input": "hat1_right", "Type": "Digital", "X":1542, "Y":270, "Width":1532, "Height":54, "Cmt": "PoV hat right" },
+ { "Input": "hat1_down", "Type": "Digital", "X":1542, "Y":326, "Width":1532, "Height":54, "Cmt": "PoV hat down" },
+ { "Input": "hat1_left", "Type": "Digital", "X":1542, "Y":382, "Width":1532, "Height":54, "Cmt": "PoV hat left" },
+ { "Input": "rotz", "Type": "Analogue", "X":2357, "Y":980, "Width":1132, "Height":54, "Cmt": "Stick twist" },
+ { "Input": "slider1", "Type": "Analogue", "X":2584, "Y":1750, "Width":832, "Height":54, "Cmt": "Stick throttle slider" },
+ { "Input": "x", "Type": "Analogue", "X":2357, "Y":924, "Width":1132, "Height":54, "Cmt": "Stick pitch" },
+ { "Input": "y", "Type": "Analogue", "X":2357, "Y":868, "Width":1132, "Height": 54, "Cmt": "Stick roll" }
+ ]
+ }
+ ]
+}
diff --git a/graphics/layouts/t16000m.json b/graphics/layouts/t16000m.json
index 814c3a0..8b8732c 100644
--- a/graphics/layouts/t16000m.json
+++ b/graphics/layouts/t16000m.json
@@ -1,36 +1,36 @@
{
"MapName" : "2: T.16000M (right hand Joystick)",
"MapImage" : "t16000m.jpg",
- "InputDevices" :[
- {
- "InputType": "J",
- "DeviceName": "T.16000M Joystick ",
- "DeviceProdGuid": ["{B10A044F-0000-0000-0000-504944564944}"],
- "Controls": [
- { "Input": "button1", "Type": "Digital", "X":2124, "Y":624, "Width":1092, "Height":54, "Cmt": "Primary trigger" },
- { "Input": "button2", "Type": "Digital", "X":474, "Y":624, "Width":1092, "Height":54, "Cmt": "Bottom button" },
- { "Input": "button3", "Type": "Digital", "X":474, "Y":494, "Width":1092, "Height":54, "Cmt": "Left-hand button" },
- { "Input": "button4", "Type": "Digital", "X":2124, "Y":494, "Width":1092, "Height":54, "Cmt": "Right-hand button" },
- { "Input": "button5", "Type": "Digital", "X":24, "Y":1104, "Width":542, "Height":108, "Cmt": "Left bank top-left button" },
- { "Input": "button6", "Type": "Digital", "X":574, "Y":1104, "Width":542, "Height":108, "Cmt": "Left bank top-middle button" },
- { "Input": "button7", "Type": "Digital", "X":1124, "Y":1104, "Width":542, "Height":108, "Cmt": "Left bank top-right button" },
- { "Input": "button8", "Type": "Digital", "X":1124, "Y":1220, "Width":542, "Height":108, "Cmt": "Left bank bottom-right button" },
- { "Input": "button9", "Type": "Digital", "X":574, "Y":1220, "Width":542, "Height":108, "Cmt": "Left bank bottom-middle button" },
- { "Input": "button10", "Type": "Digital", "X":24, "Y":1220, "Width":542, "Height":108, "Cmt": "Left bank bottom-left button" },
- { "Input": "button11", "Type": "Digital", "X":3264, "Y":1104, "Width":542, "Height":108, "Cmt": "Right bank top-right button" },
- { "Input": "button12", "Type": "Digital", "X":2714, "Y":1104, "Width":542, "Height":108, "Cmt": "Right bank top-middle button" },
- { "Input": "button13", "Type": "Digital", "X":2164, "Y":1104, "Width":542, "Height":108, "Cmt": "Right bank top-left button" },
- { "Input": "button14", "Type": "Digital", "X":2164, "Y":1220, "Width":542, "Height":108, "Cmt": "Right bank bottom-left button" },
- { "Input": "button15", "Type": "Digital", "X":2714, "Y":1220, "Width":542, "Height":108, "Cmt": "Right bank bottom-middle button" },
- { "Input": "button16", "Type": "Digital", "X":3264, "Y":1220, "Width":542, "Height":108, "Cmt": "Right bank bottom-right button" },
- { "Input": "hat1_up", "Type": "Digital", "X":1542, "Y":214, "Width":1532, "Height":54, "Cmt": "PoV hat up" },
- { "Input": "hat1_right", "Type": "Digital", "X":1542, "Y":270, "Width":1532, "Height":54, "Cmt": "PoV hat right" },
- { "Input": "hat1_down", "Type": "Digital", "X":1542, "Y":326, "Width":1532, "Height":54, "Cmt": "PoV hat down" },
- { "Input": "hat1_left", "Type": "Digital", "X":1542, "Y":382, "Width":1532, "Height":54, "Cmt": "PoV hat left" },
- { "Input": "rotz", "Type": "Analogue", "X":2357, "Y":980, "Width":1132, "Height":54, "Cmt": "Stick twist" },
- { "Input": "slider1", "Type": "Analogue", "X":2584, "Y":1750, "Width":832, "Height":54, "Cmt": "Stick throttle slider" },
- { "Input": "x", "Type": "Analogue", "X":2357, "Y":924, "Width":1132, "Height":54, "Cmt": "Stick pitch" },
- { "Input": "y", "Type": "Analogue", "X":2357, "Y":868, "Width":1132, "Height": 54, "Cmt": "Stick roll" }
+ "InputDevices" : [
+ {
+ "InputType" : "J",
+ "DeviceName" : "T.16000M Joystick",
+ "DeviceProdGuid" : ["{B10A044F-0000-0000-0000-504944564944}"],
+ "Controls" : [
+ { "Input" : "button1", "Type" : "Digital", "X" : 2124, "Y" : 624, "Width" : 1091, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 474, "Y" : 624, "Width" : 1091, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 474, "Y" : 494, "Width" : 1091, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 2124, "Y" : 494, "Width" : 1091, "Height" : 53, "Cmt" : "" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 24, "Y" : 1104, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 574, "Y" : 1104, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 1124, "Y" : 1104, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 1124, "Y" : 1220, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 574, "Y" : 1220, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 24, "Y" : 1220, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 3264, "Y" : 1104, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 2714, "Y" : 1104, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button13", "Type" : "Digital", "X" : 2164, "Y" : 1104, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button14", "Type" : "Digital", "X" : 2164, "Y" : 1220, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button15", "Type" : "Digital", "X" : 2714, "Y" : 1220, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "button16", "Type" : "Digital", "X" : 3264, "Y" : 1220, "Width" : 541, "Height" : 107, "Cmt" : "" },
+ { "Input" : "hat1_up", "Type" : "Digital", "X" : 1544, "Y" : 214, "Width" : 1531, "Height" : 53, "Cmt" : "POV1 up" },
+ { "Input" : "hat1_right", "Type" : "Digital", "X" : 1544, "Y" : 270, "Width" : 1531, "Height" : 53, "Cmt" : "POV1 right" },
+ { "Input" : "hat1_down", "Type" : "Digital", "X" : 1544, "Y" : 326, "Width" : 1531, "Height" : 53, "Cmt" : "POV1 down" },
+ { "Input" : "hat1_left", "Type" : "Digital", "X" : 1544, "Y" : 382, "Width" : 1531, "Height" : 53, "Cmt" : "POV1 left" },
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 2357, "Y" : 981, "Width" : 1131, "Height" : 52, "Cmt" : "RotZ-Axis" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 2357, "Y" : 925, "Width" : 1131, "Height" : 53, "Cmt" : "X-Axis" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 2357, "Y" : 868, "Width" : 1131, "Height" : 54, "Cmt" : "Y-Axis" },
+ { "Input" : "slider1", "Type" : "Analogue", "X" : 2584, "Y" : 1750, "Width" : 831, "Height" : 53, "Cmt" : "U-Axis" }
]
}
]
diff --git a/graphics/layouts/t16000mduo-left-right.json b/graphics/layouts/t16000mduo-left-right.json
index 8e8b0db..cdec0f5 100644
--- a/graphics/layouts/t16000mduo-left-right.json
+++ b/graphics/layouts/t16000mduo-left-right.json
@@ -7,30 +7,30 @@
"DeviceName": "T.16000M Joystick - left",
"DeviceProdGuid": ["{B10A044F-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1299, "Y":792, "Width":660, "Height":108, "Cmt": "Primary trigger" },
- { "Input": "button2", "Type": "Digital", "X":137, "Y":726, "Width":770, "Height":54, "Cmt": "Bottom button" },
- { "Input": "button3", "Type": "Digital", "X":140, "Y":509, "Width":770, "Height":54, "Cmt": "Left-hand button" },
- { "Input": "button4", "Type": "Digital", "X":1267, "Y":589, "Width":770, "Height":54, "Cmt": "Right-hand button" },
- { "Input": "button5", "Type": "Digital", "X":1272, "Y":1056, "Width":770, "Height":54, "Cmt": "Left bank top-left button" },
- { "Input": "button6", "Type": "Digital", "X":1272, "Y":1107, "Width":770, "Height":54, "Cmt": "Left bank top-middle button" },
- { "Input": "button7", "Type": "Digital", "X":1272, "Y":1157, "Width":770, "Height":54, "Cmt": "Left bank top-right button" },
- { "Input": "button8", "Type": "Digital", "X":1595, "Y":1450, "Width":770, "Height":54, "Cmt": "Left bank bottom-right button" },
- { "Input": "button9", "Type": "Digital", "X":1595, "Y":1399, "Width":770, "Height":54, "Cmt": "Left bank bottom-middle button" },
- { "Input": "button10", "Type": "Digital", "X":1595, "Y":1347, "Width":770, "Height":54, "Cmt": "Left bank bottom-left button" },
- { "Input": "button11", "Type": "Digital", "X":16, "Y":1112, "Width":770, "Height":54, "Cmt": "Right bank top-right button" },
- { "Input": "button12", "Type": "Digital", "X":16, "Y":1164, "Width":770, "Height":54, "Cmt": "Right bank top-middle button" },
- { "Input": "button13", "Type": "Digital", "X":16, "Y":1214, "Width":770, "Height":54, "Cmt": "Right bank top-left button" },
- { "Input": "button14", "Type": "Digital", "X":16, "Y":1730, "Width":770, "Height":54, "Cmt": "Right bank bottom-left button" },
- { "Input": "button15", "Type": "Digital", "X":16, "Y":1679, "Width":770, "Height":54, "Cmt": "Right bank bottom-middle button" },
- { "Input": "button16", "Type": "Digital", "X":16, "Y":1629, "Width":770, "Height":54, "Cmt": "Right bank bottom-right button" },
- { "Input": "hat1_up", "Type": "Digital", "X":728, "Y":229, "Width":770, "Height":54, "Cmt": "PoV hat up" },
- { "Input": "hat1_right", "Type": "Digital", "X":728, "Y":280, "Width":770, "Height":54, "Cmt": "PoV hat right" },
- { "Input": "hat1_down", "Type": "Digital", "X":728, "Y":333, "Width":770, "Height":54, "Cmt": "PoV hat down" },
- { "Input": "hat1_left", "Type": "Digital", "X":728, "Y":385, "Width":770, "Height":54, "Cmt": "PoV hat left" },
- { "Input": "rotz", "Type": "Analogue", "X":134, "Y":982, "Width":770, "Height":54, "Cmt": "Stick twist" },
- { "Input": "slider1", "Type": "Analogue", "X":711, "Y":1824, "Width":770, "Height":54, "Cmt": "Stick throttle slider" },
- { "Input": "x", "Type": "Analogue", "X":134, "Y":930, "Width":770, "Height":54, "Cmt": "Stick pitch" },
- { "Input": "y", "Type": "Analogue", "X":134, "Y":880, "Width":770, "Height":54, "Cmt": "Stick roll" }
+ { "Input" : "button1", "Type" : "Digital", "X" : 1299, "Y" : 793, "Width" : 537, "Height" : 95, "Cmt" : "" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 138, "Y" : 727, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 140, "Y" : 509, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 1268, "Y" : 590, "Width" : 756, "Height" : 40, "Cmt" : "" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 1272, "Y" : 1057, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 1272, "Y" : 1108, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 1272, "Y" : 1159, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 1595, "Y" : 1450, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 1595, "Y" : 1399, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 1595, "Y" : 1348, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 17, "Y" : 1114, "Width" : 647, "Height" : 45, "Cmt" : "" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 17, "Y" : 1164, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button13", "Type" : "Digital", "X" : 17, "Y" : 1215, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button14", "Type" : "Digital", "X" : 17, "Y" : 1731, "Width" : 646, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button15", "Type" : "Digital", "X" : 17, "Y" : 1679, "Width" : 646, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button16", "Type" : "Digital", "X" : 17, "Y" : 1629, "Width" : 646, "Height" : 46, "Cmt" : "" },
+ { "Input" : "hat1_up", "Type" : "Digital", "X" : 728, "Y" : 230, "Width" : 756, "Height" : 46, "Cmt" : "POV1 up" },
+ { "Input" : "hat1_right", "Type" : "Digital", "X" : 728, "Y" : 281, "Width" : 756, "Height" : 48, "Cmt" : "POV1 right" },
+ { "Input" : "hat1_down", "Type" : "Digital", "X" : 728, "Y" : 334, "Width" : 756, "Height" : 46, "Cmt" : "POV1 down" },
+ { "Input" : "hat1_left", "Type" : "Digital", "X" : 728, "Y" : 385, "Width" : 756, "Height" : 47, "Cmt" : "POV1 left" },
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 134, "Y" : 983, "Width" : 756, "Height" : 47, "Cmt" : "RotZ-Axis" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 134, "Y" : 932, "Width" : 756, "Height" : 46, "Cmt" : "X-Axis" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 134, "Y" : 881, "Width" : 756, "Height" : 46, "Cmt" : "Y-Axis" },
+ { "Input" : "slider1", "Type" : "Analogue", "X" : 711, "Y" : 1824, "Width" : 757, "Height" : 41, "Cmt" : "U-Axis" }
]
},
{
@@ -38,30 +38,30 @@
"DeviceName": "T.16000M Joystick - right",
"DeviceProdGuid": ["{B10A044F-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1997, "Y":792, "Width":660, "Height":108, "Cmt": "Primary trigger" },
- { "Input": "button2", "Type": "Digital", "X":2915, "Y":726, "Width":770, "Height":54, "Cmt": "Bottom button" },
- { "Input": "button3", "Type": "Digital", "X":1814, "Y":509, "Width":770, "Height":54, "Cmt": "Left-hand button" },
- { "Input": "button4", "Type": "Digital", "X":2910, "Y":509, "Width":770, "Height":54, "Cmt": "Right-hand button" },
- { "Input": "button5", "Type": "Digital", "X":1933, "Y":953, "Width":770, "Height":54, "Cmt": "Left bank top-left button" },
- { "Input": "button6", "Type": "Digital", "X":1933, "Y":1003, "Width":770, "Height":54, "Cmt": "Left bank top-middle button" },
- { "Input": "button7", "Type": "Digital", "X":1933, "Y":1054, "Width":770, "Height":54, "Cmt": "Left bank top-right button" },
- { "Input": "button8", "Type": "Digital", "X":1618, "Y":1677, "Width":770, "Height":54, "Cmt": "Left bank bottom-right button" },
- { "Input": "button9", "Type": "Digital", "X":1618, "Y":1626, "Width":770, "Height":54, "Cmt": "Left bank bottom-middle button" },
- { "Input": "button10", "Type": "Digital", "X":1618, "Y":1574, "Width":770, "Height":54, "Cmt": "Left bank bottom-left button" },
- { "Input": "button11", "Type": "Digital", "X":3164, "Y":1122, "Width":770, "Height":54, "Cmt": "Right bank top-right button" },
- { "Input": "button12", "Type": "Digital", "X":3164, "Y":1172, "Width":770, "Height":54, "Cmt": "Right bank top-middle button" },
- { "Input": "button13", "Type": "Digital", "X":3164, "Y":1223, "Width":770, "Height":54, "Cmt": "Right bank top-left button" },
- { "Input": "button14", "Type": "Digital", "X":3166, "Y":1721, "Width":770, "Height":54, "Cmt": "Right bank bottom-left button" },
- { "Input": "button15", "Type": "Digital", "X":3166, "Y":1669, "Width":770, "Height":54, "Cmt": "Right bank bottom-middle button" },
- { "Input": "button16", "Type": "Digital", "X":3166, "Y":1619, "Width":770, "Height":54, "Cmt": "Right bank bottom-right button" },
- { "Input": "hat1_up", "Type": "Digital", "X":2395, "Y":230, "Width":770, "Height":54, "Cmt": "PoV hat up" },
- { "Input": "hat1_right", "Type": "Digital", "X":2395, "Y":280, "Width":770, "Height":54, "Cmt": "PoV hat right" },
- { "Input": "hat1_down", "Type": "Digital", "X":2395, "Y":333, "Width":770, "Height":54, "Cmt": "PoV hat down" },
- { "Input": "hat1_left", "Type": "Digital", "X":2395, "Y":385, "Width":770, "Height":54, "Cmt": "PoV hat left" },
- { "Input": "rotz", "Type": "Analogue", "X":2982, "Y":995, "Width":770, "Height":54, "Cmt": "Stick twist" },
- { "Input": "slider1", "Type": "Analogue", "X":2382, "Y":1824, "Width":770, "Height":54, "Cmt": "Stick throttle slider" },
- { "Input": "x", "Type": "Analogue", "X":2982, "Y":943, "Width":770, "Height":54, "Cmt": "Stick pitch" },
- { "Input": "y", "Type": "Analogue", "X":2982, "Y":893, "Width":770, "Height":54, "Cmt": "Stick roll" }
+ { "Input" : "button1", "Type" : "Digital", "X" : 1998, "Y" : 793, "Width" : 537, "Height" : 95, "Cmt" : "" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 2916, "Y" : 727, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 1815, "Y" : 509, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 2910, "Y" : 509, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 1933, "Y" : 953, "Width" : 647, "Height" : 45, "Cmt" : "" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 1933, "Y" : 1003, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 1933, "Y" : 1054, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 1618, "Y" : 1677, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 1618, "Y" : 1626, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 1618, "Y" : 1575, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 3165, "Y" : 1123, "Width" : 647, "Height" : 45, "Cmt" : "" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 3165, "Y" : 1173, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button13", "Type" : "Digital", "X" : 3165, "Y" : 1224, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button14", "Type" : "Digital", "X" : 3166, "Y" : 1722, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button15", "Type" : "Digital", "X" : 3166, "Y" : 1671, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button16", "Type" : "Digital", "X" : 3166, "Y" : 1620, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "hat1_up", "Type" : "Digital", "X" : 2395, "Y" : 230, "Width" : 757, "Height" : 46, "Cmt" : "POV1 up" },
+ { "Input" : "hat1_right", "Type" : "Digital", "X" : 2395, "Y" : 281, "Width" : 757, "Height" : 48, "Cmt" : "POV1 right" },
+ { "Input" : "hat1_down", "Type" : "Digital", "X" : 2395, "Y" : 334, "Width" : 757, "Height" : 46, "Cmt" : "POV1 down" },
+ { "Input" : "hat1_left", "Type" : "Digital", "X" : 2395, "Y" : 385, "Width" : 757, "Height" : 47, "Cmt" : "POV1 left" },
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 2983, "Y" : 995, "Width" : 757, "Height" : 47, "Cmt" : "RotZ-Axis" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 2983, "Y" : 944, "Width" : 757, "Height" : 46, "Cmt" : "X-Axis" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 2983, "Y" : 893, "Width" : 757, "Height" : 46, "Cmt" : "Y-Axis" },
+ { "Input" : "slider1", "Type" : "Analogue", "X" : 2383, "Y" : 1824, "Width" : 757, "Height" : 41, "Cmt" : "U-Axis" }
]
}
]
diff --git a/graphics/layouts/t16000mduo-right-left.json b/graphics/layouts/t16000mduo-right-left.json
index 2cc41b4..680fbef 100644
--- a/graphics/layouts/t16000mduo-right-left.json
+++ b/graphics/layouts/t16000mduo-right-left.json
@@ -7,30 +7,30 @@
"DeviceName": "T.16000M Joystick - left",
"DeviceProdGuid": ["{B10A044F-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1299, "Y":792, "Width":660, "Height":108, "Cmt": "Primary trigger" },
- { "Input": "button2", "Type": "Digital", "X":137, "Y":726, "Width":770, "Height":54, "Cmt": "Bottom button" },
- { "Input": "button3", "Type": "Digital", "X":140, "Y":509, "Width":770, "Height":54, "Cmt": "Left-hand button" },
- { "Input": "button4", "Type": "Digital", "X":1267, "Y":589, "Width":770, "Height":54, "Cmt": "Right-hand button" },
- { "Input": "button5", "Type": "Digital", "X":1272, "Y":1056, "Width":770, "Height":54, "Cmt": "Left bank top-left button" },
- { "Input": "button6", "Type": "Digital", "X":1272, "Y":1107, "Width":770, "Height":54, "Cmt": "Left bank top-middle button" },
- { "Input": "button7", "Type": "Digital", "X":1272, "Y":1157, "Width":770, "Height":54, "Cmt": "Left bank top-right button" },
- { "Input": "button8", "Type": "Digital", "X":1595, "Y":1450, "Width":770, "Height":54, "Cmt": "Left bank bottom-right button" },
- { "Input": "button9", "Type": "Digital", "X":1595, "Y":1399, "Width":770, "Height":54, "Cmt": "Left bank bottom-middle button" },
- { "Input": "button10", "Type": "Digital", "X":1595, "Y":1347, "Width":770, "Height":54, "Cmt": "Left bank bottom-left button" },
- { "Input": "button11", "Type": "Digital", "X":16, "Y":1112, "Width":770, "Height":54, "Cmt": "Right bank top-right button" },
- { "Input": "button12", "Type": "Digital", "X":16, "Y":1164, "Width":770, "Height":54, "Cmt": "Right bank top-middle button" },
- { "Input": "button13", "Type": "Digital", "X":16, "Y":1214, "Width":770, "Height":54, "Cmt": "Right bank top-left button" },
- { "Input": "button14", "Type": "Digital", "X":16, "Y":1730, "Width":770, "Height":54, "Cmt": "Right bank bottom-left button" },
- { "Input": "button15", "Type": "Digital", "X":16, "Y":1679, "Width":770, "Height":54, "Cmt": "Right bank bottom-middle button" },
- { "Input": "button16", "Type": "Digital", "X":16, "Y":1629, "Width":770, "Height":54, "Cmt": "Right bank bottom-right button" },
- { "Input": "hat1_up", "Type": "Digital", "X":728, "Y":229, "Width":770, "Height":54, "Cmt": "PoV hat up" },
- { "Input": "hat1_right", "Type": "Digital", "X":728, "Y":280, "Width":770, "Height":54, "Cmt": "PoV hat right" },
- { "Input": "hat1_down", "Type": "Digital", "X":728, "Y":333, "Width":770, "Height":54, "Cmt": "PoV hat down" },
- { "Input": "hat1_left", "Type": "Digital", "X":728, "Y":385, "Width":770, "Height":54, "Cmt": "PoV hat left" },
- { "Input": "rotz", "Type": "Analogue", "X":134, "Y":982, "Width":770, "Height":54, "Cmt": "Stick twist" },
- { "Input": "slider1", "Type": "Analogue", "X":711, "Y":1824, "Width":770, "Height":54, "Cmt": "Stick throttle slider" },
- { "Input": "x", "Type": "Analogue", "X":134, "Y":930, "Width":770, "Height":54, "Cmt": "Stick pitch" },
- { "Input": "y", "Type": "Analogue", "X":134, "Y":880, "Width":770, "Height":54, "Cmt": "Stick roll" }
+ { "Input" : "button1", "Type" : "Digital", "X" : 1299, "Y" : 793, "Width" : 537, "Height" : 95, "Cmt" : "" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 138, "Y" : 727, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 140, "Y" : 509, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 1268, "Y" : 590, "Width" : 756, "Height" : 40, "Cmt" : "" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 1272, "Y" : 1057, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 1272, "Y" : 1108, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 1272, "Y" : 1159, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 1595, "Y" : 1450, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 1595, "Y" : 1399, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 1595, "Y" : 1348, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 17, "Y" : 1114, "Width" : 647, "Height" : 45, "Cmt" : "" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 17, "Y" : 1164, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button13", "Type" : "Digital", "X" : 17, "Y" : 1215, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button14", "Type" : "Digital", "X" : 17, "Y" : 1731, "Width" : 646, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button15", "Type" : "Digital", "X" : 17, "Y" : 1679, "Width" : 646, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button16", "Type" : "Digital", "X" : 17, "Y" : 1629, "Width" : 646, "Height" : 46, "Cmt" : "" },
+ { "Input" : "hat1_up", "Type" : "Digital", "X" : 728, "Y" : 230, "Width" : 756, "Height" : 46, "Cmt" : "POV1 up" },
+ { "Input" : "hat1_right", "Type" : "Digital", "X" : 728, "Y" : 281, "Width" : 756, "Height" : 48, "Cmt" : "POV1 right" },
+ { "Input" : "hat1_down", "Type" : "Digital", "X" : 728, "Y" : 334, "Width" : 756, "Height" : 46, "Cmt" : "POV1 down" },
+ { "Input" : "hat1_left", "Type" : "Digital", "X" : 728, "Y" : 385, "Width" : 756, "Height" : 47, "Cmt" : "POV1 left" },
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 134, "Y" : 983, "Width" : 756, "Height" : 47, "Cmt" : "RotZ-Axis" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 134, "Y" : 932, "Width" : 756, "Height" : 46, "Cmt" : "X-Axis" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 134, "Y" : 881, "Width" : 756, "Height" : 46, "Cmt" : "Y-Axis" },
+ { "Input" : "slider1", "Type" : "Analogue", "X" : 711, "Y" : 1824, "Width" : 757, "Height" : 41, "Cmt" : "U-Axis" }
]
},
{
@@ -38,30 +38,30 @@
"DeviceName": "T.16000M Joystick -right",
"DeviceProdGuid": ["{B10A044F-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1997, "Y":792, "Width":660, "Height":108, "Cmt": "Primary trigger" },
- { "Input": "button2", "Type": "Digital", "X":2915, "Y":726, "Width":770, "Height":54, "Cmt": "Bottom button" },
- { "Input": "button3", "Type": "Digital", "X":1814, "Y":509, "Width":770, "Height":54, "Cmt": "Left-hand button" },
- { "Input": "button4", "Type": "Digital", "X":2910, "Y":509, "Width":770, "Height":54, "Cmt": "Right-hand button" },
- { "Input": "button5", "Type": "Digital", "X":1933, "Y":953, "Width":770, "Height":54, "Cmt": "Left bank top-left button" },
- { "Input": "button6", "Type": "Digital", "X":1933, "Y":1003, "Width":770, "Height":54, "Cmt": "Left bank top-middle button" },
- { "Input": "button7", "Type": "Digital", "X":1933, "Y":1054, "Width":770, "Height":54, "Cmt": "Left bank top-right button" },
- { "Input": "button8", "Type": "Digital", "X":1618, "Y":1677, "Width":770, "Height":54, "Cmt": "Left bank bottom-right button" },
- { "Input": "button9", "Type": "Digital", "X":1618, "Y":1626, "Width":770, "Height":54, "Cmt": "Left bank bottom-middle button" },
- { "Input": "button10", "Type": "Digital", "X":1618, "Y":1574, "Width":770, "Height":54, "Cmt": "Left bank bottom-left button" },
- { "Input": "button11", "Type": "Digital", "X":3164, "Y":1122, "Width":770, "Height":54, "Cmt": "Right bank top-right button" },
- { "Input": "button12", "Type": "Digital", "X":3164, "Y":1172, "Width":770, "Height":54, "Cmt": "Right bank top-middle button" },
- { "Input": "button13", "Type": "Digital", "X":3164, "Y":1223, "Width":770, "Height":54, "Cmt": "Right bank top-left button" },
- { "Input": "button14", "Type": "Digital", "X":3166, "Y":1721, "Width":770, "Height":54, "Cmt": "Right bank bottom-left button" },
- { "Input": "button15", "Type": "Digital", "X":3166, "Y":1669, "Width":770, "Height":54, "Cmt": "Right bank bottom-middle button" },
- { "Input": "button16", "Type": "Digital", "X":3166, "Y":1619, "Width":770, "Height":54, "Cmt": "Right bank bottom-right button" },
- { "Input": "hat1_up", "Type": "Digital", "X":2395, "Y":230, "Width":770, "Height":54, "Cmt": "PoV hat up" },
- { "Input": "hat1_right", "Type": "Digital", "X":2395, "Y":280, "Width":770, "Height":54, "Cmt": "PoV hat right" },
- { "Input": "hat1_down", "Type": "Digital", "X":2395, "Y":333, "Width":770, "Height":54, "Cmt": "PoV hat down" },
- { "Input": "hat1_left", "Type": "Digital", "X":2395, "Y":385, "Width":770, "Height":54, "Cmt": "PoV hat left" },
- { "Input": "rotz", "Type": "Analogue", "X":2982, "Y":995, "Width":770, "Height":54, "Cmt": "Stick twist" },
- { "Input": "slider1", "Type": "Analogue", "X":2382, "Y":1824, "Width":770, "Height":54, "Cmt": "Stick throttle slider" },
- { "Input": "x", "Type": "Analogue", "X":2982, "Y":943, "Width":770, "Height":54, "Cmt": "Stick pitch" },
- { "Input": "y", "Type": "Analogue", "X":2982, "Y":893, "Width":770, "Height":54, "Cmt": "Stick roll" }
+ { "Input" : "button1", "Type" : "Digital", "X" : 1998, "Y" : 793, "Width" : 537, "Height" : 95, "Cmt" : "" },
+ { "Input" : "button2", "Type" : "Digital", "X" : 2916, "Y" : 727, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button3", "Type" : "Digital", "X" : 1815, "Y" : 509, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button4", "Type" : "Digital", "X" : 2910, "Y" : 509, "Width" : 757, "Height" : 41, "Cmt" : "" },
+ { "Input" : "button5", "Type" : "Digital", "X" : 1933, "Y" : 953, "Width" : 647, "Height" : 45, "Cmt" : "" },
+ { "Input" : "button6", "Type" : "Digital", "X" : 1933, "Y" : 1003, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button7", "Type" : "Digital", "X" : 1933, "Y" : 1054, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button8", "Type" : "Digital", "X" : 1618, "Y" : 1677, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button9", "Type" : "Digital", "X" : 1618, "Y" : 1626, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button10", "Type" : "Digital", "X" : 1618, "Y" : 1575, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button11", "Type" : "Digital", "X" : 3165, "Y" : 1123, "Width" : 647, "Height" : 45, "Cmt" : "" },
+ { "Input" : "button12", "Type" : "Digital", "X" : 3165, "Y" : 1173, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button13", "Type" : "Digital", "X" : 3165, "Y" : 1224, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button14", "Type" : "Digital", "X" : 3166, "Y" : 1722, "Width" : 647, "Height" : 47, "Cmt" : "" },
+ { "Input" : "button15", "Type" : "Digital", "X" : 3166, "Y" : 1671, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "button16", "Type" : "Digital", "X" : 3166, "Y" : 1620, "Width" : 647, "Height" : 46, "Cmt" : "" },
+ { "Input" : "hat1_up", "Type" : "Digital", "X" : 2395, "Y" : 230, "Width" : 757, "Height" : 46, "Cmt" : "POV1 up" },
+ { "Input" : "hat1_right", "Type" : "Digital", "X" : 2395, "Y" : 281, "Width" : 757, "Height" : 48, "Cmt" : "POV1 right" },
+ { "Input" : "hat1_down", "Type" : "Digital", "X" : 2395, "Y" : 334, "Width" : 757, "Height" : 46, "Cmt" : "POV1 down" },
+ { "Input" : "hat1_left", "Type" : "Digital", "X" : 2395, "Y" : 385, "Width" : 757, "Height" : 47, "Cmt" : "POV1 left" },
+ { "Input" : "rotz", "Type" : "Analogue", "X" : 2983, "Y" : 995, "Width" : 757, "Height" : 47, "Cmt" : "RotZ-Axis" },
+ { "Input" : "x", "Type" : "Analogue", "X" : 2983, "Y" : 944, "Width" : 757, "Height" : 46, "Cmt" : "X-Axis" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 2983, "Y" : 893, "Width" : 757, "Height" : 46, "Cmt" : "Y-Axis" },
+ { "Input" : "slider1", "Type" : "Analogue", "X" : 2383, "Y" : 1824, "Width" : 757, "Height" : 41, "Cmt" : "U-Axis" }
]
}
]
diff --git a/graphics/layouts/t16000mfcs.json b/graphics/layouts/t16000mfcs.json
index 50b9c6e..100bab0 100644
--- a/graphics/layouts/t16000mfcs.json
+++ b/graphics/layouts/t16000mfcs.json
@@ -7,30 +7,30 @@
"DeviceName": "T.16000M Joystick ",
"DeviceProdGuid": ["{B10A044F-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1804, "Y":844, "Width":642, "Height":54, "Cmt": "Primary trigger" },
- { "Input": "button2", "Type": "Digital", "X":2764, "Y":604, "Width":992, "Height":54, "Cmt": "Bottom button" },
- { "Input": "button3", "Type": "Digital", "X":1754, "Y":484, "Width":692, "Height":54, "Cmt": "Left-hand button" },
- { "Input": "button4", "Type": "Digital", "X":2764, "Y":504, "Width":992, "Height":54, "Cmt": "Right-hand button" },
- { "Input": "button5", "Type": "Digital", "X":1254, "Y":1244, "Width":292, "Height":108, "Cmt": "Left bank top-left button" },
- { "Input": "button6", "Type": "Digital", "X":1554, "Y":1244, "Width":292, "Height":108, "Cmt": "Left bank top-middle button" },
- { "Input": "button7", "Type": "Digital", "X":1854, "Y":1244, "Width":292, "Height":108, "Cmt": "Left bank top-right button" },
- { "Input": "button8", "Type": "Digital", "X":1854, "Y":1360, "Width":292, "Height":108, "Cmt": "Left bank bottom-right button" },
- { "Input": "button9", "Type": "Digital", "X":1554, "Y":1360, "Width":292, "Height":108, "Cmt": "Left bank bottom-middle button" },
- { "Input": "button10", "Type": "Digital", "X":1254, "Y":1360, "Width":292, "Height":108, "Cmt": "Left bank bottom-left button" },
- { "Input": "button11", "Type": "Digital", "X":3484, "Y":992, "Width":292, "Height":108, "Cmt": "Right bank top-right button" },
- { "Input": "button12", "Type": "Digital", "X":3184, "Y":992, "Width":292, "Height":108, "Cmt": "Right bank top-middle button" },
- { "Input": "button13", "Type": "Digital", "X":2884, "Y":992, "Width":292, "Height":108, "Cmt": "Right bank top-left button" },
- { "Input": "button14", "Type": "Digital", "X":2884, "Y":1108, "Width":292, "Height":108, "Cmt": "Right bank bottom-left button" },
- { "Input": "button15", "Type": "Digital", "X":3184, "Y":1108, "Width":292, "Height":108, "Cmt": "Right bank bottom-middle button" },
- { "Input": "button16", "Type": "Digital", "X":3484, "Y":1108, "Width":292, "Height":108, "Cmt": "Right bank bottom-right button" },
- { "Input": "hat1_up", "Type": "Digital", "X":2524, "Y":214, "Width":1192, "Height":54, "Cmt": "PoV hat up" },
- { "Input": "hat1_right", "Type": "Digital", "X":2524, "Y":270, "Width":1192, "Height":54, "Cmt": "PoV hat right" },
- { "Input": "hat1_down", "Type": "Digital", "X":2524, "Y":326, "Width":1192, "Height":54, "Cmt": "PoV hat down" },
- { "Input": "hat1_left", "Type": "Digital", "X":2524, "Y":382, "Width":1192, "Height":54, "Cmt": "PoV hat left" },
- { "Input": "rotz", "Type": "Analogue", "X":2824, "Y":856, "Width":932, "Height":54, "Cmt": "Stick twist" },
- { "Input": "slider1", "Type": "Analogue", "X":2944, "Y":1593, "Width":832, "Height":54, "Cmt": "Stick throttle slider" },
- { "Input": "x", "Type": "Analogue", "X":2824, "Y":800, "Width":932, "Height":54, "Cmt": "Stick pitch" },
- { "Input": "y", "Type": "Analogue", "X":2824, "Y":744, "Width":932, "Height": 54, "Cmt": "Stick roll" }
+ { "Input": "button1", "Type": "Digital", "X":1804, "Y":844, "Width":641, "Height":107, "Cmt": "Primary trigger" },
+ { "Input": "button2", "Type": "Digital", "X":2764, "Y":604, "Width":991, "Height":53, "Cmt": "Bottom button" },
+ { "Input": "button3", "Type": "Digital", "X":1754, "Y":484, "Width":691, "Height":53, "Cmt": "Left-hand button" },
+ { "Input": "button4", "Type": "Digital", "X":2764, "Y":504, "Width":991, "Height":53, "Cmt": "Right-hand button" },
+ { "Input": "button5", "Type": "Digital", "X":1254, "Y":1244, "Width":291, "Height":107, "Cmt": "Left bank top-left button" },
+ { "Input": "button6", "Type": "Digital", "X":1554, "Y":1244, "Width":291, "Height":107, "Cmt": "Left bank top-middle button" },
+ { "Input": "button7", "Type": "Digital", "X":1854, "Y":1244, "Width":291, "Height":107, "Cmt": "Left bank top-right button" },
+ { "Input": "button8", "Type": "Digital", "X":1854, "Y":1360, "Width":291, "Height":107, "Cmt": "Left bank bottom-right button" },
+ { "Input": "button9", "Type": "Digital", "X":1554, "Y":1360, "Width":291, "Height":107, "Cmt": "Left bank bottom-middle button" },
+ { "Input": "button10", "Type": "Digital", "X":1254, "Y":1360, "Width":291, "Height":107, "Cmt": "Left bank bottom-left button" },
+ { "Input": "button11", "Type": "Digital", "X":3484, "Y":992, "Width":291, "Height":107, "Cmt": "Right bank top-right button" },
+ { "Input": "button12", "Type": "Digital", "X":3184, "Y":992, "Width":291, "Height":107, "Cmt": "Right bank top-middle button" },
+ { "Input": "button13", "Type": "Digital", "X":2884, "Y":992, "Width":291, "Height":107, "Cmt": "Right bank top-left button" },
+ { "Input": "button14", "Type": "Digital", "X":2884, "Y":1108, "Width":291, "Height":107, "Cmt": "Right bank bottom-left button" },
+ { "Input": "button15", "Type": "Digital", "X":3184, "Y":1108, "Width":291, "Height":107, "Cmt": "Right bank bottom-middle button" },
+ { "Input": "button16", "Type": "Digital", "X":3484, "Y":1108, "Width":291, "Height":107, "Cmt": "Right bank bottom-right button" },
+ { "Input": "hat1_up", "Type": "Digital", "X":2524, "Y":214, "Width":1190, "Height":53, "Cmt": "PoV hat up" },
+ { "Input": "hat1_right", "Type": "Digital", "X":2524, "Y":270, "Width":1190, "Height":53, "Cmt": "PoV hat right" },
+ { "Input": "hat1_down", "Type": "Digital", "X":2524, "Y":326, "Width":1190, "Height":53, "Cmt": "PoV hat down" },
+ { "Input": "hat1_left", "Type": "Digital", "X":2524, "Y":382, "Width":1190, "Height":53, "Cmt": "PoV hat left" },
+ { "Input": "rotz", "Type": "Analogue", "X":2824, "Y":857, "Width":931, "Height":52, "Cmt": "Stick twist" },
+ { "Input": "x", "Type": "Analogue", "X":2824, "Y":801, "Width":931, "Height":53, "Cmt": "Stick pitch" },
+ { "Input": "y", "Type": "Analogue", "X":2824, "Y":744, "Width":931, "Height":54, "Cmt": "Stick roll" },
+ { "Input": "slider1", "Type": "Analogue", "X":2944, "Y":1593, "Width":831, "Height":53, "Cmt": "Stick throttle slider" }
]
},
{
@@ -38,29 +38,29 @@
"DeviceName": "T16000M Throttle",
"DeviceProdGuid": ["{B687044F-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":294, "Y":1244, "Width":792, "Height":54, "Cmt": "Thumb button" },
- { "Input": "button2", "Type": "Digital", "X":1774, "Y":1774, "Width":892, "Height":54, "Cmt": "Pinky button" },
- { "Input": "button3", "Type": "Digital", "X":1714, "Y":1664, "Width":892, "Height":54, "Cmt": "Ring finger button" },
- { "Input": "button4", "Type": "Digital", "X":1484, "Y":1514, "Width":692, "Height":54, "Cmt": "Middle finger rocker up" },
- { "Input": "button5", "Type": "Digital", "X":1484, "Y":1570, "Width":692, "Height":54, "Cmt": "Middle finger rocker down" },
- { "Input": "button6", "Type": "Digital", "X":244, "Y":1866, "Width":732, "Height":54, "Cmt": "Index finger mouse push" },
- { "Input": "button7", "Type": "Digital", "X":1024, "Y":654, "Width":692, "Height":54, "Cmt": "Middle hat up" },
- { "Input": "button8", "Type": "Digital", "X":1024, "Y":710, "Width":692, "Height":54, "Cmt": "Middle hat right" },
- { "Input": "button9", "Type": "Digital", "X":1024, "Y":766, "Width":692, "Height":54, "Cmt": "Middle hat down" },
- { "Input": "button10", "Type": "Digital", "X":1024, "Y":820, "Width":692, "Height":54, "Cmt": "Middle hat left" },
- { "Input": "button11", "Type": "Digital", "X":1034, "Y":929, "Width":692, "Height":54, "Cmt": "Middle hat up" },
- { "Input": "button12", "Type": "Digital", "X":1034, "Y":985, "Width":692, "Height":54, "Cmt": "Castle hat right" },
- { "Input": "button13", "Type": "Digital", "X":1034, "Y":1041, "Width":692, "Height":54, "Cmt": "Castle hat down" },
- { "Input": "button14", "Type": "Digital", "X":1034, "Y":1097, "Width":692, "Height":54, "Cmt": "Castle hat left" },
- { "Input": "hat1_up", "Type": "Digital", "X":1014, "Y":364, "Width":692, "Height":54, "Cmt": "PoV hat up" },
- { "Input": "hat1_right", "Type": "Digital", "X":1014, "Y":420, "Width":692, "Height":54, "Cmt": "PoV hat right" },
- { "Input": "hat1_down", "Type": "Digital", "X":1014, "Y":476, "Width":692, "Height":54, "Cmt": "PoV hat down" },
- { "Input": "hat1_left", "Type": "Digital", "X":1014, "Y":532, "Width":692, "Height":54, "Cmt": "PoV hat left" },
- { "Input": "x", "Type": "Digital", "X":244, "Y":1810, "Width":732, "Height":54, "Cmt": "Index finger mouse X" },
- { "Input": "y", "Type": "Digital", "X":244, "Y":1754, "Width":732, "Height":54, "Cmt": "Index finger mouse Y" },
- { "Input": "z", "Type": "Digital", "X":84, "Y":555, "Width":572, "Height":54, "Cmt": "Throttle" },
- { "Input": "slider1", "Type": "Digital", "X":1874, "Y":1914, "Width":832, "Height":54, "Cmt": "Pinky dial" },
- { "Input": "rotz", "Type": "Digital", "X":1954, "Y":2054, "Width":832, "Height":54, "Cmt": "Paddle" }
+ { "Input": "button1", "Type": "Digital", "X":294, "Y":1244, "Width":791, "Height":53, "Cmt": "Thumb button" },
+ { "Input": "button2", "Type": "Digital", "X":1774, "Y":1774, "Width":891, "Height":53, "Cmt": "Pinky button" },
+ { "Input": "button3", "Type": "Digital", "X":1714, "Y":1664, "Width":891, "Height":53, "Cmt": "Ring finger button" },
+ { "Input": "button4", "Type": "Digital", "X":1484, "Y":1514, "Width":691, "Height":55, "Cmt": "Middle finger rocker up" },
+ { "Input": "button5", "Type": "Digital", "X":1484, "Y":1572, "Width":691, "Height":51, "Cmt": "Middle finger rocker down" },
+ { "Input": "button6", "Type": "Digital", "X":244, "Y":1866, "Width":731, "Height":51, "Cmt": "Index finger mouse push" },
+ { "Input": "button7", "Type": "Digital", "X":1025, "Y":654, "Width":690, "Height":53, "Cmt": "Middle hat up" },
+ { "Input": "button8", "Type": "Digital", "X":1025, "Y":710, "Width":690, "Height":53, "Cmt": "Middle hat right" },
+ { "Input": "button9", "Type": "Digital", "X":1025, "Y":766, "Width":690, "Height":53, "Cmt": "Middle hat down" },
+ { "Input": "button10", "Type": "Digital", "X":1025, "Y":822, "Width":690, "Height":53, "Cmt": "Middle hat left" },
+ { "Input": "button11", "Type": "Digital", "X":1034, "Y":929, "Width":690, "Height":53, "Cmt": "Middle hat up" },
+ { "Input": "button12", "Type": "Digital", "X":1034, "Y":985, "Width":690, "Height":53, "Cmt": "Castle hat right" },
+ { "Input": "button13", "Type": "Digital", "X":1034, "Y":1041, "Width":690, "Height":53, "Cmt": "Castle hat down" },
+ { "Input": "button14", "Type": "Digital", "X":1034, "Y":1097, "Width":690, "Height":53, "Cmt": "Castle hat left" },
+ { "Input": "hat1_up", "Type": "Digital", "X":1014, "Y":364, "Width":690, "Height":53, "Cmt": "PoV hat up" },
+ { "Input": "hat1_right", "Type": "Digital", "X":1014, "Y":420, "Width":690, "Height":53, "Cmt": "PoV hat right" },
+ { "Input": "hat1_down", "Type": "Digital", "X":1014, "Y":476, "Width":690, "Height":53, "Cmt": "PoV hat down" },
+ { "Input": "hat1_left", "Type": "Digital", "X":1014, "Y":532, "Width":690, "Height":53, "Cmt": "PoV hat left" },
+ { "Input": "rotz", "Type": "Analogue", "X":1954, "Y":2054, "Width":831, "Height":53, "Cmt": "Paddle" },
+ { "Input": "x", "Type": "Analogue", "X":244, "Y":1810, "Width":731, "Height":53, "Cmt": "Index finger mouse X" },
+ { "Input": "y", "Type": "Analogue", "X":244, "Y":1754, "Width":731, "Height":53, "Cmt": "Index finger mouse Y" },
+ { "Input": "z", "Type": "Analogue", "X":84, "Y":555, "Width":571, "Height":53, "Cmt": "Throttle" },
+ { "Input": "slider1", "Type": "Analogue", "X":1874, "Y":1914, "Width":831, "Height":53, "Cmt": "Pinky dial" }
]
}
]
diff --git a/graphics/layouts/tfrpedals.json b/graphics/layouts/tfrpedals.json
index 9832ae8..7079cfd 100644
--- a/graphics/layouts/tfrpedals.json
+++ b/graphics/layouts/tfrpedals.json
@@ -7,9 +7,9 @@
"DeviceName": "ThrustMaster T-Flight Pedals",
"DeviceProdGuid": ["{B679044F-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "x", "Type": "Digital", "X":164, "Y":588, "Width":1332, "Height":162, "Cmt":"Left pedal"},
- { "Input": "y", "Type": "Digital", "X":2264, "Y":588, "Width":1332, "Height":162, "Cmt":"Right pedal"},
- { "Input": "z", "Type": "Analogue", "X":1208, "Y":331, "Width":1332, "Height":162, "Cmt":"Rudder"}
+ { "Input" : "x", "Type" : "Analogue", "X" : 164, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Left pedal" },
+ { "Input" : "y", "Type" : "Analogue", "X" : 2264, "Y" : 588, "Width" : 1331, "Height" : 161, "Cmt" : "Right pedal" },
+ { "Input" : "z", "Type" : "Analogue", "X" : 1208, "Y" : 331, "Width" : 1331, "Height" : 161, "Cmt" : "Rudder" }
]
}
]
diff --git a/graphics/layouts/vpc-warbrd-delta-left.jpg b/graphics/layouts/vpc-warbrd-delta-left.jpg
index f5857d6..3a39496 100644
Binary files a/graphics/layouts/vpc-warbrd-delta-left.jpg and b/graphics/layouts/vpc-warbrd-delta-left.jpg differ
diff --git a/graphics/layouts/vpc-warbrd-delta-left.json b/graphics/layouts/vpc-warbrd-delta-left.json
index 62b557b..5759d95 100644
--- a/graphics/layouts/vpc-warbrd-delta-left.json
+++ b/graphics/layouts/vpc-warbrd-delta-left.json
@@ -7,33 +7,33 @@
"DeviceName": "VPC WarBRD Delta left",
"DeviceProdGuid": ["{204203EB-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":2470, "Y":1100, "Width":1180, "Height":54, "Cmt":"Trigger first stage"},
- { "Input": "button2", "Type": "Digital", "X":2470, "Y":1160, "Width":1180, "Height":54, "Cmt":"Trigger second stage"},
- { "Input": "button3", "Type": "Digital", "X":2470, "Y":1300, "Width":1180, "Height":54, "Cmt":"Trigger button"},
- { "Input": "button4", "Type": "Digital", "X":270, "Y":1000, "Width":1180, "Height":54, "Cmt":"Wheel up"},
- { "Input": "button5", "Type": "Digital", "X":270, "Y":1060, "Width":1180, "Height":54, "Cmt":"Wheel down"},
- { "Input": "button6", "Type": "Digital", "X":270, "Y":1120, "Width":1180, "Height":54, "Cmt":"Wheel push"},
- { "Input": "button7", "Type": "Digital", "X":270, "Y":820, "Width":1180, "Height":54, "Cmt":"Mini-joystick push"},
- { "Input": "button8", "Type": "Digital", "X":2470, "Y":700, "Width":1180, "Height":54, "Cmt":"4-way hat right up"},
- { "Input": "button9", "Type": "Digital", "X":2470, "Y":760, "Width":1180, "Height":54, "Cmt":"4-way hat right righ"},
- { "Input": "button10", "Type": "Digital", "X":2470, "Y":820, "Width":1180, "Height":54, "Cmt":"4-way hat right down"},
- { "Input": "button11", "Type": "Digital", "X":2470, "Y":880, "Width":1180, "Height":54, "Cmt":"4-way hat right left"},
- { "Input": "button12", "Type": "Digital", "X":2470, "Y":940, "Width":1180, "Height":54, "Cmt":"4-way hat right push?"},
- { "Input": "button13", "Type": "Digital", "X":270, "Y":300, "Width":1180, "Height":54, "Cmt":"4-way hat left up"},
- { "Input": "button14", "Type": "Digital", "X":270, "Y":360, "Width":1180, "Height":54, "Cmt":"4-way hat left righ"},
- { "Input": "button15", "Type": "Digital", "X":270, "Y":420, "Width":1180, "Height":54, "Cmt":"4-way hat left down"},
- { "Input": "button16", "Type": "Digital", "X":270, "Y":480, "Width":1180, "Height":54, "Cmt":"4-way hat left left"},
- { "Input": "button17", "Type": "Digital", "X":270, "Y":540, "Width":1180, "Height":54, "Cmt":"4-way hat left push?"},
- { "Input": "button18", "Type": "Digital", "X":2470, "Y":300, "Width":1180, "Height":54, "Cmt":"8-way hat LED up"},
- { "Input": "button19", "Type": "Digital", "X":2470, "Y":360, "Width":1180, "Height":54, "Cmt":"8-way hat LED righ"},
- { "Input": "button20", "Type": "Digital", "X":2470, "Y":420, "Width":1180, "Height":54, "Cmt":"8-way hat LED down"},
- { "Input": "button21", "Type": "Digital", "X":2470, "Y":480, "Width":1180, "Height":54, "Cmt":"8-way hat LED left"},
- { "Input": "button22", "Type": "Digital", "X":2470, "Y":540, "Width":1180, "Height":54, "Cmt":"8-way hat LED push?"},
- { "Input": "x", "Type": "Analogue", "X":270, "Y":1400, "Width":1180, "Height":54, "Cmt":"Joystick axis" },
- { "Input": "y", "Type": "Analogue", "X":270, "Y":1460, "Width":1180, "Height":54, "Cmt":""},
- { "Input": "z", "Type": "Analogue", "X":270, "Y":1520, "Width":1180, "Height":54, "Cmt":""},
- { "Input": "rotx", "Type": "Analogue", "X":270, "Y":700, "Width":1180, "Height":54, "Cmt":"Mini-joysticks axis"},
- { "Input": "roty", "Type": "Analogue", "X":270, "Y":760, "Width":1180, "Height":54, "Cmt":""}
+ { "Input": "button1", "Type": "Digital", "X":2041, "Y":1063, "Width":756, "Height":43, "Cmt":"Trigger first stage"},
+ { "Input": "button2", "Type": "Digital", "X":2041, "Y":1110, "Width":756, "Height":48, "Cmt":"Trigger second stage"},
+ { "Input": "button3", "Type": "Digital", "X":1934, "Y":1269, "Width":757, "Height":41, "Cmt":"Trigger button"},
+ { "Input": "button4", "Type": "Digital", "X":922, "Y":1100, "Width":757, "Height":46, "Cmt":"Wheel up"},
+ { "Input": "button5", "Type": "Digital", "X":922, "Y":1151, "Width":757, "Height":46, "Cmt":"Wheel down"},
+ { "Input": "button6", "Type": "Digital", "X":922, "Y":1202, "Width":757, "Height":47, "Cmt":"Wheel push"},
+ { "Input": "button7", "Type": "Digital", "X":918, "Y":913, "Width":757, "Height":47, "Cmt":"Mini-joystick push"},
+ { "Input": "button8", "Type": "Digital", "X":2161, "Y":432, "Width":756, "Height":48, "Cmt":"4-way hat right up"},
+ { "Input": "button9", "Type": "Digital", "X":2161, "Y":485, "Width":756, "Height":47, "Cmt":"4-way hat right righ"},
+ { "Input": "button10", "Type": "Digital", "X":2161, "Y":537, "Width":756, "Height":48, "Cmt":"4-way hat right down"},
+ { "Input": "button11", "Type": "Digital", "X":2161, "Y":590, "Width":756, "Height":46, "Cmt":"4-way hat right left"},
+ { "Input": "button12", "Type": "Digital", "X":2161, "Y":641, "Width":756, "Height":47, "Cmt":"4-way hat right push?"},
+ { "Input": "button13", "Type": "Digital", "X":941, "Y":216, "Width":756, "Height":48, "Cmt":"4-way hat left up"},
+ { "Input": "button14", "Type": "Digital", "X":941, "Y":269, "Width":756, "Height":47, "Cmt":"4-way hat left righ"},
+ { "Input": "button15", "Type": "Digital", "X":941, "Y":321, "Width":756, "Height":48, "Cmt":"4-way hat left down"},
+ { "Input": "button16", "Type": "Digital", "X":941, "Y":374, "Width":756, "Height":46, "Cmt":"4-way hat left left"},
+ { "Input": "button17", "Type": "Digital", "X":941, "Y":425, "Width":756, "Height":47, "Cmt":"4-way hat left push?"},
+ { "Input": "button18", "Type": "Digital", "X":1811, "Y":99, "Width":757, "Height":48, "Cmt":"8-way hat LED up"},
+ { "Input": "button19", "Type": "Digital", "X":1811, "Y":152, "Width":757, "Height":47, "Cmt":"8-way hat LED righ"},
+ { "Input": "button20", "Type": "Digital", "X":1811, "Y":204, "Width":757, "Height":48, "Cmt":"8-way hat LED down"},
+ { "Input": "button21", "Type": "Digital", "X":1811, "Y":257, "Width":757, "Height":46, "Cmt":"8-way hat LED left"},
+ { "Input": "button22", "Type": "Digital", "X":1811, "Y":308, "Width":757, "Height":47, "Cmt":"8-way hat LED push?"},
+ { "Input": "rotx", "Type": "Analogue", "X":918, "Y":862, "Width":757, "Height":46, "Cmt":"Mini-joysticks axis"},
+ { "Input": "roty", "Type": "Analogue", "X":918, "Y":811, "Width":757, "Height":46, "Cmt":""},
+ { "Input": "x", "Type": "Analogue", "X":1992, "Y":1698, "Width":756, "Height":46, "Cmt":"Joystick axis"},
+ { "Input": "y", "Type": "Analogue", "X":1992, "Y":1648, "Width":756, "Height":45, "Cmt":""},
+ { "Input": "z", "Type": "Analogue", "X":1992, "Y":1749, "Width":756, "Height":47, "Cmt":""}
]
}
]
diff --git a/graphics/layouts/vpc-warbrd-delta-right.jpg b/graphics/layouts/vpc-warbrd-delta-right.jpg
index 9aee23f..10511c7 100644
Binary files a/graphics/layouts/vpc-warbrd-delta-right.jpg and b/graphics/layouts/vpc-warbrd-delta-right.jpg differ
diff --git a/graphics/layouts/vpc-warbrd-delta-right.json b/graphics/layouts/vpc-warbrd-delta-right.json
index 00f4760..cbc9067 100644
--- a/graphics/layouts/vpc-warbrd-delta-right.json
+++ b/graphics/layouts/vpc-warbrd-delta-right.json
@@ -7,33 +7,33 @@
"DeviceName": "VPC WarBRD Delta right",
"DeviceProdGuid": ["{204403EB-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":270, "Y":1100, "Width":1180, "Height":54, "Cmt":"Trigger first stage"},
- { "Input": "button2", "Type": "Digital", "X":270, "Y":1160, "Width":1180, "Height":54, "Cmt":"Trigger second stage"},
- { "Input": "button3", "Type": "Digital", "X":270, "Y":1300, "Width":1180, "Height":54, "Cmt":"Trigger button"},
- { "Input": "button4", "Type": "Digital", "X":2470, "Y":1000, "Width":1180, "Height":54, "Cmt":"Wheel up"},
- { "Input": "button5", "Type": "Digital", "X":2470, "Y":1060, "Width":1180, "Height":54, "Cmt":"Wheel down"},
- { "Input": "button6", "Type": "Digital", "X":2470, "Y":1120, "Width":1180, "Height":54, "Cmt":"Wheel push"},
- { "Input": "button7", "Type": "Digital", "X":2470, "Y":820, "Width":1180, "Height":54, "Cmt":"Mini-joystick push"},
- { "Input": "button8", "Type": "Digital", "X":2470, "Y":300, "Width":1180, "Height":54, "Cmt":"4-way hat right up"},
- { "Input": "button9", "Type": "Digital", "X":2470, "Y":360, "Width":1180, "Height":54, "Cmt":"4-way hat right righ"},
- { "Input": "button10", "Type": "Digital", "X":2470, "Y":420, "Width":1180, "Height":54, "Cmt":"4-way hat right down"},
- { "Input": "button11", "Type": "Digital", "X":2470, "Y":480, "Width":1180, "Height":54, "Cmt":"4-way hat right left"},
- { "Input": "button12", "Type": "Digital", "X":2470, "Y":540, "Width":1180, "Height":54, "Cmt":"4-way hat right push?"},
- { "Input": "button13", "Type": "Digital", "X":270, "Y":700, "Width":1180, "Height":54, "Cmt":"4-way hat left up"},
- { "Input": "button14", "Type": "Digital", "X":270, "Y":760, "Width":1180, "Height":54, "Cmt":"4-way hat left righ"},
- { "Input": "button15", "Type": "Digital", "X":270, "Y":820, "Width":1180, "Height":54, "Cmt":"4-way hat left down"},
- { "Input": "button16", "Type": "Digital", "X":270, "Y":880, "Width":1180, "Height":54, "Cmt":"4-way hat left left"},
- { "Input": "button17", "Type": "Digital", "X":270, "Y":940, "Width":1180, "Height":54, "Cmt":"4-way hat left push?"},
- { "Input": "button18", "Type": "Digital", "X":270, "Y":300, "Width":1180, "Height":54, "Cmt":"8-way hat LED up"},
- { "Input": "button19", "Type": "Digital", "X":270, "Y":360, "Width":1180, "Height":54, "Cmt":"8-way hat LED righ"},
- { "Input": "button20", "Type": "Digital", "X":270, "Y":420, "Width":1180, "Height":54, "Cmt":"8-way hat LED down"},
- { "Input": "button21", "Type": "Digital", "X":270, "Y":480, "Width":1180, "Height":54, "Cmt":"8-way hat LED left"},
- { "Input": "button22", "Type": "Digital", "X":270, "Y":540, "Width":1180, "Height":54, "Cmt":"8-way hat LED push?"},
- { "Input": "x", "Type": "Analogue", "X":2470, "Y":1400, "Width":1180, "Height":54, "Cmt":"Joystick axis"},
- { "Input": "y", "Type": "Analogue", "X":2470, "Y":1460, "Width":1180, "Height":54, "Cmt":""},
- { "Input": "z", "Type": "Analogue", "X":2470, "Y":1520, "Width":1180, "Height":54, "Cmt":""},
- { "Input": "rotx", "Type": "Analogue", "X":2470, "Y":700, "Width":1180, "Height":54, "Cmt":"Mini-joysticks axis"},
- { "Input": "roty", "Type": "Analogue", "X":2470, "Y":760, "Width":1180, "Height":54, "Cmt":""}
+ { "Input": "button1", "Type": "Digital", "X":900, "Y":1027, "Width":757, "Height":43, "Cmt":"Trigger first stage"},
+ { "Input": "button2", "Type": "Digital", "X":900, "Y":1075, "Width":757, "Height":47, "Cmt":"Trigger second stage"},
+ { "Input": "button3", "Type": "Digital", "X":969, "Y":1234, "Width":756, "Height":40, "Cmt":"Trigger button"},
+ { "Input": "button4", "Type": "Digital", "X":2045, "Y":1121, "Width":646, "Height":45, "Cmt":"Wheel up"},
+ { "Input": "button5", "Type": "Digital", "X":2045, "Y":1171, "Width":646, "Height":46, "Cmt":"Wheel down"},
+ { "Input": "button6", "Type": "Digital", "X":2045, "Y":1222, "Width":646, "Height":47, "Cmt":"Wheel push"},
+ { "Input": "button7", "Type": "Digital", "X":2045, "Y":962, "Width":646, "Height":47, "Cmt":"Mini-joystick push"},
+ { "Input": "button8", "Type": "Digital", "X":1935, "Y":340, "Width":756, "Height":48, "Cmt":"4-way hat right up"},
+ { "Input": "button9", "Type": "Digital", "X":1935, "Y":393, "Width":756, "Height":47, "Cmt":"4-way hat right righ"},
+ { "Input": "button10", "Type": "Digital", "X":1935, "Y":445, "Width":756, "Height":48, "Cmt":"4-way hat right down"},
+ { "Input": "button11", "Type": "Digital", "X":1935, "Y":498, "Width":756, "Height":46, "Cmt":"4-way hat right left"},
+ { "Input": "button12", "Type": "Digital", "X":1935, "Y":549, "Width":756, "Height":47, "Cmt":"4-way hat right push?"},
+ { "Input": "button13", "Type": "Digital", "X":725, "Y":685, "Width":757, "Height":48, "Cmt":"4-way hat left up"},
+ { "Input": "button14", "Type": "Digital", "X":725, "Y":738, "Width":757, "Height":48, "Cmt":"4-way hat left righ"},
+ { "Input": "button15", "Type": "Digital", "X":725, "Y":791, "Width":757, "Height":48, "Cmt":"4-way hat left down"},
+ { "Input": "button16", "Type": "Digital", "X":725, "Y":844, "Width":757, "Height":46, "Cmt":"4-way hat left left"},
+ { "Input": "button17", "Type": "Digital", "X":725, "Y":895, "Width":757, "Height":47, "Cmt":"4-way hat left push?"},
+ { "Input": "button18", "Type": "Digital", "X":984, "Y":223, "Width":756, "Height":48, "Cmt":"8-way hat LED up"},
+ { "Input": "button19", "Type": "Digital", "X":984, "Y":276, "Width":756, "Height":48, "Cmt":"8-way hat LED righ"},
+ { "Input": "button20", "Type": "Digital", "X":984, "Y":328, "Width":756, "Height":49, "Cmt":"8-way hat LED down"},
+ { "Input": "button21", "Type": "Digital", "X":984, "Y":382, "Width":756, "Height":46, "Cmt":"8-way hat LED left"},
+ { "Input": "button22", "Type": "Digital", "X":984, "Y":433, "Width":756, "Height":47, "Cmt":"8-way hat LED push?"},
+ { "Input": "rotx", "Type": "Analogue", "X":2045, "Y":911, "Width":646, "Height":46, "Cmt":"Mini-joysticks axis"},
+ { "Input": "roty", "Type": "Analogue", "X":2045, "Y":860, "Width":646, "Height":46, "Cmt":""},
+ { "Input": "x", "Type": "Analogue", "X":945, "Y":1662, "Width":757, "Height":46, "Cmt":"Joystick axis"},
+ { "Input": "y", "Type": "Analogue", "X":945, "Y":1612, "Width":757, "Height":45, "Cmt":""},
+ { "Input": "z", "Type": "Analogue", "X":945, "Y":1713, "Width":757, "Height":47, "Cmt":""}
]
}
]
diff --git a/graphics/layouts/x56-throttle+stick.json b/graphics/layouts/x56-throttle+stick.json
index 50a7d67..230c34c 100644
--- a/graphics/layouts/x56-throttle+stick.json
+++ b/graphics/layouts/x56-throttle+stick.json
@@ -7,29 +7,29 @@
"DeviceName": "Saitek Pro Flight X-56 Rhino Stick",
"DeviceProdGuid": ["{22210738-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":1964, "Y":618, "Width":642, "Height":108, "Cmt": "Primary trigger"},
- { "Input": "button2", "Type": "Digital", "X":2084, "Y":208, "Width":792, "Height":54, "Cmt": "R button"},
- { "Input": "button3", "Type": "Digital", "X":3014, "Y":604, "Width":792, "Height":54, "Cmt": "Side button"},
- { "Input": "button4", "Type": "Digital", "X":2024, "Y":904, "Width":642, "Height":54, "Cmt": "Stick press"},
- { "Input": "button5", "Type": "Digital", "X":3024, "Y":974, "Width":792, "Height":54, "Cmt": "Pinky button"},
- { "Input": "button6", "Type": "Digital", "X":1964, "Y":1038, "Width":642, "Height":108, "Cmt": "Pinky trigger"},
- { "Input": "button7", "Type": "Digital", "X":3054, "Y":224, "Width":772, "Height":54, "Cmt": "Witch hat up"},
- { "Input": "button8", "Type": "Digital", "X":3054, "Y":280, "Width":772, "Height":54, "Cmt": "Witch hat right"},
- { "Input": "button9", "Type": "Digital", "X":3054, "Y":336, "Width":772, "Height":54, "Cmt": "Witch hat down"},
- { "Input": "button10", "Type": "Digital", "X":3054, "Y":392, "Width":772, "Height":54, "Cmt": "Witch hat left"},
- { "Input": "button11", "Type": "Digital", "X":3074, "Y":724, "Width":742, "Height":54, "Cmt": "Castle hat up"},
- { "Input": "button12", "Type": "Digital", "X":3074, "Y":780, "Width":742, "Height":54, "Cmt": "Castle hat right"},
- { "Input": "button13", "Type": "Digital", "X":3074, "Y":836, "Width":742, "Height":54, "Cmt": "Castle hat down"},
- { "Input": "button14", "Type": "Digital", "X":3074, "Y":892, "Width":742, "Height":54, "Cmt": "Castle hat left"},
- { "Input": "hat1_up", "Type": "Digital", "X":1684, "Y":288, "Width":1072, "Height":54, "Cmt": "PoV hat up"},
- { "Input": "hat1_right", "Type": "Digital", "X":1684, "Y":344, "Width":1072, "Height":54, "Cmt": "PoV hat right"},
- { "Input": "hat1_down", "Type": "Digital", "X":1684, "Y":400, "Width":1072, "Height":54, "Cmt": "PoV hat down"},
- { "Input": "hat1_left", "Type": "Digital", "X":1684, "Y":456, "Width":1072, "Height":54, "Cmt": "PoV hat left"},
- { "Input": "x", "Type": "Analogue", "X":3194, "Y":1110, "Width":632, "Height":54, "Cmt": "X"},
- { "Input": "y", "Type": "Analogue", "X":3194, "Y":1054, "Width":632, "Height":54, "Cmt": "Y"},
- { "Input": "rotx", "Type": "Analogue", "X":2024, "Y":848, "Width":642, "Height":54, "Cmt": "Stick x"},
- { "Input": "roty", "Type": "Analogue", "X":2024, "Y":792, "Width":642, "Height":54, "Cmt": "Stick y"},
- { "Input": "rotz", "Type": "Analogue", "X":3194, "Y":1166, "Width":632, "Height":54, "Cmt": "z"}
+ { "Input": "button1", "Type": "Digital", "X":1964, "Y":618, "Width":641, "Height":107, "Cmt": "Primary trigger"},
+ { "Input": "button2", "Type": "Digital", "X":2084, "Y":208, "Width":791, "Height":53, "Cmt": "A button"},
+ { "Input": "button3", "Type": "Digital", "X":3014, "Y":604, "Width":791, "Height":53, "Cmt": "Side button"},
+ { "Input": "button4", "Type": "Digital", "X":2024, "Y":904, "Width":641, "Height":53, "Cmt": "Stick press"},
+ { "Input": "button5", "Type": "Digital", "X":3024, "Y":974, "Width":791, "Height":53, "Cmt": "Pinky button"},
+ { "Input": "button6", "Type": "Digital", "X":1964, "Y":1038, "Width":641, "Height":107, "Cmt": "Pinky trigger"},
+ { "Input": "button7", "Type": "Digital", "X":3054, "Y":224, "Width":770, "Height":53, "Cmt": "Witch hat up"},
+ { "Input": "button8", "Type": "Digital", "X":3054, "Y":280, "Width":770, "Height":53, "Cmt": "Witch hat right"},
+ { "Input": "button9", "Type": "Digital", "X":3054, "Y":336, "Width":770, "Height":53, "Cmt": "Witch hat down"},
+ { "Input": "button10", "Type": "Digital", "X":3054, "Y":392, "Width":770, "Height":53, "Cmt": "Witch hat left"},
+ { "Input": "button11", "Type": "Digital", "X":3074, "Y":725, "Width":740, "Height":53, "Cmt": "Castle hat up"},
+ { "Input": "button12", "Type": "Digital", "X":3074, "Y":780, "Width":740, "Height":54, "Cmt": "Castle hat right"},
+ { "Input": "button13", "Type": "Digital", "X":3074, "Y":836, "Width":740, "Height":54, "Cmt": "Castle hat down"},
+ { "Input": "button14", "Type": "Digital", "X":3074, "Y":892, "Width":740, "Height":53, "Cmt": "Castle hat left"},
+ { "Input": "hat1_up", "Type": "Digital", "X":1684, "Y":288, "Width":1070, "Height":53, "Cmt": "PoV hat up"},
+ { "Input": "hat1_right", "Type": "Digital", "X":1684, "Y":344, "Width":1070, "Height":53, "Cmt": "PoV hat right"},
+ { "Input": "hat1_down", "Type": "Digital", "X":1684, "Y":400, "Width":1070, "Height":53, "Cmt": "PoV hat down"},
+ { "Input": "hat1_left", "Type": "Digital", "X":1684, "Y":456, "Width":1070, "Height":53, "Cmt": "PoV hat left"},
+ { "Input": "rotx", "Type": "Analogue", "X":2024, "Y":848, "Width":641, "Height":53, "Cmt": "Stick x"},
+ { "Input": "roty", "Type": "Analogue", "X":2024, "Y":792, "Width":641, "Height":53, "Cmt": "Stick y"},
+ { "Input": "rotz", "Type": "Analogue", "X":3194, "Y":1167, "Width":631, "Height":52, "Cmt": "z"},
+ { "Input": "x", "Type": "Analogue", "X":3194, "Y":1111, "Width":631, "Height":53, "Cmt": "X"},
+ { "Input": "y", "Type": "Analogue", "X":3194, "Y":1054, "Width":631, "Height":54, "Cmt": "Y"}
]
},
@@ -38,44 +38,45 @@
"DeviceName": "Saitek Pro Flight X-56 Rhino Throttle",
"DeviceProdGuid": ["{A2210738-0000-0000-0000-504944564944}"],
"Controls": [
- { "Input": "button1", "Type": "Digital", "X":44, "Y":604, "Width":852, "Height":54, "Cmt": "E button" },
- { "Input": "button2", "Type": "Digital", "X":1874, "Y":1660, "Width":672, "Height":54, "Cmt": "F push" },
- { "Input": "button3", "Type": "Digital", "X":1534, "Y":1810, "Width":672, "Height":54, "Cmt": "G push" },
- { "Input": "button4", "Type": "Digital", "X":2574, "Y":1694, "Width":892, "Height":54, "Cmt": "H button" },
- { "Input": "button5", "Type": "Digital", "X":2744, "Y":1784, "Width":892, "Height":54, "Cmt": "I button" },
- { "Input": "button6", "Type": "Digital", "X":74, "Y":1604, "Width":572, "Height":54, "Cmt": "Switch 1" },
- { "Input": "button7", "Type": "Digital", "X":74, "Y":1660, "Width":572, "Height":54, "Cmt": "Switch 2" },
- { "Input": "button8", "Type": "Digital", "X":94, "Y":1754, "Width":572, "Height":54, "Cmt": "Switch 3" },
- { "Input": "button9", "Type": "Digital", "X":94, "Y":1810, "Width":572, "Height":54, "Cmt": "Switch 4" },
- { "Input": "button10", "Type": "Digital", "X":764, "Y":1754, "Width":572, "Height":54, "Cmt": "Switch 5" },
- { "Input": "button11", "Type": "Digital", "X":764, "Y":1810, "Width":572, "Height":54, "Cmt": "Switch 6" },
- { "Input": "button12", "Type": "Digital", "X":1104, "Y":1424, "Width":572, "Height":54, "Cmt": "TGL 1 up" },
- { "Input": "button13", "Type": "Digital", "X":1104, "Y":1480, "Width":572, "Height":54, "Cmt": "TGL 1 down" },
- { "Input": "button14", "Type": "Digital", "X":1164, "Y":1284, "Width":572, "Height":54, "Cmt": "TGL 2 up" },
- { "Input": "button15", "Type": "Digital", "X":1164, "Y":1340, "Width":572, "Height":54, "Cmt": "TGL 2 down" },
- { "Input": "button16", "Type": "Digital", "X":1224, "Y":1154, "Width":572, "Height":54, "Cmt": "TGL 3 up" },
- { "Input": "button17", "Type": "Digital", "X":1224, "Y":1210, "Width":572, "Height":54, "Cmt": "TGL 3 down" },
- { "Input": "button18", "Type": "Digital", "X":1244, "Y":1014, "Width":572, "Height":54, "Cmt": "TGL 4 up" },
- { "Input": "button19", "Type": "Digital", "X":1244, "Y":1070, "Width":572, "Height":54, "Cmt": "TGL 4 down" },
- { "Input": "button20", "Type": "Digital", "X":1154, "Y":564, "Width":772, "Height":54, "Cmt": "H3 up" },
- { "Input": "button21", "Type": "Digital", "X":1154, "Y":620, "Width":772, "Height":54, "Cmt": "H3 right" },
- { "Input": "button22", "Type": "Digital", "X":1154, "Y":676, "Width":772, "Height":54, "Cmt": "H3 down" },
- { "Input": "button23", "Type": "Digital", "X":1154, "Y":732, "Width":772, "Height":54, "Cmt": "H3 left" },
- { "Input": "button24", "Type": "Digital", "X":1364, "Y":1924, "Width":772, "Height":54, "Cmt": "H4 up" },
- { "Input": "button25", "Type": "Digital", "X":1364, "Y":1980, "Width":772, "Height":54, "Cmt": "H4 right" },
- { "Input": "button26", "Type": "Digital", "X":1364, "Y":2036, "Width":772, "Height":54, "Cmt": "H4 down" },
- { "Input": "button27", "Type": "Digital", "X":1364, "Y":2092, "Width":772, "Height":54, "Cmt": "H4 left" },
- { "Input": "button28", "Type": "Digital", "X":3124, "Y":2034, "Width":692, "Height":54, "Cmt": "Pinky rocker up" },
- { "Input": "button29", "Type": "Digital", "X":3124, "Y":2090, "Width":692, "Height":54, "Cmt": "Pinky rocker down" },
- { "Input": "button30", "Type": "Digital", "X":3134, "Y":1884, "Width":692, "Height":54, "Cmt": "Pinky spin up" },
- { "Input": "button31", "Type": "Digital", "X":3134, "Y":1940, "Width":692, "Height":54, "Cmt": "Pinky spin down" },
- { "Input": "x", "Type": "Analogue", "X":164, "Y":680, "Width":572, "Height":54, "Cmt": "Throttle" },
- { "Input": "z", "Type": "Analogue", "X":1874, "Y":1604, "Width":672, "Height":54, "Cmt": "F spin" },
- { "Input": "rotx", "Type": "Analogue", "X":1534, "Y":1754, "Width":672, "Height":54, "Cmt": "G spin" },
- { "Input": "roty", "Type": "Analogue", "X":1014, "Y":1574, "Width":692, "Height":54, "Cmt": "RTY2 axis" },
- { "Input": "rotz", "Type": "Analogue", "X":854, "Y":1654, "Width":692, "Height":54, "Cmt": "RTY1 axis" },
- { "Input": "slider2", "Type": "Analogue", "X":1194, "Y":870, "Width":732, "Height":54, "Cmt": "Mouse left/right" },
- { "Input": "slider1", "Type": "Analogue", "X":1194, "Y":814, "Width":732, "Height":54, "Cmt": "Mouse up/down" }
+ { "Input": "button1", "Type": "Digital", "X":24, "Y":604, "Width":751, "Height":53, "Cmt": "E button" },
+ { "Input": "button2", "Type": "Digital", "X":1874, "Y":1660, "Width":671, "Height":53, "Cmt": "F push" },
+ { "Input": "button3", "Type": "Digital", "X":1534, "Y":1810, "Width":671, "Height":53, "Cmt": "G push" },
+ { "Input": "button4", "Type": "Digital", "X":2574, "Y":1694, "Width":891, "Height":53, "Cmt": "H button" },
+ { "Input": "button5", "Type": "Digital", "X":2744, "Y":1784, "Width":891, "Height":53, "Cmt": "I button" },
+ { "Input": "button6", "Type": "Digital", "X":74, "Y":1604, "Width":531, "Height":53, "Cmt": "Switch 1" },
+ { "Input": "button7", "Type": "Digital", "X":74, "Y":1660, "Width":531, "Height":51, "Cmt": "Switch 2" },
+ { "Input": "button8", "Type": "Digital", "X":94, "Y":1754, "Width":571, "Height":53, "Cmt": "Switch 3" },
+ { "Input": "button9", "Type": "Digital", "X":94, "Y":1810, "Width":571, "Height":51, "Cmt": "Switch 4" },
+ { "Input": "button10", "Type": "Digital", "X":764, "Y":1754, "Width":571, "Height":53, "Cmt": "Switch 5" },
+ { "Input": "button11", "Type": "Digital", "X":764, "Y":1810, "Width":571, "Height":51, "Cmt": "Switch 6" },
+ { "Input": "button12", "Type": "Digital", "X":1104, "Y":1444, "Width":571, "Height":53, "Cmt": "TGL 1 up" },
+ { "Input": "button13", "Type": "Digital", "X":1104, "Y":1500, "Width":571, "Height":53, "Cmt": "TGL 1 down" },
+ { "Input": "button14", "Type": "Digital", "X":1164, "Y":1304, "Width":571, "Height":53, "Cmt": "TGL 2 up" },
+ { "Input": "button15", "Type": "Digital", "X":1164, "Y":1360, "Width":571, "Height":53, "Cmt": "TGL 2 down" },
+ { "Input": "button16", "Type": "Digital", "X":1224, "Y":1166, "Width":571, "Height":53, "Cmt": "TGL 3 up" },
+ { "Input": "button17", "Type": "Digital", "X":1224, "Y":1222, "Width":571, "Height":53, "Cmt": "TGL 3 down" },
+ { "Input": "button18", "Type": "Digital", "X":1224, "Y":1026, "Width":571, "Height":53, "Cmt": "TGL 4 up" },
+ { "Input": "button19", "Type": "Digital", "X":1224, "Y":1082, "Width":571, "Height":53, "Cmt": "TGL 4 down" },
+ { "Input": "button20", "Type": "Digital", "X":1154, "Y":534, "Width":770, "Height":53, "Cmt": "H3 up" },
+ { "Input": "button21", "Type": "Digital", "X":1154, "Y":590, "Width":770, "Height":53, "Cmt": "H3 right" },
+ { "Input": "button22", "Type": "Digital", "X":1154, "Y":646, "Width":770, "Height":53, "Cmt": "H3 down" },
+ { "Input": "button23", "Type": "Digital", "X":1154, "Y":702, "Width":770, "Height":53, "Cmt": "H3 left" },
+ { "Input": "button24", "Type": "Digital", "X":1364, "Y":1924, "Width":770, "Height":53, "Cmt": "H4 up" },
+ { "Input": "button25", "Type": "Digital", "X":1364, "Y":1980, "Width":770, "Height":53, "Cmt": "H4 right" },
+ { "Input": "button26", "Type": "Digital", "X":1364, "Y":2036, "Width":770, "Height":53, "Cmt": "H4 down" },
+ { "Input": "button27", "Type": "Digital", "X":1364, "Y":2092, "Width":770, "Height":53, "Cmt": "H4 left" },
+ { "Input": "button28", "Type": "Digital", "X":3124, "Y":2034, "Width":691, "Height":53, "Cmt": "Pinky rocker up" },
+ { "Input": "button29", "Type": "Digital", "X":3124, "Y":2090, "Width":691, "Height":53, "Cmt": "Pinky rocker down" },
+ { "Input": "button30", "Type": "Digital", "X":3134, "Y":1884, "Width":691, "Height":53, "Cmt": "Pinky spin up" },
+ { "Input": "button31", "Type": "Digital", "X":3134, "Y":1940, "Width":691, "Height":53, "Cmt": "Pinky spin down" },
+ { "Input": "rotx", "Type": "Analogue", "X":1874, "Y":1604, "Width":671, "Height":53, "Cmt": "G spin" },
+ { "Input": "roty", "Type": "Analogue", "X":1014, "Y":1588, "Width":691, "Height":53, "Cmt": "RTY3 axis" },
+ { "Input": "rotz", "Type": "Analogue", "X":854, "Y":1668, "Width":691, "Height":53, "Cmt": "RTY4 axis" },
+ { "Input": "x", "Type": "Analogue", "X":124, "Y":694, "Width":571, "Height":53, "Cmt": "Throttle R" },
+ { "Input": "y", "Type": "Analogue", "X":84, "Y":784, "Width":571, "Height":53, "Cmt": "Throttle L" },
+ { "Input": "z", "Type": "Analogue", "X":1534, "Y":1754, "Width":671, "Height":53, "Cmt": "F spin" },
+ { "Input": "slider1", "Type": "Analogue", "X":1224, "Y":782, "Width":641, "Height":53, "Cmt": "Mouse up/down" },
+ { "Input": "slider2", "Type": "Analogue", "X":1224, "Y":838, "Width":641, "Height":53, "Cmt": "Mouse left/right" }
]
}