summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlos Vinieratos <pvinis@gmail.com>2019-05-16 18:38:28 +0200
committerDrashna Jaelre <drashna@live.com>2019-05-16 09:38:28 -0700
commit1a28906a3da1f14034b81871b90bcce0ed56c286 (patch)
tree61a7fced0c7c115d27343fd4f7a6534202120aee
parenta8af694d265d5d136e81669ec7b30052a8f4de08 (diff)
[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.h10
-rw-r--r--keyboards/keebio/iris/keymaps/pvinis/keymap.c14
-rw-r--r--users/pvinis/config.h1
-rw-r--r--users/pvinis/pvinis.c10
-rw-r--r--users/pvinis/pvinis.h4
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 7a7beb0b87..b2fb43be91 100644
--- a/keyboards/keebio/iris/keymaps/pvinis/config.h
+++ b/keyboards/keebio/iris/keymaps/pvinis/config.h
@@ -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
diff --git a/keyboards/keebio/iris/keymaps/pvinis/keymap.c b/keyboards/keebio/iris/keymaps/pvinis/keymap.c
index fb9e4adcf8..2f6d5a6b47 100644
--- a/keyboards/keebio/iris/keymaps/pvinis/keymap.c
+++ b/keyboards/keebio/iris/keymaps/pvinis/keymap.c
@@ -23,20 +23,18 @@
#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] = {
// ,-----------------------------. ,-----------------------------.
diff --git a/users/pvinis/config.h b/users/pvinis/config.h
index 7f17f2d023..8e2efb40a4 100644
--- a/users/pvinis/config.h
+++ b/users/pvinis/config.h
@@ -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
diff --git a/users/pvinis/pvinis.c b/users/pvinis/pvinis.c
index 7544035794..e97edcb98c 100644
--- a/users/pvinis/pvinis.c
+++ b/users/pvinis/pvinis.c
@@ -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;
+}
diff --git a/users/pvinis/pvinis.h b/users/pvinis/pvinis.h
index 0c5e2841a1..0c75c6a661 100644
--- a/users/pvinis/pvinis.h
+++ b/users/pvinis/pvinis.h
@@ -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 |