Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						19fd0108d3
					
				| @ -7,7 +7,6 @@ BOARD = QMK_PROTON_C | |||||||
| #
 | #
 | ||||||
| BACKLIGHT_ENABLE = no | BACKLIGHT_ENABLE = no | ||||||
| BOOTMAGIC_ENABLE = no	# Virtual DIP switch configuration | BOOTMAGIC_ENABLE = no	# Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = yes	# Mouse keys | MOUSEKEY_ENABLE = yes	# Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes	# Audio control and System control | EXTRAKEY_ENABLE = yes	# Audio control and System control | ||||||
| CONSOLE_ENABLE = no	# Console for debug | CONSOLE_ENABLE = no	# Console for debug | ||||||
|  | |||||||
| @ -7,7 +7,6 @@ BOARD = QMK_PROTON_C | |||||||
| #
 | #
 | ||||||
| BACKLIGHT_ENABLE = no | BACKLIGHT_ENABLE = no | ||||||
| BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration | BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = yes # Mouse keys | MOUSEKEY_ENABLE = yes # Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes # Audio control and System control | EXTRAKEY_ENABLE = yes # Audio control and System control | ||||||
| CONSOLE_ENABLE = no  # Console for debug | CONSOLE_ENABLE = no  # Console for debug | ||||||
|  | |||||||
| @ -10,7 +10,6 @@ LED_MATRIX_DRIVER = IS31FL3731 | |||||||
| #   comment out to disable the options.
 | #   comment out to disable the options.
 | ||||||
| #
 | #
 | ||||||
| BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration | BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = yes	# Mouse keys | MOUSEKEY_ENABLE = yes	# Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes	# Audio control and System control | EXTRAKEY_ENABLE = yes	# Audio control and System control | ||||||
| CONSOLE_ENABLE = yes	# Console for debug | CONSOLE_ENABLE = yes	# Console for debug | ||||||
|  | |||||||
| @ -7,7 +7,6 @@ BOARD = QMK_PROTON_C | |||||||
| #
 | #
 | ||||||
| BACKLIGHT_ENABLE = no | BACKLIGHT_ENABLE = no | ||||||
| BOOTMAGIC_ENABLE = full	# Virtual DIP switch configuration | BOOTMAGIC_ENABLE = full	# Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = yes	# Mouse keys | MOUSEKEY_ENABLE = yes	# Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes	# Audio control and System control | EXTRAKEY_ENABLE = yes	# Audio control and System control | ||||||
| CONSOLE_ENABLE = no	# Console for debug | CONSOLE_ENABLE = no	# Console for debug | ||||||
|  | |||||||
| @ -17,7 +17,6 @@ BOARD = MCHCK_K20 | |||||||
| #   comment out to disable the options.
 | #   comment out to disable the options.
 | ||||||
| #
 | #
 | ||||||
| BOOTMAGIC_ENABLE = no	# Virtual DIP switch configuration | BOOTMAGIC_ENABLE = no	# Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = yes	# Mouse keys | MOUSEKEY_ENABLE = yes	# Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes	# Audio control and System control | EXTRAKEY_ENABLE = yes	# Audio control and System control | ||||||
| CONSOLE_ENABLE = yes	# Console for debug | CONSOLE_ENABLE = yes	# Console for debug | ||||||
|  | |||||||
| @ -8,7 +8,6 @@ BOARD = JM60_BOARD | |||||||
| #   comment out to disable the options.
 | #   comment out to disable the options.
 | ||||||
| #
 | #
 | ||||||
| BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration | BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = no	# Mouse keys | MOUSEKEY_ENABLE = no	# Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes	# Audio control and System control | EXTRAKEY_ENABLE = yes	# Audio control and System control | ||||||
| CONSOLE_ENABLE = no	# Console for debug | CONSOLE_ENABLE = no	# Console for debug | ||||||
|  | |||||||
| @ -7,7 +7,6 @@ BOARD = QMK_PROTON_C | |||||||
| #   the appropriate keymap folder that will get included automatically
 | #   the appropriate keymap folder that will get included automatically
 | ||||||
| #
 | #
 | ||||||
| BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration | BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = yes      # Mouse keys | MOUSEKEY_ENABLE = yes      # Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes       # Audio control and System control | EXTRAKEY_ENABLE = yes       # Audio control and System control | ||||||
| CONSOLE_ENABLE = yes         # Console for debug | CONSOLE_ENABLE = yes         # Console for debug | ||||||
|  | |||||||
| @ -3,7 +3,6 @@ | |||||||
| #
 | #
 | ||||||
| BACKLIGHT_ENABLE = no | BACKLIGHT_ENABLE = no | ||||||
| BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration | BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = yes	# Mouse keys | MOUSEKEY_ENABLE = yes	# Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes	# Audio control and System control | EXTRAKEY_ENABLE = yes	# Audio control and System control | ||||||
| CONSOLE_ENABLE = yes	# Console for debug | CONSOLE_ENABLE = yes	# Console for debug | ||||||
|  | |||||||
| @ -7,7 +7,6 @@ BOARD = QMK_PROTON_C | |||||||
| #   the appropriate keymap folder that will get included automatically
 | #   the appropriate keymap folder that will get included automatically
 | ||||||
| #
 | #
 | ||||||
| BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration | BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = yes      # Mouse keys | MOUSEKEY_ENABLE = yes      # Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes       # Audio control and System control | EXTRAKEY_ENABLE = yes       # Audio control and System control | ||||||
| CONSOLE_ENABLE = yes         # Console for debug | CONSOLE_ENABLE = yes         # Console for debug | ||||||
|  | |||||||
| @ -7,7 +7,6 @@ BOARD = QMK_PROTON_C | |||||||
| #   the appropriate keymap folder that will get included automatically
 | #   the appropriate keymap folder that will get included automatically
 | ||||||
| #
 | #
 | ||||||
| BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration | BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = yes      # Mouse keys | MOUSEKEY_ENABLE = yes      # Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes       # Audio control and System control | EXTRAKEY_ENABLE = yes       # Audio control and System control | ||||||
| CONSOLE_ENABLE = yes         # Console for debug | CONSOLE_ENABLE = yes         # Console for debug | ||||||
|  | |||||||
| @ -8,7 +8,6 @@ MCU = STM32F072 | |||||||
| LTO_ENABLE = yes | LTO_ENABLE = yes | ||||||
| BACKLIGHT_ENABLE = no | BACKLIGHT_ENABLE = no | ||||||
| BOOTMAGIC_ENABLE = lite  # Virtual DIP switch configuration | BOOTMAGIC_ENABLE = lite  # Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = no # Mouse keys | MOUSEKEY_ENABLE = no # Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes # Audio control and System control | EXTRAKEY_ENABLE = yes # Audio control and System control | ||||||
| CONSOLE_ENABLE = no  # Console for debug | CONSOLE_ENABLE = no  # Console for debug | ||||||
|  | |||||||
| @ -8,7 +8,6 @@ MCU = STM32F072 | |||||||
| LTO_ENABLE = yes | LTO_ENABLE = yes | ||||||
| BACKLIGHT_ENABLE = no | BACKLIGHT_ENABLE = no | ||||||
| BOOTMAGIC_ENABLE = lite  # Virtual DIP switch configuration | BOOTMAGIC_ENABLE = lite  # Virtual DIP switch configuration | ||||||
| ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 |  | ||||||
| MOUSEKEY_ENABLE = no # Mouse keys | MOUSEKEY_ENABLE = no # Mouse keys | ||||||
| EXTRAKEY_ENABLE = yes # Audio control and System control | EXTRAKEY_ENABLE = yes # Audio control and System control | ||||||
| CONSOLE_ENABLE = no  # Console for debug | CONSOLE_ENABLE = no  # Console for debug | ||||||
|  | |||||||
| @ -16,7 +16,6 @@ ifneq ($(findstring MKL26Z64, $(MCU)),) | |||||||
|   # Linker script to use |   # Linker script to use | ||||||
|   # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ |   # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||||||
|   #   or <keyboard_dir>/ld/ |   #   or <keyboard_dir>/ld/ | ||||||
|   # - NOTE: a custom ld script is needed for EEPROM on Teensy LC |  | ||||||
|   MCU_LDSCRIPT ?= MKL26Z64 |   MCU_LDSCRIPT ?= MKL26Z64 | ||||||
| 
 | 
 | ||||||
|   # Startup code to use |   # Startup code to use | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user