From 62a28ac8f97a7749496d5c22d1a8f1f5eb928aec Mon Sep 17 00:00:00 2001
From: Sean Monahan <sean@seanmonahan.org>
Date: Tue, 22 Oct 2013 19:22:30 -0700
Subject: [PATCH] Adds PS3 mappings for Mac.

Also fixes typo on Windows PS3 mappings.
---
 mappings/mac/playstation-3.json               | 45 +++++++++++++++++++
 .../dual-shock-3-motioninjoy-xinput.json      |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 mappings/mac/playstation-3.json

diff --git a/mappings/mac/playstation-3.json b/mappings/mac/playstation-3.json
new file mode 100644
index 0000000..f571a61
--- /dev/null
+++ b/mappings/mac/playstation-3.json
@@ -0,0 +1,45 @@
+{
+    "desc": "SFML Button mappings for the PS3 controller on Mac.",
+
+    "contributor": {
+        "name": "Sean Monahan",
+        "email": "hello@seanmonahan.org"
+    },
+
+    "buttons": {
+
+        "Cross": 14,
+        "Circle": 13,
+        "Square": 15,
+        "Triangle": 12,
+        "L1": 10,
+        "R1": 11,
+        "Select": 0,
+        "Start": 3,
+        "L2": 8,
+        "R2": 9,
+        "L3": 1,
+        "R3": 2,
+        "PS": 16,
+        "D-Pad Up": 4,
+        "D-Pad Right": 5,
+        "D-Pad Down": 6,
+        "D-Pad Left": 7
+
+    },
+
+    "axes": {
+
+        "_note_format": "X axes are described in the following format: 'Axis Name: min-value,max-value.",
+        "_note_sticks": "Using the format described on the horizontal axis, min-value corresponds with left, max-value with right. On the vertical axis, min-value with up, max-value with down.",
+        "_note_triggers": "Using the format described with triggers, min-value corresponds with the trigger being fully released (not pressed at all) and max-value with the trigger fully pressed.",
+
+        "Left Stick Horizontal": "X-axis: -100,100",
+        "Left Stick Vertical": "Y-axis: -100,100",
+        "Right Stick Horizontal": "Z-axis: -100,100",
+        "Right Stick Vertical": "R-axis: -100,100",
+
+    }
+
+}
+
diff --git a/mappings/windows/dual-shock-3-motioninjoy-xinput.json b/mappings/windows/dual-shock-3-motioninjoy-xinput.json
index 4ae55aa..100ba1b 100644
--- a/mappings/windows/dual-shock-3-motioninjoy-xinput.json
+++ b/mappings/windows/dual-shock-3-motioninjoy-xinput.json
@@ -13,7 +13,7 @@
         "Square": 2,
         "Triangle": 3,
         "L1": 4,
-        "R2": 5,
+        "R1": 5,
         "Select": 6,
         "Start": 7,
         "L3": 8,