add sample and wavetable examples, parsers for both

keyboards/boardwalk/keymaps/brendanwr/config.h

@@ -1,16 +0,0 @@
-/*
- * 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/>.
- */
-
-#pragma once

keyboards/boardwalk/keymaps/brendanwr/keymap.c

@@ -1,95 +0,0 @@
-/*
- * 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 QMK_KEYBOARD_H
-
-enum layer {
-  _BASE,
-  _FN,
-  _BACKLIT
-};
-
-
-#define FN MO(_FN)
-#define BACKLIT MO(_BACKLIT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* BASE
- * .-----------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | +      | \      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | LCTRL  | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | ENTER  | HOME   |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | RSHIFT | FN     | END    |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
- * |        | LALT  | LGUI       |                             SPACE                            | RGUI        | RALT    |        |
- * '-----------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_BASE] = LAYOUT_ortho_7u(
-  KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSLS,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSPC,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,   KC_HOME,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  FN,       KC_END,
-           KC_LALT, KC_LGUI,                                KC_SPC,                                 KC_RGUI, KC_RALT          
- ),
-
-/* FUNCTION
- * .-----------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | `      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        |        |        |        |        |        |        |        |        |        | UP     |        |        | DEL    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        | VOLD   | VOLU   | MUTE   |        |        |        |        |        |        | LEFT   | RIGHT  |        | PG_UP  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        |        | DOWN   |        |        | PG_DN  |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
- * |        |       |            |                                                              |             |         |        |
- * '-----------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_FN] = LAYOUT_ortho_7u(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  KC_GRV,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   _______, _______, KC_DEL,
-  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, KC_PGUP,
-  BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, KC_PGDN,
-          _______,  _______,                                  _______,                               _______, _______       
- ),
-
-/* BACKLIT 
- * .-----------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * |        | RGBTOG | RGBMOD | RGBHUI | RGBHUD | RGBSAI | RGBSAD | RGBVAI | RGBVAD |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+--------|
- * |        |       |            |                                                              |             |         |        |
- * '-----------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_BACKLIT] = LAYOUT_ortho_7u(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-          _______,  _______,                                  _______,                               _______, _______       
- )
-};

keyboards/crkbd/keymaps/drashna/config.h

@@ -27,8 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#undef USE_I2C
-#undef SSD1306OLED
+// #define SSD1306OLED
 
 #define USE_SERIAL_PD2
 
@@ -36,42 +35,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define TAPPING_TERM 100
 
 #ifdef RGBLIGHT_ENABLE
-#   undef RGBLED_NUM
-#   define RGBLED_NUM 27
+#undef RGBLED_NUM
+#define RGBLED_NUM 27
 
-#   define RGBLIGHT_HUE_STEP 8
-#   define RGBLIGHT_SAT_STEP 8
-#   define RGBLIGHT_VAL_STEP 8
-#   define RGBLIGHT_LIMIT_VAL 100
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 100
 #endif
 
-#ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-
-#   define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#   define DISABLE_RGB_MATRIX_CYCLE_ALL
-#   define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#   define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#   define DISABLE_RGB_MATRIX_DUAL_BEACON
-#   define DISABLE_RGB_MATRIX_RAINBOW_BEACON
-#   define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define DISABLE_RGB_MATRIX_RAINDROPS
-// #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#   define DISABLE_RGB_MATRIX_DIGITAL_RAIN
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#   define DISABLE_RGB_MATRIX_SOLID_SPLASH
-#   define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
 #ifdef AUDIO_ENABLE
-#   define B6_AUDIO
+#define B6_AUDIO
 // #define NO_MUSIC_MODE
 #endif
 

keyboards/crkbd/keymaps/drashna/keymap.c

@@ -1,5 +1,15 @@
 #include QMK_KEYBOARD_H
 #include "drashna.h"
+#ifdef PROTOCOL_LUFA
+  #include "lufa.h"
+  #include "split_util.h"
+#endif
+#ifdef SSD1306OLED
+  #include "ssd1306.h"
+#endif
+#ifdef OLED_DRIVER_ENABLE
+  #include "oled_driver.h"
+#endif
 
 extern keymap_config_t keymap_config;
 extern uint8_t is_master;
@@ -10,7 +20,7 @@ extern rgblight_config_t rgblight_config;
 #endif
 
 enum crkbd_keycodes {
-    RGBRST = NEW_SAFE_RANGE
+  RGBRST = NEW_SAFE_RANGE
 };
 
 #define LAYOUT_crkbd_base( \
@@ -21,7 +31,7 @@ enum crkbd_keycodes {
   LAYOUT_wrapper( \
     KC_ESC,  K01,    K02,     K03,      K04,     K05,                        K06,     K07,     K08,     K09,     K0A,     KC_MINS, \
     KC_TAB, ALT_T(K11),  K12, K13,      K14,     K15,                        K16,     K17,     K18,     K19,     K1A, RGUI_T(KC_QUOT), \
-    OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,                        K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT, \
+    OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,                        K26,     K27,     K28,     K29,  CTL_T(K2A), OS_RSFT, \
                            LT(_LOWER,KC_GRV), KC_SPC,  KC_BSPC,     KC_DEL,  KC_ENT,  RAISE                                        \
   )
 #define LAYOUT_crkbd_base_wrapper(...)       LAYOUT_crkbd_base(__VA_ARGS__)
@@ -105,38 +115,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_init_keymap(void) {
-#ifndef CONVERT_TO_PROTON_C
+  //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
+  #ifdef SSD1306OLED
+    iota_gfx_init(!has_usb());   // turns on the display
+  #endif
+
+  #ifndef CONVERT_TO_PROTON_C
     setPinOutput(D5);
     writePinHigh(D5);
 
     setPinOutput(B0);
     writePinHigh(B0);
-#endif
+  #endif
 }
 
+//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
+#ifdef SSD1306OLED
 
-#ifdef OLED_DRIVER_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (is_master) {
-        return OLED_ROTATION_270;
-    } else {
-        return rotation;
-    }
-}
+// When add source files to SRC in rules.mk, you can use functions.
+const char *read_logo(void);
+char layer_state_str[24];
+char modifier_state_str[24];
+char host_led_state_str[24];
+char keylog_str[24] = {};
+char keylogs_str[21] = {};
+int keylogs_str_idx = 0;
 
-void render_crkbd_logo(void) {
-    static const char PROGMEM crkbd_logo[] = {
-        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-        0};
-    oled_write_P(crkbd_logo, false);
-}
-
-#define KEYLOG_LEN (int)(32 / OLED_FONT_WIDTH)
-char keylog_str[KEYLOG_LEN] = {};
-uint8_t keylogs_str_idx = 0;
-uint16_t log_timer = 0;
+// const char *read_mode_icon(bool swap);
+// void set_timelog(void);
+// const char *read_timelog(void);
 
 const char code_to_name[60] = {
     ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
@@ -146,124 +153,261 @@ const char code_to_name[60] = {
     'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
     '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
 
-void add_keylog(uint16_t keycode) {
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
-        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+  char name = ' ';
+  if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
+  if (keycode < 60) {
+    name = code_to_name[keycode];
+  }
+  // update keylog
+  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
+           record->event.key.row, record->event.key.col,
+           keycode, name);
 
-    for (uint8_t i = KEYLOG_LEN - 1; i > 0; i--) {
-        keylog_str[i] = keylog_str[i - 1];
+  // update keylogs
+  if (keylogs_str_idx == sizeof(keylogs_str) - 1) {
+    keylogs_str_idx = 0;
+    for (int i = 0; i < sizeof(keylogs_str) - 1; i++) {
+      keylogs_str[i] = ' ';
     }
-    if (keycode < 60) {
-        keylog_str[0] = code_to_name[keycode];
-    }
-    log_timer = timer_read();
+  }
+
+  keylogs_str[keylogs_str_idx] = name;
+  keylogs_str_idx++;
 }
 
-void update_log(void) {
-    if (timer_elapsed(log_timer) > 750) {
-        add_keylog(0);
-    }
+const char *read_keylog(void) {
+  return keylog_str;
 }
 
+const char *read_keylogs(void) {
+  return keylogs_str;
+}
+
+
+const char* read_modifier_state(void) {
+  uint8_t modifiers = get_mods();
+  uint8_t one_shot = get_oneshot_mods();
+
+  snprintf(modifier_state_str, sizeof(modifier_state_str), "Mods:%s %s %s %s",
+    (modifiers & MOD_MASK_CTRL || one_shot & MOD_MASK_CTRL) ? "CTL" : "   ",
+    (modifiers & MOD_MASK_GUI || one_shot & MOD_MASK_GUI) ? "GUI" : "   ",
+    (modifiers & MOD_MASK_ALT || one_shot & MOD_MASK_ALT) ? "ALT" : "   ",
+    (modifiers & MOD_MASK_SHIFT || one_shot & MOD_MASK_SHIFT) ? "SFT" : "   "
+  );
+
+  return modifier_state_str;
+}
+
+const char *read_host_led_state(void) {
+  uint8_t leds = host_keyboard_leds();
+
+  snprintf(host_led_state_str, sizeof(host_led_state_str), "NL:%s CL:%s SL:%s",
+    (leds & (1 << USB_LED_NUM_LOCK)) ? "on" : "- ",
+    (leds & (1 << USB_LED_CAPS_LOCK)) ? "on" : "- ",
+    (leds & (1 << USB_LED_SCROLL_LOCK)) ? "on" : "- "
+  );
+
+  return host_led_state_str;
+}
+
+const char* read_layer_state(void) {
+  switch (biton32(layer_state)) {
+    case _RAISE:
+      snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise  ");
+      break;
+    case _LOWER:
+      snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower  ");
+      break;
+    case _ADJUST:
+      snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust ");
+      break;
+    default:
+      switch (biton32(default_layer_state)) {
+        case _QWERTY:
+          snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Qwerty ");
+          break;
+        case _COLEMAK:
+          snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Colemak");
+          break;
+        case _DVORAK:
+          snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Dvorak ");
+          break;
+        case _WORKMAN:
+          snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Workman");
+          break;
+      }
+      break;
+  }
+
+    return layer_state_str;
+}
+
+void matrix_scan_keymap(void) {
+   iota_gfx_task();
+}
+
+void matrix_render_user(struct CharacterMatrix *matrix) {
+  if (is_master) {
+    //If you want to change the display of OLED, you need to change here
+    matrix_write_ln(matrix, read_layer_state());
+    matrix_write_ln(matrix, read_modifier_state());
+    // matrix_write_ln(matrix, read_keylog());
+    matrix_write_ln(matrix, read_keylogs());
+    // matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
+    // matrix_write(matrix, read_host_led_state());
+    //matrix_write_ln(matrix, read_timelog());
+  } else {
+    matrix_write(matrix, read_logo());
+  }
+}
+
+void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
+  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
+    memcpy(dest->display, source->display, sizeof(dest->display));
+    dest->dirty = true;
+  }
+}
+
+void iota_gfx_task_user(void) {
+  struct CharacterMatrix matrix;
+  matrix_clear(&matrix);
+  matrix_render_user(&matrix);
+  matrix_update(&display, &matrix);
+}
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {  add_keylog(keycode); }
-    return true;
+  switch (keycode) {
+    case KC_A ... KC_SLASH:
+    case KC_F1 ... KC_F12:
+    case KC_INSERT ... KC_UP:
+    case KC_KP_SLASH ... KC_KP_DOT:
+    case KC_F13 ... KC_F24:
+    if (record->event.pressed) { set_keylog(keycode, record); }
+      break;
+    // set_timelog();
+  }
+  return true;
 }
 
+#endif
+
+
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (is_master) {
+    return OLED_ROTATION_270;
+  } else {
+    return rotation;
+  }
+}
+
+void render_crkbd_logo(void) {
+  static const char PROGMEM crkbd_logo[] = {
+      0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+      0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+      0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+      0};
+  oled_write_P(crkbd_logo, false);
+}
+
+
 void render_status(void) {
 
-    oled_write_P(PSTR("Layer"), false);
-    switch (biton32(layer_state)) {
-        case 0:
-            oled_write_P(PSTR("Base "), false);
-            break;
-        case _RAISE:
-            oled_write_P(PSTR("Raise"), false);
-            break;
-        case _LOWER:
-            oled_write_P(PSTR("Lower"), false);
-            break;
-        case _ADJUST:
-            oled_write_P(PSTR("Adjst"), false);
-            break;
-        default:
-            oled_write_P(PSTR("Unkn "), false);
-            break;
-    }
-    oled_write_P(PSTR("Lyout"), false);
-    switch (biton32(default_layer_state)) {
-        case _QWERTY:
-            oled_write_P(PSTR("QWRTY"), false);
-            break;
-        case _COLEMAK:
-            oled_write_P(PSTR("COLMK"), false);
-            break;
-        case _DVORAK:
-            oled_write_P(PSTR("DVRAK"), false);
-            break;
-        case _WORKMAN:
-            oled_write_P(PSTR("WRKMN"), false);
-            break;
-        case _NORMAN:
-            oled_write_P(PSTR("NORMN"), false);
-            break;
-        case _MALTRON:
-            oled_write_P(PSTR("MLTRN"), false);
-            break;
-        case _EUCALYN:
-            oled_write_P(PSTR("ECLYN"), false);
-            break;
-        case _CARPLAX:
-            oled_write_P(PSTR("CRPLX"), false);
-            break;
-    }
+  oled_write_P(PSTR("Layer"), false);
+  switch (biton32(layer_state)) {
+    case 0:
+      oled_write_P(PSTR("Base "), false);
+      break;
+    case _RAISE:
+      oled_write_P(PSTR("Raise"), false);
+      break;
+    case _LOWER:
+      oled_write_P(PSTR("Lower"), false);
+      break;
+    case _ADJUST:
+      oled_write_P(PSTR("Adjst"), false);
+      break;
+    default:
+      oled_write_P(PSTR("Unkn "), false);
+      break;
+  }
+  oled_write_P(PSTR("Lyout"), false);
+  switch (biton32(default_layer_state)) {
+    case _QWERTY:
+      oled_write_P(PSTR("QWRTY"), false);
+      break;
+    case _COLEMAK:
+      oled_write_P(PSTR("COLMK"), false);
+      break;
+    case _DVORAK:
+      oled_write_P(PSTR("DVRAK"), false);
+      break;
+    case _WORKMAN:
+      oled_write_P(PSTR("WRKMN"), false);
+      break;
+    case _NORMAN:
+      oled_write_P(PSTR("NORMN"), false);
+      break;
+    case _MALTRON:
+      oled_write_P(PSTR("MLTRN"), false);
+      break;
+    case _EUCALYN:
+      oled_write_P(PSTR("ECLYN"), false);
+      break;
+    case _CARPLAX:
+      oled_write_P(PSTR("CRPLX"), false);
+      break;
+  }
 
-    uint8_t modifiers = get_mods();
-    uint8_t one_shot = get_oneshot_mods();
+  uint8_t modifiers = get_mods();
+  uint8_t one_shot = get_oneshot_mods();
 
-    oled_write_P(PSTR("Mods:"), false);
-    oled_write_P( (modifiers & MOD_MASK_SHIFT || one_shot & MOD_MASK_SHIFT) ? PSTR(" SFT ") : PSTR("     "), false);
-    oled_write_P( (modifiers & MOD_MASK_CTRL  || one_shot & MOD_MASK_CTRL ) ? PSTR(" CTL ") : PSTR("     "), false);
-    oled_write_P( (modifiers & MOD_MASK_ALT   || one_shot & MOD_MASK_ALT  ) ? PSTR(" ALT ") : PSTR("     "), false);
-    oled_write_P( (modifiers & MOD_MASK_GUI   || one_shot & MOD_MASK_GUI  ) ? PSTR(" GUI ") : PSTR("     "), false);
+  oled_write_P(PSTR("Mods:"), false);
+  oled_write_P( (modifiers & MOD_MASK_CTRL  || one_shot & MOD_MASK_CTRL ) ? PSTR(" CTL ") : PSTR("     "), false);
+  oled_write_P( (modifiers & MOD_MASK_GUI   || one_shot & MOD_MASK_GUI  ) ? PSTR(" GUI ") : PSTR("     "), false);
+  oled_write_P( (modifiers & MOD_MASK_ALT   || one_shot & MOD_MASK_ALT  ) ? PSTR(" ALT ") : PSTR("     "), false);
+  oled_write_P( (modifiers & MOD_MASK_SHIFT || one_shot & MOD_MASK_SHIFT) ? PSTR(" SFT ") : PSTR("     "), false);
 
 
-    oled_write_P(PSTR("BTMGK"), false);
+  oled_write_P(PSTR("BTMGK"), false);
+  static const char PROGMEM mode_logo[4][4] = {
+    {0x95,0x96,0x0a,0},
+    {0xb5,0xb6,0x0a,0},
+    {0x97,0x98,0x0a,0},
+    {0xb7,0xb8,0x0a,0} };
 
-    if (keymap_config.swap_lalt_lgui) {
-        oled_write_P(PSTR(" Mac "), false);
-    } else {
-        oled_write_P(PSTR(" Win "), false);
-    }
+  if (keymap_config.swap_lalt_lgui != false) {
+    oled_write_P(mode_logo[0], false);
+    oled_write_P(mode_logo[1], false);
+  } else {
+    oled_write_P(mode_logo[2], false);
+    oled_write_P(mode_logo[3], false);
+  }
 
-    uint8_t led_usb_state = host_keyboard_leds();
-    oled_write_P(PSTR("Lock:"), false);
-    oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK)    ? PSTR(" NUM ") : PSTR("     "), false);
-    oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK)   ? PSTR(" CAPS") : PSTR("     "), false);
-    oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR(" SCRL") : PSTR("     "), false);
-
-    oled_write(keylog_str, false);
+  uint8_t led_usb_state = host_keyboard_leds();
+  oled_write_P(PSTR("Lock:"), false);
+  oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK)    ? PSTR(" NUM ") : PSTR("     "), false);
+  oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK)   ? PSTR(" CAPS") : PSTR("     "), false);
+  oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR(" SCRL") : PSTR("     "), false);
 }
 
 
 void oled_task_user(void) {
-    if (is_master) {
-        render_status();     // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_crkbd_logo();
-        oled_scroll_left();  // Turns on scrolling
-    }
+  if (is_master) {
+    render_status();     // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+  } else {
+    render_crkbd_logo();
+    oled_scroll_left();  // Turns on scrolling
+  }
 }
-
-void matrix_scan_keymap(void) { update_log(); }
 #endif
 
 uint16_t get_tapping_term(uint16_t keycode) {
-    switch (keycode) {
-        case ALT_T(KC_A):
-            return TAPPING_TERM + 100;
-        default:
-            return TAPPING_TERM;
-    }
+  switch (keycode) {
+    case ALT_T(KC_A):
+      return TAPPING_TERM + 100;
+    default:
+      return TAPPING_TERM;
+  }
 }

keyboards/crkbd/keymaps/drashna/rules.mk

@@ -14,10 +14,9 @@ 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            = no  # Enable WS2812 RGB underlight.
+RGBLIGHT_ENABLE            = yes # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE          = no  # Enable one-hand typing
 RGBLIGHT_STARTUP_ANIMATION = yes
-RGB_MATRIX_ENABLE = WS2812
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
@@ -25,7 +24,3 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 BOOTLOADER = qmk-dfu
 
 OLED_DRIVER_ENABLE = yes
-
-ifneq ($(strip $(OLED_DRIVER_ENABLE)), yes)
-    RGB_MATRIX_SPLIT_RIGHT=yes
-endif

keyboards/crkbd/keymaps/like_jis/keymap.c

@@ -11,6 +11,11 @@
 
 extern keymap_config_t keymap_config;
 
+#ifdef RGBLIGHT_ENABLE
+//Following line allows macro to read current RGB settings
+extern rgblight_config_t rgblight_config;
+#endif
+
 extern uint8_t is_master;
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -236,7 +241,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 void matrix_init_user(void) {
   #ifdef RGBLIGHT_ENABLE
     RGB_current_mode = rgblight_config.mode;
-    UPDATE_KEYMAP_STATUS();
   #endif
   //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
   #ifdef SSD1306OLED

keyboards/crkbd/keymaps/rs/config.h

@@ -1,44 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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/>.
-*/
-
-#pragma once
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define SSD1306OLED
-
-#define USE_SERIAL_PD2
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 300
-
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 27
-#define RGBLIGHT_LIMIT_VAL 120
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17

keyboards/crkbd/keymaps/rs/keymap.c

@@ -1,39 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "rs.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,EQL ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     ESCC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+              |----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  ,                N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LGUI,SPC ,         BSPC,CODE,FN
-  //                  `----+----+----'        `+---+----+----'c
-  ),
-  [_CODE] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     GRV ,EXLM, AT ,HASH, DLR,PERC,               CIRC,LPLT,ASTR,RPGT,NEQL,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , 1  , 2  , 3  , 4  , 5  ,               MINS,LBRC, UP ,RBRC,    ,BSLS,
-  //|----+----+----+----+----+----+              |----+----+----+----+----+----|
-         , 6  , 7  , 8  , 9  , 0  ,               AMPR,LEFT,DOWN,RGHT,    ,PIPE,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,DOT ,             ,    ,
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_FN] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 , F10, F11,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     LTOG,LHUI,LSAI,LVAI,LRST,BRMU,               VOLU,    ,PGUP,    ,    ,    ,
-  //|----+----+----+----+----+----+              |----+----+----+----+----+----|
-     LMOD,LHUD,LSAD,LVAD,RST ,BRMD,               VOLD,CTRA,PGDN,CTRE,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,         MUTE,    ,     
-  //                  `----+----+----'        `----+----+----'
-  ),
-};
-

keyboards/crkbd/keymaps/rs/oled.c

@@ -1,104 +0,0 @@
-#ifdef SSD1306OLED
-#include QMK_KEYBOARD_H
-#include "ssd1306.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-extern uint8_t is_master;
-
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_logo(void);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-
-void matrix_scan_user(void) { iota_gfx_task(); }
-
-typedef struct {
-  uint8_t state;
-  char name[8];
-} LAYER_DISPLAY_NAME;
-
-#define LAYER_DISPLAY_MAX 5
-const LAYER_DISPLAY_NAME layer_display_name[LAYER_DISPLAY_MAX] = {
-  {0, "Base"},
-  {2, "Code"},
-  {4, "Fn"},
-  {6, "Fn+Code"},
-  {__UINT8_MAX__, "?"},
-};
-static uint8_t layer_name_idx;
-static char layer_status_buf[24] = "Layer: Base\n";
-
-#ifdef RGBLIGHT_ENABLE
-// Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-void update_keymap_status(void) {
-  snprintf(layer_status_buf, sizeof(layer_status_buf) - 1, "Layer:%s RGB: %d\n",
-           layer_display_name[layer_name_idx].name, rgblight_config.mode);
-}
-#else
-void update_keymap_status(void) {
-  snprintf(layer_status_buf, sizeof(layer_status_buf) - 1, "Layer:%s\n",
-           layer_display_name[layer_name_idx].name);
-}
-#endif
-
-void matrix_init_user(void) {
-  iota_gfx_init(!has_usb()); // turns on the display
-  update_keymap_status();
-}
-
-// declared in users/rs/rs.c
-void rgb_mod_changed_keymap(void) {
-  update_keymap_status();
-}
-
-// declared in users/rs/rs.c
-void keylog_set_keymap(uint16_t keycode, keyrecord_t *record) {
-  set_keylog(keycode, record);
-}
-
-uint32_t layer_state_set_user(uint32_t state) {
-  for (layer_name_idx = 0; layer_name_idx < LAYER_DISPLAY_MAX; ++layer_name_idx) {
-    if (state == 0 && layer_display_name[layer_name_idx].state == default_layer_state) {
-      break;
-    } else if (state != 0 && layer_display_name[layer_name_idx].state == state) {
-      break;
-    }
-  }
-  update_keymap_status();
-  return state;
-}
-
-static inline void render_keymap_status(struct CharacterMatrix *matrix) {
-  matrix_write(matrix, layer_status_buf);
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
-    render_keymap_status(matrix);
-    matrix_write_ln(matrix, read_keylog());
-    matrix_write_ln(matrix, read_keylogs());
-  } else {
-    matrix_write(matrix, read_logo());
-  }
-}
-
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-
-#endif

keyboards/crkbd/keymaps/rs/readme.md

