Reorg Main folder, move App stuff to AApp folder

Layout/ControllerJson.cs

@@ -28,7 +28,7 @@ namespace SCJMapper_V2.Layout
         fn = Path.Combine( TheUser.LayoutsDir, fn ); // if it is not found use the default path
       }
       if ( File.Exists( fn ) ) {
-        using ( var ts = File.OpenRead( jFilename ) ) {
+        using ( var ts = File.OpenRead( fn ) ) {
           c = FromJson( ts );
         }
       }

Properties/Resources.resx

@@ -149,7 +149,7 @@
     <value>..\graphics\Cassini_Logo2_s.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="defaultProfile" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\defaultprofile.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\SC\defaultprofile.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="Monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\graphics\Monitor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

SCJMapper-V2.csproj

@@ -54,7 +54,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Cassini_Logo_Icon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>SCJMapper_V2.Program</StartupObject>
@@ -83,7 +84,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationManifest>AApp\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="log4net">
@@ -125,10 +126,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AboutBox1.cs">
+    <Compile Include="AApp\AboutBox1.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AboutBox1.Designer.cs">
+    <Compile Include="AApp\AboutBox1.Designer.cs">
       <DependentUpon>AboutBox1.cs</DependentUpon>
     </Compile>
     <Compile Include="Actions\ActionCommandCls.cs" />
@@ -136,8 +137,8 @@
     <Compile Include="Actions\ActionTreeEventArgs.cs" />
     <Compile Include="Actions\ActionTreeInputNode.cs" />
     <Compile Include="Actions\ActionTreeNode.cs" />
-    <Compile Include="appConfiguration.cs" />
+    <Compile Include="AApp\appConfiguration.cs" />
-    <Compile Include="AppSettings.cs" />
+    <Compile Include="AApp\AppSettings.cs" />
     <Compile Include="Common\CloneableItems.cs" />
     <Compile Include="Common\Commons.cs" />
     <Compile Include="Common\WinApi.cs" />
@@ -264,10 +265,10 @@
       <DependentUpon>FormJSCalCurve.cs</DependentUpon>
     </Compile>
     <Compile Include="Devices\Options\Deviceoptions.cs" />
-    <Compile Include="FormMain.cs">
+    <Compile Include="AApp\FormMain.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FormMain.Designer.cs">
+    <Compile Include="AApp\FormMain.Designer.cs">
       <DependentUpon>FormMain.cs</DependentUpon>
     </Compile>
     <Compile Include="Devices\Joystick\FormReassign.cs">
@@ -276,10 +277,10 @@
     <Compile Include="Devices\Joystick\FormReassign.Designer.cs">
       <DependentUpon>FormReassign.cs</DependentUpon>
     </Compile>
-    <Compile Include="FormSettings.cs">
+    <Compile Include="AApp\FormSettings.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FormSettings.Designer.cs">
+    <Compile Include="AApp\FormSettings.Designer.cs">
       <DependentUpon>FormSettings.cs</DependentUpon>
     </Compile>
     <Compile Include="Devices\Joystick\JoystickList.cs" />
@@ -307,14 +308,14 @@
     </Compile>
     <Compile Include="Devices\Options\OptionTree.cs" />
     <Compile Include="OGL\LoaderDDS.cs" />
-    <Compile Include="Program.cs" />
+    <Compile Include="AApp\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="OGL\RK4Integrator.cs" />
     <Compile Include="SC\SCLogExtract.cs" />
     <Compile Include="SC\SCDefaultProfile.cs" />
     <Compile Include="SC\SCMappings.cs" />
     <Compile Include="SC\SCPath.cs" />
-    <Compile Include="TheUser.cs" />
+    <Compile Include="AApp\TheUser.cs" />
     <Compile Include="Devices\UICustHeader.cs" />
     <Compile Include="OGL\TriDiagonalMatrix.cs" />
     <Compile Include="Devices\Joystick\xyPoints.cs" />
@@ -330,7 +331,7 @@
       <DependentUpon>Strings.fr.resx</DependentUpon>
     </Compile>
     <Compile Include="Translation\Tx.cs" />
-    <EmbeddedResource Include="AboutBox1.resx">
+    <EmbeddedResource Include="AApp\AboutBox1.resx">
       <DependentUpon>AboutBox1.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Devices\Monitor\FormDeviceMonitor.resx">
@@ -345,7 +346,7 @@
     <EmbeddedResource Include="Devices\Monitor\UC_Toggle.resx">
       <DependentUpon>UC_Toggle.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormMain.resx">
+    <EmbeddedResource Include="AApp\FormMain.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -378,7 +379,7 @@
     <EmbeddedResource Include="Devices\Joystick\FormReassign.resx">
       <DependentUpon>FormReassign.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FormSettings.resx">
+    <EmbeddedResource Include="AApp\FormSettings.resx">
       <DependentUpon>FormSettings.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Devices\Joystick\UC_JoyPanel.resx">
@@ -397,10 +398,12 @@
     <EmbeddedResource Include="Devices\Gamepad\UC_GpadPanel.resx">
       <DependentUpon>UC_GpadPanel.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="app.config" />
+    <None Include="AApp\app.config" />
-    <EmbeddedResource Include="app.manifest">
+    <EmbeddedResource Include="AApp\app.manifest">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <None Include="Docx\SCJMapper_QGuide V2.35beta.pdf" />
+    <None Include="Docx\SCJMapper_QGuide V2.x.pub" />
     <None Include="graphics\SB_LA_Helipad.dds">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -457,8 +460,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="AC_Examples.txt" />
-    <Content Include="Cassini_Logo_Icon.ico" />
+    <Content Include="SC\defaultProfile.xml" />
-    <Content Include="defaultProfile.xml" />
     <None Include="graphics\Folder.png" />
     <None Include="graphics\Home.png" />
     <None Include="graphics\Info.png" />

SCJMapper-V2.sln

@@ -1,10 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
+# Visual Studio 15
-VisualStudioVersion = 14.0.25420.1
+VisualStudioVersion = 15.0.28307.1062
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SCJMapper-V2", "SCJMapper-V2.csproj", "{B5F8B339-E02E-4F6D-BF62-D776F165910F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{6C767E48-A71E-4822-8B3F-2ED741F06582}"
+	ProjectSection(SolutionItems) = preProject
+		AC_Examples.txt = AC_Examples.txt
+		LICENSE = LICENSE
+		README.md = README.md
+		ReadMe.txt = ReadMe.txt
+		Docx\SCJMapper_QGuide V2.35beta.pdf = Docx\SCJMapper_QGuide V2.35beta.pdf
+		Docx\SCJMapper_QGuide V2.x.pub = Docx\SCJMapper_QGuide V2.x.pub
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,4 +35,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EFD3641A-B820-4214-9B5C-CAD3331C2247}
+	EndGlobalSection
 EndGlobal

graphics/layouts/gpad-jc-u3613m.json

@@ -1,34 +1,33 @@
 {
-  "MapName" : "7: GPad Elecom JC-U3613M (X-Input)",
+  "MapName" : "7: GPad Elecom JC-U3613M",
   "MapImage" : "gpad-jc-u3613m.jpg",
-  "InputDevices" :[
+  "InputDevices" : [
-  { 
+  {
-    "InputType": "G",
+    "InputType" : "G",
-    "DeviceName": "Elecom JC-U3613M",
+    "DeviceName" : "Elecom JC-U3613M",
-    "DeviceProdGuid": ["{028E045E-0000-0000-0000-504944564944}"],
+    "DeviceProdGuid" : ["{028E045E-0000-0000-0000-504944564944}"],
-    "Controls": [
+    "Controls" : [ 
-      { "Input":"x", "Type":  "Digital", "X":2726, "Y":1401, "Width":987, "Height":150, "Cmt":  "X"},
+      { "Input" : "x", "Type" : "Digital", "X" : 2725, "Y" : 1402, "Width" : 987, "Height" : 148, "Cmt" : "" },
-      { "Input":"a", "Type":  "Digital", "X":2726, "Y":1232, "Width":987, "Height":150, "Cmt":  "A"},
+      { "Input" : "a", "Type" : "Digital", "X" : 2725, "Y" : 1232, "Width" : 987, "Height" : 148, "Cmt" : "" },
-      { "Input":"b", "Type":  "Digital", "X":2726, "Y":1062, "Width":987, "Height":150, "Cmt":  "B"},
+      { "Input" : "b", "Type" : "Digital", "X" : 2725, "Y" : 1062, "Width" : 987, "Height" : 148, "Cmt" : "" },
-      { "Input":"y", "Type":  "Digital", "X":2726, "Y":892, "Width":987, "Height":150, "Cmt":  "Y"},
+      { "Input" : "y", "Type" : "Digital", "X" : 2725, "Y" : 892, "Width" : 987, "Height" : 149, "Cmt" : "" },
-      { "Input":"shoulderl", "Type":  "Digital", "X":564, "Y":383, "Width":987, "Height":204, "Cmt":  "Left bumper - shoulderl"},
+      { "Input" : "shoulderl", "Type" : "Digital", "X" : 564, "Y" : 383, "Width" : 987, "Height" : 203, "Cmt" : "" },
-      { "Input":"shoulderr", "Type":  "Digital", "X":2343, "Y":383, "Width":987, "Height":203, "Cmt":  "Right bumper - shoulderr"},
+      { "Input" : "shoulderr", "Type" : "Digital", "X" : 2342, "Y" : 382, "Width" : 987, "Height" : 203, "Cmt" : "" },
-      { "Input":"triggerl_btn", "Type":  "Digital", "X":829, "Y":145, "Width":987, "Height":202, "Cmt":  "Left trigger - triggerl_btn"},
+      { "Input" : "triggerl_btn", "Type" : "Digital", "X" : 829, "Y" : 144, "Width" : 986, "Height" : 203, "Cmt" : "" },
-      { "Input":"triggerr_btn", "Type":  "Digital", "X":2046, "Y":144, "Width":987, "Height":203, "Cmt":  "Right trigger - triggerr_btn"},
+      { "Input" : "triggerr_btn", "Type" : "Digital", "X" : 2044, "Y" : 144, "Width" : 987, "Height" : 203, "Cmt" : "" },
-      { "Input":"back", "Type":  "Digital", "X":343, "Y":729, "Width":987, "Height":95, "Cmt":  "Back"},
+      { "Input" : "back", "Type" : "Digital", "X" : 342, "Y" : 729, "Width" : 986, "Height" : 94, "Cmt" : "" },
-      { "Input":"start", "Type":  "Digital", "X":2584, "Y":716, "Width":987, "Height":95, "Cmt":  "Start"},
+      { "Input" : "start", "Type" : "Digital", "X" : 2583, "Y" : 716, "Width" : 987, "Height" : 94, "Cmt" : "" },
-      { "Input":"thumbl", "Type":  "Digital", "X":233, "Y":1224, "Width":986, "Height":159, "Cmt":  "Left stick button  thumbl"},
+      { "Input" : "thumbl", "Type" : "Digital", "X" : 232, "Y" : 1223, "Width" : 986, "Height" : 159, "Cmt" : "" },
-      { "Input":"thumbr", "Type":  "Digital", "X":2227, "Y":1891, "Width":1486, "Height":99, "Cmt":  "Right stick button - thumbr"},
+      { "Input" : "thumbr", "Type" : "Digital", "X" : 2226, "Y" : 1890, "Width" : 1486, "Height" : 100, "Cmt" : "" },
-      { "Input":"dpad_up", "Type":  "Digital", "X":300, "Y":1635, "Width":1478, "Height":101, "Cmt": "dpad_up"},
+      { "Input" : "dpad_up", "Type" : "Digital", "X" : 299, "Y" : 1634, "Width" : 1478, "Height" : 100, "Cmt" : "" },
-      { "Input":"dpad_right", "Type":  "Digital", "X":300, "Y":1741, "Width":1478, "Height":103, "Cmt": "dpad_right"},
+      { "Input" : "dpad_right", "Type" : "Digital", "X" : 299, "Y" : 1739, "Width" : 1478, "Height" : 103, "Cmt" : "" },
-      { "Input":"dpad_down", "Type": "Digital", "X":300, "Y":1847, "Width":1478, "Height":99, "Cmt": "dpad_down"},
+      { "Input" : "dpad_down", "Type" : "Digital", "X" : 299, "Y" : 1847, "Width" : 1478, "Height" : 98, "Cmt" : "" },
-      { "Input":"dpad_left", "Type": "Digital", "X":300, "Y":1951, "Width":1478, "Height":103, "Cmt": "dpad_left"},
+      { "Input" : "dpad_left", "Type" : "Digital", "X" : 299, "Y" : 1950, "Width" : 1478, "Height" : 102, "Cmt" : "" },
-      { "Input":"thumbry", "Type": "Analogue", "X":2227, "Y":1679, "Width":1486, "Height":103, "Cmt": "thumbry"},
+      { "Input" : "thumblx", "Type" : "Analogue", "X" : 232, "Y" : 1066, "Width" : 986, "Height" : 153, "Cmt" : "" },
-      { "Input":"thumbrx", "Type": "Analogue", "X":2227, "Y":1786, "Width":1486, "Height":100, "Cmt": "thumbrx"},
+      { "Input" : "thumbly", "Type" : "Analogue", "X" : 232, "Y" : 907, "Width" : 986, "Height" : 154, "Cmt" : "" },
-      { "Input":"thumbly", "Type": "Analogue", "X":233, "Y":907, "Width":986, "Height":155, "Cmt": "thumbly"},
+      { "Input" : "thumbrx", "Type" : "Analogue", "X" : 2226, "Y" : 1785, "Width" : 1486, "Height" : 100, "Cmt" : "" },
-      { "Input":"thumblx", "Type": "Analogue", "X":233, "Y":1067, "Width":986, "Height":152, "Cmt": "thumblx"}
+      { "Input" : "thumbry", "Type" : "Analogue", "X" : 2226, "Y" : 1678, "Width" : 1486, "Height" : 103, "Cmt" : "" }
     ]
   }
   ]
 }
-

graphics/layouts/gpad-logi-f310.json

@@ -0,0 +1,33 @@
+{
+  "MapName": "7: GPad Logitech F310",
+  "MapImage": "gpad-logi-f310.jpg",
+  "InputDevices": [
+  {
+    "InputType": "G",
+    "DeviceName": "Logitech F310",
+    "DeviceProdGuid": ["{028E045E-0000-0000-0000-504944564944}"],
+    "Controls": [ 
+      { "Input": "x", "Type": "Digital", "X": 2754, "Y": 1492, "Width": 986, "Height": 149, "Cmt": "" },
+      { "Input": "a", "Type": "Digital", "X": 2754, "Y": 1322, "Width": 986, "Height": 149, "Cmt": "" },
+      { "Input": "b", "Type": "Digital", "X": 2754, "Y": 1152, "Width": 986, "Height": 149, "Cmt": "" },
+      { "Input": "y", "Type": "Digital", "X": 2754, "Y": 982, "Width": 986, "Height": 149, "Cmt": "" },
+      { "Input": "shoulderl", "Type": "Digital", "X": 592, "Y": 474, "Width": 987, "Height": 203, "Cmt": "" },
+      { "Input": "shoulderr", "Type": "Digital", "X": 2370, "Y": 473, "Width": 987, "Height": 202, "Cmt": "" },
+      { "Input": "triggerl_btn", "Type": "Digital", "X": 891, "Y": 234, "Width": 987, "Height": 203, "Cmt": "" },
+      { "Input": "triggerr_btn", "Type": "Digital", "X": 2107, "Y": 234, "Width": 986, "Height": 203, "Cmt": "" },
+      { "Input": "back", "Type": "Digital", "X": 370, "Y": 819, "Width": 987, "Height": 95, "Cmt": "" },
+      { "Input": "start", "Type": "Digital", "X": 2611, "Y": 806, "Width": 987, "Height": 95, "Cmt": "" },
+      { "Input": "thumbl", "Type": "Digital", "X": 600, "Y": 1923, "Width": 986, "Height": 159, "Cmt": "" },
+      { "Input": "thumbr", "Type": "Digital", "X": 2257, "Y": 1956, "Width": 1486, "Height": 99, "Cmt": "" },
+      { "Input": "dpad_up", "Type": "Digital", "X": 258, "Y": 1029, "Width": 989, "Height": 100, "Cmt": "" },
+      { "Input": "dpad_right", "Type": "Digital", "X": 258, "Y": 1135, "Width": 989, "Height": 101, "Cmt": "" },
+      { "Input": "dpad_down", "Type": "Digital", "X": 258, "Y": 1242, "Width": 989, "Height": 98, "Cmt": "" },
+      { "Input": "dpad_left", "Type": "Digital", "X": 258, "Y": 1346, "Width": 989, "Height": 100, "Cmt": "" },
+      { "Input": "thumblx", "Type": "Analogue", "X": 600, "Y": 1766, "Width": 986, "Height": 153, "Cmt": "" },
+      { "Input": "thumbly", "Type": "Analogue", "X": 600, "Y": 1607, "Width": 986, "Height": 154, "Cmt": "" },
+      { "Input": "thumbrx", "Type": "Analogue", "X": 2257, "Y": 1851, "Width": 1486, "Height": 100, "Cmt": "" },
+      { "Input": "thumbry", "Type": "Analogue", "X": 2257, "Y": 1743, "Width": 1486, "Height": 103, "Cmt": "" }
+    ]
+  }
+  ]
+}

graphics/layouts/gpad-logi-f710.json

@@ -1,34 +1,33 @@
 {
-  "MapName" : "7: GPad Logitech F710",
+  "MapName": "7: GPad Logitech F710",
-  "MapImage" : "gpad-logi-f710.jpg",
+  "MapImage": "gpad-logi-f710.jpg",
-  "InputDevices" :[
+  "InputDevices": [
-  { 
+  {
     "InputType": "G",
     "DeviceName": "Logitech F710",
     "DeviceProdGuid": ["{028E045E-0000-0000-0000-504944564944}"],
-    "Controls": [
+    "Controls": [ 
-      { "Input":"x", "Type":  "Digital", "X":2754, "Y":1493, "Width":987, "Height":150, "Cmt":  "X"},
+      { "Input": "x", "Type": "Digital", "X": 2754, "Y": 1492, "Width": 986, "Height": 149, "Cmt": "" },
-      { "Input":"a", "Type":  "Digital", "X":2755, "Y":1323, "Width":987, "Height":150, "Cmt":  "A"},
+      { "Input": "a", "Type": "Digital", "X": 2754, "Y": 1322, "Width": 986, "Height": 149, "Cmt": "" },
-      { "Input":"b", "Type":  "Digital", "X":2755, "Y":1153, "Width":987, "Height":150, "Cmt":  "B"},
+      { "Input": "b", "Type": "Digital", "X": 2754, "Y": 1152, "Width": 986, "Height": 149, "Cmt": "" },
-      { "Input":"y", "Type":  "Digital", "X":2755, "Y":984, "Width":987, "Height":150, "Cmt":  "Y"},
+      { "Input": "y", "Type": "Digital", "X": 2754, "Y": 982, "Width": 986, "Height": 149, "Cmt": "" },
-      { "Input":"shoulderl", "Type":  "Digital", "X":594, "Y":475, "Width":987, "Height":204, "Cmt":  "Left bumper - shoulderl"},
+      { "Input": "shoulderl", "Type": "Digital", "X": 592, "Y": 474, "Width": 987, "Height": 203, "Cmt": "" },
-      { "Input":"shoulderr", "Type":  "Digital", "X":2370, "Y":473, "Width":987, "Height":203, "Cmt":  "Right bumper - shoulderr"},
+      { "Input": "shoulderr", "Type": "Digital", "X": 2370, "Y": 473, "Width": 987, "Height": 202, "Cmt": "" },
-      { "Input":"triggerl_btn", "Type":  "Digital", "X":858, "Y":237, "Width":987, "Height":202, "Cmt":  "Left trigger - triggerl_btn"},
+      { "Input": "triggerl_btn", "Type": "Digital", "X": 857, "Y": 234, "Width": 987, "Height": 203, "Cmt": "" },
-      { "Input":"triggerr_btn", "Type":  "Digital", "X":2074, "Y":235, "Width":987, "Height":203, "Cmt":  "Right trigger - triggerr_btn"},
+      { "Input": "triggerr_btn", "Type": "Digital", "X": 2073, "Y": 234, "Width": 986, "Height": 203, "Cmt": "" },
-      { "Input":"back", "Type":  "Digital", "X":370, "Y":821, "Width":987, "Height":95, "Cmt":  "Back"},
+      { "Input": "back", "Type": "Digital", "X": 370, "Y": 819, "Width": 987, "Height": 95, "Cmt": "" },
-      { "Input":"start", "Type":  "Digital", "X":2612, "Y":806, "Width":987, "Height":95, "Cmt":  "Start"},
+      { "Input": "start", "Type": "Digital", "X": 2611, "Y": 806, "Width": 987, "Height": 95, "Cmt": "" },
-      { "Input":"thumbl", "Type":  "Digital", "X":264, "Y":1290, "Width":986, "Height":159, "Cmt":  "Left stick button  thumbl"},
+      { "Input": "thumbl", "Type": "Digital", "X": 600, "Y": 1923, "Width": 986, "Height": 159, "Cmt": "" },
-      { "Input":"thumbr", "Type":  "Digital", "X":2258, "Y":1956, "Width":1486, "Height":99, "Cmt":  "Right stick button - thumbr"},
+      { "Input": "thumbr", "Type": "Digital", "X": 2257, "Y": 1956, "Width": 1486, "Height": 99, "Cmt": "" },
-      { "Input":"dpad_up", "Type":  "Digital", "X":331, "Y":1700, "Width":1478, "Height":101, "Cmt": "dpad_up"},
+      { "Input": "dpad_up", "Type": "Digital", "X": 258, "Y": 1029, "Width": 989, "Height": 100, "Cmt": "" },
-      { "Input":"dpad_right", "Type":  "Digital", "X":331, "Y":1806, "Width":1478, "Height":103, "Cmt": "dpad_right"},
+      { "Input": "dpad_right", "Type": "Digital", "X": 258, "Y": 1135, "Width": 989, "Height": 101, "Cmt": "" },
-      { "Input":"dpad_down", "Type": "Digital", "X":331, "Y":1914, "Width":1478, "Height":99, "Cmt": "dpad_down"},
+      { "Input": "dpad_down", "Type": "Digital", "X": 258, "Y": 1242, "Width": 989, "Height": 98, "Cmt": "" },
-      { "Input":"dpad_left", "Type": "Digital", "X":331, "Y":2016, "Width":1478, "Height":103, "Cmt": "dpad_left"},
+      { "Input": "dpad_left", "Type": "Digital", "X": 258, "Y": 1346, "Width": 989, "Height": 100, "Cmt": "" },
-      { "Input":"thumbry", "Type": "Analogue", "X":2258, "Y":1744, "Width":1486, "Height":103, "Cmt": "thumbry"},
+      { "Input": "thumblx", "Type": "Analogue", "X": 600, "Y": 1766, "Width": 986, "Height": 153, "Cmt": "" },
-      { "Input":"thumbrx", "Type": "Analogue", "X":2258, "Y":1852, "Width":1486, "Height":100, "Cmt": "thumbrx"},
+      { "Input": "thumbly", "Type": "Analogue", "X": 600, "Y": 1607, "Width": 986, "Height": 154, "Cmt": "" },
-      { "Input":"thumbly", "Type": "Analogue", "X":264, "Y":974, "Width":986, "Height":155, "Cmt": "thumbly"},
+      { "Input": "thumbrx", "Type": "Analogue", "X": 2257, "Y": 1851, "Width": 1486, "Height": 100, "Cmt": "" },
-      { "Input":"thumblx", "Type": "Analogue", "X":264, "Y":1132, "Width":986, "Height":152, "Cmt": "thumblx"}
+      { "Input": "thumbry", "Type": "Analogue", "X": 2257, "Y": 1743, "Width": 1486, "Height": 103, "Cmt": "" }
     ]
   }
   ]
 }
-

graphics/layouts/gpad-razer-rajiu_ultimate.json

@@ -0,0 +1,33 @@
+{
+  "MapName": "7: GPad Razer Rajiu Ultimate",
+  "MapImage": "gpad-razer-rajiu_ultimate.jpg",
+  "InputDevices": [
+  {
+    "InputType": "G",
+    "DeviceName": "Razer Rajiu Ultimate",
+    "DeviceProdGuid": ["{028E045E-0000-0000-0000-504944564944}"],
+    "Controls": [ 
+      { "Input": "x", "Type": "Digital", "X": 2754, "Y": 1492, "Width": 986, "Height": 149, "Cmt": "" },
+      { "Input": "a", "Type": "Digital", "X": 2754, "Y": 1322, "Width": 986, "Height": 149, "Cmt": "" },
+      { "Input": "b", "Type": "Digital", "X": 2754, "Y": 1152, "Width": 986, "Height": 149, "Cmt": "" },
+      { "Input": "y", "Type": "Digital", "X": 2754, "Y": 982, "Width": 986, "Height": 149, "Cmt": "" },
+      { "Input": "shoulderl", "Type": "Digital", "X": 592, "Y": 474, "Width": 987, "Height": 203, "Cmt": "" },
+      { "Input": "shoulderr", "Type": "Digital", "X": 2370, "Y": 473, "Width": 987, "Height": 202, "Cmt": "" },
+      { "Input": "triggerl_btn", "Type": "Digital", "X": 857, "Y": 234, "Width": 987, "Height": 203, "Cmt": "" },
+      { "Input": "triggerr_btn", "Type": "Digital", "X": 2073, "Y": 234, "Width": 986, "Height": 203, "Cmt": "" },
+      { "Input": "back", "Type": "Digital", "X": 370, "Y": 819, "Width": 987, "Height": 95, "Cmt": "" },
+      { "Input": "start", "Type": "Digital", "X": 2611, "Y": 806, "Width": 987, "Height": 95, "Cmt": "" },
+      { "Input": "thumbl", "Type": "Digital", "X": 600, "Y": 1923, "Width": 986, "Height": 159, "Cmt": "" },
+      { "Input": "thumbr", "Type": "Digital", "X": 2257, "Y": 1956, "Width": 1486, "Height": 99, "Cmt": "" },
+      { "Input": "dpad_up", "Type": "Digital", "X": 258, "Y": 1029, "Width": 989, "Height": 100, "Cmt": "" },
+      { "Input": "dpad_right", "Type": "Digital", "X": 258, "Y": 1135, "Width": 989, "Height": 101, "Cmt": "" },
+      { "Input": "dpad_down", "Type": "Digital", "X": 258, "Y": 1242, "Width": 989, "Height": 98, "Cmt": "" },
+      { "Input": "dpad_left", "Type": "Digital", "X": 258, "Y": 1346, "Width": 989, "Height": 100, "Cmt": "" },
+      { "Input": "thumblx", "Type": "Analogue", "X": 600, "Y": 1766, "Width": 986, "Height": 153, "Cmt": "" },
+      { "Input": "thumbly", "Type": "Analogue", "X": 600, "Y": 1607, "Width": 986, "Height": 154, "Cmt": "" },
+      { "Input": "thumbrx", "Type": "Analogue", "X": 2257, "Y": 1851, "Width": 1486, "Height": 100, "Cmt": "" },
+      { "Input": "thumbry", "Type": "Analogue", "X": 2257, "Y": 1743, "Width": 1486, "Height": 103, "Cmt": "" }
+    ]
+  }
+  ]
+}