summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-12 01:04:30 +0000
committerQMK Bot <hello@qmk.fm>2021-10-12 01:04:30 +0000
commit762f9e320f2858603db2ce30f3f561250508a7d9 (patch)
treec77674af0ed9f976bb78762be9451f444b0a1f99 /users
parent5043980c36c401be0d13402d31b7e3ed86f316ff (diff)
parentcecf5d52f9776a07cc7244ab6929899374bc189a (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users')
-rw-r--r--users/jonavin/jonavin.c32
-rw-r--r--users/jonavin/jonavin.h14
-rw-r--r--users/jonavin/readme.md106
-rw-r--r--users/jonavin/rules.mk3
4 files changed, 112 insertions, 43 deletions
diff --git a/users/jonavin/jonavin.c b/users/jonavin/jonavin.c
index f53aa8664e..1a0760ea8f 100644
--- a/users/jonavin/jonavin.c
+++ b/users/jonavin/jonavin.c
@@ -256,7 +256,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
break;
}
}
- return true;
+ return false;
}
#endif // ENCODER_ENABLE
@@ -266,7 +266,7 @@ __attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!process_record_keymap(keycode, record)) { return false; }
- switch (keycode) {
+ switch (keycode) {
case KC_00:
if (record->event.pressed) {
// when keycode KC_00 is pressed
@@ -298,6 +298,34 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} else unregister_code16(keycode);
break;
#endif // RGB_MATRIX_ENABLE
+
+#ifdef EMOTICON_ENABLE
+ case EMO_SHRUG:
+ if (record->event.pressed) SEND_STRING("`\\_(\"/)_/`");
+ else unregister_code16(keycode);
+ break;
+ case EMO_CONFUSE:
+ if (record->event.pressed) SEND_STRING("(*_*)");
+ else unregister_code16(keycode);
+ break;
+ case EMO_TEARS:
+ if (record->event.pressed) SEND_STRING("(T_T)");
+ else unregister_code16(keycode);
+ break;
+ case EMO_NERVOUS:
+ if (record->event.pressed) SEND_STRING("(~_~;)");
+ else unregister_code16(keycode);
+ break;
+ case EMO_JOY:
+ if (record->event.pressed) SEND_STRING("(^o^)");
+ else unregister_code16(keycode);
+ break;
+ case EMO_SAD:
+ if (record->event.pressed) SEND_STRING(":'-(");
+ else unregister_code16(keycode);
+ break;
+ #endif // EMOTICON_ENABLE
+
default:
if (record->event.pressed) {
#ifdef RGB_MATRIX_ENABLE
diff --git a/users/jonavin/jonavin.h b/users/jonavin/jonavin.h
index efe0301af3..feaf6b6a15 100644
--- a/users/jonavin/jonavin.h
+++ b/users/jonavin/jonavin.h
@@ -38,13 +38,23 @@ enum custom_user_keycodes {
RGB_TOD, // Timeout idle time down
RGB_NITE, // Turns off all rgb but allow rgb indicators to work
+ EMO_SHRUG, // `\_("/)_/`
+ EMO_CONFUSE, // (*_*)
+ EMO_SAD, // :'-(
+ EMO_NERVOUS, // (~_~;)
+ EMO_JOY, // (^o^)
+ EMO_TEARS, // (T_T)
+
NEW_SAFE_RANGE // new safe range for keymap level custom keycodes
};
-#define KC_CAD LALT(LCTL(KC_DEL))
+#define KC_CAD LALT(LCTL(KC_DEL))
#define KC_AF4 LALT(KC_F4)
#define KC_TASK LCTL(LSFT(KC_ESC))
-
+#define CT_PGUP RCTL(KC_PGUP)
+#define CT_PGDN RCTL(KC_PGDN)
+#define CT_HOME RCTL(KC_HOME)
+#define CT_END RCTL(KC_END)
#ifdef TD_LSFT_CAPSLOCK_ENABLE
// Tap Dance Definitions
diff --git a/users/jonavin/readme.md b/users/jonavin/readme.md
index c029796b4e..9fccb8c73c 100644
--- a/users/jonavin/readme.md
+++ b/users/jonavin/readme.md
@@ -14,62 +14,90 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
LAYERS:
- 0 = _BASE
- 1 = _FN1
- 2 = _LOWER
- 3 = _RAISE
+- 0 = _BASE
+- 1 = _FN1
+- 2 = _LOWER
+- 3 = _RAISE
KEYCODES:
- KC_CAD Ctrl-Alt-Del
- KC_AF4 Alt-F4
- KC_TASK Windows Task Manager (Ctrl-Shift-Esc)
- LSFT_CAPSLOCK When LSFT_CAPSLOCK_ENABLE is defined, hold for Shift double tap for CAPSLOCK; otherwise, just Shift
- KC_00 double zero "00"
- KC_WINLCK toggles LGui/Win key lock
- RGB_TOI Increase Timeout idle time threshold
- RGB_TOD Decrease Timeout idle time threshold
+- KC_CAD Ctrl-Alt-Del
+- KC_AF4 Alt-F4
+- KC_TASK Windows Task Manager (Ctrl-Shift-Esc)
+- LSFT_CAPSLOCK When LSFT_CAPSLOCK_ENABLE is defined, hold for Shift double tap for CAPSLOCK; otherwise, just Shift
+- KC_00 double zero "00"
+- KC_WINLCK toggles LGui/Win key lock
+- RGB_TOI Increase Timeout idle time threshold
+- RGB_TOD Decrease Timeout idle time threshold
+- CT_PGUP Ctrl-PgUp
+- CT_PGDN Ctrl-PgDn
+- CT_HOME Ctrl-HOme
+- CT_END Ctrl-End
+-
+ When EMOTICON_ENABLE = yes
+- EMO_SHRUG `\_("/)_/`
+- EMO_CONFUSE (*_*)
+- EMD_TEARS (T_T)
+- EMO_NERVOUS (~_~;)
+- EMO_JOY (^o^)
+
+
+AVAILABLE ENCODER ACTIONS:
+- void encoder_action_volume(bool clockwise);
+- void encoder_action_mediatrack(bool clockwise);
+- void encoder_action_navword(bool clockwise);
+- void encoder_action_navpage(bool clockwise);
+-
+- uint8_t get_selected_layer(void);
+- void encoder_action_layerchange(bool clockwise);
+-
+- void encoder_action_rgb_speed(bool clockwise);
+- void encoder_action_rgb_hue(bool clockwise);
+- void encoder_action_rgb_saturation(bool clockwise);
+- void encoder_action_rgb_brightness(bool clockwise);
+- void encoder_action_rgb_mode(bool clockwise);
+
ENABLE FEATURES your keymap rules.mk
+---------------------------------------
STARTUP_NUMLOCK_ON = yes
- turns on NUMLOCK by default
+- turns on NUMLOCK by default
ENCODER_DEFAULTACTIONS_ENABLE = yes
- Enabled default encoder funtions
- When enabled, use this in the keymap for an additional encoder processing
- bool encoder_update_keymap(uint8_t index, bool clockwise)
-
- OPTION: set ENCODER_DEFAULTACTIONS_INDEX to the encoder number if the encoder is not index 0
+- Enabled default encoder funtions
+- When enabled, use this in the keymap for an additional encoder processing
+- bool encoder_update_keymap(uint8_t index, bool clockwise)
+OPTION: set ENCODER_DEFAULTACTIONS_INDEX to the encoder number if the encoder is not index 0
+
TD_LSFT_CAPSLOCK_ENABLE = yes
- This will enable double tap on Left Shift to toggle CAPSLOCK
- KC_LSFTCAPS to bind to left Shift to enable feature
- KC_LSFTCAPSWIN does the same thing but will not turn on CAPS when Win Lkey is disabled
+- This will enable double tap on Left Shift to toggle CAPSLOCK
+- KC_LSFTCAPS to bind to left Shift to enable feature
+- KC_LSFTCAPSWIN does the same thing but will not turn on CAPS when Win Lkey is disabled
IDLE_TIMEOUT_ENABLE = yes
- Enables Timer functionality; for RGB idle timeouts that can be changed dynamically
- When enabled, use this in the keymap for an additional matrix processing
- void matrix_scan_keymap(void)
-
- Functions:
- u16int_t get_timeout_threshold(void) // returns the current timeout threshold
- void timeout_update_threshold(bool increase) // change threshold: true = increase, false = decrease
- void timeout_reset_timer(void) // resets timer (put in process_record_user if you override it)
- void timeout_tick_timer(void) // registers time ticks (put in maxtrix_scan_user if you override it)
+- Enables Timer functionality; for RGB idle timeouts that can be changed dynamically
+- When enabled, use this in the keymap for an additional matrix processing: void matrix_scan_keymap(void)
+
+- Functions:
+- u16int_t get_timeout_threshold(void) // returns the current timeout threshold
+- void timeout_update_threshold(bool increase) // change threshold: true = increase, false = decrease
+- void timeout_reset_timer(void) // resets timer (put in process_record_user if you override it)
+- void timeout_tick_timer(void) // registers time ticks (put in maxtrix_scan_user if you override it)
Other Functions:
- - activate_numlock(bool turn_on) // true = turn on NUM LOCK, false = off
+- activate_numlock(bool turn_on) // true = turn on NUM LOCK, false = off
KEYMAP LEVEL ADDITIONAL PROCESSING FUNCTIONS
- bool process_record_keymap(uint16_t keycode, keyrecord_t *record)
- void keyboard_post_init_keymap(void)
+- bool process_record_keymap(uint16_t keycode, keyrecord_t *record)
+- void keyboard_post_init_keymap(void)
LIST OF COMPATIBLE KEYMAPS
- - gmmk/pro/ansi
- - keebio/quefrency/rev3
- - mechwild/mercutio
- - mechwild/murphpad
- - mechwild/OBE (*)
- - nopunin10did/kastenwagen (*)
+- gmmk/pro/ansi
+- keebio/quefrency/rev3
+- mechwild/mercutio
+- mechwild/murphpad
+- mechwild/OBE
+- nopunin10did/kastenwagen (*)
(*) coming soon
diff --git a/users/jonavin/rules.mk b/users/jonavin/rules.mk
index e2918d9e26..eb279f6290 100644
--- a/users/jonavin/rules.mk
+++ b/users/jonavin/rules.mk
@@ -14,3 +14,6 @@ endif
ifeq ($(strip $(COLEMAK_LAYER_ENABLE)), yes)
OPT_DEFS += -DCOLEMAK_LAYER_ENABLE
endif
+ifeq ($(strip $(EMOTICON_ENABLE)), yes)
+ OPT_DEFS += -DEMOTICON_ENABLE
+endif