merging

diff --cc build_keyboard.mk
Simple merge

diff --cc keyboards/ergodox/keymaps/jack/config.h
index f0932084a0ec43565d7a592a1323c5c3ba211024,0000000000000000000000000000000000000000..1781563b84a8755b46c08a6faa75ebd24d0398a7
mode 100644,000000..100644
--- 1/keyboards/ergodox/keymaps/jack/config.h
--- /dev/null
+++ b/keyboards/ergodox/keymaps/jack/config.h
@@@ -1,14 -1,0 +1,14 @@@
- #define RGBLIGHT_HUE_STEP 8
- #define RGBLIGHT_SAT_STEP 8
- #define RGBLIGHT_VAL_STEP 8
 +#ifndef CONFIG_USER_H
 +#define CONFIG_USER_H
 +
 +#include "../../config.h"
 +
 +/* ws2812 RGB LED */
 +#define RGB_DI_PIN D7
 +// #define RGBLIGHT_TIMER
 +#define RGBLED_NUM 15     // Number of LEDs
++#define RGBLIGHT_HUE_STEP 12
++#define RGBLIGHT_SAT_STEP 255
++#define RGBLIGHT_VAL_STEP 12
 +
 +#endif

diff --cc keyboards/ergodox/keymaps/jack/keymap.c
index fabd27a618af2f9ed590973e0b1afa6c13410dd3,dda253fa4538ff940198766b2bf5690d64cb7f8b..8721b9644abb3d3ab56a4c26851dc0a22d96a3bf
--- 1/keyboards/ergodox/keymaps/jack/keymap.c
--- 2/keyboards/ergodox/keymaps/jack/keymap.c
+++ b/keyboards/ergodox/keymaps/jack/keymap.c
@@@ -19,13 -19,13 +19,13 @@@ const uint16_t PROGMEM keymaps[][MATRIX
                                                                KC_HOME,
                                                 KC_SPC,KC_SPC,KC_END,
          // right hand
--             KC_NO,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_NO,
--             KC_NO,     KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSPC,
--                        KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,          KC_QUOT,
++             KC_NO,     M(1),   KC_7,   KC_8,   KC_9,   KC_0,             KC_NO,
++             KC_NO,     RGB_TOG,   RGB_MOD,   RGB_HUI,   RGB_HUD,   KC_P,             KC_BSPC,
++                        RGB_SAI,   RGB_SAD,   RGB_VAI,   RGB_VAD,   KC_SCLN,          KC_QUOT,
               KC_NO,     KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_ENT,
                                    MO(1), KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,  
 -             KC_NO,        KC_NO,
 -             KC_PGUP,
 +             RGB_TOG,        RGB_HUI,
 +             RGB_MOD,
               KC_PGDN, KC_SPC,KC_SPC
      ),
  [SYMB] = KEYMAP(
@@@ -84,6 -84,6 +84,11 @@@ const macro_t *action_get_macro(keyreco
            unregister_code(KC_RSFT);
          }
          break;
++        case 1:
++        if (record->event.pressed) { // For resetting EEPROM
++          eeconfig_init();
++        }
++        break;
        }
      return MACRO_NONE;
  };

diff --cc quantum/keymap.h
Simple merge

diff --cc quantum/light_ws2812.c
index d38dac4c69f85f521711502db74b2b7872e7ffb3,401845e8552bd6cee3f53596e4c05610c4d15e4f..497543339b76674f022ed7091f73aa8f7af5d9b1
--- 1/quantum/light_ws2812.c
--- 2/quantum/light_ws2812.c
+++ b/quantum/light_ws2812.c
@@@ -152,31 -36,12 +152,35 @@@ void inline ws2812_setleds_pin(struct c
  // Setleds for SK6812RGBW
  void inline ws2812_setleds_rgbw(struct cRGBW *ledarray, uint16_t leds)
  {
-   // ws2812_DDRREG |= _BV(ws2812_pin); // Enable DDR
-   // new universal format (DDR)
-   _SFR_IO8((RGB_DI_PIN >> 4) + 1) |= _BV(RGB_DI_PIN & 0xF);
- 
-   ws2812_sendarray_mask((uint8_t*)ledarray,leds<<2,_BV(RGB_DI_PIN & 0xF));
 +
 +  #ifdef RGBW_BB_TWI
 +    cli();
 +    TWCR = 0;
 +    I2C_Init();
 +    I2C_Start();
 +    I2C_Write(0x84);
 +    uint16_t datlen = leds<<2;
 +    uint8_t curbyte;
 +    uint8_t * data = (uint8_t*)ledarray;
 +    while (datlen--) {
 +      curbyte=*data++;
-       I2C_Write(curbyte % 0x10);
++      I2C_Write(curbyte);
 +    }
 +    I2C_Stop();
 +    sei();
++  #else
++    _delay_us(80);
 +  #endif
 +
 +
-   _delay_us(80);
+   // ws2812_DDRREG |= _BV(ws2812_pin); // Enable DDR
+   // new universal format (DDR)
+   _SFR_IO8((RGB_DI_PIN >> 4) + 1) |= _BV(RGB_DI_PIN & 0xF);
+ 
+   ws2812_sendarray_mask((uint8_t*)ledarray,leds<<2,_BV(RGB_DI_PIN & 0xF));
 -  _delay_us(80);
++
++
++
  }
  
  void ws2812_sendarray(uint8_t *data,uint16_t datlen)
@@@ -258,7 -123,7 +262,7 @@@ void inline ws2812_sendarray_mask(uint8
    cli();
  
    while (datlen--) {
-     curbyte=(*data++) % 0x10;
 -    curbyte=*data++;
++    curbyte=(*data++);
  
      asm volatile(
      "       ldi   %0,8  \n\t"

diff --cc quantum/quantum.c
index 5fa5e66b32966f484cee5413515b899d70ec87d9,098312e6ef545c15c0a8956b4d79094587893647..b8a81a76ba4511ef65bd95b4fe68adaad69cd553
--- 1/quantum/quantum.c
--- 2/quantum/quantum.c
+++ b/quantum/quantum.c
@@@ -129,8 -129,8 +129,10 @@@ bool process_record_quantum(keyrecord_
    #ifdef UCIS_ENABLE
      process_ucis(keycode, record) &&
    #endif
 +  #ifdef PRINTING_ENABLE
 +    process_printer(keycode, record) &&
+   #ifdef UNICODEMAP_ENABLE
+     process_unicode_map(keycode, record) &&
    #endif
        true)) {
      return false;

diff --cc quantum/rgblight.c
Simple merge

diff --cc quantum/rgblight.h
Simple merge