Minor cleanup

master
Mark 2023-12-31 10:29:30 -08:00
parent 0856908bec
commit e0d54f8e79
No known key found for this signature in database
GPG Key ID: B4DF96450FAAD9F2
4 changed files with 36 additions and 42 deletions

View File

@ -14,7 +14,12 @@
"xstddef": "c", "xstddef": "c",
"type_traits": "c", "type_traits": "c",
"utility": "c", "utility": "c",
"ranges": "c" "ranges": "c",
"compare": "c",
"cstdint": "c",
"chrono": "c",
"typeindex": "c",
"typeinfo": "c"
}, },
"C_Cpp.errorSquiggles": "disabled", "C_Cpp.errorSquiggles": "disabled",
} }

View File

@ -1,4 +1,13 @@
default: voyager:
@mkdir -p "$$(pwd)/output"
docker run -it --rm \
--user $$(id -u):$$(id -g) \
-v "$$(pwd)/output:/build_output" \
-v "$$(pwd)/keyboards:/qmk_firmware/keyboards:ro" \
-e QMK_TARGET="betalupi_voyager:default" \
git.betalupi.com/mark/qmk
ergodox:
@mkdir -p "$$(pwd)/output" @mkdir -p "$$(pwd)/output"
docker run -it --rm \ docker run -it --rm \
--user $$(id -u):$$(id -g) \ --user $$(id -u):$$(id -g) \
@ -7,11 +16,11 @@ default:
-e QMK_TARGET="betalupi_ergodox:default" \ -e QMK_TARGET="betalupi_ergodox:default" \
git.betalupi.com/mark/qmk git.betalupi.com/mark/qmk
upload: ergodox_upload:
wally-cli output/betalupi_ergodox_default.hex wally-cli output/betalupi_ergodox_default.hex
docker: docker:
docker build docker -t git.betalupi.com/mark/qmk docker build docker -t git.betalupi.com/mark/qmk
.PHONY: docker upload default .PHONY: voyager ergodox ergodox_upload docker

View File

@ -1,9 +1,3 @@
// ORDER MATTERS!
// Don't forget how QMK layers work...
//
// Learned that the hard way.
// First layer will be "default" layer in QMK. // First layer will be "default" layer in QMK.
// Second will have index 1, etc. See layers.h // Second will have index 1, etc. See layers.h

View File

@ -1,31 +1,18 @@
# MCU name
MCU = atmega32u4 MCU = atmega32u4
BOOTLOADER = halfkay
# Enable raw HID for bi-directional communication # Enable raw HID for bi-directional communication
RAW_ENABLE = yes RAW_ENABLE = yes
# Bootloader selection BOOTMAGIC_ENABLE = no
# Teensy halfkay MOUSEKEY_ENABLE = no
# Pro Micro caterina EXTRAKEY_ENABLE = yes
# Atmel DFU atmel-dfu CONSOLE_ENABLE = no
# LUFA DFU lufa-dfu COMMAND_ENABLE = no
# QMK DFU qmk-dfu CUSTOM_MATRIX = lite
# ATmega32A bootloadHID NKRO_ENABLE = yes
# ATmega328P USBasp UNICODE_ENABLE = no
BOOTLOADER = halfkay SWAP_HANDS_ENABLE = no
# Build Options
# comment out to disable the options.
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
CUSTOM_MATRIX = lite # Custom matrix file for the ErgoDox EZ
NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
UNICODE_ENABLE = no # Unicode
SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
SLEEP_LED_ENABLE = no SLEEP_LED_ENABLE = no
API_SYSEX_ENABLE = no API_SYSEX_ENABLE = no
MOUSE_SHARED_EP = no MOUSE_SHARED_EP = no
@ -59,8 +46,7 @@ LTO_ENABLE = yes
# Enable keyboard-specific effects # Enable keyboard-specific effects
RGB_MATRIX_CUSTOM_KB = yes RGB_MATRIX_CUSTOM_KB = yes
# From glow dir
# FROM glow dir
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = is31fl3731 RGB_MATRIX_DRIVER = is31fl3731
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes