wip

2019-03-17 01:56:27 -07:00 · 2019-03-17 01:56:27 -07:00 · 2019-03-17 01:56:27 -07:00 · 2019-03-17 01:56:27 -07:00 · 2019-03-17 01:56:26 -07:00 · 2019-03-17 01:56:26 -07:00
40 changed files with 903 additions and 761 deletions
@@ -44,9 +44,7 @@ Fedora / Red Hat example:
    
 Arch / Manjaro example:

-    pacman -S base-devel gcc unzip wget zip avr-gcc avr-binutils avr-libc dfu-util arm-none-eabi-gcc arm-none-eabi-binutils arm-none-eabi-newlib git
-
-(the `dfu-programmer` package is availble on AUR only so you should download from there or use an AUR helper)
+    pacman -S base-devel gcc unzip wget zip avr-gcc avr-binutils avr-libc dfu-util arm-none-eabi-gcc arm-none-eabi-binutils arm-none-eabi-newlib git dfu-programmer dfu-util

 ## Nix

@@ -65,11 +65,13 @@ uint8_t i2c_start(uint8_t address)
  return 0;
 }

-uint8_t i2c_transmit(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout)
+int8_t i2c_transmit(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout)
 {
+  //xprintf("i2c_transmit(0x%x, 0x%x, %d, 0x%x) address:0x%x\n", address, data, length, timeout, address >> 1);
  i2c_address = address;
  i2cStart(&I2C_DRIVER, &i2cconfig);
-  return i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, 0, 0, MS2ST(timeout));
+  int8_t result = i2cMasterTransmitTimeout(&I2C_DRIVER, i2c_address, data, length, 0, 0, MS2ST(timeout));
+  return result;
 }

 uint8_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout)
@@ -42,7 +42,7 @@

 void i2c_init(void);
 uint8_t i2c_start(uint8_t address);
-uint8_t i2c_transmit(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout);
+int8_t i2c_transmit(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout);
 uint8_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout);
 uint8_t i2c_transmit_receive(uint8_t address, uint8_t * tx_body, uint16_t tx_length, uint8_t * rx_body, uint16_t rx_length);
 uint8_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout);