@@ -1,19 +0,0 @@
-# RS40: Code Friendly 40% Keymap
-
-This keymap is an evolution of my previous keymap optimized for coding with a 60% keyboards like the Iris. I tried to keep the simplicity of my previous keymap with all the keys necessary for coding on a single layer in addition to the base one.
-
-Because I sometime have to use my internal keyboard I my macbook, a karabiner configuration is also provided to get most of the features of this keyboard, including the code layer / backspace on right command key etc.
-
-See [rs readme](../../../../users/rs/readme.md) for a list of other keyboards supported by this keymap.
-
-## Base Layer
-
-[![](http://poitr.us/moooMf+)](http://www.keyboard-layout-editor.com/##@_backcolor=%23d8c1f5&switchMount=cherry&pcb:false&plate:true%3B&@_x:3&c=%236750f2&t=%2344b8b8&a:7%3B&=E&_x:8%3B&=I%3B&@_y:-0.87&x:2%3B&=W&_x:1%3B&=R&_x:6%3B&=U&_x:1%3B&=O%3B&@_y:-0.8799999999999999&x:5%3B&=T&_x:4%3B&=Y%3B&@_y:-0.87&c=%233a1ee6&t=%23b84465%3B&=Tab&_c=%236750f2&t=%2344b8b8%3B&=Q&_x:12%3B&=P&_c=%233a1ee6&t=%23b84465&a:5%3B&=+%0A%2F=%3B&@_y:-0.3799999999999999&x:3&c=%236750f2&t=%2344b8b8&a:7%3B&=D&_x:8%3B&=K%3B&@_y:-0.8700000000000001&x:2%3B&=S&_x:1%3B&=F&_x:6%3B&=J&_x:1%3B&=L%3B&@_y:-0.8799999999999999&x:5%3B&=G&_x:4%3B&=H%3B&@_y:-0.8700000000000001&c=%233a1ee6&t=%23b84465&a:5%3B&=Esc%0ACtrl&_c=%236750f2&t=%2344b8b8&a:7%3B&=A&_x:12&a:5%3B&=%2F:%0A%2F%3B&_c=%233a1ee6&t=%23b84465%3B&=%22%0A'%3B&@_y:-0.3799999999999999&x:3&c=%236750f2&t=%2344b8b8&a:7%3B&=C&_x:8&a:5%3B&=%3C%0A,%3B&@_y:-0.8700000000000001&x:2&a:7%3B&=X&_x:1%3B&=V&_x:6%3B&=M&_x:1&a:5%3B&=%3E%0A.%3B&@_y:-0.8799999999999999&x:5&a:7%3B&=B&_x:4%3B&=N%3B&@_y:-0.8700000000000001&c=%233a1ee6&t=%23b84465%3B&=Shift&_c=%236750f2&t=%2344b8b8%3B&=Z&_x:12&a:5%3B&=%3F%0A%2F%2F&_c=%233a1ee6&t=%23b84465&a:7%3B&=Enter%3B&@_y:-0.17999999999999972&x:11.75%3B&=Fn%3B&@_ry:0.25&y:2.95&x:3.3%3B&=Alt%3B&@_r:12&ry:1.75&y:0.5&x:4.8%3B&=Cmd%3B&@_r:35&rx:6.5&ry:4.25&y:-0.75&x:-0.75&c=%23d12424&t=%23ffffff&h:1.5%3B&=Space%3B&@_r:-35&rx:13&y:-2.75&x:-3.0999999999999996&h:1.5%3B&=Back%20Space%3B&@_r:-12&rx:0&ry:0&y:5.55&x:9.55&c=%233a1ee6&t=%23b84465%3B&=Code)
-
-## Code Layer
-
-[![](http://poitr.us/GvljvC+)](http://www.keyboard-layout-editor.com/##@_backcolor=%23d8c1f5&switchMount=cherry&pcb:false&plate:true%3B&@_x:3&c=%236750f2&t=%2344b8b8&a:7%3B&=%23&_x:8%3B&=*%3B&@_y:-0.87&x:2%3B&=%2F@&_x:1%3B&=$&_x:6&a:5%3B&=%3C%0A(&_x:1%3B&=%3E%0A)%3B&@_y:-0.8799999999999999&x:5&a:7%3B&=%25&_x:4%3B&=%5E%3B&@_y:-0.87&c=%233a1ee6&t=%23b84465%3B&=Tab&_c=%236750f2&t=%2344b8b8%3B&=!&_x:12%3B&=!%2F=&_c=%233a1ee6&t=%23b84465&a:5%3B&=+%0A%2F=%3B&@_y:-0.3799999999999999&x:3&c=%236750f2&t=%2344b8b8&a:7%3B&=3&_x:8%3B&=↑%3B&@_y:-0.8700000000000001&x:2%3B&=2&_x:1%3B&=4&_x:6&a:5%3B&=%7B%0A%5B&_x:1%3B&=%7D%0A%5D%3B&@_y:-0.8799999999999999&x:5&a:7%3B&=5&_x:4&a:5%3B&=%2F_%0A-%3B&@_y:-0.8700000000000001&c=%233a1ee6&t=%23b84465%3B&=Esc%0ACtrl&_c=%236750f2&t=%2344b8b8&a:7%3B&=1&_x:12&a:5%3B&=%2F:%0A%2F%3B&_c=%233a1ee6&t=%23b84465%3B&=%7C%0A%5C%3B&@_y:-0.3799999999999999&x:3&c=%236750f2&t=%2344b8b8&a:7%3B&=8&_x:8%3B&=↓%3B&@_y:-0.8700000000000001&x:2%3B&=7&_x:1%3B&=9&_x:6%3B&=←&_x:1%3B&=→%3B&@_y:-0.8799999999999999&x:5%3B&=0&_x:4%3B&=%2F&%3B&@_y:-0.8700000000000001&c=%233a1ee6&t=%23b84465%3B&=Shift&_c=%236750f2&t=%2344b8b8%3B&=6&_x:12&a:5%3B&=%3F%0A%2F%2F&_c=%233a1ee6&t=%23b84465&a:7%3B&=Enter%3B&@_y:-0.17999999999999972&x:11.75%3B&=Fn%3B&@_ry:0.25&y:2.95&x:3.3%3B&=Alt%3B&@_r:12&ry:1.75&y:0.5&x:4.8%3B&=Cmd%3B&@_r:35&rx:6.5&ry:4.25&y:-0.75&x:-0.75&c=%23d12424&t=%23ffffff&h:1.5%3B&=.%3B&@_r:-35&rx:13&y:-2.75&x:-3.0999999999999996&h:1.5%3B&=Back%20Space%3B&@_r:-12&rx:0&ry:0&y:5.55&x:9.55&c=%233a1ee6&t=%23b84465%3B&=Code)
-
-## Fn Layer
-
-[![](http://poitr.us/OXwmBK+)](http://www.keyboard-layout-editor.com/##@_backcolor=%23d8c1f5&switchMount=cherry&pcb:false&plate:true%3B&@_x:3&c=%236750f2&t=%2344b8b8&a:7%3B&=F3&_x:8%3B&=F8%3B&@_y:-0.87&x:2%3B&=F2&_x:1%3B&=F4&_x:6%3B&=F7&_x:1%3B&=F9%3B&@_y:-0.8799999999999999&x:5%3B&=F5&_x:4%3B&=F6%3B&@_y:-0.87&c=%233a1ee6&t=%23b84465%3B&=&_c=%236750f2&t=%2344b8b8%3B&=F1&_x:12%3B&=F10&_c=%233a1ee6&t=%23b84465%3B&=F11%3B&@_y:-0.3799999999999999&x:3&c=%236750f2&t=%2344b8b8%3B&=RGB%20Value+&_x:8%3B&=Page%20Up%3B&@_y:-0.8700000000000001&x:2%3B&=RGB%20Sat+&_x:1%3B&=RGB%20Reset&_x:6%3B&=&_x:1%3B&=%3B&@_y:-0.8799999999999999&x:5%3B&=Bright+&_x:4%3B&=Vol+%3B&@_y:-0.8700000000000001&c=%233a1ee6&t=%23b84465%3B&=RGB%20Toggle&_c=%236750f2&t=%2344b8b8%3B&=RGB%20Hue+&_x:12%3B&=&_c=%233a1ee6&t=%23b84465%3B&=%3B&@_y:-0.3799999999999999&x:3&c=%236750f2&t=%2344b8b8%3B&=RGB%20Value-&_x:8%3B&=Page%20Down%3B&@_y:-0.8700000000000001&x:2%3B&=RGB%20Sat-&_x:1%3B&=Reset&_x:6%3B&=Ctrl+A&_x:1%3B&=Ctrl+E%3B&@_y:-0.8799999999999999&x:5%3B&=Bright-&_x:4%3B&=Vol-%3B&@_y:-0.8700000000000001&c=%233a1ee6&t=%23b84465%3B&=RGB%20Mode&_c=%236750f2&t=%2344b8b8%3B&=RGB%20Hue-&_x:12%3B&=&_c=%233a1ee6&t=%23b84465%3B&=%3B&@_y:-0.17999999999999972&x:11.75%3B&=Fn%3B&@_ry:0.25&y:2.95&x:3.3%3B&=%3B&@_r:12&ry:1.75&y:0.5&x:4.8%3B&=%3B&@_r:35&rx:6.5&ry:4.25&y:-0.75&x:-0.75&c=%23d12424&t=%23ffffff&h:1.5%3B&=%3B&@_r:-35&rx:13&y:-2.75&x:-3.0999999999999996&h:1.5%3B&=Mute%3B&@_r:-12&rx:0&ry:0&y:5.55&x:9.55&c=%233a1ee6&t=%23b84465%3B&=Code)

keyboards/crkbd/keymaps/rs/rules.mk

@@ -1,32 +0,0 @@
-
-# Build Options
-#   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 = no        # 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. 
-SWAP_HANDS_ENABLE = no      # Enable one-hand typing
-TAP_DANCE_ENABLE = no
-
-BOOTLOADER = atmel-dfu
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  oled.c \
-        ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \

keyboards/dz60/keymaps/macos_arrow/keymap.c

@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |-----------------------------------------------------------------------------------------+
    * | Shift     | Z   | X   | C   | V   | B   | N   | M   | ,   | .   | /   |     | Up  |Shift|
    * |-----------------------------------------------------------------------------------------+
-   * | Ctrl | Alt  | Gui  |                Space               |Gui/_ML| Alt | Left| Down|Right|
+   * | Ctrl | Alt  | Gui  |             Space / _NL            |Gui/_ML| Alt | Left| Down|Right|
    * `-----------------------------------------------------------------------------------------'
    */
   [_BL] = LAYOUT_all(
@@ -30,25 +30,25 @@ 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_LBRC, KC_RBRC, KC_BSLS,
     LT(_FL, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
     KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_A, KC_UP, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LGUI, KC_NO, KC_SPC, KC_NO, LM(_ML, MOD_RGUI), KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT),
+    KC_LCTL, KC_LALT, KC_LGUI, KC_NO, LT(_NL, KC_SPC), KC_NO, LM(_ML, MOD_RGUI), KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT),
 
   /* ,-----------------------------------------------------------------------------------------.
    * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |    Del    |
    * |-----------------------------------------------------------------------------------------+
-   * |        |     |     | PgUp|     |     |     |     | Up  |     |     |     |     |        |
+   * |        |     |     |     |     |     |     |PgUp |     |     |     |     |     |        |
    * |-----------------------------------------------------------------------------------------+
-   * |          |     |Home |PgDwn| End |     |     | Left| Down|Right|     |     |            |
+   * |          |     |     |     |     |     | Left| Down|  Up |Right|     |     |            |
    * |-----------------------------------------------------------------------------------------+
-   * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
+   * |           |     |     |     |     |     |     |PgDwn|     |     |     |     |     |     |
    * |-----------------------------------------------------------------------------------------+
    * |      |      |      |                                      |     |     |     |     |     |
    * `-----------------------------------------------------------------------------------------'
    */
   [_FL] = LAYOUT_all(
     _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_DEL,
-    _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______,
-    _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______,
-    _______, KC_NO,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
+    _______, KC_NO,  _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 
   /* ,-----------------------------------------------------------------------------------------.
@@ -64,11 +64,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-----------------------------------------------------------------------------------------'
    */
   [_ML] = LAYOUT_all(
-    KC_MEDIA_EJECT, BR_DOWN, BR_UP, BL_TOGG, RGB_TOG, _______, _______, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_NO, _______,
+    KC_MEDIA_EJECT, BR_DOWN, BR_UP, _______, _______, _______, _______, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, KC_NO, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, KC_NO,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, BL_INC, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, RGB_MODE_REVERSE, BL_DEC, RGB_MODE_FORWARD),
+    _______, KC_NO,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+  /* ,-----------------------------------------------------------------------------------------.
+   * |     |     |     |     |     |     |     |     |  %  |  (  |  )  |  < |  > |             |
+   * |-----------------------------------------------------------------------------------------+
+   * |        |     |     |     |     |     |     |  *  |  0  |  1  |  2  |  3  |     |        |
+   * |-----------------------------------------------------------------------------------------+
+   * |          |     |     |     |     |     |     |  .  |  -  |  4  |  5  |  6  |            |
+   * |-----------------------------------------------------------------------------------------+
+   * |           |     |     |     |     |     |     |  ,  |  =  |  7  |  8  |  9  |     |     |
+   * |-----------------------------------------------------------------------------------------+
+   * |      |      |      |                                      |     |     |     |     |     |
+   * `-----------------------------------------------------------------------------------------'
+   */
+  [_NL] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_PERCENT, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_LEFT_ANGLE_BRACKET, KC_RIGHT_ANGLE_BRACKET, KC_NO, _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_ASTERISK, KC_0, KC_1, KC_2, KC_3, _______, RESET,
+    _______, _______, _______, _______, _______, _______, _______, KC_DOT, KC_MINS, KC_4, KC_5, KC_6, _______,
+    _______, KC_NO,  _______, _______, _______, _______, _______, _______, KC_COMMA, KC_EQL, KC_7, KC_8, KC_9, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {

keyboards/dz60/keymaps/macos_arrow/rules.mk

@@ -1,2 +1,2 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
+BACKLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = no

keyboards/ergotravel/keymaps/rs/keymap.c

@@ -1,7 +1,25 @@
 #include QMK_KEYBOARD_H
-#include "rs.h"
+
+enum layers {
+  _QWERTY,
+  _HYPER,
+  _SIGN
+};
+
+
+#define KC_ KC_TRNS
+
+#define KC_ESCC MT(MOD_LCTL, KC_ESC)
+#define KC_ENTS MT(MOD_LSFT, KC_ENT)
+#define KC_HYPE MO(_HYPER)
+#define KC_SIGN MO(_SIGN)
+#define KC_RST RESET
+// Brightness
+#define KC_BRUP KC_PAUS
+#define KC_BRDN KC_SLCK
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
   [_QWERTY] = LAYOUT_kc(
   //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
      TAB , Q  , W  , E  , R  , T  , GRV,      BSLS, Y  , U  , I  , O  , P  ,EQL ,
@@ -10,29 +28,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
      LSFT, Z  , X  , C  , V  , B  , SPC,      BSPC, N  , M  ,COMM,DOT ,SLSH,ENTS,
   //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-      FN ,    ,LCTL,LALT,LGUI, SPC,               BSPC, CODE,LEFT, UP ,DOWN,RIGHT
+     SIGN,    ,LCTL,LALT,LGUI, SPC,               BSPC, HYPE,LEFT, UP ,DOWN,RIGHT
   //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
   ),
-  [_CODE] = LAYOUT_kc(
+
+
+  [_HYPER] = LAYOUT_kc(
     //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-       GRV ,EXLM, AT ,HASH, DLR,PERC,    ,          ,CIRC,LPLT,ASTR,RPGT,NEQL,    ,
+       GRV , 1  , 2  , 3  , 4  , 5  ,    ,          , 6  , 7  , 8  , 9  , 0  ,    ,
     //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           , 1  , 2  , 3  , 4  , 5  ,    ,          ,MINS,LBRC, UP ,RBRC,    ,BSLS,
+           ,    ,    ,PGUP,    ,    ,    ,          ,    ,    , UP ,LBRC,RBRC,BSLS,
     //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           , 6  , 7  , 8  , 9  , 0  , DOT,          ,AMPR,LEFT,DOWN,RGHT,    ,PIPE,
+           ,    ,HOME,PGDN,END ,    ,    ,      VOLU,    ,LEFT,DOWN,RGHT,    ,PIPE,
     //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                    ,    ,    ,    ,    ,
+           ,    ,    ,    ,    ,    ,                VOLD,    ,MUTE,    ,    ,
     //`----+----+----+----+----/----/               \----\----+----+----+----+----'
   ),
-  [_FN] = LAYOUT_kc(
+
+  [_SIGN] = LAYOUT_kc(
     //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-           , F1 , F2 , F3 , F4 , F5 ,    ,          , F6 , F7 , F8 , F9 , F10,F11 ,
+       TILD,EXLM, AT ,HASH,DLR ,PERC,    ,          ,CIRC,AMPR,ASTR,LBRC,RBRC,    ,
     //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,BRMU,          ,    ,    ,PGUP,    ,    ,    ,
+       RST , F1 , F2 , F3 , F4 , F5 , F6 ,          ,    ,    ,    ,LCBR,RCBR,PIPE,
     //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-           ,    ,    ,    ,    , RST,BRMD,      VOLU,    ,CTRA,PGDN,CTRE,    ,    ,
+           , 1  , 2  , 3  , 4  , 5  ,    ,      BRUP, 6  , 7  , 8  , 9  , 0  ,    ,
     //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-           ,    ,    ,    ,    ,    ,                VOLD,MUTE,    ,    ,    ,
+           ,    ,    ,    ,    ,    ,                BRDN,    ,    ,    ,    ,
     //`----+----+----+----+----/----/               \----\----+----+----+----+----'
   ),
 };

keyboards/ergotravel/keymaps/rs/readme.md

@@ -1 +1,13 @@
-See [rs readme](../../../../users/rs/readme.md).
+# Code friendly 60% keymap
+
+I developped this keymap to make a better use of 60% ortho keyboards I use like the preonic of the iris. Instead of trying to mimic the Planck layout like the default preonic keymap, this keymap removes the raise and lower layers and offers a simpler hyper layer concept for a few missing sign keys and cursors / media keys.
+
+The important part for coders is that most important signs needed to code are available at their usual position on a full keyboard, without complex layer gymnastic. Access to [] and {} are available on the hyper layer at their usual emplacement.
+
+The right thumb is used for both backspace and hyper layer switching. On the hyper layer, in addition to some coding signs, you get the cursor keys arranged in cross, just under your right fingers, so you don't have to move your hand when navigating in code or command line. Other hand gets the home/end page up/down in a similar layout.
+
+Because you sometime have to use your internal keyboard when you use a macbook, a karabiner configuration is also provided to get most of the features of this keyboard, including the hyper layer / backspace on right command key etc.
+
+This keymap is also available for other keyboards:
+- [ortho_5x12/rs](../../../../layouts/community/ortho_5x12/rs/keymap.c)
+- [Iris/rs](../../../iris/keymaps/rs/keymap.c)

keyboards/gergo/keymaps/drashna/keymap.c

@@ -9,17 +9,23 @@
 #include QMK_KEYBOARD_H
 #include "drashna.h"
 
+// Blank template at the bottom
 
+enum customKeycodes {
+	URL  = 1
+};
+
+#define LAYOUT_gergo_wrapper(...)       LAYOUT_gergo(__VA_ARGS__)
 #define LAYOUT_gergo_base( \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
     K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_gergo_wrapper( \
-    KC_ESC,  K01,    K02,     K03,      K04,     K05,                                                K06,     K07,     K08,     K09,     K0A,    KC_PIPE,      \
-    KC_TAB,  K11,    K12,     K13,      K14,     K15,     _______,                         _______,  K16,     K17,     K18,     K19,     K1A,    KC_QUOT, \
-    OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,     _______, _______,       _______, _______,  K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT,      \
-                                       KC_GRV,   KC_SPC,  BK_LWER, OS_LALT,       OS_RGUI, DL_RAIS, KC_ENT, _______                            \
+    KC_ESC,  K01,    K02,     K03,      K04,     K05,                                              K06,     K07,     K08,     K09,     K0A,    KC_PIPE,      \
+    KC_TAB, ALT_T(K11),  K12, K13,      K14,     K15,   _______,                         _______,  K16,     K17,     K18,     K19,     K1A, RGUI_T(KC_QUOT), \
+    OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,   _______, _______,       _______, _______,  K26,     K27,     K28,     K29, CTL_T(K2A), OS_RSFT,      \
+                            _______, _______, KC_SPC, LT(_LOWER, KC_BSPC),      LT(_RAISE, KC_DEL), KC_ENT, _______, _______                            \
     )
 
 #define LAYOUT_gergo_base_wrapper(...)       LAYOUT_gergo_base(__VA_ARGS__)

keyboards/gergo/keymaps/drashna/rules.mk

@@ -1,2 +0,0 @@
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no

keyboards/keebio/bdn9/keymaps/vosechu-browser/keymap.c

@@ -1,57 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Macro keys for some apps
-#define SLACKUP LALT(LSFT(KC_UP))
-#define SLACKDN LALT(LSFT(KC_DOWN))
-#define RELOAD  LGUI(KC_R)
-
-enum custom_keycodes {
-  PAWFIVE = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-    RESET  , PAWFIVE, RELOAD ,
-    SLACKUP, KC_UP  , KC_PGUP,
-    SLACKDN, KC_DOWN, KC_PGDN
-  ),
-};
-
-void keyboard_post_init_user(void) {
-    // Call the post init code.
-    rgblight_enable_noeeprom(); // enables Rgb, without saving settings
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); // sets mode to Slow breathing without saving
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case PAWFIVE:
-      if (record->event.pressed) {
-        SEND_STRING("+:pawfive:\n");
-        return false;
-      }
-  }
-
-  return true;
-}
-
-void encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-      // Tab right
-      tap_code16(LSFT(LGUI(KC_RBRC)));
-    } else {
-      // Tab left
-      tap_code16(LSFT(LGUI(KC_LBRC)));
-    }
-  }
-  else if (index == 1) {
-    if (clockwise) {
-      // History forward
-      tap_code16(LGUI(KC_RBRC));
-    } else {
-      // History back
-      tap_code16(LGUI(KC_LBRC));
-    }
-  }
-}

keyboards/keebio/bdn9/keymaps/vosechu-ksp/keymap.c

@@ -1,172 +0,0 @@
-/* Copyright 2019 Chuck Lauer Vose <vosechu@gmail.com>
- *
- * 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 QMK_KEYBOARD_H
-
-// // Debugging
-// #include <print.h>
-
-#define BASE   TO(_BASE)
-#define PANIC  TO(_PANIC)
-#define FLIGHT TO(_FLIGHT)
-#define RCS    TO(_RCS)
-
-enum my_layers {
-    _BASE = 0,
-    _PANIC,
-    _FLIGHT,
-    _RCS
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        KC_MUTE, PANIC  , XXXXXXX,
-        FLIGHT , XXXXXXX, RCS    ,
-        XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    [_PANIC] = LAYOUT(
-        RESET  , BASE   , XXXXXXX,
-        _______, XXXXXXX, _______,
-        KC_F2  , KC_F5  , KC_F9
-    ),
-    [_FLIGHT] = LAYOUT(
-        XXXXXXX, _______, KC_M   ,
-        BASE   , KC_W   , _______,
-        KC_A   , KC_S   , KC_D
-    ),
-    [_RCS] = LAYOUT(
-        XXXXXXX, _______, XXXXXXX,
-        _______, KC_I   , BASE   ,
-        KC_J   , KC_K   , KC_L
-    )
-};
-
-bool base_mode = false;
-bool panic_mode = false;
-bool flight_mode = false;
-bool rcs_mode = false;
-
-uint32_t layer_state_set_user(uint32_t state) {
-    base_mode = false;
-    panic_mode = false;
-    flight_mode = false;
-    rcs_mode = false;
-
-    switch (biton32(state)) {
-    case _PANIC:
-        panic_mode = true; // For use in encoder evaluation
-        rgblight_sethsv_noeeprom(HSV_RED);
-        break;
-    case _FLIGHT:
-        flight_mode = true; // For use in encoder evaluation
-        rgblight_sethsv_noeeprom(HSV_CYAN);
-        break;
-    case _RCS:
-        rcs_mode = true; // For use in encoder evaluation
-        rgblight_sethsv_noeeprom(HSV_BLUE);
-        break;
-    default: //  for any other layers, or the default layer
-        base_mode = true;
-        rgblight_sethsv_noeeprom(HSV_SPRINGGREEN);
-        break;
-    }
-    return state;
-}
-
-void keyboard_post_init_user(void) {
-    // Call the post init code.
-    rgblight_enable_noeeprom(); // enables Rgb, without saving settings
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 1); // sets mode to Slow breathing without saving
-    rgblight_sethsv_noeeprom(HSV_SPRINGGREEN);
-}
-
-// bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-//     switch (keycode) {
-//         uprintf("Keycode: %s\n", keycode);
-//         if (record->event.pressed) {
-//           print("pressed");
-//           // Do something when pressed
-//         } else {
-//           print("unpressed");
-//           // Do something else when release
-//         }
-//     }
-//     return true;
-// }
-
-void encoder_update_user(uint8_t index, bool clockwise) {
-    if(base_mode == true) {
-        if (index == 0) {
-            if (clockwise) {
-                // Volume up
-                tap_code(KC_VOLU);
-            } else {
-                // Volume down
-                tap_code(KC_VOLD);
-            }
-        }
-        else if (index == 1) {
-            if (clockwise) {
-                // Time warp faster
-                tap_code(KC_DOT);
-            } else {
-                // Time warp slower
-                tap_code(KC_COMM);
-            }
-        }
-    }
-
-    if(rcs_mode == true) {
-        if (index == 0) {
-            if (clockwise) {
-                // RCS Forward
-                tap_code(KC_H);
-            } else {
-                // RCS Backward
-                tap_code(KC_N);
-            }
-        }
-        else if (index == 1) {
-            if (clockwise) {
-                // RCS Rotate Left
-                tap_code(KC_Q);
-            } else {
-                // RCS Rotate Right
-                tap_code(KC_E);
-            }
-        }
-    }
-
-    if(flight_mode == true) {
-        if (index == 0) {
-            if (clockwise) {
-                // Throttle up
-                tap_code(KC_LSFT);
-            } else {
-                // Throttle down
-                tap_code(KC_LCTL);
-            }
-        }
-        else if (index == 1) {
-            if (clockwise) {
-                // Trim left
-                tap_code16(LALT(KC_A));
-            } else {
-                // Trim right
-                tap_code16(LALT(KC_D));
-            }
-        }
-    }
-}

keyboards/keebio/iris/keymaps/drashna/config.h

@@ -29,23 +29,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EE_HANDS
 
 #ifdef RGBLIGHT_ENABLE
-#   undef RGBLED_NUM
-#   define RGBLED_NUM 18     // Number of LEDs
-#   define RGBLED_SPLIT { 9, 9 }
-#   define RGBLIGHT_HUE_STEP 12
-#   define RGBLIGHT_SAT_STEP 12
-#   define RGBLIGHT_VAL_STEP 12
-#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#undef RGBLED_NUM
+#define RGBLED_NUM 18     // Number of LEDs
+#define RGBLED_SPLIT { 9, 9 }
+#define RGBLIGHT_HUE_STEP 12
+#define RGBLIGHT_SAT_STEP 12
+#define RGBLIGHT_VAL_STEP 12
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 
-#   define RGBLIGHT_LIMIT_VAL 225
+#define RGBLIGHT_LIMIT_VAL 225
 #endif // RGBLIGHT_ENABLE
 
 #ifdef AUDIO_ENABLE
-#   define C6_AUDIO
-#   ifdef RGBLIGHT_ENABLE
-#       define NO_MUSIC_MODE
-#   endif //RGBLIGHT_ENABLE
+#define C6_AUDIO
+#ifdef RGBLIGHT_ENABLE
+#define NO_MUSIC_MODE
+#endif //RGBLIGHT_ENABLE
 #endif //AUDIO_ENABLE
 
 #define QMK_ESC_OUTPUT F6 // usually COL
@@ -55,7 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef PRODUCT
 #ifdef KEYBOARD_keebio_iris_rev2
-#   define PRODUCT         Drashna Hacked Iris Rev.2
+#define PRODUCT         Drashna Hacked Iris Rev.2
 #endif
 
 #define SHFT_LED1 6

keyboards/keebio/iris/keymaps/drashna/keymap.c

@@ -12,7 +12,7 @@
      KC_ESC,  ________________NUMBER_LEFT________________,                       ________________NUMBER_RIGHT_______________, KC_MINS, \
      KC_TAB , K01,    K02,     K03,      K04,     K05,                           K06,     K07,     K08,     K09,     K0A,     KC_BSLS, \
      KC_C1R3, K11,    K12,     K13,      K14,     K15,                           K16,     K17,     K18,     K19,     K1A,     KC_QUOT, \
-     OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,     OS_LALT,     OS_RGUI, K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT, \
+     OS_LSFT, CTL_T(K21), K22, K23,      K24,     K25,     OS_LALT,     OS_RGUI, K26,     K27,     K28,     K29,  CTL_T(K2A), OS_RSFT, \
                              LT(_LOWER,KC_GRV), KC_SPC,  KC_BSPC,         KC_DEL,  KC_ENT,  RAISE                                      \
   )
 #define LAYOUT_iris_base_wrapper(...)       LAYOUT_iris_base(__VA_ARGS__)
@@ -113,22 +113,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 void matrix_init_keymap(void) {
-#ifndef CONVERT_TO_PROTON_C
+  #ifndef CONVERT_TO_PROTON_C
     setPinOutput(D5);
     writePinHigh(D5);
 
     setPinOutput(B0);
     writePinHigh(B0);
-#endif
+  #endif
 }
 
 
 void keyboard_post_init_keymap(void) {
 #if BACKLIGHT_ENABLE
-    backlight_enable();
-    backlight_level(5);
-    #ifdef BACKLIGHT_BREATHING
-        breathing_enable();
-    #endif
+  backlight_enable();
+  backlight_level(5);
+  #ifdef BACKLIGHT_BREATHING
+    breathing_enable();
+  #endif
 #endif
 }

keyboards/keebio/iris/keymaps/drashna/rules.mk

@@ -9,7 +9,6 @@ AUDIO_ENABLE      = no
 NKRO_ENABLE       = yes
 BACKLIGHT_ENABLE  = no
 SWAP_HANDS_ENABLE = no
-SPACE_CADET_ENABLE = no
 
 INDICATOR_LIGHTS  = no
 MACROS_ENABLED    = no

keyboards/keebio/iris/keymaps/drashna_lp/config.h

@@ -21,15 +21,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../drashna/config.h"
 
 #ifdef RGBLIGHT_ENABLE
-#   undef RGBLED_NUM
-#   define RGBLED_NUM 16     // Number of LEDs
-#   undef RGBLED_SPLIT
-#   define RGBLED_SPLIT { 8, 8 }
+#undef RGBLED_NUM
+#define RGBLED_NUM 16     // Number of LEDs
+#undef RGBLED_SPLIT
+#define RGBLED_SPLIT { 8, 8 }
 #endif
 
 #undef PRODUCT
 #ifdef KEYBOARD_keebio_iris_rev2
-#   define PRODUCT         Drashna Hacked Iris LP Rev.2 (Backlit)
+#define PRODUCT         Drashna Hacked Iris LP Rev.2 (Backlit)
 #endif
 
 #undef SHFT_LED1

keyboards/keebio/iris/keymaps/drashna_old/config.h

@@ -21,15 +21,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../drashna/config.h"
 
 #ifdef RGBLIGHT_ENABLE
-#   undef RGBLED_NUM
-#   define RGBLED_NUM 16     // Number of LEDs
-#   undef RGBLED_SPLIT
-#   define RGBLED_SPLIT { 8, 8 }
+#undef RGBLED_NUM
+#define RGBLED_NUM 16     // Number of LEDs
+#undef RGBLED_SPLIT
+#define RGBLED_SPLIT { 8, 8 }
 #endif
 
 #undef PRODUCT
 #ifdef KEYBOARD_keebio_iris_rev2
-#   define PRODUCT         Drashna Hacked Iris Rev.2 (16 LED)
+#define PRODUCT         Drashna Hacked Iris Rev.2 (16 LED)
 #endif
 
 #undef SHFT_LED1

keyboards/keebio/iris/keymaps/rs/config.h

@@ -35,4 +35,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_HUE_STEP 1
 #define RGBLIGHT_SAT_STEP 1
-#define RGBLIGHT_VAL_STEP 1
+#define RGBLIGHT_VAL_STEP 1

keyboards/keebio/iris/keymaps/rs/keymap.c

@@ -1,45 +1,48 @@
 #include QMK_KEYBOARD_H
-#include "rs.h"
+
+enum layers {
+  _QWERTY,
+  _HYPER,
+};
+
+#define KC_ KC_TRNS
+
+#define KC_ESCC MT(MOD_LCTL, KC_ESC)
+#define KC_ENTS MT(MOD_LSFT, KC_ENT)
+#define KC_HYPE MO(_HYPER)
+#define KC_RST  RESET
+// Brightness
+#define KC_BRUP KC_PAUS
+#define KC_BRDN KC_SLCK
+#define KC_BLTG BL_TOGG
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
   [_QWERTY] = LAYOUT_kc(
   //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
      GRV , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,MINS,
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,EQL ,
+     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,EQL,
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
      ESCC, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
   //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
      LSFT, Z  , X  , C  , V  , B  ,SPC,      BSPC, N  , M  ,COMM,DOT ,SLSH,ENTS,
   //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       LALT,LGUI,SPC ,         BSPC,CODE,FN
+                       LALT,LGUI,SPC,          BSPC,HYPE,ENT
   //                  `----+----+----'        `+---+----+----'
-  ),
-  [_CODE] = LAYOUT_kc(
+  ), //                                              |
+  //                                                 |
+  [_HYPER] = LAYOUT_kc( //                           V
   //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
+     RST , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 ,LBRC,RBRC,    ,
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     GRV ,EXLM, AT ,HASH, DLR,PERC,               CIRC,LPLT,ASTR,RPGT,NEQL,    ,
+         ,    ,    ,PGUP,    ,BRUP,                   ,    , UP ,LCBR,RCBR,BSLS,
   //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         , 1  , 2  , 3  , 4  , 5  ,               MINS,LBRC, UP ,RBRC,    ,BSLS,
+         ,    ,HOME,PGDN,END ,BRDN,               MINS,LEFT,DOWN,RGHT,    ,PIPE,
   //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         , 6  , 7  , 8  , 9  , 0  ,    ,         ,AMPR,LEFT,DOWN,RGHT,    ,PIPE,
+         ,    ,    ,    ,    ,    ,BLTG,     VOLU,    ,    ,    ,    ,    ,    ,
   //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    , DOT,             ,    ,    
-  //                  `----+----+----'        `----+----+----'
-  ),
-  [_FN] = LAYOUT_kc(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-         , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 , F10, F11,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,                   ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     BLTG,BLUP,    ,    ,    ,BRMU,                   ,    ,PGUP,    ,    ,    ,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-         ,BLDN,    ,    ,RST ,BRMD,    ,     VOLU,    ,CTRA,PGDN,CTRE,    ,    ,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,     ,         VOLD,MUTE,    
+                           ,    ,    ,         VOLD,    ,MUTE
   //                  `----+----+----'        `----+----+----'
   ),
 };
-

keyboards/keebio/iris/keymaps/rs/readme.md

@@ -1 +1,13 @@
-See [rs readme](../../../../users/rs/readme.md).
+# Code friendly 60% keymap
+
+I developped this keymap to make a better use of 60% ortho keyboards I use like the preonic of the iris. Instead of trying to mimic the Planck layout like the default preonic keymap, this keymap removes the raise and lower layers and offers a simpler hyper layer concept for a few missing sign keys and cursors / media keys.
+
+The important part for coders is that most important signs needed to code are available at their usual position on a full keyboard, without complex layer gymnastic. Access to [] and {} are available on the hyper layer at their usual emplacement.
+
+The right thumb is used for both backspace and hyper layer switching. On the hyper layer, in addition to some coding signs, you get the cursor keys arranged in cross, just under your right fingers, so you don't have to move your hand when navigating in code or command line. Other hand gets the home/end page up/down in a similar layout.
+
+Because you sometime have to use your internal keyboard when you use a macbook, a karabiner configuration is also provided to get most of the features of this keyboard, including the hyper layer / backspace on right command key etc.
+
+This keymap is also available for other keyboards:
+- [ortho_5x12/rs](../../../../layouts/community/ortho_5x12/rs/keymap.c)
+- [ErgoTravel/rs](../../../ergotravel/keymaps/rs/keymap.c)

keyboards/keebio/iris/keymaps/rs/rules.mk

@@ -1,2 +1 @@
 BACKLIGHT_ENABLE = yes
-BOOTLOADER = atmel-dfu

keyboards/keebio/viterbi/keymaps/drashna/config.h

@@ -21,25 +21,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 
 #ifdef RGBLIGHT_ENABLE
-#   undef RGBLED_NUM
-#   define RGBLED_NUM 16
+#undef RGBLED_NUM
+#define RGBLED_NUM 16
 
-#   define RGBLIGHT_HUE_STEP 8
-#   define RGBLIGHT_SAT_STEP 8
-#   define RGBLIGHT_VAL_STEP 8
-#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 #endif // RGBLIGHT_ENABLE
 
 
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
 
 
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
 #undef PRODUCT
 #define PRODUCT   Drashnas Viterbi Macro Pad
 
 #ifdef AUDIO_ENABLE
-#   define C6_AUDIO
-#   define NO_MUSIC_MODE
+#define C6_AUDIO
+#define NO_MUSIC_MODE
 #endif
 
 #define LAYOUT_ortho_5x7( \

keyboards/keebio/viterbi/keymaps/drashna/rules.mk

@@ -8,7 +8,6 @@ RGBLIGHT_ENABLE   = yes
 AUDIO_ENABLE      = yes
 NKRO_ENABLE       = yes
 SPLIT_KEYBOARD    = no
-SPACE_CADET_ENABLE = no
 
 NO_SECRETS        = yes
 MACROS_ENABLED    = yes

keyboards/keebio/viterbi/keymaps/drashna_old/config.h

@@ -20,6 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "../drashna/config.h"
 
 #ifdef RGBLIGHT_ENABLE
-#   undef RGBLED_NUM
-#   define RGBLED_NUM 12
+#undef RGBLED_NUM
+#define RGBLED_NUM 12
 #endif

keyboards/orthodox/keymaps/drashna/config.h

@@ -39,36 +39,37 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
 #ifdef RGBLIGHT_ENABLE
-#   define RGB_DI_PIN D3
-#   define RGBLED_NUM 16     // Number of LEDs
-#   define RGBLED_SPLIT { 8, 8 }
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 16     // Number of LEDs
+#define RGBLED_SPLIT { 8, 8 }
 
-#   define RGBLIGHT_HUE_STEP 12
-#   define RGBLIGHT_SAT_STEP 12
-#   define RGBLIGHT_VAL_STEP 12
-#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_HUE_STEP 12
+#define RGBLIGHT_SAT_STEP 12
+#define RGBLIGHT_VAL_STEP 12
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 #endif // RGBLIGHT_ENABLE
 
 #ifdef AUDIO_ENABLE
-#   define C6_AUDIO
-#   ifdef RGBLIGHT_ENABLE
-#       define NO_MUSIC_MODE
-#   endif
+#define C6_AUDIO
+#ifdef RGBLIGHT_ENABLE
+#define NO_MUSIC_MODE
+#endif
 #endif //AUDIO_ENABLE
 
 #undef PRODUCT
 #ifdef KEYBOARD_orthodox_rev1
-#   define PRODUCT         Drashna Hacked Orthodox Rev.1
+#define PRODUCT         Drashna Hacked Orthodox Rev.1
 #elif KEYBOARD_orthodox_rev3
-#   define PRODUCT         Drashna Hacked Orthodox Rev.3
+#define PRODUCT         Drashna Hacked Orthodox Rev.3
 #endif
 
 #define QMK_ESC_OUTPUT D7 // usually COL
 #ifdef KEYBOARD_orthodox_rev1
-#   define QMK_ESC_INPUT D4 // usually ROW
+#define QMK_ESC_INPUT D4 // usually ROW
 #else
-#   define QMK_ESC_INPUT D2 // usually ROW
+#define QMK_ESC_INPUT D2 // usually ROW
 #endif
 #define QMK_LED B0
 #define QMK_SPEAKER C6

keyboards/orthodox/keymaps/drashna/keymap.c

@@ -38,8 +38,8 @@ uint8_t last_osm;
   ) \
   LAYOUT_wrapper( \
     KC_ESC,  K01,    K02,     K03,      K04,     K05,                                                             K06,     K07,     K08,     K09,     K0A,     KC_BSPC, \
-    KC_TAB,  K11,    K12,     K13,      K14,     K15,              OS_LALT, OS_LGUI,   OS_RALT, RAISE,            K16,     K17,     K18,     K19,     K1A,     KC_QUOT, \
-    KC_MLSF, CTL_T(K21), K22, K23,      K24,     K25,     LOWER,   KC_SPACE,KC_BSPC,   KC_DEL,  KC_ENT,  RAISE,   K26,     K27,     K28,     K29, RCTL_T(K2A), KC_MRSF  \
+    KC_TAB,  K11,    K12,     K13,      K14,     K15,              OS_LALT, OS_LGUI,   OS_RALT, RAISE,          K16,     K17,     K18,     K19,     K1A,     KC_QUOT, \
+    KC_MLSF, CTL_T(K21), K22, K23,      K24,     K25,     LOWER,   KC_SPACE,KC_BSPC,   KC_DEL,  KC_ENT,  RAISE,   K26,     K27,     K28,     K29,  CTL_T(K2A), KC_MRSF  \
   )
 #define LAYOUT_orthodox_base_wrapper(...)       LAYOUT_orthodox_base(__VA_ARGS__)
 
@@ -123,11 +123,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 void matrix_init_keymap(void) {
-#ifndef CONVERT_TO_PROTON_C
+  #ifndef CONVERT_TO_PROTON_C
     setPinOutput(D5);
     writePinHigh(D5);
 
     setPinOutput(B0);
     writePinHigh(B0);
-#endif
+  #endif
 }

keyboards/orthodox/keymaps/drashna/rules.mk

@@ -7,7 +7,6 @@ TAP_DANCE_ENABLE  = no
 RGBLIGHT_ENABLE   = yes
 AUDIO_ENABLE      = no
 NKRO_ENABLE       = yes
-SPACE_CADET_ENABLE = no
 
 INDICATOR_LIGHTS  = yes
 MACROS_ENABLED    = no

keyboards/planck/ez/config.h

@@ -51,6 +51,9 @@
 #undef AUDIO_VOICES
 #undef C6_AUDIO
 
+#define A5_AUDIO
+#define DAC_OFF_VALUE 4095
+
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 6
 

keyboards/planck/keymaps/synth_sample/config.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 2
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
+

keyboards/planck/keymaps/synth_sample/keymap.c

@@ -0,0 +1,298 @@
+/* Copyright 2019 Jack Humbert
+ *
+ * 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 QMK_KEYBOARD_H
+
+extern keymap_config_t keymap_config;
+
+enum planck_layers {
+  _QWERTY,
+  _COLEMAK,
+  _DVORAK,
+  _LOWER,
+  _RAISE,
+  _PLOVER,
+  _ADJUST
+};
+
+enum planck_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK,
+  PLOVER,
+  BACKLIT,
+  EXT_PLV
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Colemak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Dvorak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT_planck_grid(
+    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
+    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_planck_grid(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_planck_grid(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Plover layer (http://opensteno.org)
+ * ,-----------------------------------------------------------------------------------.
+ * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_PLOVER] = LAYOUT_planck_grid(
+    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
+    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
+),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid(
+    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+)
+
+};
+
+#ifdef AUDIO_ENABLE
+  float plover_song[][2]     = SONG(PLOVER_SOUND);
+  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+#endif
+
+uint32_t layer_state_set_user(uint32_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        print("mode just switched to qwerty and this is a huge string\n");
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case COLEMAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK);
+      }
+      return false;
+      break;
+    case DVORAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_DVORAK);
+      }
+      return false;
+      break;
+    case BACKLIT:
+      if (record->event.pressed) {
+        register_code(KC_RSFT);
+        #ifdef BACKLIGHT_ENABLE
+          backlight_step();
+        #endif
+        #ifdef KEYBOARD_planck_rev5
+          PORTE &= ~(1<<6);
+        #endif
+      } else {
+        unregister_code(KC_RSFT);
+        #ifdef KEYBOARD_planck_rev5
+          PORTE |= (1<<6);
+        #endif
+      }
+      return false;
+      break;
+    case PLOVER:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+          PLAY_SONG(plover_song);
+        #endif
+        layer_off(_RAISE);
+        layer_off(_LOWER);
+        layer_off(_ADJUST);
+        layer_on(_PLOVER);
+        if (!eeconfig_is_enabled()) {
+            eeconfig_init();
+        }
+        keymap_config.raw = eeconfig_read_keymap();
+        keymap_config.nkro = 1;
+        eeconfig_update_keymap(keymap_config.raw);
+      }
+      return false;
+      break;
+    case EXT_PLV:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(plover_gb_song);
+        #endif
+        layer_off(_PLOVER);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+void encoder_update(bool clockwise) {
+    if (clockwise) {
+      #ifdef MOUSEKEY_ENABLE
+        register_code(KC_MS_WH_DOWN);
+        unregister_code(KC_MS_WH_DOWN);
+      #else
+        register_code(KC_PGDN);
+        unregister_code(KC_PGDN);
+      #endif
+    } else {
+      #ifdef MOUSEKEY_ENABLE
+        register_code(KC_MS_WH_UP);
+        unregister_code(KC_MS_WH_UP);
+      #else
+        register_code(KC_PGUP);
+        unregister_code(KC_PGUP);
+      #endif
+    }
+}
+
+void matrix_scan_user(void) {
+
+}
+
+bool music_mask_user(uint16_t keycode) {
+  switch (keycode) {
+    case RAISE:
+    case LOWER:
+      return false;
+    default:
+      return true;
+  }
+}
+
+#include "sample.h"
+
+uint32_t dac_sample_custom_counter = 0;
+
+uint16_t dac_value_generate(void) {
+  if (is_playing_note()) {
+    uint16_t sample = dac_sample_custom[dac_sample_custom_counter];
+    dac_sample_custom_counter = (dac_sample_custom_counter + 1) % DAC_SAMPLE_CUSTOM_LENGTH;
+    return sample;
+  } else {
+    return DAC_OFF_VALUE;
+  }
+}

keyboards/planck/keymaps/synth_wavetable/config.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 2
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
+

keyboards/planck/keymaps/synth_wavetable/keymap.c

@@ -0,0 +1,326 @@
+/* Copyright 2019 Jack Humbert
+ *
+ * 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 QMK_KEYBOARD_H
+#include "audio.h"
+
+extern keymap_config_t keymap_config;
+
+enum planck_layers {
+  _QWERTY,
+  _COLEMAK,
+  _DVORAK,
+  _LOWER,
+  _RAISE,
+  _PLOVER,
+  _ADJUST
+};
+
+enum planck_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK,
+  PLOVER,
+  BACKLIT,
+  EXT_PLV
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Colemak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Dvorak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT_planck_grid(
+    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
+    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_planck_grid(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_planck_grid(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Plover layer (http://opensteno.org)
+ * ,-----------------------------------------------------------------------------------.
+ * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_PLOVER] = LAYOUT_planck_grid(
+    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
+    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
+),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid(
+    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+)
+
+};
+
+#ifdef AUDIO_ENABLE
+  float plover_song[][2]     = SONG(PLOVER_SOUND);
+  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+#endif
+
+uint32_t layer_state_set_user(uint32_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        print("mode just switched to qwerty and this is a huge string\n");
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case COLEMAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK);
+      }
+      return false;
+      break;
+    case DVORAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_DVORAK);
+      }
+      return false;
+      break;
+    case BACKLIT:
+      if (record->event.pressed) {
+        register_code(KC_RSFT);
+        #ifdef BACKLIGHT_ENABLE
+          backlight_step();
+        #endif
+        #ifdef KEYBOARD_planck_rev5
+          PORTE &= ~(1<<6);
+        #endif
+      } else {
+        unregister_code(KC_RSFT);
+        #ifdef KEYBOARD_planck_rev5
+          PORTE |= (1<<6);
+        #endif
+      }
+      return false;
+      break;
+    case PLOVER:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+          PLAY_SONG(plover_song);
+        #endif
+        layer_off(_RAISE);
+        layer_off(_LOWER);
+        layer_off(_ADJUST);
+        layer_on(_PLOVER);
+        if (!eeconfig_is_enabled()) {
+            eeconfig_init();
+        }
+        keymap_config.raw = eeconfig_read_keymap();
+        keymap_config.nkro = 1;
+        eeconfig_update_keymap(keymap_config.raw);
+      }
+      return false;
+      break;
+    case EXT_PLV:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(plover_gb_song);
+        #endif
+        layer_off(_PLOVER);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+void matrix_scan_user(void) {
+
+}
+
+bool music_mask_user(uint16_t keycode) {
+  switch (keycode) {
+    case RAISE:
+    case LOWER:
+      return false;
+    default:
+      return true;
+  }
+}
+
+#include "wavetable.h"
+
+float dac_if[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
+uint8_t dac_morph = 0;
+// uint8_t dac_morph_flipped = 0;
+// uint16_t dac_morph_counter = 0;
+
+void dac_setup_note(void) {
+  dac_if[dac_number_of_voices()] = 0.0f;
+}
+
+uint16_t dac_value_generate(void) {
+  uint16_t value = DAC_OFF_VALUE;
+  uint8_t working_voices = dac_number_of_voices();
+  if (working_voices > DAC_VOICES_MAX)
+    working_voices = DAC_VOICES_MAX;
+
+  if (working_voices > 0) {
+    uint16_t value_avg = 0;
+    for (uint8_t i = 0; i < working_voices; i++) {
+      dac_if[i] = dac_if[i] + ((dac_get_frequency(i) * DAC_BUFFER_SIZE) / DAC_SAMPLE_RATE);
+
+      // Needed because % doesn't work with floats
+      while (dac_if[i] >= (DAC_BUFFER_SIZE))
+        dac_if[i] = dac_if[i] - DAC_BUFFER_SIZE;
+
+      // #define DAC_MORPH_SPEED 372
+      // #define DAC_MORPH_SPEED_COMPUTED (DAC_SAMPLE_RATE / DAC_WAVETABLE_CUSTOM_LENGTH * (1000 / DAC_MORPH_SPEED))
+
+      uint16_t dac_i = (uint16_t)dac_if[i];
+      // value_avg += dac_buffer_custom[dac_morph_flipped][dac_i] / working_voices / 2 * ((dac_morph >= 63) ? 6400 - dac_morph_counter : dac_morph_counter) / 6400;
+      // value_avg += dac_buffer_custom[dac_morph_flipped + 1][dac_i] / working_voices / 2 * ((dac_morph >= 63) ? dac_morph_counter : 6400 - dac_morph_counter) / 6400;
+
+      // value_avg += dac_wavetable_custom[dac_morph][dac_i] / working_voices / 2 * (DAC_MORPH_SPEED_COMPUTED - dac_morph_counter) / DAC_MORPH_SPEED_COMPUTED;
+      // value_avg += dac_wavetable_custom[dac_morph + 1][dac_i] / working_voices / 2 * dac_morph_counter / DAC_MORPH_SPEED_COMPUTED;
+      value_avg += dac_wavetable_custom[dac_morph][dac_i] / working_voices;
+    }
+    value = value_avg;
+
+    // dac_morph_counter++;
+    // if (dac_morph_counter >= DAC_MORPH_SPEED_COMPUTED) {
+      // dac_morph_counter = 0;
+      // dac_morph = (dac_morph + 1) % 125;
+      // dac_morph_flipped = ((dac_morph >= 63) ? (125 - dac_morph) : dac_morph);
+      // dac_morph = (dac_morph + 1) % (DAC_WAVETABLE_CUSTOM_LENGTH - 1);
+    // }
+  }
+  return value;
+}
+
+void encoder_update(bool clockwise) {
+  if (clockwise) {
+    dac_morph = (dac_morph + 1) % DAC_WAVETABLE_CUSTOM_LENGTH;
+  } else {
+    if (dac_morph == 0)
+      dac_morph = (DAC_WAVETABLE_CUSTOM_LENGTH - 1);
+    else
+      dac_morph--;
+  }
+}

keyboards/planck/rev6/config.h

@@ -51,6 +51,8 @@
 #undef AUDIO_VOICES
 #undef C6_AUDIO
 
+#define A5_AUDIO
+
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 6
 

keyboards/planck/rev6/rev6.c

@@ -16,7 +16,9 @@
 #include "rev6.h"
 
 void matrix_init_kb(void) {
-	matrix_init_user();
+    palSetPadMode(GPIOA, 4, PAL_MODE_OUTPUT_PUSHPULL );
+    palSetPad(GPIOA, 4);
+    matrix_init_user();
 }
 
 void matrix_scan_kb(void) {

keyboards/singa/singa.c

@@ -34,25 +34,6 @@ void rgblight_set(void) {
 }
 #endif
 
-void matrix_init_kb(void) {
-#ifdef RGBLIGHT_ENABLE
-    if (rgblight_config.enable) {
-        i2c_init();
-        i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100);
-    }
-#endif
-    // call user level keymaps, if any
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_task();
-#endif
-    matrix_scan_user();
-    /* Nothing else for now. */
-}
-
 __attribute__ ((weak))
 void matrix_scan_user(void) {
 }
@@ -64,7 +45,7 @@ void backlight_init_ports(void) {
     setPinOutput(D4);
     setPinOutput(D6);
 
-    // turn backlight LEDs on
+    // turn RGB LEDs on
     writePinHigh(D0);
     writePinHigh(D1);
     writePinHigh(D4);
@@ -73,13 +54,13 @@ void backlight_init_ports(void) {
 
 void backlight_set(uint8_t level) {
 	if (level == 0) {
-        // turn backlight LEDs off
+        // turn RGB LEDs off
         writePinLow(D0);
         writePinLow(D1);
         writePinLow(D4);
         writePinLow(D6);
 	} else {
-        // turn backlight LEDs on
+        // turn RGB LEDs on
         writePinHigh(D0);
         writePinHigh(D1);
         writePinHigh(D4);

layouts/community/ergodox/drashna/config.h

@@ -1,11 +1,12 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#   undef RGBLIGHT_SAT_STEP
-#   define RGBLIGHT_SAT_STEP 12
+#undef RGBLIGHT_SAT_STEP
+#define RGBLIGHT_SAT_STEP 12
 
-#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3
-#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 #endif // RGBLIGHT_ENABLE
 
 

layouts/community/ergodox/drashna/keymap.c

@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef UNICODEMAP_ENABLE
 #include "drashna_unicode.h"
 #endif // UNICODEMAP_ENABLE
-#ifndef UNICODE_ENABLE
-#   define UC(x) KC_NO
-#endif
 
 #ifdef RGB_MATRIX_ENABLE
 extern bool g_suspend_state;
@@ -31,7 +28,7 @@ extern rgb_config_t rgb_matrix_config;
 extern userspace_config_t userspace_config;
 
 enum more_custom_keycodes {
-    KC_SWAP_NUM = NEW_SAFE_RANGE
+   KC_SWAP_NUM = NEW_SAFE_RANGE
 };
 
 //define layer change stuff for underglow indicator
@@ -46,7 +43,7 @@ bool skip_leds = false;
       KC_ESC,  ________________NUMBER_LEFT________________, UC_FLIP,                 UC_TABL, ________________NUMBER_RIGHT_______________, KC_MINS, \
       KC_TAB,  K01,    K02,     K03,      K04,     K05,     TG(_DIABLO),         TG(_DIABLO), K06,     K07,     K08,     K09,     K0A,     KC_BSLS, \
       KC_C1R3, K11,    K12,     K13,      K14,     K15,                                       K16,     K17,     K18,     K19,     K1A,     KC_QUOT, \
-      KC_MLSF, CTL_T(K21), K22, K23,      K24,     K25,     TG(_GAMEPAD),       TG(_GAMEPAD), K26,     K27,     K28,     K29,  RCTL_T(K2A), KC_MRSF, \
+      KC_MLSF, CTL_T(K21), K22, K23,      K24,     K25,     TG(_GAMEPAD),       TG(_GAMEPAD), K26,     K27,     K28,     K29,  CTL_T(K2A), KC_MRSF, \
       KC_GRV,  OS_MEH, OS_HYPR, KC_LBRC, KC_RBRC,                                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, UC(0x2E2E),        \
                                                   OS_LALT, OS_LGUI,                 OS_RGUI, CTL_T(KC_ESCAPE),                                      \
                                                            KC_APP,                  KC_MENU,                                                        \
@@ -308,88 +305,87 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 
-    switch (keycode) {
-        case KC_1:
-            if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
-                if (record->event.pressed) {
-                    register_code(KC_2);
-                } else {
-                    unregister_code(KC_2);
-                }
-                return false;
-            }
-            break;
-        case KC_2:
-            if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
-                if (record->event.pressed) {
-                    register_code(KC_1);
-                } else {
-                    unregister_code(KC_1);
-                }
-                return false;
-            }
-            break;
-        case KC_SWAP_NUM:
-            if (record->event.pressed) {
-                userspace_config.swapped_numbers ^= 1;
-                eeconfig_update_user(userspace_config.raw);
-            }
-            break;
-    }
-    //switch (keycode) {
-    //  case KC_P00:
-    //    if (!record->event.pressed) {
-    //      register_code(KC_KP_0);
-    //      unregister_code(KC_KP_0);
-    //      register_code(KC_KP_0);
-    //      unregister_code(KC_KP_0);
-    //    }
-    //    return false;
-    //    break;
-    //}
-    return true;
+  switch (keycode) {
+    case KC_1:
+      if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
+        if (record->event.pressed) {
+          register_code(KC_2);
+        } else {
+          unregister_code(KC_2);
+        }
+        return false;
+      }
+      break;
+    case KC_2:
+      if (IS_LAYER_ON(_GAMEPAD) && userspace_config.swapped_numbers) {
+        if (record->event.pressed) {
+          register_code(KC_1);
+        } else {
+          unregister_code(KC_1);
+        }
+        return false;
+      }
+      break;
+    case KC_SWAP_NUM:
+      if (record->event.pressed) {
+        userspace_config.swapped_numbers ^= 1;
+        eeconfig_update_user(userspace_config.raw);
+      }
+  }
+  //switch (keycode) {
+  //  case KC_P00:
+  //    if (!record->event.pressed) {
+  //      register_code(KC_KP_0);
+  //      unregister_code(KC_KP_0);
+  //      register_code(KC_KP_0);
+  //      unregister_code(KC_KP_0);
+  //    }
+  //    return false;
+  //    break;
+  //}
+  return true;
 }
 
 void matrix_scan_keymap(void) {  // runs frequently to update info
-    uint8_t modifiers = get_mods();
-    uint8_t led_usb_state = host_keyboard_leds();
-    uint8_t one_shot = get_oneshot_mods();
+  uint8_t modifiers = get_mods();
+  uint8_t led_usb_state = host_keyboard_leds();
+  uint8_t one_shot = get_oneshot_mods();
 
-    if (!skip_leds) {
-        ergodox_board_led_off();
-        ergodox_right_led_1_off();
-        ergodox_right_led_2_off();
-        ergodox_right_led_3_off();
-
-        // Since we're not using the LEDs here for layer indication anymore,
-        // then lets use them for modifier indicators.  Shame we don't have 4...
-        // Also, no "else", since we want to know each, independently.
-        if ( ( modifiers | one_shot ) & MOD_MASK_SHIFT || led_usb_state & (1<<USB_LED_CAPS_LOCK) ) {
-            ergodox_right_led_2_on();
-            ergodox_right_led_2_set( 50 );
-        }
-        if ( ( modifiers | one_shot ) & MOD_MASK_CTRL) {
-            ergodox_right_led_1_on();
-            ergodox_right_led_1_set( 10 );
-        }
-        if ( ( modifiers | one_shot ) & MOD_MASK_ALT) {
-            ergodox_right_led_3_on();
-            ergodox_right_led_3_set( 10 );
-        }
+  if (!skip_leds) {
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
 
+    // Since we're not using the LEDs here for layer indication anymore,
+    // then lets use them for modifier indicators.  Shame we don't have 4...
+    // Also, no "else", since we want to know each, independently.
+    if ( ( modifiers | one_shot ) & MOD_MASK_SHIFT || led_usb_state & (1<<USB_LED_CAPS_LOCK) ) {
+      ergodox_right_led_2_on();
+      ergodox_right_led_2_set( 50 );
+    }
+    if ( ( modifiers | one_shot ) & MOD_MASK_CTRL) {
+      ergodox_right_led_1_on();
+      ergodox_right_led_1_set( 10 );
+    }
+    if ( ( modifiers | one_shot ) & MOD_MASK_ALT) {
+      ergodox_right_led_3_on();
+      ergodox_right_led_3_set( 10 );
     }
 
-}
+  }
+
+};
 
 
 bool indicator_is_this_led_used_keyboard(uint8_t index) {
-    switch (index) {
-        case 13 ... 14:
-            return true;
-            break;
-        default:
-            return false;
-    }
+  switch (index) {
+    case 13 ... 14:
+      return true;
+      break;
+    default:
+    return false;
+  }
 }
 
 
@@ -397,81 +393,101 @@ bool indicator_is_this_led_used_keyboard(uint8_t index) {
 
 void suspend_power_down_keymap(void) {
     rgb_matrix_set_suspend_state(true);
+    rgb_matrix_config.enable = false;
 }
 
 void suspend_wakeup_init_keymap(void) {
+    rgb_matrix_config.enable = true;
     rgb_matrix_set_suspend_state(false);
 }
 
 void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-    rgb_led led;
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
-        led = g_rgb_leds[i];
-        if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-            rgb_matrix_set_color( i, red, green, blue );
-        }
+  rgb_led led;
+  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    led = g_rgb_leds[i];
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
+        rgb_matrix_set_color( i, red, green, blue );
     }
+  }
 }
 
 void rgb_matrix_indicators_user(void) {
-    if ( userspace_config.rgb_layer_change &&
-#ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
-        !g_suspend_state &&
-#endif
-#if defined(RGBLIGHT_ENABLE)
-        (!rgblight_config.enable && rgb_matrix_config.enable)
-#else
-        rgb_matrix_config.enable
-#endif
-    ) {
-        switch (biton32(layer_state)) {
-            case _MODS:
-                rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
-            case _GAMEPAD:
-                rgb_matrix_layer_helper(0xFF, 0x80, 0x00);
-                rgb_matrix_set_color(32, 0x00, 0xFF, 0x00); // Q
-                rgb_matrix_set_color(31, 0x00, 0xFF, 0xFF); // W
-                rgb_matrix_set_color(30, 0xFF, 0x00, 0x00); // E
-                rgb_matrix_set_color(29, 0xFF, 0x80, 0x00); // R
-                rgb_matrix_set_color(37, 0x00, 0xFF, 0xFF); // A
-                rgb_matrix_set_color(36, 0x00, 0xFF, 0xFF); // S
-                rgb_matrix_set_color(35, 0x00, 0xFF, 0xFF); // D
-                rgb_matrix_set_color(34, 0x7A, 0x00, 0xFF); // F
+  if (g_suspend_state || !rgb_matrix_config.enable || !userspace_config.rgb_layer_change) { return; }
 
-                rgb_matrix_set_color(27, 0xFF, 0xFF, 0xFF); // 1
-                rgb_matrix_set_color(26, 0x00, 0xFF, 0x00); // 2
-                rgb_matrix_set_color(25, 0x7A, 0x00, 0xFF); // 3
+  switch (biton32(layer_state)) {
+    case _MODS:
+      rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
+    case _GAMEPAD:
+      rgb_matrix_layer_helper(0xFF, 0x80, 0x00);
+      rgb_matrix_set_color(32, 0x00, 0xFF, 0x00); // Q
+      rgb_matrix_set_color(31, 0x00, 0xFF, 0xFF); // W
+      rgb_matrix_set_color(30, 0xFF, 0x00, 0x00); // E
+      rgb_matrix_set_color(29, 0xFF, 0x80, 0x00); // R
+      rgb_matrix_set_color(37, 0x00, 0xFF, 0xFF); // A
+      rgb_matrix_set_color(36, 0x00, 0xFF, 0xFF); // S
+      rgb_matrix_set_color(35, 0x00, 0xFF, 0xFF); // D
+      rgb_matrix_set_color(34, 0x7A, 0x00, 0xFF); // F
 
-                break;
-            case _DIABLO:
-                rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
-            case _RAISE:
-                rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
-            case _LOWER:
-                rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
-            case _ADJUST:
-                rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
-            default:
-                switch (biton32(default_layer_state)) {
-                    case _QWERTY:
-                        rgb_matrix_layer_helper(0x00, 0xFF, 0xFF); break;
-                    case _COLEMAK:
-                        rgb_matrix_layer_helper(0xFF, 0x00, 0xFF); break;
-                    case _DVORAK:
-                        rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
-                    case _WORKMAN:
-                        rgb_matrix_layer_helper(0xD9, 0xA5, 0x21); break;
-                    case _NORMAN:
-                        rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D); break;
-                    case _MALTRON:
-                        rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
-                    case _EUCALYN:
-                        rgb_matrix_layer_helper(0xFF, 0x80, 0xBF); break;
-                    case _CARPLAX:
-                        rgb_matrix_layer_helper(0x00, 0x00, 0xFF); break;
-                }
-        }
-    }
+      rgb_matrix_set_color(27, 0xFF, 0xFF, 0xFF); // 1
+      rgb_matrix_set_color(26, 0x00, 0xFF, 0x00); // 2
+      rgb_matrix_set_color(25, 0x7A, 0x00, 0xFF); // 3
+
+      break;
+    case _DIABLO:
+      rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
+    case _RAISE:
+      rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
+    case _LOWER:
+      rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
+    case _ADJUST:
+      rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
+    default:
+      switch (biton32(default_layer_state)) {
+        case _QWERTY:
+          rgb_matrix_layer_helper(0x00, 0xFF, 0xFF); break;
+        case _COLEMAK:
+          rgb_matrix_layer_helper(0xFF, 0x00, 0xFF); break;
+        case _DVORAK:
+          rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
+        case _WORKMAN:
+          rgb_matrix_layer_helper(0xD9, 0xA5, 0x21); break;
+        case _NORMAN:
+          rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D); break;
+        case _MALTRON:
+          rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
+        case _EUCALYN:
+          rgb_matrix_layer_helper(0xFF, 0x80, 0xBF); break;
+        case _CARPLAX:
+          rgb_matrix_layer_helper(0x00, 0x00, 0xFF); break;
+      }
+  }
+#if 0
+  if (this_mod & MOD_MASK_SHIFT || this_led & (1<<USB_LED_CAPS_LOCK) || this_osm & MOD_MASK_SHIFT) {
+    rgb_matrix_set_color(24, 0x00, 0xFF, 0x00);
+    rgb_matrix_set_color(36, 0x00, 0xFF, 0x00);
+  }
+  if (this_mod & MOD_MASK_CTRL || this_osm & MOD_MASK_CTRL) {
+    rgb_matrix_set_color(25, 0xFF, 0x00, 0x00);
+    rgb_matrix_set_color(34, 0xFF, 0x00, 0x00);
+    rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
+
+  }
+  if (this_mod & MOD_MASK_GUI || this_osm & MOD_MASK_GUI) {
+    rgb_matrix_set_color(39, 0xFF, 0xD9, 0x00);
+  }
+  if (this_mod & MOD_MASK_ALT || this_osm & MOD_MASK_ALT) {
+    rgb_matrix_set_color(38, 0x00, 0x00, 0xFF);
+  }
+#endif
 }
 
