diff options
| -rw-r--r-- | quantum/template/avr/readme.md | 2 | ||||
| -rw-r--r-- | quantum/template/avr/rules.mk | 25 | ||||
| -rw-r--r-- | quantum/template/avr/template.h | 14 | ||||
| -rw-r--r-- | quantum/template/base/keymaps/default/keymap.c | 54 | ||||
| -rw-r--r-- | quantum/template/ps2avrgb/readme.md | 2 | ||||
| -rw-r--r-- | quantum/template/ps2avrgb/template.h | 12 | 
6 files changed, 65 insertions, 44 deletions
| diff --git a/quantum/template/avr/readme.md b/quantum/template/avr/readme.md index d9349811d0..d243c66a94 100644 --- a/quantum/template/avr/readme.md +++ b/quantum/template/avr/readme.md @@ -12,4 +12,4 @@ Make example for this keyboard (after setting up your build environment):      make %KEYBOARD%:default -See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
\ No newline at end of file +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/quantum/template/avr/rules.mk b/quantum/template/avr/rules.mk index 92f3a03a92..383a3594b4 100644 --- a/quantum/template/avr/rules.mk +++ b/quantum/template/avr/rules.mk @@ -39,13 +39,24 @@ F_USB = $(F_CPU)  OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -# Boot Section Size in *bytes* -#   Teensy halfKay   512 -#   Teensy++ halfKay 1024 -#   Atmel DFU loader 4096 -#   LUFA bootloader  4096 -#   USBaspLoader     2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   atmega32a    bootloadHID +BOOTLOADER = atmel-dfu + + +# If you don't know the bootloader type, then you can specify the +# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line +#   Teensy halfKay      512 +#   Teensy++ halfKay    1024 +#   Atmel DFU loader    4096 +#   LUFA bootloader     4096 +#   USBaspLoader        2048 +# OPT_DEFS += -DBOOTLOADER_SIZE=4096  # Build Options diff --git a/quantum/template/avr/template.h b/quantum/template/avr/template.h index 031efc9529..0d626ed50b 100644 --- a/quantum/template/avr/template.h +++ b/quantum/template/avr/template.h @@ -18,12 +18,14 @@  #include "quantum.h" -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments representing the physical -// layout of the board and position of the keys -// The second converts the arguments into a two-dimensional array which  -// represents the switch matrix.  +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */  #define LAYOUT( \      K00, K01, K02, \        K10,  K11   \ diff --git a/quantum/template/base/keymaps/default/keymap.c b/quantum/template/base/keymaps/default/keymap.c index 14a8bc0f28..5f0730c8a9 100644 --- a/quantum/template/base/keymaps/default/keymap.c +++ b/quantum/template/base/keymaps/default/keymap.c @@ -15,32 +15,40 @@   */  #include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( /* Base */ -  KC_A,  KC_1,  KC_H, \ -    KC_TAB,  KC_SPC   \ -), +// Defines the keycodes used by our macros in process_record_user +enum custom_keycodes { +  QMKBEST = SAFE_RANGE, +  QMKURL  }; -const uint16_t PROGMEM fn_actions[] = { - +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +  [0] = LAYOUT( /* Base */ +    KC_A,  KC_1,  KC_H, \ +      KC_TAB,  KC_SPC   \ +  ),  }; -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ -  // MACRODOWN only works in this function -      switch(id) { -        case 0: -          if (record->event.pressed) { -            register_code(KC_RSFT); -          } else { -            unregister_code(KC_RSFT); -          } -        break; +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +  switch (keycode) { +    case QMKBEST: +      if (record->event.pressed) { +        // when keycode QMKBEST is pressed +        SEND_STRING("QMK is the best thing ever!"); +      } else { +        // when keycode QMKBEST is released        } -    return MACRO_NONE; -}; - +      break; +    case QMKURL: +      if (record->event.pressed) { +        // when keycode QMKURL is pressed +        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); +      } else { +        // when keycode QMKURL is released +      } +      break; +  } +  return true; +}  void matrix_init_user(void) { @@ -50,10 +58,6 @@ void matrix_scan_user(void) {  } -bool process_record_user(uint16_t keycode, keyrecord_t *record) { -  return true; -} -  void led_set_user(uint8_t usb_led) {  } diff --git a/quantum/template/ps2avrgb/readme.md b/quantum/template/ps2avrgb/readme.md index 1dcbe6e755..feec722a52 100644 --- a/quantum/template/ps2avrgb/readme.md +++ b/quantum/template/ps2avrgb/readme.md @@ -41,4 +41,4 @@ macOS:  4. Place your keyboard into reset.   5. Flash the board by typing `bootloadHID -r` followed by the path to your `.hex` file.  -See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/quantum/template/ps2avrgb/template.h b/quantum/template/ps2avrgb/template.h index c3924ee71f..b4d6f46624 100644 --- a/quantum/template/ps2avrgb/template.h +++ b/quantum/template/ps2avrgb/template.h @@ -18,10 +18,14 @@  #include "quantum.h" -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */  #define LAYOUT( \      k00, k01, k02, \        k10,  k11   \ | 