@@ -0,0 +1,227 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2019 Clueboard
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef __AVR__
+#include <avr/interrupt.h>
+#include <avr/io.h>
+#include <util/delay.h>
+#else
+#include "wait.h"
+#endif
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include "is31fl3235a.h"
+#include "i2c_master.h"
+#include "progmem.h"
+#include "print.h"
+
+
+#define ISSI_REG_CONFIG  0x00  // FIXME: Not on 3235?
+#define ISSI_REG_CONFIG_PICTUREMODE 0x00  // FIXME: Not on 3235?
+
+//#define ISSI_REG_AUDIOSYNC 0x06  // FIXME: Not on 3235?
+
+#define ISSI_COMMANDREGISTER 0xFD  // FIXME: Not on 3235?
+#define ISSI_BANK_FUNCTIONREG 0x0B    // FIXME: Not on 3235?
+
+#ifndef ISSI_TIMEOUT
+  #define ISSI_TIMEOUT 100
+#endif
+
+#ifndef ISSI_PERSISTENCE
+  #define ISSI_PERSISTENCE 0
+#endif
+
+// Transfer buffer for TWITransmitData()
+uint8_t g_3235a_transfer_buffer[20];
+
+// These buffers match the IS31FL3235A PWM registers 0x05-0x20.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in IS31FL3235A_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+uint8_t g_rgb7seg_buffer[IS31FL3235A_COUNT][IS31FL3235A_LED_MAX];
+bool g_rgb7seg_buffer_update_required = false;
+
+/* There's probably a better way to init this... */
+#if IS31FL3235A_COUNT == 1
+    uint8_t g_3235a_control_registers[IS31FL3235A_COUNT][18] = {{0}};
+#elif IS31FL3235A_COUNT == 2
+    uint8_t g_3235a_control_registers[IS31FL3235A_COUNT][18] = {{0}, {0}};
+#elif IS31FL3235A_COUNT == 3
+    uint8_t g_3235a_control_registers[IS31FL3235A_COUNT][18] = {{0}, {0}, {0}};
+#elif IS31FL3235A_COUNT == 4
+    uint8_t g_3235a_control_registers[IS31FL3235A_COUNT][18] = {{0}, {0}, {0}, {0}};
+#endif
+bool g_rgb7seg_control_registers_update_required = false;
+
+void IS31FL3235A_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+    g_3235a_transfer_buffer[0] = reg;
+    g_3235a_transfer_buffer[1] = data;
+    xprintf("IS31FL3235A_write_register(0x%x, 0x%x, 0x%x); g_3235a_transfer_buffer:0x%x\n", addr, reg, data, g_3235a_transfer_buffer);
+
+    #if ISSI_PERSISTENCE > 0
+        for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+            if (i2c_transmit(addr, g_3235a_transfer_buffer, 2, ISSI_TIMEOUT) == 0) {
+              break;
+            }
+        }
+    #else
+        if (i2c_transmit(addr, g_3235a_transfer_buffer, 2, ISSI_TIMEOUT) == -1) {
+            // When we encounter a timeout ChibiOS says the bus must be reset as it's in an unknown state
+            xprintf("i2c transmit timeout, resetting i2c bus!\n");
+            i2c_stop(ISSI_TIMEOUT);
+            wait_ms(5);
+            i2c_start(ISSI_TIMEOUT);
+        }
+    #endif
+}
+
+void IS31FL3235A_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+    // assumes bank is already selected
+
+    // transmit PWM registers in 9 transfers of 16 bytes
+    // g_3235a_transfer_buffer[] is 20 bytes
+
+    // iterate over the pwm_buffer contents at 16 byte intervals
+    for (int i = 0; i < IS31FL3235A_LED_MAX; i += 16) {
+        // set the first register, e.g. 0x24, 0x34, 0x44, etc.
+        g_3235a_transfer_buffer[0] = 0x24 + i;
+        // copy the data from i to i+15
+        // device will auto-increment register for data after the first byte
+        // thus this sets registers 0x24-0x33, 0x34-0x43, etc. in one transfer
+        for (int j = 0; j < 16; j++) {
+            g_3235a_transfer_buffer[1 + j] = pwm_buffer[i + j];
+        }
+
+    #if ISSI_PERSISTENCE > 0
+      for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+        if (i2c_transmit(addr << 1, g_3235a_transfer_buffer, 17, ISSI_TIMEOUT) == 0)
+          break;
+      }
+    #else
+        if (i2c_transmit(addr << 1, g_3235a_transfer_buffer, 17, ISSI_TIMEOUT) == -1) {
+            // When we encounter a timeout ChibiOS says the bus must be reset as it's in an unknown state
+            xprintf("i2c transmit timeout, resetting i2c bus!\n");
+            i2c_stop(ISSI_TIMEOUT);
+            wait_ms(5);
+            i2c_start(ISSI_TIMEOUT);
+        }
+    #endif
+    }
+}
+
+void IS31FL3235A_init(uint8_t addr) {
+    wait_ms(2000); // Give QMK Toolbox time to attach
+    xprintf("IS31FS3235A_init(0x%x)\n", addr);
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, first enable software shutdown,
+    // then set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    // Reset settings to default
+    //IS31FL3235A_write_register(addr, ISSI_REG_RESET_REG, 0);
+
+    // this delay was copied from other drivers, might not be needed
+    wait_ms(10);
+
+    // This is how the Arduino code does init...
+    uint8_t i = 0;
+
+    for (i=0x2A; i<=0x45; i++) {
+        IS31FL3235A_write_register(addr, i, 0xFF);  // Turn off all LEDs
+    }
+
+    for (i=0x05; i<=0x20; i++) {
+        IS31FL3235A_write_register(addr, i, 0x00);  // Write all PWM set 0x00
+    }
+
+    IS31FL3235A_write_register(addr, 0x25, 0x00);   //update PWM&Control registers
+    IS31FL3235A_write_register(addr, 0x4B, 0x01);   //frequency setting 22KHz
+    IS31FL3235A_write_register(addr, 0x00, 0x01);   //normal operation
+
+    // This is how the Arduino code does LED turn on
+    IS31FL3235A_write_register(addr, 0x05, 0xFF);   // set PWM
+    IS31FL3235A_write_register(addr, 0x25, 0x00);   // update PWM&Control registers
+    IS31FL3235A_write_register(addr, 0x08, 0xFF);   // set PWM
+    IS31FL3235A_write_register(addr, 0x25, 0x00);   // update PWM&Control registers
+    IS31FL3235A_write_register(addr, 0x12, 0xFF);   // set PWM
+    IS31FL3235A_write_register(addr, 0x25, 0x00);   // update PWM&Control registers
+
+    // FIXME: This is for testing, turn on OUT1 at full brightness
+    //IS31FL3235A_write_register(addr, 0x2A, 0xFF);
+    //IS31FL3235A_write_register(addr, 0x05, 0x00);
+
+    // I think this finally turns it on?
+    //IS31FL3235A_write_register(addr, 0x25, 0x00);    //update PWM&Control registers
+    //IS31FL3235A_write_register(addr, 0x4B, 0x01);  //frequency setting 22KHz
+    //IS31FL3235A_write_register(addr, 0x00, 0x01);    //normal operation
+}
+
+void IS31FL3235A_set_value(int index, uint8_t value) {
+/*
+    if (index >= 0 && index < IS31FL3235A_LED_COUNT) {
+        is31_led led = g_is31_leds[index];
+
+        // Subtract 0x24 to get the second index of g_rgb7seg_buffer
+        g_rgb7seg_buffer[led.driver][led.v - 0x24] = value;
+        g_rgb7seg_buffer_update_required = true;
+    }
+*/
+}
+
+void IS31FL3235A_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3235A_LED_COUNT; i++) {
+        IS31FL3235A_set_value(i, value);
+    }
+}
+
+void IS31FL3235A_set_led_control_register(uint8_t index, bool value) {
+/*
+  is31_led led = g_is31_leds[index];
+
+  uint8_t control_register = (led.v - 0x24) / 8;
+  uint8_t bit_value = (led.v - 0x24) % 8;
+
+    if (value) {
+        g_3235a_control_registers[led.driver][control_register] |= (1 << bit_value);
+    } else {
+        g_3235a_control_registers[led.driver][control_register] &= ~(1 << bit_value);
+    }
+
+    g_rgb7seg_control_registers_update_required = true;
+*/
+}
+
+void IS31FL3235A_update_pwm_buffers(uint8_t addr, uint8_t index) {
+    //xprintf("IS31FS3235A_update_pwm_buffers(0x%x, %d)\n", addr, index);
+    if (g_rgb7seg_buffer_update_required) {
+        IS31FL3235A_write_pwm_buffer(addr, g_rgb7seg_buffer[index]);
+        g_rgb7seg_buffer_update_required = false;
+    }
+}
+
+void IS31FL3235A_update_led_control_registers(uint8_t addr, uint8_t index) {
+    if (g_rgb7seg_control_registers_update_required) {
+        for (int i=0; i<18; i++) {
+            IS31FL3235A_write_register(addr, i, g_3235a_control_registers[index][i]);
+        }
+    }
+}
@@ -0,0 +1,141 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2019 Clueboard
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef IS31FL3235A_DRIVER_H
+#define IS31FL3235A_DRIVER_H
+
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 0b0111111 AD <-> VCC
+// 0b0111110 AD <-> SDA
+// 0b0111101 AD <-> SCL
+// 0b0111100 AD <-> GND
+#ifndef IS31FL3235A_COUNT
+    #define IS31FL3235A_COUNT 1
+#endif
+#ifndef IS31FL3235A_DRIVER_ADDR_1
+    #define IS31FL3235A_DRIVER_ADDR_1 0b0111111
+    //#define IS31FL3235A_DRIVER_ADDR_1 0x7E
+#endif
+#ifndef IS31FL3235A_DRIVER_ADDR_2
+    #define IS31FL3235A_DRIVER_ADDR_2 0b0111110
+#endif
+#ifndef IS31FL3235A_DRIVER_ADDR_3
+    #define IS31FL3235A_DRIVER_ADDR_3 0b0111101
+#endif
+#ifndef IS31FL3235A_DRIVER_ADDR_4
+    #define IS31FL3235A_DRIVER_ADDR_4 0b0111100
+#endif
+
+// This is the max number of LEDs this driver supports per IC
+#define IS31FL3235A_LED_MAX 28
+#ifndef IS31FL3235A_LED_COUNT
+    #define IS31FL3235A_LED_COUNT IS31FL3235A_LED_MAX
+#endif
+
+// Registers we will need to write to
+#define ISSI_REG_SHUTDOWN 0x00        // Control the software shutdown state of the controller
+#define ISSI_REG_GLOBAL_CONTROL 0x4A  // Write 0 for normal operation, 1 to shutdown all LEDs
+#define ISSI_REG_OUTPUT_FREQ 0x4B     // Write 0 for 3kHz PWM, 1 for 22kHz
+#define ISSI_REG_RESET_REG 0x4F       // Write 0 to reset all registers to default value
+
+
+void IS31FL3235A_init(uint8_t addr);
+void IS31FL3235A_write_register(uint8_t addr, uint8_t reg, uint8_t data);
+void IS31FL3235A_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+
+void IS31FL3235A_set_value(int index, uint8_t value);
+void IS31FL3235A_set_value_all(uint8_t value);
+
+void IS31FL3235A_set_led_control_register(uint8_t index, bool value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void IS31FL3235A_update_pwm_buffers(uint8_t addr, uint8_t index);
+void IS31FL3235A_update_led_control_registers(uint8_t addr, uint8_t index);
+
+// The address for each LED in the is31fl3235a's Control Register
+enum control_register {
+    CR_OUT1 = 0x2A,
+    CR_OUT2,
+    CR_OUT3,
+    CR_OUT4,
+    CR_OUT5,
+    CR_OUT6,
+    CR_OUT7,
+    CR_OUT8,
+    CR_OUT9,
+    CR_OUT10,
+    CR_OUT11,
+    CR_OUT12,
+    CR_OUT13,
+    CR_OUT14,
+    CR_OUT15,
+    CR_OUT16,
+    CR_OUT17,
+    CR_OUT18,
+    CR_OUT19,
+    CR_OUT20,
+    CR_OUT21,
+    CR_OUT22,
+    CR_OUT23,
+    CR_OUT24,
+    CR_OUT25,
+    CR_OUT26,
+    CR_OUT27,
+    CR_OUT28
+};
+
+// The address for each LED in the is31fl3235a's PWM Register
+enum pwm_register {
+    OUT1 = 0x05,
+    OUT2,
+    OUT3,
+    OUT4,
+    OUT5,
+    OUT6,
+    OUT7,
+    OUT8,
+    OUT9,
+    OUT10,
+    OUT11,
+    OUT12,
+    OUT13,
+    OUT14,
+    OUT15,
+    OUT16,
+    OUT17,
+    OUT18,
+    OUT19,
+    OUT20,
+    OUT21,
+    OUT22,
+    OUT23,
+    OUT24,
+    OUT25,
+    OUT26,
+    OUT27,
+    OUT28
+};
+
+#endif // IS31FL3235A_DRIVER_H
@@ -22,10 +22,16 @@ void qwiic_init(void) {
  #ifdef QWIIC_MICRO_OLED_ENABLE
    micro_oled_init();
  #endif
+  #ifdef QWIIC_RGB7SEG_ENABLE
+    rgb7seg_init();
+  #endif
 }

 void qwiic_task(void) {
  #ifdef QWIIC_JOYSTIIC_ENABLE
    joystiic_task();
  #endif
+  #ifdef QWIIC_RGB7SEG_ENABLE
+    rgb7seg_task();
+  #endif
 }
@@ -23,6 +23,9 @@
 #ifdef QWIIC_MICRO_OLED_ENABLE
  #include "micro_oled.h"
 #endif
+#ifdef QWIIC_RGB7SEG_ENABLE
+  #include "rgb7seg.h"
+#endif

 void qwiic_init(void);
 void qwiic_task(void);
@@ -16,3 +16,9 @@ ifneq ($(filter MICRO_OLED, $(QWIIC_ENABLE)),)
  OPT_DEFS += -DQWIIC_MICRO_OLED_ENABLE
  SRC += micro_oled.c
 endif
+
+ifneq ($(filter RGB7SEG, $(QWIIC_ENABLE)),)
+  COMMON_VPATH += $(DRIVER_PATH)/issi
+  OPT_DEFS += -DQWIIC_RGB7SEG_ENABLE
+  SRC += rgb7seg.c is31fl3235a.c
+endif
@@ -0,0 +1,168 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2017 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2019 Clueboard
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "quantum.h"
+#include "rgb7seg.h"
+#include "is31fl3235a.h"
+#include "progmem.h"
+#include "config.h"
+#include "eeprom.h"
+#include <string.h>
+#include <math.h>
+
+#ifndef MAX
+    #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+#endif
+
+#ifndef MIN
+    #define MIN(a,b) ((a) < (b)? (a): (b))
+#endif
+
+// State variables
+uint32_t g7_tick = 0;      // Global tick at 20 Hz
+bool rgb7seg_enabled = 0;  // Whether or not the display is turned on
+
+/*
+const rgb7seg_led g_rgb7seg_leds[IS31FL3235A_COUNT * 8][4] = {
+/ * Refer to IS31 manual for these locations
+ *  driver
+ *  |   R LED address
+ *  |   |      G LED address
+ *  |   |      |      B LED address
+ *  |   |      |      | * /
+    {0, OUT17, OUT16, OUT15},  // A, top middle
+    {0, OUT22, OUT21, OUT20},  // B, top right
+    {0, OUT26, OUT27, OUT28},  // C, bottom right
+    {0, OUT1,  OUT2,  OUT3},   // D, bottom center
+    {0, OUT23, OUT24, OUT25},  // DP, dot
+    {0, OUT4,  OUT5,  OUT6},   // E, bottom left
+    {0, OUT9,  OUT7,  OUT8},   // F, top left
+    {0, OUT14, OUT13, OUT12},  // G, center
+    #if IS31FL3235A_COUNT > 1
+    {1, OUT17, OUT16, OUT15},  // A, top middle
+    {1, OUT22, OUT21, OUT20},  // B, top right
+    {1, OUT26, OUT27, OUT28},  // C, bottom right
+    {1, OUT1,  OUT2,  OUT3},   // D, bottom center
+    {1, OUT23, OUT24, OUT25},  // DP, dot
+    {1, OUT4,  OUT5,  OUT6},   // E, bottom left
+    {1, OUT9,  OUT7,  OUT8},   // F, top left
+    {1, OUT14, OUT13, OUT12},  // G, center
+    #endif
+    #if IS31FL3235A_COUNT > 2
+    {2, OUT17, OUT16, OUT15},  // A, top middle
+    {2, OUT17, OUT16, OUT15},  // A, top middle
+    {2, OUT22, OUT21, OUT20},  // B, top right
+    {2, OUT26, OUT27, OUT28},  // C, bottom right
+    {2, OUT1,  OUT2,  OUT3},   // D, bottom center
+    {2, OUT23, OUT24, OUT25},  // DP, dot
+    {2, OUT4,  OUT5,  OUT6},   // E, bottom left
+    {2, OUT9,  OUT7,  OUT8},   // F, top left
+    {2, OUT14, OUT13, OUT12},  // G, center
+    #endif
+    #if IS31FL3235A_COUNT > 3
+    {3, OUT17, OUT16, OUT15},  // A, top middle
+    {3, OUT22, OUT21, OUT20},  // B, top right
+    {3, OUT26, OUT27, OUT28},  // C, bottom right
+    {3, OUT1,  OUT2,  OUT3},   // D, bottom center
+    {3, OUT23, OUT24, OUT25},  // DP, dot
+    {3, OUT4,  OUT5,  OUT6},   // E, bottom left
+    {3, OUT9,  OUT7,  OUT8},   // F, top left
+    {3, OUT14, OUT13, OUT12},  // G, center
+    {3, OUT22, OUT21, OUT20},  // B, top right
+    #endif
+};
+*/
+
+// API
+void rgb7seg_flush(void) {
+    IS31FL3235A_update_pwm_buffers(IS31FL3235A_DRIVER_ADDR_1, 0);
+    #if IS31FL3235A_COUNT > 1
+        IS31FL3235A_update_pwm_buffers(IS31FL3235A_DRIVER_ADDR_2, 1);
+    #endif
+    #if IS31FL3235A_COUNT > 2
+        IS31FL3235A_update_pwm_buffers(IS31FL3235A_DRIVER_ADDR_3, 2);
+    #endif
+    #if IS31FL3235A_COUNT > 3
+        IS31FL3235A_update_pwm_buffers(IS31FL3235A_DRIVER_ADDR_4, 3);
+    #endif
+}
+
+void rgb7seg_set_index_value(int index, uint8_t value) {
+    IS31FL3235A_set_value(index, value);
+}
+
+void rgb7seg_set_index_value_all(uint8_t value) {
+    IS31FL3235A_set_value_all(value);
+}
+
+// All LEDs off
+void rgb7seg_off(void) {
+    rgb7seg_set_index_value_all(0);
+}
+
+void rgb7seg_task(void) {
+    g7_tick++;
+
+    // Do something here?
+
+    // Tell the LED driver to update its state
+    rgb7seg_flush();
+}
+
+void rgb7seg_init(void) {
+    IS31FL3235A_init(IS31FL3235A_DRIVER_ADDR_1);
+    #if IS31FL3235A_COUNT > 1
+        IS31FL3235A_init(IS31FL3235A_DRIVER_ADDR_2);
+    #endif
+    #if IS31FL3235A_COUNT > 2
+        IS31FL3235A_init(IS31FL3235A_DRIVER_ADDR_3);
+    #endif
+    #if IS31FL3235A_COUNT > 3
+        IS31FL3235A_init(IS31FL3235A_DRIVER_ADDR_4);
+    #endif
+
+    // Wait half a second for the driver to finish initializing
+    wait_ms(500);
+}
+
+uint32_t rgb7seg_get_tick(void) {
+    return g7_tick;
+}
+
+void rgb7seg_toggle(void) {
+    rgb7seg_enabled ^= 1;
+}
+
+void rgb7seg_enable(void) {
+    rgb7seg_enabled = 1;
+}
+
+void rgb7seg_disable(void) {
+    rgb7seg_enabled = 0;
+}
+
+void rgb7seg_increase_val(void) {
+    // FIXME: Implement
+}
+
+void rgb7seg_decrease_val(void) {
+    // FIXME: Implement
+}
@@ -0,0 +1,60 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2017 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2019 Clueboard
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LED_MATRIX_H
+#define LED_MATRIX_H
+
+#include "is31fl3235a.h"
+
+#ifndef BACKLIGHT_ENABLE
+  #error You must define BACKLIGHT_ENABLE with LED_MATRIX_ENABLE
+#endif
+
+
+void rgb7seg_task(void);
+void rgb7seg_init(void);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void rgb7seg_flush(void);
+
+uint32_t rgb7seg_get_tick(void);
+
+void rgb7seg_off(void);
+void rgb7seg_set_index_value(int index, uint8_t value);
+void rgb7seg_set_index_value_all(uint8_t value);
+
+void rgb7seg_toggle(void);
+void rgb7seg_enable(void);
+void rgb7seg_disable(void);
+void rgb7seg_increase_val(void);
+void rgb7seg_decrease_val(void);
+
+typedef struct rgb7seg_led {
+  uint8_t driver;
+  uint8_t r;
+  uint8_t g;
+  uint8_t b;
+} __attribute__((packed)) rgb7seg_led;
+
+extern const rgb7seg_led g_rgb7seg_leds[IS31FL3235A_COUNT * 8];
+
+#endif
@@ -47,7 +47,7 @@
 *
 */
 #define MATRIX_ROW_PINS { B0, B1, B2, A15, A10 }
-#define MATRIX_COL_PINS { A2, A3, A6, B14, B15, A8, A9, A7, B3, B4, C14, C15, C13, B5, B6 }
+#define MATRIX_COL_PINS { A2, A3, A6, B14, B15, A8, A9, A7, B3, B4, C15, C14, C13, B5, B6 }
 #define UNUSED_PINS { A0, A1, A9, B7, B8, B9, B10, B11, B12, B13 }
 #define DIODE_DIRECTION COL2ROW

@@ -37,6 +37,17 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE

+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+#define IS31FL3235A_COUNT 1
+//#define I2C_DRIVER I2CD1
+#define I2C1_BANK GPIOB
+#define I2C1_SCL 8
+#define I2C1_SDA 9
+
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
@@ -76,7 +76,7 @@
 * @brief   Enables the I2C subsystem.
 */
 #if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                 FALSE
+#define HAL_USE_I2C                 TRUE
 #endif

 /**
@@ -154,7 +154,7 @@
 /*
 * I2C driver system settings.
 */
-#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C1                  TRUE
 #define STM32_I2C_USE_I2C2                  FALSE
 #define STM32_I2C_BUSY_TIMEOUT              50
 #define STM32_I2C_I2C1_IRQ_PRIORITY         10
@@ -17,6 +17,8 @@ DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
 # Build Options
 #   comment out to disable the options.
 #
+QWIIC_ENABLE = RGB7SEG
+
 BACKLIGHT_ENABLE = yes
 BOOTMAGIC_ENABLE = no   # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
@@ -130,6 +130,15 @@
 */
 #define BACKLIGHT_LEVELS 10

+// For the rgb7seg
+#define IS31FL3235A_COUNT 1
+/*
+#define I2C_DRIVER I2CD2
+#define I2C1_BANK GPIOA
+#define I2C1_SCL 9
+#define I2C1_SDA 10
+*/
+
 // This is a 7-bit address, that gets left-shifted and bit 0
 // set to 0 for write, 1 for read (as per I2C protocol)
 // The address will vary depending on your wiring:
@@ -138,6 +147,9 @@
 // 0b1110101 AD <-> SCL
 // 0b1110110 AD <-> SDA
 #define LED_DRIVER_ADDR_1 0b1110100
+
+/* For the LED driver
+ */
 #define I2C1_BANK GPIOB
 #define I2C1_SCL 8
 #define I2C1_SDA 9
@@ -14,7 +14,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "gen1.h"
-#include "is31fl3731-simple.h"

 void matrix_init_kb(void) {
 }
@@ -23,6 +22,8 @@ void matrix_scan_kb(void) {
 }

 #ifdef LED_MATRIX_ENABLE
+#include "is31fl3731-simple.h"
+
 const is31_led g_is31_leds[LED_DRIVER_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
 *  driver
@@ -102,7 +103,6 @@ const is31_led g_is31_leds[LED_DRIVER_LED_COUNT] = {
 };

 const led_matrix g_leds[LED_DRIVER_LED_COUNT] = {
-
    /*{row | col << 4}
      |            LED_ROW_COL(row, col)
      |             |            modifier
@@ -155,7 +155,7 @@
 * I2C driver system settings.
 */
 #define STM32_I2C_USE_I2C1                  TRUE
-#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_USE_I2C2                  TRUE
 #define STM32_I2C_BUSY_TIMEOUT              50
 #define STM32_I2C_I2C1_IRQ_PRIORITY         10
 #define STM32_I2C_I2C2_IRQ_PRIORITY         10
@@ -41,6 +41,9 @@ DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
 # LED Configuration
 LED_MATRIX_ENABLE = IS31FL3731

+# QWIIC Devices
+#QWIIC_ENABLE = RGB7SEG
+
 # Build Options
 #   comment out to disable the options.
 #
@@ -28,7 +28,7 @@
 // The first section contains all of the arguments
 // The second converts the arguments into a two-dimensional array

-#define LAYOUT_all( \
+#define LAYOUT( \
    k00, k01, k02, k03, k04, k05, k06, k07, k50, k51, k52, k53, k54,    k56,   k57, \
    k10, k11, k12, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64, k65,      k67, \
    k20, k21, k22, k23, k24, k25, k26, k27, k70, k71, k72, k73,    k75, \
@@ -47,25 +47,6 @@
    { k90, KC_NO, k92, k93, k94, k95, k96, k97 }  \
 }

-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k50, k51, k52, k53, k54,    k56,   k57, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64, k65,      k67, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k70, k71, k72, k73,    k75, \
-    k30,      k32, k33, k34, k35, k36, k37, k80, k81, k82, k83,      k85, k86, \
-    k40, k41, k42,           k45, k46,      k90,      k92, k93, k94, k95, k96, k97 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, KC_NO, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, KC_NO, KC_NO, k45, k46, KC_NO }, \
-    { k50, k51, k52, k53, k54, KC_NO, k56, k57 }, \
-    { k60, k61, k62, k63, k64, k65, KC_NO, k67 }, \
-    { k70, k71, k72, k73, KC_NO, k75, KC_NO, KC_NO }, \
-    { k80, k81, k82, k83, KC_NO, k85, k86, KC_NO }, \
-    { k90, KC_NO, k92, k93, k94, k95, k96, k97 }  \
-}
-
 #define LAYOUT_66_ansi( \
    k00, k01, k02, k03, k04, k05, k06, k07, k50, k51, k52, k53, k54,    k56,   k57, \
    k10, k11, k12, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64, k65,      k67, \
