From 643b1481445fe759d90d27cdd6aedc2f8b31c6d8 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 22 Feb 2020 14:47:36 -0600 Subject: [PATCH] Fix dir to clean --- iris/Makefile | 22 +++++++ iris/src/config.h | 9 +++ iris/src/keymap.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++ iris/src/rules.mk | 2 + splyte/Makefile | 2 +- 5 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 iris/Makefile create mode 100644 iris/src/config.h create mode 100644 iris/src/keymap.c create mode 100644 iris/src/rules.mk diff --git a/iris/Makefile b/iris/Makefile new file mode 100644 index 0000000..a4750d6 --- /dev/null +++ b/iris/Makefile @@ -0,0 +1,22 @@ +.PHONY: default +default: build + +.PHONY: build +build: submodules + @mkdir -p ../planck/lib/qmk_firmware/keyboards/keebio/iris/keymaps/lytedev/ + @cp -r src/* ../planck/lib/qmk_firmware/keyboards/keebio/iris/keymaps/lytedev/ + @pushd ../planck/lib/qmk_firmware/ && make keebio/iris/rev4:lytedev + +.PHONY: submodules +submodules: + git submodule init + git submodule update + @pushd ../planck/lib/qmk_firmware/ && make git-submodule + +.PHONY: flash +flash: build + @pushd ../planck/lib/qmk_firmware/ && make keebio/iris/rev4:lytedev:flash + +.PHONY: clean +clean: + @pushd ../planck/lib/qmk_firmware/ && make clean diff --git a/iris/src/config.h b/iris/src/config.h new file mode 100644 index 0000000..96ed138 --- /dev/null +++ b/iris/src/config.h @@ -0,0 +1,9 @@ +#pragma once + +#define EE_HANDS + +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 12 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 diff --git a/iris/src/keymap.c b/iris/src/keymap.c new file mode 100644 index 0000000..008a74b --- /dev/null +++ b/iris/src/keymap.c @@ -0,0 +1,149 @@ +#include QMK_KEYBOARD_H + +extern keymap_config_t keymap_config; + +#define _QWERTY 0 +#define _LEFT 1 +#define _RIGHT 2 +#define _ADJUST 3 +#define _CONFIG 4 + +#define ESC_CTL LCTL_T(KC_ESC) + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LEFT, + RIGHT, + ADJUST, + CONFIG, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_QWERTY] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + ESC_CTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(_CONFIG), MO(_CONFIG),KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + KC_LGUI, KC_SPC, MO(_LEFT), MO(_RIGHT),KC_SPC, KC_RALT + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ), + + [_LEFT] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LT, KC_GT, KC_QUES, _______, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + _______, _______, _______, MO(_ADJUST),MO(_ADJUST),_______ + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ), + + [_RIGHT] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + _______, KC_LALT,MO(_ADJUST), _______, _______, _______ + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ), + + [_ADJUST] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + _______, _______, _______, _______, _______, _______ + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ), + + [_CONFIG] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ + RESET, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, _______, _______, RGB_MOD, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ + _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, + //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ + _______, _______, _______, _______, _______, _______ + // └────────┴────────┴────────┘ └────────┴────────┴────────┘ + ) +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case LEFT: + if (record->event.pressed) { + layer_on(_LEFT); + update_tri_layer(_LEFT, _RIGHT, _ADJUST); + } else { + layer_off(_LEFT); + update_tri_layer(_LEFT, _RIGHT, _ADJUST); + } + return false; + break; + case RIGHT: + if (record->event.pressed) { + layer_on(_RIGHT); + update_tri_layer(_LEFT, _RIGHT, _ADJUST); + } else { + layer_off(_RIGHT); + update_tri_layer(_LEFT, _RIGHT, _ADJUST); + } + return false; + break; + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } + else if (index == 1) { + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + } +} diff --git a/iris/src/rules.mk b/iris/src/rules.mk new file mode 100644 index 0000000..d746341 --- /dev/null +++ b/iris/src/rules.mk @@ -0,0 +1,2 @@ +RGBLIGHT_ENABLE = yes +BACKLIGHT_ENABLE = yes diff --git a/splyte/Makefile b/splyte/Makefile index 37203e0..cff1ee9 100644 --- a/splyte/Makefile +++ b/splyte/Makefile @@ -19,4 +19,4 @@ flash: build .PHONY: clean clean: - @pushd ../planck/qmk_firmware/ && make clean + @pushd ../planck/lib/qmk_firmware/ && make clean