summaryrefslogtreecommitdiffstats
path: root/keyboards/iris
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-10-27 14:52:57 -0700
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-10-28 08:44:58 -0700
commitc60a312ba99f4ece511f36bc25c5f63410313b5b (patch)
tree4053a2c10b0c87fbb233da97dcc7927a2b971961 /keyboards/iris
parentb9811fd7e79b409138d733f5544a29d13906cccf (diff)
Further unify old iris keymap
Diffstat (limited to 'keyboards/iris')
-rw-r--r--keyboards/iris/keymaps/drashna/config.h2
-rw-r--r--keyboards/iris/keymaps/drashna_old/config.h41
2 files changed, 11 insertions, 32 deletions
diff --git a/keyboards/iris/keymaps/drashna/config.h b/keyboards/iris/keymaps/drashna/config.h
index 0274867153..dd247a42a7 100644
--- a/keyboards/iris/keymaps/drashna/config.h
+++ b/keyboards/iris/keymaps/drashna/config.h
@@ -68,3 +68,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ALT_LED1 8
#define GUI_LED1 9
+#define BOOTMAGIC_LITE_ROW 4
+#define BOOTMAGIC_LITE_COLUMN 3
diff --git a/keyboards/iris/keymaps/drashna_old/config.h b/keyboards/iris/keymaps/drashna_old/config.h
index e452f695a0..b985c4dfc1 100644
--- a/keyboards/iris/keymaps/drashna_old/config.h
+++ b/keyboards/iris/keymaps/drashna_old/config.h
@@ -18,52 +18,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-#undef USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
+#include "../drashna/config.h"
#ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM
#define RGBLED_NUM 16 // Number of LEDs
-
-#define RGBLIGHT_HUE_STEP 12
-#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_VAL_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
-
-#define RGBLIGHT_LIMIT_VAL 225
-#endif // RGBLIGHT_ENABLE
-
-#ifdef AUDIO_ENABLE
-#define C6_AUDIO
-#ifdef RGBLIGHT_ENABLE
-#define NO_MUSIC_MODE
-#endif //RGBLIGHT_ENABLE
-#endif //AUDIO_ENABLE
-
-#define QMK_ESC_OUTPUT F6 // usually COL
-#define QMK_ESC_INPUT D7 // usually ROW
-#define QMK_LED B0
-#define QMK_SPEAKER C6
+#endif
#undef PRODUCT
#ifdef KEYBOARD_iris_rev2
-#define PRODUCT Drashna Hacked Iris Rev.2
+#define PRODUCT Drashna Hacked Iris Rev.2 (16 LED)
#endif
+#undef SHFT_LED1
#define SHFT_LED1 5
+#undef SHFT_LED2
#define SHFT_LED2 10
+#undef CTRL_LED1
#define CTRL_LED1 6
+#undef CTRL_LED2
#define CTRL_LED2 9
+#undef ALT_LED1
#define ALT_LED1 7
+#undef GUI_LED1
#define GUI_LED1 8