@@ -3,15 +3,16 @@

 /* Select hand configuration */

-#define MASTER_LEFT
-// #define MASTER_RIGHT
+// #define MASTER_LEFT
+#define MASTER_RIGHT
 // #define EE_HANDS

 #define SSD1306OLED
 #define SWAP_SCLN

 // #define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 120
+#define TAPPING_TERM 300
+#define IGNORE_MOD_TAP_INTERRUPT

 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
@@ -16,113 +16,61 @@

 #define KC_ KC_TRNS

-#define KC_TMB1 LGUI_T(KC_TAB)
-#define KC_TMB2 LSFT_T(KC_SPC)
+#define KC_TMB1 KC_LA(TAB)
+#define KC_TMB2 KC_LS(SPC)
 #define KC_TMB3 TD(TD_LOWER) // act as LOWER when hold, as KC_LANG2(=English) when tapped
 #define KC_TMB4 TD(TD_RAISE) // act as RAISE when hold, as KC_LANG1(=Japanese) when tapped
-#define KC_TMB5 RCTL_T(KC_BSPC)
-#define KC_TMB6 RALT_T(KC_ENT)
-#define KC_TMB7 KC_DEL
-#define KC_TMB8 RALT(KC_ENT)
-#define KC_TMB9 LGUI(KC_TAB)
-
-#define KC_RST  RESET
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_EDJP EDVORAK
-#define KC_QWER QWERTY
+#define KC_TMB5 KC_RC(BSPC)
+#define KC_TMB6 KC_RG(ENT)
+#define KC_TMB7 KC_RC(DEL)

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_EDVORAK] = LAYOUT_kc(
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-     ESC ,QUOT,COMM,DOT , Y  , P  ,             F  , G  , R  , W  , Q  ,BSLS,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-     EQL , A  , O  , E  , I  , U  ,             D  , T  , N  , S  , M  ,MINS,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-     GRV ,SCLN, X  , C  , V  , Z  ,             B  , H  , J  , K  , L  ,SLSH,
-  //`----+----+----+----+----+----+----| |----+----+----+----+----+----+----'
-                         TMB1,TMB2,TMB3,  TMB4,TMB5,TMB6
-  //                    `----+----+----' `----+----+----'
-  ),
-
-  [_EDVORAKJ1] = LAYOUT_kc(
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         , AI , OU , EI ,    ,    ,                ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                ,    ,    , Y  ,    ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,ANN ,ONN ,ENN ,INN ,UNN ,                ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----| |----+----+----+----+----+----+----'
-                             ,    ,    ,      ,    ,
-  //                    `----+----+----' `----+----+----'
-  ),
-
-  [_EDVORAKJ2] = LAYOUT_kc(
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         , AI , OU , EI ,    ,    ,                ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                , Y  ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,ANN ,ONN ,ENN ,INN ,UNN ,                ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----| |----+----+----+----+----+----+----'
-                             ,    ,    ,      ,    ,
-  //                    `----+----+----' `----+----+----'
-  ),
-
-  [_QWERTY] = LAYOUT_kc(
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,             Y  , U  , I  , O  , P  ,MINS,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-     EQL , A  , S  , D  , F  , G  ,             H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-     GRV , Z  , X  , C  , V  , B  ,             N  , M  ,COMM,DOT ,SLSH,BSLS,
-  //`----+----+----+----+----+----+----| |----+----+----+----+----+----+----'
-                             ,    ,    ,      ,    ,
-  //                    `----+----+----' `----+----+----'
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     GRV ,QUOT,COMM , DOT ,  Y  , Q  ,             F  ,  G  ,  R  ,  W  , P  ,BSLS,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     EQL , A  ,LA(O),LG(E),LC(I), U  ,             D  ,RS(T),RG(N),RA(S), M  ,MINS,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     ESC ,SCLN,  X  ,  C  ,  V  , Z  ,             H  ,  J  ,  K  ,  L  , B  ,SLSH,
+  //`----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----'
+                           TMB1 ,TMB2,TMB3,  TMB4,TMB5,TMB6
+  //                      `-----+----+----' `----+----+-----'
  ),

  [_LOWER] = LAYOUT_kc(
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,    , 2  , 3  , 4  , 5  ,             6  , 7  , 8  , 9  ,    ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         , 1  ,EXLM, AT ,HASH,DLR ,            PERC,CIRC,AMPR,ASTR, 0  ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,    , LT ,LCBR,LPRN,LBRC,            RBRC,RPRN,RCBR, GT ,    ,    ,
-  //`----+----+----+----+----+----+----| |----+----+----+----+----+----+----'
-                             ,    ,    ,      ,TMB7,TMB8
-  //                    `----+----+----' `----+----+----'
+  //|----+----+------+------+------+----|           |----+------+------+-------+----+----|
+         ,    , LCBR , LBRC , LPRN ,    ,                , RPRN , RBRC , RCBR  ,    ,    ,
+  //|----+----+------+------+------+----|           |----+------+------+-------+----+----|
+      F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 ,             F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 ,
+  //|----+----+------+------+------+----|           |----+------+------+-------+----+----|
+     PSCR,    , HOME , PGDN , PGUP ,END ,            LEFT, DOWN ,  UP  , RGHT  ,    ,    ,
+  //`----+----+------+------+------+----+----| |----+----+------+------+-------+----+----'
+                                   ,    , NO ,  MAC ,TMB7,
+  //                         `-----+----+----' `----+----+-----'
  ),

  [_RAISE] = LAYOUT_kc(
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         , F1 , F2 , F3 , F4 , F5 ,             F6 , F7 , F8 , F9 ,F10 ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,F11 ,F12 ,PSCR,SLCK,PAUS,                ,HOME,PGDN,PGUP,END ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                ,LEFT,DOWN, UP ,RGHT,    ,
-  //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----'
-                         TMB9,    ,    ,      ,    ,
-  //                    `----+----+----' `----+----+----'
-  ),
-
-  [_ADJUST] = LAYOUT_kc(
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,    ,    ,   ,EXTOFF,   ,                ,EXTON,   ,    ,    ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,    ,    ,QWER,WIN ,RST ,            RTOG,MAC ,EDJP,    ,    ,    ,
-  //|----+----+----+----+----+----|           |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----| |----+----+----+----+----+----+----'
-                             ,    ,    ,      ,    ,
-  //                    `----+----+----' `----+----+----'
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+         ,    ,EXLM , AT  ,HASH ,DLR ,            PERC,CIRC ,AMPR ,ASTR ,    ,    ,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+         , 1  ,LA(2),LG(3),LC(4), 5  ,             6  ,RS(7),RG(8),RA(9), 0  ,    ,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     PSCR,    ,HOME ,PGDN ,PGUP ,END ,            LEFT,DOWN , UP  ,RGHT ,    ,    ,
+  //`----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----'
+                                ,    ,WIN ,   NO ,    ,
+  //                      `-----+----+----' `----+----+----'
  )
 };

 #ifdef SSD1306OLED
 void matrix_init_keymap(void) {
  //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-  iota_gfx_init(!has_usb());   // turns on the display
+#ifdef MASTER_RIGHT
+  iota_gfx_init(has_usb()); // turns on the display
+#else
+  iota_gfx_init(!has_usb());
+#endif // MASTER_RIGHT
 }

 void matrix_scan_user(void) {
@@ -134,23 +82,15 @@ void matrix_scan_user(void) {
 uint32_t layer_state_set_keymap(uint32_t state) {
  rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
  switch (biton32(state)) {
-    case _EDVORAKJ1:
-    case _EDVORAKJ2:
-      // _EDVORAKJ1 & J2 are same colored
-      rgblight_sethsv_noeeprom_white();
-      break;
    case _LOWER:
      rgblight_sethsv_noeeprom_red();
      break;
    case _RAISE:
-      rgblight_sethsv_noeeprom_blue();
-      break;
-    case _ADJUST:
      rgblight_sethsv_noeeprom_green();
      break;
-    default: //  for any other layers, or the default layer
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
-      rgblight_sethsv_noeeprom_red();
+    default: // for any other layers, or the default layer
+      rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
+      rgblight_sethsv_red();
      break;
  }
  return state;
@@ -21,11 +21,7 @@ const char *read_layer_state(void) {

  switch (biton32(layer_state)) {
    case L_BASE:
-      strcpy(layer_name, default_layer_state == 1UL<<_EDVORAK ? "EDVORAK" : "QWERTY");
-      break;
-    case _EDVORAKJ1:
-    case _EDVORAKJ2:
-      strcpy(layer_name, "JP_EXT");
+      strcpy(layer_name, "Default");
      break;
    case _RAISE:
      strcpy(layer_name, "Raise");
@@ -33,9 +29,6 @@ const char *read_layer_state(void) {
    case _LOWER:
      strcpy(layer_name, "Lower");
      break;
-    case _ADJUST:
-      strcpy(layer_name, "Adjust");
-      break;
    default:
      snprintf(layer_name, sizeof(layer_name), "Undef-%ld", layer_state);
  }
@@ -49,10 +42,7 @@ const char *read_layer_state(void) {

 const char *read_host_led_state(void) {
  static char led_str[24];
-  bool ext_status = get_enable_jp_extra_layer() && get_japanese_mode();
-  strcpy(led_str, ext_status ? "EXT" : "   ");
-
-  strcat(led_str, (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? " NMLK" : "     ");
+  strcpy(led_str, (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NMLK" : "    ");
  strcat(led_str, (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? " CAPS" : "    ");
  strcat(led_str, (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? " SCLK" : "     ");
  return led_str;
@@ -70,7 +60,11 @@ 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
    matrix_write(&matrix, read_mode_icon(!get_enable_kc_lang()));
    matrix_write(&matrix, " ");
    matrix_write(&matrix, read_layer_state());
@@ -1,21 +1,23 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H

+#define SWAP_SCLN
+
 #undef TAPPING_FORCE_HOLD
 #undef TAPPING_TERM
-#define TAPPING_TERM 120
-#define SWAP_SCLN
+#define TAPPING_TERM 300
+#define IGNORE_MOD_TAP_INTERRUPT

 // If you need more program area, try select and reduce rgblight modes to use.

 // Selection of RGBLIGHT MODE to use.
 #if defined(LED_ANIMATIONS)
-   #define RGBLIGHT_EFFECT_BREATHING
-   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-   #define RGBLIGHT_EFFECT_SNAKE
-   #define RGBLIGHT_EFFECT_KNIGHT
-   #define RGBLIGHT_EFFECT_CHRISTMAS
+   //#define RGBLIGHT_EFFECT_BREATHING
+   //#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+   //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+   //#define RGBLIGHT_EFFECT_SNAKE
+   //#define RGBLIGHT_EFFECT_KNIGHT
+   //#define RGBLIGHT_EFFECT_CHRISTMAS
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
   //#define RGBLIGHT_EFFECT_RGB_TEST
   //#define RGBLIGHT_EFFECT_ALTERNATING
@@ -7,21 +7,6 @@

 // keymaps definitions are moved to keymap_Xrows.c.

-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case KC_LOCK:
-      if (record->event.pressed) {
-        if (get_enable_kc_lang()) {
-          SEND_STRING( SS_LCTRL(SS_LSFT(SS_TAP(X_POWER))) );
-        } else {
-          SEND_STRING( SS_LGUI("l") );
-        }
-      }
-      return false;
-  }
-  return true;
-}
-
 #ifdef SSD1306OLED
 void matrix_init_keymap(void) {
  //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
@@ -37,23 +22,15 @@ void matrix_scan_user(void) {
 uint32_t layer_state_set_keymap(uint32_t state) {
  rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
  switch (biton32(state)) {
-    case _EDVORAKJ1:
-    case _EDVORAKJ2:
-      // _EDVORAKJ1 & J2 are same colored
-      rgblight_sethsv_noeeprom_white();
-      break;
    case _LOWER:
      rgblight_sethsv_noeeprom_red();
      break;
    case _RAISE:
      rgblight_sethsv_noeeprom_blue();
      break;
-    case _ADJUST:
-      rgblight_sethsv_noeeprom_green();
-      break;
    default: //  for any other layers, or the default layer
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
-      rgblight_sethsv_noeeprom_red();
+      rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
+      rgblight_sethsv_red();
      break;
  }
  return state;
@@ -4,86 +4,38 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_EDVORAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     LBRC,RBRC,COMM,DOT , Y  , P  ,                F  , G  , R  , W  , Q  ,BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     EQL , A  , O  , E  , I  , U  ,                D  , T  , N  , S  , M  ,MINS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     QUOT,SCLN, X  , C  , V  , Z  ,                B  , H  , J  , K  , L  ,SLSH,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     LEFT,DOWN, UP ,RGHT,TMB1,TMB2,TMB3,     TMB6,TMB7,TMB8,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-  ),
-
-  [_EDVORAKJ1] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         , AI , OU , EI ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    , Y  ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,ANN ,ONN ,ENN ,INN ,UNN ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-  ),
-
-  [_EDVORAKJ2] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         , AI , OU , EI ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   , Y  ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,ANN ,ONN ,ENN ,INN ,UNN ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-  ),
-
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     EQL , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,MINS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LBRC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     RBRC, Z  , X  , C  , V  , B  ,                N  , M  ,COMM,DOT ,SLSH,BSLS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
+  //,----+----+-----+-----+-----+----.           ,----+-----+-----+-----+----+----.
+     GRV ,QUOT,COMM , DOT ,  Y  , Q  ,             F  ,  G  ,  R  ,  W  , P  ,BSLS,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     EQL , A  ,LA(O),LG(E),LC(I), U  ,             D  ,RS(T),RG(N),RA(S), M  ,MINS,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     ESC ,SCLN,  X  ,  C  ,  V  , Z  ,             H  ,  J  ,  K  ,  L  , B  ,SLSH,
+  //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
+     HOME,PGDN,PGUP , END ,TMB1 ,TMB2,TMB3,  TMB4,TMB5,TMB6 ,LEFT ,DOWN , UP ,RGHT
+  //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
  ),

  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-      F1 , F2 , F3 , F4 , F5 ,LCBR,               RCBR, 7  , 8  , 9  ,MINS,SLSH,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-      F6 , F7 , F8 , F9 ,F10 ,LPRN,               RPRN, 4  , 5  , 6  ,PLUS,ASTR,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     F11 ,F12 ,PSCR,SLCK,PAUS,LBRC,               RBRC, 1  , 2  , 3  , NO , NO ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     HOME,PGDN,PGUP,END ,    ,    ,    ,         ,ESC , 0  ,HOME,PGDN,PGUP,END
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
+  //,----+----+------+------+------+----.           ,----+------+------+-------+----+----.
+         ,    , LCBR , LBRC , LPRN ,    ,                , RPRN , RBRC , RCBR  ,    ,    ,
+  //|----+----+------+------+------+----|           |----+------+------+-------+----+----|
+      F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 ,             F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 ,
+  //|----+----+------+------+------+----|           |----+------+------+-------+----+----|
+     PSCR,    , HOME , PGDN , PGUP ,END ,            LEFT, DOWN ,  UP  , RGHT  ,    ,    ,
+  //|----+----+------+------+------+----+----. ,----+----+------+------+-------+----+----|
+         ,    ,      ,      ,      ,    , NO ,  MAC ,TMB7,      ,      ,       ,    ,
+  //`----+----+------+------+------+----+----/ \----+----+------+------+-------+----+----'
  ),

  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-      F1 , F2 , F3 , F4 , F5 , F6 ,                F7 , F8 , F9 ,F10 ,F11 ,F12 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN, NO ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     GRV , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  , NO ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     HOME,PGDN,PGUP,END ,TMB9,ESC ,    ,         ,    ,    ,HOME,PGDN,PGUP,END
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-  ),
-
-  [_ADJUST] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,   ,EXTOFF,   ,                   ,EXTON,   ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,RST ,DBUG,RTOG,WIN ,    ,                   ,MAC ,QWER,EDJP,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
+  //,----+----+-----+-----+-----+----.           ,----+-----+-----+-----+----+----.
+         ,    ,EXLM , AT  ,HASH ,DLR ,            PERC,CIRC ,AMPR ,ASTR ,    ,    ,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+         , 1  ,LA(2),LG(3),LC(4), 5  ,             6  ,RS(7),RG(8),RA(9), 0  ,    ,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     PSCR,    ,HOME ,PGDN ,PGUP ,END ,            LEFT,DOWN , UP  ,RGHT ,    ,    ,
+  //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
+         ,    ,     ,     ,     ,    ,WIN ,   NO ,    ,     ,     ,     ,    ,
+  //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
  )
 };
@@ -4,100 +4,44 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_EDVORAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LBRC,RBRC,COMM,DOT , Y  , P  ,                F  , G  , R  , W  , Q  ,BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     EQL , A  , O  , E  , I  , U  ,                D  , T  , N  , S  , M  ,MINS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     QUOT,SCLN, X  , C  , V  , Z  ,TMB4,     TMB5, B  , H  , J  , K  , L  ,SLSH,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     LEFT,DOWN, UP ,RGHT,TMB1,TMB2,TMB3,     TMB6,TMB7,TMB8,LEFT,DOWN, UP ,RGHT
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-  ),
-
-  [_EDVORAKJ1] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , AI , OU , EI ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    , Y  ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,ANN ,ONN ,ENN ,INN ,UNN ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-  ),
-
-  [_EDVORAKJ2] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , AI , OU , EI ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   , Y  ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,ANN ,ONN ,ENN ,INN ,UNN ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-  ),
-
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     EQL , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,MINS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LBRC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     RBRC, Z  , X  , C  , V  , B  ,    ,         , N  , M  ,COMM,DOT ,SLSH,BSLS,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
+  //,----+----+-----+-----+-----+----.           ,----+-----+-----+-----+----+----.
+     ESC ,EXLM, AT  ,HASH , DLR ,PERC,            CIRC,AMPR ,ASTR ,LPRN ,RPRN,BSPC,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     GRV ,QUOT,COMM , DOT ,  Y  , Q  ,             F  ,  G  ,  R  ,  W  , P  ,BSLS,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     EQL , A  ,LA(O),LG(E),LC(I), U  ,             D  ,RS(T),RG(N),RA(S), M  ,MINS,
+  //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
+     TAB ,SCLN,  X  ,  C  ,  V  , Z  , NO ,   NO , H  ,  J  ,  K  ,  L  , B  ,SLSH,
+  //|----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----|
+     HOME,PGDN,PGUP , END ,TMB1 ,TMB2,TMB3,  TMB4,TMB5,TMB6 ,LEFT ,DOWN , UP ,RGHT
+  //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
  ),

  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,SLSH,ASTR,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-      F1 , F2 , F3 , F4 , F5 ,LCBR,               RCBR, 7  , 8  , 9  ,MINS,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-      F6 , F7 , F8 , F9 ,F10 ,LPRN,               RPRN, 4  , 5  , 6  ,PLUS,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     F11 ,F12 ,PSCR,SLCK,PAUS,LBRC,LOCK,         ,RBRC, 1  , 2  , 3  ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     HOME,PGDN,PGUP,END ,TMB9,    ,    ,         ,    , 0  ,HOME,PGDN,PGUP,END
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
+  //,----+----+------+------+------+----.           ,----+------+------+-------+----+----.
+     PSCR,    ,      ,      ,      ,    ,                ,      ,      ,       ,    ,    ,
+  //|----+----+------+------+------+----|           |----+------+------+-------+----+----|
+         ,    , LCBR , LBRC , LPRN ,    ,                , RPRN , RBRC , RCBR  ,    ,    ,
+  //|----+----+------+------+------+----|           |----+------+------+-------+----+----|
+      F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 ,             F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 ,
+  //|----+----+------+------+------+----+----. ,----+----+------+------+-------+----+----|
+         ,    , HOME , PGDN , PGUP ,END ,    ,      ,LEFT, DOWN ,  UP  , RGHT  ,    ,    ,
+  //|----+----+------+------+------+----+----| |----+----+------+------+-------+----+----|
+         ,    ,      ,      ,      ,    , NO ,  MAC ,TMB7,      ,      ,       ,    ,
+  //`----+----+------+------+------+----+----/ \----+----+------+------+-------+----+----'
  ),

  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,SLSH,ASTR,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-      F1 , F2 , F3 , F4 , F5 ,LCBR,               RCBR, 7  , 8  , 9  ,MINS,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-      F6 , F7 , F8 , F9 ,F10 ,LPRN,               RPRN, 4  , 5  , 6  ,PLUS,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     F11 ,F12 ,PSCR,SLCK,PAUS,LBRC,LOCK,         ,RBRC, 1  , 2  , 3  ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-     HOME,PGDN,PGUP,END ,TMB9,    ,    ,         ,    , 0  ,HOME,PGDN,PGUP,END
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-  ),
-
-  [_ADJUST] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,   ,EXTOFF,   ,                   ,EXTON,   ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,RST ,DBUG,RTOG,WIN ,    ,                   ,MAC ,QWER,EDJP,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----|    |----+----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
+  //,----+----+-----+-----+-----+----.           ,----+-----+-----+-----+----+----.
+     PSCR,    ,     ,     ,     ,    ,                ,     ,     ,     ,    ,    ,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+         ,    ,EXLM , AT  ,HASH ,DLR ,            PERC,CIRC ,AMPR ,ASTR ,    ,    ,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+         , 1  ,LA(2),LG(3),LC(4), 5  ,             6  ,RS(7),RG(8),RA(9), 0  ,    ,
+  //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
+         ,    ,HOME ,PGDN ,PGUP ,END ,    ,      ,LEFT,DOWN , UP  ,RGHT ,    ,    ,
+  //|----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----|
+         ,    ,     ,     ,     ,    ,WIN ,   NO ,    ,     ,     ,     ,    ,
+  //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
  )
 };
