Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arkag Userspace and MechMini2 Layout #3958

Merged
merged 27 commits into from
Sep 22, 2018
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
00281df
deleting arkag branch, forcibly moving changes over to master
Sep 10, 2018
27f8400
fade_color function added, not tested
Sep 10, 2018
7debc0c
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Sep 11, 2018
dad868d
added half functions some stuff
Sep 11, 2018
915d66c
surround_type function implemented and working.
Sep 11, 2018
d45ae60
added flashing function and removed fading, flashing supports infinit…
Sep 11, 2018
2f2a981
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Sep 11, 2018
ecfd9b6
added a fade state machine and functionality
Sep 11, 2018
4cdca49
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Sep 11, 2018
84e5428
build optimizations, changed fade to bounce between bounds rather tha…
Sep 12, 2018
11b9e19
changes to sleep breath function, changed how I will switch to HALMAK
Sep 12, 2018
957a7f6
support for halmak added
Sep 13, 2018
a391f63
support for activity detection added, condensed fading and flashing s…
Sep 13, 2018
a858557
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Sep 13, 2018
b93b83d
changed sleep and inactive behaviors, now the color shifting reverses…
Sep 14, 2018
f67d3bf
reformatted some if statements in state detection
Sep 17, 2018
6a2e700
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Sep 17, 2018
109d788
changes to force fade to pause on boot, or plug in.
Sep 17, 2018
2a3b7ae
Attempting to move over to userspace, pushing to repository for help
Sep 20, 2018
3f0dfc0
userspace stuff....
Sep 20, 2018
cbe128a
userspace stuff....
Sep 20, 2018
4401c18
layout changes, working userspace,
Sep 20, 2018
1166a8d
Layout change
Sep 21, 2018
e310c5f
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Sep 21, 2018
ff317c6
Removed excessive tabs in files
Sep 21, 2018
4944177
Moved mods on homerow around...
Sep 21, 2018
0612cd5
changes recommended by @drashna
Sep 22, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions keyboards/mechmini/v2/keymaps/arkag/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#pragma once

#define TAPPING_TERM 200
arkag marked this conversation as resolved.
Show resolved Hide resolved

// save me space!
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
#define DISABLE_LEADER
#define NO_MUSIC_MODE
40 changes: 40 additions & 0 deletions keyboards/mechmini/v2/keymaps/arkag/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#include QMK_KEYBOARD_H
#include "arkag.h"

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_2u_space_ortho(
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_TAB, TAP_A, TAP_S, TAP_D, TAP_F, KC_G, KC_H, TAP_J, TAP_K, TAP_L, TAP_SCN, QUOTE,
XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT,
M_PMOD, LRALT, M_SMOD, LOWER, RAISE, KC_SPC, KC_SLSH, LAZY, KC_LEFT, KC_DOWN, KC_RGHT),

[_RAISE] = LAYOUT_2u_space_ortho(
GRAVE, KC_1, KC_2, THREE, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
_______, OBRACK, CBRACK, TAP_EQ, HYPHEN, _______, _______, KC_4, TAP_5, KC_6, _______, KC_NLCK,
_______, _______, _______, CEDILLA, _______, KC_COMM, KC_PDOT, KC_1, KC_2, KC_3, KC_PPLS, KC_PENT,
_______, _______, _______, KEEB, _______, _______, _______, M_OS, KC_PSLS, KC_PMNS, KC_PAST),

[_LOWER] = LAYOUT_2u_space_ortho(
_______, _______, _______, _______, _______, _______, _______, M_ULIN, M_ITAL, _______, M_P_B, M_C_A_D,
_______, _______, STRIKE, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_DEL, _______, _______, _______, M_BOLD, _______, _______, _______, _______, KC_PGUP, _______,
_______, _______, _______, _______, _______, MEDIA, KC_BSLS, M_CALC, KC_HOME, KC_PGDN, KC_END),

[_KEEB] = LAYOUT_2u_space_ortho(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
_______, BL_TOGG, BL_STEP, BL_INC, BL_DEC, BL_BRTG, _______, _______, _______, _______, _______, _______,
RGB_M_P, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______,
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),

[_MEDIA] = LAYOUT_2u_space_ortho(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT),

[_LAZY] = LAYOUT_2u_space_ortho(
_______, _______, _______, _______, _______, M_TM, _______, M_SNIPT, M_SHRUG, _______, _______, _______,
_______, _______, _______, _______, _______, M_GGT, _______, M_UF, M_LOD, M_REPO, _______, _______,
_______, _______, _______, _______, _______, _______, _______, M_TF, M_LENNY, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
16 changes: 16 additions & 0 deletions keyboards/mechmini/v2/keymaps/arkag/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
BOOTMAGIC_ENABLE = no
MOUSEKEY_ENABLE = no
STENO_ENABLE = no
EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = no
COMMAND_ENABLE = no
SLEEP_LED_ENABLE = no
NKRO_ENABLE = yes
BACKLIGHT_ENABLE = yes
AUDIO_ENABLE = no
RGBLIGHT_ENABLE = yes
TAP_DANCE_ENABLE = yes
UNICODE_ENABLE = yes

# save me space!
EXTRAFLAGS += -flto
Loading