summaryrefslogtreecommitdiff
path: root/keyboards/iris/keymaps/default
diff options
context:
space:
mode:
authorRobertDhaene2018-03-25 12:56:36 -0700
committerDrashna Jaelre2018-03-25 12:56:36 -0700
commit3d587b1d2f01265ef25d9f328c157886afb0c579 (patch)
tree1b97e4f84cf4564374c29779ed43064fd66f5013 /keyboards/iris/keymaps/default
parentc4f9b8f297e09c51f9ca751b62de6f5290e244e0 (diff)
Merge in some custom keymaps from forked repository (#2605)
* Inital layout * Fix the backspace * add a number pad * move the backlight to the adjust layer; move ctrl and delete. * Update from main repo * Add initial files for custom keymap * Light keymap mod * Change the submodules to match the upstream fork's master branch
Diffstat (limited to 'keyboards/iris/keymaps/default')
-rw-r--r--keyboards/iris/keymaps/default/keymap.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/keyboards/iris/keymaps/default/keymap.c b/keyboards/iris/keymaps/default/keymap.c
index 24ef99d20..d71748b34 100644
--- a/keyboards/iris/keymaps/default/keymap.c
+++ b/keyboards/iris/keymaps/default/keymap.c
@@ -41,11 +41,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----| |----+----+----+----+----+----|
TAB , Q , W , E , R , T , Y , U , I , O , P ,DEL ,
//|----+----+----+----+----+----| |----+----+----+----+----+----|
- RASE, A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
+ LSFT, A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- LSFT, Z , X , C , V , B ,SPC , ENT , N , M ,COMM,DOT ,SLSH,RSFT,
+ LCTL, Z , X , C , V , B ,HOME, END , N , M ,COMM,DOT ,SLSH,RSFT,
//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'
- LCTL,LOWR,SPC , ENT ,LGUI,LALT
+ LGUI,LOWR,ENT , SPC ,RASE,LALT
// `----+----+----' `----+----+----'
),
@@ -93,10 +93,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-#endif
-
void persistent_default_layer_set(uint16_t default_layer) {
eeconfig_update_default_layer(default_layer);
default_layer_set(default_layer);
@@ -106,9 +102,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_qwerty);
- #endif
persistent_default_layer_set(1UL<<_QWERTY);
}
return false;