]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
[Keymap] Pvinis/update for iris (#5889)
authorPavlos Vinieratos <pvinis@gmail.com>
Thu, 16 May 2019 16:38:28 +0000 (18:38 +0200)
committerDrashna Jaelre <drashna@live.com>
Thu, 16 May 2019 16:38:28 +0000 (09:38 -0700)
* add default functions

* some indenting

* add ctl and alt

* maybe?

keyboards/keebio/iris/keymaps/pvinis/config.h
keyboards/keebio/iris/keymaps/pvinis/keymap.c
users/pvinis/config.h
users/pvinis/pvinis.c
users/pvinis/pvinis.h

index 7a7beb0b87eb5a9b78eb1017dda722e1e8f7e04d..b2fb43be91760ed62c1f9c8aaa5f4c1d2c375871 100644 (file)
@@ -2,9 +2,9 @@
 
 
 #ifdef PRODUCT
-#undef PRODUCT
-#define PRODUCT Iris Keyboard - pvinis
-#endif // PRODUCT
+  #undef PRODUCT
+  #define PRODUCT Iris Keyboard - pvinis
+#endif
 
 
 // Use I2C or Serial, not both
@@ -20,5 +20,5 @@
 
 // choose pin to use for audio. c6 is the one iris uses.
 #ifdef AUDIO_ENABLE
-#define C6_AUDIO
-#endif // AUDIO_ENABLE
+  #define C6_AUDIO
+#endif
index fb9e4adcf87dc70b8bc8812ec5ecb85d8dfd4581..2f6d5a6b47caf797221c937942775b46a80f1894 100644 (file)
 #endif
 
 #ifdef AUDIO_ENABLE
-  //#define STARTUP_SONG SONG(SONIC_RING)
+  // #define STARTUP_SONG SONG(SONIC_RING)
 #endif
 
 #ifdef AUDIO_ENABLE
-float tone_sonic[][2] = SONG(IN_LIKE_FLINT);
-float tone_1[][2] = SONG(QWERTY_SOUND);
-float tone_2[][2] = SONG(OLD_SPICE);
-float tone_3[][2] = SONG(OVERWATCH_THEME);
-float tone_4[][2] = SONG(QWERTY_SOUND);
+  float tone_sonic[][2] = SONG(IN_LIKE_FLINT);
+  float tone_1[][2] = SONG(QWERTY_SOUND);
+  float tone_2[][2] = SONG(OLD_SPICE);
+  float tone_3[][2] = SONG(OVERWATCH_THEME);
+  float tone_4[][2] = SONG(QWERTY_SOUND);
 #endif
 
 
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // ,-----------------------------.              ,-----------------------------.
index 7f17f2d0237e02224d2e70fc2e1835d168490d50..8e2efb40a4b184f2ed67bcfae61ced78930ccdf1 100644 (file)
@@ -2,6 +2,7 @@
 
 #ifdef AUDIO_ENABLE
 // #define STARTUP_SONG SONG(SONIC_RING)
+// #define DAC_SAMPLE_MAX 65535U // maybe this works for volume?
 #endif
 
 // allow rolling when keys have hold functionality
index 7544035794dc2644d452d3bf01dc35eccf84a272..e97edcb98cc004bae7ec585dcefe43d74bfeae4a 100644 (file)
@@ -77,3 +77,13 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 void keyboard_post_init_user(void) {
     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;
+}
index 0c5e2841a1d0f8370aa2ca52053d7b64cb2328ec..0c75c6a6615a76b994e5825c5c8dff681ab02b60 100644 (file)
@@ -78,8 +78,8 @@ enum {
 #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 _____________MOD_QWERTY_L2_________________  KC_A   , SFT_T(KC_S), GUI_T(KC_D), 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_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       , 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  |