+void matrix_init_keymap(void) {
+#if 0
+  #ifdef RGB_MATRIX_KEYPRESSES
+    rgblight_mode(RGB_MATRIX_MULTISPLASH);
+  #else
+    rgblight_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
+  #endif
+#endif
+}
 #endif //RGB_MATRIX_INIT

layouts/community/ergodox/drashna/rules.mk

@@ -1,20 +1,19 @@
-TAP_DANCE_ENABLE   = yes
-SLEEP_LED_ENABLE   = no  # Breathing sleep LED during USB suspend
-COMMAND_ENABLE     = no  # Commands for debug and configuration
-SPACE_CADET_ENABLE = no
+TAP_DANCE_ENABLE  = yes
+SLEEP_LED_ENABLE  = no  # Breathing sleep LED during USB suspend
+COMMAND_ENABLE    = no  # Commands for debug and configuration
 ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
-  RGBLIGHT_ENABLE   = yes
+  RGBLIGHT_ENABLE = yes
   RGB_MATRIX_ENABLE = no
 endif
-CONSOLE_ENABLE     = no
-BOOTMAGIC_ENABLE   = yes
+CONSOLE_ENABLE    = no
+BOOTMAGIC_ENABLE  = yes
 
-UNICODE_ENABLE     = yes
-UNICDOEMAP_ENABLE  = no
+UNICODE_ENABLE    = yes
+UNICDOEMAP_ENABLE = no
 
-MACROS_ENABLED     = no
-RGBLIGHT_TWINKLE   = no
-INDICATOR_LIGHTS   = no
+MACROS_ENABLED    = no
+RGBLIGHT_TWINKLE  = no
+INDICATOR_LIGHTS  = no
 RGBLIGHT_STARTUP_ANIMATION = yes
 
 DEBOUNCE_TYPE     = eager_pk

layouts/community/ergodox/drashna_glow/config.h

@@ -6,21 +6,10 @@
 #define PRODUCT         DrashnaDox - Hacked ErgoDox EZ Glow
 
 #ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
 // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED  true// turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED  true// turn off effects when suspended
 // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 // #define EECONFIG_RGB_MATRIX (uint32_t *)16
-
-#   define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#   define DISABLE_RGB_MATRIX_CYCLE_ALL
-#   define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#   define DISABLE_RGB_MATRIX_DUAL_BEACON
-#   define DISABLE_RGB_MATRIX_RAINBOW_BEACON
-#   define DISABLE_RGB_MATRIX_DIGITAL_RAIN
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#   define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-
 #endif

