gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-01-19 00:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2023-02-26 04:25:02 +00:00
commit 3784f8ad42
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builddefs/common_rules.mk
View File

@ -218,8 +218,8 @@ gccversion :
@$(SILENT) || printf "$(MSG_FLASH) $@" | $(AWK_CMD) @$(SILENT) || printf "$(MSG_FLASH) $@" | $(AWK_CMD)
@$(BUILD_CMD) @$(BUILD_CMD)
%.uf2: %.hex %.uf2: %.elf
$(eval CMD=$(UF2CONV) $(BUILD_DIR)/$(TARGET).hex --output $(BUILD_DIR)/$(TARGET).uf2 --convert --family $(UF2_FAMILY) >/dev/null 2>&1) $(eval CMD=$(HEX) $< $(BUILD_DIR)/$(TARGET).tmp && $(UF2CONV) $(BUILD_DIR)/$(TARGET).tmp --output $@ --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
#@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n" #@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
@$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD) @$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD)
@$(BUILD_CMD) @$(BUILD_CMD)

4
keyboards/keebio/kbo5000/keymaps/default/keymap.c
View File

@ -1,8 +1,8 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
enum encoder_names { enum encoder_names {
LEFT_HALF_ENC = 0, LEFT_HALF_ENC,
RIGHT_HALF_ENC1 = 2, RIGHT_HALF_ENC1,
RIGHT_HALF_ENC2, RIGHT_HALF_ENC2,
}; };

4
keyboards/keebio/kbo5000/keymaps/iso/keymap.c
View File

@ -1,8 +1,8 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
enum encoder_names { enum encoder_names {
LEFT_HALF_ENC = 0, LEFT_HALF_ENC,
RIGHT_HALF_ENC1 = 2, RIGHT_HALF_ENC1,
RIGHT_HALF_ENC2, RIGHT_HALF_ENC2,
}; };

4
keyboards/keebio/kbo5000/keymaps/via/keymap.c
View File

@ -1,8 +1,8 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
enum encoder_names { enum encoder_names {
LEFT_HALF_ENC = 0, LEFT_HALF_ENC,
RIGHT_HALF_ENC1 = 2, RIGHT_HALF_ENC1,
RIGHT_HALF_ENC2, RIGHT_HALF_ENC2,
}; };

3
keyboards/keebio/kbo5000/rev1/info.json
View File

@ -10,8 +10,7 @@
}, },
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "F5", "pin_b": "F6"}, {"pin_a": "F5", "pin_b": "F6"}
{"pin_a": "NO_PIN", "pin_b": "NO_PIN"}
] ]
}, },
"backlight": { "backlight": {