From: Fred Sundvik Date: Sat, 27 Aug 2016 18:01:46 +0000 (+0300) Subject: Merge branch 'master' into fix_line_endings X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cff26bc48413ec62d4f4a37e3a6ba34721e7670c;p=qmk_firmware.git Merge branch 'master' into fix_line_endings --- cff26bc48413ec62d4f4a37e3a6ba34721e7670c diff --cc keyboards/gh60/Makefile index 075b77256,4e2a6f00f..57b2ef62e --- a/keyboards/gh60/Makefile +++ b/keyboards/gh60/Makefile @@@ -1,74 -1,3 +1,3 @@@ - - - # MCU name - #MCU = at90usb1287 - MCU = atmega32u4 - - # Processor frequency. - # This will define a symbol, F_CPU, in all source code files equal to the - # processor frequency in Hz. You can then use this symbol in your source code to - # calculate timings. Do NOT tack on a 'UL' at the end, this will be done - # automatically to create a 32-bit value in your source code. - # - # This will be an integer division of F_USB below, as it is sourced by - # F_USB after it has run through any CPU prescalers. Note that this value - # does not *change* the processor frequency - it should merely be updated to - # reflect the processor speed set externally so that the code can use accurate - # software delays. - F_CPU = 16000000 - - - # - # LUFA specific - # - # Target architecture (see library "Board Types" documentation). - ARCH = AVR8 - - # Input clock frequency. - # This will define a symbol, F_USB, in all source code files equal to the - # input clock frequency (before any prescaling is performed) in Hz. This value may - # differ from F_CPU if prescaling is used on the latter, and is required as the - # raw input clock is fed directly to the PLL sections of the AVR for high speed - # clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' - # at the end, this will be done automatically to create a 32-bit value in your - # source code. - # - # If no clock division is performed on the input clock inside the AVR (via the - # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. - F_USB = $(F_CPU) - - # Interrupt driven control endpoint task(+60) - 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 - # comment out to disable the options. - # - BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) - MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) - EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) - # CONSOLE_ENABLE ?= yes # Console for debug(+400) - # COMMAND_ENABLE ?= yes # Commands for debug and configuration - KEYBOARD_LOCK_ENABLE ?= yes # Allow locking of keyboard via magic key - # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE - # SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend - NKRO_ENABLE ?= yes # USB 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 - # MIDI_ENABLE ?= YES # MIDI controls - # UNICODE_ENABLE ?= YES # Unicode - # BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID - - - ifndef QUANTUM_DIR + ifndef MAKEFILE_INCLUDED include ../../Makefile -endif +endif - diff --cc keyboards/gh60/readme.md index ad042483d,20afb0db0..8c744bfd3 --- a/keyboards/gh60/readme.md +++ b/keyboards/gh60/readme.md @@@ -1,60 -1,62 +1,62 @@@ -## gh60 Rev C keyboard firmware - -![gh60 Rev C PCB](gh60revc.jpg) - - /* Column pin configuration - * col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 - * pin: F0 F1 E6 C7 C6 B6 D4 B1 B7 B5 B4 D7 D6 B3 (Rev.C) - */ - - /* Row pin configuration - * row: 0 1 2 3 4 - * pin: D0 D1 D2 D3 D5 - */ - - GPIO pads - 0 F7 WASD LEDs - 1 F6 ESC LED - 2 F5 FN LED - 3 F4 POKER Arrow LEDs - - B2 Capslock LED - B0 not connected - -Functions to controls LED clusters - - gh60_caps_led_on() - gh60_poker_leds_on() - gh60_fn_led_on() - gh60_esc_led_on() - gh60_wasd_leds_on() - - gh60_caps_led_off() - gh60_poker_leds_off() - gh60_fn_led_off() - gh60_esc_led_off() - gh60_wasd_leds_off() - -====================== - -## Quantum MK Firmware - -For the full Quantum feature list, see [the parent readme.md](/readme.md). - -## Building - -Download or clone the whole firmware and navigate to the keyboards/gh60_rev_c folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. - -Depending on which keymap you would like to use, you will have to compile slightly differently. - -### Default -To build with the default keymap, simply run `make default`. - -### Other Keymaps -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `.c` in the keymaps folder, and see keymap document (you can find in top readme.md) and existent keymap files. - -To build the firmware binary hex file with a keymap just do `make` with a keymap like this: - -``` -$ make [default|jack|] -``` - -Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. +## gh60 Rev C keyboard firmware + +![gh60 Rev C PCB](gh60revc.jpg) + + /* Column pin configuration + * col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 + * pin: F0 F1 E6 C7 C6 B6 D4 B1 B7 B5 B4 D7 D6 B3 (Rev.C) + */ + + /* Row pin configuration + * row: 0 1 2 3 4 + * pin: D0 D1 D2 D3 D5 + */ + + GPIO pads + 0 F7 WASD LEDs + 1 F6 ESC LED + 2 F5 FN LED + 3 F4 POKER Arrow LEDs + + B2 Capslock LED + B0 not connected + +Functions to controls LED clusters + + gh60_caps_led_on() + gh60_poker_leds_on() + gh60_fn_led_on() + gh60_esc_led_on() + gh60_wasd_leds_on() + + gh60_caps_led_off() + gh60_poker_leds_off() + gh60_fn_led_off() + gh60_esc_led_off() + gh60_wasd_leds_off() + +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme.md](/readme.md). + +## Building + +Download or clone the whole firmware and navigate to the keyboards/gh60_rev_c folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. + +Depending on which keymap you would like to use, you will have to compile slightly differently. + +### Default - To build with the default keymap, simply run `make`. ++To build with the default keymap, simply run `make default`. + +### Other Keymaps +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `.c` in the keymaps folder, and see keymap document (you can find in top readme.md) and existent keymap files. + - To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like: ++To build the firmware binary hex file with a keymap just do `make` with a keymap like this: ++ +``` - $ make KEYMAP=[default|jack|] ++$ make [default|jack|] +``` ++ +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder.