summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/drashna/config.h22
-rw-r--r--users/drashna/drashna.h1
-rw-r--r--users/drashna/oled_stuff.c8
-rw-r--r--users/drashna/process_records.c2
4 files changed, 25 insertions, 8 deletions
diff --git a/users/drashna/config.h b/users/drashna/config.h
index 32667d49a1..ebb8d7b7ac 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -197,16 +197,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
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index af26fdc433..6a45141d9a 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -50,6 +50,7 @@ enum userspace_layers {
LAST_DEFAULT_LAYER = _DVORAK,
_GAMEPAD,
_DIABLO,
+ _DIABLOII,
_MOUSE,
_MEDIA,
_LOWER,
diff --git a/users/drashna/oled_stuff.c b/users/drashna/oled_stuff.c
index 69d1d64b79..396e5e05b7 100644
--- a/users/drashna/oled_stuff.c
+++ b/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
diff --git a/users/drashna/process_records.c b/users/drashna/process_records.c
index 1e7f7ca762..c16c70c050 100644
--- a/users/drashna/process_records.c
+++ b/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;
}