layouts/community/numpad_5x6/drashna/config.h

@@ -3,17 +3,18 @@
 // #define B6_AUDIO
 
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
-#   define RGB_DI_PIN B1
-#   define RGBLED_NUM 16     // Number of LEDs
+#define RGB_DI_PIN B1
+#define RGBLED_NUM 16     // Number of LEDs
 
-#   define RGBLIGHT_HUE_STEP 12
-#   define RGBLIGHT_SAT_STEP 12
-#   define RGBLIGHT_VAL_STEP 12
-#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_HUE_STEP 12
+#define RGBLIGHT_SAT_STEP 12
+#define RGBLIGHT_VAL_STEP 12
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 #endif // RGBLIGHT_ENABLE
 
 #if defined(KEYBOARD_primekb_prime_m)
-#   undef PRODUCT
-#   define PRODUCT Drashna Hacked Prime_M Macro Pad
+#undef PRODUCT
+#define PRODUCT Drashna Hacked Prime_M Macro Pad
 #endif

layouts/community/ortho_4x12/drashna/config.h

@@ -2,52 +2,49 @@
 
 
 #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
-#   define RGB_DI_PIN B3
-#   define RGBLED_NUM 13     // Number of LEDs
-#   define RGBLIGHT_ANIMATIONS
-#   define RGBLIGHT_HUE_STEP 12
-#   define RGBLIGHT_SAT_STEP 12
-#   define RGBLIGHT_VAL_STEP 12
-#   define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#   define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
-#   ifdef RGB_MATRIX_ENABLE
-#       define RGBLIGHT_DISABLE_KEYCODES
-#   endif
+#define RGB_DI_PIN B3
+#define RGBLED_NUM 13     // Number of LEDs
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_HUE_STEP 12
+#define RGBLIGHT_SAT_STEP 12
+#define RGBLIGHT_VAL_STEP 12
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
 #endif // RGBLIGHT_ENABLE
 
 #ifdef RGB_MATRIX_ENABLE
-#   define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
 // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
 // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED true// turn off effects when suspended
 // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#   define RGB_DISABLE_WHEN_USB_SUSPENDED true// turn off effects when suspended
-#   ifndef KEYBOARD_planck_ez
-#       define EECONFIG_RGB_MATRIX (uint32_t *)15
-#   endif
+#define EECONFIG_RGB_MATRIX (uint32_t *)15
 #endif
 
 #if defined(KEYBOARD_lets_split_rev2)
-#   define USE_SERIAL
-#   undef USE_I2C
-#   define EE_HANDS
+#define USE_SERIAL
+#undef USE_I2C
+
+#define EE_HANDS
 #endif
 
 #if !defined(KEYBOARD_planck_light)
-#   ifdef RGBLIGHT_ENABLE
-#       define NO_MUSIC_MODE
-#   endif // RGBLIGHT_ENABLE
+#ifdef RGBLIGHT_ENABLE
+#define NO_MUSIC_MODE
+#endif // RGBLIGHT_ENABLE
 #endif // KEYBOARD_planck_light
 
 
 #if defined(KEYBOARD_planck)
-#   undef PRODUCT
-#   if defined(KEYBOARD_planck_light)
-#       define PRODUCT Drashna Hacked RGB Beacon (Planck Light)
-#   elif defined(KEYBOARD_planck_rev6)
-#       define PRODUCT Drashna Hacked Planck Rev6
-#   elif defined(KEYBOARD_planck_EZ)
-#   define PRODUCT Drashna Hacked Planck EZ
-#   endif
+#undef PRODUCT
+#if defined(KEYBOARD_planck_light)
+#define PRODUCT Drashna Hacked RGB Beacon (Planck Light)
+#elif defined(KEYBOARD_planck_rev6)
+#define PRODUCT Drashna Hacked Planck Rev6
+#elif defined(KEYBOARD_planck_EZ)
+#define PRODUCT Drashna Hacked Planck EZ
+#endif
 #endif
 
 /*
@@ -61,7 +58,7 @@
    - MIDI notes can be sent when in Music mode is on
 */
 
-// #define MIDI_BASIC
+#define MIDI_BASIC
 
 /* enable advanced MIDI features:
    - MIDI notes can be added to the keymap

layouts/community/ortho_4x12/drashna/keymap.c

@@ -34,18 +34,6 @@ enum planck_keycodes {
   #define BACKLIT OSM(MOD_LSFT)
 #endif
 
-#ifdef KEYBOARD_planck_ez
-#   define PLNK_1 BK_LWER
-#   define PLNK_2 SP_LWER
-#   define PLNK_3 KC_NO
-#   define PLNK_4 ET_RAIS
-#else
-#   define PLNK_1 SP_LWER
-#   define PLNK_2 BK_LWER
-#   define PLNK_3 DL_RAIS
-#   define PLNK_4 ET_RAIS
-#endif
-
 #define LAYOUT_ortho_4x12_base( \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
     K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
@@ -54,8 +42,8 @@ enum planck_keycodes {
   LAYOUT_ortho_4x12_wrapper( \
     KC_ESC,  K01,    K02,     K03,      K04,     K05,     K06,     K07,     K08,     K09,     K0A,     KC_BSPC, \
     KC_TAB,  K11,    K12,     K13,      K14,     K15,     K16,     K17,     K18,     K19,     K1A,     KC_QUOT, \
-    KC_MLSF, CTL_T(K21), K22, K23,      K24,     K25,     K26,     K27,     K28,     K29, RCTL_T(K2A), KC_ENT,  \
-    BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, PLNK_1,  PLNK_2,  PLNK_3,  PLNK_4,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+    KC_MLSF, CTL_T(K21), K22, K23,      K24,     K25,     K26,     K27,     K28,     K29,  CTL_T(K2A), KC_ENT,  \
+    BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
   )
 #define LAYOUT_ortho_4x12_base_wrapper(...)       LAYOUT_ortho_4x12_base(__VA_ARGS__)
 
@@ -142,132 +130,128 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
- #ifdef BACKLIGHT_ENABLE
-        case BACKLIT:
-            if (record->event.pressed) {
-                register_code(KC_RSFT);
-                #ifdef BACKLIGHT_ENABLE
-                backlight_step();
-                #endif
-            } else {
-                unregister_code(KC_RSFT);
-            }
-            return false;
-            break;
+  switch (keycode) {
+
+#ifdef BACKLIGHT_ENABLE
+    case BACKLIT:
+      if (record->event.pressed) {
+        register_code(KC_RSFT);
+        #ifdef BACKLIGHT_ENABLE
+          backlight_step();
+        #endif
+      } else {
+        unregister_code(KC_RSFT);
+      }
+      return false;
+      break;
 #endif
-    }
-    return true;
+  }
+  return true;
 }
 
 bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-        case BK_LWER:
-        case SP_LWER:
-        case DL_RAIS:
-        case ET_RAIS:
-            return false;
-        default:
-            return true;
-    }
+  switch (keycode) {
+    case RAISE:
+    case LOWER:
+    case BK_LWER:
+    case SP_LWER:
+    case DL_RAIS:
+    case ET_RAIS:
+      return false;
+    default:
+      return true;
+  }
 }
 
 #ifdef RGB_MATRIX_ENABLE
 
 void suspend_power_down_keymap(void) {
     rgb_matrix_set_suspend_state(true);
+    rgb_matrix_config.enable = false;
 }
 
 void suspend_wakeup_init_keymap(void) {
+    rgb_matrix_config.enable = true;
     rgb_matrix_set_suspend_state(false);
 }
 
-void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-    rgb_led led;
-    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
-        led = g_rgb_leds[i];
-        if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-            rgb_matrix_set_color( i, red, green, blue );
-        }
+void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) {
+  rgb_led led;
+  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+    led = g_rgb_leds[i];
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
+        rgb_matrix_set_color( i, red, green, blue );
     }
+  }
 }
 
 void rgb_matrix_indicators_user(void) {
-    uint8_t this_mod = get_mods();
-    uint8_t this_led = host_keyboard_leds();
-    uint8_t this_osm = get_oneshot_mods();
-    bool is_ez;
-    #ifdef KEYBOARD_planck_ez
-    is_ez = true;
-    #endif
+  uint8_t this_mod = get_mods();
+  uint8_t this_led = host_keyboard_leds();
+  uint8_t this_osm = get_oneshot_mods();
 
-    if ( userspace_config.rgb_layer_change &&
-#ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
-        !g_suspend_state &&
-#endif
-#if defined(RGBLIGHT_ENABLE)
-            (!rgblight_config.enable && rgb_matrix_config.enable)
+  if (!g_suspend_state && userspace_config.rgb_layer_change &&
+#if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
+    (!rgblight_config.enable && rgb_matrix_config.enable)
 #else
-            rgb_matrix_config.enable
+    rgb_matrix_config.enable
 #endif
-        ) {
-        switch (biton32(layer_state)) {
-            case _RAISE:
-                rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
-            case _LOWER:
-                rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
-            case _ADJUST:
-                rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
-            default:
-                switch (biton32(default_layer_state)) {
-                case _QWERTY:
-                    rgb_matrix_layer_helper(0x00, 0xFF, 0xFF); break;
-                case _COLEMAK:
-                    rgb_matrix_layer_helper(0xFF, 0x00, 0xFF); break;
-                case _DVORAK:
-                    rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
-                case _WORKMAN:
-                    rgb_matrix_layer_helper(0xD9, 0xA5, 0x21); break;
-                case _NORMAN:
-                    rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D); break;
-                case _MALTRON:
-                    rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
-                case _EUCALYN:
-                    rgb_matrix_layer_helper(0xFF, 0x80, 0xBF); break;
-                case _CARPLAX:
-                    rgb_matrix_layer_helper(0x00, 0x00, 0xFF); break;
-                }
+    ) {
+    switch (biton32(layer_state)) {
+      case _RAISE:
+        rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); break;
+      case _LOWER:
+        rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false); break;
+      case _ADJUST:
+        rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false); break;
+      default:
+        switch (biton32(default_layer_state)) {
+          case _QWERTY:
+            rgb_matrix_layer_helper(0x00, 0xFF, 0xFF, true); break;
+          case _COLEMAK:
+            rgb_matrix_layer_helper(0xFF, 0x00, 0xFF, true); break;
+          case _DVORAK:
+            rgb_matrix_layer_helper(0x00, 0xFF, 0x00, true); break;
+          case _WORKMAN:
+            rgb_matrix_layer_helper(0xD9, 0xA5, 0x21, true); break;
+          case _NORMAN:
+            rgb_matrix_layer_helper(0xFF, 0x7C, 0x4D, true); break;
+          case _MALTRON:
+            rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, true); break;
+          case _EUCALYN:
+            rgb_matrix_layer_helper(0xFF, 0x80, 0xBF, true); break;
+          case _CARPLAX:
+            rgb_matrix_layer_helper(0x00, 0x00, 0xFF, true); break;
         }
     }
+  }
 
-    switch (biton32(default_layer_state)) {
-        case _QWERTY:
-            rgb_matrix_set_color(is_ez ? 41 : 42, 0x00, 0xFF, 0xFF); break;
-        case _COLEMAK:
-            rgb_matrix_set_color(is_ez ? 41 : 42, 0xFF, 0x00, 0xFF); break;
-        case _DVORAK:
-            rgb_matrix_set_color(is_ez ? 41 : 42, 0x00, 0xFF, 0x00); break;
-        case _WORKMAN:
-            rgb_matrix_set_color(is_ez ? 41 : 42, 0xD9, 0xA5, 0x21); break;
-    }
-    if ( (this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1<<USB_LED_CAPS_LOCK)) {
-        rgb_matrix_set_color(24, 0x00, 0xFF, 0x00);
-        rgb_matrix_set_color(36, 0x00, 0xFF, 0x00);
-    }
-    if ( (this_mod | this_osm) & MOD_MASK_CTRL) {
-        rgb_matrix_set_color(25, 0xFF, 0x00, 0x00);
-        rgb_matrix_set_color(34, 0xFF, 0x00, 0x00);
-        rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
+  switch (biton32(default_layer_state)) {
+    case _QWERTY:
+      rgb_matrix_set_color(42, 0x00, 0xFF, 0xFF); break;
+    case _COLEMAK:
+      rgb_matrix_set_color(42, 0xFF, 0x00, 0xFF); break;
+    case _DVORAK:
+      rgb_matrix_set_color(42, 0x00, 0xFF, 0x00); break;
+    case _WORKMAN:
+      rgb_matrix_set_color(42, 0xD9, 0xA5, 0x21); break;
+  }
+  if ( (this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1<<USB_LED_CAPS_LOCK)) {
+    rgb_matrix_set_color(24, 0x00, 0xFF, 0x00);
+    rgb_matrix_set_color(36, 0x00, 0xFF, 0x00);
+  }
+  if ( (this_mod | this_osm) & MOD_MASK_CTRL) {
+    rgb_matrix_set_color(25, 0xFF, 0x00, 0x00);
+    rgb_matrix_set_color(34, 0xFF, 0x00, 0x00);
+    rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
 
-    }
-    if ( (this_mod | this_osm) & MOD_MASK_GUI) {
-        rgb_matrix_set_color(39, 0xFF, 0xD9, 0x00);
-    }
-    if ( (this_mod | this_osm) & MOD_MASK_ALT) {
-        rgb_matrix_set_color(38, 0x00, 0x00, 0xFF);
-    }
+  }
+  if ( (this_mod | this_osm) & MOD_MASK_GUI) {
+    rgb_matrix_set_color(39, 0xFF, 0xD9, 0x00);
+  }
+  if ( (this_mod | this_osm) & MOD_MASK_ALT) {
+    rgb_matrix_set_color(38, 0x00, 0x00, 0xFF);
+  }
 }
 
 void matrix_init_keymap(void) {
@@ -276,81 +260,57 @@ void matrix_init_keymap(void) {
 #else //RGB_MATRIX_INIT
 
 void matrix_init_keymap(void) {
-#if !defined(CONVERT_TO_PROTON_C) && !defined(KEYBOARD_planck)
+  #if !defined(CONVERT_TO_PROTON_C) && !defined(KEYBOARD_planck)
     setPinOutput(D5);
     writePinHigh(D5);
 
     setPinOutput(B0);
     writePinHigh(B0);
-#endif
+  #endif
 }
 #endif //RGB_MATRIX_INIT
 
 #ifdef ENCODER_ENABLE
 void encoder_update(bool clockwise) {
-    switch (biton32(layer_state)) {
-        case _RAISE:
-            clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU);
-            break;
-        case _LOWER:
-#ifdef RGB_MATRIX_ENABLE
-            clockwise ? rgb_matrix_step() : rgblight_step_reverse();
-#else
-            clockwise ? tap_code(KC_PGDN) : tap_code(KC_PGUP);
-#endif
-            break;
-        case _ADJUST:
-#ifdef AUDIO_CLICKY
-            clockwise ? clicky_freq_up() : clicky_freq_down();
-#endif
-            break;
-        default:
-            clockwise ? tap_code(KC_DOWN) : tap_code(KC_UP);
-    }
-#ifdef AUDIO_CLICKY
+  switch (biton32(layer_state)) {
+    case _RAISE:
+      clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU);
+      break;
+    case _LOWER:
+      #ifdef RGB_MATRIX_ENABLE
+        clockwise ? rgb_matrix_step() : rgblight_step_reverse();
+      #else
+      clockwise ? tap_code(KC_PGDN) : tap_code(KC_PGUP);
+      #endif
+    case _ADJUST:
+      #ifdef AUDIO_CLICKY
+        clockwise ? clicky_freq_up() : clicky_freq_down();
+      #endif
+      break;
+    default:
+      clockwise ? tap_code(KC_DOWN) : tap_code(KC_UP);
+  }
+  #ifdef AUDIO_CLICKY
     clicky_play();
-#endif
+  #endif
 }
 #endif // ENCODER_ENABLE
 
 #ifdef KEYBOARD_planck_rev6
 void dip_update(uint8_t index, bool active) {
-    switch (index) {
-        case 0:
-            if(active) { audio_on(); } else { audio_off(); }
-            break;
-        case 1:
-            if(active) { clicky_on(); } else { clicky_off(); }
-            break;
-        case 2:
-            keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = active;
-            break;
-        case 3:
-            userspace_config.nuke_switch = active;
-            break;
-    }
+  switch (index) {
+    case 0:
+      if(active) { audio_on(); } else { audio_off(); }
+      break;
+    case 1:
+      if(active) { clicky_on(); } else { clicky_off(); }
+      break;
+    case 2:
+      keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = active;
+      break;
+    case 3:
+      userspace_config.nuke_switch = active;
+      break;
+   }
 }
 #endif // KEYBOARD_planck_rev6
-
-#ifdef KEYBOARD_planck_ez
-uint32_t layer_state_set_keymap(uint32_t state) {
-
-    palClearPad(GPIOB, 8);
-    palClearPad(GPIOB, 9);
-    switch (biton32(state)) {
-        case _LOWER:
-            palSetPad(GPIOB, 9);
-            break;
-        case _RAISE:
-            palSetPad(GPIOB, 8);
-            break;
-        case _ADJUST:
-            palSetPad(GPIOB, 9);
-            palSetPad(GPIOB, 8);
-            break;
-        default:
-            break;
-    }
-    return state;
-}
-#endif

layouts/community/ortho_4x12/drashna/rules.mk

@@ -5,27 +5,16 @@ CONSOLE_ENABLE    = no         # Console for debug(+400)
 COMMAND_ENABLE    = no        # Commands for debug and configuration
 TAP_DANCE_ENABLE  = no
 AUDIO_ENABLE      = yes
-SPACE_CADET_ENABLE = no
-
 ifeq (,$(findstring planck/rev6,$(KEYBOARD))) # Make sure it's NOT the Planck Rev6
-    RGBLIGHT_ENABLE             = yes
-    INDICATOR_LIGHTS            = yes
-    RGBLIGHT_TWINKLE            = yes
-    RGBLIGHT_STARTUP_ANIMATION  = yes
+  RGBLIGHT_ENABLE             = yes
+  INDICATOR_LIGHTS            = yes
+  RGBLIGHT_TWINKLE            = yes
+  RGBLIGHT_STARTUP_ANIMATION  = yes
 endif
 ifneq (,$(findstring planck/light,$(KEYBOARD))) # Make sure it IS the Planck Light
-    RGB_MATRIX_ENABLE           = yes
-    RGBLIGHT_ENABLE             = no
-    RGBLIGHT_STARTUP_ANIMATION  = no
-endif
-ifneq (,$(findstring planck/ez,$(KEYBOARD))) # Make sure it IS the Planck Light
-    RGBLIGHT_ENABLE = no
-    # SERIAL_LINK_ENABLE = yes
-    ENCODER_ENABLE = no
-    RGB_MATRIX_ENABLE = IS31FL3737
-    INDICATOR_LIGHTS            = yes
-    RGBLIGHT_TWINKLE            = yes
-    RGBLIGHT_STARTUP_ANIMATION  = yes
+  RGB_MATRIX_ENABLE           = yes
+  RGBLIGHT_ENABLE             = no
+  RGBLIGHT_STARTUP_ANIMATION  = no
 endif
 
 ifeq ($(strip $(PROTOCOL)), VUSB)

layouts/community/ortho_4x12/rs/config.h

@@ -1 +0,0 @@
-#pragma once

layouts/community/ortho_4x12/rs/keymap.c

@@ -1,52 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "rs.h"
-
-// Used to create a keymap using only KC_ prefixed keys
-#define LAYOUT_kc( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-	) \
-	LAYOUT_ortho_4x12( \
-		KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b, \
-		KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b, \
-		KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b, \
-		KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b \
-	)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc( \
-  // ,-----------------------------------------------------------------------------------.
-       TAB  ,   Q  ,   W  ,   E  ,   R  ,   T  ,   Y  ,   U  ,   I  ,   O  ,   P  , EQL  ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-       ESCC ,   A  ,   S  ,   D  ,   F  ,   G  ,   H  ,   J  ,   K  ,   L  , SCLN , QUOT ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-       LSFT ,   Z  ,   X  ,   C  ,   V  ,   B  ,   N  ,   M  , COMM ,  DOT , SLSH , ENTS ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      , LCTL , LALT , LGUI , SPC  , SPC  , BCOD ,  FN  ,      , LEFT , RGHT
-  // `-----------------------------------------------------------------------------------'
-  ),
-  [_CODE] = LAYOUT_kc(
-  // ,-----------------------------------------------------------------------------------.
-       GRV  , EXLM ,  AT  , HASH , DLR  , PERC , CIRC , LPLT , ASTR , RPGT , NEQL ,      ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,  1   ,  2   ,  3   ,  4   ,  5   , MINS , LBRC ,  UP  , RBRC ,      , BSLS ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,  6   ,  7   ,  8   ,  9   ,  0   , AMPR , LEFT , DOWN , RGHT ,      , PIPE ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      ,      ,      ,      , DOT  ,      ,      ,      ,      ,      ,      
-  // `-----------------------------------------------------------------------------------'
-  ),
-  [_FN] = LAYOUT_kc(
-  // ,-----------------------------------------------------------------------------------.
-            ,  F1  ,  F2  ,  F3  ,  F4  ,  F5  ,  F6  ,  F7  ,  F8  ,  F9  , F10  , F11  ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-       BLTG , BLUP ,      ,      ,      , BRMU , VOLU ,      , PGUP ,      ,      ,      ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-       BLTG , BLDN ,      ,      , RST  , BRMD , VOLD , CTRA , PGDN , CTRE ,      ,      ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      ,      ,      ,      ,      , MUTE ,      ,      ,      ,      ,      
-  // `-----------------------------------------------------------------------------------'
-  ),
-};

layouts/community/ortho_4x12/rs/readme.md

@@ -1 +0,0 @@
-See [rs readme](../../../../users/rs/readme.md).

layouts/community/ortho_5x12/drashna/config.h

@@ -3,19 +3,20 @@
 
 /* ws2812 RGB LED */
 #if defined(KEYBOARD_fractal)
-#   define RGB_DI_PIN D2
-#   undef RGBLED_NUM
-#   define RGBLIGHT_ANIMATIONS
-#   define RGBLED_NUM 29     // Number of LEDs
-#   undef RGBLIGHT_HUE_STEP
-#   define RGBLIGHT_HUE_STEP 8
-#   undef RGBLIGHT_SAT_STEP
-#   define RGBLIGHT_SAT_STEP 8
-#   undef RGBLIGHT_VAL_STEP
-#   define RGBLIGHT_VAL_STEP 8
-#   define RGBLIGHT_LIMIT_VAL 175
-#   define RGBLIGHT_SLEEP
+  #define RGB_DI_PIN D2
+  #undef RGBLED_NUM
+  #define RGBLIGHT_ANIMATIONS
+  #define RGBLED_NUM 29     // Number of LEDs
+  #undef RGBLIGHT_HUE_STEP
+  #define RGBLIGHT_HUE_STEP 8
+  #undef RGBLIGHT_SAT_STEP
+  #define RGBLIGHT_SAT_STEP 8
+  #undef RGBLIGHT_VAL_STEP
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 175
+  #define RGBLIGHT_SLEEP
+
+  #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 3
+  #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 14
 
-#   define RGBLIGHT_EFFECT_KNIGHT_OFFSET 3
-#   define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 14
 #endif

layouts/community/ortho_5x12/rs/config.h

@@ -1 +1,35 @@
 #pragma once
+
+#ifdef AUDIO_ENABLE
+//#define STARTUP_SONG SONG(PREONIC_SOUND)
+#define STARTUP_SONG SONG(NO_SOUND)
+
+#define DEFAULT_LAYER_SONGS                                                    \
+  { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
+#endif
+
+#define MUSIC_MASK (keycode != KC_NO)
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 2

layouts/community/ortho_5x12/rs/karabiner.json

@@ -0,0 +1,154 @@
+{
+    "title": "RS",
+    "rules": [{
+        "description": "CapsLock to Escape / Control Mod-Tap",
+        "manipulators": [{
+            "type": "basic",
+            "from": {
+                "key_code": "caps_lock",
+                "modifiers": {
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "left_control"}],
+            "to_if_alone": [{"key_code": "escape"}]
+        }]
+    },
+    {
+        "description": "Right-Shift / Enter Mod-Tap",
+        "manipulators": [{
+            "type": "basic",
+            "from": {
+                "key_code": "right_shift",
+                "modifiers": {
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "right_shift"}],
+            "to_if_alone": [{"key_code": "return_or_enter"}]
+        }]
+    },
+    {
+        "description": "Right-Command / Backspace Mod-Tap",
+        "manipulators": [{
+            "type": "basic",
+            "from": {
+                "key_code": "right_command",
+                "modifiers": {
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "right_command"}],
+            "to_if_alone": [{"key_code": "delete_or_backspace"}]
+        }]
+    },
+    {
+        "description": "Right-Command Accents",
+        "manipulators": [
+        {
+            "type": "basic",
+            "from": {
+                "key_code": "a",
+                "modifiers": {
+                    "mandatory": ["right_command"],
+                    "optional": ["left_shift", "right_shift"]
+                }
+            },
+            "to": [
+                {"key_code": "grave_accent_and_tilde", "modifiers": ["left_option"]},
+                {"key_code": "a"}
+            ]
+        }]
+    },
+    {
+        "description": "Right Command Navigation",
+        "manipulators": [{
+            "type": "basic",
+            "from": {
+                "key_code": "j",
+                "modifiers": {
+                    "mandatory": ["right_command"],
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "left_arrow"}]
+        },
+        {
+            "type": "basic",
+            "from": {
+                "key_code": "k",
+                "modifiers": {
+                    "mandatory": ["right_command"],
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "down_arrow"}]
+        },
+        {
+            "type": "basic",
+            "from": {
+                "key_code": "i",
+                "modifiers": {
+                    "mandatory": ["right_command"],
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "up_arrow"}]
+        },
+        {
+            "type": "basic",
+            "from": {
+                "key_code": "l",
+                "modifiers": {
+                    "mandatory": ["right_command"],
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "right_arrow"}]
+        },
+        {
+            "type": "basic",
+            "from": {
+                "key_code": "e",
+                "modifiers": {
+                    "mandatory": ["right_command"],
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "page_up"}]
+        },
+        {
+            "type": "basic",
+            "from": {
+                "key_code": "d",
+                "modifiers": {
+                    "mandatory": ["right_command"],
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "page_down"}]
+        },
+        {
+            "type": "basic",
+            "from": {
+                "key_code": "s",
+                "modifiers": {
+                    "mandatory": ["right_command"],
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "home"}]
+        },
+        {
+            "type": "basic",
+            "from": {
+                "key_code": "f",
+                "modifiers": {
+                    "mandatory": ["right_command"],
+                    "optional": ["any"]
+                }
+            },
+            "to": [{"key_code": "end"}]
+        }]
+    }]
+}

layouts/community/ortho_5x12/rs/keymap.c

@@ -1,5 +1,19 @@
 #include QMK_KEYBOARD_H
-#include "rs.h"
+
+enum layers {
+  _QWERTY,
+  _HYPER,
+};
+
+#define KC_ KC_TRNS
+
+#define KC_ESCC MT(MOD_LCTL, KC_ESC)
+#define KC_RST  RESET
+#define KC_BSPH LT(_HYPER, KC_BSPC)
+#define KC_ENTS MT(MOD_LSFT, KC_ENT)
+// Brightness
+#define KC_BRUP KC_PAUS
+#define KC_BRDN KC_SLCK
 
 // Used to create a keymap using only KC_ prefixed keys
 #ifndef LAYOUT_kc
@@ -20,6 +34,7 @@
 #endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
   [_QWERTY] = LAYOUT_kc( \
   // ,-----------------------------------------------------------------------------------.
        GRV  ,   1  ,   2  ,   3  ,   4  ,   5  ,   6  ,   7  ,   8  ,   9  ,   0  , MINS ,
@@ -30,34 +45,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   // |------+------+------+------+------+------+------+------+------+------+------+------|
        LSFT ,   Z  ,   X  ,   C  ,   V  ,   B  ,   N  ,   M  , COMM ,  DOT , SLSH , ENTS ,
   // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      , LCTL , LALT , LGUI , SPC  , SPC  , BCOD ,  FN  ,      , LEFT , RGHT
+            , LCTL , LALT , LGUI , SPC  , SPC  , BSPC , BSPH , LEFT , DOWN ,  UP  , RGHT
   // `---------------------------------------------------+-------------------------------'
-  ),
-  [_CODE] = LAYOUT_kc(
+  ), //                                                  |
+  //                                                     |
+  [_HYPER] = LAYOUT_kc( /*                               V  */ \
   // ,-----------------------------------------------------------------------------------.
-            ,      ,      ,      ,      ,      ,      ,      ,      ,      ,      ,      ,
+        RST ,  F1  ,  F2  ,  F3  ,  F4  ,  F5  ,  F6  ,  F7  ,  F8  , LBRC , RBRC ,      ,
   // |------+------+------+------+------+------+------+------+------+------+------+------|
-       GRV  , EXLM ,  AT  , HASH , DLR  , PERC , CIRC , LPLT , ASTR , RPGT , NEQL ,      ,
+            ,      ,      , PGUP ,      ,      ,      ,      ,  UP  , LCBR , RCBR , BSLS ,
   // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,  1   ,  2   ,  3   ,  4   ,  5   , MINS , LBRC ,  UP  , RBRC ,      , BSLS ,
+            ,      , HOME , PGDN , END  ,      , MINS , LEFT , DOWN , RGHT ,      , PIPE ,
   // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,  6   ,  7   ,  8   ,  9   ,  0   , AMPR , LEFT , DOWN , RGHT ,      , PIPE ,
+            ,      ,      ,      ,      ,      ,      ,      ,      , BRDN , BRUP ,      ,
   // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      ,      ,      ,      , DOT  ,      ,      ,      ,      ,      ,      
-  // `-----------------------------------------------------------------------------------'
-  ),
-  [_FN] = LAYOUT_kc(
-  // ,-----------------------------------------------------------------------------------.
-            ,  F1  ,  F2  ,  F3  ,  F4  ,  F5  ,  F6  ,  F7  ,  F8  ,  F9  , F10  , F11  ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      ,      ,      ,      ,      ,      ,      ,      ,      ,      ,      ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-       BLTG , BLUP ,      ,      ,      , BRMU , VOLU ,      , PGUP ,      ,      ,      ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-       BLTG , BLDN ,      ,      , RST  , BRMD , VOLD , CTRA , PGDN , CTRE ,      ,      ,
-  // |------+------+------+------+------+------+------+------+------+------+------+------|
-            ,      ,      ,      ,      ,      , MUTE ,      ,      ,      ,      ,      
+            ,      ,      ,      ,      ,      ,      ,      , MUTE , VOLD , VOLU , MPLY
   // `-----------------------------------------------------------------------------------'
   ),
 };
-

layouts/community/ortho_5x12/rs/readme.md

@@ -1 +1,17 @@
-See [rs readme](../../../../users/rs/readme.md).
+# Code friendly 60% keymap
+
+I developped this keymap to make a better use of 60% ortho keyboards I use like the preonic of the iris. Instead of trying to mimic the Planck layout like the default preonic keymap, this keymap removes the raise and lower layers and offers a simpler hyper layer concept for a few missing sign keys and cursors / media keys.
+
+The important part for coders is that most important signs needed to code are available at their usual position on a full keyboard, without complex layer gymnastic. Access to [] and {} are available on the hyper layer at their usual emplacement.
+
+The right thumb is used for both backspace and hyper layer switching. On the hyper layer, in addition to some coding signs, you get the cursor keys arranged in cross, just under your right fingers, so you don't have to move your hand when navigating in code or command line. Other hand gets the home/end page up/down in a similar layout.
+
+Because you sometime have to use your internal keyboard when you use a macbook, a karabiner configuration is also provided to get most of the features of this keyboard, including the hyper layer / backspace on right command key etc.
+
+This keymap has been tested with those keyboards:
+- [Preonic](../../../../keyboards/preonic/)
+- [My preonic clone](../../../rs60/)
+
+Checkout an adaptation of this keymap for other keyboards:
+- [Iris/rs](../../../../keyboards/iris/keymaps/rs/keymap.c)
+- [ErgoTravel/rs](../../../../keyboards/ergotravel/keymaps/rs/keymap.c)

