masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2023-06-01 09:26:41 +00:00
parent 6156972781 c805c10672
commit 857e9b74d6
3 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
keyboards/z12/keymaps/zigotica/keymap.c
View File

@ -38,9 +38,10 @@ void raw_hid_receive(uint8_t* data, uint8_t length) {
enum custom_keycodes { enum custom_keycodes {
VIM_SIF = SAFE_RANGE, VIM_SIF = SAFE_RANGE,
VIM_SIP, VIM_FORMAT,
VIM_RIF, VIM_GODEF,
VIM_RIP, VIM_RENSYM,
VIM_CODEACT,
VIM_NEW VIM_NEW
}; };
@ -49,31 +50,45 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case VIM_SIF:// Search in File case VIM_SIF:// Search in File
if (record->event.pressed) { if (record->event.pressed) {
register_code(KC_ESC); register_code(KC_ESC);
tap_code(KC_SLASH); tap_code(KC_SPACE);
tap_code(KC_S);
tap_code(KC_C);
} else { // released } else { // released
unregister_code(KC_ESC); unregister_code(KC_ESC);
} }
break; break;
case VIM_SIP:// Search in Project case VIM_FORMAT:// Autoformat file
if (record->event.pressed) { if (record->event.pressed) {
register_code(KC_ESC); register_code(KC_ESC);
SEND_STRING(":Ag "); tap_code(KC_F9);
} else { // released } else { // released
unregister_code(KC_ESC); unregister_code(KC_ESC);
} }
break; break;
case VIM_RIF:// Replace in File case VIM_GODEF:// Go to Definition
if (record->event.pressed) { if (record->event.pressed) {
register_code(KC_ESC); register_code(KC_ESC);
SEND_STRING(":%s/a/b/g"); tap_code(KC_G);
tap_code(KC_D);
} else { // released } else { // released
unregister_code(KC_ESC); unregister_code(KC_ESC);
} }
break; break;
case VIM_RIP:// Replace in Project case VIM_CODEACT:// Code actions
if (record->event.pressed) { if (record->event.pressed) {
register_code(KC_ESC); register_code(KC_ESC);
SEND_STRING(":cdo %s/a/b/g"); tap_code(KC_SPACE);
tap_code(KC_C);
tap_code(KC_A);
} else { // released
unregister_code(KC_ESC);
}
break;
case VIM_RENSYM:// Rename symbol
if (record->event.pressed) {
register_code(KC_ESC);
tap_code(KC_SPACE);
tap_code(KC_R);
} else { // released } else { // released
unregister_code(KC_ESC); unregister_code(KC_ESC);
} }
@ -160,15 +175,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |BUFFER | BROW | VIM | SCROLL| * |BUFFER | BROW | VIM | SCROLL|
* |-------+------+------+-------| * |-------+------+------+-------|
* |-------+-------+-------| * |-------+-------+-------|
* |SRCH FL|REPL FL|NEW BUF| * |SRCH FL| FORMAT|NEW BUF|
* |-------+-------+-------| * |-------+-------+-------|
* |SRCH PR|REPL PR| o | * |REN SYM|GO DEF |CODEACT|
* |-------+-------+-------| * |-------+-------+-------|
*/ */
[_VIM] = LAYOUT( [_VIM] = LAYOUT(
_______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
VIM_SIF, VIM_RIF, VIM_NEW, VIM_SIF, VIM_FORMAT, VIM_NEW,
VIM_SIP, VIM_RIP, _______ VIM_RENSYM, VIM_GODEF, VIM_CODEACT
), ),
}; };

31
keyboards/z12/keymaps/zigotica/oled.c
View File

@ -17,23 +17,36 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "zigotica.h" #include "zigotica.h"
static void render_status(void) { static void render_status(void) {
oled_write_P(PSTR("z12 v1.0\n"), false);
oled_write_P(PSTR("Layer: "), false);
switch (get_highest_layer(layer_state)) { switch (get_highest_layer(layer_state)) {
case _VIM: case _BASE:
oled_write_P(PSTR("VIM \n\nBUFFER SCROLL"), false); oled_write_P(PSTR("Volume Scroll"), false);
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR(" z12 v1.1"), false);
break; break;
case _FIGMA: case _FIGMA:
oled_write_P(PSTR("FIGMA \n\nTABS ZOOM"), false); oled_write_P(PSTR("Tabs Zoom"), false);
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR("ZoomFit Grids Full"), false);
oled_write_P(PSTR("Zoom100 Next Color"), false);
break; break;
case _BROWSER: case _BROWSER:
oled_write_P(PSTR("BROWSER \n\nTABS SCROLL"), false); oled_write_P(PSTR("Tabs Scroll"), false);
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR("Search Fav DevTool"), false);
oled_write_P(PSTR("Zoom100 Mute Read"), false);
break; break;
case _BASE: case _VIM:
oled_write_P(PSTR("BASE \n\nVOLUME SCROLL"), false); oled_write_P(PSTR("Buffer Scroll"), false);
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR("Find-F Format New"), false);
oled_write_P(PSTR("Rename Go-Def Action"), false);
break; break;
default: default:
oled_write_P(PSTR("Undef\n"), false); oled_write_P(PSTR(" "), false);
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR(" "), false);
oled_write_P(PSTR(" "), false);
} }
} }

3
layouts/community/ergodox/zweihander-macos/rules.mk
View File

@ -1,3 +1,6 @@
# Don’t do a tricolor flashing-light wave when the computer is shut down in Windows, # Don’t do a tricolor flashing-light wave when the computer is shut down in Windows,
# or when the machine is sleeping in macOS # or when the machine is sleeping in macOS
SLEEP_LED_ENABLE = no SLEEP_LED_ENABLE = no
# Don’t pretend to be a mouse (if a a mouse is plugged into a FreeBSD machine, an annoying cursor will pop up)
MOUSEKEY_ENABLE = no