[Keymap] Pvinis/update for iris (#5889)

* add default functions

* some indenting

* add ctl and alt

* maybe?
This commit is contained in:
Pavlos Vinieratos 2019-05-16 18:38:28 +02:00 committed by Drashna Jaelre
parent a8af694d26
commit 1a28906a3d
5 changed files with 24 additions and 15 deletions

View File

@ -2,9 +2,9 @@
#ifdef PRODUCT #ifdef PRODUCT
#undef PRODUCT #undef PRODUCT
#define PRODUCT Iris Keyboard - pvinis #define PRODUCT Iris Keyboard - pvinis
#endif // PRODUCT #endif
// Use I2C or Serial, not both // Use I2C or Serial, not both
@ -20,5 +20,5 @@
// choose pin to use for audio. c6 is the one iris uses. // choose pin to use for audio. c6 is the one iris uses.
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#define C6_AUDIO #define C6_AUDIO
#endif // AUDIO_ENABLE #endif

View File

@ -23,20 +23,18 @@
#endif #endif
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
//#define STARTUP_SONG SONG(SONIC_RING) // #define STARTUP_SONG SONG(SONIC_RING)
#endif #endif
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
float tone_sonic[][2] = SONG(IN_LIKE_FLINT); float tone_sonic[][2] = SONG(IN_LIKE_FLINT);
float tone_1[][2] = SONG(QWERTY_SOUND); float tone_1[][2] = SONG(QWERTY_SOUND);
float tone_2[][2] = SONG(OLD_SPICE); float tone_2[][2] = SONG(OLD_SPICE);
float tone_3[][2] = SONG(OVERWATCH_THEME); float tone_3[][2] = SONG(OVERWATCH_THEME);
float tone_4[][2] = SONG(QWERTY_SOUND); float tone_4[][2] = SONG(QWERTY_SOUND);
#endif #endif
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// ,-----------------------------. ,-----------------------------. // ,-----------------------------. ,-----------------------------.

View File

@ -2,6 +2,7 @@
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
// #define STARTUP_SONG SONG(SONIC_RING) // #define STARTUP_SONG SONG(SONIC_RING)
// #define DAC_SAMPLE_MAX 65535U // maybe this works for volume?
#endif #endif
// allow rolling when keys have hold functionality // allow rolling when keys have hold functionality

View File

@ -77,3 +77,13 @@ qk_tap_dance_action_t tap_dance_actions[] = {
void keyboard_post_init_user(void) { void keyboard_post_init_user(void) {
keyboard_post_init_user_local(); keyboard_post_init_user_local();
} }
// default functions
__attribute__ ((weak))
void keyboard_post_init_user_local(void) {}
__attribute__ ((weak))
uint32_t layer_state_set_user_local(uint32_t state) {
return state;
}

View File

@ -78,8 +78,8 @@ enum {
#define _________________QWERTY_R2_________________ KC_H , KC_J , KC_K , KC_L , KC_SCLN #define _________________QWERTY_R2_________________ KC_H , KC_J , KC_K , KC_L , KC_SCLN
#define _________________QWERTY_R3_________________ KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH #define _________________QWERTY_R3_________________ KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH
#define _____________MOD_QWERTY_L2_________________ KC_A , SFT_T(KC_S), GUI_T(KC_D), KC_F , KC_G #define _____________MOD_QWERTY_L2_________________ CTL_T(KC_A), SFT_T(KC_S), GUI_T(KC_D), ALT_T(KC_F), KC_G
#define _____________MOD_QWERTY_R2_________________ KC_H , KC_J , GUI_T(KC_K), SFT_T(KC_L), KC_SCLN #define _____________MOD_QWERTY_R2_________________ KC_H , ALT_T(KC_J), GUI_T(KC_K), SFT_T(KC_L), CTL_T(KC_SCLN)
// ,-----+-----+-----+-----+-----, ,-----+-----+-----+-----+-----, // ,-----+-----+-----+-----+-----, ,-----+-----+-----+-----+-----,
// | Q | G | M | L | W | | Y | F | I | O | P | // | Q | G | M | L | W | | Y | F | I | O | P |