quantum/audio/audio.h

@@ -13,8 +13,8 @@
  * 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 AUDIO_H
-#define AUDIO_H
+
+#pragma once
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -27,6 +27,9 @@
 #include "voices.h"
 #include "quantum.h"
 #include <math.h>
+#if defined(PROTOCOL_CHIBIOS)
+  #include "audio_arm.h"
+#endif
 
 // Largely untested PWM audio mode (doesn't sound as good)
 // #define PWM_AUDIO
@@ -107,6 +110,5 @@ void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat);
 #define PLAY_SONG(note_array) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), false)
 #define PLAY_LOOP(note_array) play_notes(&note_array, NOTE_ARRAY_SIZE((note_array)), true)
 
+bool is_playing_note(void);
 bool is_playing_notes(void);
-
-#endif

quantum/audio/audio_arm.c

@@ -1,4 +1,4 @@
-/* Copyright 2016 Jack Humbert
+/* Copyright 2016-2019 Jack Humbert
  *
  * 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
@@ -26,21 +26,8 @@
 
 // -----------------------------------------------------------------------------
 
-int voices = 0;
-int voice_place = 0;
-float frequency = 0;
-float frequency_alt = 0;
-int volume = 0;
-long position = 0;
-
-float frequencies[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-int volumes[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-bool sliding = false;
-
-float place = 0;
-
-uint8_t * sample;
-uint16_t sample_length = 0;
+uint8_t dac_voices = 0;
+float dac_frequencies[8] = { 0.0 };
 
 bool     playing_notes = false;
 bool     playing_note = false;
@@ -48,14 +35,12 @@ float    note_frequency = 0;
 float    note_length = 0;
 uint8_t  note_tempo = TEMPO_DEFAULT;
 float    note_timbre = TIMBRE_DEFAULT;
-uint16_t note_position = 0;
+uint32_t note_position = 0;
 float (* notes_pointer)[][2];
 uint16_t notes_count;
 bool     notes_repeat;
-bool     note_resting = false;
 
 uint16_t current_note = 0;
-uint8_t rest_counter = 0;
 
 #ifdef VIBRATO_ENABLE
 float vibrato_counter = 0;
@@ -77,200 +62,198 @@ bool glissando = true;
 #endif
 float startup_song[][2] = STARTUP_SONG;
 
-static void gpt_cb8(GPTDriver *gptp);
-
-#define DAC_BUFFER_SIZE 100
-#ifndef DAC_SAMPLE_MAX
-#define DAC_SAMPLE_MAX  65535U
-#endif
-
-#define START_CHANNEL_1() gptStart(&GPTD6, &gpt6cfg1); \
-    gptStartContinuous(&GPTD6, 2U)
-#define START_CHANNEL_2() gptStart(&GPTD7, &gpt7cfg1); \
-    gptStartContinuous(&GPTD7, 2U)
-#define STOP_CHANNEL_1() gptStopTimer(&GPTD6)
-#define STOP_CHANNEL_2() gptStopTimer(&GPTD7)
-#define RESTART_CHANNEL_1() STOP_CHANNEL_1(); \
-    START_CHANNEL_1()
-#define RESTART_CHANNEL_2() STOP_CHANNEL_2(); \
-    START_CHANNEL_2()
-#define UPDATE_CHANNEL_1_FREQ(freq) gpt6cfg1.frequency = freq * DAC_BUFFER_SIZE; \
-    RESTART_CHANNEL_1()
-#define UPDATE_CHANNEL_2_FREQ(freq) gpt7cfg1.frequency = freq * DAC_BUFFER_SIZE; \
-    RESTART_CHANNEL_2()
-#define GET_CHANNEL_1_FREQ (uint16_t)(gpt6cfg1.frequency * DAC_BUFFER_SIZE)
-#define GET_CHANNEL_2_FREQ (uint16_t)(gpt7cfg1.frequency * DAC_BUFFER_SIZE)
-
-
-/*
- * GPT6 configuration.
- */
-// static const GPTConfig gpt6cfg1 = {
-//   .frequency    = 1000000U,
-//   .callback     = NULL,
-//   .cr2          = TIM_CR2_MMS_1,    /* MMS = 010 = TRGO on Update Event.    */
-//   .dier         = 0U
-// };
-
-GPTConfig gpt6cfg1 = {
-  .frequency    = 440U*DAC_BUFFER_SIZE,
-  .callback     = NULL,
-  .cr2          = TIM_CR2_MMS_1,    /* MMS = 010 = TRGO on Update Event.    */
-  .dier         = 0U
+static const dacsample_t dac_buffer_sine[DAC_BUFFER_SIZE] = {
+  // 256 values, max 4095
+  0x800,0x832,0x864,0x896,0x8c8,0x8fa,0x92c,0x95e,
+  0x98f,0x9c0,0x9f1,0xa22,0xa52,0xa82,0xab1,0xae0,
+  0xb0f,0xb3d,0xb6b,0xb98,0xbc5,0xbf1,0xc1c,0xc47,
+  0xc71,0xc9a,0xcc3,0xceb,0xd12,0xd39,0xd5f,0xd83,
+  0xda7,0xdca,0xded,0xe0e,0xe2e,0xe4e,0xe6c,0xe8a,
+  0xea6,0xec1,0xedc,0xef5,0xf0d,0xf24,0xf3a,0xf4f,
+  0xf63,0xf76,0xf87,0xf98,0xfa7,0xfb5,0xfc2,0xfcd,
+  0xfd8,0xfe1,0xfe9,0xff0,0xff5,0xff9,0xffd,0xffe,
+  0xfff,0xffe,0xffd,0xff9,0xff5,0xff0,0xfe9,0xfe1,
+  0xfd8,0xfcd,0xfc2,0xfb5,0xfa7,0xf98,0xf87,0xf76,
+  0xf63,0xf4f,0xf3a,0xf24,0xf0d,0xef5,0xedc,0xec1,
+  0xea6,0xe8a,0xe6c,0xe4e,0xe2e,0xe0e,0xded,0xdca,
+  0xda7,0xd83,0xd5f,0xd39,0xd12,0xceb,0xcc3,0xc9a,
+  0xc71,0xc47,0xc1c,0xbf1,0xbc5,0xb98,0xb6b,0xb3d,
+  0xb0f,0xae0,0xab1,0xa82,0xa52,0xa22,0x9f1,0x9c0,
+  0x98f,0x95e,0x92c,0x8fa,0x8c8,0x896,0x864,0x832,
+  0x800,0x7cd,0x79b,0x769,0x737,0x705,0x6d3,0x6a1,
+  0x670,0x63f,0x60e,0x5dd,0x5ad,0x57d,0x54e,0x51f,
+  0x4f0,0x4c2,0x494,0x467,0x43a,0x40e,0x3e3,0x3b8,
+  0x38e,0x365,0x33c,0x314,0x2ed,0x2c6,0x2a0,0x27c,
+  0x258,0x235,0x212,0x1f1,0x1d1,0x1b1,0x193,0x175,
+  0x159,0x13e,0x123,0x10a,0xf2, 0xdb, 0xc5, 0xb0,
+  0x9c, 0x89, 0x78, 0x67, 0x58, 0x4a, 0x3d, 0x32,
+  0x27, 0x1e, 0x16, 0xf,  0xa,  0x6,  0x2,  0x1,
+  0x0,  0x1,  0x2,  0x6,  0xa,  0xf,  0x16, 0x1e,
+  0x27, 0x32, 0x3d, 0x4a, 0x58, 0x67, 0x78, 0x89,
+  0x9c, 0xb0, 0xc5, 0xdb, 0xf2, 0x10a,0x123,0x13e,
+  0x159,0x175,0x193,0x1b1,0x1d1,0x1f1,0x212,0x235,
+  0x258,0x27c,0x2a0,0x2c6,0x2ed,0x314,0x33c,0x365,
+  0x38e,0x3b8,0x3e3,0x40e,0x43a,0x467,0x494,0x4c2,
+  0x4f0,0x51f,0x54e,0x57d,0x5ad,0x5dd,0x60e,0x63f,
+  0x670,0x6a1,0x6d3,0x705,0x737,0x769,0x79b,0x7cd
 };
 
-GPTConfig gpt7cfg1 = {
-  .frequency    = 440U*DAC_BUFFER_SIZE,
-  .callback     = NULL,
-  .cr2          = TIM_CR2_MMS_1,    /* MMS = 010 = TRGO on Update Event.    */
-  .dier         = 0U
+static const dacsample_t dac_buffer_triangle[DAC_BUFFER_SIZE] = {
+  // 256 values, max 4095
+  0x20, 0x40, 0x60, 0x80, 0xa0, 0xc0, 0xe0, 0x100,
+  0x120,0x140,0x160,0x180,0x1a0,0x1c0,0x1e0,0x200,
+  0x220,0x240,0x260,0x280,0x2a0,0x2c0,0x2e0,0x300,
+  0x320,0x340,0x360,0x380,0x3a0,0x3c0,0x3e0,0x400,
+  0x420,0x440,0x460,0x480,0x4a0,0x4c0,0x4e0,0x500,
+  0x520,0x540,0x560,0x580,0x5a0,0x5c0,0x5e0,0x600,
+  0x620,0x640,0x660,0x680,0x6a0,0x6c0,0x6e0,0x700,
+  0x720,0x740,0x760,0x780,0x7a0,0x7c0,0x7e0,0x800,
+  0x81f,0x83f,0x85f,0x87f,0x89f,0x8bf,0x8df,0x8ff,
+  0x91f,0x93f,0x95f,0x97f,0x99f,0x9bf,0x9df,0x9ff,
+  0xa1f,0xa3f,0xa5f,0xa7f,0xa9f,0xabf,0xadf,0xaff,
+  0xb1f,0xb3f,0xb5f,0xb7f,0xb9f,0xbbf,0xbdf,0xbff,
+  0xc1f,0xc3f,0xc5f,0xc7f,0xc9f,0xcbf,0xcdf,0xcff,
+  0xd1f,0xd3f,0xd5f,0xd7f,0xd9f,0xdbf,0xddf,0xdff,
+  0xe1f,0xe3f,0xe5f,0xe7f,0xe9f,0xebf,0xedf,0xeff,
+  0xf1f,0xf3f,0xf5f,0xf7f,0xf9f,0xfbf,0xfdf,0xfff,
+  0xfdf,0xfbf,0xf9f,0xf7f,0xf5f,0xf3f,0xf1f,0xeff,
+  0xedf,0xebf,0xe9f,0xe7f,0xe5f,0xe3f,0xe1f,0xdff,
+  0xddf,0xdbf,0xd9f,0xd7f,0xd5f,0xd3f,0xd1f,0xcff,
+  0xcdf,0xcbf,0xc9f,0xc7f,0xc5f,0xc3f,0xc1f,0xbff,
+  0xbdf,0xbbf,0xb9f,0xb7f,0xb5f,0xb3f,0xb1f,0xaff,
+  0xadf,0xabf,0xa9f,0xa7f,0xa5f,0xa3f,0xa1f,0x9ff,
+  0x9df,0x9bf,0x99f,0x97f,0x95f,0x93f,0x91f,0x8ff,
+  0x8df,0x8bf,0x89f,0x87f,0x85f,0x83f,0x81f,0x800,
+  0x7e0,0x7c0,0x7a0,0x780,0x760,0x740,0x720,0x700,
+  0x6e0,0x6c0,0x6a0,0x680,0x660,0x640,0x620,0x600,
+  0x5e0,0x5c0,0x5a0,0x580,0x560,0x540,0x520,0x500,
+  0x4e0,0x4c0,0x4a0,0x480,0x460,0x440,0x420,0x400,
+  0x3e0,0x3c0,0x3a0,0x380,0x360,0x340,0x320,0x300,
+  0x2e0,0x2c0,0x2a0,0x280,0x260,0x240,0x220,0x200,
+  0x1e0,0x1c0,0x1a0,0x180,0x160,0x140,0x120,0x100,
+  0xe0, 0xc0, 0xa0, 0x80, 0x60, 0x40, 0x20, 0x0
 };
 
-GPTConfig gpt8cfg1 = {
-  .frequency    = 10,
-  .callback     = gpt_cb8,
-  .cr2          = TIM_CR2_MMS_1,    /* MMS = 010 = TRGO on Update Event.    */
-  .dier         = 0U
-};
-
-
-/*
- * DAC test buffer (sine wave).
- */
-// static const dacsample_t dac_buffer[DAC_BUFFER_SIZE] = {
-//   2047, 2082, 2118, 2154, 2189, 2225, 2260, 2296, 2331, 2367, 2402, 2437,
-//   2472, 2507, 2542, 2576, 2611, 2645, 2679, 2713, 2747, 2780, 2813, 2846,
-//   2879, 2912, 2944, 2976, 3008, 3039, 3070, 3101, 3131, 3161, 3191, 3221,
-//   3250, 3278, 3307, 3335, 3362, 3389, 3416, 3443, 3468, 3494, 3519, 3544,
-//   3568, 3591, 3615, 3637, 3660, 3681, 3703, 3723, 3744, 3763, 3782, 3801,
-//   3819, 3837, 3854, 3870, 3886, 3902, 3917, 3931, 3944, 3958, 3970, 3982,
-//   3993, 4004, 4014, 4024, 4033, 4041, 4049, 4056, 4062, 4068, 4074, 4078,
-//   4082, 4086, 4089, 4091, 4092, 4093, 4094, 4093, 4092, 4091, 4089, 4086,
-//   4082, 4078, 4074, 4068, 4062, 4056, 4049, 4041, 4033, 4024, 4014, 4004,
-//   3993, 3982, 3970, 3958, 3944, 3931, 3917, 3902, 3886, 3870, 3854, 3837,
-//   3819, 3801, 3782, 3763, 3744, 3723, 3703, 3681, 3660, 3637, 3615, 3591,
-//   3568, 3544, 3519, 3494, 3468, 3443, 3416, 3389, 3362, 3335, 3307, 3278,
-//   3250, 3221, 3191, 3161, 3131, 3101, 3070, 3039, 3008, 2976, 2944, 2912,
-//   2879, 2846, 2813, 2780, 2747, 2713, 2679, 2645, 2611, 2576, 2542, 2507,
-//   2472, 2437, 2402, 2367, 2331, 2296, 2260, 2225, 2189, 2154, 2118, 2082,
-//   2047, 2012, 1976, 1940, 1905, 1869, 1834, 1798, 1763, 1727, 1692, 1657,
-//   1622, 1587, 1552, 1518, 1483, 1449, 1415, 1381, 1347, 1314, 1281, 1248,
-//   1215, 1182, 1150, 1118, 1086, 1055, 1024,  993,  963,  933,  903,  873,
-//    844,  816,  787,  759,  732,  705,  678,  651,  626,  600,  575,  550,
-//    526,  503,  479,  457,  434,  413,  391,  371,  350,  331,  312,  293,
-//    275,  257,  240,  224,  208,  192,  177,  163,  150,  136,  124,  112,
-//    101,   90,   80,   70,   61,   53,   45,   38,   32,   26,   20,   16,
-//     12,    8,    5,    3,    2,    1,    0,    1,    2,    3,    5,    8,
-//     12,   16,   20,   26,   32,   38,   45,   53,   61,   70,   80,   90,
-//    101,  112,  124,  136,  150,  163,  177,  192,  208,  224,  240,  257,
-//    275,  293,  312,  331,  350,  371,  391,  413,  434,  457,  479,  503,
-//    526,  550,  575,  600,  626,  651,  678,  705,  732,  759,  787,  816,
-//    844,  873,  903,  933,  963,  993, 1024, 1055, 1086, 1118, 1150, 1182,
-//   1215, 1248, 1281, 1314, 1347, 1381, 1415, 1449, 1483, 1518, 1552, 1587,
-//   1622, 1657, 1692, 1727, 1763, 1798, 1834, 1869, 1905, 1940, 1976, 2012
-// };
-
-// static const dacsample_t dac_buffer_2[DAC_BUFFER_SIZE] = {
-//     12,    8,    5,    3,    2,    1,    0,    1,    2,    3,    5,    8,
-//     12,   16,   20,   26,   32,   38,   45,   53,   61,   70,   80,   90,
-//    101,  112,  124,  136,  150,  163,  177,  192,  208,  224,  240,  257,
-//    275,  293,  312,  331,  350,  371,  391,  413,  434,  457,  479,  503,
-//    526,  550,  575,  600,  626,  651,  678,  705,  732,  759,  787,  816,
-//    844,  873,  903,  933,  963,  993, 1024, 1055, 1086, 1118, 1150, 1182,
-//   1215, 1248, 1281, 1314, 1347, 1381, 1415, 1449, 1483, 1518, 1552, 1587,
-//   1622, 1657, 1692, 1727, 1763, 1798, 1834, 1869, 1905, 1940, 1976, 2012,
-//   2047, 2082, 2118, 2154, 2189, 2225, 2260, 2296, 2331, 2367, 2402, 2437,
-//   2472, 2507, 2542, 2576, 2611, 2645, 2679, 2713, 2747, 2780, 2813, 2846,
-//   2879, 2912, 2944, 2976, 3008, 3039, 3070, 3101, 3131, 3161, 3191, 3221,
-//   3250, 3278, 3307, 3335, 3362, 3389, 3416, 3443, 3468, 3494, 3519, 3544,
-//   3568, 3591, 3615, 3637, 3660, 3681, 3703, 3723, 3744, 3763, 3782, 3801,
-//   3819, 3837, 3854, 3870, 3886, 3902, 3917, 3931, 3944, 3958, 3970, 3982,
-//   3993, 4004, 4014, 4024, 4033, 4041, 4049, 4056, 4062, 4068, 4074, 4078,
-//   4082, 4086, 4089, 4091, 4092, 4093, 4094, 4093, 4092, 4091, 4089, 4086,
-//   4082, 4078, 4074, 4068, 4062, 4056, 4049, 4041, 4033, 4024, 4014, 4004,
-//   3993, 3982, 3970, 3958, 3944, 3931, 3917, 3902, 3886, 3870, 3854, 3837,
-//   3819, 3801, 3782, 3763, 3744, 3723, 3703, 3681, 3660, 3637, 3615, 3591,
-//   3568, 3544, 3519, 3494, 3468, 3443, 3416, 3389, 3362, 3335, 3307, 3278,
-//   3250, 3221, 3191, 3161, 3131, 3101, 3070, 3039, 3008, 2976, 2944, 2912,
-//   2879, 2846, 2813, 2780, 2747, 2713, 2679, 2645, 2611, 2576, 2542, 2507,
-//   2472, 2437, 2402, 2367, 2331, 2296, 2260, 2225, 2189, 2154, 2118, 2082,
-//   2047, 2012, 1976, 1940, 1905, 1869, 1834, 1798, 1763, 1727, 1692, 1657,
-//   1622, 1587, 1552, 1518, 1483, 1449, 1415, 1381, 1347, 1314, 1281, 1248,
-//   1215, 1182, 1150, 1118, 1086, 1055, 1024,  993,  963,  933,  903,  873,
-//    844,  816,  787,  759,  732,  705,  678,  651,  626,  600,  575,  550,
-//    526,  503,  479,  457,  434,  413,  391,  371,  350,  331,  312,  293,
-//    275,  257,  240,  224,  208,  192,  177,  163,  150,  136,  124,  112,
-//    101,   90,   80,   70,   61,   53,   45,   38,   32,   26,   20,   16
-// };
-
-// squarewave
-static const dacsample_t dac_buffer[DAC_BUFFER_SIZE] = {
+static const dacsample_t dac_buffer_square[DAC_BUFFER_SIZE] = {
   // First half is max, second half is 0
   [0                 ... DAC_BUFFER_SIZE/2-1] = DAC_SAMPLE_MAX,
   [DAC_BUFFER_SIZE/2 ... DAC_BUFFER_SIZE  -1] = 0,
 };
 
-// squarewave
-static const dacsample_t dac_buffer_2[DAC_BUFFER_SIZE] = {
-  // opposite of dac_buffer above
-  [0                 ... DAC_BUFFER_SIZE/2-1] = 0,
-  [DAC_BUFFER_SIZE/2 ... DAC_BUFFER_SIZE  -1] = DAC_SAMPLE_MAX,
-};
+static dacsample_t dac_buffer_empty[DAC_BUFFER_SIZE] = { DAC_OFF_VALUE };
 
-/*
- * DAC streaming callback.
+static float dac_if[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
+
+/**
+ * Generation of the waveform being passed to the callback. Declared weak so users
+ * can override it with their own waveforms/noises.
  */
-size_t nx = 0, ny = 0, nz = 0;
-static void end_cb1(DACDriver *dacp, dacsample_t *buffer, size_t n) {
+__attribute__ ((weak))
+uint16_t dac_value_generate(void) {
+  uint16_t value = DAC_OFF_VALUE;
+  uint8_t working_voices = dac_voices;
+  if (working_voices > DAC_VOICES_MAX)
+    working_voices = DAC_VOICES_MAX;
+
+  if (working_voices > 0) {
+    uint16_t value_avg = 0;
+    for (uint8_t i = 0; i < working_voices; i++) {
+      dac_if[i] = dac_if[i] + ((dac_frequencies[i] * DAC_BUFFER_SIZE) / DAC_SAMPLE_RATE);
+
+      // Needed because % doesn't work with floats
+      while (dac_if[i] >= (DAC_BUFFER_SIZE))
+        dac_if[i] = dac_if[i] - DAC_BUFFER_SIZE;
+
+      // Wavetable generation/lookup
+      uint16_t dac_i = (uint16_t)dac_if[i];
+      // SINE
+      value_avg += dac_buffer_sine[dac_i] / working_voices / 3;
+      // TRIANGLE
+      value_avg += dac_buffer_triangle[dac_i] / working_voices / 3;
+      // SQUARE
+      value_avg += dac_buffer_square[dac_i] / working_voices / 3;
+    }
+    value = value_avg;
+  }
+  return value;
+}
+
+/**
+ * DAC streaming callback. Does all of the main computing for playing songs.
+ */
+static void dac_end(DACDriver * dacp, dacsample_t * sample_p, size_t sample_count) {
 
   (void)dacp;
 
-  nz++;
-  if (dac_buffer == buffer) {
-    nx += n;
-  }
-  else {
-    ny += n;
+  for (uint8_t s = 0; s < sample_count; s++) {
+    sample_p[s] = dac_value_generate();
   }
 
-  if ((nz % 1000) == 0) {
-    // palTogglePad(GPIOD, GPIOD_LED3);
+  if (playing_notes) {
+    note_position += sample_count;
+
+    // End of the note - 35 is arbitary here, but gets us close to AVR's timing
+    if ((note_position >= (note_length*DAC_SAMPLE_RATE/35))) {
+      stop_note((*notes_pointer)[current_note][0]);
+      current_note++;
+      if (current_note >= notes_count) {
+        if (notes_repeat) {
+          current_note = 0;
+        } else {
+          playing_notes = false;
+          return;
+        }
+      }
+      play_note((*notes_pointer)[current_note][0], 15);
+      envelope_index = 0;
+      note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
+
+      // Skip forward in the next note's length if we've over shot the last, so
+      // the overall length of the song is the same
+      note_position = note_position - (note_length*DAC_SAMPLE_RATE/35);
+    }
   }
 }
 
-/*
- * DAC error callback.
- */
-static void error_cb1(DACDriver *dacp, dacerror_t err) {
+static void dac_error(DACDriver *dacp, dacerror_t err) {
 
   (void)dacp;
   (void)err;
 
-  chSysHalt("DAC failure");
+  chSysHalt("DAC failure. halp");
 }
 
-static const DACConfig dac1cfg1 = {
+static const GPTConfig gpt6cfg1 = {
+  .frequency    = DAC_SAMPLE_RATE * 3,
+  .callback     = NULL,
+  .cr2          = TIM_CR2_MMS_1,       /* MMS = 010 = TRGO on Update Event.  */
+  .dier         = 0U
+};
+
+static const DACConfig dac_conf = {
   .init         = DAC_SAMPLE_MAX,
   .datamode     = DAC_DHRM_12BIT_RIGHT
 };
 
-static const DACConversionGroup dacgrpcfg1 = {
+/**
+ * @note The DAC_TRG(0) here selects the Timer 6 TRGO event, which is triggered
+ * on the rising edge after 3 APB1 clock cycles, causing our gpt6cfg1.frequency
+ * to be a third of what we expect.
+ *
+ * Here are all the values for DAC_TRG (TSEL in the ref manual)
+ * TIM15_TRGO 0b011
+ * TIM2_TRGO  0b100
+ * TIM3_TRGO  0b001
+ * TIM6_TRGO  0b000
+ * TIM7_TRGO  0b010
+ * EXTI9      0b110
+ * SWTRIG     0b111
+ */
+static const DACConversionGroup dac_conv_cfg = {
   .num_channels = 1U,
-  .end_cb       = end_cb1,
-  .error_cb     = error_cb1,
-  .trigger      = DAC_TRG(0)
-};
-
-static const DACConfig dac1cfg2 = {
-  .init         = DAC_SAMPLE_MAX,
-  .datamode     = DAC_DHRM_12BIT_RIGHT
-};
-
-static const DACConversionGroup dacgrpcfg2 = {
-  .num_channels = 1U,
-  .end_cb       = end_cb1,
-  .error_cb     = error_cb1,
-  .trigger      = DAC_TRG(0)
+  .end_cb       = dac_end,
+  .error_cb     = dac_error,
+  .trigger      = DAC_TRG(0b000)
 };
 
 void audio_init() {
@@ -292,26 +275,20 @@ void audio_init() {
   #endif
 #endif // ARM EEPROM
 
-  /*
-   * Starting DAC1 driver, setting up the output pin as analog as suggested
-   * by the Reference Manual.
-   */
-  palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG);
-  palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG);
-  dacStart(&DACD1, &dac1cfg1);
-  dacStart(&DACD2, &dac1cfg2);
 
-  /*
-   * Starting GPT6/7 driver, it is used for triggering the DAC.
-   */
-  START_CHANNEL_1();
-  START_CHANNEL_2();
+#if defined(A4_AUDIO)
+  palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG );
+  dacStart(&DACD1, &dac_conf);
+  dacStartConversion(&DACD1, &dac_conv_cfg, dac_buffer_empty, DAC_BUFFER_SIZE);
+#endif
+#if defined(A5_AUDIO)
+  palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG );
+  dacStart(&DACD2, &dac_conf);
+  dacStartConversion(&DACD2, &dac_conv_cfg, dac_buffer_empty, DAC_BUFFER_SIZE);
+#endif
 
-  /*
-   * Starting a continuous conversion.
-   */
-  dacStartConversion(&DACD1, &dacgrpcfg1, (dacsample_t *)dac_buffer, DAC_BUFFER_SIZE);
-  dacStartConversion(&DACD2, &dacgrpcfg2, (dacsample_t *)dac_buffer_2, DAC_BUFFER_SIZE);
+  gptStart(&GPTD6, &gpt6cfg1);
+  gptStartContinuous(&GPTD6, 2U);
 
   audio_initialized = true;
 
@@ -329,22 +306,13 @@ void stop_all_notes() {
     if (!audio_initialized) {
         audio_init();
     }
-    voices = 0;
-
-    gptStopTimer(&GPTD6);
-    gptStopTimer(&GPTD7);
-    gptStopTimer(&GPTD8);
+    dac_voices = 0;
 
     playing_notes = false;
     playing_note = false;
-    frequency = 0;
-    frequency_alt = 0;
-    volume = 0;
 
-    for (uint8_t i = 0; i < 8; i++)
-    {
-        frequencies[i] = 0;
-        volumes[i] = 0;
+    for (uint8_t i = 0; i < 8; i++) {
+        dac_frequencies[i] = 0;
     }
 }
 
@@ -356,32 +324,20 @@ void stop_note(float freq) {
       audio_init();
     }
     for (int i = 7; i >= 0; i--) {
-      if (frequencies[i] == freq) {
-        frequencies[i] = 0;
-        volumes[i] = 0;
+      if (dac_frequencies[i] == freq) {
+        dac_frequencies[i] = 0;
         for (int j = i; (j < 7); j++) {
-          frequencies[j] = frequencies[j+1];
-          frequencies[j+1] = 0;
-          volumes[j] = volumes[j+1];
-          volumes[j+1] = 0;
+          dac_frequencies[j] = dac_frequencies[j+1];
+          dac_frequencies[j+1] = 0;
         }
         break;
       }
     }
-    voices--;
-    if (voices < 0) {
-      voices = 0;
+    dac_voices--;
+    if (dac_voices < 0) {
+      dac_voices = 0;
     }
-    if (voice_place >= voices) {
-      voice_place = 0;
-    }
-    if (voices == 0) {
-      STOP_CHANNEL_1();
-      STOP_CHANNEL_2();
-      gptStopTimer(&GPTD8);
-      frequency = 0;
-      frequency_alt = 0;
-      volume = 0;
+    if (dac_voices == 0) {
       playing_note = false;
     }
   }
@@ -406,196 +362,6 @@ float vibrato(float average_freq) {
 
 #endif
 
-static void gpt_cb8(GPTDriver *gptp) {
-  float freq;
-
-  if (playing_note) {
-    if (voices > 0) {
-
-      float freq_alt = 0;
-      if (voices > 1) {
-        if (polyphony_rate == 0) {
-          if (glissando) {
-            if (frequency_alt != 0 && frequency_alt < frequencies[voices - 2] && frequency_alt < frequencies[voices - 2] * pow(2, -440/frequencies[voices - 2]/12/2)) {
-              frequency_alt = frequency_alt * pow(2, 440/frequency_alt/12/2);
-            } else if (frequency_alt != 0 && frequency_alt > frequencies[voices - 2] && frequency_alt > frequencies[voices - 2] * pow(2, 440/frequencies[voices - 2]/12/2)) {
-              frequency_alt = frequency_alt * pow(2, -440/frequency_alt/12/2);
-            } else {
-              frequency_alt = frequencies[voices - 2];
-            }
-          } else {
-            frequency_alt = frequencies[voices - 2];
-          }
-
-          #ifdef VIBRATO_ENABLE
-            if (vibrato_strength > 0) {
-              freq_alt = vibrato(frequency_alt);
-            } else {
-              freq_alt = frequency_alt;
-            }
-          #else
-            freq_alt = frequency_alt;
-          #endif
-        }
-
-        if (envelope_index < 65535) {
-          envelope_index++;
-        }
-
-        freq_alt = voice_envelope(freq_alt);
-
-        if (freq_alt < 30.517578125) {
-          freq_alt = 30.52;
-        }
-
-        if (GET_CHANNEL_2_FREQ != (uint16_t)freq_alt) {
-          UPDATE_CHANNEL_2_FREQ(freq_alt);
-        } else {
-          RESTART_CHANNEL_2();
-        }
-        //note_timbre;
-      }
-
-      if (polyphony_rate > 0) {
-        if (voices > 1) {
-          voice_place %= voices;
-          if (place++ > (frequencies[voice_place] / polyphony_rate)) {
-            voice_place = (voice_place + 1) % voices;
-            place = 0.0;
-          }
-        }
-
-        #ifdef VIBRATO_ENABLE
-          if (vibrato_strength > 0) {
-              freq = vibrato(frequencies[voice_place]);
-          } else {
-              freq = frequencies[voice_place];
-          }
-        #else
-          freq = frequencies[voice_place];
-        #endif
-      } else {
-        if (glissando) {
-          if (frequency != 0 && frequency < frequencies[voices - 1] && frequency < frequencies[voices - 1] * pow(2, -440/frequencies[voices - 1]/12/2)) {
-            frequency = frequency * pow(2, 440/frequency/12/2);
-          } else if (frequency != 0 && frequency > frequencies[voices - 1] && frequency > frequencies[voices - 1] * pow(2, 440/frequencies[voices - 1]/12/2)) {
-            frequency = frequency * pow(2, -440/frequency/12/2);
-          } else {
-            frequency = frequencies[voices - 1];
-          }
-        } else {
-          frequency = frequencies[voices - 1];
-        }
-
-        #ifdef VIBRATO_ENABLE
-          if (vibrato_strength > 0) {
-            freq = vibrato(frequency);
-          } else {
-            freq = frequency;
-          }
-        #else
-          freq = frequency;
-        #endif
-      }
-
-      if (envelope_index < 65535) {
-        envelope_index++;
-      }
-
-      freq = voice_envelope(freq);
-
-      if (freq < 30.517578125) {
-        freq = 30.52;
-      }
-
-
-      if (GET_CHANNEL_1_FREQ != (uint16_t)freq) {
-        UPDATE_CHANNEL_1_FREQ(freq);
-      } else {
-        RESTART_CHANNEL_1();
-      }
-      //note_timbre;
-    }
-  }
-
-  if (playing_notes) {
-    if (note_frequency > 0) {
-      #ifdef VIBRATO_ENABLE
-        if (vibrato_strength > 0) {
-          freq = vibrato(note_frequency);
-        } else {
-          freq = note_frequency;
-        }
-      #else
-        freq = note_frequency;
-      #endif
-
-      if (envelope_index < 65535) {
-        envelope_index++;
-      }
-      freq = voice_envelope(freq);
-
-
-      if (GET_CHANNEL_1_FREQ != (uint16_t)freq) {
-        UPDATE_CHANNEL_1_FREQ(freq);
-        UPDATE_CHANNEL_2_FREQ(freq);
-      }
-      //note_timbre;
-    } else {
-        // gptStopTimer(&GPTD6);
-        // gptStopTimer(&GPTD7);
-    }
-
-    note_position++;
-    bool end_of_note = false;
-    if (GET_CHANNEL_1_FREQ > 0) {
-      if (!note_resting)
-        end_of_note = (note_position >= (note_length*8 - 1));
-      else
-        end_of_note = (note_position >= (note_length*8));
-    } else {
-      end_of_note = (note_position >= (note_length*8));
-    }
-
-    if (end_of_note) {
-      current_note++;
-      if (current_note >= notes_count) {
-        if (notes_repeat) {
-          current_note = 0;
-        } else {
-          STOP_CHANNEL_1();
-          STOP_CHANNEL_2();
-          // gptStopTimer(&GPTD8);
-          playing_notes = false;
-          return;
-        }
-      }
-      if (!note_resting) {
-        note_resting = true;
-        current_note--;
-        if ((*notes_pointer)[current_note][0] == (*notes_pointer)[current_note + 1][0]) {
-          note_frequency = 0;
-          note_length = 1;
-        } else {
-          note_frequency = (*notes_pointer)[current_note][0];
-          note_length = 1;
-        }
-      } else {
-        note_resting = false;
-        envelope_index = 0;
-        note_frequency = (*notes_pointer)[current_note][0];
-        note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
-      }
-
-      note_position = 0;
-    }
-  }
-
-  if (!audio_config.enable) {
-    playing_notes = false;
-    playing_note = false;
-  }
-}
 
 void play_note(float freq, int vol) {
 
@@ -605,29 +371,19 @@ void play_note(float freq, int vol) {
       audio_init();
   }
 
-  if (audio_config.enable && voices < 8) {
-
-     // Cancel notes if notes are playing
-    if (playing_notes) {
-      stop_all_notes();
-    }
-
+  if (audio_config.enable && dac_voices < 8) {
     playing_note = true;
-
-    envelope_index = 0;
-
     if (freq > 0) {
-      frequencies[voices] = freq;
-      volumes[voices] = vol;
-      voices++;
+      envelope_index = 0;
+      dac_frequencies[dac_voices] = freq;
+      dac_voices++;
     }
-
-    gptStart(&GPTD8, &gpt8cfg1);
-    gptStartContinuous(&GPTD8, 2U);
-    RESTART_CHANNEL_1();
-    RESTART_CHANNEL_2();
   }
+}
 
+__attribute__ ((weak))
+void dac_setup_note(void) {
+  dac_if[dac_voices] = 0.0f;
 }
 
 void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat) {
@@ -638,31 +394,26 @@ void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat) {
 
   if (audio_config.enable) {
 
-    // Cancel note if a note is playing
-    if (playing_note) {
-      stop_all_notes();
-    }
-
     playing_notes = true;
 
     notes_pointer = np;
     notes_count = n_count;
     notes_repeat = n_repeat;
 
-    place = 0;
     current_note = 0;
 
-    note_frequency = (*notes_pointer)[current_note][0];
     note_length = ((*notes_pointer)[current_note][1] / 4) * (((float)note_tempo) / 100);
     note_position = 0;
 
-    gptStart(&GPTD8, &gpt8cfg1);
-    gptStartContinuous(&GPTD8, 2U);
-    RESTART_CHANNEL_1();
-    RESTART_CHANNEL_2();
+    play_note((*notes_pointer)[current_note][0], 15);
+
   }
 }
 
+bool is_playing_note(void) {
+  return playing_note;
+}
+
 bool is_playing_notes(void) {
   return playing_notes;
 }
@@ -770,3 +521,11 @@ void increase_tempo(uint8_t tempo_change) {
     note_tempo -= tempo_change;
   }
 }
+
+uint8_t dac_number_of_voices(void) {
+  return dac_voices;
+}
+
+float dac_get_frequency(uint8_t index) {
+  return dac_frequencies[index];
+}

quantum/audio/audio_arm.h

@@ -0,0 +1,89 @@
+/* Copyright 2019 Jack Humbert
+ *
+ * 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/>.
+ */
+#pragma once
+
+#include "ch.h"
+
+/**
+ * Size of the dac_buffer arrays. All must be the same size.
+ */
+#define DAC_BUFFER_SIZE 256U
+
+/**
+ * Highest value allowed by our 12bit DAC.
+ */
+#ifndef DAC_SAMPLE_MAX
+  #define DAC_SAMPLE_MAX  4095U
+#endif
+
+// #define DAC_LOW_QUALITY
+
+/**
+ * These presets allow you to quickly switch between quality/voice settings for
+ * the DAC. The sample rate and number of voices roughly has an inverse
+ * relationship - slightly higher sample rates may be possible.
+ */
+#ifdef DAC_VERY_LOW_QUALITY
+  #define DAC_SAMPLE_RATE 11025U
+  #define DAC_VOICES_MAX 8
+#endif
+
+#ifdef DAC_LOW_QUALITY
+  #define DAC_SAMPLE_RATE 22050U
+  #define DAC_VOICES_MAX 4
+#endif
+
+#ifdef DAC_HIGH_QUALITY
+  #define DAC_SAMPLE_RATE 44100U
+  #define DAC_VOICES_MAX 2
+#endif
+
+#ifdef DAC_VERY_HIGH_QUALITY
+  #define DAC_SAMPLE_RATE 88200U
+  #define DAC_VOICES_MAX 1
+#endif
+
+/**
+ * Effective bitrate of the DAC. 44.1khz is the standard for most audio - any
+ * lower will sacrifice perceptible audio quality. Any higher will limit the
+ * number of simultaneous voices. In most situations, a tenth (1/10) of the
+ * sample rate is where notes become unbearable.
+ */
+#ifndef DAC_SAMPLE_RATE
+  #define DAC_SAMPLE_RATE 44100U
+#endif
+
+/**
+ * The number of voices (in polyphony) that are supported. If too high a value
+ * is used here, the keyboard will freeze and glitch-out when that many voices
+ * are being played.
+ */
+#ifndef DAC_VOICES_MAX
+  #define DAC_VOICES_MAX 2
+#endif
+
+/**
+ * The default value of the DAC when not playing anything. Certain hardware
+ * setups may require a high (DAC_SAMPLE_MAX) or low (0) value here.
+ */
+#ifndef DAC_OFF_VALUE
+  #define DAC_OFF_VALUE DAC_SAMPLE_MAX / 2
+#endif
+
+uint8_t dac_number_of_voices(void);
+float dac_get_frequency(uint8_t index);
+uint16_t dac_value_generate(void);
+void dac_setup_note(void);

quantum/process_keycode/process_music.c

@@ -195,6 +195,16 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
           music_sequence_interval+=10;
           return false;
         }
+
+        if (keycode == KC_LEFT) {
+            music_offset--;
+            return false;
+        }
+
+        if (keycode == KC_RIGHT) {
+            music_offset++;
+            return false;
+        }
       }
 
       uint8_t note = 36;

quantum/split_common/transport.c

@@ -13,6 +13,7 @@
 
 #ifdef BACKLIGHT_ENABLE
 #  include "backlight.h"
+extern backlight_config_t backlight_config;
 #endif
 
 #ifdef ENCODER_ENABLE
@@ -54,7 +55,7 @@ bool transport_master(matrix_row_t matrix[]) {
 
   // write backlight info
 #  ifdef BACKLIGHT_ENABLE
-  uint8_t level = is_backlight_enabled() ? get_backlight_level() : 0;
+  uint8_t level = get_backlight_level();
   if (level != i2c_buffer->backlight_level) {
     if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_BACKLIGHT_START, (void *)&level, sizeof(level), TIMEOUT) >= 0) {
       i2c_buffer->backlight_level = level;
@@ -222,7 +223,7 @@ bool transport_master(matrix_row_t matrix[]) {
 
 #  ifdef BACKLIGHT_ENABLE
   // Write backlight level for slave to read
-  serial_m2s_buffer.backlight_level = is_backlight_enabled() ? get_backlight_level() : 0;
+  serial_m2s_buffer.backlight_level = backlight_config.enable ? backlight_config.level : 0;
 #  endif
 
 #  ifdef ENCODER_ENABLE

quantum/stm32/mcuconf.h

@@ -141,8 +141,8 @@
 #define STM32_GPT_USE_TIM3                  FALSE
 #define STM32_GPT_USE_TIM4                  FALSE
 #define STM32_GPT_USE_TIM6                  TRUE
-#define STM32_GPT_USE_TIM7                  TRUE
-#define STM32_GPT_USE_TIM8                  TRUE
+#define STM32_GPT_USE_TIM7                  FALSE
+#define STM32_GPT_USE_TIM8                  FALSE
 #define STM32_GPT_TIM1_IRQ_PRIORITY         7
 #define STM32_GPT_TIM2_IRQ_PRIORITY         7
 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

users/drashna/.gitlab-ci.yml

@@ -1,7 +1,9 @@
 stages:
   - test
+  - build
+  - deploy
 
-QMK Firmware:
+Preliminary Test:
   stage: test
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
@@ -16,7 +18,36 @@ QMK Firmware:
   script:
     - make test:all
     - make planck/rev6:default planck/rev5:default
-    - make keebio/iris/rev2:drashna keebio/iris/rev2:drashna_old ergodox_ez:drashna ergodox_ez:drashna_glow keebio/viterbi/rev1:drashna orthodox/rev1:drashna orthodox/rev3:drashna crkbd:drashna planck/light:drashna planck/rev6:drashna fractal:drashna primekb/prime_m:drashna -j2 --output-sync
+
+QMK Firmware Defaults:
+  stage: deploy
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+  tags:
+    - linux
+  image: ubuntu:18.10
+  before_script:
+    - apt-get update -qy
+    - apt-get install -y build-essential avr-libc binutils-arm-none-eabi binutils-avr dfu-programmer dfu-util gcc gcc-arm-none-eabi gcc-avr git libnewlib-arm-none-eabi unzip wget zip
+    - avr-gcc --version
+    - uname -a
+  script:
+    - make test:all
+    - make all:default -j16
+
+Drashna Firmware:
+  stage: build
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+  tags:
+    - linux
+  image: ubuntu:18.10
+  before_script:
+    - apt-get update -qy
+    - apt-get install -y build-essential avr-libc binutils-arm-none-eabi binutils-avr dfu-programmer dfu-util gcc gcc-arm-none-eabi gcc-avr git libnewlib-arm-none-eabi unzip wget zip
+    - avr-gcc --version
+  script:
+    - make keebio/iris/rev2:drashna keebio/iris/rev2:drashna_old ergodox_ez:drashna ergodox_ez:drashna_glow keebio/viterbi/rev1:drashna orthodox/rev1:drashna orthodox/rev3:drashna crkbd:drashna planck/light:drashna planck/rev6:drashna fractal:drashna primekb/prime_m:drashna -j16 --output-sync
   artifacts:
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:

users/drashna/config.h

@@ -2,43 +2,50 @@
 
 
 #ifdef AUDIO_ENABLE
-#   define AUDIO_CLICKY
-#   define STARTUP_SONG SONG(RICK_ROLL)
-#   define GOODBYE_SONG  SONG(SONIC_RING)
-#   define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+  #define AUDIO_CLICKY
+  #define STARTUP_SONG SONG(RICK_ROLL)
+  #define GOODBYE_SONG  SONG(SONIC_RING)
+  #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
                                     SONG(COLEMAK_SOUND), \
                                     SONG(DVORAK_SOUND), \
                                     SONG(OVERWATCH_THEME) \
-                                }
+                                  }
 
-#   define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f
+  #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f
+  // #ifdef RGBLIGHT_ENABLE
+  // #define NO_MUSIC_MODE
+  // #endif //RGBLIGHT_ENABLE/
+  // #ifndef __arm__
+  //   #undef  NOTE_REST
+  //   #define NOTE_REST         1.00f
+  // #endif // !__arm__
 
-#   define UNICODE_SONG_OSX SONG(RICK_ROLL)
-#   define UNICODE_SONG_LNX SONG(RICK_ROLL)
-#   define UNICODE_SONG_WIN SONG(RICK_ROLL)
-#   define UNICODE_SONG_BSD SONG(RICK_ROLL)
-#   define UNICODE_SONG_WINC SONG(RICK_ROLL)
+#define UNICODE_SONG_OSX SONG(RICK_ROLL)
+#define UNICODE_SONG_LNX SONG(RICK_ROLL)
+#define UNICODE_SONG_WIN SONG(RICK_ROLL)
+#define UNICODE_SONG_BSD SONG(RICK_ROLL)
+#define UNICODE_SONG_WINC SONG(RICK_ROLL)
 
 #endif // !AUDIO_ENABLE
 
 #ifdef RGBLIGHT_ENABLE
-#   define RGBLIGHT_SLEEP
-#   undef RGBLIGHT_ANIMATIONS
-#   define RGBLIGHT_EFFECT_BREATHING
-#   define RGBLIGHT_EFFECT_SNAKE
-#   define RGBLIGHT_EFFECT_KNIGHT
+  #define RGBLIGHT_SLEEP
+  #undef RGBLIGHT_ANIMATIONS
+  #define RGBLIGHT_EFFECT_BREATHING
+  #define RGBLIGHT_EFFECT_SNAKE
+  #define RGBLIGHT_EFFECT_KNIGHT
 #endif // RGBLIGHT_ENABLE
 
 #ifndef ONESHOT_TAP_TOGGLE
-#   define ONESHOT_TAP_TOGGLE 2
+  #define ONESHOT_TAP_TOGGLE 2
 #endif // !ONESHOT_TAP_TOGGLE
 
 #ifndef ONESHOT_TIMEOUT
-#   define ONESHOT_TIMEOUT 3000
+  #define ONESHOT_TIMEOUT 3000
 #endif// !ONESHOT_TIMEOUT
 
 #ifndef QMK_KEYS_PER_SCAN
-#   define QMK_KEYS_PER_SCAN 4
+  #define QMK_KEYS_PER_SCAN 4
 #endif // !QMK_KEYS_PER_SCAN
 
 
@@ -55,27 +62,24 @@
 #define FORCE_NKRO
 
 #ifndef TAPPING_TOGGLE
-#   define TAPPING_TOGGLE  1
+  #define TAPPING_TOGGLE  1
 #endif
 
 #ifdef TAPPING_TERM
-#   undef TAPPING_TERM
+  #undef TAPPING_TERM
 #endif // TAPPING_TERM
 #if defined(KEYBOARD_ergodox_ez)
-#   define TAPPING_TERM 185
+  #define TAPPING_TERM 185
 #elif defined(KEYBOARD_crkbd)
-#   define TAPPING_TERM 200
+  #define TAPPING_TERM 200
 #else
-#   define TAPPING_TERM 175
+  #define TAPPING_TERM 175
 #endif
 
 
+// Disable action_get_macro and fn_actions, since we don't use these
+// and it saves on space in the firmware.
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
 #define TAP_CODE_DELAY 5
-
-/* Disable unused and unneeded features to reduce on firmware size */
-#ifdef LOCKING_SUPPORT_ENABLE
-#   undef LOCKING_SUPPORT_ENABLE
-#endif
-#ifdef LOCKING_RESYNC_ENABLE
-#   undef LOCKING_RESYNC_ENABLE
-#endif

users/drashna/drashna.c

@@ -19,78 +19,78 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 userspace_config_t userspace_config;
 #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-    #define DRASHNA_UNICODE_MODE UC_WIN
+  #define DRASHNA_UNICODE_MODE UC_WIN
 #else
   // set to 2 for UC_WIN, set to 4 for UC_WINC
-    #define DRASHNA_UNICODE_MODE 2
+  #define DRASHNA_UNICODE_MODE 2
 #endif
 
 
 // This block is for all of the gaming macros, as they were all doing
 // the same thing, but with differring text sent.
 bool send_game_macro(const char *str, keyrecord_t *record, bool override) {
-    if (!record->event.pressed || override) {
-        uint16_t keycode;
-        if (userspace_config.is_overwatch) {
-        keycode = KC_BSPC;
-        } else {
-        keycode = KC_ENTER;
-        }
-        clear_keyboard();
-        tap_code(keycode);
-        wait_ms(TAP_CODE_DELAY);
-        send_string_with_delay(str, TAP_CODE_DELAY);
-        wait_ms(TAP_CODE_DELAY);
-        tap_code(KC_ENTER);
+  if (!record->event.pressed || override) {
+    uint16_t keycode;
+    if (userspace_config.is_overwatch) {
+      keycode = KC_BSPC;
+    } else {
+      keycode = KC_ENTER;
     }
-    if (override) wait_ms(3000);
-    return false;
+    clear_keyboard();
+    tap_code(keycode);
+    wait_ms(TAP_CODE_DELAY);
+    send_string_with_delay(str, TAP_CODE_DELAY);
+    wait_ms(TAP_CODE_DELAY);
+    tap_code(KC_ENTER);
+  }
+  if (override) wait_ms(3000);
+  return false;
 }
 
 bool mod_key_press_timer (uint16_t code, uint16_t mod_code, bool pressed) {
-    static uint16_t this_timer;
-    if(pressed) {
-        this_timer= timer_read();
-    } else {
-        if (timer_elapsed(this_timer) < TAPPING_TERM){
-            tap_code(code);
-        } else {
-            register_code(mod_code);
-            tap_code(code);
-            unregister_code(mod_code);
-        }
-    }
-    return false;
+  static uint16_t this_timer;
+  if(pressed) {
+      this_timer= timer_read();
+  } else {
+      if (timer_elapsed(this_timer) < TAPPING_TERM){
+          tap_code(code);
+      } else {
+          register_code(mod_code);
+          tap_code(code);
+          unregister_code(mod_code);
+      }
+  }
+  return false;
 }
 
 bool mod_key_press (uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer) {
-    if(pressed) {
-        this_timer= timer_read();
-    } else {
-        if (timer_elapsed(this_timer) < TAPPING_TERM){
-            tap_code(code);
-        } else {
-            register_code(mod_code);
-            tap_code(code);
-            unregister_code(mod_code);
-        }
-    }
-    return false;
+  if(pressed) {
+      this_timer= timer_read();
+  } else {
+      if (timer_elapsed(this_timer) < TAPPING_TERM){
+          tap_code(code);
+      } else {
+          register_code(mod_code);
+          tap_code(code);
+          unregister_code(mod_code);
+      }
+  }
+  return false;
 }
 
 void bootmagic_lite(void) {
-    matrix_scan();
-    #if defined(DEBOUNCING_DELAY) && DEBOUNCING_DELAY > 0
-        wait_ms(DEBOUNCING_DELAY * 2);
-    #elif defined(DEBOUNCE) && DEBOUNCE > 0
-        wait_ms(DEBOUNCE * 2);
-    #else
-        wait_ms(30);
-    #endif
-    matrix_scan();
-    if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
-        bootloader_jump();
-    }
+  matrix_scan();
+  #if defined(DEBOUNCING_DELAY) && DEBOUNCING_DELAY > 0
+    wait_ms(DEBOUNCING_DELAY * 2);
+  #elif defined(DEBOUNCE) && DEBOUNCE > 0
+    wait_ms(DEBOUNCE * 2);
+  #else
+    wait_ms(30);
+  #endif
+  matrix_scan();
+   if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
+    bootloader_jump();
+  }
 }
 
 // Add reconfigurable functions here, for keymap customization
@@ -103,21 +103,21 @@ void matrix_init_keymap(void) {}
 // Call user matrix init, set default RGB colors and then
 // call the keymap's init function
 void matrix_init_user(void) {
-    userspace_config.raw = eeconfig_read_user();
+  userspace_config.raw = eeconfig_read_user();
 
-    #ifdef BOOTLOADER_CATERINA
-        DDRD &= ~(1<<5);
-        PORTD &= ~(1<<5);
+  #ifdef BOOTLOADER_CATERINA
+    DDRD &= ~(1<<5);
+    PORTD &= ~(1<<5);
 
-        DDRB &= ~(1<<0);
-        PORTB &= ~(1<<0);
-    #endif
+    DDRB &= ~(1<<0);
+    PORTB &= ~(1<<0);
+  #endif
 
-    #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-        set_unicode_input_mode(DRASHNA_UNICODE_MODE);
-        get_unicode_input_mode();
-    #endif //UNICODE_ENABLE
-    matrix_init_keymap();
+  #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
+    set_unicode_input_mode(DRASHNA_UNICODE_MODE);
+    get_unicode_input_mode();
+  #endif //UNICODE_ENABLE
+  matrix_init_keymap();
 }
 
 __attribute__((weak))
@@ -125,26 +125,26 @@ void keyboard_post_init_keymap(void){ }
 
 void keyboard_post_init_user(void){
 #ifdef RGBLIGHT_ENABLE
-    keyboard_post_init_rgb();
+  keyboard_post_init_rgb();
 #endif
-    keyboard_post_init_keymap();
+  keyboard_post_init_keymap();
 }
 
 __attribute__ ((weak))
 void shutdown_keymap(void) {}
 
 void shutdown_user (void) {
-    #ifdef RGBLIGHT_ENABLE
-        rgblight_enable_noeeprom();
-        rgblight_mode_noeeprom(1);
-        rgblight_setrgb_red();
-    #endif // RGBLIGHT_ENABLE
-    #ifdef RGB_MATRIX_ENABLE
-        // uint16_t timer_start = timer_read();
-        // rgb_matrix_set_color_all( 0xFF, 0x00, 0x00 );
-        // while(timer_elapsed(timer_start) < 250) { wait_ms(1); }
-    #endif //RGB_MATRIX_ENABLE
-    shutdown_keymap();
+  #ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(1);
+    rgblight_setrgb_red();
+  #endif // RGBLIGHT_ENABLE
+  #ifdef RGB_MATRIX_ENABLE
+    // uint16_t timer_start = timer_read();
+    // rgb_matrix_set_color_all( 0xFF, 0x00, 0x00 );
+    // while(timer_elapsed(timer_start) < 250) { wait_ms(1); }
+  #endif //RGB_MATRIX_ENABLE
+  shutdown_keymap();
 }
 
 __attribute__ ((weak))
@@ -158,7 +158,7 @@ __attribute__ ((weak))
 void suspend_wakeup_init_keymap(void) {}
 
 void suspend_wakeup_init_user(void) {
-    suspend_wakeup_init_keymap();
+  suspend_wakeup_init_keymap();
 }
 
 
@@ -168,54 +168,54 @@ void matrix_scan_keymap(void) {}
 // No global matrix scan code, so just run keymap's matrix
 // scan function
 void matrix_scan_user(void) {
-    static bool has_ran_yet;
-    if (!has_ran_yet) {
-        has_ran_yet = true;
-        startup_user();
-    }
+  static bool has_ran_yet;
+  if (!has_ran_yet) {
+    has_ran_yet = true;
+    startup_user();
+  }
 
 #ifdef TAP_DANCE_ENABLE  // Run Diablo 3 macro checking code.
-    run_diablo_macro_check();
+  run_diablo_macro_check();
 #endif // TAP_DANCE_ENABLE
 
 #ifdef RGBLIGHT_ENABLE
-    matrix_scan_rgb();
+  matrix_scan_rgb();
 #endif // RGBLIGHT_ENABLE
 
-    matrix_scan_keymap();
+  matrix_scan_keymap();
 }
 
 
 __attribute__ ((weak))
 uint32_t layer_state_set_keymap (uint32_t state) {
-    return state;
+  return state;
 }
 
 // on layer change, no matter where the change was initiated
 // Then runs keymap's layer change check
 uint32_t layer_state_set_user(uint32_t state) {
-    state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
+  state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
 #ifdef RGBLIGHT_ENABLE
-    state = layer_state_set_rgb(state);
+  state = layer_state_set_rgb(state);
 #endif // RGBLIGHT_ENABLE
-    return layer_state_set_keymap (state);
+  return layer_state_set_keymap (state);
 }
 
 
 __attribute__ ((weak))
 uint32_t default_layer_state_set_keymap (uint32_t state) {
-    return state;
+  return state;
 }
 
 // Runs state check and changes underglow color and animation
 uint32_t default_layer_state_set_user(uint32_t state) {
-    state = default_layer_state_set_keymap(state);
+  state = default_layer_state_set_keymap(state);
 #if 0
 #ifdef RGBLIGHT_ENABLE
   state = default_layer_state_set_rgb(state);
 #endif // RGBLIGHT_ENABLE
 #endif
-    return state;
+  return state;
 }
 
 __attribute__ ((weak))
@@ -225,16 +225,16 @@ void led_set_keymap(uint8_t usb_led) {}
 // So far, I only have keyboard specific code,
 // So nothing goes here.
 void led_set_user(uint8_t usb_led) {
-    led_set_keymap(usb_led);
+  led_set_keymap(usb_led);
 }
 
 __attribute__ ((weak))
 void eeconfig_init_keymap(void) {}
 
 void eeconfig_init_user(void) {
-    userspace_config.raw = 0;
-    userspace_config.rgb_layer_change = true;
-    eeconfig_update_user(userspace_config.raw);
+  userspace_config.raw = 0;
+  userspace_config.rgb_layer_change = true;
+  eeconfig_update_user(userspace_config.raw);
   #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
     set_unicode_input_mode(DRASHNA_UNICODE_MODE);
     get_unicode_input_mode();

users/drashna/drashna.h

@@ -22,36 +22,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "wrappers.h"
 #include "process_records.h"
 #ifdef TAP_DANCE_ENABLE
-#   include "tap_dances.h"
+  #include "tap_dances.h"
 #endif // TAP_DANCE_ENABLE
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-#   include "rgb_stuff.h"
+  #include "rgb_stuff.h"
 #endif
 #if defined(AUDIO_ENABLE) && __GNUC__ > 7
-#   if __has_include("drashna_song_list.h")
-#       include "drashna_song_list.h"
-#   endif
+  #if __has_include("drashna_song_list.h")
+    #include "drashna_song_list.h"
+  #endif
 #endif
 
 /* Define layer names */
 enum userspace_layers {
-    _QWERTY = 0,
-    _NUMLOCK = 0,
-    _COLEMAK,
-    _DVORAK,
-    _WORKMAN,
-    _NORMAN,
-    _MALTRON,
-    _EUCALYN,
-    _CARPLAX,
-    _MODS, /* layer 8 */
-    _GAMEPAD,
-    _DIABLO,
-    _MACROS,
-    _MEDIA,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
+  _QWERTY = 0,
+  _NUMLOCK = 0,
+  _COLEMAK,
+  _DVORAK,
+  _WORKMAN,
+  _NORMAN,
+  _MALTRON,
+  _EUCALYN,
+  _CARPLAX,
+  _MODS, /* layer 8 */
+  _GAMEPAD,
+  _DIABLO,
+  _MACROS,
+  _MEDIA,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
 };
 
 /*
@@ -73,14 +73,14 @@ void led_set_keymap(uint8_t usb_led);
 void eeconfig_init_keymap(void);
 
 typedef union {
-    uint32_t raw;
-    struct {
-        bool     rgb_layer_change :1;
-        bool     is_overwatch     :1;
-        bool     nuke_switch      :1;
-        uint8_t  unicode_mod      :4;
-        bool     swapped_numbers  :1;
-    };
+  uint32_t raw;
+  struct {
+    bool     rgb_layer_change :1;
+    bool     is_overwatch     :1;
+    bool     nuke_switch      :1;
+    uint8_t  unicode_mod      :4;
+    bool     swapped_numbers  :1;
+  };
 } userspace_config_t;
 
 extern userspace_config_t userspace_config;
@@ -92,13 +92,13 @@ But since TD() doesn't work when tap dance is disabled
 We use custom codes here, so we can substitute the right stuff
 */
 #ifdef TAP_DANCE_ENABLE
-#   define KC_D3_1 TD(TD_D3_1)
-#   define KC_D3_2 TD(TD_D3_2)
-#   define KC_D3_3 TD(TD_D3_3)
-#   define KC_D3_4 TD(TD_D3_4)
+#define KC_D3_1 TD(TD_D3_1)
+#define KC_D3_2 TD(TD_D3_2)
+#define KC_D3_3 TD(TD_D3_3)
+#define KC_D3_4 TD(TD_D3_4)
 #else // TAP_DANCE_ENABLE
-#   define KC_D3_1 KC_1
-#   define KC_D3_2 KC_2
-#   define KC_D3_3 KC_3
-#   define KC_D3_4 KC_4
+#define KC_D3_1 KC_1
+#define KC_D3_2 KC_2
+#define KC_D3_3 KC_3
+#define KC_D3_4 KC_4
 #endif // TAP_DANCE_ENABLE

users/drashna/process_records.c

@@ -4,12 +4,12 @@ uint16_t copy_paste_timer;
 
 __attribute__ ((weak))
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-    return true;
+  return true;
 }
 
 __attribute__ ((weak))
 bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
-    return true;
+  return true;
 }
 
 // Defines actions tor my global custom keycodes. Defined in drashna.h file
@@ -18,140 +18,140 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   // If console is enabled, it will print the matrix position and status of each key pressed
 #ifdef KEYLOGGER_ENABLE
-#   if defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_keebio_iris_rev2)
-        xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.row, record->event.key.col, record->event.pressed);
-#   else
-        xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
-#   endif
+  #if defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_keebio_iris_rev2)
+    xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.row, record->event.key.col, record->event.pressed);
+  #else
+    xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
+  #endif
 #endif //KEYLOGGER_ENABLE
 
-    switch (keycode) {
-    case KC_QWERTY ... KC_CARPLAX:
-        if (record->event.pressed) {
-            set_single_persistent_default_layer(keycode - KC_QWERTY);
-        }
-        break;
+  switch (keycode) {
+  case KC_QWERTY ... KC_CARPLAX:
+    if (record->event.pressed) {
+      set_single_persistent_default_layer(keycode - KC_QWERTY);
+    }
+    break;
 
-    case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
-        if (!record->event.pressed) {
-            uint8_t temp_mod = get_mods();
-            uint8_t temp_osm = get_oneshot_mods();
-            clear_mods(); clear_oneshot_mods();
-            send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), TAP_CODE_DELAY);
+  case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
+    if (!record->event.pressed) {
+      uint8_t temp_mod = get_mods();
+      uint8_t temp_osm = get_oneshot_mods();
+      clear_mods(); clear_oneshot_mods();
+      send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), TAP_CODE_DELAY);
 #ifndef MAKE_BOOTLOADER
-        if ( ( temp_mod | temp_osm ) & MOD_MASK_SHIFT )
+      if ( ( temp_mod | temp_osm ) & MOD_MASK_SHIFT )
 #endif
-        {
-            #if defined(__arm__)
-            send_string_with_delay_P(PSTR(":dfu-util"), TAP_CODE_DELAY);
-            #elif defined(BOOTLOADER_DFU)
-            send_string_with_delay_P(PSTR(":dfu"), TAP_CODE_DELAY);
-            #elif defined(BOOTLOADER_HALFKAY)
-            send_string_with_delay_P(PSTR(":teensy"), TAP_CODE_DELAY);
-            #elif defined(BOOTLOADER_CATERINA)
-            send_string_with_delay_P(PSTR(":avrdude"), TAP_CODE_DELAY);
-            #endif // bootloader options
-        }
-        if ( ( temp_mod | temp_osm ) & MOD_MASK_CTRL) { send_string_with_delay_P(PSTR(" -j8 --output-sync"), TAP_CODE_DELAY); }
-            send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY);
-        }
-        break;
+      {
+        #if defined(__arm__)
+          send_string_with_delay_P(PSTR(":dfu-util"), TAP_CODE_DELAY);
+        #elif defined(BOOTLOADER_DFU)
+          send_string_with_delay_P(PSTR(":dfu"), TAP_CODE_DELAY);
+        #elif defined(BOOTLOADER_HALFKAY)
+          send_string_with_delay_P(PSTR(":teensy"), TAP_CODE_DELAY);
+        #elif defined(BOOTLOADER_CATERINA)
+          send_string_with_delay_P(PSTR(":avrdude"), TAP_CODE_DELAY);
+        #endif // bootloader options
+       }
+      if ( ( temp_mod | temp_osm ) & MOD_MASK_CTRL) { send_string_with_delay_P(PSTR(" -j8 --output-sync"), TAP_CODE_DELAY); }
+      send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY);
+    }
+    break;
 
-    case VRSN: // Prints firmware version
-        if (record->event.pressed) {
-            send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY);
-        }
-        break;
+  case VRSN: // Prints firmware version
+    if (record->event.pressed) {
+      send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY);
+    }
+    break;
 
-    // These are a serious of gaming macros.
-    // Only enables for the viterbi, basically,
-    // to save on firmware space, since it's limited.
+// These are a serious of gaming macros.
+// Only enables for the viterbi, basically,
+// to save on firmware space, since it's limited.
 #ifdef MACROS_ENABLED
-    case KC_OVERWATCH: // Toggle's if we hit "ENTER" or "BACKSPACE" to input macros
-        if (record->event.pressed) { userspace_config.is_overwatch ^= 1; eeconfig_update_user(userspace_config.raw); }
+  case KC_OVERWATCH: // Toggle's if we hit "ENTER" or "BACKSPACE" to input macros
+    if (record->event.pressed) { userspace_config.is_overwatch ^= 1; eeconfig_update_user(userspace_config.raw); }
 #ifdef RGBLIGHT_ENABLE
-        userspace_config.is_overwatch ? rgblight_mode_noeeprom(17) : rgblight_mode_noeeprom(18);
+    userspace_config.is_overwatch ? rgblight_mode_noeeprom(17) : rgblight_mode_noeeprom(18);
 #endif //RGBLIGHT_ENABLE
