summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Chan <jchan@linkedin.com>2017-02-06 19:03:48 +0100
committerJimmy Chan <jchan@linkedin.com>2017-02-07 21:36:52 +0100
commit56d2198b3d85f112317b4b0d09d5cf6a5c915db8 (patch)
tree4793a10faaa502340a6dc9322f07856f451cf9de
parent048ef311dc5a92d736c8b0778334bfa82f8f42a8 (diff)
downloadqmk_firmware-56d2198b3d85f112317b4b0d09d5cf6a5c915db8.tar.gz
qmk_firmware-56d2198b3d85f112317b4b0d09d5cf6a5c915db8.tar.xz
rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as well
-rw-r--r--keyboards/lets_split/keymaps/i2c/config.h7
-rw-r--r--keyboards/lets_split/keymaps/serial/config.h2
-rw-r--r--keyboards/lets_split/readme.md4
-rw-r--r--keyboards/lets_split/split_util.c3
4 files changed, 10 insertions, 6 deletions
diff --git a/keyboards/lets_split/keymaps/i2c/config.h b/keyboards/lets_split/keymaps/i2c/config.h
index 332c990fc..013542731 100644
--- a/keyboards/lets_split/keymaps/i2c/config.h
+++ b/keyboards/lets_split/keymaps/i2c/config.h
@@ -16,8 +16,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define USE_I2C
-#define I2C_MASTER_LEFT
-// #define I2C_MASTER_RIGHT
+#define MASTER_LEFT
+// #define _MASTER_RIGHT
+// #define EE_HANDS
#ifdef SUBPROJECT_rev1
#include "../../rev1/config.h"
@@ -27,4 +28,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#ifdef SUBPROJECT_rev2fliphalf
#include "../../rev2fliphalf/config.h"
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/lets_split/keymaps/serial/config.h b/keyboards/lets_split/keymaps/serial/config.h
index 753f422dd..ba271d1ac 100644
--- a/keyboards/lets_split/keymaps/serial/config.h
+++ b/keyboards/lets_split/keymaps/serial/config.h
@@ -18,6 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_SERIAL
+#define MASTER_LEFT
+// #define _MASTER_RIGHT
// #define EE_HANDS
diff --git a/keyboards/lets_split/readme.md b/keyboards/lets_split/readme.md
index 0e903065e..ecce3f415 100644
--- a/keyboards/lets_split/readme.md
+++ b/keyboards/lets_split/readme.md
@@ -123,12 +123,12 @@ The EEPROM approach requires additional setup (flashing the eeeprom) but allows
The USB cable approach is easier to setup and if you just want the usb cable on the left board, you do not need to do anything extra.
### Setting the left hand as master
-If you always plug the usb cable into the left board, nothing extra is needed as this is the default. Comment out `EE_HANDS` and comment out `I2C_MASTER_RIGHT` if for some reason it was set.
+If you always plug the usb cable into the left board, nothing extra is needed as this is the default. Comment out `EE_HANDS` and comment out `I2C_MASTER_RIGHT` or `MASTER_RIGHT` if for some reason it was set.
### Setting the right hand as master
If you always plug the usb cable into the right board, add an extra flag to your `config.h`
```
- #define I2C_MASTER_RIGHT
+ #define MASTER_RIGHT
```
### Setting EE_hands to use either hands as master
diff --git a/keyboards/lets_split/split_util.c b/keyboards/lets_split/split_util.c
index 461921798..226dc1881 100644
--- a/keyboards/lets_split/split_util.c
+++ b/keyboards/lets_split/split_util.c
@@ -21,7 +21,8 @@ static void setup_handedness(void) {
#ifdef EE_HANDS
isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
#else
- #ifdef I2C_MASTER_RIGHT
+ // I2C_MASTER_RIGHT is deprecated use MASTER_RIGHT instead since this works for both serial and i2c
+ #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT)
isLeftHand = !has_usb();
#else
isLeftHand = has_usb();