summaryrefslogtreecommitdiffstats
path: root/keyboards/viterbi/keymaps/drashna
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-07-17 03:04:32 +0200
committerJack Humbert <jack.humb@gmail.com>2018-07-17 03:04:32 +0200
commitb2877470ced1deb9651ecb39f6a82f5ef380b399 (patch)
treeba4c9e0a9c86526cf4bc002b732be0dce37acd5b /keyboards/viterbi/keymaps/drashna
parente0c9cfad86a7c17863db08574472e866aa3d37b7 (diff)
downloadqmk_firmware-b2877470ced1deb9651ecb39f6a82f5ef380b399.tar.gz
qmk_firmware-b2877470ced1deb9651ecb39f6a82f5ef380b399.tar.xz
Update to drashna userspace and keymaps (#3172)
* Use string with delay * Add skipped region to ergodox * Add send string config * Use default_layer_state instead of function * Fully generalize keyboards * old iris cleanup * Fix Drashna keymap compile issues By checking to see if secret.c exists before actually trying to add it * Remove unnecessary references * Add 4x12 ortho board * Update userspace readme for secrets * Make RGB more modular * Fix iris keymap, since we don't need the lower left (Function keys) * Fix includes * Add Blanks * Fix Ergodox lower layer * Add suspend commands * Add Maltron Layout * Add additional layouts * Finish adding gamepad to Iris * Tweaks to iris gamepag layer * make gaming layers more friendly * minor gaming layer tweak * Add Carplax * Add modded key timer function * Cleanup and macro documentation * Add QMK DFU info * Add 'old' keymap for 12 LED spare * Update Pro Micro documentation * Disable twinkling so it fits in firmware space * Switch to QMK DFU bootloader, since it's better anyhow * Write default layer state colors to EEPROM Since we are writing to EEPROM anyways, and this way, it sticks on reboot * Fix QMK DFU bootloader options * More updates for QMK DFU support * Use matrix scanning hack for startup_user until #3113 gets merged * Fix indicator light consistency issue * Add/readd ifdefs to indicators * Add/readd alt indicator * Remove RGB Twinkling from Viterbi macro pad * Fix default layer color detection * Fix rebase and detection issues * Cleanup code so it will compile if RGBLIGHT is disabled * Revert vsode settings * Use Pragma Once instead of boilerplate code
Diffstat (limited to 'keyboards/viterbi/keymaps/drashna')
-rw-r--r--keyboards/viterbi/keymaps/drashna/config.h11
-rw-r--r--keyboards/viterbi/keymaps/drashna/keymap.c13
-rw-r--r--keyboards/viterbi/keymaps/drashna/rules.mk3
3 files changed, 16 insertions, 11 deletions
diff --git a/keyboards/viterbi/keymaps/drashna/config.h b/keyboards/viterbi/keymaps/drashna/config.h
index e25761203..5bc5598ee 100644
--- a/keyboards/viterbi/keymaps/drashna/config.h
+++ b/keyboards/viterbi/keymaps/drashna/config.h
@@ -15,11 +15,7 @@ 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 CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include QMK_KEYBOARD_CONFIG_H
-
+#pragma once
#ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM
@@ -78,4 +74,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO \
)
-#endif
+#define QMK_ESC_OUTPUT F5 // usually COL
+#define QMK_ESC_INPUT D4 // usually ROW
+#define QMK_LED B0
+#define QMK_SPEAKER C6
diff --git a/keyboards/viterbi/keymaps/drashna/keymap.c b/keyboards/viterbi/keymaps/drashna/keymap.c
index 11ffe6ebd..68ca593db 100644
--- a/keyboards/viterbi/keymaps/drashna/keymap.c
+++ b/keyboards/viterbi/keymaps/drashna/keymap.c
@@ -76,10 +76,8 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
//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);
+ // tap(KC_KP_0);
+ // tap(KC_KP_0);
// }
// return false;
// break;
@@ -89,5 +87,12 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+void matrix_init_keymap(void) {
+ DDRD &= ~(1<<5);
+ PORTD &= ~(1<<5);
+
+ DDRB &= ~(1<<0);
+ PORTB &= ~(1<<0);
+}
diff --git a/keyboards/viterbi/keymaps/drashna/rules.mk b/keyboards/viterbi/keymaps/drashna/rules.mk
index a7b18e071..ec3befc0b 100644
--- a/keyboards/viterbi/keymaps/drashna/rules.mk
+++ b/keyboards/viterbi/keymaps/drashna/rules.mk
@@ -11,7 +11,7 @@ NKRO_ENABLE = yes
NO_SECRETS = yes
MACROS_ENABLED = yes
INDICATOR_LIGHTS = no
-RGBLIGHT_TWINKLE = yes
+RGBLIGHT_TWINKLE = no
LAYOUTS = ortho_5x7
@@ -22,3 +22,4 @@ LAYOUTS = ortho_5x7
# SRC := $(filter-out split_util.c,$(SRC))
# SRC += quantum/matrix.c
+BOOTLOADER = qmk-dfu