diff options
| author | Pavlos Vinieratos <pvinis@gmail.com> | 2019-05-16 18:38:28 +0200 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-05-16 09:38:28 -0700 |
| commit | 1a28906a3da1f14034b81871b90bcce0ed56c286 (patch) | |
| tree | 61a7fced0c7c115d27343fd4f7a6534202120aee | |
| parent | a8af694d265d5d136e81669ec7b30052a8f4de08 (diff) | |
| download | qmk_firmware-1a28906a3da1f14034b81871b90bcce0ed56c286.tar.gz qmk_firmware-1a28906a3da1f14034b81871b90bcce0ed56c286.zip | |
[Keymap] Pvinis/update for iris (#5889)
* add default functions
* some indenting
* add ctl and alt
* maybe?
| -rw-r--r-- | keyboards/keebio/iris/keymaps/pvinis/config.h | 10 | ||||
| -rw-r--r-- | keyboards/keebio/iris/keymaps/pvinis/keymap.c | 14 | ||||
| -rw-r--r-- | users/pvinis/config.h | 1 | ||||
| -rw-r--r-- | users/pvinis/pvinis.c | 10 | ||||
| -rw-r--r-- | users/pvinis/pvinis.h | 4 |
5 files changed, 24 insertions, 15 deletions
diff --git a/keyboards/keebio/iris/keymaps/pvinis/config.h b/keyboards/keebio/iris/keymaps/pvinis/config.h index 7a7beb0b8..b2fb43be9 100644 --- a/keyboards/keebio/iris/keymaps/pvinis/config.h +++ b/keyboards/keebio/iris/keymaps/pvinis/config.h | |||
| @@ -2,9 +2,9 @@ | |||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | #ifdef PRODUCT | 4 | #ifdef PRODUCT |
| 5 | #undef PRODUCT | 5 | #undef PRODUCT |
| 6 | #define PRODUCT Iris Keyboard - pvinis | 6 | #define PRODUCT Iris Keyboard - pvinis |
| 7 | #endif // PRODUCT | 7 | #endif |
| 8 | 8 | ||
| 9 | 9 | ||
| 10 | // Use I2C or Serial, not both | 10 | // Use I2C or Serial, not both |
| @@ -20,5 +20,5 @@ | |||
| 20 | 20 | ||
| 21 | // choose pin to use for audio. c6 is the one iris uses. | 21 | // choose pin to use for audio. c6 is the one iris uses. |
| 22 | #ifdef AUDIO_ENABLE | 22 | #ifdef AUDIO_ENABLE |
| 23 | #define C6_AUDIO | 23 | #define C6_AUDIO |
| 24 | #endif // AUDIO_ENABLE | 24 | #endif |
diff --git a/keyboards/keebio/iris/keymaps/pvinis/keymap.c b/keyboards/keebio/iris/keymaps/pvinis/keymap.c index fb9e4adcf..2f6d5a6b4 100644 --- a/keyboards/keebio/iris/keymaps/pvinis/keymap.c +++ b/keyboards/keebio/iris/keymaps/pvinis/keymap.c | |||
| @@ -23,20 +23,18 @@ | |||
| 23 | #endif | 23 | #endif |
| 24 | 24 | ||
| 25 | #ifdef AUDIO_ENABLE | 25 | #ifdef AUDIO_ENABLE |
| 26 | //#define STARTUP_SONG SONG(SONIC_RING) | 26 | // #define STARTUP_SONG SONG(SONIC_RING) |
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||
| 29 | #ifdef AUDIO_ENABLE | 29 | #ifdef AUDIO_ENABLE |
| 30 | float tone_sonic[][2] = SONG(IN_LIKE_FLINT); | 30 | float tone_sonic[][2] = SONG(IN_LIKE_FLINT); |
| 31 | float tone_1[][2] = SONG(QWERTY_SOUND); | 31 | float tone_1[][2] = SONG(QWERTY_SOUND); |
| 32 | float tone_2[][2] = SONG(OLD_SPICE); | 32 | float tone_2[][2] = SONG(OLD_SPICE); |
| 33 | float tone_3[][2] = SONG(OVERWATCH_THEME); | 33 | float tone_3[][2] = SONG(OVERWATCH_THEME); |
| 34 | float tone_4[][2] = SONG(QWERTY_SOUND); | 34 | float tone_4[][2] = SONG(QWERTY_SOUND); |
| 35 | #endif | 35 | #endif |
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | |||
| 39 | |||
| 40 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 38 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 41 | 39 | ||
| 42 | // ,-----------------------------. ,-----------------------------. | 40 | // ,-----------------------------. ,-----------------------------. |
diff --git a/users/pvinis/config.h b/users/pvinis/config.h index 7f17f2d02..8e2efb40a 100644 --- a/users/pvinis/config.h +++ b/users/pvinis/config.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | #ifdef AUDIO_ENABLE | 3 | #ifdef AUDIO_ENABLE |
| 4 | // #define STARTUP_SONG SONG(SONIC_RING) | 4 | // #define STARTUP_SONG SONG(SONIC_RING) |
| 5 | // #define DAC_SAMPLE_MAX 65535U // maybe this works for volume? | ||
| 5 | #endif | 6 | #endif |
| 6 | 7 | ||
| 7 | // allow rolling when keys have hold functionality | 8 | // allow rolling when keys have hold functionality |
diff --git a/users/pvinis/pvinis.c b/users/pvinis/pvinis.c index 754403579..e97edcb98 100644 --- a/users/pvinis/pvinis.c +++ b/users/pvinis/pvinis.c | |||
| @@ -77,3 +77,13 @@ qk_tap_dance_action_t tap_dance_actions[] = { | |||
| 77 | void keyboard_post_init_user(void) { | 77 | void keyboard_post_init_user(void) { |
| 78 | keyboard_post_init_user_local(); | 78 | keyboard_post_init_user_local(); |
| 79 | } | 79 | } |
| 80 | |||
| 81 | |||
| 82 | // default functions | ||
| 83 | __attribute__ ((weak)) | ||
| 84 | void keyboard_post_init_user_local(void) {} | ||
| 85 | |||
| 86 | __attribute__ ((weak)) | ||
| 87 | uint32_t layer_state_set_user_local(uint32_t state) { | ||
| 88 | return state; | ||
| 89 | } | ||
diff --git a/users/pvinis/pvinis.h b/users/pvinis/pvinis.h index 0c5e2841a..0c75c6a66 100644 --- a/users/pvinis/pvinis.h +++ b/users/pvinis/pvinis.h | |||
| @@ -78,8 +78,8 @@ enum { | |||
| 78 | #define _________________QWERTY_R2_________________ KC_H , KC_J , KC_K , KC_L , KC_SCLN | 78 | #define _________________QWERTY_R2_________________ KC_H , KC_J , KC_K , KC_L , KC_SCLN |
| 79 | #define _________________QWERTY_R3_________________ KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH | 79 | #define _________________QWERTY_R3_________________ KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH |
| 80 | 80 | ||
| 81 | #define _____________MOD_QWERTY_L2_________________ KC_A , SFT_T(KC_S), GUI_T(KC_D), KC_F , KC_G | 81 | #define _____________MOD_QWERTY_L2_________________ CTL_T(KC_A), SFT_T(KC_S), GUI_T(KC_D), ALT_T(KC_F), KC_G |
| 82 | #define _____________MOD_QWERTY_R2_________________ KC_H , KC_J , GUI_T(KC_K), SFT_T(KC_L), KC_SCLN | 82 | #define _____________MOD_QWERTY_R2_________________ KC_H , ALT_T(KC_J), GUI_T(KC_K), SFT_T(KC_L), CTL_T(KC_SCLN) |
| 83 | 83 | ||
| 84 | // ,-----+-----+-----+-----+-----, ,-----+-----+-----+-----+-----, | 84 | // ,-----+-----+-----+-----+-----, ,-----+-----+-----+-----+-----, |
| 85 | // | Q | G | M | L | W | | Y | F | I | O | P | | 85 | // | Q | G | M | L | W | | Y | F | I | O | P | |
