Remove unused _BOOTLOADER defines

This commit is contained in:
fauxpark 2019-08-02 13:47:52 +10:00 committed by noroadsleft
parent 430c37024e
commit 72f382fc02
20 changed files with 48 additions and 55 deletions

View File

@ -36,4 +36,3 @@ 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

View File

@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } #define MATRIX_COL_PINS { F5, 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 tapping term */ /* define tapping term */
#define TAPPING_TERM 100 #define TAPPING_TERM 100

View File

@ -43,13 +43,15 @@ F_USB = $(F_CPU)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in *bytes* # Bootloader selection
# Teensy halfKay 512 # Teensy halfkay
# Teensy++ halfKay 1024 # Pro Micro caterina
# Atmel DFU loader 4096 # Atmel DFU atmel-dfu
# LUFA bootloader 4096 # LUFA DFU lufa-dfu
# USBaspLoader 2048 # QMK DFU qmk-dfu
OPT_DEFS += -DBOOTLOADER_SIZE=4096 # atmega32a bootloadHID
BOOTLOADER = caterina
# 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

View File

@ -51,8 +51,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

View File

@ -37,10 +37,13 @@ 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 # Bootloader selection
# This definition is optional, and if your keyboard supports multiple bootloaders of # Teensy halfkay
# different sizes, comment this out, and the correct address will be loaded # Pro Micro caterina
# automatically (+60). See bootloader.mk for all options. # Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# atmega32a bootloadHID
BOOTLOADER = caterina BOOTLOADER = caterina
# Interrupt driven control endpoint task(+60) # Interrupt driven control endpoint task(+60)

View File

@ -46,6 +46,5 @@ 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
#endif #endif

View File

@ -25,10 +25,13 @@ NO_SUSPEND_POWER_DOWN = yes
# processor frequency # processor frequency
F_CPU = 12000000 F_CPU = 12000000
# Bootloader # Bootloader selection
# This definition is optional, and if your keyboard supports multiple bootloaders of # Teensy halfkay
# different sizes, comment this out, and the correct address will be loaded # Pro Micro caterina
# automatically (+60). See bootloader.mk for all options. # Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# atmega32a bootloadHID
BOOTLOADER = bootloadHID BOOTLOADER = bootloadHID
# build options # build options

View File

@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } #define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
#define CATERINA_BOOTLOADER
#define USB_MAX_POWER_CONSUMPTION 50 #define USB_MAX_POWER_CONSUMPTION 50
/* Use I2C or Serial, not both */ /* Use I2C or Serial, not both */

View File

@ -33,10 +33,13 @@ 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 # Bootloader selection
# This definition is optional, and if your keyboard supports multiple bootloaders of # Teensy halfkay
# different sizes, comment this out, and the correct address will be loaded # Pro Micro caterina
# automatically (+60). See bootloader.mk for all options. # Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# atmega32a bootloadHID
BOOTLOADER = caterina BOOTLOADER = caterina
# Interrupt driven control endpoint task(+60) # Interrupt driven control endpoint task(+60)

View File

@ -36,8 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } #define MATRIX_ROW_PINS { C6, 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
/* define tapping term */ /* define tapping term */
#define TAPPING_TERM 100 #define TAPPING_TERM 100
@ -72,4 +70,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_TAPPING //#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO //#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION //#define NO_ACTION_FUNCTION

View File

@ -40,10 +40,13 @@ 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 # Bootloader selection
# This definition is optional, and if your keyboard supports multiple bootloaders of # Teensy halfkay
# different sizes, comment this out, and the correct address will be loaded # Pro Micro caterina
# automatically (+60). See bootloader.mk for all options. # Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# atmega32a bootloadHID
BOOTLOADER = caterina BOOTLOADER = caterina
# Interrupt driven control endpoint task(+60) # Interrupt driven control endpoint task(+60)

View File

@ -40,9 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define B5_AUDIO #define B5_AUDIO
#define AUDIO_VOICES #define AUDIO_VOICES
#define CATERINA_BOOTLOADER
// #define BACKLIGHT_PIN B7 // #define BACKLIGHT_PIN B7
// #define BACKLIGHT_BREATHING // #define BACKLIGHT_BREATHING
//#define BACKLIGHT_LEVELS 3 //#define BACKLIGHT_LEVELS 3

View File

@ -36,8 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LED_EN_PIN D2 #define LED_EN_PIN D2
#define UNUSED_PINS #define UNUSED_PINS
#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 DEBOUNCE 5 #define DEBOUNCE 5

View File

@ -32,15 +32,14 @@ BOOTLOADER = caterina
# Interrupt driven control endpoint task(+60) # Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Bootloader selection
# Boot Section Size in *bytes* # Teensy halfkay
# Teensy halfKay 512 # Pro Micro caterina
# Teensy++ halfKay 1024 # Atmel DFU atmel-dfu
# Atmel DFU loader 4096 # LUFA DFU lufa-dfu
# LUFA bootloader 4096 # QMK DFU qmk-dfu
# USBaspLoader 2048 # atmega32a bootloadHID
OPT_DEFS += -DBOOTLOADER_SIZE=4096 BOOTLOADER = caterina
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable

View File

@ -48,8 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { D2, F5, F6, D6, D7, B4, B5, B6, F7 } #define MATRIX_COL_PINS { D2, F5, F6, D6, D7, B4, B5, B6, F7 }
/*/ /*/
#define CATERINA_BOOTLOADER
/* COL2ROW or ROW2COL */ /* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW

View File

@ -34,6 +34,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_LEVELS 5 #define BACKLIGHT_LEVELS 5
#define NO_UART 1 #define NO_UART 1
#define BOOTLOADHID_BOOTLOADER 1
#endif #endif

View File

@ -38,7 +38,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
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
// the backlight PWM does not work (yet). Therefore, we only have two backlight levels (on/off) // the backlight PWM does not work (yet). Therefore, we only have two backlight levels (on/off)

View File

@ -37,7 +37,7 @@ 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 BOOTLOADER = bootloadHID
# custom matrix setup # custom matrix setup
SRC = i2c_master.c SRC = i2c_master.c

View File

@ -46,6 +46,5 @@ 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
#endif #endif

View File

@ -51,7 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS
/*#define RGBLIGHT_VAL_STEP 20 /*#define RGBLIGHT_VAL_STEP 20
#define NO_UART 1 #define NO_UART 1*/
#define BOOTLOADHID_BOOTLOADER 1*/
#endif #endif