@@ -2,27 +2,20 @@
 #define KEYMAP_XROWS_H

 #include "edvorakjp.h"
-
-enum custom_keycodes {
-  KC_LOCK = NEW_SAFE_RANGE,
-};
+/*
+ * enum custom_keycodes {
+ *   KC_LOCK = NEW_SAFE_RANGE,
+ * };
+ */

 #define KC_ KC_TRNS

-#define KC_TMB1 LGUI_T(KC_TAB)
-#define KC_TMB2 LSFT_T(KC_SPC)
-#define KC_TMB3 LOWER // act as LOWER when hold, as KC_LANG2(=English) when tapped
-#define KC_TMB4 LCTL_T(KC_ESC)
-#define KC_TMB5 RSFT_T(KC_DEL)
-#define KC_TMB6 RAISE // act as RAISE when hold, as KC_LANG1(=Japanese) when tapped
-#define KC_TMB7 RCTL_T(KC_BSPC)
-#define KC_TMB8 RALT_T(KC_ENT)
-#define KC_TMB9 LGUI(KC_TAB)
-
-#define KC_RST  RESET
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_EDJP EDVORAK
-#define KC_QWER QWERTY
+#define KC_TMB1 KC_LA(TAB)
+#define KC_TMB2 KC_LS(SPC)
+#define KC_TMB3 TD(TD_LOWER) // act as LOWER when hold, as KC_LANG2(=English) when tapped
+#define KC_TMB4 TD(TD_RAISE) // act as RAISE when hold, as KC_LANG1(=Japanese) when tapped
+#define KC_TMB5 KC_RC(BSPC)
+#define KC_TMB6 KC_RG(ENT)
+#define KC_TMB7 KC_RC(DEL)

 #endif
@@ -34,13 +34,7 @@ void render_status(struct CharacterMatrix *matrix) {
  matrix_write_P(matrix, PSTR("\nLayer: "));
  switch (biton32(layer_state)) {
    case L_BASE:
-      matrix_write_P(matrix,
-          default_layer_state == 1UL<<_EDVORAK ? PSTR("EDVORAK") : PSTR("QWERTY")
-          );
-      break;
-    case _EDVORAKJ1:
-    case _EDVORAKJ2:
-      matrix_write_P(matrix, PSTR("JP_EXT"));
+      matrix_write_P(matrix, PSTR("Default"));
      break;
    case _RAISE:
      matrix_write_P(matrix, PSTR("Raise"));
@@ -48,17 +42,13 @@ void render_status(struct CharacterMatrix *matrix) {
    case _LOWER:
      matrix_write_P(matrix, PSTR("Lower"));
      break;
-    case _ADJUST:
-      matrix_write_P(matrix, PSTR("Adjust"));
-      break;
    default:
      matrix_write(matrix, buf);
  }

  // Host Keyboard LED Status
  char led[40];
-  snprintf(led, sizeof(led), "\n%s %s %s %s",
-      get_enable_jp_extra_layer() && get_japanese_mode() ? "EXT" : "   ",
+  snprintf(led, sizeof(led), "\n%s %s %s",
      (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NMLK" : "    ",
      (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ",
      (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    ");
@@ -15,6 +15,7 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE = no      # Enable one-hand typing
+TAP_DANCE_ENABLE = yes

 define HELIX_CUSTOMISE_MSG
  $(info Helix customize)
@@ -1,10 +1,7 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H

-#include "config_common.h"
-
 /* Use I2C or Serial, not both */
-
 #define USE_SERIAL
 // #define USE_I2C

@@ -14,18 +11,16 @@
 // #define MASTER_RIGHT
 // #define EE_HANDS

+#define SWAP_SCLN
+#define TAPPING_TERM 300
+#define IGNORE_MOD_TAP_INTERRUPT
+
 #undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLED_NUM 10
+#define RGBLIGHT_LIMIT_VAL 100
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 100

-#define MOUSEKEY_WHEEL_MAX_SPEED   10
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 20
-
-#define TAPPING_TERM 120
-#define SWAP_SCLN
-
-#endif
+#endif // CONFIG_USER_H
@@ -1,166 +1,85 @@
 #include QMK_KEYBOARD_H
 #include "edvorakjp.h"

-enum custom_keycodes {
-  KC_LOCK = NEW_SAFE_RANGE,
-};
+/*
+ * enum custom_keycodes {
+ *   KC_LOCK = NEW_SAFE_RANGE,
+ * };
+ */

 #define KC_ KC_TRNS

-#define KC_TMB1 LGUI_T(KC_TAB)
-#define KC_TMB2 LSFT_T(KC_SPC)
-#define KC_TMB3 LOWER // act as LOWER when hold, as KC_LANG2(=English) when tapped
-#define KC_TMB4 LCTL_T(KC_ESC)
-#define KC_TMB5 RSFT_T(KC_DEL)
-#define KC_TMB6 RAISE // act as RAISE when hold, as KC_LANG1(=Japanese) when tapped
-#define KC_TMB7 RCTL_T(KC_BSPC)
-#define KC_TMB8 RALT_T(KC_ENT)
-#define KC_TMB9 LGUI(KC_TAB)
-
-#define KC_RST  RESET
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_EDJP EDVORAK
-#define KC_QWER QWERTY
+#define KC_TMB1 KC_LA(TAB)
+#define KC_TMB2 KC_LS(SPC)
+#define KC_TMB3 TD(TD_LOWER) // act as LOWER when hold, as KC_LANG2(=English) when tapped
+#define KC_TMB4 TD(TD_RAISE) // act as RAISE when hold, as KC_LANG1(=Japanese) when tapped
+#define KC_TMB5 KC_RC(BSPC)
+#define KC_TMB6 KC_RG(ENT)
+#define KC_TMB7 KC_RC(DEL)

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_EDVORAK] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LBRC,RBRC,COMM,DOT , Y  , P  ,                F  , G  , R  , W  , Q  ,BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     EQL , A  , O  , E  , I  , U  ,                D  , T  , N  , S  , M  ,MINS,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     QUOT,SCLN, X  , C  , V  , Z  ,TMB4,     TMB5, B  , H  , J  , K  , L  ,SLSH,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                       TMB1,TMB2,TMB3,         TMB6,TMB7,TMB8
-  //                  `----+----+----'        `----+----+----'
-  ),
-
-  [_EDVORAKJ1] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , AI , OU , EI ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    , Y  ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,ANN ,ONN ,ENN ,INN ,UNN ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-
-  [_EDVORAKJ2] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , AI , OU , EI ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   , Y  ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,ANN ,ONN ,ENN ,INN ,UNN ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     EQL , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,MINS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LBRC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     RBRC, Z  , X  , C  , V  , B  ,    ,         , N  , M  ,COMM,DOT ,SLSH,BSLS,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
+  //,----+----+-----+-----+-----+----.           ,----+-----+-----+-----+----+----.
+     GRV ,EXLM, AT  ,HASH , DLR ,PERC,            CIRC,AMPR ,ASTR ,LPRN ,RPRN,BSPC,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     TAB ,QUOT,COMM , DOT ,  Y  , Q  ,             F  ,  G  ,  R  ,  W  , P  ,BSLS,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+     EQL , A  ,LA(O),LG(E),LC(I), U  ,             D  ,RS(T),RG(N),RA(S), M  ,MINS,
+  //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
+     ESC ,SCLN,  X  ,  C  ,  V  , Z  , NO ,   NO , H  ,  J  ,  K  ,  L  , B  ,SLSH,
+  //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
+                           TMB1,TMB2,TMB3,    TMB4,TMB5,TMB6
+  //                      `----+----+----'   `----+----+----'
  ),

  [_LOWER] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,SLSH,ASTR,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,BTN4,WH_U,BTN5,    ,                   , 7  , 8  , 9  ,MINS,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,WH_L,WH_D,WH_R,    ,                   , 4  , 5  , 6  ,PLUS,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,BTN1,BTN3,BTN2,    ,    ,         ,    , 1  , 2  , 3  ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             , 0  ,
-  //                  `----+----+----'        `----+----+----'
+  //,----+----+------+------+------+----.           ,----+------+------+-------+----+----.
+         ,    ,      ,      ,      ,    ,                ,      ,      ,       ,    ,    ,
+  //|----+----+------+------+------+----|           |----+------+------+-------+----+----|
+         ,    , LCBR , LBRC , LPRN ,    ,                , RPRN , RBRC , RCBR  ,    ,    ,
+  //|----+----+------+------+------+----|           |----+------+------+-------+----+----|
+      F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 ,             F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 ,
+  //|----+----+------+------+------+----+----. ,----+----+------+------+-------+----+----|
+     PSCR,    , HOME , PGDN , PGUP ,END ,    ,      ,LEFT, DOWN ,  UP  , RGHT  ,    ,    ,
+  //`----+----+------+------+------+----+----/ \----+----+------+------+-------+----+----'
+                                  ,    , NO ,    MAC ,TMB7,
+  //                         `----+----+----'   `----+----+----'
  ),

  [_RAISE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-      F1 , F2 , F3 , F4 , F5 ,LCBR,               RCBR,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-      F6 , F7 , F8 , F9 ,F10 ,LPRN,               RPRN,HOME,PGDN,PGUP,END ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     F11 ,F12 ,PSCR,SLCK,PAUS,LBRC,LOCK,         ,RBRC,LEFT,DOWN, UP ,RGHT,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                       TMB9,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-
-  [_ADJUST] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,   ,EXTOFF,   ,                   ,EXTON,   ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,RST ,DBUG,RTOG,WIN ,    ,                   ,MAC ,QWER,EDJP,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
-  //`----+----+----+----+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
+  //,----+----+-----+-----+-----+----.           ,----+-----+-----+-----+----+----.
+         ,    ,     ,     ,     ,    ,                ,     ,     ,     ,    ,    ,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+         ,    ,EXLM , AT  ,HASH ,DLR ,            PERC,CIRC ,AMPR ,ASTR ,    ,    ,
+  //|----+----+-----+-----+-----+----|           |----+-----+-----+-----+----+----|
+         , 1  ,LA(2),LG(3),LC(4), 5  ,             6  ,RS(7),RG(8),RA(9), 0  ,    ,
+  //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----|
+     PSCR,    ,HOME ,PGDN ,PGUP ,END ,    ,      ,LEFT,DOWN , UP  ,RGHT ,    ,    ,
+  //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
+                               ,    ,WIN ,     NO ,    ,
+  //                      `----+----+----'   `----+----+----'
  )
 };

 void matrix_init_keymap() {
 }

-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case KC_LOCK:
-      if (record->event.pressed) {
-        if (get_enable_kc_lang()) {
-          SEND_STRING( SS_LCTRL(SS_LSFT(SS_TAP(X_POWER))) );
-        } else {
-          SEND_STRING( SS_LGUI("l") );
-        }
-      }
-      return false;
-  }
-  return true;
-}
-
+#ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
 uint32_t layer_state_set_keymap(uint32_t state) {
+  rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
  switch (biton32(state)) {
-    case _EDVORAKJ1:
-    case _EDVORAKJ2:
-      // _EDVORAKJ1 & J2 are same colored
-      rgblight_setrgb (0xFF, 0xFF, 0xFF);
-      break;
    case _LOWER:
-      rgblight_setrgb (0xFF, 0x00, 0x00);
+      rgblight_sethsv_noeeprom_red();
      break;
    case _RAISE:
-      rgblight_setrgb (0x00, 0x00, 0xFF);
+      rgblight_sethsv_noeeprom_blue();
      break;
-    case _ADJUST:
-      rgblight_setrgb (0x00, 0xFF, 0x00);
-      break;
-    default: //  for any other layers, or the default layer
-      rgblight_mode(28);
+    default: // for any other layers, or the default layer
+      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
+      get_japanese_mode() ? rgblight_sethsv_noeeprom_red() : rgblight_sethsv_noeeprom_green();
      break;
  }
  return state;
 }
