[Keymap] updates for oled, and diablo 2 layer - Drashna

keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h

@@ -102,6 +102,10 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 // #define EXTERNAL_EEPROM_ADDRESS_SIZE 2
 // #define DEBUG_EEPROM_OUTPUT
 
+#ifdef EEPROM_SPI
+# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8195
+#endif
+
 /* pmw3360 config */
 #define PMW3360_CS_PIN B0
 #define PMW3360_SPI_MODE 3

keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h

@@ -18,5 +18,4 @@
 
 #define TRACKBALL_DPI_OPTIONS { 1200, 1800, 2600, 3400 }
 
-#undef DEBOUNCE
-#define DEBOUNCE 15
+#define DEBOUNCE 45

keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c

@@ -94,6 +94,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  SFT_T(KC_SPC), KC_J, _______,
  ALT_T(KC_Q), KC_LGUI, _______, _______
  ),
+ [_DIABLOII] = LAYOUT_5x6_right(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_GRV, _______, _______, _______, _______, _______, _______,
+ KC_TAB, KC_A, KC_T, KC_Q, KC_I, KC_M, _______, _______, _______, _______, _______, _______,
+ KC_S, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, _______, _______,
+ KC_LCTL, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______,
+ KC_F, KC_L, KC_NO, TG(_DIABLOII),
+ _______, KC_G, _______,
+ KC_LSFT, _______, _______,
+ KC_LCTL, KC_V, _______, _______
+ ),
  [_LOWER] = LAYOUT_5x6_right_wrapper(
  KC_F12, _________________FUNC_LEFT_________________, _________________FUNC_RIGHT________________, KC_F11,
  _______, _________________LOWER_L1__________________, _________________LOWER_R1__________________, _______,
@@ -122,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  HPT_DWLI, HPT_DWLD, TG_GAME, TG_DBLO,
  HPT_TOG, HPT_BUZ, KC_NUKE,
  _______, _______, _______,
- _______, _______, KC_NUKE, _______
+ _______, TG(_DIABLOII),KC_NUKE, _______
  ),
 };
 

keyboards/moonlander/keymaps/drashna/keymap.c

@@ -82,6 +82,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_NO, KC_NO, KC_L, KC_J, KC_F, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
  KC_DIABLO_CLEAR, SFT_T(KC_SPACE), ALT_T(KC_Q), KC_PGDN, KC_DEL, KC_ENT
  ),
+ [_DIABLOII] = LAYOUT_moonlander_wrapper(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_GRV, KC_NO, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
+ KC_TAB, KC_A, KC_T, KC_Q, KC_I, KC_M, TG(_DIABLOII), KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_S, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_LCTL, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_G, KC_F, KC_L, KC_V, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_G, KC_LSFT, KC_LCTL, KC_PGDN, KC_DEL, KC_ENT
+ ),
 
  [_LOWER] = LAYOUT_moonlander_wrapper(
  KC_F12, _________________FUNC_LEFT_________________, _______, _______, _________________FUNC_RIGHT________________, KC_F11,
@@ -103,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  [_ADJUST] = LAYOUT_moonlander_wrapper(
  KC_MAKE, _________________FUNC_LEFT_________________, UC_MOD, KC_NUKE, _________________ADJUST_R1_________________, KC_RST,
- VRSN, _________________ADJUST_L1_________________, _______,  _______, _________________ADJUST_R1_________________, EEP_RST,
+ VRSN, _________________ADJUST_L1_________________, TG(_DIABLOII), _______, _________________ADJUST_R1_________________, EEP_RST,
  _______, _________________ADJUST_L2_________________, _______, _______, _________________ADJUST_R2_________________, RGB_IDL,
  KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,

keyboards/work_louder/work_board/keymaps/drashna/keymap.c

@@ -117,7 +117,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
  clockwise ? rgb_matrix_step() : rgb_matrix_step_reverse();
  break;
  default:
- clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU);
+ clockwise ? tap_code(KC_VOLU) : tap_code(KC_VOLD);
  break;
  }
  return false;

