Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove legacy handling for ErgoDox Infinity handedness #14919

Merged
merged 1 commit into from
Oct 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions build_keyboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,6 @@ endif
# this an empty or blank macro!
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
OPT_DEFS += -DSKIP_VERSION
endif
Expand Down
24 changes: 5 additions & 19 deletions keyboards/ergodox_infinity/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,27 @@ for the left and right halves seperately. To flash them:

- 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.

- 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
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.
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),
and then flash the same firmware to both halves.

- Flash the left half, rebuild the firmware with "MASTER=right" and then flash
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.
- Flash with the instructions above, which assume the left hand is connected to USB.

- 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.

### EE_HANDS initialization
Expand Down Expand Up @@ -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
`make ergodox_infinity:keymapname`.

- After this, you can flash both halves with the same firmware, _without_ having to rebuild with
"MASTER=right" or risking a mirrored keyboard when connected the wrong way.
- After this, you can flash both halves with the same firmware, _without_ risking a mirrored keyboard when connected the wrong way.
If you reset your EEPROM later, you'll have to follow these steps again, though.