+#endif
@@ -2,15 +2,17 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = no  # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes   # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes  # Audio control and System control(+450)
-CONSOLE_ENABLE = no    # Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-NKRO_ENABLE = no       # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-MIDI_ENABLE = no       # MIDI controls
-AUDIO_ENABLE = no      # Audio output on port C6
-UNICODE_ENABLE = no    # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes  # Enable WS2812 RGB underlight. 
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
+EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
+SWAP_HANDS_ENABLE = no      # Enable one-hand typing
+TAP_DANCE_ENABLE = yes
@@ -22,9 +22,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RSFT,
+      KC_LGUI, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RGUI,
  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-      KC_LGUI, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LALT,          KC_RALT,  KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RGUI,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LALT,          KC_RALT,  KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                    KC_LCTL, LOWER,   KC_SPC,                    KC_ENT,  RAISE,   KC_RCTL
                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
@@ -1,10 +1,5 @@
 #include "edvorakjp.h"

-void dvorakj_layer_off(void) {
-  layer_off(_EDVORAKJ1);
-  layer_off(_EDVORAKJ2);
-}
-
 void matrix_init_user(void) {
  edvorakjp_status_init();
  matrix_init_keymap();
@@ -25,7 +20,6 @@ uint32_t layer_state_set_keymap(uint32_t state) {

 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return process_record_keymap(keycode, record) &&\
-         process_record_edvorakjp_ext(keycode, record) &&\
         process_record_edvorakjp_swap_scln(keycode, record) &&\
         process_record_edvorakjp_config(keycode, record) &&\
         process_record_layer(keycode, record) &&\
@@ -10,9 +10,6 @@ extern keymap_config_t keymap_config;

 enum edvorakjp_layers {
  _EDVORAK = 0,
-  _EDVORAKJ1,
-  _EDVORAKJ2,
-  _QWERTY,
  _LOWER,
  _RAISE,
  _ADJUST,
@@ -21,26 +18,24 @@ enum edvorakjp_layers {

 enum edvorakjp_keycodes {
  EDVORAK = SAFE_RANGE,
-  QWERTY,
  LOWER,
  RAISE,
  KC_MAC,
  KC_WIN,
-  KC_EXTON,
-  KC_EXTOFF,
  KC_JPN,
  KC_ENG,
-  KC_AI,
-  KC_OU,
-  KC_EI,
-  KC_ANN,
-  KC_ONN,
-  KC_ENN,
-  KC_INN,
-  KC_UNN,
  NEW_SAFE_RANGE
 };

+#define KC_LC(k) LCTL_T(KC_##k)
+#define KC_LS(k) LSFT_T(KC_##k)
+#define KC_LA(k) LALT_T(KC_##k)
+#define KC_LG(k) LGUI_T(KC_##k)
+#define KC_RC(k) RCTL_T(KC_##k)
+#define KC_RS(k) RSFT_T(KC_##k)
+#define KC_RG(k) RGUI_T(KC_##k)
+#define KC_RA(k) RALT_T(KC_##k)
+
 enum tap_dance_code {
  TD_LOWER = 0,
  TD_RAISE
@@ -57,8 +52,6 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);

 // status
 void edvorakjp_status_init(void);
-bool get_enable_jp_extra_layer(void);
-void set_enable_jp_extra_layer(bool new_state);
 bool get_enable_kc_lang(void);
 void set_enable_kc_lang(bool new_state);
 bool get_japanese_mode(void);
@@ -69,7 +62,6 @@ void set_japanese_mode(bool new_state);
 * return false if processed, or return true if not processed.
 * You can add your original macros in process_record_keymap() in keymap.c.
 */
-bool process_record_edvorakjp_ext(uint16_t keycode, keyrecord_t *record);
 bool process_record_edvorakjp_swap_scln(uint16_t keycode, keyrecord_t *record);
 bool process_record_edvorakjp_config(uint16_t keycode, keyrecord_t *record);
 bool process_record_layer(uint16_t keycode, keyrecord_t *record);
@@ -7,114 +7,6 @@ static uint16_t time_on_pressed;
 * Each process_record_* methods defined here are
 * return false if handle edvorak_keycodes, or return true others.
 */
-bool process_record_edvorakjp_ext(uint16_t keycode, keyrecord_t *record) {
-  if (!(default_layer_state == 1UL<<_EDVORAK &&
-        get_enable_jp_extra_layer() && get_japanese_mode())) {
-    return true;
-  }
-
-  // consonant keys
-  // layer_on(J1) or layer_on(J2) are defined based on key positions.
-  switch (keycode) {
-    // right hand's left side w/o N
-    case KC_F:
-    case KC_G:
-    case KC_R:
-    case KC_D:
-    case KC_T:
-    case KC_B:
-    case KC_H:
-    case KC_J:
-      if (record->event.pressed) {
-        layer_on(_EDVORAKJ1);
-      }
-      return true;
-
-    // N: toggle layer
-    case KC_N:
-      if (record->event.pressed) {
-        biton32(layer_state) == _EDVORAK ? layer_on(_EDVORAKJ1) : dvorakj_layer_off();
-      }
-      return true;
-
-    // left hand up and right hand's right side
-    case KC_Y:
-    case KC_P:
-    case KC_W:
-    case KC_Q:
-    case KC_S:
-    case KC_M:
-    case KC_K:
-    case KC_L:
-      if (record->event.pressed) {
-        layer_on(_EDVORAKJ2);
-      }
-      return true;
-    // left hand down
-    // If return true, QMK sends keycode in new layer,
-    // but these keys are only available in old layer.
-    case KC_X:
-    case KC_C:
-    case KC_V:
-    case KC_Z:
-      if (record->event.pressed) {
-        layer_on(_EDVORAKJ2);
-        tap_code(keycode);
-      }
-      return false;
-  }
-
-  // vowel keys, symbol keys and modifier keys
-  if (record->event.pressed) {
-    dvorakj_layer_off();
-  }
-  switch (keycode) {
-    // combination vowel keys
-    case KC_AI:
-      if (record->event.pressed) {
-        SEND_STRING("ai");
-      }
-      return false;
-    case KC_OU:
-      if (record->event.pressed) {
-        SEND_STRING("ou");
-      }
-      return false;
-    case KC_EI:
-      if (record->event.pressed) {
-        SEND_STRING("ei");
-      }
-      return false;
-    case KC_ANN:
-      if (record->event.pressed) {
-        SEND_STRING("ann");
-      }
-      return false;
-    case KC_ONN:
-      if (record->event.pressed) {
-        SEND_STRING("onn");
-      }
-      return false;
-    case KC_ENN:
-      if (record->event.pressed) {
-        SEND_STRING("enn");
-      }
-      return false;
-    case KC_INN:
-      if (record->event.pressed) {
-        SEND_STRING("inn");
-      }
-      return false;
-    case KC_UNN:
-      if (record->event.pressed) {
-        SEND_STRING("unn");
-      }
-      return false;
-  }
-  // AOEIU and other (symbol, modifier) keys
-  return true;
-}
-
 bool process_record_edvorakjp_swap_scln(uint16_t keycode, keyrecord_t *record) {
 #ifdef SWAP_SCLN
  static const uint8_t shift_bits = MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT);
@@ -146,30 +38,13 @@ bool process_record_edvorakjp_config(uint16_t keycode, keyrecord_t *record) {
        set_enable_kc_lang(keycode == KC_MAC);
      }
      return false;
-    case KC_EXTON:
-    case KC_EXTOFF:
-      if (record->event.pressed) {
-        set_enable_jp_extra_layer(keycode == KC_EXTON);
-      }
-      return false;
  }
  return true;
 }

 bool process_record_layer(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case EDVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_EDVORAK);
-      }
-      return false;
-    case QWERTY:
-      if (record->event.pressed) {
-        dvorakj_layer_off();
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
 #if TAP_DANCE_ENABLE != yes
+  switch (keycode) {
    case LOWER:
      if (record->event.pressed) {
        layer_on(_LOWER);
@@ -196,8 +71,8 @@ bool process_record_layer(uint16_t keycode, keyrecord_t *record) {
        time_on_pressed = 0;
      }
      return false;
-#endif
  }
+#endif
  return true;
 }

@@ -4,8 +4,7 @@
 typedef union {
  uint8_t raw;
  struct {
-    bool enable_jp_extra_layer : 1;
-    bool enable_kc_lang        : 1;  // for macOS
+    bool enable_kc_lang;  // for macOS
  };
 } edvorakjp_config_t;
 static edvorakjp_config_t edvorakjp_config;
@@ -34,15 +33,6 @@ void edvorakjp_status_init(void) {
  edvorakjp_config.raw = eeconfig_read_edvorakjp();
 }

-bool get_enable_jp_extra_layer(void) {
-  return edvorakjp_config.enable_jp_extra_layer;
-}
-
-void set_enable_jp_extra_layer(bool new_state) {
-  edvorakjp_config.enable_jp_extra_layer = new_state;
-  eeconfig_update_edvorakjp(edvorakjp_config.raw);
-}
-
 bool get_enable_kc_lang(void) {
  return edvorakjp_config.enable_kc_lang;
 }
@@ -65,7 +55,6 @@ void set_japanese_mode(bool new_state) {
      SEND_STRING(SS_LALT("`"));
    }
  } else {
-    dvorakj_layer_off();
    if (edvorakjp_config.enable_kc_lang) {
      SEND_STRING(SS_TAP(X_LANG2));
    } else {
@@ -8,8 +8,11 @@ enum tap_state {
  HOLD
 };

-static int td_status_lower = NONE;
-static int td_status_raise = NONE;
+typedef struct {
+  uint8_t lower;
+  uint8_t raise;
+} td_status_t;
+static td_status_t td_status = {NONE, NONE};

 int cur_dance(qk_tap_dance_state_t *state) {
  if (state->interrupted || !state->pressed) {
@@ -20,14 +23,14 @@ int cur_dance(qk_tap_dance_state_t *state) {
 }

 void td_lower_finished(qk_tap_dance_state_t *state, void *user_data) {
-  td_status_lower = cur_dance(state);
-  switch(td_status_lower) {
+  td_status.lower = cur_dance(state);
+  switch(td_status.lower) {
    case SINGLE_TAP:
      set_japanese_mode(false);
-      register_code(KC_ESC);
      break;
    case DOUBLE_TAP:
      set_japanese_mode(false);
+      register_code(KC_ESC);
      break;
    case HOLD:
      break;
@@ -36,18 +39,19 @@ void td_lower_finished(qk_tap_dance_state_t *state, void *user_data) {
 }

 void td_lower_reset(qk_tap_dance_state_t *state, void *user_data) {
-  if (td_status_lower == SINGLE_TAP) {
+  if (td_status.lower == DOUBLE_TAP) {
    unregister_code(KC_ESC);
  }
  layer_off(_LOWER);
-  td_status_lower = NONE;
+  td_status.lower = NONE;
 }

 void td_raise_finished(qk_tap_dance_state_t *state, void *user_data) {
-  td_status_raise = cur_dance(state);
-  switch(td_status_raise) {
-    case SINGLE_TAP:
+  td_status.raise = cur_dance(state);
+  switch(td_status.raise) {
    case DOUBLE_TAP:
+      // same as single
+    case SINGLE_TAP:
      set_japanese_mode(true);
      break;
    case HOLD:
@@ -58,14 +62,12 @@ void td_raise_finished(qk_tap_dance_state_t *state, void *user_data) {

 void td_raise_reset(qk_tap_dance_state_t *state, void *user_data) {
  layer_off(_RAISE);
-  td_status_raise = NONE;
+  td_status.raise = NONE;
 }

 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(
-      NULL, td_lower_finished, td_lower_reset, TAPPING_TERM * 1.5
-      ),
-  [TD_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(
-      NULL, td_raise_finished, td_raise_reset, TAPPING_TERM * 1.5
-      )
+  [TD_LOWER] =
+    ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_lower_finished, td_lower_reset, 100),
+  [TD_RAISE] =
+    ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_raise_finished, td_raise_reset, 100)
 };
@@ -5,49 +5,20 @@ epaew's Enhanced Dvorak layout for Japanese Programmer
 ## Layout overview
 This is a sample. You can swap any symbol keys and modifier keys.

- Base layer (for ansi layout)
+- Basic layout (for ansi)
 ```
  //+----+----+----+----+----+----+----+----+----+----+----+----+----+---------+
      `  , !  , @  , #  , $  , %  , ^  , &  , *  , (  , )  , [  , ]  ,  BSPC   ,
  //+----+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+-------+
-      TAB  , '  , ,  , .  , Y  , P  , F  , G  , R  , W  , Q  , /  , =  ,   \   ,
+      TAB  , '  , ,  , .  , Y  , Q  , F  , G  , R  , W  , P  , /  , =  ,   \   ,
  //+------++---++---++---++---++---++---++---++---++---++---++---++---+-------+
      CAPS  , A  , O  , E  , I  , U  , D  , T  , N  , S  , M  , -  ,    ENT    ,
  //+-------+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-----------+
-       LSFT   , ;  , X  , C  , V  , Z  , B  , H  , J  , K  , L  ,     RSFT     ,
+       LSFT   , :  , X  , C  , V  , Z  , H  , J  , K  , L  , B  ,     RSFT     ,
  //+------+--+---++----++---+----+----+----+----+-+--+---++----++------+------+
      LCTL , LGUI , LALT ,          SPACE          , RALT , RGUI , MENU , RCTL
  //+------+------+------+-------------------------+------+------+------+------+
 ```
- Base layer (for iso layout)
-  - Two C keys are placed, it's on purpose.
-```
-  //+----+----+----+----+----+----+----+----+----+----+----+----+----+---------+
-      `  , !  , @  , #  , $  , %  , ^  , &  , *  , (  , )  , [  , ]  ,  BSPC   ,
-  //+----+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+-------+
-      TAB  , '  , ,  , .  , Y  , P  , F  , G  , R  , W  , C  , /  , =  ,
-  //+------++---++---++---++---++---++---++---++---++---++---++---++---++
-      CAPS  , A  , O  , E  , I  , U  , D  , T  , N  , S  , M  , ;  , -  , ENT  ,
-  //+-------+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+------+
-       LSFT   , Q  , X  , C  , V  , Z  , B  , H  , J  , K  , L  , \  ,  RSFT   ,
-  //+------+--+---++----++---+----+----+----+----+-+--+---++----++---+--+------+
-      LCTL , LGUI , LALT ,          SPACE          , RALT , RGUI , MENU , RCTL
-  //+------+------+------+-------------------------+------+------+------+------+
-```
- Additional layer (common, blanks are transparent)
-```
-  //+----+----+----+----+----+----+----+----+----+----+----+----+----+---------+
-         ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,    ,         ,
-  //+----+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+-------+
-           , AI , OU , EI ,    ,    ,    ,    ,    ,    ,    ,    ,    ,       ,
-  //+------++---++---++---++---++---++---++---++---++---++---++---++---+-------+
-            , A  , O  , E  , I  , U  ,    , Y1 , N  , Y2 ,    ,    ,           ,
-  //+-------+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-+--+-----------+
-              ,ANN ,ONN ,ENN ,INN ,UNN ,    ,    ,    ,    ,    ,              ,
-  //+------+--+---++----++---+----+----+----+----+-+--+---++----++------+------+
-           ,      ,      ,                         ,      ,      ,      ,
-  //+------+------+------+-------------------------+------+------+------+------+
-```

 And you can see [my iris keyboard layout](../../keyboards/iris/keymaps/edvorakjp/keymap.c) for sample implementation, too.

@@ -57,36 +28,25 @@ This is a sample. You can swap any symbol keys and modifier keys.
  - IME 切り替えキー
    - 長押しでレイヤー切り替え、短押しでIME切り替え
    - macOS(かな/英数)、Windows(Alt+\`)の両方に対応
-  - DvorakJP(<http://www7.plala.or.jp/dvorakjp/>)を参考にした日本語入力用キーの導入
-    - 拗音入力用のYキーを追加配置
-    - 二重母音入力用のキー(AI, OU, EI)
-    - 撥音入力用のキー(ANN, ONN, ENN, INN, UNN)
-    - いずれかの子音を押下することで Additional layer が出現し、いずれかの母音を押下することで Base layer に戻ります（※1※2）
-      - ※1促音の入力に使うため、また連続で同じ指での打鍵を減らすために、  
-        FGRDTNBHJ を押下した場合はy1が、それ以外の子音を押下した場合はy2が出現しません
-      - ※2撥音の入力のため、nを2連打すると、Base layerに戻ります
 - Define some custom keys for typing Japanese
  - IME switching
    - act as LOWER/RAISE when hold, act as IME switching when tapped
    - for macOS(かな/英数), for Windows(Alt+\`)
-  - oneshot combination keys, inspired from DvorakJP (<http://www7.plala.or.jp/dvorakjp/>)
-    - additional Y key to enter a contracted sound
-    - diphthong keys (AI, OU, EI)
-    - syllabic nasal (ANN, ONN, ENN, INN, UNN)
-    - Additional layer is appeared when you taps any consonant keys, and disappeared when you taps any diphthong keys.

 ## for Programmer

 - Dvorak 配列をベースに、ショートカットでよく利用される XCV は QWERTY 配列の位置を維持
 - 一部にVimユーザ用のキー配置を実施
    - HJKL キーを横並びで配置
-    - Shift押下時と非押下時で、";"キーの挙動を入れ替え（`config.h` 内で `#define SWAP_SCLN` の宣言が必要です）
+    - Shift押下時と非押下時で、";"キーの挙動を入れ替え  
+      （`config.h` 内で `#define SWAP_SCLN` の宣言が必要です）
 - デフォルトレイヤーには、数字キーの代わりに記号 `!@#$%^&*()` を配置

 - mainly based on Dvorak layout, but XCV is available in the same position of QWERTY layout
 - for Vim users
    - HJKL is lining side by side
-    - swap the ";" key behavior. i.e. send ":" normally and send ";" when you hold shift. (need `#define SWAP_SCLN` in your `config.h`)
+    - swap the ";" key behavior. i.e. send ":" normally and send ";" when you hold shift.  
+      (need `#define SWAP_SCLN` in your `config.h`)
 - we can type `!@#$%^&*()` keys without shift keys in base layer

 ## License
Author	SHA1	Message	Date
skullY	471722f495	wip	2019-03-17 01:56:27 -07:00
skullY	5e66140fbc	wip	2019-03-17 01:56:27 -07:00
skullY	ef8de0e6f0	wip	2019-03-17 01:56:27 -07:00
skullY	d495b26d2d	wip	2019-03-17 01:56:27 -07:00
skullY	e992079e08	stm32 cleanup	2019-03-17 01:56:26 -07:00
skullY	0aa30138ff	Get Clueboard 66% hotswap working with led_matrix	2019-03-17 01:56:26 -07:00
skullY	aa11627383	Bring this branch up to date with led_matrix	2019-03-17 01:55:58 -07:00
skullY	5c132afbf5	wip	2019-03-17 01:55:09 -07:00
skullY	b4feae42b4	Fix LAYOUT_66_ansi	2019-03-17 01:52:24 -07:00
skullY	b867398408	Initial Clueboard 66% arm support	2019-03-17 01:52:24 -07:00
epaew	9d915ed051	Update edvorak keymap simplify (#5350 ) * Update edvorakjp layouts * swap master hand * update tapping_term	2019-03-09 08:22:21 -08:00
Vyolle	cd9e15036e	Swapped Gui keys and Shift Keys. I think it's more ergonomic in this configuration. (#5347 )	2019-03-08 14:37:40 -08:00
enkore	fef206f661	getting_started_build_tools: dfu-{util,programmer} now available from arch repo See https://www.archlinux.org/packages/extra/x86_64/dfu-programmer/	2019-03-08 10:18:21 -08:00