diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-26 01:36:28 +0100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 01:36:28 +0100 |
| commit | d977daa8dc9136746425f9e1414e1f93cb161877 (patch) | |
| tree | 209ab8082580e5fdf37f1a8b7c1169250b7548c0 /keyboards/v60_type_r | |
| parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
| parent | 0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff) | |
| download | qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.gz qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.xz | |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards/v60_type_r')
| -rw-r--r-- | keyboards/v60_type_r/keymaps/default/keymap.c | 7 | ||||
| -rw-r--r-- | keyboards/v60_type_r/keymaps/vimouse/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/v60_type_r/readme.md | 2 | ||||
| -rw-r--r-- | keyboards/v60_type_r/rules.mk | 15 |
4 files changed, 9 insertions, 18 deletions
diff --git a/keyboards/v60_type_r/keymaps/default/keymap.c b/keyboards/v60_type_r/keymaps/default/keymap.c index 4f9b7f9b2..77546c0a6 100644 --- a/keyboards/v60_type_r/keymaps/default/keymap.c +++ b/keyboards/v60_type_r/keymaps/default/keymap.c @@ -63,13 +63,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; - - - -const uint16_t PROGMEM fn_actions[] = { - -}; - const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function diff --git a/keyboards/v60_type_r/keymaps/vimouse/keymap.c b/keyboards/v60_type_r/keymaps/vimouse/keymap.c index fba711148..258668312 100644 --- a/keyboards/v60_type_r/keymaps/vimouse/keymap.c +++ b/keyboards/v60_type_r/keymaps/vimouse/keymap.c @@ -97,9 +97,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _____, _____, _____, _____, _____, _____, _____, _____), }; -const uint16_t PROGMEM fn_actions[] = { -}; - const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function diff --git a/keyboards/v60_type_r/readme.md b/keyboards/v60_type_r/readme.md index c7039c2e7..06ff749b8 100644 --- a/keyboards/v60_type_r/readme.md +++ b/keyboards/v60_type_r/readme.md @@ -40,7 +40,7 @@ or make v60_type_r:vimouse -See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. +See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. diff --git a/keyboards/v60_type_r/rules.mk b/keyboards/v60_type_r/rules.mk index 30038d562..7a1340a1a 100644 --- a/keyboards/v60_type_r/rules.mk +++ b/keyboards/v60_type_r/rules.mk @@ -39,13 +39,14 @@ F_USB = $(F_CPU) OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=512 +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# atmega32a bootloadHID +BOOTLOADER = atmel-dfu # Build Options |