-        break;
-    case KC_SALT:
-        return send_game_macro("Salt, salt, salt...", record, false);
-    case KC_MORESALT:
-        return  send_game_macro("Please sir, can I have some more salt?!", record, false);
-    case KC_SALTHARD:
-        return send_game_macro("Your salt only makes me harder, and even more aggressive!", record, false);
-    case KC_GOODGAME:
-        return send_game_macro("Good game, everyone!", record, false);
-    case KC_GLHF:
-        return send_game_macro("Good luck, have fun!!!", record, false);
-    case KC_SYMM:
-        return send_game_macro("Left click to win!", record, false);
-    case KC_JUSTGAME:
-        return send_game_macro("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games.", record, false);
-    case KC_TORB:
-        return send_game_macro("That was positively riveting!", record, false);
-    case KC_AIM:
-        send_game_macro("That aim is absolutely amazing. It's almost like you're a machine!", record, true);
-        return send_game_macro("Wait! That aim is TOO good!  You're clearly using an aim hack! CHEATER!", record, false);
-    case KC_C9:
-        return send_game_macro("OMG!!!  C9!!!", record, false);
-    case KC_GGEZ:
-        return send_game_macro("That was a fantastic game, though it was a bit easy. Try harder next time!", record, false);
+    break;
+  case KC_SALT:
+    return send_game_macro("Salt, salt, salt...", record, false);
+  case KC_MORESALT:
+    return  send_game_macro("Please sir, can I have some more salt?!", record, false);
+  case KC_SALTHARD:
+    return send_game_macro("Your salt only makes me harder, and even more aggressive!", record, false);
+  case KC_GOODGAME:
+    return send_game_macro("Good game, everyone!", record, false);
+  case KC_GLHF:
+    return send_game_macro("Good luck, have fun!!!", record, false);
+  case KC_SYMM:
+    return send_game_macro("Left click to win!", record, false);
+  case KC_JUSTGAME:
+    return send_game_macro("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games.", record, false);
+  case KC_TORB:
+    return send_game_macro("That was positively riveting!", record, false);
+  case KC_AIM:
+    send_game_macro("That aim is absolutely amazing. It's almost like you're a machine!", record, true);
+    return send_game_macro("Wait! That aim is TOO good!  You're clearly using an aim hack! CHEATER!", record, false);
+  case KC_C9:
+    return send_game_macro("OMG!!!  C9!!!", record, false);
+  case KC_GGEZ:
+    return send_game_macro("That was a fantastic game, though it was a bit easy. Try harder next time!", record, false);
 #endif // MACROS_ENABLED
 
 
-    case KC_DIABLO_CLEAR:  // reset all Diablo timers, disabling them
+  case KC_DIABLO_CLEAR:  // reset all Diablo timers, disabling them
 #ifdef TAP_DANCE_ENABLE
-        if (record->event.pressed) {
-            uint8_t dtime;
-            for (dtime = 0; dtime < 4; dtime++) {
-                diablo_timer[dtime].key_time = diablo_times[0];
-            }
-        }
+    if (record->event.pressed) {
+      uint8_t dtime;
+      for (dtime = 0; dtime < 4; dtime++) {
+        diablo_key_time[dtime] = diablo_times[0];
+      }
+    }
 #endif // TAP_DANCE_ENABLE
-        break;
+    break;
 
 
   case KC_CCCV:                                    // One key copy/paste
-        if(record->event.pressed){
-            copy_paste_timer = timer_read();
-            } else {
-            if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {   // Hold, copy
-                register_code(KC_LCTL);
-                tap_code(KC_C);
-                unregister_code(KC_LCTL);
-            } else {                                // Tap, paste
-                register_code(KC_LCTL);
-                tap_code(KC_V);
-                unregister_code(KC_LCTL);
-            }
-        }
-        break;
-#ifdef UNICODE_ENABLE
-    case UC_FLIP: // (ノಠ痊ಠ)ノ彡┻━┻
-        if (record->event.pressed) {
-            send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
-        }
-        break;
-    case UC_TABL: // ┬─┬ノ( º _ ºノ)
-        if (record->event.pressed) {
-            send_unicode_hex_string("252C 2500 252C 30CE 0028 0020 00BA 0020 005F 0020 00BA 30CE 0029");
-        }
-        break;
-    case UC_SHRG: // ¯\_(ツ)_/¯
-        if (record->event.pressed) {
-            send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF");
-        }
-        break;
-    case UC_DISA: // ಠ_ಠ
-        if (record->event.pressed) {
-            send_unicode_hex_string("0CA0 005F 0CA0");
-        }
-        break;
-#endif
+    if(record->event.pressed){
+      copy_paste_timer = timer_read();
+    } else {
+      if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {   // Hold, copy
+        register_code(KC_LCTL);
+        tap_code(KC_C);
+        unregister_code(KC_LCTL);
+      } else {                                // Tap, paste
+        register_code(KC_LCTL);
+        tap_code(KC_V);
+        unregister_code(KC_LCTL);
+      }
     }
-    return process_record_keymap(keycode, record) &&
+    break;
+#ifdef UNICODE_ENABLE
+  case UC_FLIP: // (ノಠ痊ಠ)ノ彡┻━┻
+    if (record->event.pressed) {
+      send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
+    }
+    break;
+  case UC_TABL: // ┬─┬ノ( º _ ºノ)
+    if (record->event.pressed) {
+      send_unicode_hex_string("252C 2500 252C 30CE 0028 0020 00BA 0020 005F 0020 00BA 30CE 0029");
+    }
+    break;
+  case UC_SHRG: // ¯\_(ツ)_/¯
+    if (record->event.pressed) {
+      send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF");
+    }
+    break;
+  case UC_DISA: // ಠ_ಠ
+    if (record->event.pressed) {
+      send_unicode_hex_string("0CA0 005F 0CA0");
+    }
+    break;
+#endif
+  }
+  return process_record_keymap(keycode, record) &&
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-        process_record_user_rgb(keycode, record) &&
+    process_record_user_rgb(keycode, record) &&
 #endif // RGBLIGHT_ENABLE
-        process_record_secrets(keycode, record);
+    process_record_secrets(keycode, record);
 }

users/drashna/process_records.h

@@ -2,48 +2,48 @@
 #include "drashna.h"
 
 #if defined(KEYMAP_SAFE_RANGE)
-#   define PLACEHOLDER_SAFE_RANGE KEYMAP_SAFE_RANGE
+  #define PLACEHOLDER_SAFE_RANGE KEYMAP_SAFE_RANGE
 #else
-#   define PLACEHOLDER_SAFE_RANGE SAFE_RANGE
+  #define PLACEHOLDER_SAFE_RANGE SAFE_RANGE
 #endif
 
 enum userspace_custom_keycodes {
-    VRSN = PLACEHOLDER_SAFE_RANGE,              // Prints QMK Firmware and board info
-    KC_QWERTY,         // Sets default layer to QWERTY
-    KC_COLEMAK,        // Sets default layer to COLEMAK
-    KC_DVORAK,         // Sets default layer to DVORAK
-    KC_WORKMAN,        // Sets default layer to WORKMAN
-    KC_NORMAN,         // Sets default layer to NORMAN
-    KC_MALTRON,        // Sets default layer to MALTRON
-    KC_EUCALYN,        // Sets default layer to EUCALYN
-    KC_CARPLAX,        // Sets default layer to CARPLAX
-    KC_DIABLO_CLEAR,   // Clears all Diablo Timers
-    KC_OVERWATCH,      // Toggles game macro input mode (so in OW, it defaults to game chat)
-    KC_SALT,           // See drashna.c for details
-    KC_MORESALT,
-    KC_SALTHARD,
-    KC_GOODGAME,
-    KC_SYMM,
-    KC_JUSTGAME,
-    KC_GLHF,
-    KC_TORB,
-    KC_AIM,
-    KC_C9,
-    KC_GGEZ,
-    KC_MAKE,           // Run keyboard's customized make command
-    KC_RGB_T,          // Toggles RGB Layer Indication mode
-    KC_SECRET_1,       // test1
-    KC_SECRET_2,       // test2
-    KC_SECRET_3,       // test3
-    KC_SECRET_4,       // test4
-    KC_SECRET_5,       // test5
-    KC_CCCV,           // Hold to copy, tap to paste
-    KC_NUKE,           // NUCLEAR LAUNCH DETECTED!!!
-    UC_FLIP,           // (ಠ痊ಠ)┻━┻
-    UC_TABL,           // ┬─┬ノ( º _ ºノ)
-    UC_SHRG,           // ¯\_(ツ)_/¯
-    UC_DISA,           // ಠ_ಠ
-    NEW_SAFE_RANGE     //use "NEWPLACEHOLDER for keymap specific codes
+  VRSN = PLACEHOLDER_SAFE_RANGE,              // Prints QMK Firmware and board info
+  KC_QWERTY,         // Sets default layer to QWERTY
+  KC_COLEMAK,        // Sets default layer to COLEMAK
+  KC_DVORAK,         // Sets default layer to DVORAK
+  KC_WORKMAN,        // Sets default layer to WORKMAN
+  KC_NORMAN,         // Sets default layer to NORMAN
+  KC_MALTRON,        // Sets default layer to MALTRON
+  KC_EUCALYN,        // Sets default layer to EUCALYN
+  KC_CARPLAX,        // Sets default layer to CARPLAX
+  KC_DIABLO_CLEAR,   // Clears all Diablo Timers
+  KC_OVERWATCH,      // Toggles game macro input mode (so in OW, it defaults to game chat)
+  KC_SALT,           // See drashna.c for details
+  KC_MORESALT,
+  KC_SALTHARD,
+  KC_GOODGAME,
+  KC_SYMM,
+  KC_JUSTGAME,
+  KC_GLHF,
+  KC_TORB,
+  KC_AIM,
+  KC_C9,
+  KC_GGEZ,
+  KC_MAKE,           // Run keyboard's customized make command
+  KC_RGB_T,          // Toggles RGB Layer Indication mode
+  KC_SECRET_1,       // test1
+  KC_SECRET_2,       // test2
+  KC_SECRET_3,       // test3
+  KC_SECRET_4,       // test4
+  KC_SECRET_5,       // test5
+  KC_CCCV,           // Hold to copy, tap to paste
+  KC_NUKE,           // NUCLEAR LAUNCH DETECTED!!!
+  UC_FLIP,           // (ಠ痊ಠ)┻━┻
+  UC_TABL,           // ┬─┬ノ( º _ ºノ)
+  UC_SHRG,           // ¯\_(ツ)_/¯
+  UC_DISA,           // ಠ_ಠ
+  NEW_SAFE_RANGE     //use "NEWPLACEHOLDER for keymap specific codes
 };
 
 bool process_record_secrets(uint16_t keycode, keyrecord_t *record);

users/drashna/rgb_stuff.c

@@ -11,80 +11,80 @@ extern rgb_config_t rgb_matrix_config;
 
 #ifdef RGBLIGHT_ENABLE
 void rgblight_sethsv_default_helper(uint8_t index) {
-    rgblight_sethsv_at(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, index);
+  rgblight_sethsv_at(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, index);
 }
 #endif // RGBLIGHT_ENABLE
 
 #ifdef INDICATOR_LIGHTS
 void set_rgb_indicators(uint8_t this_mod, uint8_t this_led, uint8_t this_osm) {
-    if (userspace_config.rgb_layer_change && biton32(layer_state) == 0) {
-        if ( (this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1<<USB_LED_CAPS_LOCK) ) {
-        #ifdef SHFT_LED1
-            rgblight_sethsv_at(120, 255, 255, SHFT_LED1);
-        #endif // SHFT_LED1
-        #ifdef SHFT_LED2
-            rgblight_sethsv_at(120, 255, 255, SHFT_LED2);
-        #endif // SHFT_LED2
-        } else {
-        #ifdef SHFT_LED1
-            rgblight_sethsv_default_helper(SHFT_LED1);
-        #endif // SHFT_LED1
-        #ifdef SHFT_LED2
-            rgblight_sethsv_default_helper(SHFT_LED2);
-        #endif // SHFT_LED2
-        }
-        if ( (this_mod | this_osm) & MOD_MASK_CTRL) {
-        #ifdef CTRL_LED1
-            rgblight_sethsv_at(0, 255, 255, CTRL_LED1);
-        #endif // CTRL_LED1
-        #ifdef CTRL_LED2
-            rgblight_sethsv_at(0, 255, 255, CTRL_LED2);
-        #endif // CTRL_LED2
-        } else {
-        #ifdef CTRL_LED1
-            rgblight_sethsv_default_helper(CTRL_LED1);
-        #endif // CTRL_LED1
-        #ifdef CTRL_LED2
-            rgblight_sethsv_default_helper(CTRL_LED2);
-        #endif // CTRL_LED2
-        }
-        if ( (this_mod | this_osm) & MOD_MASK_GUI) {
-        #ifdef GUI_LED1
-            rgblight_sethsv_at(51, 255, 255, GUI_LED1);
-        #endif // GUI_LED1
-        #ifdef GUI_LED2
-            rgblight_sethsv_at(51, 255, 255, GUI_LED2);
-        #endif // GUI_LED2
-        } else {
-        #ifdef GUI_LED1
-            rgblight_sethsv_default_helper(GUI_LED1);
-        #endif // GUI_LED1
-        #ifdef GUI_LED2
-            rgblight_sethsv_default_helper(GUI_LED2);
-        #endif // GUI_LED2
-        }
-        if ( (this_mod | this_osm) & MOD_MASK_ALT) {
-        #ifdef ALT_LED1
-            rgblight_sethsv_at(240, 255, 255, ALT_LED1);
-        #endif // ALT_LED1
-        #ifdef GUI_LED2
-            rgblight_sethsv_at(240, 255, 255, ALT_LED2);
-        #endif // GUI_LED2
-        } else {
-        #ifdef GUI_LED1
-            rgblight_sethsv_default_helper(ALT_LED1);
-        #endif // GUI_LED1
-        #ifdef GUI_LED2
-            rgblight_sethsv_default_helper(ALT_LED2);
-        #endif // GUI_LED2
-        }
+  if (userspace_config.rgb_layer_change && biton32(layer_state) == 0) {
+    if ( (this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1<<USB_LED_CAPS_LOCK) ) {
+      #ifdef SHFT_LED1
+        rgblight_sethsv_at(120, 255, 255, SHFT_LED1);
+      #endif // SHFT_LED1
+      #ifdef SHFT_LED2
+        rgblight_sethsv_at(120, 255, 255, SHFT_LED2);
+      #endif // SHFT_LED2
+    } else {
+      #ifdef SHFT_LED1
+        rgblight_sethsv_default_helper(SHFT_LED1);
+      #endif // SHFT_LED1
+      #ifdef SHFT_LED2
+        rgblight_sethsv_default_helper(SHFT_LED2);
+      #endif // SHFT_LED2
     }
+    if ( (this_mod | this_osm) & MOD_MASK_CTRL) {
+      #ifdef CTRL_LED1
+        rgblight_sethsv_at(0, 255, 255, CTRL_LED1);
+      #endif // CTRL_LED1
+      #ifdef CTRL_LED2
+        rgblight_sethsv_at(0, 255, 255, CTRL_LED2);
+      #endif // CTRL_LED2
+    } else {
+      #ifdef CTRL_LED1
+        rgblight_sethsv_default_helper(CTRL_LED1);
+      #endif // CTRL_LED1
+      #ifdef CTRL_LED2
+        rgblight_sethsv_default_helper(CTRL_LED2);
+      #endif // CTRL_LED2
+    }
+    if ( (this_mod | this_osm) & MOD_MASK_GUI) {
+      #ifdef GUI_LED1
+        rgblight_sethsv_at(51, 255, 255, GUI_LED1);
+      #endif // GUI_LED1
+      #ifdef GUI_LED2
+        rgblight_sethsv_at(51, 255, 255, GUI_LED2);
+      #endif // GUI_LED2
+    } else {
+      #ifdef GUI_LED1
+        rgblight_sethsv_default_helper(GUI_LED1);
+      #endif // GUI_LED1
+      #ifdef GUI_LED2
+        rgblight_sethsv_default_helper(GUI_LED2);
+      #endif // GUI_LED2
+    }
+    if ( (this_mod | this_osm) & MOD_MASK_ALT) {
+      #ifdef ALT_LED1
+        rgblight_sethsv_at(240, 255, 255, ALT_LED1);
+      #endif // ALT_LED1
+      #ifdef GUI_LED2
+        rgblight_sethsv_at(240, 255, 255, ALT_LED2);
+      #endif // GUI_LED2
+    } else {
+      #ifdef GUI_LED1
+        rgblight_sethsv_default_helper(ALT_LED1);
+      #endif // GUI_LED1
+      #ifdef GUI_LED2
+        rgblight_sethsv_default_helper(ALT_LED2);
+      #endif // GUI_LED2
+    }
+  }
 }
 
 void matrix_scan_indicator(void) {
-    if (has_initialized) {
-        set_rgb_indicators(get_mods(), host_keyboard_leds(), get_oneshot_mods());
-    }
+  if (has_initialized) {
+    set_rgb_indicators(get_mods(), host_keyboard_leds(), get_oneshot_mods());
+  }
 }
 #endif //INDICATOR_LIGHTS
 
@@ -95,71 +95,69 @@ __attribute__ ((weak))
 bool rgblight_twinkle_is_led_used_keymap(uint8_t index) { return false; }
 
 bool rgblight_twinkle_is_led_used(uint8_t index) {
-    switch (index) {
+  switch (index) {
 #ifdef INDICATOR_LIGHTS
 #ifdef SHFT_LED1
-        case SHFT_LED1:
-            return true;
+    case SHFT_LED1:
+      return true;
 #endif //SHFT_LED1
 #ifdef SHFT_LED2
-        case SHFT_LED2:
-            return true;
+    case SHFT_LED2:
+      return true;
 #endif //SHFT_LED2
 #ifdef CTRL_LED1
-        case CTRL_LED1:
-            return true;
+    case CTRL_LED1:
+      return true;
 #endif //CTRL_LED1
 #ifdef CTRL_LED2
-        case CTRL_LED2:
-            return true;
+    case CTRL_LED2:
+      return true;
 #endif //CTRL_LED2
 #ifdef GUI_LED1
-        case GUI_LED1:
-            return true;
+    case GUI_LED1:
+      return true;
 #endif //GUI_LED1
 #ifdef GUI_LED2
-        case GUI_LED2:
-            return true;
+    case GUI_LED2:
+      return true;
 #endif //GUI_LED2
 #ifdef ALT_LED1
-        case ALT_LED1:
-            return true;
+    case ALT_LED1:
+      return true;
 #endif //ALT_LED1
 #ifdef ALT_LED2
-        case ALT_LED2:
-            return true;
+    case ALT_LED2:
+      return true;
 #endif //ALT_LED2
 #endif //INDICATOR_LIGHTS
-        default:
-            return rgblight_twinkle_is_led_used_keymap(index);
+    default:
+    return rgblight_twinkle_is_led_used_keymap(index);
   }
 }
 
 void scan_rgblight_fadeout(void) { // Don't effing change this function .... rgblight_sethsv is supppppper intensive
-    bool litup = false;
-    for (uint8_t light_index = 0 ; light_index < RGBLED_NUM ; ++light_index ) {
-        if (lights[light_index].enabled && timer_elapsed(lights[light_index].timer) > 10) {
-        rgblight_fadeout *light = &lights[light_index];
-        litup = true;
+  bool litup = false;
+  for (uint8_t light_index = 0 ; light_index < RGBLED_NUM ; ++light_index ) {
+    if (lights[light_index].enabled && timer_elapsed(lights[light_index].timer) > 10) {
+      rgblight_fadeout *light = &lights[light_index];
+      litup = true;
 
-        if (light->life) {
-            light->life -= 1;
-            if (biton32(layer_state) == 0) {
-                sethsv(light->hue + rand() % 0xF, 255, light->life, (LED_TYPE *)&led[light_index]);
-            }
-            light->timer = timer_read();
-        }
-        else {
-            if (light->enabled && biton32(layer_state) == 0) {
-                rgblight_sethsv_default_helper(light_index);
-            }
-            litup = light->enabled = false;
-        }
+      if (light->life) {
+        light->life -= 1;
+        if (biton32(layer_state) == 0) {
+          sethsv(light->hue + rand() % 0xF, 255, light->life, (LED_TYPE *)&led[light_index]);
         }
+        light->timer = timer_read();
+      }
+      else {
+        if (light->enabled && biton32(layer_state) == 0) { rgblight_sethsv_default_helper(light_index); }
+        litup = light->enabled = false;
+      }
     }
-    if (litup && biton32(layer_state) == 0) {
-        rgblight_set();
-    }
+  }
+  if (litup && biton32(layer_state) == 0) {
+    rgblight_set();
+  }
 }
 
 void start_rgb_light(void) {
@@ -205,42 +203,42 @@ void start_rgb_light(void) {
 
 
 bool process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
-    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
-        keycode = keycode & 0xFF;
-    }
-    switch (keycode) {
+  if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
+    keycode = keycode & 0xFF;
+  }
+  switch (keycode) {
 #ifdef RGBLIGHT_TWINKLE
-        case KC_A ... KC_SLASH:
-        case KC_F1 ... KC_F12:
-        case KC_INSERT ... KC_UP:
-        case KC_KP_SLASH ... KC_KP_DOT:
-        case KC_F13 ... KC_F24:
-        case KC_AUDIO_MUTE ... KC_MEDIA_REWIND:
-            if (record->event.pressed) { start_rgb_light(); }
-            return true; break;
+    case KC_A ... KC_SLASH:
+    case KC_F1 ... KC_F12:
+    case KC_INSERT ... KC_UP:
+    case KC_KP_SLASH ... KC_KP_DOT:
+    case KC_F13 ... KC_F24:
+    case KC_AUDIO_MUTE ... KC_MEDIA_REWIND:
+      if (record->event.pressed) { start_rgb_light(); }
+      return true; break;
 #endif // RGBLIGHT_TWINKLE
-        case KC_RGB_T:  // This allows me to use underglow as layer indication, or as normal
+  case KC_RGB_T:  // This allows me to use underglow as layer indication, or as normal
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-            if (record->event.pressed) {
-                userspace_config.rgb_layer_change ^= 1;
-                xprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
-                eeconfig_update_user(userspace_config.raw);
-                if (userspace_config.rgb_layer_change) {
-                    layer_state_set(layer_state); // This is needed to immediately set the layer color (looks better)
-                }
-            }
+    if (record->event.pressed) {
+      userspace_config.rgb_layer_change ^= 1;
+      xprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
+      eeconfig_update_user(userspace_config.raw);
+      if (userspace_config.rgb_layer_change) {
+        layer_state_set(layer_state); // This is needed to immediately set the layer color (looks better)
+      }
+    }
 #endif // RGBLIGHT_ENABLE
-            return false; break;
+    return false; break;
 #ifdef RGBLIGHT_ENABLE
-        case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT: // quantum_keycodes.h L400 for definitions
-            if (record->event.pressed) { //This disables layer indication, as it's assumed that if you're changing this ... you want that disabled
-                if (userspace_config.rgb_layer_change) {
-                    userspace_config.rgb_layer_change = false;
-                    xprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
-                    eeconfig_update_user(userspace_config.raw);
-                }
-            }
-            return true; break;
+  case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT: // quantum_keycodes.h L400 for definitions
+    if (record->event.pressed) { //This disables layer indication, as it's assumed that if you're changing this ... you want that disabled
+      if (userspace_config.rgb_layer_change) {
+        userspace_config.rgb_layer_change = false;
+        xprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
+        eeconfig_update_user(userspace_config.raw);
+      }
+    }
+    return true; break;
 #endif // RGBLIGHT_ENABLE
   }
     return true;
@@ -250,28 +248,28 @@ bool process_record_user_rgb(uint16_t keycode, keyrecord_t *record) {
 
 void keyboard_post_init_rgb(void) {
 #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_STARTUP_ANIMATION)
-    if (userspace_config.rgb_layer_change) { rgblight_enable_noeeprom(); }
-    if (rgblight_config.enable) {
-        layer_state_set_user(layer_state);
-        uint16_t old_hue = rgblight_config.hue;
-        rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-        for (uint16_t i = 255; i > 0; i--) {
-            rgblight_sethsv_noeeprom( ( i + old_hue) % 255, 255, 255);
-            matrix_scan();
-            wait_ms(10);
-        }
-    }
-#endif
+  if (userspace_config.rgb_layer_change) { rgblight_enable_noeeprom(); }
+	if (rgblight_config.enable) {
     layer_state_set_user(layer_state);
+    uint16_t old_hue = rgblight_config.hue;
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+    for (uint16_t i = 360; i > 0; i--) {
+      rgblight_sethsv_noeeprom( ( i + old_hue) % 360, 255, 255);
+      matrix_scan();
+      wait_ms(10);
+    }
+  }
+#endif
+  layer_state_set_user(layer_state);
 }
 
 void matrix_scan_rgb(void) {
 #ifdef RGBLIGHT_TWINKLE
-    scan_rgblight_fadeout();
+  scan_rgblight_fadeout();
 #endif // RGBLIGHT_ENABLE
 
 #ifdef INDICATOR_LIGHTS
-    matrix_scan_indicator();
+  matrix_scan_indicator();
 #endif
 
 }
@@ -279,60 +277,99 @@ void matrix_scan_rgb(void) {
 
 uint32_t layer_state_set_rgb(uint32_t state) {
 #ifdef RGBLIGHT_ENABLE
-    if (userspace_config.rgb_layer_change) {
-        switch (biton32(state)) {
-            case _MACROS:
-                rgblight_sethsv_noeeprom_orange();
-                userspace_config.is_overwatch ? rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 2) : rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 3);
-                break;
-            case _MEDIA:
-                rgblight_sethsv_noeeprom_chartreuse();
-                rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 1);
-                break;
-            case _GAMEPAD:
-                rgblight_sethsv_noeeprom_orange();
-                rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 2);
-                break;
-            case _DIABLO:
-                rgblight_sethsv_noeeprom_red();
-                rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
-                break;
-            case _RAISE:
-                rgblight_sethsv_noeeprom_yellow();
-                rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
-                break;
-            case _LOWER:
-                rgblight_sethsv_noeeprom_green();
-                rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
-                break;
-            case _ADJUST:
-                rgblight_sethsv_noeeprom_red();
-                rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
-                break;
-            default: //  for any other layers, or the default layer
-                switch (biton32(default_layer_state)) {
-                    case _COLEMAK:
-                        rgblight_sethsv_noeeprom_magenta(); break;
-                    case _DVORAK:
-                        rgblight_sethsv_noeeprom_springgreen(); break;
-                    case _WORKMAN:
-                        rgblight_sethsv_noeeprom_goldenrod(); break;
-                    case _NORMAN:
-                        rgblight_sethsv_noeeprom_coral(); break;
-                    case _MALTRON:
-                        rgblight_sethsv_noeeprom_yellow(); break;
-                    case _EUCALYN:
-                        rgblight_sethsv_noeeprom_pink(); break;
-                    case _CARPLAX:
-                        rgblight_sethsv_noeeprom_blue(); break;
-                    default:
-                        rgblight_sethsv_noeeprom_cyan(); break;
-                }
-                biton32(state) == _MODS ? rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING) : rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); // if _MODS layer is on, then breath to denote it
-                break;
-        }
+  if (userspace_config.rgb_layer_change) {
+    switch (biton32(state)) {
+    case _MACROS:
+      rgblight_sethsv_noeeprom_orange();
+      userspace_config.is_overwatch ? rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 2) : rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 3);
+      break;
+    case _MEDIA:
+      rgblight_sethsv_noeeprom_chartreuse();
+      rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 1);
+      break;
+    case _GAMEPAD:
+      rgblight_sethsv_noeeprom_orange();
+      rgblight_mode_noeeprom(RGBLIGHT_MODE_SNAKE + 2);
+      break;
+    case _DIABLO:
+      rgblight_sethsv_noeeprom_red();
+      rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
+      break;
+    case _RAISE:
+      rgblight_sethsv_noeeprom_yellow();
+      rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
+      break;
+    case _LOWER:
+      rgblight_sethsv_noeeprom_green();
+      rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3);
+      break;
+    case _ADJUST:
+      rgblight_sethsv_noeeprom_red();
+      rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2);
+      break;
+    default: //  for any other layers, or the default layer
+      switch (biton32(default_layer_state)) {
+        case _COLEMAK:
+          rgblight_sethsv_noeeprom_magenta(); break;
+        case _DVORAK:
+          rgblight_sethsv_noeeprom_springgreen(); break;
+        case _WORKMAN:
+          rgblight_sethsv_noeeprom_goldenrod(); break;
+        case _NORMAN:
+          rgblight_sethsv_noeeprom_coral(); break;
+        case _MALTRON:
+          rgblight_sethsv_noeeprom_yellow(); break;
+        case _EUCALYN:
+          rgblight_sethsv_noeeprom_pink(); break;
+        case _CARPLAX:
+          rgblight_sethsv_noeeprom_blue(); break;
+        default:
+          rgblight_sethsv_noeeprom_cyan(); break;
+      }
+      biton32(state) == _MODS ? rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING) : rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); // if _MODS layer is on, then breath to denote it
+      break;
     }
+//    layer_state_set_indicator(); // Runs every scan, so need to call this here .... since I can't get it working "right" anyhow
+  }
 #endif // RGBLIGHT_ENABLE
 
-    return state;
+  return state;
 }
+
+#if 0
+uint32_t default_layer_state_set_rgb(uint32_t state) {
+#ifdef RGBLIGHT_ENABLE
+  if (userspace_config.rgb_layer_change) {
+    rgblight_config_t temp_rgblight_config = rgblight_config;
+    switch (biton32(state)) {
+      case _COLEMAK:
+        temp_rgblight_config.hue = 300;
+        temp_rgblight_config.val = 255;
+        temp_rgblight_config.sat = 255;
+        temp_rgblight_config.mode = 1;
+        break;
+      case _DVORAK:
+        temp_rgblight_config.hue = 150;
+        temp_rgblight_config.val = 255;
+        temp_rgblight_config.sat = 255;
+        temp_rgblight_config.mode = 1;
+      case _WORKMAN:
+        temp_rgblight_config.hue = 43;
+        temp_rgblight_config.val = 218;
+        temp_rgblight_config.sat = 218;
+        temp_rgblight_config.mode = 1;
+      default:
+        temp_rgblight_config.hue = 180;
+        temp_rgblight_config.val = 255;
+        temp_rgblight_config.sat = 255;
+        temp_rgblight_config.mode = 1;
+    }
+    if (temp_rgblight_config.raw != eeconfig_read_rgblight()) {
+      xprintf("rgblight set default layer hsv [EEPROM]: %u,%u,%u,%u\n", temp_rgblight_config.hue, temp_rgblight_config.sat, temp_rgblight_config.val, temp_rgblight_config.mode);
+      eeconfig_update_rgblight(temp_rgblight_config.raw);
+    }
+  }
+#endif // RGBLIGHT_ENABLE
+  return state;
+}
+#endif

users/drashna/rgblight_breathe_table.h

@@ -1,116 +0,0 @@
-#ifndef RGBLIGHT_EFFECT_BREATHE_TABLE
-#define RGBLIGHT_EFFECT_BREATHE_TABLE
-
-const uint8_t rgblight_effect_breathe_table[] PROGMEM = {
-  /* #define RGBLIGHT_EFFECT_BREATHE_CENTER   0.00 */
-  /* #define RGBLIGHT_EFFECT_BREATHE_MAX      255 */
-
- #if RGBLIGHT_BREATHE_TABLE_SIZE == 256
-  0x44,  0x45,  0x47,  0x48,  0x4a,  0x4b,  0x4c,  0x4e,
-  0x4f,  0x51,  0x52,  0x54,  0x55,  0x57,  0x58,  0x5a,
-  0x5c,  0x5d,  0x5f,  0x60,  0x62,  0x64,  0x65,  0x67,
-  0x69,  0x6a,  0x6c,  0x6e,  0x70,  0x72,  0x73,  0x75,
-  0x77,  0x79,  0x7b,  0x7c,  0x7e,  0x80,  0x82,  0x84,
-  0x86,  0x88,  0x8a,  0x8b,  0x8d,  0x8f,  0x91,  0x93,
-  0x95,  0x97,  0x99,  0x9b,  0x9d,  0x9f,  0xa1,  0xa3,
-  0xa5,  0xa7,  0xa9,  0xaa,  0xac,  0xae,  0xb0,  0xb2,
-  0xb4,  0xb6,  0xb8,  0xba,  0xbc,  0xbe,  0xbf,  0xc1,
-  0xc3,  0xc5,  0xc7,  0xc9,  0xca,  0xcc,  0xce,  0xd0,
-  0xd1,  0xd3,  0xd5,  0xd6,  0xd8,  0xda,  0xdb,  0xdd,
-  0xde,  0xe0,  0xe1,  0xe3,  0xe4,  0xe5,  0xe7,  0xe8,
-  0xe9,  0xeb,  0xec,  0xed,  0xee,  0xef,  0xf0,  0xf1,
-  0xf2,  0xf3,  0xf4,  0xf5,  0xf6,  0xf7,  0xf8,  0xf8,
-  0xf9,  0xfa,  0xfa,  0xfb,  0xfc,  0xfc,  0xfc,  0xfd,
-  0xfd,  0xfe,  0xfe,  0xfe,  0xfe,  0xfe,  0xfe,  0xfe,
-  0xfe,  0xfe,  0xfe,  0xfe,  0xfe,  0xfe,  0xfe,  0xfd,
-  0xfd,  0xfc,  0xfc,  0xfc,  0xfb,  0xfa,  0xfa,  0xf9,
-  0xf8,  0xf8,  0xf7,  0xf6,  0xf5,  0xf4,  0xf3,  0xf2,
-  0xf1,  0xf0,  0xef,  0xee,  0xed,  0xec,  0xeb,  0xe9,
-  0xe8,  0xe7,  0xe5,  0xe4,  0xe3,  0xe1,  0xe0,  0xde,
-  0xdd,  0xdb,  0xda,  0xd8,  0xd6,  0xd5,  0xd3,  0xd1,
-  0xd0,  0xce,  0xcc,  0xca,  0xc9,  0xc7,  0xc5,  0xc3,
-  0xc1,  0xbf,  0xbe,  0xbc,  0xba,  0xb8,  0xb6,  0xb4,
-  0xb2,  0xb0,  0xae,  0xac,  0xaa,  0xa9,  0xa7,  0xa5,
-  0xa3,  0xa1,  0x9f,  0x9d,  0x9b,  0x99,  0x97,  0x95,
-  0x93,  0x91,  0x8f,  0x8d,  0x8b,  0x8a,  0x88,  0x86,
-  0x84,  0x82,  0x80,  0x7e,  0x7c,  0x7b,  0x79,  0x77,
-  0x75,  0x73,  0x72,  0x70,  0x6e,  0x6c,  0x6a,  0x69,
-  0x67,  0x65,  0x64,  0x62,  0x60,  0x5f,  0x5d,  0x5c,
-  0x5a,  0x58,  0x57,  0x55,  0x54,  0x52,  0x51,  0x4f,
-  0x4e,  0x4c,  0x4b,  0x4a,  0x48,  0x47,  0x45,  0x44
- #endif /* 256 bytes table */
-
- #if RGBLIGHT_BREATHE_TABLE_SIZE == 128
-  0x44,  0x47,  0x4a,  0x4c,
-  0x4f,  0x52,  0x55,  0x58,
-  0x5c,  0x5f,  0x62,  0x65,
-  0x69,  0x6c,  0x70,  0x73,
-  0x77,  0x7b,  0x7e,  0x82,
-  0x86,  0x8a,  0x8d,  0x91,
-  0x95,  0x99,  0x9d,  0xa1,
-  0xa5,  0xa9,  0xac,  0xb0,
-  0xb4,  0xb8,  0xbc,  0xbf,
-  0xc3,  0xc7,  0xca,  0xce,
-  0xd1,  0xd5,  0xd8,  0xdb,
-  0xde,  0xe1,  0xe4,  0xe7,
-  0xe9,  0xec,  0xee,  0xf0,
-  0xf2,  0xf4,  0xf6,  0xf8,
-  0xf9,  0xfa,  0xfc,  0xfc,
-  0xfd,  0xfe,  0xfe,  0xfe,
-  0xfe,  0xfe,  0xfe,  0xfe,
-  0xfd,  0xfc,  0xfb,  0xfa,
-  0xf8,  0xf7,  0xf5,  0xf3,
-  0xf1,  0xef,  0xed,  0xeb,
-  0xe8,  0xe5,  0xe3,  0xe0,
-  0xdd,  0xda,  0xd6,  0xd3,
-  0xd0,  0xcc,  0xc9,  0xc5,
-  0xc1,  0xbe,  0xba,  0xb6,
-  0xb2,  0xae,  0xaa,  0xa7,
-  0xa3,  0x9f,  0x9b,  0x97,
-  0x93,  0x8f,  0x8b,  0x88,
-  0x84,  0x80,  0x7c,  0x79,
-  0x75,  0x72,  0x6e,  0x6a,
-  0x67,  0x64,  0x60,  0x5d,
-  0x5a,  0x57,  0x54,  0x51,
-  0x4e,  0x4b,  0x48,  0x45
- #endif /* 128 bytes table */
-
- #if RGBLIGHT_BREATHE_TABLE_SIZE == 64
-  0x44,  0x4a,
-  0x4f,  0x55,
-  0x5c,  0x62,
-  0x69,  0x70,
-  0x77,  0x7e,
-  0x86,  0x8d,
-  0x95,  0x9d,
-  0xa5,  0xac,
-  0xb4,  0xbc,
-  0xc3,  0xca,
-  0xd1,  0xd8,
-  0xde,  0xe4,
-  0xe9,  0xee,
-  0xf2,  0xf6,
-  0xf9,  0xfc,
-  0xfd,  0xfe,
-  0xfe,  0xfe,
-  0xfd,  0xfb,
-  0xf8,  0xf5,
-  0xf1,  0xed,
-  0xe8,  0xe3,
-  0xdd,  0xd6,
-  0xd0,  0xc9,
-  0xc1,  0xba,
-  0xb2,  0xaa,
-  0xa3,  0x9b,
-  0x93,  0x8b,
-  0x84,  0x7c,
-  0x75,  0x6e,
-  0x67,  0x60,
-  0x5a,  0x54,
-  0x4e,  0x48
- #endif /* 64 bytes table */
-};
-
-static const int table_scale = 256/sizeof(rgblight_effect_breathe_table);
-
-#endif /* RGBLIGHT_EFFECT_BREATHE_TABLE */

users/drashna/rules.mk

@@ -1,40 +1,40 @@
 SRC += drashna.c \
        process_records.c
 
-LINK_TIME_OPTIMIZATION_ENABLE = yes
-
 ifneq ("$(wildcard $(USER_PATH)/secrets.c)","")
-    SRC += secrets.c
+  SRC += secrets.c
 endif
 
 ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
-    SRC += tap_dances.c
+  SRC += tap_dances.c
 endif
 
-
+ifeq ($(PLATFORM),AVR)
+  EXTRAFLAGS += -flto
+endif
 
 ifeq ($(strip $(NO_SECRETS)), yes)
     OPT_DEFS += -DNO_SECRETS
 endif
 
 ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
-    SRC += rgb_stuff.c
-    ifeq ($(strip $(INDICATOR_LIGHTS)), yes)
-        OPT_DEFS += -DINDICATOR_LIGHTS
-    endif
-    ifeq ($(strip $(RGBLIGHT_TWINKLE)), yes)
-        OPT_DEFS += -DRGBLIGHT_TWINKLE
-    endif
-    ifeq ($(strip $(RGBLIGHT_NOEEPROM)), yes)
-        OPT_DEFS += -DRGBLIGHT_NOEEPROM
-    endif
-    ifeq ($(strip $(RGBLIGHT_STARTUP_ANIMATION)), yes)
-        OPT_DEFS += -DRGBLIGHT_STARTUP_ANIMATION
-    endif
+  SRC += rgb_stuff.c
+  ifeq ($(strip $(INDICATOR_LIGHTS)), yes)
+      OPT_DEFS += -DINDICATOR_LIGHTS
+  endif
+  ifeq ($(strip $(RGBLIGHT_TWINKLE)), yes)
+    OPT_DEFS += -DRGBLIGHT_TWINKLE
+  endif
+  ifeq ($(strip $(RGBLIGHT_NOEEPROM)), yes)
+    OPT_DEFS += -DRGBLIGHT_NOEEPROM
+  endif
+  ifeq ($(strip $(RGBLIGHT_STARTUP_ANIMATION)), yes)
+    OPT_DEFS += -DRGBLIGHT_STARTUP_ANIMATION
+  endif
 endif
 
-ifneq ($(strip $(RGB_MATRIX_ENABLE)), no)
-    SRC += rgb_stuff.c
+ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
+  SRC += rgb_stuff.c
 endif
 
 
@@ -43,9 +43,9 @@ ifeq ($(strip $(MACROS_ENABLED)), yes)
 endif
 
 ifdef CONSOLE_ENABLE
-    ifeq ($(strip $(KEYLOGGER_ENABLE)), yes)
-        OPT_DEFS += -DKEYLOGGER_ENABLE
-    endif
+  ifeq ($(strip $(KEYLOGGER_ENABLE)), yes)
+    OPT_DEFS += -DKEYLOGGER_ENABLE
+  endif
 endif
 
 ifeq ($(strip $(MAKE_BOOTLOADER)), yes)

users/drashna/send_unicode.h

@@ -7,65 +7,65 @@ void send_unicode_hex_string(const char* str);
 /* use X(n) to call the  */
 #ifdef UNICODEMAP_ENABLE
 enum unicode_name {
-    THINK, // thinking face 🤔
-    GRIN, // grinning face 😊
-    SMRK, // smirk 😏
-    WEARY, // good shit 😩
-    UNAMU, // unamused 😒
+  THINK, // thinking face 🤔
+  GRIN, // grinning face 😊
+  SMRK, // smirk 😏
+  WEARY, // good shit 😩
+  UNAMU, // unamused 😒
 
-    SNEK, // snke 🐍
-    PENGUIN, // 🐧
-    DRAGON, // 🐉
-    MONKEY, // 🐒
-    CHICK, // 🐥
-    BOAR, // 🐗
+  SNEK, // snke 🐍
+  PENGUIN, // 🐧
+  DRAGON, // 🐉
+  MONKEY, // 🐒
+  CHICK, // 🐥
+  BOAR, // 🐗
 
-    OKOK, // 👌
-    EFFU, // 🖕
-    INUP, // 👆
-    THUP, // 👍
-    THDN, // 👎
+  OKOK, // 👌
+  EFFU, // 🖕
+  INUP, // 👆
+  THUP, // 👍
+  THDN, // 👎
 
-    BBB, // dat B 🅱
-    POO, // poop 💩
-    HUNDR, // 100 💯
-    EGGPL, // EGGPLANT 🍆
-    WATER, // wet 💦
-    TUMBLER, // 🥃
+  BBB, // dat B 🅱
+  POO, // poop 💩
+  HUNDR, // 100 💯
+  EGGPL, // EGGPLANT 🍆
+  WATER, // wet 💦
+  TUMBLER, // 🥃
 
-    LIT, // fire 🔥
-    BANG, // ‽
-    IRONY, // ⸮
-    DEGREE // °
+  LIT, // fire 🔥
+  BANG, // ‽
+  IRONY, // ⸮
+  DEGREE // °
 };
 
 
 const uint32_t PROGMEM unicode_map[] = {
-    [THINK]     = 0x1F914,
-    [GRIN]      = 0x1F600,
-    [BBB]       = 0x1F171,
-    [POO]       = 0x1F4A9,
-    [HUNDR]     = 0x1F4AF,
-    [SMRK]      = 0x1F60F,
-    [WEARY]     = 0x1F629,
-    [EGGPL]     = 0x1F346,
-    [WATER]     = 0x1F4A6,
-    [LIT]       = 0x1F525,
-    [UNAMU]     = 0x1F612,
-    [SNEK]      = 0x1F40D,
-    [PENGUIN]   = 0x1F427,
-    [BOAR]      = 0x1F417,
-    [MONKEY]    = 0x1F412,
-    [CHICK]     = 0x1F425,
-    [DRAGON]    = 0x1F409,
-    [OKOK]      = 0x1F44C,
-    [EFFU]      = 0x1F595,
-    [INUP]      = 0x1F446,
-    [THDN]      = 0x1F44E,
-    [THUP]      = 0x1F44D,
-    [TUMBLER]   = 0x1F943,
-    [BANG]      = 0x0203D,
-    [IRONY]     = 0x02E2E,
-    [DEGREE]    = 0x000B0
+  [THINK]     = 0x1F914,
+  [GRIN]      = 0x1F600,
+  [BBB]       = 0x1F171,
+  [POO]       = 0x1F4A9,
+  [HUNDR]     = 0x1F4AF,
+  [SMRK]      = 0x1F60F,
+  [WEARY]     = 0x1F629,
+  [EGGPL]     = 0x1F346,
+  [WATER]     = 0x1F4A6,
+  [LIT]       = 0x1F525,
+  [UNAMU]     = 0x1F612,
+  [SNEK]      = 0x1F40D,
+  [PENGUIN]   = 0x1F427,
+  [BOAR]      = 0x1F417,
+  [MONKEY]    = 0x1F412,
+  [CHICK]     = 0x1F425,
+  [DRAGON]    = 0x1F409,
+  [OKOK]      = 0x1F44C,
+  [EFFU]      = 0x1F595,
+  [INUP]      = 0x1F446,
+  [THDN]      = 0x1F44E,
+  [THUP]      = 0x1F44D,
+  [TUMBLER]   = 0x1F943,
+  [BANG]      = 0x0203D,
+  [IRONY]     = 0x02E2E,
+  [DEGREE]    = 0x000B0
  };
 #endif // UNICODEMAP_ENABLE

users/drashna/tap_dances.c

@@ -2,64 +2,63 @@
 
 
 //define diablo macro timer variables
-diablo_timer_t diablo_timer[4];
-
-uint8_t diablo_times[] = { 0, 0, 1, 3, 5, 10, 30 };
+uint16_t diablo_timer[4];
+uint8_t diablo_times[] = { 0, 1, 3, 5, 10, 30 };
+uint8_t diablo_key_time[4];
 
 // has the correct number of seconds elapsed (as defined by diablo_times)
-bool check_dtimer(uint8_t dtimer) { return (timer_elapsed(diablo_timer[dtimer].key_time) < (diablo_timer[dtimer].timer * 1000)) ? false : true; };
+bool check_dtimer(uint8_t dtimer) { return (timer_elapsed(diablo_timer[dtimer]) < (diablo_key_time[dtimer] * 1000)) ? false : true; };
 
 // Cycle through the times for the macro, starting at 0, for disabled.
 // Max of six values, so don't exceed
-void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) {
-    int index = (int)user_data;
-    if (state->count >= 7) {
-        diablo_timer[index].key_time = diablo_times[0];
-        reset_tap_dance(state);
-    }  else {
-        diablo_timer[index].key_time = diablo_times[state->count];
-    }
+void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
+  if (state->count >= 7) {
+    diablo_key_time[diablo_key] = diablo_times[0];
+    reset_tap_dance(state);
+  }  else {
+    diablo_key_time[diablo_key] = diablo_times[state->count - 1];
+  }
 }
 
-// One funtion to rule them all!!
-#define ACTION_TAP_DANCE_DIABLO(arg) {  \
-    .fn = { NULL, (void *)diablo_tapdance_master, NULL }, \
-    .user_data = (void *)arg,  \
-  }
+// Would rather have one function for all of this, but no idea how to do that...
+void diablo_tapdance1(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 0); }
+void diablo_tapdance2(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 1); }
+void diablo_tapdance3(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 2); }
+void diablo_tapdance4(qk_tap_dance_state_t *state, void *user_data) { diablo_tapdance_master(state, user_data, 3); }
 
 //Tap Dance Definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
-    // tap once to disable, and more to enable timed micros
-    [TD_D3_1] = ACTION_TAP_DANCE_DIABLO(0),
-    [TD_D3_2] = ACTION_TAP_DANCE_DIABLO(1),
-    [TD_D3_3] = ACTION_TAP_DANCE_DIABLO(2),
-    [TD_D3_4] = ACTION_TAP_DANCE_DIABLO(3),
+  // tap once to disable, and more to enable timed micros
+  [TD_D3_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
+  [TD_D3_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
+  [TD_D3_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
+  [TD_D3_4] = ACTION_TAP_DANCE_FN(diablo_tapdance4),
 };
 
 // Sends the key press to system, but only if on the Diablo layer
 void send_diablo_keystroke(uint8_t diablo_key) {
-    if (IS_LAYER_ON(_DIABLO)) {
-        switch (diablo_key) {
-        case 0:
-            tap_code(KC_1); break;
-        case 1:
-            tap_code(KC_2); break;
-        case 2:
-            tap_code(KC_3); break;
-        case 3:
-            tap_code(KC_4); break;
-        }
+  if (IS_LAYER_ON(_DIABLO)) {
+    switch (diablo_key) {
+      case 0:
+        tap_code(KC_1); break;
+      case 1:
+        tap_code(KC_2); break;
+      case 2:
+        tap_code(KC_3); break;
+      case 3:
+        tap_code(KC_4); break;
     }
+  }
 }
 
 // Checks each of the 4 timers/keys to see if enough time has elapsed
 // Runs the "send string" command if enough time has passed, and resets the timer.
 void run_diablo_macro_check(void) {
-    uint8_t dtime;
-    for (dtime = 0; dtime < 4; dtime++) {
-        if (check_dtimer(dtime) && diablo_timer[dtime].key_time) {
-        diablo_timer[dtime].timer = timer_read();
-        send_diablo_keystroke(dtime);
-        }
+  uint8_t dtime;
+  for (dtime = 0; dtime < 4; dtime++) {
+    if (check_dtimer(dtime) && diablo_key_time[dtime]) {
+      diablo_timer[dtime] = timer_read();
+      send_diablo_keystroke(dtime);
     }
+  }
 }

users/drashna/tap_dances.h

@@ -2,21 +2,18 @@
 #include "drashna.h"
 
 //define diablo macro timer variables
+extern uint16_t diablo_timer[4];
 extern uint8_t diablo_times[];
-typedef struct {
-    uint16_t timer;
-    uint8_t key_time;
-} diablo_timer_t;
+extern uint8_t diablo_key_time[4];
 
-extern diablo_timer_t diablo_timer[4];
 
 void run_diablo_macro_check(void);
 
 #ifdef TAP_DANCE_ENABLE
 enum {
-    TD_D3_1 = 0,
-    TD_D3_2,
-    TD_D3_3,
-    TD_D3_4
+  TD_D3_1 = 0,
+  TD_D3_2,
+  TD_D3_3,
+  TD_D3_4
 };
 #endif // TAP_DANCE_ENABLE

users/drashna/wrappers.h

@@ -6,7 +6,7 @@ arguments, we need a wrapper in order for these definitions to be
 expanded before being used as arguments to the LAYOUT_xxx macro.
 */
 #if (!defined(LAYOUT) && defined(KEYMAP))
-#   define LAYOUT KEYMAP
+#define LAYOUT KEYMAP
 #endif
 
 #define LAYOUT_ergodox_wrapper(...)          LAYOUT_ergodox(__VA_ARGS__)
@@ -15,7 +15,6 @@ expanded before being used as arguments to the LAYOUT_xxx macro.
 #define LAYOUT_wrapper(...)                  LAYOUT(__VA_ARGS__)
 #define LAYOUT_ortho_4x12_wrapper(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
 #define LAYOUT_ortho_5x12_wrapper(...)       LAYOUT_ortho_5x12(__VA_ARGS__)
-#define LAYOUT_gergo_wrapper(...)            LAYOUT_gergo(__VA_ARGS__)
 
 /*
 Blocks for each of the four major keyboard layouts

users/rs/readme.md

@@ -1,30 +0,0 @@
-# RS: Code Friendly 40% – 60% Keymaps
-
-The rs keymap collection is an evolution of my previous keymap optimized for coding with a 60% keyboards like the Iris. I tried to keep the simplicity of my previous keymap with all the keys necessary for coding on a single layer in addition to the base one. It work well with any 40% and 60% keyboard, split or not.
-
-To build it, use:
-
-    make <keyboard>:rs
-
-Example:
-
-    make keebio/iris:rs
-    make crkbd:rs
-    make planck:rs
-    make preonic:rs
-    make ergotravel:rs
-    make handwired/rs60:rs
-
-Because I sometime have to use my internal keyboard I my macbook, a [karabiner configuration](karabiner.json) is also provided to get most of the features of this keyboard, including the code layer / backspace on right command key etc.
-
-This set of keymaps have been tested with those keyboards:
-- [Planck](../../keyboards/planck/)
-- [Preonic](../../keyboards/preonic/)
-- [My preonic clone](../../keyboards/handwired/rs60/)
-
-This keymap in is also available for other keyboards:
-- [Crkdb/rs](../../keyboards/crkbd/keymaps/rs/keymap.c)
-- [Iris/rs](../../keyboards/keebio/iris/keymaps/rs/keymap.c)
-- [Ergotravel/rs](../../keyboards/ergotravel/keymaps/rs/keymap.c)
-- [ortho_5x12/rs](../../layouts/community/ortho_5x12/rs/keymap.c)
-- [ortho_4x12/rs](../../layouts/community/ortho_4x12/rs/keymap.c)

users/rs/rs.c

@@ -1,74 +0,0 @@
-
-#include "rs.h"
-
-// process_record_user is like process_record_user for keymaps including this file.
-__attribute__ ((weak))
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-// rgb_mod_changed_keymap is called any time the RGB mod has been changed.
-__attribute__ ((weak))
-void rgb_mod_changed_keymap(void) {
-}
-
-// keylog_set_keymap is called for every key press.
-__attribute__ ((weak))
-void keylog_set_keymap(uint16_t keycode, keyrecord_t *record) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-    keylog_set_keymap(keycode, record);
-  }
-
-  switch (keycode) {
-  case NEQL: // !=
-    if (record->event.pressed) {
-      SEND_STRING("!=");
-    }
-    return false;
-  case LPLT: // ( or < with shift
-    if (record->event.pressed) {
-      if (get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) {
-        // <
-        tap_code(KC_COMM); // shift is already registered
-      } else {
-        // (
-        register_mods(MOD_BIT(KC_LSFT));
-        tap_code(KC_9);
-        unregister_mods(MOD_BIT(KC_LSFT));
-      }
-    }
-    return false;
-  case RPGT: // ) or > with shift
-    if (record->event.pressed) {
-      if (get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) {
-        // <
-        tap_code(KC_DOT); // shift is already registered
-      } else {
-        // )
-        register_mods(MOD_BIT(KC_LSFT));
-        tap_code(KC_0);
-        unregister_mods(MOD_BIT(KC_LSFT));
-      }
-    }
-    return false;
-#ifdef RGBLIGHT_ENABLE
-  case RGB_MOD:
-      if (record->event.pressed) {
-        rgblight_step();
-        rgb_mod_changed_keymap();
-      }
-    return false;
-  case RGBRST:
-      if (record->event.pressed) {
-        eeconfig_update_rgblight_default();
-        rgblight_enable();
-        rgb_mod_changed_keymap();
-      }
-    return false;
-#endif
-  }
-  return process_record_keymap(keycode, record);
-}

users/rs/rs.h

@@ -1,50 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-enum layers {
-  _QWERTY,
-  _CODE,
-  _FN,
-};
-
-enum custom_keycodes {
-  CODE = SAFE_RANGE,
-  FN,
-  LPLT,
-  RPGT,
-  NEQL,
-#ifdef RGBLIGHT_ENABLE
-  RGBRST,
-#endif
-};
-
-#define KC_ KC_TRNS
-
-#define KC_ESCC MT(MOD_LCTL, KC_ESC)
-#define KC_ENTS MT(MOD_LSFT, KC_ENT)
-#define KC_LTGT LTGT // > or < with shift
-#define KC_LPLT LPLT // ( or < with shift
-#define KC_RPGT RPGT // ) or > with shift
-#define KC_NEQL NEQL // !=
-#define KC_CODE MO(_CODE)
-#define KC_BCOD LT(_CODE, KC_BSPC)
-#define KC_FN   MO(_FN)
-#define KC_RST  RESET
-#define KC_CTRA LCTL(KC_A)
-#define KC_CTRE LCTL(KC_E)
-#define KC_BLTG BL_TOGG
-#define KC_BLUP BL_INC
-#define KC_BLDN BL_DEC
-#define KC_BLBR BL_BRTG
-
-#ifdef RGBLIGHT_ENABLE
-#define KC_LRST RGBRST
-#define KC_LTOG RGB_TOG
-#define KC_LHUI RGB_HUI
-#define KC_LHUD RGB_HUD
-#define KC_LSAI RGB_SAI
-#define KC_LSAD RGB_SAD
-#define KC_LVAI RGB_VAI
-#define KC_LVAD RGB_VAD
-#define KC_LMOD RGB_MOD
-#endif

users/rs/rules.mk

@@ -1 +0,0 @@
-SRC += rs.c

util/sample_parser.py

@@ -0,0 +1,39 @@
+#! /bin/python
+#
+# Copyright 2019 Jack Humbert
+#
+# 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/>.
+#
+
+import wave, struct, sys
+
+waveFile = wave.open(sys.argv[1], 'r')
+# print(str(waveFile.getparams()))
+# sys.exit()
+
+if (waveFile.getsampwidth() != 2):
+    raise(Exception("This script currently only works with 16bit audio files"))
+
+length = waveFile.getnframes()
+out = "#define DAC_SAMPLE_CUSTOM_LENGTH " + str(length) + "\n\n"
+out += "static const dacsample_t dac_sample_custom[" + str(length) + "] = {"
+for i in range(0,length):
+    if (i % 8 == 0):
+        out += "\n    "
+    waveData = waveFile.readframes(1)
+    data = struct.unpack("<h", waveData)
+    out += str(int((int(data[0]) + 0x8000) / 16)) + ", "
+out = out[:-2]
+out += "\n};"
+print(out)

util/wavetable_parser.py

@@ -0,0 +1,40 @@
+#! /bin/python
+#
+# Copyright 2019 Jack Humbert
+#
+# 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/>.
+#
+
+import wave, struct, sys
+
+waveFile = wave.open(sys.argv[1], 'r')
+
+length = waveFile.getnframes()
+out = "#define DAC_WAVETABLE_CUSTOM_LENGTH " + str(int(length / 256)) + "\n\n"
+out += "static const dacsample_t dac_wavetable_custom[" + str(int(length / 256)) + "][256] = {"
+for i in range(0,length):
+    if (i % 8 == 0):
+        out += "\n    "
+    if (i % 256 == 0):
+        out = out[:-2]
+        out += "{\n    "
+    waveData = waveFile.readframes(1)
+    data = struct.unpack("<h", waveData)
+    out += str(int((int(data[0]) + 0x8000) / 16)) + ", "
+    if (i % 256 == 255):
+        out = out[:-2]
+        out += "\n  },"
+out = out[:-1]
+out += "\n};"
+print(out)