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 LAYOUT_kc macros from edvorakjp keymaps #12217

Merged
merged 12 commits into from
Apr 10, 2021
Merged
Prev Previous commit
Next Next commit
Replace is_master with is_keyboard_left()
  • Loading branch information
epaew committed Mar 26, 2021
commit 6b1d0587acaedfe8151bb9a15f0f6ee7964ac3ec
6 changes: 1 addition & 5 deletions keyboards/crkbd/keymaps/edvorakjp/oled.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ void iota_gfx_task_user(void) {
struct CharacterMatrix matrix;

matrix_clear(&matrix);
#ifdef MASTER_RIGHT
if (!is_master) {
#else
if (is_master) {
#endif // MASTER_RIGHT
if (is_keyboard_left()) {
matrix_write(&matrix, read_mode_icon(!get_enable_kc_lang()));
matrix_write(&matrix, " ");
matrix_write(&matrix, read_layer_state());
Expand Down
1 change: 0 additions & 1 deletion keyboards/crkbd/keymaps/edvorakjp/oled.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "ssd1306.h"
#include "edvorakjp.h"

extern uint8_t is_master;
extern bool japanese_mode;

// method prototypes defined in crkbd/lib
Expand Down
2 changes: 1 addition & 1 deletion keyboards/helix/rev2/keymaps/edvorakjp/oled.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void iota_gfx_task_user(void) {
#endif

matrix_clear(&matrix);
if (is_master) {
if (is_keyboard_left()) {
render_status(&matrix);
} else {
render_logo(&matrix);
Expand Down
1 change: 0 additions & 1 deletion keyboards/helix/rev2/keymaps/edvorakjp/oled.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "ssd1306.h"
#include "edvorakjp.h"

extern uint8_t is_master;
extern bool japanese_mode;

void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source);
Expand Down