tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove legacy handling for ErgoDox Infinity handedness (#14919)

master
Joel Challis 2021-10-23 05:17:07 +01:00 committed by GitHub
parent 3b04425f1a
commit b9c9f3759a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build_keyboard.mk
View File

@ -32,20 +32,6 @@ endif
# this an empty or blank macro! # this an empty or blank macro!
KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET) KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
# For split boards we need to set a master half.
MASTER ?= left
ifdef master
MASTER = $(master)
endif
ifeq ($(MASTER),right)
OPT_DEFS += -DMASTER_IS_ON_RIGHT
else
ifneq ($(MASTER),left)
$(error MASTER does not have a valid value(left/right))
endif
endif
ifdef SKIP_VERSION ifdef SKIP_VERSION
OPT_DEFS += -DSKIP_VERSION OPT_DEFS += -DSKIP_VERSION
endif endif

24
keyboards/ergodox_infinity/readme.md
View File

@ -13,18 +13,16 @@ for the left and right halves seperately. To flash them:
- Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util` - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util`
- Build right hand firmware with `make ergodox_infinity:keymapname MASTER=right`
- Plug in the right hand keyboard only. - Plug in the right hand keyboard only.
- Press the program button (back of keyboard, above thumb pad). - Press the program button (back of keyboard, above thumb pad).
- Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util MASTER=right` - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util`
More information on the Infinity firmware is available in the [TMK/chibios for More information on the Infinity firmware is available in the [TMK/chibios for
Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md) Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md)
## Infinity Master/Two Halves ## Infinity Two Halves
The Infinity is two completely independent keyboards, that can connect together. The Infinity is two completely independent keyboards, that can connect together.
You have a few options in how you flash the firmware: You have a few options in how you flash the firmware:
@ -32,21 +30,10 @@ You have a few options in how you flash the firmware:
- Add `#define EE_HANDS` to your config.h, initialize the EEPROM values (see below), - Add `#define EE_HANDS` to your config.h, initialize the EEPROM values (see below),
and then flash the same firmware to both halves. and then flash the same firmware to both halves.
- Flash the left half, rebuild the firmware with "MASTER=right" and then flash - Flash with the instructions above, which assume the left hand is connected to USB.
the right half. This allows you to plug in either half directly to the
computer and is what the above instructions do.
- Flash the left half, then flash the same firmware on the right. This only
works when the left half is plugged directly to the computer and the keymap
is mirrored. It saves the small extra step of rebuilding with
"MASTER=right".
- The same as the previous one but with "MASTER=right" when you build the
firmware, then flash the same firmware to both halves. You just have to
directly connect the right half to the computer.
- For minor changes such as changing only the keymap without having updated - For minor changes such as changing only the keymap without having updated
any part of the firmware code itself, you can program only the MASTER half, any part of the firmware code itself, you can program only the half connected to USB,
but it is safest to program both halves. but it is safest to program both halves.
### EE_HANDS initialization ### EE_HANDS initialization
@ -74,7 +61,6 @@ They only need to be done once, unless you reset the EEPROM later.
- Add `#define EE_HANDS` to the config.h file of your keymap, and build your firmware using - Add `#define EE_HANDS` to the config.h file of your keymap, and build your firmware using
`make ergodox_infinity:keymapname`. `make ergodox_infinity:keymapname`.
- After this, you can flash both halves with the same firmware, _without_ having to rebuild with - After this, you can flash both halves with the same firmware, _without_ risking a mirrored keyboard when connected the wrong way.
"MASTER=right" or risking a mirrored keyboard when connected the wrong way.
If you reset your EEPROM later, you'll have to follow these steps again, though. If you reset your EEPROM later, you'll have to follow these steps again, though.