Updates bootloader settings, adds file size check (#2029)
* pull fuse settings for bootloader jump * fix 32a chips * make automatic bootloader selection optional * quantify bootloaders * fixs #164, speeds up dfu reset * fix for chips w/o usb * missing an n * fix bootloader sizes, use words for addresses * fix bmini, pearl, and [[ issue, make things quiet * ignore avr errors on arm for now * update settings for the light * document bootloader stuff * add bootloader titlemaster
parent
9113f3387a
commit
9fdc276260
|
@ -0,0 +1,62 @@
|
||||||
|
# Copyright 2017 Jack Humbert
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# If it's possible that multiple bootloaders can be used for one project,
|
||||||
|
# you can leave this unset, and the correct size will be selected
|
||||||
|
# automatically.
|
||||||
|
#
|
||||||
|
# Sets the bootloader defined in the keyboard's/keymap's rules.mk
|
||||||
|
# Current options:
|
||||||
|
# atmel-dfu
|
||||||
|
# lufa-dfu
|
||||||
|
# qmk-dfu
|
||||||
|
# halfkay
|
||||||
|
# caterina
|
||||||
|
# bootloadHID
|
||||||
|
#
|
||||||
|
# BOOTLOADER_SIZE can still be defined manually, but it's recommended
|
||||||
|
# you add any possible configuration to this list
|
||||||
|
|
||||||
|
ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
|
||||||
|
OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
|
||||||
|
OPT_DEFS += -DBOOTLOADER_DFU
|
||||||
|
BOOTLOADER_SIZE = 4096
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(BOOTLOADER)), lufa-dfu)
|
||||||
|
OPT_DEFS += -DBOOTLOADER_LUFA_DFU
|
||||||
|
OPT_DEFS += -DBOOTLOADER_DFU
|
||||||
|
BOOTLOADER_SIZE = 4096
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(BOOTLOADER)), qmk-dfu)
|
||||||
|
OPT_DEFS += -DBOOTLOADER_QMK_DFU
|
||||||
|
OPT_DEFS += -DBOOTLOADER_DFU
|
||||||
|
BOOTLOADER_SIZE = 4096
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(BOOTLOADER)), halfkay)
|
||||||
|
OPT_DEFS += -DBOOTLOADER_HALFKAY
|
||||||
|
BOOTLOADER_SIZE = 512
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(BOOTLOADER)), caterina)
|
||||||
|
OPT_DEFS += -DBOOTLOADER_CATERINA
|
||||||
|
BOOTLOADER_SIZE = 4096
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(BOOTLOADER)), bootloadHID)
|
||||||
|
OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
|
||||||
|
BOOTLOADER_SIZE = 4096
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef BOOTLOADER_SIZE
|
||||||
|
OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE))
|
||||||
|
endif
|
|
@ -230,6 +230,7 @@ VPATH += $(USER_PATH)
|
||||||
include common_features.mk
|
include common_features.mk
|
||||||
include $(TMK_PATH)/protocol.mk
|
include $(TMK_PATH)/protocol.mk
|
||||||
include $(TMK_PATH)/common.mk
|
include $(TMK_PATH)/common.mk
|
||||||
|
include bootloader.mk
|
||||||
|
|
||||||
SRC += $(TMK_COMMON_SRC)
|
SRC += $(TMK_COMMON_SRC)
|
||||||
OPT_DEFS += $(TMK_COMMON_DEFS)
|
OPT_DEFS += $(TMK_COMMON_DEFS)
|
||||||
|
@ -266,10 +267,10 @@ $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) $(GFXINC)
|
||||||
$(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG)
|
$(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG)
|
||||||
|
|
||||||
# Default target.
|
# Default target.
|
||||||
all: build sizeafter
|
all: build check-size
|
||||||
|
|
||||||
# Change the build target to build a HEX file or a library.
|
# Change the build target to build a HEX file or a library.
|
||||||
build: elf hex
|
build: elf cphex
|
||||||
#build: elf hex eep lss sym
|
#build: elf hex eep lss sym
|
||||||
#build: lib
|
#build: lib
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,20 @@
|
||||||
# Flashing Intrustructions
|
# Flashing Intrustructions / Bootloader Information
|
||||||
|
|
||||||
There are quite a few different types of bootloaders that keyboards use, and just about all of the use a different flashing method. Luckily, projects like the [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) aim to be compatible with all the different types without having to think about it much, but this article will describe the different types of bootloaders, and available methods for flashing them.
|
There are quite a few different types of bootloaders that keyboards use, and just about all of the use a different flashing method. Luckily, projects like the [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) aim to be compatible with all the different types without having to think about it much, but this article will describe the different types of bootloaders, and available methods for flashing them.
|
||||||
|
|
||||||
|
If you have a bootloader selected with the `BOOTLOADER` variable in your `rules.mk`, QMK will automatically calculate if your .hex file is the right size to be flashed to the device, and output the total size it bytes (along with the max). To run this process manually, compile with the target `check-size`, eg `make planck/rev4:default:check-size`.
|
||||||
|
|
||||||
## DFU
|
## DFU
|
||||||
|
|
||||||
Atmel's DFU bootloader comes on all atmega32u4 chips by default, and is used by many keyboards that have their own ICs on their PCBs (Older OLKB boards, Clueboards). Some keyboards may also use LUFA's DFU bootloader (or QMK's fork) (Newer OLKB boards) that adds in additional features specific to that hardware.
|
Atmel's DFU bootloader comes on all atmega32u4 chips by default, and is used by many keyboards that have their own ICs on their PCBs (Older OLKB boards, Clueboards). Some keyboards may also use LUFA's DFU bootloader (or QMK's fork) (Newer OLKB boards) that adds in additional features specific to that hardware.
|
||||||
|
|
||||||
These bootloaders are usually 4096 bytes for the atmega32u4 chip.
|
To ensure compatability with the DFU bootloader, make sure this block is present your `rules.mk` (optionally with `lufa-dfu` or `qmk-dfu` instead):
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = atmel-dfu
|
||||||
|
|
||||||
Compatible flashers:
|
Compatible flashers:
|
||||||
|
|
||||||
|
@ -26,15 +34,32 @@ or:
|
||||||
|
|
||||||
make <keyboard>:<keymap>:dfu
|
make <keyboard>:<keymap>:dfu
|
||||||
|
|
||||||
|
### QMK DFU
|
||||||
|
|
||||||
|
QMK has a fork of the LUFA DFU bootloader that allows for a simple matrix scan for exiting the bootloader and returning to the application, as well as flashing an LED/making a ticking noise with a speaker when things are happening. To enable these features, use this block in your `config.h` (The key that exits the bootloader needs to be hooked-up to the INPUT and OUTPUT defined here):
|
||||||
|
|
||||||
|
#define QMK_ESC_OUTPUT F1 // usually COL
|
||||||
|
#define QMK_ESC_INPUT D5 // usually ROW
|
||||||
|
#define QMK_LED E6
|
||||||
|
#define QMK_SPEAKER C6
|
||||||
|
|
||||||
|
The Manufacturer and Product names are automatically pulled from your `config.h`, and "Bootloader" is added to the product.
|
||||||
|
|
||||||
|
To generate this bootloader, use the `bootloader` target, eg `make planck/rev4:default:bootloader`.
|
||||||
|
|
||||||
|
To generate a production-ready .hex file (containing the application and the bootloader), use the `production` target, eg `make planck/rev4:default:production`.
|
||||||
|
|
||||||
## Caterina
|
## Caterina
|
||||||
|
|
||||||
Arduino boards and their clones use the [Caterina bootloader](https://github.com/arduino/Arduino/tree/master/hardware/arduino/avr/bootloaders/caterina) (any keyboard built with a Pro Micro, or clone), and uses the avr109 protocol to communicate through virtual serial. Bootloaders like [A-Star](https://www.pololu.com/docs/0J61/9) are based on Caterina.
|
Arduino boards and their clones use the [Caterina bootloader](https://github.com/arduino/Arduino/tree/master/hardware/arduino/avr/bootloaders/caterina) (any keyboard built with a Pro Micro, or clone), and uses the avr109 protocol to communicate through virtual serial. Bootloaders like [A-Star](https://www.pololu.com/docs/0J61/9) are based on Caterina.
|
||||||
|
|
||||||
This block of code allows for Caterina compatibility in QMK:
|
To ensure compatability with the Caterina bootloader, make sure this block is present your `rules.mk`:
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
These bootloaders are usually 4096 bytes for the atmega32u4 chip.
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
Compatible flashers:
|
Compatible flashers:
|
||||||
|
|
||||||
|
@ -57,7 +82,13 @@ or
|
||||||
|
|
||||||
Halfkay is a super-slim protocol developed by PJRC that uses HID, and come on all Teensys (namely the 2.0).
|
Halfkay is a super-slim protocol developed by PJRC that uses HID, and come on all Teensys (namely the 2.0).
|
||||||
|
|
||||||
This bootloader is 512 bytes.
|
To ensure compatability with the Halfkay bootloader, make sure this block is present your `rules.mk`:
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = halfkay
|
||||||
|
|
||||||
Compatible flashers:
|
Compatible flashers:
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@ ifdef TEENSY2
|
||||||
ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
|
ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
|
||||||
else
|
else
|
||||||
OPT_DEFS += -DATREUS_ASTAR
|
OPT_DEFS += -DATREUS_ASTAR
|
||||||
OPT_DEFS += -DCATERINA_BOOTLOADER
|
|
||||||
ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
||||||
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
||||||
endif
|
endif
|
||||||
|
@ -27,7 +26,6 @@ MCU = atmega32u4
|
||||||
# software delays.
|
# software delays.
|
||||||
F_CPU = 16000000
|
F_CPU = 16000000
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# LUFA specific
|
# LUFA specific
|
||||||
#
|
#
|
||||||
|
@ -47,19 +45,20 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
ifdef TEENSY2
|
||||||
|
BOOTLOADER = halfkay
|
||||||
|
else
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
endif
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
|
|
|
@ -38,8 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { D2, D3, D1, D0, D4 }
|
#define MATRIX_ROW_PINS { D2, D3, D1, D0, D4 }
|
||||||
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7, C6 }
|
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7, C6 }
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
#define DIODE_DIRECTION ROW2COL
|
#define DIODE_DIRECTION ROW2COL
|
||||||
|
|
||||||
|
|
|
@ -35,18 +35,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -41,7 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_ANIMATIONS
|
#define RGBLIGHT_ANIMATIONS
|
||||||
|
|
||||||
#define NO_UART 1
|
#define NO_UART 1
|
||||||
#define BOOTLOADHID_BOOTLOADER 1
|
|
||||||
|
|
||||||
/* key combination for command */
|
/* key combination for command */
|
||||||
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
||||||
|
|
|
@ -24,6 +24,12 @@ NO_SUSPEND_POWER_DOWN = yes
|
||||||
# processor frequency
|
# processor frequency
|
||||||
F_CPU = 12000000
|
F_CPU = 12000000
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = bootloadHID
|
||||||
|
|
||||||
# build options
|
# build options
|
||||||
BOOTMAGIC_ENABLE = yes
|
BOOTMAGIC_ENABLE = yes
|
||||||
MOUSEKEY_ENABLE = yes
|
MOUSEKEY_ENABLE = yes
|
||||||
|
@ -35,7 +41,6 @@ RGBLIGHT_ENABLE = yes
|
||||||
RGBLIGHT_CUSTOM_DRIVER = yes
|
RGBLIGHT_CUSTOM_DRIVER = yes
|
||||||
|
|
||||||
OPT_DEFS = -DDEBUG_LEVEL=0
|
OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
|
@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_ANIMATIONS
|
#define RGBLIGHT_ANIMATIONS
|
||||||
|
|
||||||
#define NO_UART 1
|
#define NO_UART 1
|
||||||
#define BOOTLOADHID_BOOTLOADER 1
|
|
||||||
|
|
||||||
/* key combination for command */
|
/* key combination for command */
|
||||||
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
||||||
|
|
|
@ -24,6 +24,12 @@ NO_SUSPEND_POWER_DOWN = yes
|
||||||
# processor frequency
|
# processor frequency
|
||||||
F_CPU = 12000000
|
F_CPU = 12000000
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = bootloadHID
|
||||||
|
|
||||||
# build options
|
# build options
|
||||||
BOOTMAGIC_ENABLE = yes
|
BOOTMAGIC_ENABLE = yes
|
||||||
MOUSEKEY_ENABLE = yes
|
MOUSEKEY_ENABLE = yes
|
||||||
|
@ -35,7 +41,6 @@ RGBLIGHT_ENABLE = yes
|
||||||
RGBLIGHT_CUSTOM_DRIVER = yes
|
RGBLIGHT_CUSTOM_DRIVER = yes
|
||||||
|
|
||||||
OPT_DEFS = -DDEBUG_LEVEL=0
|
OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
|
|
||||||
OPT_DEFS += -DCHIMERA_ORTHO_PROMICRO
|
OPT_DEFS += -DCHIMERA_ORTHO_PROMICRO
|
||||||
OPT_DEFS += -DCATERINA_BOOTLOADER
|
|
||||||
CHIMERA_ORTHO_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
CHIMERA_ORTHO_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
||||||
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
||||||
|
|
||||||
|
@ -45,19 +44,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
BLUETOOTH = AdafruitBLE
|
BLUETOOTH = AdafruitBLE
|
||||||
ADAFRUIT_BLE_ENABLE = yes
|
ADAFRUIT_BLE_ENABLE = yes
|
||||||
OPT_DEFS += -DCATERINA_BOOTLOADER
|
|
||||||
F_CPU = 8000000
|
F_CPU = 8000000
|
||||||
|
|
|
@ -43,19 +43,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task
|
# Interrupt driven control endpoint task
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
|
|
|
@ -39,18 +39,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -37,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2 }
|
#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2 }
|
||||||
#define MATRIX_COL_PINS { B6, B5, B4, E6, D7, C6, D4, D1}
|
#define MATRIX_COL_PINS { B6, B5, B4, E6, D7, C6, D4, D1}
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
#define DIODE_DIRECTION COL2ROW
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
|
|
||||||
OPT_DEFS += -DDICHOTEMY_PROMICRO
|
OPT_DEFS += -DDICHOTEMY_PROMICRO
|
||||||
OPT_DEFS += -DCATERINA_BOOTLOADER
|
|
||||||
DICHOTEMY_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
DICHOTEMY_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
||||||
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
||||||
|
|
||||||
|
@ -25,8 +24,6 @@ MCU = atmega32u4
|
||||||
# software delays.
|
# software delays.
|
||||||
F_CPU = 16000000
|
F_CPU = 16000000
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# LUFA specific
|
# LUFA specific
|
||||||
#
|
#
|
||||||
# Target architecture (see library "Board Types" documentation).
|
# Target architecture (see library "Board Types" documentation).
|
||||||
|
@ -45,19 +42,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
|
|
|
@ -31,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROWS 4
|
#define MATRIX_ROWS 4
|
||||||
#define MATRIX_COLS 14
|
#define MATRIX_COLS 14
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
#define DIODE_DIRECTION COL2ROW
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
|
|
|
@ -34,18 +34,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -54,18 +54,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = halfkay
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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
|
|
||||||
|
|
||||||
# If you have Left LEDs (see
|
# If you have Left LEDs (see
|
||||||
# https://geekhack.org/index.php?topic=22780.msg873819#msg873819 for
|
# https://geekhack.org/index.php?topic=22780.msg873819#msg873819 for
|
||||||
# details), include the following define:
|
# details), include the following define:
|
||||||
|
|
|
@ -52,8 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
|
#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
|
||||||
#define MATRIX_COL_PINS { B4, E6, D7, F6, D4, D0 }
|
#define MATRIX_COL_PINS { B4, E6, D7, F6, D4, D0 }
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
#define UNUSED_PINS
|
#define UNUSED_PINS
|
||||||
|
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
|
|
|
@ -33,14 +33,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
||||||
|
|
||||||
|
|
||||||
# Boot Section Size in *bytes*
|
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=4096
|
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
|
|
|
@ -5,21 +5,29 @@ SRC= babblePaste.c
|
||||||
|
|
||||||
ifdef ASTAR
|
ifdef ASTAR
|
||||||
CFLAGS=-D ASTAR
|
CFLAGS=-D ASTAR
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=4096
|
|
||||||
MCU = atmega32u4
|
MCU = atmega32u4
|
||||||
OPT_DEFS += -DCATERINA_BOOTLOADER
|
|
||||||
SCULPT_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done ; \
|
SCULPT_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done ; \
|
||||||
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
||||||
|
|
||||||
else
|
else
|
||||||
MCU = at90usb1286
|
MCU = at90usb1286
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
|
||||||
SCULPT_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
|
SCULPT_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
|
||||||
endif
|
endif
|
||||||
|
|
||||||
F_CPU = 16000000
|
F_CPU = 16000000
|
||||||
ARCH = AVR8
|
ARCH = AVR8
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
ifdef ASTAR
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
else
|
||||||
|
BOOTLOADER = atmel-dfu
|
||||||
|
endif
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
||||||
|
|
||||||
|
|
|
@ -36,30 +36,25 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
ifdef TEENSY2
|
ifdef TEENSY2
|
||||||
|
BOOTLOADER = halfkay
|
||||||
OPT_DEFS += -DATREUS_TEENSY2
|
OPT_DEFS += -DATREUS_TEENSY2
|
||||||
ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
|
ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
|
||||||
else
|
else
|
||||||
|
BOOTLOADER = caterina
|
||||||
OPT_DEFS += -DATREUS_ASTAR
|
OPT_DEFS += -DATREUS_ASTAR
|
||||||
OPT_DEFS += -DCATERINA_BOOTLOADER
|
|
||||||
ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
||||||
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
||||||
|
|
||||||
|
|
||||||
# MCU name
|
|
||||||
|
|
||||||
# Boot Section Size in *bytes*
|
|
||||||
# Teensy halfKay 512
|
|
||||||
# Teensy++ halfKay 1024
|
|
||||||
# Atmel DFU loader 4096
|
|
||||||
# LUFA bootloader 4096
|
|
||||||
# USBaspLoader 2048
|
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=4096
|
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change yes to no to disable
|
# change yes to no to disable
|
||||||
|
|
|
@ -11,8 +11,6 @@
|
||||||
#define PRODUCT Space Odyssey
|
#define PRODUCT Space Odyssey
|
||||||
#define DESCRIPTION Keyboard
|
#define DESCRIPTION Keyboard
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
#define MOUSEKEY_INTERVAL 16
|
#define MOUSEKEY_INTERVAL 16
|
||||||
#define MOUSEKEY_DELAY 0
|
#define MOUSEKEY_DELAY 0
|
||||||
#define MOUSEKEY_TIME_TO_MAX 60
|
#define MOUSEKEY_TIME_TO_MAX 60
|
||||||
|
|
|
@ -33,14 +33,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
||||||
|
|
||||||
|
|
||||||
# Boot Section Size in *bytes*
|
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=4096
|
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
|
|
|
@ -37,15 +37,23 @@ ARCH = AVR8
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
ifdef TEENSY2
|
ifdef TEENSY2
|
||||||
|
BOOTLOADER = halfkay
|
||||||
OPT_DEFS += -DATREUS_TEENSY2
|
OPT_DEFS += -DATREUS_TEENSY2
|
||||||
ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
|
ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex
|
||||||
else
|
else
|
||||||
|
BOOTLOADER = caterina
|
||||||
OPT_DEFS += -DATREUS_ASTAR
|
OPT_DEFS += -DATREUS_ASTAR
|
||||||
OPT_DEFS += -DCATERINA_BOOTLOADER
|
|
||||||
ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
||||||
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
||||||
|
|
||||||
|
|
|
@ -53,8 +53,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
// #define BACKLIGHT_BREATHING
|
// #define BACKLIGHT_BREATHING
|
||||||
// #define BACKLIGHT_LEVELS 3
|
// #define BACKLIGHT_LEVELS 3
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
||||||
#define DEBOUNCING_DELAY 5
|
#define DEBOUNCING_DELAY 5
|
||||||
|
|
||||||
|
|
|
@ -35,19 +35,16 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change yes to no to disable
|
# change yes to no to disable
|
||||||
#
|
#
|
||||||
|
|
|
@ -37,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
|
#define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
|
||||||
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, F4 }
|
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, F4 }
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
#define DIODE_DIRECTION COL2ROW
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
|
|
|
@ -37,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { D7, E6, B4, D2, D4 }
|
#define MATRIX_ROW_PINS { D7, E6, B4, D2, D4 }
|
||||||
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
#define DIODE_DIRECTION COL2ROW
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
|
|
|
@ -39,18 +39,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -38,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define TAPPING_TOGGLE 3
|
#define TAPPING_TOGGLE 3
|
||||||
|
|
||||||
#define NO_UART 1
|
#define NO_UART 1
|
||||||
#define BOOTLOADHID_BOOTLOADER 1
|
|
||||||
|
|
||||||
/* key combination for command */
|
/* key combination for command */
|
||||||
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
||||||
|
|
|
@ -1,74 +0,0 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import usb
|
|
||||||
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print('Searching for jj40... ', end='')
|
|
||||||
|
|
||||||
dev = usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
|
||||||
if dev is None:
|
|
||||||
raise ValueError('Device not found')
|
|
||||||
|
|
||||||
print('Found', end='\n\n')
|
|
||||||
|
|
||||||
print('Device Information:')
|
|
||||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
|
||||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
|
||||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
|
||||||
print('Serial: %s' % (dev.iSerialNumber))
|
|
||||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
|
||||||
|
|
||||||
print('Transferring control to bootloader... ', end='')
|
|
||||||
|
|
||||||
dev.set_configuration()
|
|
||||||
|
|
||||||
request_type = usb.util.build_request_type(
|
|
||||||
usb.util.CTRL_OUT,
|
|
||||||
usb.util.CTRL_TYPE_CLASS,
|
|
||||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
|
||||||
|
|
||||||
USBRQ_HID_SET_REPORT = 0x09
|
|
||||||
HID_REPORT_OPTION = 0x0301
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
dev.ctrl_transfer(
|
|
||||||
request_type,
|
|
||||||
USBRQ_HID_SET_REPORT,
|
|
||||||
HID_REPORT_OPTION,
|
|
||||||
0,
|
|
||||||
[0, 0, 0xFF] + [0] * 5
|
|
||||||
)
|
|
||||||
except usb.core.USBError:
|
|
||||||
# for some reason I keep getting USBError, but it works!
|
|
||||||
pass
|
|
||||||
|
|
||||||
# wait a bit until bootloader starts up
|
|
||||||
time.sleep(2)
|
|
||||||
|
|
||||||
print('OK')
|
|
||||||
print('Programming...')
|
|
||||||
if os.system('bootloadHID -r "%s"' % sys.argv[1]) == 0:
|
|
||||||
print('\nDone!')
|
|
|
@ -24,6 +24,12 @@ NO_SUSPEND_POWER_DOWN = yes
|
||||||
# processor frequency
|
# processor frequency
|
||||||
F_CPU = 12000000
|
F_CPU = 12000000
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = bootloadHID
|
||||||
|
|
||||||
# build options
|
# build options
|
||||||
BOOTMAGIC_ENABLE = no
|
BOOTMAGIC_ENABLE = no
|
||||||
MOUSEKEY_ENABLE = no
|
MOUSEKEY_ENABLE = no
|
||||||
|
@ -39,11 +45,10 @@ KEY_LOCK_ENABLE = yes
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
OPT_DEFS = -DDEBUG_LEVEL=0
|
OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
SRC = matrix.c i2c.c
|
SRC = matrix.c i2c.c
|
||||||
|
|
||||||
# programming options
|
# programming options
|
||||||
PROGRAM_CMD = ./keyboards/jj40/program $(TARGET).hex
|
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||||
|
|
|
@ -39,9 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
|
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
|
||||||
// #define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
|
// #define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
|
||||||
|
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* define if matrix has ghost */
|
/* define if matrix has ghost */
|
||||||
//#define MATRIX_HAS_GHOST
|
//#define MATRIX_HAS_GHOST
|
||||||
|
|
||||||
|
|
|
@ -39,8 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
||||||
// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
|
// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* define if matrix has ghost */
|
/* define if matrix has ghost */
|
||||||
//#define MATRIX_HAS_GHOST
|
//#define MATRIX_HAS_GHOST
|
||||||
|
|
||||||
|
|
|
@ -40,18 +40,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -39,8 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_COL_PINS { F4, F7, D7, B3, B2, B6}
|
#define MATRIX_COL_PINS { F4, F7, D7, B3, B2, B6}
|
||||||
// #define MATRIX_COL_PINS { B6, B2, B3, C6, F7, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
|
// #define MATRIX_COL_PINS { B6, B2, B3, C6, F7, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* define if matrix has ghost */
|
/* define if matrix has ghost */
|
||||||
//#define MATRIX_HAS_GHOST
|
//#define MATRIX_HAS_GHOST
|
||||||
|
|
||||||
|
|
|
@ -38,8 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
|
#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
|
||||||
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, F4 }
|
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, F4 }
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* define if matrix has ghost */
|
/* define if matrix has ghost */
|
||||||
//#define MATRIX_HAS_GHOST
|
//#define MATRIX_HAS_GHOST
|
||||||
|
|
||||||
|
|
|
@ -38,9 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { D4, D7, E6, B4 }
|
#define MATRIX_ROW_PINS { D4, D7, E6, B4 }
|
||||||
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
||||||
|
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* define if matrix has ghost */
|
/* define if matrix has ghost */
|
||||||
//#define MATRIX_HAS_GHOST
|
//#define MATRIX_HAS_GHOST
|
||||||
|
|
||||||
|
|
|
@ -40,18 +40,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGB_DI_PIN E2
|
#define RGB_DI_PIN E2
|
||||||
|
|
||||||
#define NO_UART 1
|
#define NO_UART 1
|
||||||
#define BOOTLOADHID_BOOTLOADER 1
|
|
||||||
|
|
||||||
/* key combination for command */
|
/* key combination for command */
|
||||||
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
||||||
|
|
|
@ -24,6 +24,12 @@ NO_SUSPEND_POWER_DOWN = yes
|
||||||
# processor frequency
|
# processor frequency
|
||||||
F_CPU = 12000000
|
F_CPU = 12000000
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = atmel-dfu
|
||||||
|
|
||||||
# build options
|
# build options
|
||||||
BOOTMAGIC_ENABLE = yes
|
BOOTMAGIC_ENABLE = yes
|
||||||
MOUSEKEY_ENABLE = yes
|
MOUSEKEY_ENABLE = yes
|
||||||
|
@ -35,7 +41,6 @@ RGBLIGHT_ENABLE = yes
|
||||||
RGBLIGHT_CUSTOM_DRIVER = yes
|
RGBLIGHT_CUSTOM_DRIVER = yes
|
||||||
|
|
||||||
OPT_DEFS = -DDEBUG_LEVEL=0
|
OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
|
@ -26,8 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { B2, B6, B4, B5 }
|
#define MATRIX_ROW_PINS { B2, B6, B4, B5 }
|
||||||
#define MATRIX_COL_PINS { F4, D3, D2, D1, D4 }
|
#define MATRIX_COL_PINS { F4, D3, D2, D1, D4 }
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
#define USE_SERIAL
|
#define USE_SERIAL
|
||||||
|
|
||||||
//#define EE_HANDS
|
//#define EE_HANDS
|
||||||
|
|
|
@ -39,18 +39,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
|
|
||||||
OPT_DEFS += -DMITOSIS_PROMICRO
|
OPT_DEFS += -DMITOSIS_PROMICRO
|
||||||
OPT_DEFS += -DCATERINA_BOOTLOADER
|
|
||||||
MITOSIS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
MITOSIS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \
|
||||||
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB)
|
||||||
|
|
||||||
|
@ -25,7 +24,6 @@ MCU = atmega32u4
|
||||||
# software delays.
|
# software delays.
|
||||||
F_CPU = 16000000
|
F_CPU = 16000000
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# LUFA specific
|
# LUFA specific
|
||||||
#
|
#
|
||||||
|
@ -45,19 +43,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
|
|
|
@ -44,7 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_VAL_STEP 18
|
#define RGBLIGHT_VAL_STEP 18
|
||||||
|
|
||||||
#define NO_UART 1
|
#define NO_UART 1
|
||||||
#define BOOTLOADHID_BOOTLOADER 1
|
|
||||||
|
|
||||||
#define TAPPING_TERM 200
|
#define TAPPING_TERM 200
|
||||||
|
|
||||||
|
|
|
@ -1,74 +0,0 @@
|
||||||
#!/usr/bin/env python2.7
|
|
||||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import usb
|
|
||||||
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print('Searching for planck clone keyboard... ', end='')
|
|
||||||
|
|
||||||
dev = usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
|
||||||
if dev is None:
|
|
||||||
raise ValueError('Device not found')
|
|
||||||
|
|
||||||
print('Found', end='\n\n')
|
|
||||||
|
|
||||||
print('Device Information:')
|
|
||||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
|
||||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
|
||||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
|
||||||
print('Serial: %s' % (dev.iSerialNumber))
|
|
||||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
|
||||||
|
|
||||||
print('Transferring control to bootloader... ', end='')
|
|
||||||
|
|
||||||
dev.set_configuration()
|
|
||||||
|
|
||||||
request_type = usb.util.build_request_type(
|
|
||||||
usb.util.CTRL_OUT,
|
|
||||||
usb.util.CTRL_TYPE_CLASS,
|
|
||||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
|
||||||
|
|
||||||
USBRQ_HID_SET_REPORT = 0x09
|
|
||||||
HID_REPORT_OPTION = 0x0301
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
dev.ctrl_transfer(
|
|
||||||
request_type,
|
|
||||||
USBRQ_HID_SET_REPORT,
|
|
||||||
HID_REPORT_OPTION,
|
|
||||||
0,
|
|
||||||
[0, 0, 0xFF] + [0] * 5
|
|
||||||
)
|
|
||||||
except usb.core.USBError:
|
|
||||||
# for some reason I keep getting USBError, but it works!
|
|
||||||
pass
|
|
||||||
|
|
||||||
# wait a bit until bootloader starts up
|
|
||||||
time.sleep(2)
|
|
||||||
|
|
||||||
print('OK')
|
|
||||||
print('Programming...')
|
|
||||||
if os.system('bootloadHID -r "%s"' % sys.argv[1]) == 0:
|
|
||||||
print('\nDone!')
|
|
|
@ -9,6 +9,12 @@ NO_SUSPEND_POWER_DOWN = yes
|
||||||
# processor frequency
|
# processor frequency
|
||||||
F_CPU = 12000000
|
F_CPU = 12000000
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = bootloadHID
|
||||||
|
|
||||||
# build options
|
# build options
|
||||||
BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000)
|
BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000)
|
||||||
MOUSEKEY_ENABLE ?= no # Mouse keys(+4700)
|
MOUSEKEY_ENABLE ?= no # Mouse keys(+4700)
|
||||||
|
@ -26,11 +32,10 @@ RGBLIGHT_CUSTOM_DRIVER = yes
|
||||||
TAP_DANCE_ENABLE = no
|
TAP_DANCE_ENABLE = no
|
||||||
|
|
||||||
OPT_DEFS = -DDEBUG_LEVEL=0
|
OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
SRC = matrix.c i2c.c
|
SRC = matrix.c i2c.c
|
||||||
|
|
||||||
# programming options
|
# programming options
|
||||||
PROGRAM_CMD = ./keyboards/mt40/program $(TARGET).hex
|
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||||
|
|
|
@ -37,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
|
#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
|
||||||
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
#define DIODE_DIRECTION COL2ROW
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
|
|
|
@ -39,18 +39,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -51,8 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_COL_PINS { D2, F5, F6, F7, B6, B5, B4, D7, D6 }
|
#define MATRIX_COL_PINS { D2, F5, F6, F7, B6, B5, B4, D7, D6 }
|
||||||
/*/
|
/*/
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
#define DIODE_DIRECTION COL2ROW
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
|
|
|
@ -39,18 +39,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define DESCRIPTION 40% keyboard
|
#define DESCRIPTION 40% keyboard
|
||||||
|
|
||||||
#define NO_UART 1
|
#define NO_UART 1
|
||||||
#define BOOTLOADHID_BOOTLOADER 1
|
|
||||||
|
|
||||||
#define RGBLIGHT_ANIMATIONS
|
#define RGBLIGHT_ANIMATIONS
|
||||||
#define RGBLED_NUM 12
|
#define RGBLED_NUM 12
|
||||||
|
|
|
@ -24,6 +24,12 @@ NO_SUSPEND_POWER_DOWN = yes
|
||||||
# processor frequency
|
# processor frequency
|
||||||
F_CPU = 12000000
|
F_CPU = 12000000
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = bootloadHID
|
||||||
|
|
||||||
# build options
|
# build options
|
||||||
BOOTMAGIC_ENABLE = yes
|
BOOTMAGIC_ENABLE = yes
|
||||||
MOUSEKEY_ENABLE = yes
|
MOUSEKEY_ENABLE = yes
|
||||||
|
@ -35,7 +41,6 @@ RGBLIGHT_ENABLE = yes
|
||||||
RGBLIGHT_CUSTOM_DRIVER = yes
|
RGBLIGHT_CUSTOM_DRIVER = yes
|
||||||
|
|
||||||
OPT_DEFS = -DDEBUG_LEVEL=0
|
OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
|
@ -4,6 +4,4 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
|
||||||
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||||
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
|
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=8192
|
|
||||||
|
|
||||||
MCU = at90usb1286
|
MCU = at90usb1286
|
|
@ -1,10 +1 @@
|
||||||
|
|
||||||
# Boot Section Size in *bytes*
|
|
||||||
# Teensy halfKay 512
|
|
||||||
# Teensy++ halfKay 1024
|
|
||||||
# Atmel DFU loader 4096
|
|
||||||
# LUFA bootloader 4096
|
|
||||||
# USBaspLoader 2048
|
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=4096
|
|
||||||
|
|
||||||
AUDIO_ENABLE = no # Audio output on port C6
|
AUDIO_ENABLE = no # Audio output on port C6
|
||||||
|
|
|
@ -1,9 +1 @@
|
||||||
# Boot Section Size in *bytes*
|
|
||||||
# Teensy halfKay 512
|
|
||||||
# Teensy++ halfKay 1024
|
|
||||||
# Atmel DFU loader 4096
|
|
||||||
# LUFA bootloader 4096
|
|
||||||
# USBaspLoader 2048
|
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=4096
|
|
||||||
|
|
||||||
AUDIO_ENABLE = yes # Audio output on port C6
|
AUDIO_ENABLE = yes # Audio output on port C6
|
||||||
|
|
|
@ -1,9 +1 @@
|
||||||
# Boot Section Size in *bytes*
|
|
||||||
# Teensy halfKay 512
|
|
||||||
# Teensy++ halfKay 1024
|
|
||||||
# Atmel DFU loader 4096
|
|
||||||
# LUFA bootloader 4096
|
|
||||||
# USBaspLoader 2048
|
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=4096
|
|
||||||
|
|
||||||
AUDIO_ENABLE = yes # Audio output on port C6
|
AUDIO_ENABLE = yes # Audio output on port C6
|
|
@ -34,6 +34,23 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
ifeq ($(strip $(KEYBOARD)), planck/rev3)
|
||||||
|
BOOTLOADER = atmel-dfu
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(KEYBOARD)), planck/rev4)
|
||||||
|
BOOTLOADER = atmel-dfu
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(KEYBOARD)), planck/rev5)
|
||||||
|
BOOTLOADER = qmk-dfu
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(KEYBOARD)), planck/light)
|
||||||
|
BOOTLOADER = qmk-dfu
|
||||||
|
endif
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
||||||
|
|
||||||
|
@ -46,9 +63,9 @@ MOUSEKEY_ENABLE = no # Mouse keys(+4700)
|
||||||
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
|
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
|
||||||
CONSOLE_ENABLE = yes # Console for debug(+400)
|
CONSOLE_ENABLE = yes # Console for debug(+400)
|
||||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||||
NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI controls
|
MIDI_ENABLE = yes # MIDI controls
|
||||||
AUDIO_ENABLE = yes # Audio output on port C6
|
AUDIO_ENABLE = yes # Audio output on port C6
|
||||||
UNICODE_ENABLE = no # Unicode
|
UNICODE_ENABLE = no # Unicode
|
||||||
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||||
|
|
|
@ -36,18 +36,20 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
ifeq ($(strip $(KEYBOARD)), preonic/rev1)
|
||||||
|
BOOTLOADER = atmel-dfu
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(KEYBOARD)), preonic/rev2)
|
||||||
|
BOOTLOADER = qmk-dfu
|
||||||
|
endif
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_ANIMATIONS
|
#define RGBLIGHT_ANIMATIONS
|
||||||
|
|
||||||
#define NO_UART 1
|
#define NO_UART 1
|
||||||
#define BOOTLOADHID_BOOTLOADER 1
|
|
||||||
|
|
||||||
/* key combination for command */
|
/* key combination for command */
|
||||||
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
||||||
|
|
|
@ -24,6 +24,12 @@ NO_SUSPEND_POWER_DOWN = yes
|
||||||
# processor frequency
|
# processor frequency
|
||||||
F_CPU = 12000000
|
F_CPU = 12000000
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = atmel-dfu
|
||||||
|
|
||||||
# build options
|
# build options
|
||||||
BOOTMAGIC_ENABLE = yes
|
BOOTMAGIC_ENABLE = yes
|
||||||
MOUSEKEY_ENABLE = yes
|
MOUSEKEY_ENABLE = yes
|
||||||
|
@ -35,7 +41,6 @@ RGBLIGHT_ENABLE = yes
|
||||||
RGBLIGHT_CUSTOM_DRIVER = yes
|
RGBLIGHT_CUSTOM_DRIVER = yes
|
||||||
|
|
||||||
OPT_DEFS = -DDEBUG_LEVEL=0
|
OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
|
@ -37,8 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
|
#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
|
||||||
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
|
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
|
||||||
|
|
||||||
#define CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
#define DIODE_DIRECTION COL2ROW
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
|
|
|
@ -39,18 +39,15 @@ ARCH = AVR8
|
||||||
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
|
||||||
F_USB = $(F_CPU)
|
F_USB = $(F_CPU)
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
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=4096
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# change to "no" to disable the options, or define them in the Makefile in
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
# the appropriate keymap folder that will get included automatically
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
|
|
@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_ANIMATIONS
|
#define RGBLIGHT_ANIMATIONS
|
||||||
|
|
||||||
#define NO_UART 1
|
#define NO_UART 1
|
||||||
#define BOOTLOADHID_BOOTLOADER 1
|
|
||||||
|
|
||||||
/* key combination for command */
|
/* key combination for command */
|
||||||
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
|
||||||
|
|
|
@ -24,6 +24,12 @@ NO_SUSPEND_POWER_DOWN = yes
|
||||||
# processor frequency
|
# processor frequency
|
||||||
F_CPU = 12000000
|
F_CPU = 12000000
|
||||||
|
|
||||||
|
# Bootloader
|
||||||
|
# This definition is optional, and if your keyboard supports multiple bootloaders of
|
||||||
|
# different sizes, comment this out, and the correct address will be loaded
|
||||||
|
# automatically (+60). See bootloader.mk for all options.
|
||||||
|
BOOTLOADER = atmel-dfu
|
||||||
|
|
||||||
# build options
|
# build options
|
||||||
BOOTMAGIC_ENABLE = yes
|
BOOTMAGIC_ENABLE = yes
|
||||||
MOUSEKEY_ENABLE = yes
|
MOUSEKEY_ENABLE = yes
|
||||||
|
@ -35,7 +41,6 @@ RGBLIGHT_ENABLE = yes
|
||||||
RGBLIGHT_CUSTOM_DRIVER = yes
|
RGBLIGHT_CUSTOM_DRIVER = yes
|
||||||
|
|
||||||
OPT_DEFS = -DDEBUG_LEVEL=0
|
OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
|
@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
KC_HOME,
|
KC_HOME,
|
||||||
KC_SPC,KC_SPC,KC_END,
|
KC_SPC,KC_SPC,KC_END,
|
||||||
// right hand
|
// right hand
|
||||||
KC_NO, M(1), KC_7, KC_8, KC_9, KC_0, KC_NO,
|
KC_NO, M(1), RESET, KC_8, KC_9, KC_0, KC_NO,
|
||||||
KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_P, KC_BSPC,
|
KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_P, KC_BSPC,
|
||||||
RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_SCLN, KC_QUOT,
|
RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_SCLN, KC_QUOT,
|
||||||
KC_NO, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_ENT,
|
KC_NO, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_ENT,
|
||||||
|
|
|
@ -43,9 +43,9 @@ MSG_SIZE_BEFORE = Size before:
|
||||||
MSG_SIZE_AFTER = Size after:
|
MSG_SIZE_AFTER = Size after:
|
||||||
MSG_COFF = Converting to AVR COFF:
|
MSG_COFF = Converting to AVR COFF:
|
||||||
MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
|
MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
|
||||||
MSG_FLASH = Creating load file for Flash:
|
MSG_FLASH = Creating load file for flashing:
|
||||||
MSG_EEPROM = Creating load file for EEPROM:
|
MSG_EEPROM = Creating load file for EEPROM:
|
||||||
MSG_BIN = Creating binary load file for Flash:
|
MSG_BIN = Creating binary load file for flashing:
|
||||||
MSG_EXTENDED_LISTING = Creating Extended Listing:
|
MSG_EXTENDED_LISTING = Creating Extended Listing:
|
||||||
MSG_SYMBOL_TABLE = Creating Symbol Table:
|
MSG_SYMBOL_TABLE = Creating Symbol Table:
|
||||||
MSG_LINKING = Linking:
|
MSG_LINKING = Linking:
|
||||||
|
@ -76,3 +76,7 @@ define GENERATE_MSG_MAKE_TEST
|
||||||
endef
|
endef
|
||||||
MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL)
|
MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL)
|
||||||
MSG_TEST = Testing $(BOLD)$(TEST_NAME)$(NO_COLOR)
|
MSG_TEST = Testing $(BOLD)$(TEST_NAME)$(NO_COLOR)
|
||||||
|
MSG_CHECK_FILESIZE = Checking file size of $(TARGET).hex
|
||||||
|
MSG_FILE_TOO_BIG = $(ERROR_COLOR)Your file is too big!$(NO_COLOR) $(CURRENT_SIZE)/$(MAX_SIZE)\n
|
||||||
|
MSG_FILE_TOO_SMALL = Your file is too small! $(CURRENT_SIZE)/$(MAX_SIZE)\n
|
||||||
|
MSG_FILE_JUST_RIGHT = File size is fine - $(CURRENT_SIZE)/$(MAX_SIZE)\n
|
||||||
|
|
|
@ -143,7 +143,8 @@ void reset_keyboard(void) {
|
||||||
#else
|
#else
|
||||||
wait_ms(250);
|
wait_ms(250);
|
||||||
#endif
|
#endif
|
||||||
#ifdef CATERINA_BOOTLOADER
|
// this is also done later in bootloader.c - not sure if it's neccesary here
|
||||||
|
#ifdef BOOTLOADER_CATERINA
|
||||||
*(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
|
*(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
|
||||||
#endif
|
#endif
|
||||||
bootloader_jump();
|
bootloader_jump();
|
||||||
|
|
|
@ -121,22 +121,22 @@ qmk: $(BUILD_DIR)/$(TARGET).hex
|
||||||
printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk
|
printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk
|
||||||
|
|
||||||
# Program the device.
|
# Program the device.
|
||||||
program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
|
program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep check-size
|
||||||
$(PROGRAM_CMD)
|
$(PROGRAM_CMD)
|
||||||
|
|
||||||
teensy: $(BUILD_DIR)/$(TARGET).hex
|
teensy: $(BUILD_DIR)/$(TARGET).hex check-size
|
||||||
$(TEENSY_LOADER_CLI) -mmcu=$(MCU) -w -v $(BUILD_DIR)/$(TARGET).hex
|
$(TEENSY_LOADER_CLI) -mmcu=$(MCU) -w -v $(BUILD_DIR)/$(TARGET).hex
|
||||||
|
|
||||||
BATCHISP ?= batchisp
|
BATCHISP ?= batchisp
|
||||||
|
|
||||||
flip: $(BUILD_DIR)/$(TARGET).hex
|
flip: $(BUILD_DIR)/$(TARGET).hex check-size
|
||||||
$(BATCHISP) -hardware usb -device $(MCU) -operation erase f
|
$(BATCHISP) -hardware usb -device $(MCU) -operation erase f
|
||||||
$(BATCHISP) -hardware usb -device $(MCU) -operation loadbuffer $(BUILD_DIR)/$(TARGET).hex program
|
$(BATCHISP) -hardware usb -device $(MCU) -operation loadbuffer $(BUILD_DIR)/$(TARGET).hex program
|
||||||
$(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
|
$(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
|
||||||
|
|
||||||
DFU_PROGRAMMER ?= dfu-programmer
|
DFU_PROGRAMMER ?= dfu-programmer
|
||||||
|
|
||||||
dfu: $(BUILD_DIR)/$(TARGET).hex sizeafter
|
dfu: $(BUILD_DIR)/$(TARGET).hex check-size
|
||||||
until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\
|
until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\
|
||||||
echo "Error: Bootloader not found. Trying again in 5s." ;\
|
echo "Error: Bootloader not found. Trying again in 5s." ;\
|
||||||
sleep 5 ;\
|
sleep 5 ;\
|
||||||
|
@ -168,7 +168,7 @@ dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
|
||||||
fi
|
fi
|
||||||
$(DFU_PROGRAMMER) $(MCU) reset
|
$(DFU_PROGRAMMER) $(MCU) reset
|
||||||
|
|
||||||
avrdude: $(BUILD_DIR)/$(TARGET).hex
|
avrdude: $(BUILD_DIR)/$(TARGET).hex check-size
|
||||||
if grep -q -s Microsoft /proc/version; then \
|
if grep -q -s Microsoft /proc/version; then \
|
||||||
echo 'ERROR: AVR flashing cannot be automated within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \
|
echo 'ERROR: AVR flashing cannot be automated within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \
|
||||||
else \
|
else \
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include <avr/wdt.h>
|
#include <avr/wdt.h>
|
||||||
#include <util/delay.h>
|
#include <util/delay.h>
|
||||||
#include "bootloader.h"
|
#include "bootloader.h"
|
||||||
|
#include <avr/boot.h>
|
||||||
|
|
||||||
#ifdef PROTOCOL_LUFA
|
#ifdef PROTOCOL_LUFA
|
||||||
#include <LUFA/Drivers/USB/USB.h>
|
#include <LUFA/Drivers/USB/USB.h>
|
||||||
|
@ -56,14 +57,17 @@
|
||||||
* | Bootloader | 512B | Bootloader | 1KB
|
* | Bootloader | 512B | Bootloader | 1KB
|
||||||
* 0x7FFF +---------------+ 0x1FFFF +---------------+
|
* 0x7FFF +---------------+ 0x1FFFF +---------------+
|
||||||
*/
|
*/
|
||||||
#ifndef BOOTLOADER_SIZE
|
|
||||||
#warning To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
|
#define FLASH_SIZE (FLASHEND + 1L)
|
||||||
#define BOOTLOADER_SIZE 4096
|
|
||||||
|
#if !defined(BOOTLOADER_SIZE)
|
||||||
|
uint16_t bootloader_start;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define FLASH_SIZE (FLASHEND + 1L)
|
#define BOOT_SIZE_256 0b110
|
||||||
#define BOOTLOADER_START (FLASH_SIZE - BOOTLOADER_SIZE)
|
#define BOOT_SIZE_512 0b100
|
||||||
|
#define BOOT_SIZE_1024 0b010
|
||||||
|
#define BOOT_SIZE_2048 0b000
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Entering the Bootloader via Software
|
* Entering the Bootloader via Software
|
||||||
|
@ -74,34 +78,62 @@ uint32_t reset_key __attribute__ ((section (".noinit")));
|
||||||
|
|
||||||
/* initialize MCU status by watchdog reset */
|
/* initialize MCU status by watchdog reset */
|
||||||
void bootloader_jump(void) {
|
void bootloader_jump(void) {
|
||||||
#ifndef CATERINA_BOOTLOADER
|
|
||||||
|
|
||||||
#ifdef PROTOCOL_LUFA
|
#if !defined(BOOTLOADER_SIZE)
|
||||||
USB_Disable();
|
uint8_t high_fuse = boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS);
|
||||||
cli();
|
|
||||||
_delay_ms(2000);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PROTOCOL_PJRC
|
if (high_fuse & BOOT_SIZE_256) {
|
||||||
cli();
|
bootloader_start = (FLASH_SIZE - 512) >> 1;
|
||||||
UDCON = 1;
|
} else if (high_fuse & BOOT_SIZE_512) {
|
||||||
USBCON = (1<<FRZCLK);
|
bootloader_start = (FLASH_SIZE - 1024) >> 1;
|
||||||
UCSR1B = 0;
|
} else if (high_fuse & BOOT_SIZE_1024) {
|
||||||
_delay_ms(5);
|
bootloader_start = (FLASH_SIZE - 2048) >> 1;
|
||||||
#endif
|
} else {
|
||||||
|
bootloader_start = (FLASH_SIZE - 4096) >> 1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef BOOTLOADHID_BOOTLOADER
|
// Something like this might work, but it compiled larger than the block above
|
||||||
// force bootloadHID to stay in bootloader mode, so that it waits
|
// bootloader_start = FLASH_SIZE - (256 << (~high_fuse & 0b110 >> 1));
|
||||||
// for a new firmware to be flashed
|
|
||||||
eeprom_write_byte((uint8_t *)1, 0x00);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// watchdog reset
|
|
||||||
reset_key = BOOTLOADER_RESET_KEY;
|
|
||||||
wdt_enable(WDTO_250MS);
|
|
||||||
for (;;);
|
|
||||||
|
|
||||||
#else
|
#if defined(BOOTLOADER_HALFKAY)
|
||||||
|
// http://www.pjrc.com/teensy/jump_to_bootloader.html
|
||||||
|
cli();
|
||||||
|
// disable watchdog, if enabled (it's not)
|
||||||
|
// disable all peripherals
|
||||||
|
// a shutdown call might make sense here
|
||||||
|
UDCON = 1;
|
||||||
|
USBCON = (1<<FRZCLK); // disable USB
|
||||||
|
UCSR1B = 0;
|
||||||
|
_delay_ms(5);
|
||||||
|
#if defined(__AVR_AT90USB162__) // Teensy 1.0
|
||||||
|
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0;
|
||||||
|
TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
|
||||||
|
DDRB = 0; DDRC = 0; DDRD = 0;
|
||||||
|
PORTB = 0; PORTC = 0; PORTD = 0;
|
||||||
|
asm volatile("jmp 0x3E00");
|
||||||
|
#elif defined(__AVR_ATmega32U4__) // Teensy 2.0
|
||||||
|
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
|
||||||
|
TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
|
||||||
|
DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
|
||||||
|
PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
|
||||||
|
asm volatile("jmp 0x7E00");
|
||||||
|
#elif defined(__AVR_AT90USB646__) // Teensy++ 1.0
|
||||||
|
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
|
||||||
|
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
|
||||||
|
DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
|
||||||
|
PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
|
||||||
|
asm volatile("jmp 0xFC00");
|
||||||
|
#elif defined(__AVR_AT90USB1286__) // Teensy++ 2.0
|
||||||
|
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
|
||||||
|
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
|
||||||
|
DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
|
||||||
|
PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
|
||||||
|
asm volatile("jmp 0x1FC00");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#elif defined(BOOTLOADER_CATERINA)
|
||||||
// this block may be optional
|
// this block may be optional
|
||||||
// TODO: figure it out
|
// TODO: figure it out
|
||||||
|
|
||||||
|
@ -118,83 +150,65 @@ void bootloader_jump(void) {
|
||||||
|
|
||||||
while(1) {} // wait for watchdog timer to trigger
|
while(1) {} // wait for watchdog timer to trigger
|
||||||
|
|
||||||
|
#else // Assume remaining boards are DFU, even if the flag isn't set
|
||||||
|
|
||||||
|
#ifndef __AVR_ATmega32A__ // no USB - maybe BOOTLOADER_BOOTLOADHID instead though?
|
||||||
|
UDCON = 1;
|
||||||
|
USBCON = (1<<FRZCLK); // disable USB
|
||||||
|
UCSR1B = 0;
|
||||||
|
_delay_ms(5); // 5 seems to work fine
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef BOOTLOADER_BOOTLOADHID
|
||||||
|
// force bootloadHID to stay in bootloader mode, so that it waits
|
||||||
|
// for a new firmware to be flashed
|
||||||
|
eeprom_write_byte((uint8_t *)1, 0x00);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// watchdog reset
|
||||||
|
reset_key = BOOTLOADER_RESET_KEY;
|
||||||
|
wdt_enable(WDTO_250MS);
|
||||||
|
for (;;);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __AVR_ATmega32A__
|
#ifdef __AVR_ATmega32A__
|
||||||
// MCUSR is actually called MCUCSR in ATmega32A
|
// MCUSR is actually called MCUCSR in ATmega32A
|
||||||
#define MCUSR MCUCSR
|
#define MCUSR MCUCSR
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* this runs before main() */
|
/* this runs before main() */
|
||||||
void bootloader_jump_after_watchdog_reset(void) __attribute__ ((used, naked, section (".init3")));
|
void bootloader_jump_after_watchdog_reset(void) __attribute__ ((used, naked, section (".init3")));
|
||||||
void bootloader_jump_after_watchdog_reset(void)
|
void bootloader_jump_after_watchdog_reset(void)
|
||||||
{
|
{
|
||||||
if ((MCUSR & (1<<WDRF)) && reset_key == BOOTLOADER_RESET_KEY) {
|
#ifndef BOOTLOADER_HALFKAY
|
||||||
reset_key = 0;
|
if ((MCUSR & (1<<WDRF)) && reset_key == BOOTLOADER_RESET_KEY) {
|
||||||
|
reset_key = 0;
|
||||||
|
|
||||||
// My custom USBasploader requires this to come up.
|
// My custom USBasploader requires this to come up.
|
||||||
MCUSR = 0;
|
MCUSR = 0;
|
||||||
|
|
||||||
// Seems like Teensy halfkay loader requires clearing WDRF and disabling watchdog.
|
// Seems like Teensy halfkay loader requires clearing WDRF and disabling watchdog.
|
||||||
MCUSR &= ~(1<<WDRF);
|
MCUSR &= ~(1<<WDRF);
|
||||||
wdt_disable();
|
wdt_disable();
|
||||||
|
|
||||||
// This is compled into 'icall', address should be in word unit, not byte.
|
|
||||||
((void (*)(void))(BOOTLOADER_START/2))();
|
// This is compled into 'icall', address should be in word unit, not byte.
|
||||||
}
|
#ifdef BOOTLOADER_SIZE
|
||||||
|
((void (*)(void))( (FLASH_SIZE - BOOTLOADER_SIZE) >> 1))();
|
||||||
|
#else
|
||||||
|
asm("ijmp" :: "z" (bootloader_start));
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
/* Jumping To The Bootloader
|
|
||||||
* http://www.pjrc.com/teensy/jump_to_bootloader.html
|
|
||||||
*
|
|
||||||
* This method doen't work when using LUFA. idk why.
|
|
||||||
* - needs to initialize more regisers or interrupt setting?
|
|
||||||
*/
|
|
||||||
void bootloader_jump(void) {
|
|
||||||
#ifdef PROTOCOL_LUFA
|
|
||||||
USB_Disable();
|
|
||||||
cli();
|
|
||||||
_delay_ms(2000);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PROTOCOL_PJRC
|
|
||||||
cli();
|
|
||||||
UDCON = 1;
|
|
||||||
USBCON = (1<<FRZCLK);
|
|
||||||
UCSR1B = 0;
|
|
||||||
_delay_ms(5);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize
|
* USBaspLoader - I'm not sure if this is used at all in any projects
|
||||||
*/
|
* would love to support it if it is -Jack
|
||||||
#if defined(__AVR_AT90USB162__)
|
|
||||||
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0;
|
|
||||||
TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
|
|
||||||
DDRB = 0; DDRC = 0; DDRD = 0;
|
|
||||||
PORTB = 0; PORTC = 0; PORTD = 0;
|
|
||||||
#elif defined(__AVR_ATmega32U4__)
|
|
||||||
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
|
|
||||||
TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
|
|
||||||
DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
|
|
||||||
PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
|
|
||||||
#elif defined(__AVR_AT90USB646__)
|
|
||||||
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
|
|
||||||
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
|
|
||||||
DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
|
|
||||||
PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
|
|
||||||
#elif defined(__AVR_AT90USB1286__)
|
|
||||||
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
|
|
||||||
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
|
|
||||||
DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
|
|
||||||
PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* USBaspLoader
|
|
||||||
*/
|
*/
|
||||||
#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__)
|
#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__)
|
||||||
// This makes custom USBasploader come up.
|
// This makes custom USBasploader come up.
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
// Copyright 2017 Jack Humbert
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#include <avr/io.h>
|
||||||
|
#include <avr/boot.h>
|
||||||
|
|
||||||
|
// this is not valid C - it's for computing the size available on the chip
|
||||||
|
AVR_SIZE: FLASHEND + 1 - BOOTLOADER_SIZE
|
|
@ -216,6 +216,9 @@ MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@)
|
||||||
|
|
||||||
elf: $(BUILD_DIR)/$(TARGET).elf
|
elf: $(BUILD_DIR)/$(TARGET).elf
|
||||||
hex: $(BUILD_DIR)/$(TARGET).hex
|
hex: $(BUILD_DIR)/$(TARGET).hex
|
||||||
|
cphex: hex
|
||||||
|
$(SILENT) || printf "Copying $(TARGET).hex to qmk_firmware folder" | $(AWK_CMD)
|
||||||
|
$(COPY) $(BUILD_DIR)/$(TARGET).hex $(TARGET).hex && $(PRINT_OK)
|
||||||
eep: $(BUILD_DIR)/$(TARGET).eep
|
eep: $(BUILD_DIR)/$(TARGET).eep
|
||||||
lss: $(BUILD_DIR)/$(TARGET).lss
|
lss: $(BUILD_DIR)/$(TARGET).lss
|
||||||
sym: $(BUILD_DIR)/$(TARGET).sym
|
sym: $(BUILD_DIR)/$(TARGET).sym
|
||||||
|
@ -223,19 +226,17 @@ LIBNAME=lib$(TARGET).a
|
||||||
lib: $(LIBNAME)
|
lib: $(LIBNAME)
|
||||||
|
|
||||||
# Display size of file.
|
# Display size of file.
|
||||||
HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
|
HEXSIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex
|
||||||
#ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf
|
#ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf
|
||||||
ELFSIZE = $(SIZE) $(BUILD_DIR)/$(TARGET).elf
|
ELFSIZE = $(SIZE) $(BUILD_DIR)/$(TARGET).elf
|
||||||
|
|
||||||
sizebefore:
|
sizebefore:
|
||||||
@if test -f $(TARGET).hex; then $(SECHO) $(MSG_SIZE_BEFORE); $(SILENT) || $(HEXSIZE); \
|
@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO) $(MSG_SIZE_BEFORE); $(SILENT) || $(HEXSIZE); \
|
||||||
2>/dev/null; $(SECHO); fi
|
2>/dev/null; $(SECHO); fi
|
||||||
|
|
||||||
sizeafter: $(BUILD_DIR)/$(TARGET).hex
|
sizeafter: $(BUILD_DIR)/$(TARGET).hex
|
||||||
@if test -f $(TARGET).hex; then $(SECHO); $(SECHO) $(MSG_SIZE_AFTER); $(SILENT) || $(HEXSIZE); \
|
@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO); $(SECHO) $(MSG_SIZE_AFTER); $(SILENT) || $(HEXSIZE); \
|
||||||
2>/dev/null; $(SECHO); fi
|
2>/dev/null; $(SECHO); fi
|
||||||
# test file sizes eventually
|
|
||||||
# @if [[ $($(SIZE) --target=$(FORMAT) $(TARGET).hex | $(AWK) 'NR==2 {print "0x"$5}') -gt 0x200 ]]; then $(SECHO) "File is too big!"; fi
|
|
||||||
|
|
||||||
# Display compiler version information.
|
# Display compiler version information.
|
||||||
gccversion :
|
gccversion :
|
||||||
|
@ -249,8 +250,6 @@ gccversion :
|
||||||
@if $(AUTOGEN); then \
|
@if $(AUTOGEN); then \
|
||||||
$(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/$(TARGET).hex\n"; \
|
$(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/$(TARGET).hex\n"; \
|
||||||
$(COPY) $@ $(KEYMAP_PATH)/$(TARGET).hex; \
|
$(COPY) $@ $(KEYMAP_PATH)/$(TARGET).hex; \
|
||||||
else \
|
|
||||||
$(COPY) $@ $(TARGET).hex; \
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%.eep: %.elf
|
%.eep: %.elf
|
||||||
|
@ -371,6 +370,14 @@ show_path:
|
||||||
@echo SRC=$(SRC)
|
@echo SRC=$(SRC)
|
||||||
@echo OBJ=$(OBJ)
|
@echo OBJ=$(OBJ)
|
||||||
|
|
||||||
|
check-size:
|
||||||
|
$(eval MAX_SIZE=$(shell n=`avr-gcc -E -mmcu=$(MCU) $(CFLAGS) $(OPT_DEFS) tmk_core/common/avr/bootloader_size.c 2> /dev/null | grep -oP "(?<=AVR_SIZE: ).+"`; echo $$(($$n)) || echo 0))
|
||||||
|
$(eval CURRENT_SIZE=$(shell if [ -f $(BUILD_DIR)/$(TARGET).hex ]; then $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(AWK) 'NR==2 {print $$4}'; else printf 0; fi))
|
||||||
|
if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \
|
||||||
|
$(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \
|
||||||
|
if [ $(CURRENT_SIZE) -gt $(MAX_SIZE) ]; then $(PRINT_WARNING_PLAIN); $(SILENT) || printf " * $(MSG_FILE_TOO_BIG)" ; else $(PRINT_OK); $(SILENT) || printf " * $(MSG_FILE_JUST_RIGHT)"; fi \
|
||||||
|
fi
|
||||||
|
|
||||||
# Create build directory
|
# Create build directory
|
||||||
$(shell mkdir -p $(BUILD_DIR) 2>/dev/null)
|
$(shell mkdir -p $(BUILD_DIR) 2>/dev/null)
|
||||||
|
|
||||||
|
@ -385,4 +392,4 @@ $(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null)))
|
||||||
.PHONY : all finish sizebefore sizeafter qmkversion \
|
.PHONY : all finish sizebefore sizeafter qmkversion \
|
||||||
gccversion build elf hex eep lss sym coff extcoff \
|
gccversion build elf hex eep lss sym coff extcoff \
|
||||||
clean clean_list debug gdb-config show_path \
|
clean clean_list debug gdb-config show_path \
|
||||||
program teensy dfu flip dfu-ee flip-ee dfu-start
|
program teensy dfu flip dfu-ee flip-ee dfu-start
|
|
@ -428,7 +428,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
case KC_MAKE:
|
case KC_MAKE:
|
||||||
if (!record->event.pressed) {
|
if (!record->event.pressed) {
|
||||||
SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP);
|
SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP);
|
||||||
#ifndef CATERINA_BOOTLOADER
|
#ifndef BOOTLOADER_CATERINA
|
||||||
SEND_STRING(":teensy ");
|
SEND_STRING(":teensy ");
|
||||||
#else
|
#else
|
||||||
SEND_STRING(" ");
|
SEND_STRING(" ");
|
||||||
|
|
|
@ -43,7 +43,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
case KC_MAKE:
|
case KC_MAKE:
|
||||||
if (!record->event.pressed) {
|
if (!record->event.pressed) {
|
||||||
SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP);
|
SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP);
|
||||||
#ifndef CATERINA_BOOTLOADER
|
#ifndef BOOTLOADER_CATERINA
|
||||||
SEND_STRING(":teensy ");
|
SEND_STRING(":teensy ");
|
||||||
#else
|
#else
|
||||||
SEND_STRING(" ");
|
SEND_STRING(" ");
|
||||||
|
|
Loading…
Reference in New Issue