users/drashna/config.h

@@ -148,16 +148,32 @@
 // # define OLED_FONT_AZTECH
 // # define OLED_FONT_BMPLAIN
 // # define OLED_FONT_CRACKERS
-// # define OLED_FONT_HISKYF21
 # define OLED_FONT_DEAD_MEAL
+// # define OLED_FONT_EIN
+// # define OLED_FONT_HISKYF21
+// # define OLED_FONT_SQUASH
+// # define OLED_FONT_ZXPIX
 // # define OLED_FONT_SUPER_DIGG
-// # define OLED_LOGO_GMK_BAD
-// # define OLED_LOGO_HUE_MANITEE
+
+// # define OLED_LOGO_BEBOP
 // # define OLED_LOGO_CORNE
+// # define OLED_LOGO_GMK_BAD
 // # define OLED_LOGO_GOTHAM
+// # define OLED_LOGO_HUE_MANITEE
+// # define OLED_LOGO_LOOSE
 # define OLED_LOGO_SCIFI
+// # define OLED_LOGO_SETS3N
+// # define OLED_LOGO_SKEEB
 #endif
 
+// #define WPM_ESTIMATED_WORD_SIZE 5
+#define WPM_ALLOW_COUNT_REGRESSION
+// #define WPM_UNFILTERED
+// #define WPM_SAMPLE_SECONDS 5
+// #define WPM_SAMPLE_PERIODS 50
+// #define WPM_LAUNCH_CONTROL
+
+
 #ifndef ONESHOT_TAP_TOGGLE
 # define ONESHOT_TAP_TOGGLE 2
 #endif // !ONESHOT_TAP_TOGGLE

users/drashna/drashna.h

@@ -50,6 +50,7 @@ enum userspace_layers {
  LAST_DEFAULT_LAYER = _DVORAK,
  _GAMEPAD,
  _DIABLO,
+ _DIABLOII,
  _MOUSE,
  _MEDIA,
  _LOWER,

users/drashna/oled_stuff.c

@@ -36,8 +36,8 @@ static const char PROGMEM code_to_name[256] = {
  ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', // 0x
  'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', // 1x
  '3', '4', '5', '6', '7', '8', '9', '0', 20, 19, 27, 26, 22, '-', '=', '[', // 2x
- ']','\\', '#', ';','\'', '`', ',', '.', '/', 128, '1', '2', '3', '4', '5', '6', // 3x
- '7', '8', '9', '0', '1', '2', 'P', 'S', 19, ' ', 17, 30, 16, 16, 31, 26, // 4x
+ ']','\\', '#', ';','\'', '`', ',', '.', '/', 128,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA, // 3x
+ 0xDB,0xDC,0xDD,0xDE,0XDF,0xFB,'P', 'S', 19, ' ', 17, 30, 16, 16, 31, 26, // 4x
  27, 25, 24, 'N', '/', '*', '-', '+', 23, '1', '2', '3', '4', '5', '6', '7', // 5x
  '8', '9', '0', '.','\\', 'A', 0, '=', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 6x
  ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // 7x
@@ -47,8 +47,8 @@ static const char PROGMEM code_to_name[256] = {
  ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Bx
  ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Cx
  ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Dx
- 'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 24, 26, 24, // Ex
- 25,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D, 24, 25, 27, 26,  ' ', ' ', ' ' // Fx
+ 'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  24, 26, 24, // Ex
+ 25,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D,0x9D, 24, 25, 27, 26, ' ', ' ', ' ' // Fx
 };
 // clang-format on
 

users/drashna/process_records.c

@@ -199,6 +199,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *re
  }
  }
  break;
+#endif
  case KEYLOCK: {
  static host_driver_t *host_driver = 0;
 
@@ -215,7 +216,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *re
  }
  break;
  }
-#endif
  }
  return true;
 }