1
0
Fork 0

rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as well

This commit is contained in:
Jimmy Chan 2017-02-06 10:03:48 -08:00
parent 048ef311dc
commit 56d2198b3d
4 changed files with 10 additions and 6 deletions

View file

@ -16,8 +16,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define USE_I2C #define USE_I2C
#define I2C_MASTER_LEFT #define MASTER_LEFT
// #define I2C_MASTER_RIGHT // #define _MASTER_RIGHT
// #define EE_HANDS
#ifdef SUBPROJECT_rev1 #ifdef SUBPROJECT_rev1
#include "../../rev1/config.h" #include "../../rev1/config.h"

View file

@ -18,6 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_SERIAL #define USE_SERIAL
#define MASTER_LEFT
// #define _MASTER_RIGHT
// #define EE_HANDS // #define EE_HANDS

View file

@ -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. 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 ### 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 ### 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` 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 ### Setting EE_hands to use either hands as master

View file

@ -21,7 +21,8 @@ static void setup_handedness(void) {
#ifdef EE_HANDS #ifdef EE_HANDS
isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS); isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
#else #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(); isLeftHand = !has_usb();
#else #else
isLeftHand = has_usb(); isLeftHand = has_usb();