From 6bafafc18db88cf6e3f04449bc1b63ba81d90e3c Mon Sep 17 00:00:00 2001 From: Nigel Lundsten Date: Wed, 17 Aug 2016 14:00:47 -0700 Subject: [PATCH 001/120] fix ergodox link (again?) /ergodox/ez is a broken link, seems like the ez stuff is at /ergodox --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index e2221e7496..c4f3a9fe2d 100644 --- a/readme.md +++ b/readme.md @@ -13,7 +13,7 @@ For an easy-to-read version of this document and the repository, check out [http * [Planck](/keyboards/planck/) * [Preonic](/keyboards/preonic/) * [Atomic](/keyboards/atomic/) -* [ErgoDox EZ](/keyboards/ergodox/ez/) +* [ErgoDox EZ](/keyboards/ergodox) * [Clueboard](/keyboards/clueboard/) * [Cluepad](/keyboards/cluepad/) From 3e1d1420186277237b872574164d38d264644ebe Mon Sep 17 00:00:00 2001 From: Nigel Lundsten Date: Wed, 17 Aug 2016 14:01:27 -0700 Subject: [PATCH 002/120] trailing slash --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index c4f3a9fe2d..353c74611e 100644 --- a/readme.md +++ b/readme.md @@ -13,7 +13,7 @@ For an easy-to-read version of this document and the repository, check out [http * [Planck](/keyboards/planck/) * [Preonic](/keyboards/preonic/) * [Atomic](/keyboards/atomic/) -* [ErgoDox EZ](/keyboards/ergodox) +* [ErgoDox EZ](/keyboards/ergodox/) * [Clueboard](/keyboards/clueboard/) * [Cluepad](/keyboards/cluepad/) From 578b7e969ea93f1f07ea2dde9c986101e97a9e2d Mon Sep 17 00:00:00 2001 From: dbroqua Date: Fri, 19 Aug 2016 09:19:55 +0200 Subject: [PATCH 003/120] - Updated dbroqua layout for planck keyboard --- keyboards/planck/keymaps/dbroqua/keymap.c | 314 ++++++++++++++++++++++ 1 file changed, 314 insertions(+) create mode 100644 keyboards/planck/keymaps/dbroqua/keymap.c diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c new file mode 100644 index 0000000000..e183582cfd --- /dev/null +++ b/keyboards/planck/keymaps/dbroqua/keymap.c @@ -0,0 +1,314 @@ +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, +// this is the style you want to emulate. + +#include "planck.h" +#include "action_layer.h" +#ifdef AUDIO_ENABLE + #include "audio.h" +#endif +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _PLOVER 5 +#define _ADJUST 16 + +enum planck_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + PLOVER, + LOWER, + RAISE, + BACKLIT, + EXT_PLV +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Qwerty + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Ctrl | GUI | Lower| Raise| Alt | Space |AltGr | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_QWERTY] = { + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, + {KC_LCTL, KC_LGUI, LOWER, RAISE, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT} +}, + +/* Colemak + * ,-----------------------------------------------------------------------------------. + * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | R | S | T | D | H | N | E | I | O | " | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_COLEMAK] = { + {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, + {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, + {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +/* Dvorak + * ,-----------------------------------------------------------------------------------. + * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | Esc | A | O | E | U | I | D | H | T | N | S | / | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------------------------------------------------' + */ +[_DVORAK] = { + {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, + {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, + {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, + {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} +}, + +/* Lower + * ,-----------------------------------------------------------------------------------. + * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | | | Home | PgDwn| PgUp | End | [ | ] | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | | | | | | \ |Insert| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| | | | | | | | | | Del | + * `-----------------------------------------------------------------------------------' + */ +[_LOWER] = { + {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, + {_______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LBRC, KC_RBRC}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,KC_BSLS, KC_INS}, + {BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, KC_DEL} +}, + +/* Raise + * ,-----------------------------------------------------------------------------------. + * | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | - | = | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | | | | | Left | Down | Up | Right| | ` | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | | | | | | Mute | Vol+ | Vol- | | | |Insert| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Prev | Play | Next | Del | + * `-----------------------------------------------------------------------------------' + */ +[_RAISE] = { + {KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL}, + {_______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_GRV}, + {_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD, _______, _______, _______, KC_INS}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL} +}, + +/* Plover layer (http://opensteno.org) + * ,-----------------------------------------------------------------------------------. + * | # | # | # | # | # | # | # | # | # | # | # | # | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | S | T | P | H | * | * | F | P | L | T | D | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * |TogOut| S | K | W | R | * | * | R | B | G | S | Z | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Exit | | | A | O | | E | U | | | | + * `-----------------------------------------------------------------------------------' + */ + +[_PLOVER] = { + {KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 }, + {XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC}, + {XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX} +}, + +/* Adjust (Lower + Raise) + * ,-----------------------------------------------------------------------------------. + * | | Reset| | | | | | | | | | Del | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| | + * |------+------+------+------+------+------|------+------+------+------+------+------| + * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * `-----------------------------------------------------------------------------------' + */ +[_ADJUST] = { + {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, + {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______}, + {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} +} + + +}; + +#ifdef AUDIO_ENABLE + +float tone_startup[][2] = SONG(STARTUP_SOUND); +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float tone_colemak[][2] = SONG(COLEMAK_SOUND); +float tone_plover[][2] = SONG(PLOVER_SOUND); +float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); +float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); + +float tone_goodbye[][2] = SONG(GOODBYE_SOUND); +#endif + + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_qwerty, false, 0); + #endif + persistant_default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_colemak, false, 0); + #endif + persistant_default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_dvorak, false, 0); + #endif + persistant_default_layer_set(1UL<<_DVORAK); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case BACKLIT: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + return false; + break; + case PLOVER: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + stop_all_notes(); + PLAY_NOTE_ARRAY(tone_plover, false, 0); + #endif + layer_off(_RAISE); + layer_off(_LOWER); + layer_off(_ADJUST); + layer_on(_PLOVER); + if (!eeconfig_is_enabled()) { + eeconfig_init(); + } + keymap_config.raw = eeconfig_read_keymap(); + keymap_config.nkro = 1; + eeconfig_update_keymap(keymap_config.raw); + } + return false; + break; + case EXT_PLV: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); + #endif + layer_off(_PLOVER); + } + return false; + break; + } + return true; +} + +void matrix_init_user(void) { + #ifdef AUDIO_ENABLE + startup_user(); + #endif +} + +#ifdef AUDIO_ENABLE + +void startup_user() +{ + _delay_ms(20); // gets rid of tick + PLAY_NOTE_ARRAY(tone_startup, false, 0); +} + +void shutdown_user() +{ + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + _delay_ms(150); + stop_all_notes(); +} + +void music_on_user(void) +{ + music_scale_user(); +} + +void music_scale_user(void) +{ + PLAY_NOTE_ARRAY(music_scale, false, 0); +} + +#endif \ No newline at end of file From 31120ed16690ff784d8ddc40a11b2fa5ebe9e717 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Fri, 19 Aug 2016 09:39:25 +0200 Subject: [PATCH 004/120] - Moved Brite function on esc to avoid conflict with ctrl key. --- keyboards/planck/keymaps/dbroqua/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c index e183582cfd..70bac391b0 100644 --- a/keyboards/planck/keymaps/dbroqua/keymap.c +++ b/keyboards/planck/keymaps/dbroqua/keymap.c @@ -97,18 +97,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | Home | PgDwn| PgUp | End | [ | ] | + * | Brite| | | | | | Home | PgDwn| PgUp | End | [ | ] | * |------+------+------+------+------+------|------+------+------+------+------+------| * | | | | | | | | | | | \ |Insert| * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| | | | | | | | | | Del | + * | | | | | | | | | | | Del | * `-----------------------------------------------------------------------------------' */ [_LOWER] = { {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, - {_______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LBRC, KC_RBRC}, + {BACKLIT, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LBRC, KC_RBRC}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,KC_BSLS, KC_INS}, - {BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, KC_DEL} + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, KC_DEL} }, /* Raise From b4f23b146f05aac1def181a3f4dd4fb0479d15e8 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Fri, 19 Aug 2016 14:01:37 +0200 Subject: [PATCH 005/120] - Moved Home/End/PgUp/PgDn on arrow keys --- keyboards/planck/keymaps/dbroqua/keymap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c index 70bac391b0..a0517ced7d 100644 --- a/keyboards/planck/keymaps/dbroqua/keymap.c +++ b/keyboards/planck/keymaps/dbroqua/keymap.c @@ -97,25 +97,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Brite| | | | | | Home | PgDwn| PgUp | End | [ | ] | + * | Brite| | | | | | | | | | [ | ] | * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | \ |Insert| + * | | | | | | | | | | | \ | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | Del | + * | | | | | | | | Home | PgDwn| PgUp | End | * `-----------------------------------------------------------------------------------' */ [_LOWER] = { - {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, - {BACKLIT, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LBRC, KC_RBRC}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,KC_BSLS, KC_INS}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, KC_DEL} + {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, + {BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END} }, /* Raise * ,-----------------------------------------------------------------------------------. * | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | - | = | * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | Left | Down | Up | Right| | ` | + * | | | | | | | | | | | | ` | * |------+------+------+------+------+------|------+------+------+------+------+------| * | | | | | | Mute | Vol+ | Vol- | | | |Insert| * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_RAISE] = { {KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL}, - {_______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_GRV}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV}, {_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD, _______, _______, _______, KC_INS}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL} }, From c6e733afce48871c1787912c08c6eb6a44f13291 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Fri, 19 Aug 2016 14:17:07 +0200 Subject: [PATCH 006/120] - Added readme file and layout preview --- keyboards/planck/keymaps/dbroqua/layout.png | Bin 0 -> 21465 bytes keyboards/planck/keymaps/dbroqua/readme.md | 11 +++++++++++ 2 files changed, 11 insertions(+) create mode 100644 keyboards/planck/keymaps/dbroqua/layout.png create mode 100644 keyboards/planck/keymaps/dbroqua/readme.md diff --git a/keyboards/planck/keymaps/dbroqua/layout.png b/keyboards/planck/keymaps/dbroqua/layout.png new file mode 100644 index 0000000000000000000000000000000000000000..bab28a7c7c0533644d40320b661baf1f32de0318 GIT binary patch literal 21465 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 literal 0 HcmV?d00001 diff --git a/keyboards/planck/keymaps/dbroqua/readme.md b/keyboards/planck/keymaps/dbroqua/readme.md new file mode 100644 index 0000000000..b3b64c325f --- /dev/null +++ b/keyboards/planck/keymaps/dbroqua/readme.md @@ -0,0 +1,11 @@ +# Dbroqua Layout + +![Layout](layout.png "Dbroqua Keymap") + +* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/e77306f9d14cc93fa26123b93b106474 + +# Programming Instructions: +Enter into programming mode and run the following command. +``` +$ sudo KEYMAP=dbroqua make dfu +``` From 11aa19a6264c3ca3151143db4b790db89791beee Mon Sep 17 00:00:00 2001 From: dbroqua Date: Fri, 19 Aug 2016 21:00:24 +0200 Subject: [PATCH 007/120] - Updated lower and raise layer --- keyboards/planck/keymaps/dbroqua/keymap.c | 176 ++++++-------------- keyboards/planck/keymaps/dbroqua/layout.png | Bin 21465 -> 20569 bytes 2 files changed, 48 insertions(+), 128 deletions(-) diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c index a0517ced7d..56d4cf22dd 100644 --- a/keyboards/planck/keymaps/dbroqua/keymap.c +++ b/keyboards/planck/keymaps/dbroqua/keymap.c @@ -15,36 +15,38 @@ extern keymap_config_t keymap_config; // Layer names don't all need to be of the same length, obviously, and you can also skip them // entirely and just use numbers. #define _QWERTY 0 -#define _COLEMAK 1 -#define _DVORAK 2 -#define _LOWER 3 -#define _RAISE 4 -#define _PLOVER 5 -#define _ADJUST 16 +#define _LOWER 1 +#define _RAISE 2 +#define _ESC 3 +#define _ADJUST 4 enum planck_keycodes { QWERTY = SAFE_RANGE, - COLEMAK, - DVORAK, - PLOVER, LOWER, RAISE, - BACKLIT, - EXT_PLV + BACKLIT }; // Fillers to make layering more clear #define _______ KC_TRNS #define XXXXXXX KC_NO +// Func macro definitions. +#define SFT_ESC FUNC(0) // Tap for Enter, hold for Shift + +// Enable these functions using FUNC(n) macro. +const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_LAYER_TAP_KEY(_ESC, KC_ESC) + }; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty * ,-----------------------------------------------------------------------------------. * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| * | Esc | A | S | D | F | G | H | J | K | L | ; | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Ctrl | GUI | Lower| Raise| Alt | Space |AltGr | Left | Down | Up |Right | @@ -52,108 +54,72 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_QWERTY] = { {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, - {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {SFT_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, {KC_LCTL, KC_LGUI, LOWER, RAISE, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT} }, -/* Colemak - * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Esc | A | R | S | T | D | H | N | E | I | O | " | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_COLEMAK] = { - {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC}, - {KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT}, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, - {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} -}, - -/* Dvorak - * ,-----------------------------------------------------------------------------------. - * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Esc | A | O | E | U | I | D | H | T | N | S | / | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | - * `-----------------------------------------------------------------------------------' - */ -[_DVORAK] = { - {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, - {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, - {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, - {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} -}, - /* Lower * ,-----------------------------------------------------------------------------------. - * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Brite| | | | | | | | | | [ | ] | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | \ | | + * | | | | | | | | | | | ( | ) | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | Brite| | | | | | | | | | { | } | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | [ | ] | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | Home | PgDwn| PgUp | End | * `-----------------------------------------------------------------------------------' */ [_LOWER] = { - {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, - {BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN}, + {BACKLIT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END} }, /* Raise * ,-----------------------------------------------------------------------------------. * | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | - | = | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | | | ` | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | Mute | Vol+ | Vol- | | | |Insert| * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Prev | Play | Next | Del | + * | | | | | | | | | | | | ` | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | \ |Insert| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | Del | * `-----------------------------------------------------------------------------------' */ [_RAISE] = { {KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV}, - {_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD, _______, _______, _______, KC_INS}, - {_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL} + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_INS}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL} }, -/* Plover layer (http://opensteno.org) +/* Esc * ,-----------------------------------------------------------------------------------. - * | # | # | # | # | # | # | # | # | # | # | # | # | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | S | T | P | H | * | * | F | P | L | T | D | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * |TogOut| S | K | W | R | * | * | R | B | G | S | Z | + * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Exit | | | A | O | | E | U | | | | + * | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | Mute | Vol+ | Vol- | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | Prev | Play | Next | | * `-----------------------------------------------------------------------------------' */ - -[_PLOVER] = { - {KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 }, - {XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC}, - {XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, - {EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX} +[_ESC] = { + {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD, _______, _______, _______, KC_INS}, + {_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL} }, + /* Adjust (Lower + Raise) * ,-----------------------------------------------------------------------------------. * | | Reset| | | | | | | | | | Del | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| | - * |------+------+------+------+------+------|------+------+------+------+------+------| + * |------+------+------+------+------+------+------+------+------+------+------+------| + * | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty| | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------| * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | @@ -161,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = { {_______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, - {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______}, + {_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______}, {_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} } @@ -199,24 +165,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case COLEMAK: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_colemak, false, 0); - #endif - persistant_default_layer_set(1UL<<_COLEMAK); - } - return false; - break; - case DVORAK: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_dvorak, false, 0); - #endif - persistant_default_layer_set(1UL<<_DVORAK); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); @@ -248,34 +196,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; - case PLOVER: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - stop_all_notes(); - PLAY_NOTE_ARRAY(tone_plover, false, 0); - #endif - layer_off(_RAISE); - layer_off(_LOWER); - layer_off(_ADJUST); - layer_on(_PLOVER); - if (!eeconfig_is_enabled()) { - eeconfig_init(); - } - keymap_config.raw = eeconfig_read_keymap(); - keymap_config.nkro = 1; - eeconfig_update_keymap(keymap_config.raw); - } - return false; - break; - case EXT_PLV: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); - #endif - layer_off(_PLOVER); - } - return false; - break; } return true; } diff --git a/keyboards/planck/keymaps/dbroqua/layout.png b/keyboards/planck/keymaps/dbroqua/layout.png index bab28a7c7c0533644d40320b661baf1f32de0318..d8aaf6fa64bb257db45764a5a6ad1b3d68610950 100644 GIT binary patch literal 20569 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 From b9a284352e9066127f00bc2b992c6cbd7757f6f3 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Fri, 19 Aug 2016 21:10:07 +0200 Subject: [PATCH 008/120] - Moved Insert/Del in Esc layer --- keyboards/planck/keymaps/dbroqua/keymap.c | 12 ++++++------ keyboards/planck/keymaps/dbroqua/layout.png | Bin 20569 -> 20479 bytes keyboards/planck/keymaps/dbroqua/readme.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c index 56d4cf22dd..3d89ff1d34 100644 --- a/keyboards/planck/keymaps/dbroqua/keymap.c +++ b/keyboards/planck/keymaps/dbroqua/keymap.c @@ -83,16 +83,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | ` | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | \ |Insert| + * | | | | | | | | | | | \ | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | Del | + * | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ [_RAISE] = { {KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, KC_INS}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL} + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______}, + {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} }, /* Esc @@ -101,9 +101,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | Mute | Vol+ | Vol- | | | | | + * | | | | | | Mute | Vol+ | Vol- | | | |Insert| * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | Prev | Play | Next | | + * | | | | | | | | Prev | Play | Next | Del | * `-----------------------------------------------------------------------------------' */ [_ESC] = { diff --git a/keyboards/planck/keymaps/dbroqua/layout.png b/keyboards/planck/keymaps/dbroqua/layout.png index d8aaf6fa64bb257db45764a5a6ad1b3d68610950..0deafefe2730d056941450918b4424b41043cd3c 100644 GIT binary patch delta 19829 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 diff --git a/keyboards/planck/keymaps/dbroqua/readme.md b/keyboards/planck/keymaps/dbroqua/readme.md index b3b64c325f..b5cdb9f65d 100644 --- a/keyboards/planck/keymaps/dbroqua/readme.md +++ b/keyboards/planck/keymaps/dbroqua/readme.md @@ -8,4 +8,4 @@ Enter into programming mode and run the following command. ``` $ sudo KEYMAP=dbroqua make dfu -``` +``` \ No newline at end of file From 32216066e7a6881378f7f46995a00da36c0d34f3 Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Fri, 19 Aug 2016 14:36:41 -0600 Subject: [PATCH 009/120] Adding nicer Infinity build instructions. --- keyboards/ergodox/readme.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md index f81d7cd8df..9f89418634 100644 --- a/keyboards/ergodox/readme.md +++ b/keyboards/ergodox/readme.md @@ -1,3 +1,14 @@ +# Infinity on Ubuntu Quickstart + +To build an Infinity firmware under Ubuntu (tested on 15.10): + + - Run the `util/install_dependencies.sh` script as root. + - Build the firmware with `make keymap=keymapname subproject=infinity` + - Plug in the left hand keyboard only. + - Press the program button (back of keyboard, above thumb pad). + - Install the firmware with `sudo make dfu-util keymap=keymapname subproject=infinity` + - Install the right hand firmware, but I haven't figured this out yet. + # Getting started There are two main ways you could customize the ErgoDox (EZ and Infinity) From b918aa6bab85e7dba586a9ee2bde650b721113c2 Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Fri, 19 Aug 2016 14:49:29 -0600 Subject: [PATCH 010/120] Adding submodule note. --- keyboards/ergodox/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md index 9f89418634..c3aa6c9da2 100644 --- a/keyboards/ergodox/readme.md +++ b/keyboards/ergodox/readme.md @@ -3,6 +3,7 @@ To build an Infinity firmware under Ubuntu (tested on 15.10): - Run the `util/install_dependencies.sh` script as root. + - Check out the submodules with `git submodule update --init --recursive` - Build the firmware with `make keymap=keymapname subproject=infinity` - Plug in the left hand keyboard only. - Press the program button (back of keyboard, above thumb pad). From 30c63b1495ac49cf4f7ea9e6271ade53496f7770 Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Fri, 19 Aug 2016 14:52:05 -0600 Subject: [PATCH 011/120] Noting the change directory. --- keyboards/ergodox/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md index c3aa6c9da2..1c1181dbae 100644 --- a/keyboards/ergodox/readme.md +++ b/keyboards/ergodox/readme.md @@ -4,6 +4,7 @@ To build an Infinity firmware under Ubuntu (tested on 15.10): - Run the `util/install_dependencies.sh` script as root. - Check out the submodules with `git submodule update --init --recursive` + - Go into the ErgoDox directory with `cd keyboards/ergodox` - Build the firmware with `make keymap=keymapname subproject=infinity` - Plug in the left hand keyboard only. - Press the program button (back of keyboard, above thumb pad). From 86706de036cf7ad52b679b259ca8f980057d0da5 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 1 Aug 2016 09:23:37 +0300 Subject: [PATCH 012/120] Parsing of makefile variables from starting dir --- Makefile | 314 ++++++---------------------------------------- build_keyboard.mk | 276 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 313 insertions(+), 277 deletions(-) create mode 100644 build_keyboard.mk diff --git a/Makefile b/Makefile index 693edc9f06..fcd57754b5 100644 --- a/Makefile +++ b/Makefile @@ -1,281 +1,41 @@ -ifndef VERBOSE -.SILENT: +STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST)) +ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST)) +ABS_STARTING_MAKEFILE := $(abspath $(STARTING_MAKEFILE)) +ABS_ROOT_MAKEFILE := $(abspath $(ROOT_MAKEFILE)) +ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE)) +ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE)) +STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR)) + +PATH_ELEMENTS := $(subst /, ,$(STARTING_DIR)) + +define NEXT_PATH_ELEMENT + $$(eval CURRENT_PATH_ELEMENT := $$(firstword $$(PATH_ELEMENTS))) + $$(eval PATH_ELEMENTS := $$(wordlist 2,9999,$$(PATH_ELEMENTS))) +endef + +$(eval $(call NEXT_PATH_ELEMENT)) + +ifeq ($(CURRENT_PATH_ELEMENT),keyboards) + $(eval $(call NEXT_PATH_ELEMENT)) + KEYBOARD := $(CURRENT_PATH_ELEMENT) + $(eval $(call NEXT_PATH_ELEMENT)) + ifeq ($(CURRENT_PATH_ELEMENT),keymaps) + $(eval $(call NEXT_PATH_ELEMENT)) + KEYMAP := $(CURRENT_PATH_ELEMENT) + else ifneq ($(CURRENT_PATH_ELEMENT),) + SUBPROJECT := $(CURRENT_PATH_ELEMENT) + $(eval $(call NEXT_PATH_ELEMENT)) + ifeq ($(CURRENT_PATH_ELEMENT),keymaps) + $(eval $(call NEXT_PATH_ELEMENT)) + KEYMAP := $(CURRENT_PATH_ELEMENT) + endif + endif endif -.DEFAULT_GOAL := all - -space := $(subst ,, ) -ESCAPED_ABS_PATH = $(subst $(space),_SPACE_,$(abspath $1)) -starting_makefile := $(call ESCAPED_ABS_PATH,$(firstword $(MAKEFILE_LIST))) -mkfile_path := $(call ESCAPED_ABS_PATH,$(lastword $(MAKEFILE_LIST)))) -abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path))) - -ifneq (,$(findstring /keyboards/,$(starting_makefile))) - possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboards/%,%,$(starting_makefile)))) - ifneq (,$(findstring /keymaps/,$(possible_keyboard))) - KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard))) - KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard))) - ifneq (,$(findstring /,$(KEYBOARD_DIR))) - # SUBPROJECT_DIR:=$(lastword $(subst /, ,$(KEYBOARD_DIR))) - # KEYBOARD_DIR:=$(firstword $(subst /, ,$(KEYBOARD_DIR))) - tmk_root = ../../.. - else - tmk_root = ../../../.. - endif - else - KEYMAP_DIR:=default - KEYBOARD_DIR:=$(possible_keyboard) - ifneq (,$(findstring /,$(KEYBOARD_DIR))) - # SUBPROJECT_DIR:=$(lastword $(subst /, ,$(KEYBOARD_DIR))) - # KEYBOARD_DIR:=$(firstword $(subst /, ,$(KEYBOARD_DIR))) - tmk_root = ../../.. - else - tmk_root = ../.. - endif - endif -else - tmk_root = . -endif -# $(info $(KEYBOARD_DIR)) -# $(info $(KEYMAP_DIR)) -# $(info $(SUBPROJECT_DIR)) - -# Directory common source filess exist -TOP_DIR = $(tmk_root) -TMK_DIR = tmk_core -TMK_PATH = $(TOP_DIR)/$(TMK_DIR) -LIB_PATH = $(TOP_DIR)/lib - -QUANTUM_DIR = quantum -QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR) +$(info Keyboard: $(KEYBOARD)) +$(info Keymap: $(KEYMAP)) +$(info Subproject: $(SUBPROJECT)) -ifdef keyboard - KEYBOARD ?= $(keyboard) -endif -ifdef KEYBOARD_DIR - KEYBOARD ?= $(KEYBOARD_DIR) -endif -ifndef KEYBOARD - KEYBOARD=planck -endif - -MASTER ?= left -ifdef master - MASTER = $(master) -endif - - -# converts things to keyboards/subproject -ifneq (,$(findstring /,$(KEYBOARD))) - TEMP:=$(KEYBOARD) - KEYBOARD:=$(firstword $(subst /, ,$(TEMP))) - SUBPROJECT:=$(lastword $(subst /, ,$(TEMP))) -endif - -KEYBOARD_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD) - -ifdef sub - SUBPROJECT=$(sub) -endif -ifdef subproject - SUBPROJECT=$(subproject) -endif - -ifneq ("$(wildcard $(KEYBOARD_PATH)/$(KEYBOARD).c)","") - KEYBOARD_FILE = keyboards/$(KEYBOARD)/$(KEYBOARD).c - ifneq ($(call ESCAPED_ABS_PATH,$(KEYBOARD_PATH)/Makefile),$(starting_makefile)) - -include $(KEYBOARD_PATH)/Makefile - endif -else -$(error "$(KEYBOARD_PATH)/$(KEYBOARD).c" does not exist) -endif - -ifdef SUBPROJECT_DEFAULT - SUBPROJECT?=$(SUBPROJECT_DEFAULT) -endif - -ifdef SUBPROJECT - SUBPROJECT_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD)/$(SUBPROJECT) - ifneq ("$(wildcard $(SUBPROJECT_PATH)/$(SUBPROJECT).c)","") - OPT_DEFS += -DSUBPROJECT_$(SUBPROJECT) - SUBPROJECT_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/$(SUBPROJECT).c - ifneq ($(call ESCAPED_ABS_PATH,$(SUBPROJECT_PATH)/Makefile),$(starting_makefile)) - -include $(SUBPROJECT_PATH)/Makefile - endif - else -$(error "$(SUBPROJECT_PATH)/$(SUBPROJECT).c" does not exist) - endif -endif - -ifdef keymap - KEYMAP ?= $(keymap) -endif -ifdef KEYMAP_DIR - KEYMAP ?= $(KEYMAP_DIR) -endif -ifndef KEYMAP - KEYMAP = default -endif -KEYMAP_PATH = $(KEYBOARD_PATH)/keymaps/$(KEYMAP) -ifneq ("$(wildcard $(KEYMAP_PATH)/keymap.c)","") - KEYMAP_FILE = keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c - ifneq ($(call ESCAPED_ABS_PATH,$(KEYMAP_PATH)/Makefile),$(starting_makefile)) - -include $(KEYMAP_PATH)/Makefile - endif -else - ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/keymap.c)","") -$(error "$(KEYMAP_PATH)/keymap.c" does not exist) - else - KEYMAP_PATH = $(SUBPROJECT_PATH)/keymaps/$(KEYMAP) - KEYMAP_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/$(KEYMAP)/keymap.c - ifneq ($(call ESCAPED_ABS_PATH,$(KEYMAP_PATH)/Makefile),$(starting_makefile)) - -include $(KEYMAP_PATH)/Makefile - endif - endif -endif - -ifdef SUBPROJECT - TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP) -else - TARGET ?= $(KEYBOARD)_$(KEYMAP) -endif - -BUILD_DIR = $(TOP_DIR)/.build - -# Object files directory -# To put object files in current directory, use a dot (.), do NOT make -# this an empty or blank macro! -OBJDIR = $(BUILD_DIR)/obj_$(TARGET) - - - -ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","") - CONFIG_H = $(KEYMAP_PATH)/config.h -else - CONFIG_H = $(KEYBOARD_PATH)/config.h - ifdef SUBPROJECT - ifneq ("$(wildcard $(SUBPROJECT_PATH)/$(SUBPROJECT).c)","") - CONFIG_H = $(SUBPROJECT_PATH)/config.h - endif - endif -endif - -# # project specific files -SRC += $(KEYBOARD_FILE) \ - $(KEYMAP_FILE) \ - $(QUANTUM_DIR)/quantum.c \ - $(QUANTUM_DIR)/keymap_common.c \ - $(QUANTUM_DIR)/keycode_config.c \ - $(QUANTUM_DIR)/process_keycode/process_leader.c - -ifdef SUBPROJECT - SRC += $(SUBPROJECT_FILE) -endif - -ifdef SUBPROJECT - SRC += $(SUBPROJECT_FILE) -endif - -ifdef SUBPROJECT - SRC += $(SUBPROJECT_FILE) -endif - -ifndef CUSTOM_MATRIX - SRC += $(QUANTUM_DIR)/matrix.c -endif - -ifeq ($(strip $(MIDI_ENABLE)), yes) - OPT_DEFS += -DMIDI_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c -endif - -ifeq ($(strip $(AUDIO_ENABLE)), yes) - OPT_DEFS += -DAUDIO_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_music.c - SRC += $(QUANTUM_DIR)/audio/audio.c - SRC += $(QUANTUM_DIR)/audio/voices.c - SRC += $(QUANTUM_DIR)/audio/luts.c -endif - -ifeq ($(strip $(UCIS_ENABLE)), yes) - OPT_DEFS += -DUCIS_ENABLE - UNICODE_ENABLE = yes -endif - -ifeq ($(strip $(UNICODE_ENABLE)), yes) - OPT_DEFS += -DUNICODE_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c -endif - -ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) - OPT_DEFS += -DRGBLIGHT_ENABLE - SRC += $(QUANTUM_DIR)/light_ws2812.c - SRC += $(QUANTUM_DIR)/rgblight.c -endif - -ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) - OPT_DEFS += -DTAP_DANCE_ENABLE - SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c -endif - -ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes) - SERIAL_DIR = $(QUANTUM_DIR)/serial_link - SERIAL_PATH = $(QUANTUM_PATH)/serial_link - SERIAL_SRC = $(wildcard $(SERIAL_PATH)/protocol/*.c) - SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c) - SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC)) - OPT_DEFS += -DSERIAL_LINK_ENABLE - VAPTH += $(SERIAL_PATH) -endif - -# Optimize size but this may cause error "relocation truncated to fit" -#EXTRALDFLAGS = -Wl,--relax - -# Search Path -VPATH += $(KEYMAP_PATH) -ifdef SUBPROJECT - VPATH += $(SUBPROJECT_PATH) -endif -VPATH += $(KEYBOARD_PATH) -VPATH += $(TOP_DIR) -VPATH += $(TMK_PATH) -VPATH += $(QUANTUM_PATH) -VPATH += $(QUANTUM_PATH)/keymap_extras -VPATH += $(QUANTUM_PATH)/audio -VPATH += $(QUANTUM_PATH)/process_keycode - - -# We can assume a ChibiOS target When MCU_FAMILY is defined, since it's not used for LUFA -ifdef MCU_FAMILY - PLATFORM=CHIBIOS -else - PLATFORM=AVR -endif - -include $(TMK_PATH)/common.mk -ifeq ($(PLATFORM),AVR) - include $(TMK_PATH)/protocol/lufa.mk - include $(TMK_PATH)/avr.mk -else ifeq ($(PLATFORM),CHIBIOS) - include $(TMK_PATH)/protocol/chibios.mk - include $(TMK_PATH)/chibios.mk - OPT_OS = chibios -else - $(error Unknown platform) -endif - -ifeq ($(strip $(VISUALIZER_ENABLE)), yes) - VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer - VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer - include $(VISUALIZER_PATH)/visualizer.mk -endif - -include $(TMK_PATH)/rules.mk - -GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") -BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") -OPT_DEFS += -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" - -$(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(QUANTUM_PATH)/version.h) -$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(QUANTUM_PATH)/version.h) +all: + echo "Compiling" \ No newline at end of file diff --git a/build_keyboard.mk b/build_keyboard.mk new file mode 100644 index 0000000000..053c8532af --- /dev/null +++ b/build_keyboard.mk @@ -0,0 +1,276 @@ +ifndef VERBOSE +.SILENT: +endif + +.DEFAULT_GOAL := all + +space := $(subst ,, ) +ESCAPED_ABS_PATH = $(subst $(space),_SPACE_,$(abspath $1)) +starting_makefile := $(call ESCAPED_ABS_PATH,$(firstword $(MAKEFILE_LIST))) +mkfile_path := $(call ESCAPED_ABS_PATH,$(lastword $(MAKEFILE_LIST)))) +abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path))) + +ifneq (,$(findstring /keyboards/,$(starting_makefile))) + possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboards/%,%,$(starting_makefile)))) + ifneq (,$(findstring /keymaps/,$(possible_keyboard))) + KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard))) + KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard))) + ifneq (,$(findstring /,$(KEYBOARD_DIR))) + # SUBPROJECT_DIR:=$(lastword $(subst /, ,$(KEYBOARD_DIR))) + # KEYBOARD_DIR:=$(firstword $(subst /, ,$(KEYBOARD_DIR))) + tmk_root = ../../.. + else + tmk_root = ../../../.. + endif + else + KEYMAP_DIR:=default + KEYBOARD_DIR:=$(possible_keyboard) + ifneq (,$(findstring /,$(KEYBOARD_DIR))) + # SUBPROJECT_DIR:=$(lastword $(subst /, ,$(KEYBOARD_DIR))) + # KEYBOARD_DIR:=$(firstword $(subst /, ,$(KEYBOARD_DIR))) + tmk_root = ../../.. + else + tmk_root = ../.. + endif + endif +else + tmk_root = . +endif +# $(info $(KEYBOARD_DIR)) +# $(info $(KEYMAP_DIR)) +# $(info $(SUBPROJECT_DIR)) + +# Directory common source filess exist +TOP_DIR = $(tmk_root) +TMK_DIR = tmk_core +TMK_PATH = $(TOP_DIR)/$(TMK_DIR) +LIB_PATH = $(TOP_DIR)/lib + +QUANTUM_DIR = quantum +QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR) + + +ifdef keyboard + KEYBOARD ?= $(keyboard) +endif +ifdef KEYBOARD_DIR + KEYBOARD ?= $(KEYBOARD_DIR) +endif +ifndef KEYBOARD + KEYBOARD=planck +endif + +MASTER ?= left +ifdef master + MASTER = $(master) +endif + + +# converts things to keyboards/subproject +ifneq (,$(findstring /,$(KEYBOARD))) + TEMP:=$(KEYBOARD) + KEYBOARD:=$(firstword $(subst /, ,$(TEMP))) + SUBPROJECT:=$(lastword $(subst /, ,$(TEMP))) +endif + +KEYBOARD_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD) + +ifdef sub + SUBPROJECT=$(sub) +endif +ifdef subproject + SUBPROJECT=$(subproject) +endif + +ifneq ("$(wildcard $(KEYBOARD_PATH)/$(KEYBOARD).c)","") + KEYBOARD_FILE = keyboards/$(KEYBOARD)/$(KEYBOARD).c + ifneq ($(call ESCAPED_ABS_PATH,$(KEYBOARD_PATH)/Makefile),$(starting_makefile)) + -include $(KEYBOARD_PATH)/Makefile + endif +else +$(error "$(KEYBOARD_PATH)/$(KEYBOARD).c" does not exist) +endif + +ifdef SUBPROJECT_DEFAULT + SUBPROJECT?=$(SUBPROJECT_DEFAULT) +endif + +ifdef SUBPROJECT + SUBPROJECT_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD)/$(SUBPROJECT) + ifneq ("$(wildcard $(SUBPROJECT_PATH)/$(SUBPROJECT).c)","") + OPT_DEFS += -DSUBPROJECT_$(SUBPROJECT) + SUBPROJECT_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/$(SUBPROJECT).c + ifneq ($(call ESCAPED_ABS_PATH,$(SUBPROJECT_PATH)/Makefile),$(starting_makefile)) + -include $(SUBPROJECT_PATH)/Makefile + endif + else +$(error "$(SUBPROJECT_PATH)/$(SUBPROJECT).c" does not exist) + endif +endif + +ifdef keymap + KEYMAP ?= $(keymap) +endif +ifdef KEYMAP_DIR + KEYMAP ?= $(KEYMAP_DIR) +endif +ifndef KEYMAP + KEYMAP = default +endif +KEYMAP_PATH = $(KEYBOARD_PATH)/keymaps/$(KEYMAP) +ifneq ("$(wildcard $(KEYMAP_PATH)/keymap.c)","") + KEYMAP_FILE = keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c + ifneq ($(call ESCAPED_ABS_PATH,$(KEYMAP_PATH)/Makefile),$(starting_makefile)) + -include $(KEYMAP_PATH)/Makefile + endif +else + ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/keymap.c)","") +$(error "$(KEYMAP_PATH)/keymap.c" does not exist) + else + KEYMAP_PATH = $(SUBPROJECT_PATH)/keymaps/$(KEYMAP) + KEYMAP_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/$(KEYMAP)/keymap.c + ifneq ($(call ESCAPED_ABS_PATH,$(KEYMAP_PATH)/Makefile),$(starting_makefile)) + -include $(KEYMAP_PATH)/Makefile + endif + endif +endif + +ifdef SUBPROJECT + TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP) +else + TARGET ?= $(KEYBOARD)_$(KEYMAP) +endif + +BUILD_DIR = $(TOP_DIR)/.build + +# Object files directory +# To put object files in current directory, use a dot (.), do NOT make +# this an empty or blank macro! +OBJDIR = $(BUILD_DIR)/obj_$(TARGET) + + + +ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","") + CONFIG_H = $(KEYMAP_PATH)/config.h +else + CONFIG_H = $(KEYBOARD_PATH)/config.h + ifdef SUBPROJECT + ifneq ("$(wildcard $(SUBPROJECT_PATH)/$(SUBPROJECT).c)","") + CONFIG_H = $(SUBPROJECT_PATH)/config.h + endif + endif +endif + +# # project specific files +SRC += $(KEYBOARD_FILE) \ + $(KEYMAP_FILE) \ + $(QUANTUM_DIR)/quantum.c \ + $(QUANTUM_DIR)/keymap_common.c \ + $(QUANTUM_DIR)/keycode_config.c \ + $(QUANTUM_DIR)/process_keycode/process_leader.c + +ifdef SUBPROJECT + SRC += $(SUBPROJECT_FILE) +endif + +ifdef SUBPROJECT + SRC += $(SUBPROJECT_FILE) +endif + +ifdef SUBPROJECT + SRC += $(SUBPROJECT_FILE) +endif + +ifndef CUSTOM_MATRIX + SRC += $(QUANTUM_DIR)/matrix.c +endif + +ifeq ($(strip $(MIDI_ENABLE)), yes) + OPT_DEFS += -DMIDI_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c +endif + +ifeq ($(strip $(AUDIO_ENABLE)), yes) + OPT_DEFS += -DAUDIO_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_music.c + SRC += $(QUANTUM_DIR)/audio/audio.c + SRC += $(QUANTUM_DIR)/audio/voices.c + SRC += $(QUANTUM_DIR)/audio/luts.c +endif + +ifeq ($(strip $(UNICODE_ENABLE)), yes) + OPT_DEFS += -DUNICODE_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c +endif + +ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) + OPT_DEFS += -DRGBLIGHT_ENABLE + SRC += $(QUANTUM_DIR)/light_ws2812.c + SRC += $(QUANTUM_DIR)/rgblight.c +endif + +ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) + OPT_DEFS += -DTAP_DANCE_ENABLE + SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c +endif + +ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes) + SERIAL_DIR = $(QUANTUM_DIR)/serial_link + SERIAL_PATH = $(QUANTUM_PATH)/serial_link + SERIAL_SRC = $(wildcard $(SERIAL_PATH)/protocol/*.c) + SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c) + SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC)) + OPT_DEFS += -DSERIAL_LINK_ENABLE + VAPTH += $(SERIAL_PATH) +endif + +# Optimize size but this may cause error "relocation truncated to fit" +#EXTRALDFLAGS = -Wl,--relax + +# Search Path +VPATH += $(KEYMAP_PATH) +ifdef SUBPROJECT + VPATH += $(SUBPROJECT_PATH) +endif +VPATH += $(KEYBOARD_PATH) +VPATH += $(TOP_DIR) +VPATH += $(TMK_PATH) +VPATH += $(QUANTUM_PATH) +VPATH += $(QUANTUM_PATH)/keymap_extras +VPATH += $(QUANTUM_PATH)/audio +VPATH += $(QUANTUM_PATH)/process_keycode + + +# We can assume a ChibiOS target When MCU_FAMILY is defined, since it's not used for LUFA +ifdef MCU_FAMILY + PLATFORM=CHIBIOS +else + PLATFORM=AVR +endif + +include $(TMK_PATH)/common.mk +ifeq ($(PLATFORM),AVR) + include $(TMK_PATH)/protocol/lufa.mk + include $(TMK_PATH)/avr.mk +else ifeq ($(PLATFORM),CHIBIOS) + include $(TMK_PATH)/protocol/chibios.mk + include $(TMK_PATH)/chibios.mk + OPT_OS = chibios +else + $(error Unknown platform) +endif + +ifeq ($(strip $(VISUALIZER_ENABLE)), yes) + VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer + VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer + include $(VISUALIZER_PATH)/visualizer.mk +endif + +include $(TMK_PATH)/rules.mk + +GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") +BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") +OPT_DEFS += -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" + +$(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(QUANTUM_PATH)/version.h) +$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(QUANTUM_PATH)/version.h) \ No newline at end of file From e6e675335dbaa6bd175be7aaee829c717e572488 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 3 Aug 2016 08:44:11 +0300 Subject: [PATCH 013/120] First version of rule parsing Only handles allkb at the moment. --- Makefile | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/Makefile b/Makefile index fcd57754b5..f0d5c05ccc 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,54 @@ $(info Keyboard: $(KEYBOARD)) $(info Keymap: $(KEYMAP)) $(info Subproject: $(SUBPROJECT)) +# Compare the start of the RULE_VARIABLE with the first argument($1) +# If the rules equals $1 or starts with $1-, RULE_FOUND is set to true +# and $1 is removed from the RULE variable +# Otherwise the RULE_FOUND variable is set to false +# The function is a bit tricky, since there's no built in $(startswith) function +define COMPARE_AND_REMOVE_FROM_RULE + ifeq ($1,$$(RULE)) + RULE:= + RULE_FOUND := true + else + STARTDASH_REMOVED=$$(subst START$1-,,START$$(RULE)) + ifneq ($$(STARTDASH_REMOVED),START$$(RULE)) + RULE_FOUND := true + RULE := $$(STARTDASH_REMOVED) + else + RULE_FOUND := false + endif + endif +endef +define PARSE_ALL_KEYBOARDS + COMMANDS += allkb + #$$(info $$(RULE)) + COMMAND_allkb := "All keyboards with $$(RULE)" +endef + +define PARSE_RULE + RULE := $1 + COMMANDS := + $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allkb)) + ifeq ($$(RULE_FOUND),true) + $$(eval $$(call PARSE_ALL_KEYBOARDS)) + endif +endef + +RUN_COMMAND = echo "Running": $(COMMAND_$(COMMAND)); + +.PHONY: % +%: + $(eval $(call PARSE_RULE,$@)) + $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) + +.PHONY: all-keyboards +all-keyboards: allkb + +.PHONY: all-keyboards-defaults +all-keyboards-defaults: allkb-default-default + +.PHONY: all all: echo "Compiling" \ No newline at end of file From f97ae2b199df087f4b48c7019c2d887089d81614 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 3 Aug 2016 09:28:47 +0300 Subject: [PATCH 014/120] Rule parsing to match kebyoards --- Makefile | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Makefile b/Makefile index f0d5c05ccc..b24270ad1b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST)) ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST)) +ROOT_DIR := $(dir, $(ROOT_MAKEFILE)) +ifeq ($(ROOT_DIR),) + ROOT_DIR := . +endif ABS_STARTING_MAKEFILE := $(abspath $(STARTING_MAKEFILE)) ABS_ROOT_MAKEFILE := $(abspath $(ROOT_MAKEFILE)) ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE)) @@ -32,9 +36,14 @@ ifeq ($(CURRENT_PATH_ELEMENT),keyboards) endif endif +$(info $(ROOT_DIR)/keyboards) +KEYBOARDS := $(notdir $(patsubst %/.,%,$(wildcard $(ROOT_DIR)/keyboards/*/.))) + $(info Keyboard: $(KEYBOARD)) $(info Keymap: $(KEYMAP)) $(info Subproject: $(SUBPROJECT)) +$(info Keyboards: $(KEYBOARDS)) + # Compare the start of the RULE_VARIABLE with the first argument($1) # If the rules equals $1 or starts with $1-, RULE_FOUND is set to true @@ -62,12 +71,34 @@ define PARSE_ALL_KEYBOARDS COMMAND_allkb := "All keyboards with $$(RULE)" endef +define PARSE_KEYBOARD + COMMANDS += $1 + #$$(info $$(RULE)) + COMMAND_$1 := "Keyboard $1 with $$(RULE)" +endef + + +# Recursively try to find a matching keyboard +# During the first call $1 contains a list of all keyboards +# One keyboard is checked and removed at a time +define TRY_PARSE_KEYBOARD + CURRENT_KB := $$(firstword $1) + $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,$$(CURRENT_KB))) + ifeq ($$(RULE_FOUND),true) + $$(eval $$(call PARSE_KEYBOARD,$$(CURRENT_KB))) + else ifneq ($1,) + $$(eval $$(call TRY_PARSE_KEYBOARD,$$(wordlist 2,9999,$1))) + endif +endef + define PARSE_RULE RULE := $1 COMMANDS := $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allkb)) ifeq ($$(RULE_FOUND),true) $$(eval $$(call PARSE_ALL_KEYBOARDS)) + else + $$(eval $$(call TRY_PARSE_KEYBOARD,$(KEYBOARDS))) endif endef From 9b02e66ce0f703480e42038a5084174a45b54b1d Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Thu, 4 Aug 2016 08:49:44 +0300 Subject: [PATCH 015/120] Add keymap parsing --- Makefile | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b24270ad1b..b4204478e1 100644 --- a/Makefile +++ b/Makefile @@ -71,12 +71,28 @@ define PARSE_ALL_KEYBOARDS COMMAND_allkb := "All keyboards with $$(RULE)" endef +# $1 = Keyboard define PARSE_KEYBOARD - COMMANDS += $1 - #$$(info $$(RULE)) - COMMAND_$1 := "Keyboard $1 with $$(RULE)" + $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allkm)) + ifeq ($$(RULE_FOUND),true) + $$(eval $$(call PARSE_ALL_KEYMAPS, $1)) + else + KEYMAPS := $(notdir $(patsubst %/.,%,$(wildcard $(ROOT_DIR)/keyboards/$1/keymaps/*/.))) + $$(eval $$(call TRY_PARSE_KEYMAP,$$(KEYMAPS),$1)) + endif endef +define PARSE_ALL_KEYMAPS + COMMANDS += ALL_KEYMAPS + COMMAND_ALL_KEYMAPS := All keymaps in $1 +endef + +# $1 Keyboard +# $2 Keymap +define PARSE_KEYMAP + COMMANDS += KEYBOARD_$1_KEYMAP_$2 + COMMAND_KEYBOARD_$1_KEYMAP_$2 := Keyboard $1, Keymap $2 +endef # Recursively try to find a matching keyboard # During the first call $1 contains a list of all keyboards @@ -91,6 +107,18 @@ define TRY_PARSE_KEYBOARD endif endef +# $1 list of keymaps +# $2 keyboard +define TRY_PARSE_KEYMAP + CURRENT_KM := $$(firstword $1) + $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,$$(CURRENT_KM))) + ifeq ($$(RULE_FOUND),true) + $$(eval $$(call PARSE_KEYMAP,$2,$$(CURRENT_KM))) + else ifneq ($1,) + $$(eval $$(call TRY_PARSE_KEYMAP,$$(wordlist 2,9999,$1),$2)) + endif +endef + define PARSE_RULE RULE := $1 COMMANDS := From dfe510d5b8f83c9977b507ed204632c2f22c5d24 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Thu, 4 Aug 2016 09:17:02 +0300 Subject: [PATCH 016/120] Refactor common rule list parsing into own function --- Makefile | 61 +++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index b4204478e1..e88eeefee4 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,20 @@ define COMPARE_AND_REMOVE_FROM_RULE endif endef +# Recursively try to find a match +# $1 The list to be checked +# If a match is found, then RULE_FOUND is set to true +# and MATCHED_ITEM to the item that was matched +define TRY_TO_MATCH_RULE_FROM_LIST + $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1))) + ifeq ($$(RULE_FOUND),true) + MATCHED_ITEM := $$(firstword $1) + else ifneq ($1,) + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(wordlist 2,9999,$1))) + endif +endef + + define PARSE_ALL_KEYBOARDS COMMANDS += allkb #$$(info $$(RULE)) @@ -73,51 +87,31 @@ endef # $1 = Keyboard define PARSE_KEYBOARD + CURRENT_KB := $1 $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allkm)) ifeq ($$(RULE_FOUND),true) - $$(eval $$(call PARSE_ALL_KEYMAPS, $1)) + $$(eval $$(call PARSE_ALL_KEYMAPS)) else KEYMAPS := $(notdir $(patsubst %/.,%,$(wildcard $(ROOT_DIR)/keyboards/$1/keymaps/*/.))) - $$(eval $$(call TRY_PARSE_KEYMAP,$$(KEYMAPS),$1)) + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS))) + ifeq ($$(RULE_FOUND),true) + $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) + endif endif endef define PARSE_ALL_KEYMAPS COMMANDS += ALL_KEYMAPS - COMMAND_ALL_KEYMAPS := All keymaps in $1 + COMMAND_ALL_KEYMAPS := All keymaps in $(CURRENT_KB) endef -# $1 Keyboard -# $2 Keymap +# $1 Keymap define PARSE_KEYMAP - COMMANDS += KEYBOARD_$1_KEYMAP_$2 - COMMAND_KEYBOARD_$1_KEYMAP_$2 := Keyboard $1, Keymap $2 + CURRENT_KM = $1 + COMMANDS += KEYBOARD_$$(CURRENT_KB)_KEYMAP_$$(CURRENT_KM) + COMMAND_KEYBOARD_$$(CURRENT_KB)_KEYMAP_$$(CURRENT_KM) := Keyboard $$(CURRENT_KB), Keymap $$(CURRENT_KM) endef -# Recursively try to find a matching keyboard -# During the first call $1 contains a list of all keyboards -# One keyboard is checked and removed at a time -define TRY_PARSE_KEYBOARD - CURRENT_KB := $$(firstword $1) - $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,$$(CURRENT_KB))) - ifeq ($$(RULE_FOUND),true) - $$(eval $$(call PARSE_KEYBOARD,$$(CURRENT_KB))) - else ifneq ($1,) - $$(eval $$(call TRY_PARSE_KEYBOARD,$$(wordlist 2,9999,$1))) - endif -endef - -# $1 list of keymaps -# $2 keyboard -define TRY_PARSE_KEYMAP - CURRENT_KM := $$(firstword $1) - $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,$$(CURRENT_KM))) - ifeq ($$(RULE_FOUND),true) - $$(eval $$(call PARSE_KEYMAP,$2,$$(CURRENT_KM))) - else ifneq ($1,) - $$(eval $$(call TRY_PARSE_KEYMAP,$$(wordlist 2,9999,$1),$2)) - endif -endef define PARSE_RULE RULE := $1 @@ -126,7 +120,10 @@ define PARSE_RULE ifeq ($$(RULE_FOUND),true) $$(eval $$(call PARSE_ALL_KEYBOARDS)) else - $$(eval $$(call TRY_PARSE_KEYBOARD,$(KEYBOARDS))) + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS))) + ifeq ($$(RULE_FOUND),true) + $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) + endif endif endef From 9ee6d4a23d9a1bdc019fc9968a909866ffeda905 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Thu, 4 Aug 2016 09:56:03 +0300 Subject: [PATCH 017/120] Proper looping for allkb and allkm --- Makefile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index e88eeefee4..57cf3f523a 100644 --- a/Makefile +++ b/Makefile @@ -78,21 +78,32 @@ define TRY_TO_MATCH_RULE_FROM_LIST endif endef +define ALL_IN_LIST_LOOP + OLD_RULE$1 := $$(RULE) + $$(eval $$(call $1,$$(ITEM$1))) + RULE := $$(OLD_RULE$1) +endef + +define PARSE_ALL_IN_LIST + $$(foreach ITEM$1,$2,$$(eval $$(call ALL_IN_LIST_LOOP,$1))) +endef define PARSE_ALL_KEYBOARDS - COMMANDS += allkb - #$$(info $$(RULE)) - COMMAND_allkb := "All keyboards with $$(RULE)" + $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(KEYBOARDS))) +endef + +define PARSE_ALL_KEYMAPS + $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS))) endef # $1 = Keyboard define PARSE_KEYBOARD CURRENT_KB := $1 + KEYMAPS := $(notdir $(patsubst %/.,%,$(wildcard $(ROOT_DIR)/keyboards/$1/keymaps/*/.))) $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allkm)) ifeq ($$(RULE_FOUND),true) $$(eval $$(call PARSE_ALL_KEYMAPS)) else - KEYMAPS := $(notdir $(patsubst %/.,%,$(wildcard $(ROOT_DIR)/keyboards/$1/keymaps/*/.))) $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS))) ifeq ($$(RULE_FOUND),true) $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) @@ -100,11 +111,6 @@ define PARSE_KEYBOARD endif endef -define PARSE_ALL_KEYMAPS - COMMANDS += ALL_KEYMAPS - COMMAND_ALL_KEYMAPS := All keymaps in $(CURRENT_KB) -endef - # $1 Keymap define PARSE_KEYMAP CURRENT_KM = $1 @@ -112,7 +118,6 @@ define PARSE_KEYMAP COMMAND_KEYBOARD_$$(CURRENT_KB)_KEYMAP_$$(CURRENT_KM) := Keyboard $$(CURRENT_KB), Keymap $$(CURRENT_KM) endef - define PARSE_RULE RULE := $1 COMMANDS := From 1df6498721e989f1b3b10ba4b1b03d0ba54e9204 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 14:33:49 +0300 Subject: [PATCH 018/120] Subproject parsing Does not handle keyboards without subprojects correctly yet. --- Makefile | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 57cf3f523a..e9e95569c4 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ $(info Keyboards: $(KEYBOARDS)) # Otherwise the RULE_FOUND variable is set to false # The function is a bit tricky, since there's no built in $(startswith) function define COMPARE_AND_REMOVE_FROM_RULE + RULE_FOUND := false ifeq ($1,$$(RULE)) RULE:= RULE_FOUND := true @@ -70,11 +71,13 @@ endef # If a match is found, then RULE_FOUND is set to true # and MATCHED_ITEM to the item that was matched define TRY_TO_MATCH_RULE_FROM_LIST - $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1))) - ifeq ($$(RULE_FOUND),true) - MATCHED_ITEM := $$(firstword $1) - else ifneq ($1,) - $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(wordlist 2,9999,$1))) + ifneq ($1,) + $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1))) + ifeq ($$(RULE_FOUND),true) + MATCHED_ITEM := $$(firstword $1) + else + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(wordlist 2,9999,$1))) + endif endif endef @@ -96,10 +99,18 @@ define PARSE_ALL_KEYMAPS $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS))) endef -# $1 = Keyboard -define PARSE_KEYBOARD - CURRENT_KB := $1 - KEYMAPS := $(notdir $(patsubst %/.,%,$(wildcard $(ROOT_DIR)/keyboards/$1/keymaps/*/.))) +define PARSE_ALL_SUBPROJECTS + ifeq ($$(SUBPROJECTS),) + $$(eval $$(call PARSE_SUBPROJECT,)) + else + $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$$(SUBPROJECTS))) + endif +endef + +# $1 Subproject +define PARSE_SUBPROJECT + CURRENT_SP := $1 + KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.))) $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allkm)) ifeq ($$(RULE_FOUND),true) $$(eval $$(call PARSE_ALL_KEYMAPS)) @@ -111,11 +122,27 @@ define PARSE_KEYBOARD endif endef +# $1 = Keyboard +define PARSE_KEYBOARD + CURRENT_KB := $1 + # A subproject is any keyboard subfolder with a makefile + SUBPROJECTS := $$(notdir $$(patsubst %/Makefile,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/*/Makefile))) + $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allsp)) + ifeq ($$(RULE_FOUND),true) + $$(eval $$(call PARSE_ALL_SUBPROJECTS)) + else + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(SUBPROJECTS))) + ifeq ($$(RULE_FOUND),true) + $$(eval $$(call PARSE_SUBPROJECT,$$(MATCHED_ITEM))) + endif + endif +endef + # $1 Keymap define PARSE_KEYMAP CURRENT_KM = $1 - COMMANDS += KEYBOARD_$$(CURRENT_KB)_KEYMAP_$$(CURRENT_KM) - COMMAND_KEYBOARD_$$(CURRENT_KB)_KEYMAP_$$(CURRENT_KM) := Keyboard $$(CURRENT_KB), Keymap $$(CURRENT_KM) + COMMANDS += KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) + COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) := Keyboard $$(CURRENT_KB), Subproject $$(CURRENT_SP), Keymap $$(CURRENT_KM) endef define PARSE_RULE From 286b3b8057630bf9ce78d3a0aaa24f4841b37b3e Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 15:56:41 +0300 Subject: [PATCH 019/120] Slight refactoring to remove some verbosity --- Makefile | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index e9e95569c4..8f7dbb9e6c 100644 --- a/Makefile +++ b/Makefile @@ -50,8 +50,7 @@ $(info Keyboards: $(KEYBOARDS)) # and $1 is removed from the RULE variable # Otherwise the RULE_FOUND variable is set to false # The function is a bit tricky, since there's no built in $(startswith) function -define COMPARE_AND_REMOVE_FROM_RULE - RULE_FOUND := false +define COMPARE_AND_REMOVE_FROM_RULE_HELPER ifeq ($1,$$(RULE)) RULE:= RULE_FOUND := true @@ -66,21 +65,25 @@ define COMPARE_AND_REMOVE_FROM_RULE endif endef +COMPARE_AND_REMOVE_FROM_RULE = $(eval $(call COMPARE_AND_REMOVE_FROM_RULE_HELPER,$1))$(RULE_FOUND) + + # Recursively try to find a match # $1 The list to be checked # If a match is found, then RULE_FOUND is set to true # and MATCHED_ITEM to the item that was matched -define TRY_TO_MATCH_RULE_FROM_LIST +define TRY_TO_MATCH_RULE_FROM_LIST_HELPER ifneq ($1,) - $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1))) - ifeq ($$(RULE_FOUND),true) + ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1)),true) MATCHED_ITEM := $$(firstword $1) else - $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(wordlist 2,9999,$1))) + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$$(wordlist 2,9999,$1))) endif endif endef +TRY_TO_MATCH_RULE_FROM_LIST = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$1))$(RULE_FOUND) + define ALL_IN_LIST_LOOP OLD_RULE$1 := $$(RULE) $$(eval $$(call $1,$$(ITEM$1))) @@ -111,14 +114,10 @@ endef define PARSE_SUBPROJECT CURRENT_SP := $1 KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.))) - $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allkm)) - ifeq ($$(RULE_FOUND),true) + ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true) $$(eval $$(call PARSE_ALL_KEYMAPS)) - else - $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS))) - ifeq ($$(RULE_FOUND),true) - $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) - endif + else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true) + $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) endif endef @@ -127,14 +126,10 @@ define PARSE_KEYBOARD CURRENT_KB := $1 # A subproject is any keyboard subfolder with a makefile SUBPROJECTS := $$(notdir $$(patsubst %/Makefile,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/*/Makefile))) - $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allsp)) - ifeq ($$(RULE_FOUND),true) + ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allsp),true) $$(eval $$(call PARSE_ALL_SUBPROJECTS)) - else - $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(SUBPROJECTS))) - ifeq ($$(RULE_FOUND),true) - $$(eval $$(call PARSE_SUBPROJECT,$$(MATCHED_ITEM))) - endif + else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(SUBPROJECTS)),true) + $$(eval $$(call PARSE_SUBPROJECT,$$(MATCHED_ITEM))) endif endef @@ -148,14 +143,10 @@ endef define PARSE_RULE RULE := $1 COMMANDS := - $$(eval $$(call COMPARE_AND_REMOVE_FROM_RULE,allkb)) - ifeq ($$(RULE_FOUND),true) + ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkb),true) $$(eval $$(call PARSE_ALL_KEYBOARDS)) - else - $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS))) - ifeq ($$(RULE_FOUND),true) - $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) - endif + else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) + $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) endif endef From 091fab5103bd896f1b36094a7337dbe2f9d2ad59 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 16:02:14 +0300 Subject: [PATCH 020/120] Slight rearrange of the Makefile for easier readability --- Makefile | 64 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 8f7dbb9e6c..a034213653 100644 --- a/Makefile +++ b/Makefile @@ -94,30 +94,13 @@ define PARSE_ALL_IN_LIST $$(foreach ITEM$1,$2,$$(eval $$(call ALL_IN_LIST_LOOP,$1))) endef -define PARSE_ALL_KEYBOARDS - $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(KEYBOARDS))) -endef - -define PARSE_ALL_KEYMAPS - $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS))) -endef - -define PARSE_ALL_SUBPROJECTS - ifeq ($$(SUBPROJECTS),) - $$(eval $$(call PARSE_SUBPROJECT,)) - else - $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$$(SUBPROJECTS))) - endif -endef - -# $1 Subproject -define PARSE_SUBPROJECT - CURRENT_SP := $1 - KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.))) - ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true) - $$(eval $$(call PARSE_ALL_KEYMAPS)) - else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true) - $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) +define PARSE_RULE + RULE := $1 + COMMANDS := + ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkb),true) + $$(eval $$(call PARSE_ALL_KEYBOARDS)) + else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) + $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) endif endef @@ -133,6 +116,29 @@ define PARSE_KEYBOARD endif endef +define PARSE_ALL_KEYBOARDS + $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(KEYBOARDS))) +endef + +# $1 Subproject +define PARSE_SUBPROJECT + CURRENT_SP := $1 + KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.))) + ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true) + $$(eval $$(call PARSE_ALL_KEYMAPS)) + else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true) + $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) + endif +endef + +define PARSE_ALL_SUBPROJECTS + ifeq ($$(SUBPROJECTS),) + $$(eval $$(call PARSE_SUBPROJECT,)) + else + $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$$(SUBPROJECTS))) + endif +endef + # $1 Keymap define PARSE_KEYMAP CURRENT_KM = $1 @@ -140,14 +146,8 @@ define PARSE_KEYMAP COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) := Keyboard $$(CURRENT_KB), Subproject $$(CURRENT_SP), Keymap $$(CURRENT_KM) endef -define PARSE_RULE - RULE := $1 - COMMANDS := - ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkb),true) - $$(eval $$(call PARSE_ALL_KEYBOARDS)) - else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) - $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) - endif +define PARSE_ALL_KEYMAPS + $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS))) endef RUN_COMMAND = echo "Running": $(COMMAND_$(COMMAND)); From 0d5caead5ad0edc06aedda06814da05815fc177e Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 16:45:33 +0300 Subject: [PATCH 021/120] Add default subproject parsing --- Makefile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a034213653..1e11dd5ff8 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,8 @@ STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR)) PATH_ELEMENTS := $(subst /, ,$(STARTING_DIR)) +QUANTUM_DIR:=$(ROOT_DIR)/quantum + define NEXT_PATH_ELEMENT $$(eval CURRENT_PATH_ELEMENT := $$(firstword $$(PATH_ELEMENTS))) $$(eval PATH_ELEMENTS := $$(wordlist 2,9999,$$(PATH_ELEMENTS))) @@ -111,8 +113,14 @@ define PARSE_KEYBOARD SUBPROJECTS := $$(notdir $$(patsubst %/Makefile,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/*/Makefile))) ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allsp),true) $$(eval $$(call PARSE_ALL_SUBPROJECTS)) + else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,defaultsp),true) + $$(eval $$(call PARSE_SUBPROJECT,defaultsp)) else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(SUBPROJECTS)),true) $$(eval $$(call PARSE_SUBPROJECT,$$(MATCHED_ITEM))) + else + # If there's no matching subproject, we assume it's the default + # This will allow you to leave the subproject part of the target out + $$(eval $$(call PARSE_SUBPROJECT,defaultsp)) endif endef @@ -122,7 +130,12 @@ endef # $1 Subproject define PARSE_SUBPROJECT - CURRENT_SP := $1 + ifeq ($1,defaultsp) + $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/Makefile) + CURRENT_SP := $$(SUBPROJECT_DEFAULT) + else + CURRENT_SP := $1 + endif KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.))) ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true) $$(eval $$(call PARSE_ALL_KEYMAPS)) @@ -133,7 +146,7 @@ endef define PARSE_ALL_SUBPROJECTS ifeq ($$(SUBPROJECTS),) - $$(eval $$(call PARSE_SUBPROJECT,)) + $$(eval $$(call PARSE_SUBPROJECT,defaultsp)) else $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$$(SUBPROJECTS))) endif From 44441de8cad7255fd0637459ed39b89e34751b78 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 17:04:39 +0300 Subject: [PATCH 022/120] Split keyboard makefiles into rules and Makefile --- Makefile | 2 +- keyboards/alps64/Makefile | 69 +----------------- keyboards/alps64/rules.mk | 66 +++++++++++++++++ keyboards/amj60/Makefile | 71 +----------------- keyboards/amj60/rules.mk | 66 +++++++++++++++++ keyboards/arrow_pad/Makefile | 73 +------------------ keyboards/arrow_pad/rules.mk | 70 ++++++++++++++++++ keyboards/atomic/Makefile | 72 +------------------ keyboards/atomic/rules.mk | 69 ++++++++++++++++++ keyboards/atreus/Makefile | 89 +---------------------- keyboards/atreus/rules.mk | 82 +++++++++++++++++++++ keyboards/bantam44/Makefile | 73 +------------------ keyboards/bantam44/rules.mk | 67 +++++++++++++++++ keyboards/chibios_test/Makefile | 11 +-- keyboards/chibios_test/rules.mk | 8 +++ keyboards/clueboard/Makefile | 108 +--------------------------- keyboards/clueboard/rules.mk | 103 ++++++++++++++++++++++++++ keyboards/cluecard/Makefile | 77 +------------------- keyboards/cluecard/rules.mk | 70 ++++++++++++++++++ keyboards/cluepad/Makefile | 71 +----------------- keyboards/cluepad/rules.mk | 65 +++++++++++++++++ keyboards/ergodox/Makefile | 33 +-------- keyboards/ergodox/rules.mk | 28 ++++++++ keyboards/gh60/Makefile | 77 +------------------- keyboards/gh60/rules.mk | 68 ++++++++++++++++++ keyboards/handwired/Makefile | 2 +- keyboards/handwired/onekey/Makefile | 66 +---------------- keyboards/handwired/rules.mk | 0 keyboards/hhkb/Makefile | 91 +---------------------- keyboards/hhkb/rules.mk | 84 ++++++++++++++++++++++ keyboards/infinity_chibios/Makefile | 69 +----------------- keyboards/infinity_chibios/rules.mk | 66 +++++++++++++++++ keyboards/jd45/Makefile | 72 +------------------ keyboards/jd45/rules.mk | 67 +++++++++++++++++ keyboards/kc60/Makefile | 77 +------------------- keyboards/kc60/rules.mk | 70 ++++++++++++++++++ keyboards/kinesis/Makefile | 80 +-------------------- keyboards/kinesis/rules.mk | 73 +++++++++++++++++++ keyboards/lets_split/Makefile | 77 +------------------- keyboards/lets_split/rules.mk | 74 +++++++++++++++++++ keyboards/phantom/Makefile | 75 +------------------ keyboards/phantom/rules.mk | 69 ++++++++++++++++++ keyboards/planck/Makefile | 71 +----------------- keyboards/planck/rules.mk | 67 +++++++++++++++++ keyboards/preonic/Makefile | 72 +------------------ keyboards/preonic/rules.mk | 69 ++++++++++++++++++ keyboards/retro_refit/Makefile | 75 +------------------ keyboards/retro_refit/rules.mk | 68 ++++++++++++++++++ keyboards/s60-x/Makefile | 76 +------------------- keyboards/s60-x/rules.mk | 69 ++++++++++++++++++ keyboards/satan/Makefile | 71 +----------------- keyboards/satan/rules.mk | 66 +++++++++++++++++ keyboards/sixkeyboard/Makefile | 76 +------------------- keyboards/sixkeyboard/rules.mk | 70 ++++++++++++++++++ keyboards/tv44/Makefile | 76 +------------------- keyboards/tv44/rules.mk | 69 ++++++++++++++++++ 56 files changed, 1792 insertions(+), 1903 deletions(-) create mode 100644 keyboards/alps64/rules.mk create mode 100644 keyboards/amj60/rules.mk create mode 100644 keyboards/arrow_pad/rules.mk create mode 100644 keyboards/atomic/rules.mk create mode 100644 keyboards/atreus/rules.mk create mode 100644 keyboards/bantam44/rules.mk create mode 100644 keyboards/chibios_test/rules.mk create mode 100644 keyboards/clueboard/rules.mk create mode 100644 keyboards/cluecard/rules.mk create mode 100644 keyboards/cluepad/rules.mk create mode 100644 keyboards/ergodox/rules.mk create mode 100644 keyboards/gh60/rules.mk create mode 100644 keyboards/handwired/rules.mk create mode 100644 keyboards/hhkb/rules.mk create mode 100644 keyboards/infinity_chibios/rules.mk create mode 100644 keyboards/jd45/rules.mk create mode 100644 keyboards/kc60/rules.mk create mode 100644 keyboards/kinesis/rules.mk create mode 100644 keyboards/lets_split/rules.mk create mode 100644 keyboards/phantom/rules.mk create mode 100644 keyboards/planck/rules.mk create mode 100644 keyboards/preonic/rules.mk create mode 100644 keyboards/retro_refit/rules.mk create mode 100644 keyboards/s60-x/rules.mk create mode 100644 keyboards/satan/rules.mk create mode 100644 keyboards/sixkeyboard/rules.mk create mode 100644 keyboards/tv44/rules.mk diff --git a/Makefile b/Makefile index 1e11dd5ff8..b2a8735320 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR)) PATH_ELEMENTS := $(subst /, ,$(STARTING_DIR)) -QUANTUM_DIR:=$(ROOT_DIR)/quantum +MAKEFILE_INCLUDED=yes define NEXT_PATH_ELEMENT $$(eval CURRENT_PATH_ELEMENT := $$(firstword $$(PATH_ELEMENTS))) diff --git a/keyboards/alps64/Makefile b/keyboards/alps64/Makefile index d8325e6c89..4e2a6f00fd 100644 --- a/keyboards/alps64/Makefile +++ b/keyboards/alps64/Makefile @@ -1,70 +1,3 @@ - - -# Target file name (without extension). - -# project specific files -SRC = led.c - -# MCU name -MCU = atmega32u2 - -# 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 -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/alps64/rules.mk b/keyboards/alps64/rules.mk new file mode 100644 index 0000000000..c326d3e26c --- /dev/null +++ b/keyboards/alps64/rules.mk @@ -0,0 +1,66 @@ + + +# Target file name (without extension). + +# project specific files +SRC = led.c + +# MCU name +MCU = atmega32u2 + +# 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 +#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA \ No newline at end of file diff --git a/keyboards/amj60/Makefile b/keyboards/amj60/Makefile index 1f695aa4d8..4e2a6f00fd 100644 --- a/keyboards/amj60/Makefile +++ b/keyboards/amj60/Makefile @@ -1,70 +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 ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= no # 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 -NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -RGBLIGHT_ENABLE ?= yes # Enable keyboard underlight functionality (+4870) -BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality (+1150) -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/amj60/rules.mk b/keyboards/amj60/rules.mk new file mode 100644 index 0000000000..18403ac328 --- /dev/null +++ b/keyboards/amj60/rules.mk @@ -0,0 +1,66 @@ + +# 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 ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= no # 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 +NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +RGBLIGHT_ENABLE ?= yes # Enable keyboard underlight functionality (+4870) +BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality (+1150) +MIDI_ENABLE ?= no # MIDI controls +AUDIO_ENABLE ?= no +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID diff --git a/keyboards/arrow_pad/Makefile b/keyboards/arrow_pad/Makefile index 09fcf3e7a0..4e2a6f00fd 100644 --- a/keyboards/arrow_pad/Makefile +++ b/keyboards/arrow_pad/Makefile @@ -1,74 +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=512 - - -# Build Options -# change yes to no to disable -# -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 ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= yes # USB Nkey Rollover -BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/arrow_pad/rules.mk b/keyboards/arrow_pad/rules.mk new file mode 100644 index 0000000000..3dca9b6ea7 --- /dev/null +++ b/keyboards/arrow_pad/rules.mk @@ -0,0 +1,70 @@ + + +# 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=512 + + +# Build Options +# change yes to no to disable +# +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 ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= yes # USB Nkey Rollover +BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 \ No newline at end of file diff --git a/keyboards/atomic/Makefile b/keyboards/atomic/Makefile index 08e9205cbf..4e2a6f00fd 100644 --- a/keyboards/atomic/Makefile +++ b/keyboards/atomic/Makefile @@ -1,73 +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 -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= yes # 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 -BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no # Audio output on port C6 -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/atomic/rules.mk b/keyboards/atomic/rules.mk new file mode 100644 index 0000000000..d0f3a3a1c0 --- /dev/null +++ b/keyboards/atomic/rules.mk @@ -0,0 +1,69 @@ + + +# 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 +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= yes # 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 +BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality +MIDI_ENABLE ?= no # MIDI controls +AUDIO_ENABLE ?= no # Audio output on port C6 +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend \ No newline at end of file diff --git a/keyboards/atreus/Makefile b/keyboards/atreus/Makefile index 5894d231f9..4e2a6f00fd 100644 --- a/keyboards/atreus/Makefile +++ b/keyboards/atreus/Makefile @@ -1,88 +1,3 @@ - - -ifdef TEENSY2 - OPT_DEFS += -DATREUS_TEENSY2 - ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex -else - OPT_DEFS += -DATREUS_ASTAR - OPT_DEFS += -DCATERINA_BOOTLOADER - ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ - avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) -endif - -# 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 -# 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 - not yet supported in LUFA -# 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 - -USB ?= /dev/cu.usbmodem1411 - -upload: build - $(ATREUS_UPLOAD_COMMAND) - +endif \ No newline at end of file diff --git a/keyboards/atreus/rules.mk b/keyboards/atreus/rules.mk new file mode 100644 index 0000000000..d71f50bb2b --- /dev/null +++ b/keyboards/atreus/rules.mk @@ -0,0 +1,82 @@ + + +ifdef TEENSY2 + OPT_DEFS += -DATREUS_TEENSY2 + ATRUES_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex +else + OPT_DEFS += -DATREUS_ASTAR + OPT_DEFS += -DCATERINA_BOOTLOADER + ATRUES_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ + avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) +endif + +# 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 +# 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 - not yet supported in LUFA +# 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 + +USB ?= /dev/cu.usbmodem1411 + +upload: build + $(ATRUES_UPLOAD_COMMAND) \ No newline at end of file diff --git a/keyboards/bantam44/Makefile b/keyboards/bantam44/Makefile index 03893dbf89..4e2a6f00fd 100644 --- a/keyboards/bantam44/Makefile +++ b/keyboards/bantam44/Makefile @@ -1,72 +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=512 - - -# 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 -# 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 \ No newline at end of file diff --git a/keyboards/bantam44/rules.mk b/keyboards/bantam44/rules.mk new file mode 100644 index 0000000000..baa0e9e7a2 --- /dev/null +++ b/keyboards/bantam44/rules.mk @@ -0,0 +1,67 @@ + + +# 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=512 + + +# 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 +# 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 diff --git a/keyboards/chibios_test/Makefile b/keyboards/chibios_test/Makefile index d9f2b8b83b..4b07a62343 100644 --- a/keyboards/chibios_test/Makefile +++ b/keyboards/chibios_test/Makefile @@ -1,14 +1,5 @@ SUBPROJECT_DEFAULT = stm32_f072_onekey -#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE ?= yes # Mouse keys -EXTRAKEY_ENABLE ?= yes # Audio control and System control -CONSOLE_ENABLE ?= yes # Console for debug -COMMAND_ENABLE ?= yes # Commands for debug and configuration -SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= yes # USB Nkey Rollover -CUSTOM_MATRIX ?= yes # Custom matrix file - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/chibios_test/rules.mk b/keyboards/chibios_test/rules.mk new file mode 100644 index 0000000000..4b5a845356 --- /dev/null +++ b/keyboards/chibios_test/rules.mk @@ -0,0 +1,8 @@ +#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +MOUSEKEY_ENABLE ?= yes # Mouse keys +EXTRAKEY_ENABLE ?= yes # Audio control and System control +CONSOLE_ENABLE ?= yes # Console for debug +COMMAND_ENABLE ?= yes # Commands for debug and configuration +SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend +NKRO_ENABLE ?= yes # USB Nkey Rollover +CUSTOM_MATRIX ?= yes # Custom matrix file \ No newline at end of file diff --git a/keyboards/clueboard/Makefile b/keyboards/clueboard/Makefile index e6b13f955a..b9bada8f8d 100644 --- a/keyboards/clueboard/Makefile +++ b/keyboards/clueboard/Makefile @@ -1,109 +1,5 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- - SUBPROJECT_DEFAULT = rev2 -# MCU name -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 -# change to no to disable the options. -# -BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= no # 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 -NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -AUDIO_ENABLE ?= no -RGBLIGHT_ENABLE ?= no # Enable keyboard underlight functionality -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/clueboard/rules.mk b/keyboards/clueboard/rules.mk new file mode 100644 index 0000000000..3909fbd5cb --- /dev/null +++ b/keyboards/clueboard/rules.mk @@ -0,0 +1,103 @@ +#---------------------------------------------------------------------------- +# On command line: +# +# make all = Make software. +# +# make clean = Clean out built project files. +# +# make coff = Convert ELF to AVR COFF. +# +# make extcoff = Convert ELF to AVR Extended COFF. +# +# make program = Download the hex file to the device. +# Please customize your programmer settings(PROGRAM_CMD) +# +# make teensy = Download the hex file to the device, using teensy_loader_cli. +# (must have teensy_loader_cli installed). +# +# make dfu = Download the hex file to the device, using dfu-programmer (must +# have dfu-programmer installed). +# +# make flip = Download the hex file to the device, using Atmel FLIP (must +# have Atmel FLIP installed). +# +# make dfu-ee = Download the eeprom file to the device, using dfu-programmer +# (must have dfu-programmer installed). +# +# make flip-ee = Download the eeprom file to the device, using Atmel FLIP +# (must have Atmel FLIP installed). +# +# make debug = Start either simulavr or avarice as specified for debugging, +# with avr-gdb or avr-insight as the front end for debugging. +# +# make filename.s = Just compile filename.c into the assembler code only. +# +# make filename.i = Create a preprocessed source file for use in submitting +# bug reports to the GCC project. +# +# To rebuild project do "make clean" then "make all". +#---------------------------------------------------------------------------- + +# MCU name +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 ?= no # 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 +NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +AUDIO_ENABLE ?= no +RGBLIGHT_ENABLE ?= no # Enable keyboard underlight functionality +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID \ No newline at end of file diff --git a/keyboards/cluecard/Makefile b/keyboards/cluecard/Makefile index 029d0b9670..4e2a6f00fd 100644 --- a/keyboards/cluecard/Makefile +++ b/keyboards/cluecard/Makefile @@ -1,76 +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 -# change yes to no to disable -# -BOOTMAGIC_ENABLE ?= no # 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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -RGBLIGHT_ENABLE ?= yes # Enable keyboard underlight functionality (+4870) -BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= yes # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif - - +endif \ No newline at end of file diff --git a/keyboards/cluecard/rules.mk b/keyboards/cluecard/rules.mk new file mode 100644 index 0000000000..454235877d --- /dev/null +++ b/keyboards/cluecard/rules.mk @@ -0,0 +1,70 @@ + + +# 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 +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # 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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +RGBLIGHT_ENABLE ?= yes # Enable keyboard underlight functionality (+4870) +BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= yes # Audio output on port C6 diff --git a/keyboards/cluepad/Makefile b/keyboards/cluepad/Makefile index a331ff4dcd..4e2a6f00fd 100644 --- a/keyboards/cluepad/Makefile +++ b/keyboards/cluepad/Makefile @@ -1,70 +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 -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 numpad's backlight functionality -RGBLIGHT_ENABLE ?= yes -# 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 \ No newline at end of file diff --git a/keyboards/cluepad/rules.mk b/keyboards/cluepad/rules.mk new file mode 100644 index 0000000000..19b16b95a9 --- /dev/null +++ b/keyboards/cluepad/rules.mk @@ -0,0 +1,65 @@ + +# 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 +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 numpad's backlight functionality +RGBLIGHT_ENABLE ?= yes +# MIDI_ENABLE ?= YES # MIDI controls +# UNICODE_ENABLE ?= YES # Unicode +# BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID \ No newline at end of file diff --git a/keyboards/ergodox/Makefile b/keyboards/ergodox/Makefile index 05fb588d11..7165350050 100644 --- a/keyboards/ergodox/Makefile +++ b/keyboards/ergodox/Makefile @@ -1,34 +1,5 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make = Make software. -# -# make clean = Clean out built project files. -# -# That's pretty much all you need. To compile, always go make clean, -# followed by make. -# -# For advanced users only: -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -#---------------------------------------------------------------------------- SUBPROJECT_DEFAULT = ez -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= yes # Commands for debug and configuration -CUSTOM_MATRIX ?= yes # Custom matrix file for the ErgoDox EZ -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 -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= yes # Unicode - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/ergodox/rules.mk b/keyboards/ergodox/rules.mk new file mode 100644 index 0000000000..ac63d4eff2 --- /dev/null +++ b/keyboards/ergodox/rules.mk @@ -0,0 +1,28 @@ +#---------------------------------------------------------------------------- +# On command line: +# +# make = Make software. +# +# make clean = Clean out built project files. +# +# That's pretty much all you need. To compile, always go make clean, +# followed by make. +# +# For advanced users only: +# make teensy = Download the hex file to the device, using teensy_loader_cli. +# (must have teensy_loader_cli installed). +# +#---------------------------------------------------------------------------- +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= yes # Commands for debug and configuration +CUSTOM_MATRIX ?= yes # Custom matrix file for the ErgoDox EZ +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 +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= yes # Unicode diff --git a/keyboards/gh60/Makefile b/keyboards/gh60/Makefile index 39a9cc0ae1..4e2a6f00fd 100644 --- a/keyboards/gh60/Makefile +++ b/keyboards/gh60/Makefile @@ -1,74 +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 - include ../../Makefile -endif - +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif \ No newline at end of file diff --git a/keyboards/gh60/rules.mk b/keyboards/gh60/rules.mk new file mode 100644 index 0000000000..73f4bd76e8 --- /dev/null +++ b/keyboards/gh60/rules.mk @@ -0,0 +1,68 @@ + + +# 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 diff --git a/keyboards/handwired/Makefile b/keyboards/handwired/Makefile index 57493a47ca..4e2a6f00fd 100644 --- a/keyboards/handwired/Makefile +++ b/keyboards/handwired/Makefile @@ -1,3 +1,3 @@ -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/handwired/onekey/Makefile b/keyboards/handwired/onekey/Makefile index c6d10856a1..4e2a6f00fd 100644 --- a/keyboards/handwired/onekey/Makefile +++ b/keyboards/handwired/onekey/Makefile @@ -1,65 +1,3 @@ - - -# MCU name -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 ?= no # 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 -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA - -ifndef QUANTUM_DIR - include ../../../Makefile +ifndef MAKEFILE_INCLUDED + include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/handwired/rules.mk b/keyboards/handwired/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/hhkb/Makefile b/keyboards/hhkb/Makefile index 6fe973e1eb..4e2a6f00fd 100644 --- a/keyboards/hhkb/Makefile +++ b/keyboards/hhkb/Makefile @@ -1,90 +1,3 @@ - - -# project specific files -SRC = matrix.c - -# 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 - -# as per original hasu settings -OPT_DEFS += -DBOOTLOADER_SIZE=512 - -# 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 -CUSTOM_MATRIX ?= yes # Custom matrix file for the HHKB -# 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 - -ifneq (, $(findstring yes, $(HHKB_JP))) - OPT_DEFS += -DHHKB_JP -endif - -debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION -debug-on: all - -debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT -debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) -debug-off: all +endif \ No newline at end of file diff --git a/keyboards/hhkb/rules.mk b/keyboards/hhkb/rules.mk new file mode 100644 index 0000000000..b43b5e23f1 --- /dev/null +++ b/keyboards/hhkb/rules.mk @@ -0,0 +1,84 @@ + + +# project specific files +SRC = matrix.c + +# 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 + +# as per original hasu settings +OPT_DEFS += -DBOOTLOADER_SIZE=512 + +# 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 +CUSTOM_MATRIX ?= yes # Custom matrix file for the HHKB +# 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 + +ifneq (, $(findstring yes, $(HHKB_JP))) + OPT_DEFS += -DHHKB_JP +endif + +debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION +debug-on: all + +debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT +debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) +debug-off: all diff --git a/keyboards/infinity_chibios/Makefile b/keyboards/infinity_chibios/Makefile index 649b43e64d..4e2a6f00fd 100644 --- a/keyboards/infinity_chibios/Makefile +++ b/keyboards/infinity_chibios/Makefile @@ -1,70 +1,3 @@ -# project specific files -SRC = matrix.c \ - led.c - -## chip/board settings -# - the next two should match the directories in -# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -# - For Teensies, FAMILY = KINETIS and SERIES is either -# KL2x (LC) or K20x (3.0,3.1,3.2). -# - For Infinity KB, SERIES = K20x -MCU_FAMILY = KINETIS -MCU_SERIES = K20x - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ -# - NOTE: a custom ld script is needed for EEPROM on Teensy LC -# - LDSCRIPT = -# - MKL26Z64 for Teensy LC -# - MK20DX128 for Teensy 3.0 -# - MK20DX256 for Teensy 3.1 and 3.2 -# - MK20DX128BLDR4 for Infinity with Kiibohd bootloader -MCU_LDSCRIPT = MK20DX128BLDR4 - -# Startup code to use -# - it should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ -# - STARTUP = -# - kl2x for Teensy LC -# - k20x5 for Teensy 3.0 and Infinity KB -# - k20x7 for Teensy 3.1 and 3.2 -MCU_STARTUP = k20x5 - -# Board: it should exist either in /os/hal/boards/ -# or /boards -# - BOARD = -# - PJRC_TEENSY_LC for Teensy LC -# - PJRC_TEENSY_3 for Teensy 3.0 -# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 -# - MCHCK_K20 for Infinity KB -BOARD = MCHCK_K20 - -# Cortex version -# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 -MCU = cortex-m4 - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -# I.e. 6 for Teensy LC; 7 for Teensy 3.x -ARMV = 7 - -# Vector table for application -# 0x00000000-0x00001000 area is occupied by bootlaoder.*/ -# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB -OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 - -# Build Options -# comment out to disable the options. -# -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 -EXTRAKEY_ENABLE ?= yes # Audio control and System control -CONSOLE_ENABLE ?= yes # Console for debug -COMMAND_ENABLE ?= yes # Commands for debug and configuration -SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= yes # USB Nkey Rollover -CUSTOM_MATRIX ?= yes # Custom matrix file - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/infinity_chibios/rules.mk b/keyboards/infinity_chibios/rules.mk new file mode 100644 index 0000000000..56d6470b59 --- /dev/null +++ b/keyboards/infinity_chibios/rules.mk @@ -0,0 +1,66 @@ +# project specific files +SRC = matrix.c \ + led.c + +## chip/board settings +# - the next two should match the directories in +# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) +# - For Teensies, FAMILY = KINETIS and SERIES is either +# KL2x (LC) or K20x (3.0,3.1,3.2). +# - For Infinity KB, SERIES = K20x +MCU_FAMILY = KINETIS +MCU_SERIES = K20x + +# Linker script to use +# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ +# or /ld/ +# - NOTE: a custom ld script is needed for EEPROM on Teensy LC +# - LDSCRIPT = +# - MKL26Z64 for Teensy LC +# - MK20DX128 for Teensy 3.0 +# - MK20DX256 for Teensy 3.1 and 3.2 +# - MK20DX128BLDR4 for Infinity with Kiibohd bootloader +MCU_LDSCRIPT = MK20DX128BLDR4 + +# Startup code to use +# - it should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ +# - STARTUP = +# - kl2x for Teensy LC +# - k20x5 for Teensy 3.0 and Infinity KB +# - k20x7 for Teensy 3.1 and 3.2 +MCU_STARTUP = k20x5 + +# Board: it should exist either in /os/hal/boards/ +# or /boards +# - BOARD = +# - PJRC_TEENSY_LC for Teensy LC +# - PJRC_TEENSY_3 for Teensy 3.0 +# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 +# - MCHCK_K20 for Infinity KB +BOARD = MCHCK_K20 + +# Cortex version +# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 +MCU = cortex-m4 + +# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 +# I.e. 6 for Teensy LC; 7 for Teensy 3.x +ARMV = 7 + +# Vector table for application +# 0x00000000-0x00001000 area is occupied by bootlaoder.*/ +# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB +OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 + +# Build Options +# comment out to disable the options. +# +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 +EXTRAKEY_ENABLE ?= yes # Audio control and System control +CONSOLE_ENABLE ?= yes # Console for debug +COMMAND_ENABLE ?= yes # Commands for debug and configuration +SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend +NKRO_ENABLE ?= yes # USB Nkey Rollover +CUSTOM_MATRIX ?= yes # Custom matrix file \ No newline at end of file diff --git a/keyboards/jd45/Makefile b/keyboards/jd45/Makefile index 75d544f16a..4e2a6f00fd 100644 --- a/keyboards/jd45/Makefile +++ b/keyboards/jd45/Makefile @@ -1,71 +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 -# 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 - not yet supported in LUFA -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 \ No newline at end of file diff --git a/keyboards/jd45/rules.mk b/keyboards/jd45/rules.mk new file mode 100644 index 0000000000..2f1e266a14 --- /dev/null +++ b/keyboards/jd45/rules.mk @@ -0,0 +1,67 @@ + + +# 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 +# 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 - not yet supported in LUFA +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 \ No newline at end of file diff --git a/keyboards/kc60/Makefile b/keyboards/kc60/Makefile index b00a488b91..4e2a6f00fd 100644 --- a/keyboards/kc60/Makefile +++ b/keyboards/kc60/Makefile @@ -1,76 +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 -# change yes to no to disable -# -BOOTMAGIC_ENABLE ?= no # 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 ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 - - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif - +endif \ No newline at end of file diff --git a/keyboards/kc60/rules.mk b/keyboards/kc60/rules.mk new file mode 100644 index 0000000000..4efd6f9887 --- /dev/null +++ b/keyboards/kc60/rules.mk @@ -0,0 +1,70 @@ + + +# 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 +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # 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 ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 diff --git a/keyboards/kinesis/Makefile b/keyboards/kinesis/Makefile index ca077e6366..4e2a6f00fd 100644 --- a/keyboards/kinesis/Makefile +++ b/keyboards/kinesis/Makefile @@ -1,79 +1,3 @@ - -## Project specific files - -SRC= matrix.c - -# MCU name -MCU = at90usb1286 -#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=1024 - - -# Build Options -# change yes to no to disable -# -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 ?= no # Console for debug(+400) -COMMAND_ENABLE ?= no -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output should be port E6, current quantum library hardcodes C6, which we use for programming -CUSTOM_MATRIX=yes # need to do our own thing with the matrix - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif - - +endif \ No newline at end of file diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk new file mode 100644 index 0000000000..a4a2b7d156 --- /dev/null +++ b/keyboards/kinesis/rules.mk @@ -0,0 +1,73 @@ + +## Project specific files + +SRC= matrix.c + +# MCU name +MCU = at90usb1286 +#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=1024 + + +# Build Options +# change yes to no to disable +# +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 ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output should be port E6, current quantum library hardcodes C6, which we use for programming +CUSTOM_MATRIX=yes # need to do our own thing with the matrix diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile index b9f07636be..4e2a6f00fd 100644 --- a/keyboards/lets_split/Makefile +++ b/keyboards/lets_split/Makefile @@ -1,78 +1,3 @@ -SRC += matrix.c \ - i2c.c \ - split_util.c \ - serial.c - -# 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 -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= yes # 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 -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= yes # Audio output on port C6 -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend - -CUSTOM_MATRIX = yes - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk new file mode 100644 index 0000000000..6961fbd556 --- /dev/null +++ b/keyboards/lets_split/rules.mk @@ -0,0 +1,74 @@ +SRC += matrix.c \ + i2c.c \ + split_util.c \ + serial.c + +# 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 +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= yes # 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 +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality +MIDI_ENABLE ?= no # MIDI controls +AUDIO_ENABLE ?= yes # Audio output on port C6 +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend + +CUSTOM_MATRIX = yes \ No newline at end of file diff --git a/keyboards/phantom/Makefile b/keyboards/phantom/Makefile index 3a71fd0ee3..4e2a6f00fd 100644 --- a/keyboards/phantom/Makefile +++ b/keyboards/phantom/Makefile @@ -1,74 +1,3 @@ - - -SRC = led.c - -# 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 ?= no # 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 -NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -RGBLIGHT_ENABLE ?=yes # Enable keyboard underlight functionality (+4870) -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality (+1150) -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID - - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/phantom/rules.mk b/keyboards/phantom/rules.mk new file mode 100644 index 0000000000..c6b8ca6c35 --- /dev/null +++ b/keyboards/phantom/rules.mk @@ -0,0 +1,69 @@ + + +SRC = led.c + +# 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 ?= no # 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 +NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +RGBLIGHT_ENABLE ?=yes # Enable keyboard underlight functionality (+4870) +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality (+1150) +MIDI_ENABLE ?= no # MIDI controls +AUDIO_ENABLE ?= no +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID diff --git a/keyboards/planck/Makefile b/keyboards/planck/Makefile index 23944f92ea..7d49c5ef96 100644 --- a/keyboards/planck/Makefile +++ b/keyboards/planck/Makefile @@ -1,74 +1,5 @@ - SUBPROJECT_DEFAULT = rev4 -# 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 -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= yes # 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 -BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no # Audio output on port C6 -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/planck/rules.mk b/keyboards/planck/rules.mk new file mode 100644 index 0000000000..25db53a315 --- /dev/null +++ b/keyboards/planck/rules.mk @@ -0,0 +1,67 @@ +# 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 +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= yes # 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 +BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality +MIDI_ENABLE ?= no # MIDI controls +AUDIO_ENABLE ?= no # Audio output on port C6 +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend \ No newline at end of file diff --git a/keyboards/preonic/Makefile b/keyboards/preonic/Makefile index 08e9205cbf..4e2a6f00fd 100644 --- a/keyboards/preonic/Makefile +++ b/keyboards/preonic/Makefile @@ -1,73 +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 -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= yes # 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 -BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no # Audio output on port C6 -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif \ No newline at end of file diff --git a/keyboards/preonic/rules.mk b/keyboards/preonic/rules.mk new file mode 100644 index 0000000000..d0f3a3a1c0 --- /dev/null +++ b/keyboards/preonic/rules.mk @@ -0,0 +1,69 @@ + + +# 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 +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= yes # 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 +BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality +MIDI_ENABLE ?= no # MIDI controls +AUDIO_ENABLE ?= no # Audio output on port C6 +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend \ No newline at end of file diff --git a/keyboards/retro_refit/Makefile b/keyboards/retro_refit/Makefile index 2dd8cc5f79..4e2a6f00fd 100644 --- a/keyboards/retro_refit/Makefile +++ b/keyboards/retro_refit/Makefile @@ -1,74 +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=512 - - -# 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 \ No newline at end of file diff --git a/keyboards/retro_refit/rules.mk b/keyboards/retro_refit/rules.mk new file mode 100644 index 0000000000..10fbfa5c9d --- /dev/null +++ b/keyboards/retro_refit/rules.mk @@ -0,0 +1,68 @@ + + +# 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=512 + + +# 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 diff --git a/keyboards/s60-x/Makefile b/keyboards/s60-x/Makefile index 8b51d4609f..4e2a6f00fd 100644 --- a/keyboards/s60-x/Makefile +++ b/keyboards/s60-x/Makefile @@ -1,75 +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 -# change yes to no to disable -# -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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif - - +endif \ No newline at end of file diff --git a/keyboards/s60-x/rules.mk b/keyboards/s60-x/rules.mk new file mode 100644 index 0000000000..7ec93933a9 --- /dev/null +++ b/keyboards/s60-x/rules.mk @@ -0,0 +1,69 @@ + + +# 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 +# change yes to no to disable +# +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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 \ No newline at end of file diff --git a/keyboards/satan/Makefile b/keyboards/satan/Makefile index a0879fc9c9..4e2a6f00fd 100644 --- a/keyboards/satan/Makefile +++ b/keyboards/satan/Makefile @@ -1,70 +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 ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= no # 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 -NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -RGBLIGHT_ENABLE ?= yes # Enable keyboard underlight functionality (+4870) -BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality (+1150) -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/satan/rules.mk b/keyboards/satan/rules.mk new file mode 100644 index 0000000000..1102584d8a --- /dev/null +++ b/keyboards/satan/rules.mk @@ -0,0 +1,66 @@ + +# 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 ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= no # 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 +NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +RGBLIGHT_ENABLE ?= yes # Enable keyboard underlight functionality (+4870) +BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality (+1150) +MIDI_ENABLE ?= no # MIDI controls +AUDIO_ENABLE ?= no +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID diff --git a/keyboards/sixkeyboard/Makefile b/keyboards/sixkeyboard/Makefile index 6f273064a7..4e2a6f00fd 100644 --- a/keyboards/sixkeyboard/Makefile +++ b/keyboards/sixkeyboard/Makefile @@ -1,75 +1,3 @@ - - -SRC = matrix.c - -# MCU name -#MCU = at90usb1287 -MCU = atmega16u2 - -# 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 ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= no # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= no # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= no # Commands for debug and configuration -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= no # USB 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 -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -CUSTOM_MATRIX = yes - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif - +endif \ No newline at end of file diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk new file mode 100644 index 0000000000..2c99985a97 --- /dev/null +++ b/keyboards/sixkeyboard/rules.mk @@ -0,0 +1,70 @@ + + +SRC = matrix.c + +# MCU name +#MCU = at90usb1287 +MCU = atmega16u2 + +# 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 ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= no # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= no # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no # Commands for debug and configuration +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +NKRO_ENABLE ?= no # USB 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 +MIDI_ENABLE ?= no # MIDI controls +AUDIO_ENABLE ?= no +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +CUSTOM_MATRIX = yes \ No newline at end of file diff --git a/keyboards/tv44/Makefile b/keyboards/tv44/Makefile index 45ca127807..4e2a6f00fd 100644 --- a/keyboards/tv44/Makefile +++ b/keyboards/tv44/Makefile @@ -1,75 +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 -# change yes to no to disable -# -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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= yes # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif - - +endif \ No newline at end of file diff --git a/keyboards/tv44/rules.mk b/keyboards/tv44/rules.mk new file mode 100644 index 0000000000..dbba6bace6 --- /dev/null +++ b/keyboards/tv44/rules.mk @@ -0,0 +1,69 @@ + + +# 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 +# change yes to no to disable +# +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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= yes # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 From 2dd9c1edcdcc3fc579e6109daf9012f9a82b7435 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 17:48:59 +0300 Subject: [PATCH 023/120] Proper parsing of keymaps inside subprojects --- Makefile | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b2a8735320..028d143930 100644 --- a/Makefile +++ b/Makefile @@ -131,16 +131,32 @@ endef # $1 Subproject define PARSE_SUBPROJECT ifeq ($1,defaultsp) + SUBPROJECT_DEFAULT= $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/Makefile) CURRENT_SP := $$(SUBPROJECT_DEFAULT) else CURRENT_SP := $1 endif - KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.))) - ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true) - $$(eval $$(call PARSE_ALL_KEYMAPS)) - else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true) - $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) + # If current subproject is empty (the default was not defined), and we have a list of subproject + # then make all + ifeq ($$(CURRENT_SP),) + ifneq ($$(SUBPROJECTS),) + CURRENT_SP := allsp + endif + endif + ifneq ($$(CURRENT_SP),allsp) + KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.))) + ifneq ($$(CURRENT_SP),) + SP_KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/keymaps/*/.))) + KEYMAPS := $$(sort $$(KEYMAPS) $$(SP_KEYMAPS)) + endif + ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true) + $$(eval $$(call PARSE_ALL_KEYMAPS)) + else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true) + $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) + endif + else + $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$(SUBPROJECTS))) endif endef From a6d35000241e20df32b34498a3a9622bde6f0062 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 18:12:45 +0300 Subject: [PATCH 024/120] Print error message when trying to build non-existing keymap --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 028d143930..a9a2d98fcb 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,8 @@ ifeq ($(CURRENT_PATH_ELEMENT),keyboards) endif $(info $(ROOT_DIR)/keyboards) -KEYBOARDS := $(notdir $(patsubst %/.,%,$(wildcard $(ROOT_DIR)/keyboards/*/.))) +# Only consider folders with makefiles, to prevent errors in case there are extra folders +KEYBOARDS := $(notdir $(patsubst %/Makefile,%,$(wildcard $(ROOT_DIR)/keyboards/*/Makefile))) $(info Keyboard: $(KEYBOARD)) $(info Keymap: $(KEYMAP)) @@ -154,6 +155,13 @@ define PARSE_SUBPROJECT $$(eval $$(call PARSE_ALL_KEYMAPS)) else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true) $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) + else + ifeq ($$(CURRENT_SP),) + $$(info make: *** No rule to make target '$$(CURRENT_KB)-$$(RULE)'. Stop.) + else + $$(info make: *** No rule to make target '$$(CURRENT_KB)-$$(CURRENT_SP)-$$(RULE)'. Stop.) + endif + exit 1 endif else $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$(SUBPROJECTS))) From 1ad5578d11b0b4a7288c3fd0748de3a57f4180f2 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 18:15:45 +0300 Subject: [PATCH 025/120] Print error when building non-existing keyboard --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index a9a2d98fcb..623e4b064d 100644 --- a/Makefile +++ b/Makefile @@ -104,6 +104,9 @@ define PARSE_RULE $$(eval $$(call PARSE_ALL_KEYBOARDS)) else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) + else + $$(info make: *** No rule to make target '$1'. Stop.) + exit 1 endif endef From c83af5451349e6160a2ee220e7b45bb974be5c64 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 18:30:58 +0300 Subject: [PATCH 026/120] Support for running from keyboard directory --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 623e4b064d..7180b41476 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST)) ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST)) -ROOT_DIR := $(dir, $(ROOT_MAKEFILE)) +ROOT_DIR := $(dir $(ROOT_MAKEFILE)) ifeq ($(ROOT_DIR),) ROOT_DIR := . endif @@ -104,6 +104,8 @@ define PARSE_RULE $$(eval $$(call PARSE_ALL_KEYBOARDS)) else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) + else ifneq ($$(KEYBOARD),) + $$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD))) else $$(info make: *** No rule to make target '$1'. Stop.) exit 1 From 051017c3129a17a1f4c610f19067c60bf0a49da9 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 18:38:03 +0300 Subject: [PATCH 027/120] Split subproject make files into Makefile and rules.mk --- .../chibios_test/stm32_f072_onekey/Makefile | 42 +-------- .../chibios_test/stm32_f072_onekey/rules.mk | 41 +++++++++ .../chibios_test/stm32_f103_onekey/Makefile | 53 +---------- .../chibios_test/stm32_f103_onekey/rules.mk | 52 +++++++++++ .../chibios_test/teensy_lc_onekey/Makefile | 48 +--------- .../chibios_test/teensy_lc_onekey/rules.mk | 49 ++++++++++ keyboards/clueboard/rev1/Makefile | 6 +- keyboards/clueboard/rev1/rules.mk | 5 ++ keyboards/clueboard/rev2/Makefile | 6 +- keyboards/clueboard/rev2/rules.mk | 5 ++ keyboards/ergodox/ez/Makefile | 77 +--------------- keyboards/ergodox/ez/rules.mk | 76 ++++++++++++++++ keyboards/ergodox/infinity/Makefile | 78 +--------------- keyboards/ergodox/infinity/rules.mk | 77 ++++++++++++++++ keyboards/handwired/CMD60/Makefile | 74 +-------------- keyboards/handwired/CMD60/rules.mk | 73 +++++++++++++++ keyboards/handwired/fivethirteen/Makefile | 74 +-------------- keyboards/handwired/fivethirteen/rules.mk | 73 +++++++++++++++ keyboards/handwired/minorca/Makefile | 70 +-------------- keyboards/handwired/minorca/rules.mk | 67 ++++++++++++++ keyboards/handwired/onekey/Makefile | 2 +- keyboards/handwired/onekey/rules.mk | 65 ++++++++++++++ keyboards/handwired/traveller/Makefile | 90 +------------------ keyboards/handwired/traveller/rules.mk | 89 ++++++++++++++++++ keyboards/planck/rev3/Makefile | 4 +- keyboards/planck/rev3/rules.mk | 5 ++ keyboards/planck/rev4/Makefile | 4 +- keyboards/planck/rev4/rules.mk | 5 ++ 28 files changed, 705 insertions(+), 605 deletions(-) create mode 100644 keyboards/chibios_test/stm32_f072_onekey/rules.mk create mode 100644 keyboards/chibios_test/stm32_f103_onekey/rules.mk create mode 100644 keyboards/chibios_test/teensy_lc_onekey/rules.mk create mode 100644 keyboards/clueboard/rev1/rules.mk create mode 100644 keyboards/clueboard/rev2/rules.mk create mode 100644 keyboards/ergodox/ez/rules.mk create mode 100644 keyboards/ergodox/infinity/rules.mk create mode 100644 keyboards/handwired/CMD60/rules.mk create mode 100644 keyboards/handwired/fivethirteen/rules.mk create mode 100644 keyboards/handwired/minorca/rules.mk create mode 100644 keyboards/handwired/onekey/rules.mk create mode 100644 keyboards/handwired/traveller/rules.mk create mode 100644 keyboards/planck/rev3/rules.mk create mode 100644 keyboards/planck/rev4/rules.mk diff --git a/keyboards/chibios_test/stm32_f072_onekey/Makefile b/keyboards/chibios_test/stm32_f072_onekey/Makefile index eae38c4b2b..191c6bb664 100644 --- a/keyboards/chibios_test/stm32_f072_onekey/Makefile +++ b/keyboards/chibios_test/stm32_f072_onekey/Makefile @@ -1,41 +1,3 @@ -# project specific files -SRC = matrix.c \ - led.c - -## chip/board settings -# the next two should match the directories in -# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -MCU_FAMILY = STM32 -MCU_SERIES = STM32F0xx -# linker script to use -# it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ -MCU_LDSCRIPT = STM32F072xB -# startup code to use -# is should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ -MCU_STARTUP = stm32f0xx -# it should exist either in /os/hal/boards/ -# or /boards -BOARD = ST_STM32F072B_DISCOVERY -# Cortex version -# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 -MCU = cortex-m0 -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -ARMV = 6 -# If you want to be able to jump to bootloader from firmware on STM32 MCUs, -# set the correct BOOTLOADER_ADDRESS. Either set it here, or define it in -# ./bootloader_defs.h or in ./boards//bootloader_defs.h (if you have -# a custom board definition that you plan to reuse). -# If you're not setting it here, leave it commented out. -# It is chip dependent, the correct number can be looked up here (page 175): -# http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf -# This also requires a patch to chibios: -# /tmk_core/tool/chibios/ch-bootloader-jump.patch -#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 - -# Build Options -# comment out to disable the options. -# -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/chibios_test/stm32_f072_onekey/rules.mk b/keyboards/chibios_test/stm32_f072_onekey/rules.mk new file mode 100644 index 0000000000..eae38c4b2b --- /dev/null +++ b/keyboards/chibios_test/stm32_f072_onekey/rules.mk @@ -0,0 +1,41 @@ +# project specific files +SRC = matrix.c \ + led.c + +## chip/board settings +# the next two should match the directories in +# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) +MCU_FAMILY = STM32 +MCU_SERIES = STM32F0xx +# linker script to use +# it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ +# or /ld/ +MCU_LDSCRIPT = STM32F072xB +# startup code to use +# is should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ +MCU_STARTUP = stm32f0xx +# it should exist either in /os/hal/boards/ +# or /boards +BOARD = ST_STM32F072B_DISCOVERY +# Cortex version +# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 +MCU = cortex-m0 +# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 +ARMV = 6 +# If you want to be able to jump to bootloader from firmware on STM32 MCUs, +# set the correct BOOTLOADER_ADDRESS. Either set it here, or define it in +# ./bootloader_defs.h or in ./boards//bootloader_defs.h (if you have +# a custom board definition that you plan to reuse). +# If you're not setting it here, leave it commented out. +# It is chip dependent, the correct number can be looked up here (page 175): +# http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf +# This also requires a patch to chibios: +# /tmk_core/tool/chibios/ch-bootloader-jump.patch +#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 + +# Build Options +# comment out to disable the options. +# +ifndef QUANTUM_DIR + include ../../../Makefile +endif diff --git a/keyboards/chibios_test/stm32_f103_onekey/Makefile b/keyboards/chibios_test/stm32_f103_onekey/Makefile index 307ca5b198..191c6bb664 100644 --- a/keyboards/chibios_test/stm32_f103_onekey/Makefile +++ b/keyboards/chibios_test/stm32_f103_onekey/Makefile @@ -1,52 +1,3 @@ -# project specific files -SRC = matrix.c \ - led.c - -# GENERIC STM32F103C8T6 board - stm32duino bootloader -OPT_DEFS = -DCORTEX_VTOR_INIT=0x2000 -MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader -BOARD = GENERIC_STM32_F103 - -# GENERIC STM32F103C8T6 board - no bootloader (programmer over serial or SWD) -# OPT_DEFS = -# MCU_LDSCRIPT = STM32F103x8 -# BOARD = GENERIC_STM32_F103 - -# MAPLE MINI -# OPT_DEFS = -DCORTEX_VTOR_INIT=0x5000 -# MCU_LDSCRIPT = STM32F103xB_maplemini_bootloader -# BOARD = MAPLEMINI_STM32_F103 - -## chip/board settings -# the next two should match the directories in -# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -MCU_FAMILY = STM32 -MCU_SERIES = STM32F1xx -# linker script to use -# it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ -# startup code to use -# is should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ -MCU_STARTUP = stm32f1xx -# it should exist either in /os/hal/boards/ -# or /boards -# Cortex version -# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 -MCU = cortex-m3 -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -ARMV = 7 -# If you want to be able to jump to bootloader from firmware on STM32 MCUs, -# set the correct BOOTLOADER_ADDRESS. Either set it here, or define it in -# ./bootloader_defs.h or in ./boards//bootloader_defs.h (if you have -# a custom board definition that you plan to reuse). -# If you're not setting it here, leave it commented out. -# It is chip dependent, the correct number can be looked up here (page 175): -# http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf -# This also requires a patch to chibios: -# /tmk_core/tool/chibios/ch-bootloader-jump.patch -#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 - - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/chibios_test/stm32_f103_onekey/rules.mk b/keyboards/chibios_test/stm32_f103_onekey/rules.mk new file mode 100644 index 0000000000..307ca5b198 --- /dev/null +++ b/keyboards/chibios_test/stm32_f103_onekey/rules.mk @@ -0,0 +1,52 @@ +# project specific files +SRC = matrix.c \ + led.c + +# GENERIC STM32F103C8T6 board - stm32duino bootloader +OPT_DEFS = -DCORTEX_VTOR_INIT=0x2000 +MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader +BOARD = GENERIC_STM32_F103 + +# GENERIC STM32F103C8T6 board - no bootloader (programmer over serial or SWD) +# OPT_DEFS = +# MCU_LDSCRIPT = STM32F103x8 +# BOARD = GENERIC_STM32_F103 + +# MAPLE MINI +# OPT_DEFS = -DCORTEX_VTOR_INIT=0x5000 +# MCU_LDSCRIPT = STM32F103xB_maplemini_bootloader +# BOARD = MAPLEMINI_STM32_F103 + +## chip/board settings +# the next two should match the directories in +# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) +MCU_FAMILY = STM32 +MCU_SERIES = STM32F1xx +# linker script to use +# it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ +# or /ld/ +# startup code to use +# is should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ +MCU_STARTUP = stm32f1xx +# it should exist either in /os/hal/boards/ +# or /boards +# Cortex version +# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 +MCU = cortex-m3 +# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 +ARMV = 7 +# If you want to be able to jump to bootloader from firmware on STM32 MCUs, +# set the correct BOOTLOADER_ADDRESS. Either set it here, or define it in +# ./bootloader_defs.h or in ./boards//bootloader_defs.h (if you have +# a custom board definition that you plan to reuse). +# If you're not setting it here, leave it commented out. +# It is chip dependent, the correct number can be looked up here (page 175): +# http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf +# This also requires a patch to chibios: +# /tmk_core/tool/chibios/ch-bootloader-jump.patch +#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 + + +ifndef QUANTUM_DIR + include ../../../Makefile +endif diff --git a/keyboards/chibios_test/teensy_lc_onekey/Makefile b/keyboards/chibios_test/teensy_lc_onekey/Makefile index 43ea9d82d9..191c6bb664 100644 --- a/keyboards/chibios_test/teensy_lc_onekey/Makefile +++ b/keyboards/chibios_test/teensy_lc_onekey/Makefile @@ -1,49 +1,3 @@ -# project specific files -SRC = matrix.c \ - led.c - -## chip/board settings -# - the next two should match the directories in -# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -# - For Teensies, FAMILY = KINETIS and SERIES is either -# KL2x (LC) or K20x (3.0,3.1,3.2). -MCU_FAMILY = KINETIS -MCU_SERIES = KL2x - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ -# - NOTE: a custom ld script is needed for EEPROM on Teensy LC -# - LDSCRIPT = -# - MKL26Z64 for Teensy LC -# - MK20DX128 for Teensy 3.0 -# - MK20DX256 for Teensy 3.1 and 3.2 -MCU_LDSCRIPT = MKL26Z64 - -# Startup code to use -# - it should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ -# - STARTUP = -# - kl2x for Teensy LC -# - k20x5 for Teensy 3.0 -# - k20x7 for Teensy 3.1 and 3.2 -MCU_STARTUP = kl2x - -# Board: it should exist either in /os/hal/boards/ -# or /boards -# - BOARD = -# - PJRC_TEENSY_LC for Teensy LC -# - PJRC_TEENSY_3 for Teensy 3.0 -# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 -BOARD = PJRC_TEENSY_LC - -# Cortex version -# Teensy LC is cortex-m0plus; Teensy 3.x are cortex-m4 -MCU = cortex-m0plus - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -# I.e. 6 for Teensy LC; 7 for Teensy 3.x -ARMV = 6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile endif \ No newline at end of file diff --git a/keyboards/chibios_test/teensy_lc_onekey/rules.mk b/keyboards/chibios_test/teensy_lc_onekey/rules.mk new file mode 100644 index 0000000000..43ea9d82d9 --- /dev/null +++ b/keyboards/chibios_test/teensy_lc_onekey/rules.mk @@ -0,0 +1,49 @@ +# project specific files +SRC = matrix.c \ + led.c + +## chip/board settings +# - the next two should match the directories in +# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) +# - For Teensies, FAMILY = KINETIS and SERIES is either +# KL2x (LC) or K20x (3.0,3.1,3.2). +MCU_FAMILY = KINETIS +MCU_SERIES = KL2x + +# Linker script to use +# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ +# or /ld/ +# - NOTE: a custom ld script is needed for EEPROM on Teensy LC +# - LDSCRIPT = +# - MKL26Z64 for Teensy LC +# - MK20DX128 for Teensy 3.0 +# - MK20DX256 for Teensy 3.1 and 3.2 +MCU_LDSCRIPT = MKL26Z64 + +# Startup code to use +# - it should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ +# - STARTUP = +# - kl2x for Teensy LC +# - k20x5 for Teensy 3.0 +# - k20x7 for Teensy 3.1 and 3.2 +MCU_STARTUP = kl2x + +# Board: it should exist either in /os/hal/boards/ +# or /boards +# - BOARD = +# - PJRC_TEENSY_LC for Teensy LC +# - PJRC_TEENSY_3 for Teensy 3.0 +# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 +BOARD = PJRC_TEENSY_LC + +# Cortex version +# Teensy LC is cortex-m0plus; Teensy 3.x are cortex-m4 +MCU = cortex-m0plus + +# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 +# I.e. 6 for Teensy LC; 7 for Teensy 3.x +ARMV = 6 + +ifndef QUANTUM_DIR + include ../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/clueboard/rev1/Makefile b/keyboards/clueboard/rev1/Makefile index 80a942d06f..191c6bb664 100644 --- a/keyboards/clueboard/rev1/Makefile +++ b/keyboards/clueboard/rev1/Makefile @@ -1,5 +1,3 @@ -BACKLIGHT_ENABLE = no - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/clueboard/rev1/rules.mk b/keyboards/clueboard/rev1/rules.mk new file mode 100644 index 0000000000..80a942d06f --- /dev/null +++ b/keyboards/clueboard/rev1/rules.mk @@ -0,0 +1,5 @@ +BACKLIGHT_ENABLE = no + +ifndef QUANTUM_DIR + include ../../../Makefile +endif diff --git a/keyboards/clueboard/rev2/Makefile b/keyboards/clueboard/rev2/Makefile index cea967b795..191c6bb664 100644 --- a/keyboards/clueboard/rev2/Makefile +++ b/keyboards/clueboard/rev2/Makefile @@ -1,5 +1,3 @@ -BACKLIGHT_ENABLE = yes - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/clueboard/rev2/rules.mk b/keyboards/clueboard/rev2/rules.mk new file mode 100644 index 0000000000..cea967b795 --- /dev/null +++ b/keyboards/clueboard/rev2/rules.mk @@ -0,0 +1,5 @@ +BACKLIGHT_ENABLE = yes + +ifndef QUANTUM_DIR + include ../../../Makefile +endif diff --git a/keyboards/ergodox/ez/Makefile b/keyboards/ergodox/ez/Makefile index 37e554b304..191c6bb664 100644 --- a/keyboards/ergodox/ez/Makefile +++ b/keyboards/ergodox/ez/Makefile @@ -1,76 +1,3 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make = Make software. -# -# make clean = Clean out built project files. -# -# That's pretty much all you need. To compile, always go make clean, -# followed by make. -# -# For advanced users only: -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -#---------------------------------------------------------------------------- - -# # project specific files -SRC = twimaster.c \ - matrix.c - -# MCU name -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=512 - - -# Build Options -# comment out to disable the options. -# - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif +endif \ No newline at end of file diff --git a/keyboards/ergodox/ez/rules.mk b/keyboards/ergodox/ez/rules.mk new file mode 100644 index 0000000000..37e554b304 --- /dev/null +++ b/keyboards/ergodox/ez/rules.mk @@ -0,0 +1,76 @@ +#---------------------------------------------------------------------------- +# On command line: +# +# make = Make software. +# +# make clean = Clean out built project files. +# +# That's pretty much all you need. To compile, always go make clean, +# followed by make. +# +# For advanced users only: +# make teensy = Download the hex file to the device, using teensy_loader_cli. +# (must have teensy_loader_cli installed). +# +#---------------------------------------------------------------------------- + +# # project specific files +SRC = twimaster.c \ + matrix.c + +# MCU name +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=512 + + +# Build Options +# comment out to disable the options. +# + +ifndef QUANTUM_DIR + include ../../../Makefile +endif diff --git a/keyboards/ergodox/infinity/Makefile b/keyboards/ergodox/infinity/Makefile index ccb735a485..191c6bb664 100644 --- a/keyboards/ergodox/infinity/Makefile +++ b/keyboards/ergodox/infinity/Makefile @@ -1,77 +1,3 @@ -# project specific files -SRC = matrix.c \ - led.c - -## chip/board settings -# - the next two should match the directories in -# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -# - For Teensies, FAMILY = KINETIS and SERIES is either -# KL2x (LC) or K20x (3.0,3.1,3.2). -# - For Infinity KB, SERIES = K20x -MCU_FAMILY = KINETIS -MCU_SERIES = K20x - -# Linker script to use -# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ -# or /ld/ -# - NOTE: a custom ld script is needed for EEPROM on Teensy LC -# - LDSCRIPT = -# - MKL26Z64 for Teensy LC -# - MK20DX128 for Teensy 3.0 -# - MK20DX256 for Teensy 3.1 and 3.2 -# - MK20DX128BLDR4 for Infinity 60% with Kiibohd bootloader -# - MK20DX256BLDR8 for Infinity ErgoDox with Kiibohd bootloader -MCU_LDSCRIPT = MK20DX256BLDR8 - -# Startup code to use -# - it should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ -# - STARTUP = -# - kl2x for Teensy LC -# - k20x5 for Teensy 3.0 and Infinity 60% -# - k20x7 for Teensy 3.1, 3.2 and Infinity ErgoDox -MCU_STARTUP = k20x7 - -# Board: it should exist either in /os/hal/boards/ -# or /boards -# - BOARD = -# - PJRC_TEENSY_LC for Teensy LC -# - PJRC_TEENSY_3 for Teensy 3.0 -# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 -# - MCHCK_K20 for Infinity KB -#BOARD = MCHCK_K20 -BOARD = PJRC_TEENSY_3_1 - -# Cortex version -# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 -MCU = cortex-m4 - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -# I.e. 6 for Teensy LC; 7 for Teensy 3.x -ARMV = 7 - -# Vector table for application -# 0x00000000-0x00001000 area is occupied by bootlaoder.*/ -# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB -OPT_DEFS += -DCORTEX_VTOR_INIT=0x00002000 - -# Build Options -# comment out to disable the options. -# -CUSTOM_MATRIX ?= yes # Custom matrix file -SERIAL_LINK_ENABLE = yes -VISUALIZER_ENABLE ?= no #temporarily disabled to make everything compile -LCD_ENABLE ?= yes -LED_ENABLE ?= yes -LCD_BACKLIGHT_ENABLE ?= yes - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif - -ifdef LCD_ENABLE -include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk -endif - -ifdef LED_ENABLE -include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk -endif +endif \ No newline at end of file diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk new file mode 100644 index 0000000000..ccb735a485 --- /dev/null +++ b/keyboards/ergodox/infinity/rules.mk @@ -0,0 +1,77 @@ +# project specific files +SRC = matrix.c \ + led.c + +## chip/board settings +# - the next two should match the directories in +# /os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) +# - For Teensies, FAMILY = KINETIS and SERIES is either +# KL2x (LC) or K20x (3.0,3.1,3.2). +# - For Infinity KB, SERIES = K20x +MCU_FAMILY = KINETIS +MCU_SERIES = K20x + +# Linker script to use +# - it should exist either in /os/common/ports/ARMCMx/compilers/GCC/ld/ +# or /ld/ +# - NOTE: a custom ld script is needed for EEPROM on Teensy LC +# - LDSCRIPT = +# - MKL26Z64 for Teensy LC +# - MK20DX128 for Teensy 3.0 +# - MK20DX256 for Teensy 3.1 and 3.2 +# - MK20DX128BLDR4 for Infinity 60% with Kiibohd bootloader +# - MK20DX256BLDR8 for Infinity ErgoDox with Kiibohd bootloader +MCU_LDSCRIPT = MK20DX256BLDR8 + +# Startup code to use +# - it should exist in /os/common/ports/ARMCMx/compilers/GCC/mk/ +# - STARTUP = +# - kl2x for Teensy LC +# - k20x5 for Teensy 3.0 and Infinity 60% +# - k20x7 for Teensy 3.1, 3.2 and Infinity ErgoDox +MCU_STARTUP = k20x7 + +# Board: it should exist either in /os/hal/boards/ +# or /boards +# - BOARD = +# - PJRC_TEENSY_LC for Teensy LC +# - PJRC_TEENSY_3 for Teensy 3.0 +# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2 +# - MCHCK_K20 for Infinity KB +#BOARD = MCHCK_K20 +BOARD = PJRC_TEENSY_3_1 + +# Cortex version +# Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 +MCU = cortex-m4 + +# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 +# I.e. 6 for Teensy LC; 7 for Teensy 3.x +ARMV = 7 + +# Vector table for application +# 0x00000000-0x00001000 area is occupied by bootlaoder.*/ +# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB +OPT_DEFS += -DCORTEX_VTOR_INIT=0x00002000 + +# Build Options +# comment out to disable the options. +# +CUSTOM_MATRIX ?= yes # Custom matrix file +SERIAL_LINK_ENABLE = yes +VISUALIZER_ENABLE ?= no #temporarily disabled to make everything compile +LCD_ENABLE ?= yes +LED_ENABLE ?= yes +LCD_BACKLIGHT_ENABLE ?= yes + +ifndef QUANTUM_DIR + include ../../../Makefile +endif + +ifdef LCD_ENABLE +include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk +endif + +ifdef LED_ENABLE +include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk +endif diff --git a/keyboards/handwired/CMD60/Makefile b/keyboards/handwired/CMD60/Makefile index 7117599173..191c6bb664 100644 --- a/keyboards/handwired/CMD60/Makefile +++ b/keyboards/handwired/CMD60/Makefile @@ -1,73 +1,3 @@ - -# MCU name -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=512 - - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE ?= no # 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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif - - +endif \ No newline at end of file diff --git a/keyboards/handwired/CMD60/rules.mk b/keyboards/handwired/CMD60/rules.mk new file mode 100644 index 0000000000..7117599173 --- /dev/null +++ b/keyboards/handwired/CMD60/rules.mk @@ -0,0 +1,73 @@ + +# MCU name +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=512 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # 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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 + +ifndef QUANTUM_DIR + include ../../../Makefile +endif + + diff --git a/keyboards/handwired/fivethirteen/Makefile b/keyboards/handwired/fivethirteen/Makefile index 7117599173..191c6bb664 100644 --- a/keyboards/handwired/fivethirteen/Makefile +++ b/keyboards/handwired/fivethirteen/Makefile @@ -1,73 +1,3 @@ - -# MCU name -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=512 - - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE ?= no # 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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif - - +endif \ No newline at end of file diff --git a/keyboards/handwired/fivethirteen/rules.mk b/keyboards/handwired/fivethirteen/rules.mk new file mode 100644 index 0000000000..7117599173 --- /dev/null +++ b/keyboards/handwired/fivethirteen/rules.mk @@ -0,0 +1,73 @@ + +# MCU name +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=512 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # 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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 + +ifndef QUANTUM_DIR + include ../../../Makefile +endif + + diff --git a/keyboards/handwired/minorca/Makefile b/keyboards/handwired/minorca/Makefile index 155c1f9a29..191c6bb664 100644 --- a/keyboards/handwired/minorca/Makefile +++ b/keyboards/handwired/minorca/Makefile @@ -1,71 +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=512 - -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -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 ?= no # Console for debug(+400) -COMMAND_ENABLE ?= yes # Commands for debug and configuration -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 -MIDI_ENABLE ?= no # MIDI controls -AUDIO_ENABLE ?= no # Audio output on port C6 -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE ?= yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile endif \ No newline at end of file diff --git a/keyboards/handwired/minorca/rules.mk b/keyboards/handwired/minorca/rules.mk new file mode 100644 index 0000000000..c51371a781 --- /dev/null +++ b/keyboards/handwired/minorca/rules.mk @@ -0,0 +1,67 @@ +# 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=512 + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +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 ?= no # Console for debug(+400) +COMMAND_ENABLE ?= yes # Commands for debug and configuration +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 +MIDI_ENABLE ?= no # MIDI controls +AUDIO_ENABLE ?= no # Audio output on port C6 +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE ?= yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend \ No newline at end of file diff --git a/keyboards/handwired/onekey/Makefile b/keyboards/handwired/onekey/Makefile index 4e2a6f00fd..191c6bb664 100644 --- a/keyboards/handwired/onekey/Makefile +++ b/keyboards/handwired/onekey/Makefile @@ -1,3 +1,3 @@ ifndef MAKEFILE_INCLUDED - include ../../Makefile + include ../../../Makefile endif \ No newline at end of file diff --git a/keyboards/handwired/onekey/rules.mk b/keyboards/handwired/onekey/rules.mk new file mode 100644 index 0000000000..c6d10856a1 --- /dev/null +++ b/keyboards/handwired/onekey/rules.mk @@ -0,0 +1,65 @@ + + +# MCU name +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 ?= no # 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 +#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA + +ifndef QUANTUM_DIR + include ../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/handwired/traveller/Makefile b/keyboards/handwired/traveller/Makefile index 12a4b71f4e..191c6bb664 100644 --- a/keyboards/handwired/traveller/Makefile +++ b/keyboards/handwired/traveller/Makefile @@ -1,89 +1,3 @@ - -#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 - -# for avr upload -USB ?= /dev/cu.usbmodem1421 -# -# 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) - - -ifdef TEENSY2 - OPT_DEFS += -DATREUS_TEENSY2 - ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex -else - OPT_DEFS += -DATREUS_ASTAR - OPT_DEFS += -DCATERINA_BOOTLOADER - ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ - avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) -endif -# Interrupt driven control endpoint task(+60) -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 -# change yes to no to disable -# -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 -RGBLIGHT_ENABLE = yes - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile -endif - -upload: build - $(ATREUS_UPLOAD_COMMAND) - +endif \ No newline at end of file diff --git a/keyboards/handwired/traveller/rules.mk b/keyboards/handwired/traveller/rules.mk new file mode 100644 index 0000000000..12a4b71f4e --- /dev/null +++ b/keyboards/handwired/traveller/rules.mk @@ -0,0 +1,89 @@ + +#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 + +# for avr upload +USB ?= /dev/cu.usbmodem1421 +# +# 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) + + +ifdef TEENSY2 + OPT_DEFS += -DATREUS_TEENSY2 + ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex +else + OPT_DEFS += -DATREUS_ASTAR + OPT_DEFS += -DCATERINA_BOOTLOADER + ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ + avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) +endif +# Interrupt driven control endpoint task(+60) +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 +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 +RGBLIGHT_ENABLE = yes + +ifndef QUANTUM_DIR + include ../../../Makefile +endif + +upload: build + $(ATREUS_UPLOAD_COMMAND) + diff --git a/keyboards/planck/rev3/Makefile b/keyboards/planck/rev3/Makefile index 3ed1445e43..191c6bb664 100644 --- a/keyboards/planck/rev3/Makefile +++ b/keyboards/planck/rev3/Makefile @@ -1,5 +1,3 @@ -AUDIO_ENABLE ?= no # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile endif \ No newline at end of file diff --git a/keyboards/planck/rev3/rules.mk b/keyboards/planck/rev3/rules.mk new file mode 100644 index 0000000000..3ed1445e43 --- /dev/null +++ b/keyboards/planck/rev3/rules.mk @@ -0,0 +1,5 @@ +AUDIO_ENABLE ?= no # Audio output on port C6 + +ifndef QUANTUM_DIR + include ../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/planck/rev4/Makefile b/keyboards/planck/rev4/Makefile index ed09f85a4d..191c6bb664 100644 --- a/keyboards/planck/rev4/Makefile +++ b/keyboards/planck/rev4/Makefile @@ -1,5 +1,3 @@ -AUDIO_ENABLE ?= yes # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../../Makefile endif \ No newline at end of file diff --git a/keyboards/planck/rev4/rules.mk b/keyboards/planck/rev4/rules.mk new file mode 100644 index 0000000000..ed09f85a4d --- /dev/null +++ b/keyboards/planck/rev4/rules.mk @@ -0,0 +1,5 @@ +AUDIO_ENABLE ?= yes # Audio output on port C6 + +ifndef QUANTUM_DIR + include ../../../Makefile +endif \ No newline at end of file From 4f20061f6619f632c28518979d17a51674a3f2c9 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 18:44:57 +0300 Subject: [PATCH 028/120] Proper handling for running make from a subproject or keymap dir --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 7180b41476..a14642af6c 100644 --- a/Makefile +++ b/Makefile @@ -105,6 +105,15 @@ define PARSE_RULE else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) else ifneq ($$(KEYBOARD),) + # If there's no match in the beginning, then use the working directory instead + # First add the keymap to the commandline if we are in a keymap subdirectory + ifneq ($$(KEYMAP),) + RULE := $$(KEYMAP)-$$(RULE) + endif + # If we are in a subproject subdirectory add the subproject + ifneq ($$(SUBPROJECT),) + RULE := $$(SUBPROJECT)-$$(RULE) + endif $$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD))) else $$(info make: *** No rule to make target '$1'. Stop.) From 459ddaceda252a7d8614c43f17cd4c8c14712d5f Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 18:54:12 +0300 Subject: [PATCH 029/120] Add backwards compability with makefile variables --- Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Makefile b/Makefile index a14642af6c..cf0a12f695 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,20 @@ $(info $(ROOT_DIR)/keyboards) # Only consider folders with makefiles, to prevent errors in case there are extra folders KEYBOARDS := $(notdir $(patsubst %/Makefile,%,$(wildcard $(ROOT_DIR)/keyboards/*/Makefile))) +#Compability with the old make variables +ifdef keyboard + KEYBOARD := $(keyboard) +endif +ifdef sub + SUBPROJECT := $(sub) +endif +ifdef subproject + SUBPROJECT := $(subproject) +endif +ifdef keymap + KEYMAP := $(keymap) +endif + $(info Keyboard: $(KEYBOARD)) $(info Keymap: $(KEYMAP)) $(info Subproject: $(SUBPROJECT)) From 3fa6625869b1bc1a2050a7e5edc6228a926536fc Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 19:16:44 +0300 Subject: [PATCH 030/120] Proper default goals when inside keyboard fodlers --- Makefile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cf0a12f695..38bead90a5 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,18 @@ $(info Keymap: $(KEYMAP)) $(info Subproject: $(SUBPROJECT)) $(info Keyboards: $(KEYBOARDS)) +ifneq ($(KEYMAP),) + ifeq ($(SUBPROJECT),) + .DEFAULT_GOAL := $(KEYBOARD)-$(KEYMAP) + else + .DEFAULT_GOAL := $(KEYBOARD)-$(SUBPROJECT)-$(KEYMAP) + endif +else ifneq ($(SUBPROJECT),) + .DEFAULT_GOAL := $(KEYBOARD)-$(SUBPROJECT)-allkm +else ifneq ($(KEYBOARD),) + .DEFAULT_GOAL := $(KEYBOARD)-allsp-allkm +endif + # Compare the start of the RULE_VARIABLE with the first argument($1) # If the rules equals $1 or starts with $1-, RULE_FOUND is set to true @@ -114,9 +126,11 @@ endef define PARSE_RULE RULE := $1 COMMANDS := + $$(info $$(RULE)) ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkb),true) $$(eval $$(call PARSE_ALL_KEYBOARDS)) else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) + $$(info $$(MATCHED_ITEM)) $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) else ifneq ($$(KEYBOARD),) # If there's no match in the beginning, then use the working directory instead @@ -222,12 +236,13 @@ RUN_COMMAND = echo "Running": $(COMMAND_$(COMMAND)); $(eval $(call PARSE_RULE,$@)) $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) + +.PHONY: all +all: + echo "Compiling" + .PHONY: all-keyboards all-keyboards: allkb .PHONY: all-keyboards-defaults all-keyboards-defaults: allkb-default-default - -.PHONY: all -all: - echo "Compiling" \ No newline at end of file From a04bb3a3bae456a0744cf2f6dde326d9a24ebcee Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 19:22:21 +0300 Subject: [PATCH 031/120] Fixed the shortcut targets --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 38bead90a5..d59da0b635 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,7 @@ $(info Keymap: $(KEYMAP)) $(info Subproject: $(SUBPROJECT)) $(info Keyboards: $(KEYBOARDS)) +.DEFAULT_GOAL := all ifneq ($(KEYMAP),) ifeq ($(SUBPROJECT),) .DEFAULT_GOAL := $(KEYBOARD)-$(KEYMAP) @@ -238,11 +239,10 @@ RUN_COMMAND = echo "Running": $(COMMAND_$(COMMAND)); .PHONY: all -all: - echo "Compiling" +all: all-keyboards .PHONY: all-keyboards -all-keyboards: allkb +all-keyboards: allkb-allsp-allkm .PHONY: all-keyboards-defaults -all-keyboards-defaults: allkb-default-default +all-keyboards-defaults: allkb-allsp-default From 0dd629a990e1546614dfa2b430489571c2550f7a Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 7 Aug 2016 21:28:14 +0300 Subject: [PATCH 032/120] Fix running make from various subfolders --- Makefile | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index d59da0b635..a02fa24a2b 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,6 @@ ifeq ($(CURRENT_PATH_ELEMENT),keyboards) endif endif -$(info $(ROOT_DIR)/keyboards) # Only consider folders with makefiles, to prevent errors in case there are extra folders KEYBOARDS := $(notdir $(patsubst %/Makefile,%,$(wildcard $(ROOT_DIR)/keyboards/*/Makefile))) @@ -127,22 +126,11 @@ endef define PARSE_RULE RULE := $1 COMMANDS := - $$(info $$(RULE)) ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkb),true) $$(eval $$(call PARSE_ALL_KEYBOARDS)) else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) - $$(info $$(MATCHED_ITEM)) $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) else ifneq ($$(KEYBOARD),) - # If there's no match in the beginning, then use the working directory instead - # First add the keymap to the commandline if we are in a keymap subdirectory - ifneq ($$(KEYMAP),) - RULE := $$(KEYMAP)-$$(RULE) - endif - # If we are in a subproject subdirectory add the subproject - ifneq ($$(SUBPROJECT),) - RULE := $$(SUBPROJECT)-$$(RULE) - endif $$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD))) else $$(info make: *** No rule to make target '$1'. Stop.) @@ -161,6 +149,8 @@ define PARSE_KEYBOARD $$(eval $$(call PARSE_SUBPROJECT,defaultsp)) else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(SUBPROJECTS)),true) $$(eval $$(call PARSE_SUBPROJECT,$$(MATCHED_ITEM))) + else ifneq ($$(SUBPROJECT),) + $$(eval $$(call PARSE_SUBPROJECT,$$(SUBPROJECT))) else # If there's no matching subproject, we assume it's the default # This will allow you to leave the subproject part of the target out @@ -194,10 +184,14 @@ define PARSE_SUBPROJECT SP_KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/keymaps/*/.))) KEYMAPS := $$(sort $$(KEYMAPS) $$(SP_KEYMAPS)) endif - ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true) + ifeq ($$(RULE),) + $$(eval $$(call PARSE_ALL_KEYMAPS)) + else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true) $$(eval $$(call PARSE_ALL_KEYMAPS)) else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true) $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) + else ifneq ($$(KEYMAP),) + $$(eval $$(call PARSE_KEYMAP,$$(KEYMAP))) else ifeq ($$(CURRENT_SP),) $$(info make: *** No rule to make target '$$(CURRENT_KB)-$$(RULE)'. Stop.) @@ -232,12 +226,16 @@ endef RUN_COMMAND = echo "Running": $(COMMAND_$(COMMAND)); +# Allow specifying just the subproject, in the keyboard directory, which will compile all keymaps +SUBPROJECTS := $(notdir $(patsubst %/Makefile,%,$(wildcard ./*/Makefile))) +.PHONY: $(SUBPROJECTS) +$(SUBPROJECTS): %: %-allkm + .PHONY: % %: $(eval $(call PARSE_RULE,$@)) $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) - .PHONY: all all: all-keyboards From db5c3b74fb6541879bfad9930d2a659b1d89cd83 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 8 Aug 2016 01:16:06 +0300 Subject: [PATCH 033/120] Add color output --- Makefile | 33 ++++++++++++++++++++++++++++++--- message.mk | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 message.mk diff --git a/Makefile b/Makefile index a02fa24a2b..e5becd7ad7 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ +ifndef VERBOSE +.SILENT: +endif + STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST)) ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST)) ROOT_DIR := $(dir $(ROOT_MAKEFILE)) @@ -216,15 +220,37 @@ endef # $1 Keymap define PARSE_KEYMAP CURRENT_KM = $1 - COMMANDS += KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) - COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) := Keyboard $$(CURRENT_KB), Subproject $$(CURRENT_SP), Keymap $$(CURRENT_KM) + COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) + COMMANDS += $$(COMMAND) + ifeq ($$(CURRENT_SP),) + KB_SP := $(CURRENT_KB) + else + KB_SP := $(CURRENT_KB)/$$(CURRENT_SP) + endif + KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) + COMMAND_$$(COMMAND) := \ + printf "Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR)" | \ + $(AWK) '{ printf "%-118s", $$$$0;}'; \ + LOG=$$$$(echo "$$(MAKE) -c $(ROOT_DIR) -f build_keyboard.mk VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true" 2>&1) ; \ + if [ $$$$? -gt 0 ]; \ + then $$(PRINT_ERROR_PLAIN); \ + elif [ "$$$$LOG" != "" ] ; \ + then $$(PRINT_WARNING_PLAIN); \ + else \ + $$(PRINT_OK); \ + fi; endef define PARSE_ALL_KEYMAPS $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS))) endef -RUN_COMMAND = echo "Running": $(COMMAND_$(COMMAND)); +include $(ROOT_DIR)/message.mk + +#RUN_COMMAND = echo "Running": $(COMMAND_$(COMMAND)); +RUN_COMMAND = \ +$(COMMAND_$(COMMAND)) +#LOG=$$(echo $(COMMAND) VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR_PLAIN); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING_PLAIN); else $(PRINT_OK); fi; \ # Allow specifying just the subproject, in the keyboard directory, which will compile all keymaps SUBPROJECTS := $(notdir $(patsubst %/Makefile,%,$(wildcard ./*/Makefile))) @@ -244,3 +270,4 @@ all-keyboards: allkb-allsp-allkm .PHONY: all-keyboards-defaults all-keyboards-defaults: allkb-allsp-default + diff --git a/message.mk b/message.mk new file mode 100644 index 0000000000..2ebf76a58c --- /dev/null +++ b/message.mk @@ -0,0 +1,35 @@ +COLOR ?= true + +ifeq ($(COLOR),true) + NO_COLOR=\033[0m + OK_COLOR=\033[32;01m + ERROR_COLOR=\033[31;01m + WARN_COLOR=\033[33;01m + BLUE=\033[0;34m + BOLD=\033[1m +endif + +ifneq ($(shell awk --version 2>/dev/null),) + AWK=awk +else + AWK=cat && test +endif + +OK_STRING=$(OK_COLOR)[OK]$(NO_COLOR)\n +ERROR_STRING=$(ERROR_COLOR)[ERRORS]$(NO_COLOR)\n +WARN_STRING=$(WARN_COLOR)[WARNINGS]$(NO_COLOR)\n + +ifndef $(SILENT) + SILENT = false +endif + +TAB_LOG = printf "\n$$LOG\n\n" | $(AWK) '{ sub(/^/," | "); print }' +TAB_LOG_PLAIN = printf "$$LOG\n" +AWK_STATUS = $(AWK) '{ printf " %-10s\n", $$1; }' +AWK_CMD = $(AWK) '{ printf "%-99s", $$0; }' +PRINT_ERROR = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) && exit 1 +PRINT_WARNING = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) +PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) && exit 1 +PRINT_WARNING_PLAIN = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) +PRINT_OK = $(SILENT) || printf " $(OK_STRING)" | $(AWK_STATUS) +BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING); else $(PRINT_OK); fi; \ No newline at end of file From 67b294ca66fd9da341ab93019a380d91ac589c96 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 8 Aug 2016 10:26:23 +0300 Subject: [PATCH 034/120] Actual compilation --- Makefile | 26 ++++---- build_keyboard.mk | 163 +++++++++++----------------------------------- message.mk | 3 +- 3 files changed, 55 insertions(+), 137 deletions(-) diff --git a/Makefile b/Makefile index e5becd7ad7..fc61572094 100644 --- a/Makefile +++ b/Makefile @@ -228,17 +228,19 @@ define PARSE_KEYMAP KB_SP := $(CURRENT_KB)/$$(CURRENT_SP) endif KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) + MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) + MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=false COMMAND_$$(COMMAND) := \ - printf "Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR)" | \ - $(AWK) '{ printf "%-118s", $$$$0;}'; \ - LOG=$$$$(echo "$$(MAKE) -c $(ROOT_DIR) -f build_keyboard.mk VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true" 2>&1) ; \ - if [ $$$$? -gt 0 ]; \ - then $$(PRINT_ERROR_PLAIN); \ - elif [ "$$$$LOG" != "" ] ; \ - then $$(PRINT_WARNING_PLAIN); \ - else \ - $$(PRINT_OK); \ - fi; + printf "Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR)" | \ + $(AWK) '{ printf "%-118s", $$$$0;}'; \ + LOG=$$$$($$(MAKE) -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_VARS) 2>&1) ; \ + if [ $$$$? -gt 0 ]; \ + then $$(PRINT_ERROR_PLAIN); \ + elif [ "$$$$LOG" != "" ] ; \ + then $$(PRINT_WARNING_PLAIN); \ + else \ + $$(PRINT_OK); \ + fi; endef define PARSE_ALL_KEYMAPS @@ -258,9 +260,11 @@ SUBPROJECTS := $(notdir $(patsubst %/Makefile,%,$(wildcard ./*/Makefile))) $(SUBPROJECTS): %: %-allkm .PHONY: % -%: +%: + cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; $(eval $(call PARSE_RULE,$@)) $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) + .PHONY: all all: all-keyboards diff --git a/build_keyboard.mk b/build_keyboard.mk index 053c8532af..b0cb22e6ac 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -4,44 +4,9 @@ endif .DEFAULT_GOAL := all -space := $(subst ,, ) -ESCAPED_ABS_PATH = $(subst $(space),_SPACE_,$(abspath $1)) -starting_makefile := $(call ESCAPED_ABS_PATH,$(firstword $(MAKEFILE_LIST))) -mkfile_path := $(call ESCAPED_ABS_PATH,$(lastword $(MAKEFILE_LIST)))) -abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path))) - -ifneq (,$(findstring /keyboards/,$(starting_makefile))) - possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboards/%,%,$(starting_makefile)))) - ifneq (,$(findstring /keymaps/,$(possible_keyboard))) - KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard))) - KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard))) - ifneq (,$(findstring /,$(KEYBOARD_DIR))) - # SUBPROJECT_DIR:=$(lastword $(subst /, ,$(KEYBOARD_DIR))) - # KEYBOARD_DIR:=$(firstword $(subst /, ,$(KEYBOARD_DIR))) - tmk_root = ../../.. - else - tmk_root = ../../../.. - endif - else - KEYMAP_DIR:=default - KEYBOARD_DIR:=$(possible_keyboard) - ifneq (,$(findstring /,$(KEYBOARD_DIR))) - # SUBPROJECT_DIR:=$(lastword $(subst /, ,$(KEYBOARD_DIR))) - # KEYBOARD_DIR:=$(firstword $(subst /, ,$(KEYBOARD_DIR))) - tmk_root = ../../.. - else - tmk_root = ../.. - endif - endif -else - tmk_root = . -endif -# $(info $(KEYBOARD_DIR)) -# $(info $(KEYMAP_DIR)) -# $(info $(SUBPROJECT_DIR)) # Directory common source filess exist -TOP_DIR = $(tmk_root) +TOP_DIR = . TMK_DIR = tmk_core TMK_PATH = $(TOP_DIR)/$(TMK_DIR) LIB_PATH = $(TOP_DIR)/lib @@ -50,92 +15,49 @@ QUANTUM_DIR = quantum QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR) -ifdef keyboard - KEYBOARD ?= $(keyboard) -endif -ifdef KEYBOARD_DIR - KEYBOARD ?= $(KEYBOARD_DIR) -endif -ifndef KEYBOARD - KEYBOARD=planck -endif - MASTER ?= left ifdef master MASTER = $(master) endif +KEYBOARD_PATH := keyboards/$(KEYBOARD) +KEYBOARD_C := $(KEYBOARD_PATH)/$(KEYBOARD).c -# converts things to keyboards/subproject -ifneq (,$(findstring /,$(KEYBOARD))) - TEMP:=$(KEYBOARD) - KEYBOARD:=$(firstword $(subst /, ,$(TEMP))) - SUBPROJECT:=$(lastword $(subst /, ,$(TEMP))) -endif - -KEYBOARD_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD) - -ifdef sub - SUBPROJECT=$(sub) -endif -ifdef subproject - SUBPROJECT=$(subproject) -endif - -ifneq ("$(wildcard $(KEYBOARD_PATH)/$(KEYBOARD).c)","") - KEYBOARD_FILE = keyboards/$(KEYBOARD)/$(KEYBOARD).c - ifneq ($(call ESCAPED_ABS_PATH,$(KEYBOARD_PATH)/Makefile),$(starting_makefile)) - -include $(KEYBOARD_PATH)/Makefile - endif +ifneq ("$(wildcard $(KEYBOARD_C))","") + include $(KEYBOARD_PATH)/rules.mk else -$(error "$(KEYBOARD_PATH)/$(KEYBOARD).c" does not exist) + $(error "$(KEYBOARD_C)" does not exist) endif -ifdef SUBPROJECT_DEFAULT - SUBPROJECT?=$(SUBPROJECT_DEFAULT) + +ifneq ($(SUBPROJECT),) + SUBPROJECT_PATH := keyboards/$(KEYBOARD)/$(SUBPROJECT) + SUBPROJECT_C := $(SUBPROJECT_PATH)/$(SUBPROJECT).c + ifneq ("$(wildcard $(SUBPROJECT_C))","") + OPT_DEFS += -DSUBPROJECT_$(SUBPROJECT) + include $(SUBPROJECT_PATH)/rules.mk + else + $(error "$(SUBPROJECT_PATH)/$(SUBPROJECT).c" does not exist) + endif endif -ifdef SUBPROJECT - SUBPROJECT_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD)/$(SUBPROJECT) - ifneq ("$(wildcard $(SUBPROJECT_PATH)/$(SUBPROJECT).c)","") - OPT_DEFS += -DSUBPROJECT_$(SUBPROJECT) - SUBPROJECT_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/$(SUBPROJECT).c - ifneq ($(call ESCAPED_ABS_PATH,$(SUBPROJECT_PATH)/Makefile),$(starting_makefile)) - -include $(SUBPROJECT_PATH)/Makefile - endif - else -$(error "$(SUBPROJECT_PATH)/$(SUBPROJECT).c" does not exist) - endif +MAIN_KEYMAP_PATH := $(KEYBOARD_PATH)/keymaps/$(KEYMAP) +MAIN_KEYMAP_C := $(MAIN_KEYMAP_PATH)/keymap.c +SUBPROJ_KEYMAP_PATH := $(SUBPROJECT_PATH)/keymaps/$(KEYMAP) +SUBPROJ_KEYMAP_C := $(SUBPROJ_KEYMAP_PATH)/keymap.c +ifneq ("$(wildcard $(SUBPROJ_KEYMAP_C))","") + -include $(SUBPROJ_KEYMAP_PATH)/Makefile + KEYMAP_C := $(SUBPROJ_KEYMAP_C) + KEYMAP_PATH := $(SUBPROJ_KEYMAP_PATH) +else ifneq ("$(wildcard $(MAIN_KEYMAP_C))","") + -include $(MAIN_KEYMAP_PATH)/Makefile + KEYMAP_C := $(MAIN_KEYMAP_C) + KEYMAP_PATH := $(MAIN_KEYMAP_PATH) +else + $(error "$(MAIN_KEYMAP_C)/keymap.c" does not exist) endif -ifdef keymap - KEYMAP ?= $(keymap) -endif -ifdef KEYMAP_DIR - KEYMAP ?= $(KEYMAP_DIR) -endif -ifndef KEYMAP - KEYMAP = default -endif -KEYMAP_PATH = $(KEYBOARD_PATH)/keymaps/$(KEYMAP) -ifneq ("$(wildcard $(KEYMAP_PATH)/keymap.c)","") - KEYMAP_FILE = keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c - ifneq ($(call ESCAPED_ABS_PATH,$(KEYMAP_PATH)/Makefile),$(starting_makefile)) - -include $(KEYMAP_PATH)/Makefile - endif -else - ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/keymap.c)","") -$(error "$(KEYMAP_PATH)/keymap.c" does not exist) - else - KEYMAP_PATH = $(SUBPROJECT_PATH)/keymaps/$(KEYMAP) - KEYMAP_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/$(KEYMAP)/keymap.c - ifneq ($(call ESCAPED_ABS_PATH,$(KEYMAP_PATH)/Makefile),$(starting_makefile)) - -include $(KEYMAP_PATH)/Makefile - endif - endif -endif - -ifdef SUBPROJECT +ifneq ($(SUBPROJECT),) TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP) else TARGET ?= $(KEYBOARD)_$(KEYMAP) @@ -149,36 +71,27 @@ BUILD_DIR = $(TOP_DIR)/.build OBJDIR = $(BUILD_DIR)/obj_$(TARGET) - ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","") CONFIG_H = $(KEYMAP_PATH)/config.h else CONFIG_H = $(KEYBOARD_PATH)/config.h - ifdef SUBPROJECT - ifneq ("$(wildcard $(SUBPROJECT_PATH)/$(SUBPROJECT).c)","") + ifneq ($(SUBPROJECT),) + ifneq ("$(wildcard $(SUBPROJECT_C))","") CONFIG_H = $(SUBPROJECT_PATH)/config.h endif endif endif # # project specific files -SRC += $(KEYBOARD_FILE) \ - $(KEYMAP_FILE) \ +SRC += $(KEYBOARD_C) \ + $(KEYMAP_C) \ $(QUANTUM_DIR)/quantum.c \ $(QUANTUM_DIR)/keymap_common.c \ $(QUANTUM_DIR)/keycode_config.c \ $(QUANTUM_DIR)/process_keycode/process_leader.c -ifdef SUBPROJECT - SRC += $(SUBPROJECT_FILE) -endif - -ifdef SUBPROJECT - SRC += $(SUBPROJECT_FILE) -endif - -ifdef SUBPROJECT - SRC += $(SUBPROJECT_FILE) +ifneq ($(SUBPROJECT),) + SRC += $(SUBPROJECT_C) endif ifndef CUSTOM_MATRIX @@ -229,7 +142,7 @@ endif # Search Path VPATH += $(KEYMAP_PATH) -ifdef SUBPROJECT +ifneq ($(SUBPROJECT),) VPATH += $(SUBPROJECT_PATH) endif VPATH += $(KEYBOARD_PATH) diff --git a/message.mk b/message.mk index 2ebf76a58c..08a4e02ab6 100644 --- a/message.mk +++ b/message.mk @@ -32,4 +32,5 @@ PRINT_WARNING = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) && exit 1 PRINT_WARNING_PLAIN = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) PRINT_OK = $(SILENT) || printf " $(OK_STRING)" | $(AWK_STATUS) -BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING); else $(PRINT_OK); fi; \ No newline at end of file +BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING); else $(PRINT_OK); fi; +MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR) \ No newline at end of file From cc2df445ab3b0fd3998de7861b1c9ba0ad64aa8a Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 8 Aug 2016 11:06:47 +0300 Subject: [PATCH 035/120] Remove unneded code from tmk_core/rules.mk --- build_keyboard.mk | 4 ++- tmk_core/rules.mk | 91 ++--------------------------------------------- 2 files changed, 5 insertions(+), 90 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index b0cb22e6ac..7493c13285 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -4,6 +4,8 @@ endif .DEFAULT_GOAL := all +include message.mk + # Directory common source filess exist TOP_DIR = . @@ -68,7 +70,7 @@ BUILD_DIR = $(TOP_DIR)/.build # Object files directory # To put object files in current directory, use a dot (.), do NOT make # this an empty or blank macro! -OBJDIR = $(BUILD_DIR)/obj_$(TARGET) +OBJDIR := $(BUILD_DIR)/obj_$(TARGET) ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","") diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index d2350f27c1..9aa4ac8cf8 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -34,43 +34,8 @@ FORMAT = ihex # (Note: 3 is not always the best optimization level. See avr-libc FAQ.) OPT = s -COLOR ?= true - -ifeq ($(COLOR),true) - NO_COLOR=\033[0m - OK_COLOR=\033[32;01m - ERROR_COLOR=\033[31;01m - WARN_COLOR=\033[33;01m - BLUE=\033[0;34m - BOLD=\033[1m -endif - AUTOGEN ?= false -ifneq ($(shell awk --version 2>/dev/null),) - AWK=awk -else - AWK=cat && test -endif - -OK_STRING=$(OK_COLOR)[OK]$(NO_COLOR)\n -ERROR_STRING=$(ERROR_COLOR)[ERRORS]$(NO_COLOR)\n -WARN_STRING=$(WARN_COLOR)[WARNINGS]$(NO_COLOR)\n - -ifndef $(SILENT) - SILENT = false -endif - -TAB_LOG = printf "\n$$LOG\n\n" | $(AWK) '{ sub(/^/," | "); print }' -TAB_LOG_PLAIN = printf "$$LOG\n" -AWK_STATUS = $(AWK) '{ printf " %-10s\n", $$1; }' -AWK_CMD = $(AWK) '{ printf "%-99s", $$0; }' -PRINT_ERROR = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) && exit 1 -PRINT_WARNING = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) -PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) && exit 1 -PRINT_WARNING_PLAIN = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) -PRINT_OK = $(SILENT) || printf " $(OK_STRING)" | $(AWK_STATUS) -BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING); else $(PRINT_OK); fi; # List any extra directories to look for include files here. # Each directory must be seperated by a space. @@ -432,6 +397,7 @@ DEPS = $(patsubst %.o,%.d,$(OBJ)) .PRECIOUS: $(DEPS) # Empty rule to force recompilation if the .d file is missing $(DEPS): + # Since the object files could be in two different folders, generate # separate rules for them, rather than having too generic rules @@ -464,57 +430,6 @@ show_path: @echo VPATH=$(VPATH) @echo SRC=$(SRC) -SUBDIRS := $(filter-out %/util/ %/doc/ %/keymaps/ %/old_keymap_files/,$(dir $(wildcard $(TOP_DIR)/keyboards/**/*/Makefile))) -SUBDIRS := $(SUBDIRS) $(dir $(wildcard $(TOP_DIR)/keyboards/*/.)) -SUBDIRS := $(sort $(SUBDIRS)) -# $(error $(SUBDIRS)) -all-keyboards-defaults-%: - @for x in $(SUBDIRS) ; do \ - printf "Compiling with default: $$x" | $(AWK_CMD); \ - LOG=$$($(MAKE) -C $$x $(subst all-keyboards-defaults-,,$@) VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR_PLAIN); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING_PLAIN); else $(PRINT_OK); fi; \ - done - -all-keyboards-defaults: all-keyboards-defaults-all - -KEYBOARDS := $(SUBDIRS:$(TOP_DIR)/keyboards/%/=/keyboards/%) -all-keyboards-all: $(addsuffix -all,$(KEYBOARDS)) -all-keyboards-clean: $(addsuffix -clean,$(KEYBOARDS)) -all-keyboards: all-keyboards-all - -define make_keyboard -$(eval KEYBOARD=$(patsubst /keyboards/%,%,$1)) -$(eval SUBPROJECT=$(lastword $(subst /, ,$(KEYBOARD)))) -$(eval KEYBOARD=$(firstword $(subst /, ,$(KEYBOARD)))) -$(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)/keyboards/$(KEYBOARD)/keymaps/*/.)))) -$(eval KEYMAPS+=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)/keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/*/.)))) -@for x in $(KEYMAPS) ; do \ - printf "Compiling $(BOLD)$(KEYBOARD)/$(SUBPROJECT)$(NO_COLOR) with $(BOLD)$$x$(NO_COLOR)" | $(AWK) '{ printf "%-118s", $$0; }'; \ - LOG=$$($(MAKE) -C $(TOP_DIR)$1 $2 keymap=$$x VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR_PLAIN); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING_PLAIN); else $(PRINT_OK); fi; \ -done -endef - -define make_keyboard_helper -# Just remove the -all and so on from the first argument and pass it forward -$(call make_keyboard,$(subst -$2,,$1),$2) -endef - -/keyboards/%-all: - $(call make_keyboard_helper,$@,all) -/keyboards/%-clean: - $(call make_keyboard_helper,$@,clean) -/keyboards/%: - $(call make_keyboard_helper,$@,all) - -all-keymaps-%: - $(eval MAKECONFIG=$(call get_target,all-keymaps,$@)) - $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)/keyboards/$(KEYBOARD)/keymaps/*/.)))) - @for x in $(KEYMAPS) ; do \ - printf "Compiling $(BOLD)$(KEYBOARD)$(NO_COLOR) with $(BOLD)$$x$(NO_COLOR)" | $(AWK) '{ printf "%-118s", $$0; }'; \ - LOG=$$($(MAKE) $(subst all-keymaps-,,$@) keyboard=$(KEYBOARD) keymap=$$x VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR_PLAIN); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING_PLAIN); else $(PRINT_OK); fi; \ - done - -all-keymaps: all-keymaps-all - # Create build directory $(shell mkdir $(BUILD_DIR) 2>/dev/null) @@ -530,6 +445,4 @@ $(shell mkdir $(KBOBJDIR) 2>/dev/null) .PHONY : all finish sizebefore sizeafter gccversion \ build elf hex eep lss sym coff extcoff check_submodule \ clean clean_list debug gdb-config show_path \ -program teensy dfu flip dfu-ee flip-ee dfu-start \ -all-keyboards-defaults all-keyboards all-keymaps \ -all-keyboards-defaults-% all-keyboards-% all-keymaps-% +program teensy dfu flip dfu-ee flip-ee dfu-start \ No newline at end of file From 60c6e79ecb032e9726809a295ab3e0011e6b2fb4 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 8 Aug 2016 11:19:29 +0300 Subject: [PATCH 036/120] Move git submodule check and version generation to main Makefile --- Makefile | 12 ++++++++++++ build_keyboard.mk | 5 ----- tmk_core/rules.mk | 13 ++----------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index fc61572094..caa8f2de1c 100644 --- a/Makefile +++ b/Makefile @@ -262,6 +262,13 @@ $(SUBPROJECTS): %: %-allkm .PHONY: % %: cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; + git submodule status --recursive 2>/dev/null | \ + while IFS= read -r x; do \ + case "$$x" in \ + \ *) ;; \ + *) printf "$(MSG_SUBMODULE_DIRTY)";break;; \ + esac \ + done $(eval $(call PARSE_RULE,$@)) $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) @@ -275,3 +282,8 @@ all-keyboards: allkb-allsp-allkm .PHONY: all-keyboards-defaults all-keyboards-defaults: allkb-allsp-default + +GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") +BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") +$(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) +$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) \ No newline at end of file diff --git a/build_keyboard.mk b/build_keyboard.mk index 7493c13285..7d284cfa7b 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -183,9 +183,4 @@ endif include $(TMK_PATH)/rules.mk -GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") -BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") OPT_DEFS += -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" - -$(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(QUANTUM_PATH)/version.h) -$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(QUANTUM_PATH)/version.h) \ No newline at end of file diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 9aa4ac8cf8..e8e3de5719 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -267,15 +267,6 @@ sym: $(BUILD_DIR)/$(TARGET).sym LIBNAME=lib$(TARGET).a lib: $(LIBNAME) -check_submodule: - git submodule status --recursive | \ - while IFS= read -r x; do \ - case "$$x" in \ - \ *) ;; \ - *) printf "$(MSG_SUBMODULE_DIRTY)";break;; \ - esac \ - done - # Display size of file. HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex #ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf @@ -337,7 +328,7 @@ gccversion : $(eval CMD=$(AR) $@ $(OBJ) ) @$(BUILD_CMD) -BEGIN = gccversion check_submodule sizebefore +BEGIN = gccversion sizebefore # Link: create ELF output file from object files. .SECONDARY : $(BUILD_DIR)/$(TARGET).elf @@ -443,6 +434,6 @@ $(shell mkdir $(KBOBJDIR) 2>/dev/null) # Listing of phony targets. .PHONY : all finish sizebefore sizeafter gccversion \ -build elf hex eep lss sym coff extcoff check_submodule \ +build elf hex eep lss sym coff extcoff \ clean clean_list debug gdb-config show_path \ program teensy dfu flip dfu-ee flip-ee dfu-start \ No newline at end of file From dd8c1a7659fec4fe3211682864fc4c50d4a61f85 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 8 Aug 2016 11:27:15 +0300 Subject: [PATCH 037/120] Don't add VERSION as a define To avoid full recompilation when the git commit hash changes. --- tmk_core/common.mk | 3 --- tmk_core/common/command.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tmk_core/common.mk b/tmk_core/common.mk index aa05b9491d..21b894e2be 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -106,9 +106,6 @@ $(error MASTER does not have a valid value(left/right)) endif -# Version string -OPT_DEFS += -DVERSION=$(GIT_VERSION) - # Bootloader address ifdef STM32_BOOTLOADER_ADDRESS OPT_DEFS += -DSTM32_BOOTLOADER_ADDRESS=$(STM32_BOOTLOADER_ADDRESS) diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index 084c9fe155..476fc6fe3c 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -34,6 +34,7 @@ along with this program. If not, see . #include "command.h" #include "backlight.h" #include "quantum.h" +#include "version.h" #ifdef MOUSEKEY_ENABLE #include "mousekey.h" @@ -180,7 +181,7 @@ static void print_version(void) print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") " "PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") " "VER: " STR(DEVICE_VER) "\n"); - print("BUILD: " STR(VERSION) " (" __TIME__ " " __DATE__ ")\n"); + print("BUILD: " STR(QMK_VERSION) " (" __TIME__ " " __DATE__ ")\n"); /* build options */ print("OPTIONS:" From 881bde8258e077500a99fd670633e79ecd074832 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 9 Aug 2016 08:30:21 +0300 Subject: [PATCH 038/120] Fix running make in parallel --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index caa8f2de1c..b39e9dded1 100644 --- a/Makefile +++ b/Makefile @@ -270,7 +270,7 @@ $(SUBPROJECTS): %: %-allkm esac \ done $(eval $(call PARSE_RULE,$@)) - $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) + +$(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) .PHONY: all From e4c842de02d95e98f65c7bb4a8406ec6df4944fe Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 9 Aug 2016 08:31:04 +0300 Subject: [PATCH 039/120] Don't run builtin rules for submake To speed up the compilation --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b39e9dded1..9b534e897b 100644 --- a/Makefile +++ b/Makefile @@ -233,7 +233,7 @@ define PARSE_KEYMAP COMMAND_$$(COMMAND) := \ printf "Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR)" | \ $(AWK) '{ printf "%-118s", $$$$0;}'; \ - LOG=$$$$($$(MAKE) -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_VARS) 2>&1) ; \ + LOG=$$$$($$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_VARS) 2>&1) ; \ if [ $$$$? -gt 0 ]; \ then $$(PRINT_ERROR_PLAIN); \ elif [ "$$$$LOG" != "" ] ; \ From 8732265928818dd0b8797fb271e7c7fa9346d025 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 9 Aug 2016 09:52:01 +0300 Subject: [PATCH 040/120] Options for silent compilation A single keyboard is always by default compiled in verbose mode. While multiple keyboards are compiled in silent mode. This can be overriden by the silent variable from the command line --- Makefile | 50 ++++++++++++++++++++++++++++++++++++++------------ message.mk | 4 ---- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 9b534e897b..3d4bd589f3 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,16 @@ ifndef VERBOSE .SILENT: endif +ifdef silent + SILENT = $(silent) +endif + +ifdef SILENT + SUB_IS_SILENT := $(silent) +endif + +override SILENT = false + STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST)) ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST)) ROOT_DIR := $(dir $(ROOT_MAKEFILE)) @@ -59,10 +69,10 @@ ifdef keymap KEYMAP := $(keymap) endif -$(info Keyboard: $(KEYBOARD)) -$(info Keymap: $(KEYMAP)) -$(info Subproject: $(SUBPROJECT)) -$(info Keyboards: $(KEYBOARDS)) +#$(info Keyboard: $(KEYBOARD)) +#$(info Keymap: $(KEYMAP)) +#$(info Subproject: $(SUBPROJECT)) +#$(info Keyboards: $(KEYBOARDS)) .DEFAULT_GOAL := all ifneq ($(KEYMAP),) @@ -229,11 +239,14 @@ define PARSE_KEYMAP endif KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) - MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=false - COMMAND_$$(COMMAND) := \ - printf "Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR)" | \ - $(AWK) '{ printf "%-118s", $$$$0;}'; \ - LOG=$$$$($$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_VARS) 2>&1) ; \ + MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) + MAKE_COMMAND := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk + MAKE_MSG := Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR) + MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}' + COMMAND_true_$$(COMMAND) := \ + printf "$$(MAKE_MSG)" | \ + $$(MAKE_MSG_FORMAT); \ + LOG=$$$$($$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=true 2>&1) ; \ if [ $$$$? -gt 0 ]; \ then $$(PRINT_ERROR_PLAIN); \ elif [ "$$$$LOG" != "" ] ; \ @@ -241,18 +254,30 @@ define PARSE_KEYMAP else \ $$(PRINT_OK); \ fi; + COMMAND_false_$$(COMMAND) := \ + printf "$$(MAKE_MSG)\n" | \ + $$(MAKE_MSG_FORMAT); \ + $$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=false; endef define PARSE_ALL_KEYMAPS $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS))) endef +define SET_SILENT_MODE + ifdef SUB_IS_SILENT + SILENT_MODE := $(SUB_IS_SILENT) + else ifeq ($$(words $$(COMMANDS)),1) + SILENT_MODE := false + else + SILENT_MODE := true + endif +endef + include $(ROOT_DIR)/message.mk -#RUN_COMMAND = echo "Running": $(COMMAND_$(COMMAND)); RUN_COMMAND = \ -$(COMMAND_$(COMMAND)) -#LOG=$$(echo $(COMMAND) VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR_PLAIN); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING_PLAIN); else $(PRINT_OK); fi; \ +$(COMMAND_$(SILENT_MODE)_$(COMMAND)) # Allow specifying just the subproject, in the keyboard directory, which will compile all keymaps SUBPROJECTS := $(notdir $(patsubst %/Makefile,%,$(wildcard ./*/Makefile))) @@ -270,6 +295,7 @@ $(SUBPROJECTS): %: %-allkm esac \ done $(eval $(call PARSE_RULE,$@)) + $(eval $(call SET_SILENT_MODE)) +$(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) diff --git a/message.mk b/message.mk index 08a4e02ab6..aefb46de84 100644 --- a/message.mk +++ b/message.mk @@ -19,10 +19,6 @@ OK_STRING=$(OK_COLOR)[OK]$(NO_COLOR)\n ERROR_STRING=$(ERROR_COLOR)[ERRORS]$(NO_COLOR)\n WARN_STRING=$(WARN_COLOR)[WARNINGS]$(NO_COLOR)\n -ifndef $(SILENT) - SILENT = false -endif - TAB_LOG = printf "\n$$LOG\n\n" | $(AWK) '{ sub(/^/," | "); print }' TAB_LOG_PLAIN = printf "$$LOG\n" AWK_STATUS = $(AWK) '{ printf " %-10s\n", $$1; }' From d924eb591ebcfb603f8941763de9616ce4b1554c Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Thu, 11 Aug 2016 09:34:23 +0300 Subject: [PATCH 041/120] Fix variable name clash with builtin This caused the submake to be called several times, messing up the build. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3d4bd589f3..319684c83e 100644 --- a/Makefile +++ b/Makefile @@ -240,13 +240,13 @@ define PARSE_KEYMAP KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) - MAKE_COMMAND := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk + MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk MAKE_MSG := Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR) MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}' COMMAND_true_$$(COMMAND) := \ printf "$$(MAKE_MSG)" | \ $$(MAKE_MSG_FORMAT); \ - LOG=$$$$($$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=true 2>&1) ; \ + LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \ if [ $$$$? -gt 0 ]; \ then $$(PRINT_ERROR_PLAIN); \ elif [ "$$$$LOG" != "" ] ; \ @@ -257,7 +257,7 @@ define PARSE_KEYMAP COMMAND_false_$$(COMMAND) := \ printf "$$(MAKE_MSG)\n" | \ $$(MAKE_MSG_FORMAT); \ - $$(MAKE_COMMAND) $$(MAKE_VARS) SILENT=false; + $$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; endef define PARSE_ALL_KEYMAPS From 87bf34a5d341c3a2381f57c19fcb94c21c8d0122 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 14 Aug 2016 12:25:23 +0300 Subject: [PATCH 042/120] Pass the target to submake --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 319684c83e..ed89b07337 100644 --- a/Makefile +++ b/Makefile @@ -230,6 +230,9 @@ endef # $1 Keymap define PARSE_KEYMAP CURRENT_KM = $1 + # The rest of the rule is the target + # Remove the leading "-" from the target, as it acts as a separator + MAKE_TARGET := $$(patsubst -%,%,$$(RULE)) COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) COMMANDS += $$(COMMAND) ifeq ($$(CURRENT_SP),) @@ -240,8 +243,11 @@ define PARSE_KEYMAP KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) - MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk - MAKE_MSG := Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR) + MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET) + MAKE_MSG := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR) + ifneq ($$(MAKE_TARGET),) + MAKE_MSG += and target $(BOLD)$$(MAKE_TARGET)$(NO_COLOR) + endif MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}' COMMAND_true_$$(COMMAND) := \ printf "$$(MAKE_MSG)" | \ From 3aac4e95c91be3244d68f27159c2667904c8fddd Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 15 Aug 2016 08:20:16 +0300 Subject: [PATCH 043/120] More general system for generating several outputs --- build_keyboard.mk | 44 ++++++++++------ message.mk | 29 +++++++++- tmk_core/chibios.mk | 4 +- tmk_core/rules.mk | 125 ++++++++++++++------------------------------ 4 files changed, 98 insertions(+), 104 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index 7d284cfa7b..d10412ea57 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -43,6 +43,9 @@ ifneq ($(SUBPROJECT),) endif endif +# Save the defs here, so we don't include any keymap specific ones +PROJECT_DEFS := $(OPT_DEFS) + MAIN_KEYMAP_PATH := $(KEYBOARD_PATH)/keymaps/$(KEYMAP) MAIN_KEYMAP_C := $(MAIN_KEYMAP_PATH)/keymap.c SUBPROJ_KEYMAP_PATH := $(SUBPROJECT_PATH)/keymaps/$(KEYMAP) @@ -59,18 +62,33 @@ else $(error "$(MAIN_KEYMAP_C)/keymap.c" does not exist) endif +BUILD_DIR = $(TOP_DIR)/.build + ifneq ($(SUBPROJECT),) TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP) + KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)_$(SUBPROJECT) else TARGET ?= $(KEYBOARD)_$(KEYMAP) + KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD) endif -BUILD_DIR = $(TOP_DIR)/.build +# We can assume a ChibiOS target When MCU_FAMILY is defined, since it's not used for LUFA +ifdef MCU_FAMILY + PLATFORM=CHIBIOS +else + PLATFORM=AVR +endif + +ifeq ($(PLATFORM),CHIBIOS) + include $(TMK_PATH)/protocol/chibios.mk + include $(TMK_PATH)/chibios.mk + OPT_OS = chibios +endif # Object files directory # To put object files in current directory, use a dot (.), do NOT make # this an empty or blank macro! -OBJDIR := $(BUILD_DIR)/obj_$(TARGET) +KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET) ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","") @@ -156,23 +174,10 @@ VPATH += $(QUANTUM_PATH)/audio VPATH += $(QUANTUM_PATH)/process_keycode -# We can assume a ChibiOS target When MCU_FAMILY is defined, since it's not used for LUFA -ifdef MCU_FAMILY - PLATFORM=CHIBIOS -else - PLATFORM=AVR -endif - include $(TMK_PATH)/common.mk ifeq ($(PLATFORM),AVR) include $(TMK_PATH)/protocol/lufa.mk include $(TMK_PATH)/avr.mk -else ifeq ($(PLATFORM),CHIBIOS) - include $(TMK_PATH)/protocol/chibios.mk - include $(TMK_PATH)/chibios.mk - OPT_OS = chibios -else - $(error Unknown platform) endif ifeq ($(strip $(VISUALIZER_ENABLE)), yes) @@ -181,6 +186,13 @@ ifeq ($(strip $(VISUALIZER_ENABLE)), yes) include $(VISUALIZER_PATH)/visualizer.mk endif + +OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) +$(KEYMAP_OUTPUT)_SRC := $(SRC) +$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" +$(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) +$(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) + + include $(TMK_PATH)/rules.mk -OPT_DEFS += -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" diff --git a/message.mk b/message.mk index aefb46de84..6abc782152 100644 --- a/message.mk +++ b/message.mk @@ -29,4 +29,31 @@ PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $ PRINT_WARNING_PLAIN = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) PRINT_OK = $(SILENT) || printf " $(OK_STRING)" | $(AWK_STATUS) BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING); else $(PRINT_OK); fi; -MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR) \ No newline at end of file +MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR) + +# Define Messages +# English +MSG_ERRORS_NONE = Errors: none +MSG_BEGIN = -------- begin -------- +MSG_END = -------- end -------- +MSG_SIZE_BEFORE = Size before: +MSG_SIZE_AFTER = Size after: +MSG_COFF = Converting to AVR COFF: +MSG_EXTENDED_COFF = Converting to AVR Extended COFF: +MSG_FLASH = Creating load file for Flash: +MSG_EEPROM = Creating load file for EEPROM: +MSG_BIN = Creating binary load file for Flash: +MSG_EXTENDED_LISTING = Creating Extended Listing: +MSG_SYMBOL_TABLE = Creating Symbol Table: +MSG_LINKING = Linking: +MSG_COMPILING = Compiling: +MSG_COMPILING_CPP = Compiling: +MSG_ASSEMBLING = Assembling: +MSG_CLEANING = Cleaning project: +MSG_CREATING_LIBRARY = Creating library: +MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR)\n \ + Some git sub-modules are out of date or modified, please consider runnning:$(BOLD)\n\ + git submodule sync --recursive\n\ + git submodule update --init --recursive$(NO_COLOR)\n\n\ + You can ignore this warning if you are not compiling any ChibiOS keyboards,\n\ + or if you have modified the ChibiOS libraries yourself. \n\n \ No newline at end of file diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index cb67ac6f25..b05d59ee89 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -89,9 +89,9 @@ CHIBISRC = $(STARTUPSRC) \ $(STARTUPASM) \ $(PORTASM) \ $(OSALASM) - -SRC += $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC)) +CHIBISRC := $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC)) + EXTRAINCDIRS += $(CHIBIOS)/os/license \ $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index e8e3de5719..9f6d8d9dfd 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -25,6 +25,18 @@ vpath %.hpp $(VPATH_SRC) vpath %.S $(VPATH_SRC) VPATH := +# Convert all SRC to OBJ +define OBJ_FROM_SRC +$(patsubst %.c,$1/%.o,$(patsubst %.cpp,$1/%.o,$(patsubst %.S,$1/%.o,$($1_SRC)))) +endef +$(foreach OUTPUT,$(OUTPUTS),$(eval $(OUTPUT)_OBJ +=$(call OBJ_FROM_SRC,$(OUTPUT)))) + +# Define a list of all objects +OBJ := $(foreach OUTPUT,$(OUTPUTS),$($(OUTPUT)_OBJ)) + +MASTER_OUTPUT := $(firstword $(OUTPUTS)) + + # Output format. (can be srec, ihex, binary) FORMAT = ihex @@ -53,17 +65,18 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS += $(OPT_DEFS) +#CDEFS += # Place -D or -U options here for ASM sources -ADEFS += $(OPT_DEFS) +#ADEFS += # Place -D or -U options here for C++ sources #CPPDEFS += -D__STDC_LIMIT_MACROS #CPPDEFS += -D__STDC_CONSTANT_MACROS -CPPDEFS += $(OPT_DEFS) +#CPPDEFS += + @@ -134,7 +147,8 @@ endif # files -- see avr-libc docs [FIXME: not yet described there] # -listing-cont-lines: Sets the maximum number of continuation lines of hex # dump that will be displayed for a given single line of source input. -ASFLAGS += $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 +ASFLAGS += $(ADEFS) +ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 ASFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) ifdef CONFIG_H ASFLAGS += -include $(CONFIG_H) @@ -193,48 +207,6 @@ COPY = cp WINSHELL = cmd SECHO = $(SILENT) || echo -# Define Messages -# English -MSG_ERRORS_NONE = Errors: none -MSG_BEGIN = -------- begin -------- -MSG_END = -------- end -------- -MSG_SIZE_BEFORE = Size before: -MSG_SIZE_AFTER = Size after: -MSG_COFF = Converting to AVR COFF: -MSG_EXTENDED_COFF = Converting to AVR Extended COFF: -MSG_FLASH = Creating load file for Flash: -MSG_EEPROM = Creating load file for EEPROM: -MSG_BIN = Creating binary load file for Flash: -MSG_EXTENDED_LISTING = Creating Extended Listing: -MSG_SYMBOL_TABLE = Creating Symbol Table: -MSG_LINKING = Linking: -MSG_COMPILING = Compiling: -MSG_COMPILING_CPP = Compiling: -MSG_ASSEMBLING = Assembling: -MSG_CLEANING = Cleaning project: -MSG_CREATING_LIBRARY = Creating library: -MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR)\n \ - Some git sub-modules are out of date or modified, please consider runnning:$(BOLD)\n\ - git submodule sync --recursive\n\ - git submodule update --init --recursive$(NO_COLOR)\n\n\ - You can ignore this warning if you are not compiling any ChibiOS keyboards,\n\ - or if you have modified the ChibiOS libraries yourself. \n\n - - -# Define all object files. -OBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(patsubst %.cpp,$(OBJDIR)/%.o,$(patsubst %.S,$(OBJDIR)/%.o,$(SRC)))) -# The files in the lib folder are shared between all keymaps, so generate that folder name by removing -# the keymap from the name -KBOBJDIR=$(subst _$(KEYMAP),,$(OBJDIR)) -# And fixup the object files to match -LIBOBJ = $(foreach v,$(OBJ),$(if $(findstring /lib/,$v),$v)) -NONLIBOBJ := $(filter-out $(LIBOBJ),$(OBJ)) -LIBOBJ := $(subst _$(KEYMAP)/,/,$(LIBOBJ)) -OBJ := $(LIBOBJ) $(NONLIBOBJ) - -# Define all listing files. -LST = $(patsubst %.c,$(OBJDIR)/%.lst,$(patsubst %.cpp,$(OBJDIR)/%.lst,$(patsubst %.S,$(OBJDIR)/%.lst,$(SRC)))) - # Compiler flags to generate dependency files. #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d @@ -320,68 +292,66 @@ gccversion : $(eval CMD=$(BIN) $< $@ || exit 0) @$(BUILD_CMD) -# Create library from object files. -.SECONDARY : $(BUILD_DIR)/$(TARGET).a -.PRECIOUS : $(OBJ) -%.a: $(OBJ) - @$(SILENT) || printf "$(MSG_CREATING_LIBRARY) $@" | $(AWK_CMD) - $(eval CMD=$(AR) $@ $(OBJ) ) - @$(BUILD_CMD) - BEGIN = gccversion sizebefore # Link: create ELF output file from object files. .SECONDARY : $(BUILD_DIR)/$(TARGET).elf .PRECIOUS : $(OBJ) # Note the obj.txt depeendency is there to force linking if a source file is deleted -%.elf: $(OBJ) $(OBJDIR)/cflags.txt $(OBJDIR)/ldflags.txt $(OBJDIR)/obj.txt | $(BEGIN) +%.elf: $(OBJ) $(MASTER_OUTPUT)/cflags.txt $(MASTER_OUTPUT)/ldflags.txt $(MASTER_OUTPUT)/obj.txt | $(BEGIN) @$(SILENT) || printf "$(MSG_LINKING) $@" | $(AWK_CMD) $(eval CMD=$(CC) $(ALL_CFLAGS) $(filter-out %.txt,$^) --output $@ $(LDFLAGS)) @$(BUILD_CMD) + define GEN_OBJRULE +$1_CFLAGS = $$(ALL_CFLAGS) $$($1_DEFS) +$1_CPPFLAGS= $$(ALL_CPPFLAGS) $$($1_DEFS) +$1_ASFLAGS= $$(ALL_ASFLAGS) $$($1_DEFS) + # Compile: create object files from C source files. $1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN) @mkdir -p $$(@D) @$$(SILENT) || printf "$$(MSG_COMPILING) $$<" | $$(AWK_CMD) - $$(eval CMD=$$(CC) -c $$(ALL_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP)) + $$(eval CMD := $$(CC) -c $$($1_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP)) @$$(BUILD_CMD) # Compile: create object files from C++ source files. $1/%.o : %.cpp $1/%.d $1/cppflags.txt $1/compiler.txt | $(BEGIN) @mkdir -p $$(@D) @$$(SILENT) || printf "$$(MSG_COMPILING_CPP) $$<" | $$(AWK_CMD) - $$(eval CMD=$$(CC) -c $$(ALL_CPPFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP)) + $$(eval CMD=$$(CC) -c $$($1_CPPFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP)) @$(BUILD_CMD) # Assemble: create object files from assembler source files. $1/%.o : %.S $1/asflags.txt $1/compiler.txt | $(BEGIN) @mkdir -p $$(@D) @$(SILENT) || printf "$$(MSG_ASSEMBLING) $$<" | $$(AWK_CMD) - $$(eval CMD=$$(CC) -c $$(ALL_ASFLAGS) $$< -o $$@) + $$(eval CMD=$$(CC) -c $$($1_ASFLAGS) $$< -o $$@) @$$(BUILD_CMD) $1/force: $1/cflags.txt: $1/force - echo '$$(ALL_CFLAGS)' | cmp -s - $$@ || echo '$$(ALL_CFLAGS)' > $$@ + echo '$$($1_CFLAGS)' | cmp -s - $$@ || echo '$$($1_CFLAGS)' > $$@ $1/cppflags.txt: $1/force - echo '$$(ALL_CPPFLAGS)' | cmp -s - $$@ || echo '$$(ALL_CPPFLAGS)' > $$@ + echo '$$($1_CPPFLAGS)' | cmp -s - $$@ || echo '$$($1_CPPFLAGS)' > $$@ $1/asflags.txt: $1/force - echo '$$(ALL_ASFLAGS)' | cmp -s - $$@ || echo '$$(ALL_ASFLAGS)' > $$@ - -$1/ldflags.txt: $1/force - echo '$$(LDFLAGS)' | cmp -s - $$@ || echo '$$(LDFLAGS)' > $$@ - -$1/obj.txt: $1/force - echo '$$(OBJ)' | cmp -s - $$@ || echo '$$(OBJ)' > $$@ + echo '$$($1_ASFLAGS)' | cmp -s - $$@ || echo '$$($1_ASFLAGS)' > $$@ $1/compiler.txt: $1/force $$(CC) --version | cmp -s - $$@ || $$(CC) --version > $$@ endef +$(MASTER_OUTPUT)/obj.txt: $(MASTER_OUTPUT)/force + echo '$(OBJ)' | cmp -s - $$@ || echo '$(OBJ)' > $$@ + +$(MASTER_OUTPUT)/ldflags.txt: $(MASTER_OUTPUT)/force + echo '$(LDFLAGS)' | cmp -s - $$@ || echo '$(LDFLAGS)' > $$@ + + # We have to use static rules for the .d files for some reason DEPS = $(patsubst %.o,%.d,$(OBJ)) # Keep the .d files @@ -390,22 +360,7 @@ DEPS = $(patsubst %.o,%.d,$(OBJ)) $(DEPS): -# Since the object files could be in two different folders, generate -# separate rules for them, rather than having too generic rules -$(eval $(call GEN_OBJRULE,$(OBJDIR))) -$(eval $(call GEN_OBJRULE,$(KBOBJDIR))) - -# Compile: create assembler files from C source files. -%.s : %.c | $(BEGIN) - @$(SILENT) || printf "$(MSG_ASSEMBLING) $<" | $(AWK_CMD) - $(eval CMD=$(CC) -S $(ALL_CFLAGS) $< -o $@) - @$(BUILD_CMD) - -# Compile: create assembler files from C++ source files. -%.s : %.cpp | $(BEGIN) - @$(SILENT) || printf "$(MSG_ASSEMBLING) $<" | $(AWK_CMD) - $(eval CMD=$(CC) -S $(ALL_CPPFLAGS) $< -o $@) - @$(BUILD_CMD) +$(foreach OUTPUT,$(OUTPUTS),$(eval $(call GEN_OBJRULE,$(OUTPUT)))) # Create preprocessed source for use in sending a bug report. %.i : %.c | $(BEGIN) @@ -420,13 +375,13 @@ clean: show_path: @echo VPATH=$(VPATH) @echo SRC=$(SRC) + @echo OBJ=$(OBJ) # Create build directory $(shell mkdir $(BUILD_DIR) 2>/dev/null) # Create object files directory -$(shell mkdir $(OBJDIR) 2>/dev/null) -$(shell mkdir $(KBOBJDIR) 2>/dev/null) +$(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir $(OUTPUT) 2>/dev/null))) # Include the dependency files. -include $(patsubst %.o,%.d,$(OBJ)) From 33fbd3be36bf58c6a02fb6b4ae99dc5bca7c8e58 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 15 Aug 2016 08:45:36 +0300 Subject: [PATCH 044/120] Output specific include paths --- build_keyboard.mk | 31 +++++++++++++++++-------------- tmk_core/rules.mk | 18 +++++------------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index d10412ea57..0debc49259 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -43,8 +43,22 @@ ifneq ($(SUBPROJECT),) endif endif -# Save the defs here, so we don't include any keymap specific ones +# We can assume a ChibiOS target When MCU_FAMILY is defined, since it's not used for LUFA +ifdef MCU_FAMILY + PLATFORM=CHIBIOS +else + PLATFORM=AVR +endif + +ifeq ($(PLATFORM),CHIBIOS) + include $(TMK_PATH)/protocol/chibios.mk + include $(TMK_PATH)/chibios.mk + OPT_OS = chibios +endif + +# Save the defines and includes here, so we don't include any keymap specific ones PROJECT_DEFS := $(OPT_DEFS) +PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(SUBPROJECT_PATH) $(KEYBOARD_PATH) MAIN_KEYMAP_PATH := $(KEYBOARD_PATH)/keymaps/$(KEYMAP) MAIN_KEYMAP_C := $(MAIN_KEYMAP_PATH)/keymap.c @@ -72,19 +86,6 @@ else KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD) endif -# We can assume a ChibiOS target When MCU_FAMILY is defined, since it's not used for LUFA -ifdef MCU_FAMILY - PLATFORM=CHIBIOS -else - PLATFORM=AVR -endif - -ifeq ($(PLATFORM),CHIBIOS) - include $(TMK_PATH)/protocol/chibios.mk - include $(TMK_PATH)/chibios.mk - OPT_OS = chibios -endif - # Object files directory # To put object files in current directory, use a dot (.), do NOT make # this an empty or blank macro! @@ -190,8 +191,10 @@ endif OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) $(KEYMAP_OUTPUT)_SRC := $(SRC) $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" +$(KEYMAP_OUTPUT)_INC := $(EXTRAINCDIRS) $(VPATH) $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) +$(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) include $(TMK_PATH)/rules.mk diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 9f6d8d9dfd..7b2c842ed6 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -49,13 +49,6 @@ OPT = s AUTOGEN ?= false -# List any extra directories to look for include files here. -# Each directory must be seperated by a space. -# Use forward slashes for directory separators. -# For a directory that has spaces, enclose it in quotes. -EXTRAINCDIRS += $(subst :, ,$(VPATH_SRC)) - - # Compiler flag to set the C Standard level. # c89 = "ANSI" C # gnu89 = c89 plus GCC extensions @@ -104,7 +97,6 @@ CFLAGS += -Wstrict-prototypes #CFLAGS += -Wunreachable-code #CFLAGS += -Wsign-compare CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) -CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) CFLAGS += $(CSTANDARD) ifdef CONFIG_H CFLAGS += -include $(CONFIG_H) @@ -131,7 +123,6 @@ CPPFLAGS += -Wundef #CPPFLAGS += -Wunreachable-code #CPPFLAGS += -Wsign-compare CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) -CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) #CPPFLAGS += $(CSTANDARD) ifdef CONFIG_H CPPFLAGS += -include $(CONFIG_H) @@ -149,7 +140,6 @@ endif # dump that will be displayed for a given single line of source input. ASFLAGS += $(ADEFS) ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 -ASFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) ifdef CONFIG_H ASFLAGS += -include $(CONFIG_H) endif @@ -305,9 +295,11 @@ BEGIN = gccversion sizebefore define GEN_OBJRULE -$1_CFLAGS = $$(ALL_CFLAGS) $$($1_DEFS) -$1_CPPFLAGS= $$(ALL_CPPFLAGS) $$($1_DEFS) -$1_ASFLAGS= $$(ALL_ASFLAGS) $$($1_DEFS) +$1_INCFLAGS := $$(patsubst %,-I%,$$($1_INC)) +$1_CFLAGS = $$(ALL_CFLAGS) $$($1_DEFS) $$($1_INCFLAGS) +$1_CPPFLAGS= $$(ALL_CPPFLAGS) $$($1_DEFS) $$($1_INCFLAGS) +$1_ASFLAGS= $$(ALL_ASFLAGS) $$($1_DEFS) $$($1_INCFLAGS) +$$(info $$($1_INCFLAGS)) # Compile: create object files from C source files. $1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN) From 9028a412eaf95e37e98a9f2e4573653ec70d7e18 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 15 Aug 2016 08:58:05 +0300 Subject: [PATCH 045/120] Add output specific config file --- build_keyboard.mk | 17 ++++++++++------- tmk_core/rules.mk | 20 ++++++-------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index 0debc49259..a6b578efbc 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -56,9 +56,17 @@ ifeq ($(PLATFORM),CHIBIOS) OPT_OS = chibios endif +CONFIG_H = $(KEYBOARD_PATH)/config.h +ifneq ($(SUBPROJECT),) + ifneq ("$(wildcard $(SUBPROJECT_C))","") + CONFIG_H = $(SUBPROJECT_PATH)/config.h + endif +endif + # Save the defines and includes here, so we don't include any keymap specific ones PROJECT_DEFS := $(OPT_DEFS) PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(SUBPROJECT_PATH) $(KEYBOARD_PATH) +PROJECT_CONFIG := $(CONFIG_H) MAIN_KEYMAP_PATH := $(KEYBOARD_PATH)/keymaps/$(KEYMAP) MAIN_KEYMAP_C := $(MAIN_KEYMAP_PATH)/keymap.c @@ -94,13 +102,6 @@ KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET) ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","") CONFIG_H = $(KEYMAP_PATH)/config.h -else - CONFIG_H = $(KEYBOARD_PATH)/config.h - ifneq ($(SUBPROJECT),) - ifneq ("$(wildcard $(SUBPROJECT_C))","") - CONFIG_H = $(SUBPROJECT_PATH)/config.h - endif - endif endif # # project specific files @@ -192,9 +193,11 @@ OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) $(KEYMAP_OUTPUT)_SRC := $(SRC) $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" $(KEYMAP_OUTPUT)_INC := $(EXTRAINCDIRS) $(VPATH) +$(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H) $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) +$(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG) include $(TMK_PATH)/rules.mk diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 7b2c842ed6..977a2d0e53 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -98,9 +98,6 @@ CFLAGS += -Wstrict-prototypes #CFLAGS += -Wsign-compare CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) CFLAGS += $(CSTANDARD) -ifdef CONFIG_H - CFLAGS += -include $(CONFIG_H) -endif #---------------- Compiler Options C++ ---------------- @@ -124,10 +121,6 @@ CPPFLAGS += -Wundef #CPPFLAGS += -Wsign-compare CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) #CPPFLAGS += $(CSTANDARD) -ifdef CONFIG_H - CPPFLAGS += -include $(CONFIG_H) -endif - #---------------- Assembler Options ---------------- # -Wa,...: tell GCC to pass this to the assembler. @@ -140,9 +133,6 @@ endif # dump that will be displayed for a given single line of source input. ASFLAGS += $(ADEFS) ASFLAGS += -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 -ifdef CONFIG_H - ASFLAGS += -include $(CONFIG_H) -endif #---------------- Library Options ---------------- # Minimalistic printf version @@ -296,10 +286,12 @@ BEGIN = gccversion sizebefore define GEN_OBJRULE $1_INCFLAGS := $$(patsubst %,-I%,$$($1_INC)) -$1_CFLAGS = $$(ALL_CFLAGS) $$($1_DEFS) $$($1_INCFLAGS) -$1_CPPFLAGS= $$(ALL_CPPFLAGS) $$($1_DEFS) $$($1_INCFLAGS) -$1_ASFLAGS= $$(ALL_ASFLAGS) $$($1_DEFS) $$($1_INCFLAGS) -$$(info $$($1_INCFLAGS)) +ifdef $1_CONFIG +$1_CONFIG_FLAGS += -include $$($1_CONFIG) +endif +$1_CFLAGS = $$(ALL_CFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS) +$1_CPPFLAGS= $$(ALL_CPPFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS) +$1_ASFLAGS= $$(ALL_ASFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS) # Compile: create object files from C source files. $1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN) From 3442e216dcec3ce6c8ba1c755b0d647a7f384f01 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 15 Aug 2016 09:07:32 +0300 Subject: [PATCH 046/120] Move bootloader_defs include to build_keyboard Also fix it for subprojects --- build_keyboard.mk | 9 +++++++++ tmk_core/chibios.mk | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index a6b578efbc..e8d8f3572b 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -54,6 +54,15 @@ ifeq ($(PLATFORM),CHIBIOS) include $(TMK_PATH)/protocol/chibios.mk include $(TMK_PATH)/chibios.mk OPT_OS = chibios + ifneq ("$(wildcard $(SUBPROJECT_PATH)/bootloader_defs.h)","") + OPT_DEFS += -include $(SUBPROJECT_PATH)/bootloader_defs.h + else ifneq ("$(wildcard $(SUBPROJECT_PATH)/boards/$(BOARD)/bootloader_defs.h)","") + OPT_DEFS += -include $(SUBPROJECT_PATH)/boards/$(BOARD)/bootloader_defs.h + else ifneq ("$(wildcard $(KEYBOARD_PATH)/bootloader_defs.h)","") + OPT_DEFS += -include $(KEYBOARD_PATH)/bootloader_defs.h + else ifneq ("$(wildcard $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h)","") + OPT_DEFS += -include $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h + endif endif CONFIG_H = $(KEYBOARD_PATH)/config.h diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index b05d59ee89..062a712bd1 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -143,14 +143,6 @@ MCUFLAGS = -mcpu=$(MCU) DEBUG = gdb -# Define ASM defines here -# bootloader definitions may be used in the startup .s file -ifneq ("$(wildcard $(KEYBOARD_PATH)/bootloader_defs.h)","") - OPT_DEFS += -include $(KEYBOARD_PATH)/bootloader_defs.h -else ifneq ("$(wildcard $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h)","") - OPT_DEFS += -include $(KEYBOARD_PATH)/boards/$(BOARD)/bootloader_defs.h -endif - # List any extra directories to look for libraries here. EXTRALIBDIRS = $(RULESPATH)/ld From 03e31ef8b9752220d092a1950030cf7942e002eb Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 16 Aug 2016 08:42:08 +0300 Subject: [PATCH 047/120] Continue on error --- Makefile | 6 +++++- message.mk | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ed89b07337..f80d4e99c8 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,8 @@ endif override SILENT = false +ON_ERROR := error_occured=1 + STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST)) ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST)) ROOT_DIR := $(dir $(ROOT_MAKEFILE)) @@ -302,7 +304,9 @@ $(SUBPROJECTS): %: %-allkm done $(eval $(call PARSE_RULE,$@)) $(eval $(call SET_SILENT_MODE)) - +$(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) + +error_occured=0; \ + $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) \ + if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi .PHONY: all diff --git a/message.mk b/message.mk index 6abc782152..f8fd387121 100644 --- a/message.mk +++ b/message.mk @@ -15,6 +15,8 @@ else AWK=cat && test endif +ON_ERROR ?= exit 1 + OK_STRING=$(OK_COLOR)[OK]$(NO_COLOR)\n ERROR_STRING=$(ERROR_COLOR)[ERRORS]$(NO_COLOR)\n WARN_STRING=$(WARN_COLOR)[WARNINGS]$(NO_COLOR)\n @@ -23,9 +25,9 @@ TAB_LOG = printf "\n$$LOG\n\n" | $(AWK) '{ sub(/^/," | "); print }' TAB_LOG_PLAIN = printf "$$LOG\n" AWK_STATUS = $(AWK) '{ printf " %-10s\n", $$1; }' AWK_CMD = $(AWK) '{ printf "%-99s", $$0; }' -PRINT_ERROR = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) && exit 1 +PRINT_ERROR = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) && $(ON_ERROR) PRINT_WARNING = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG) -PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) && exit 1 +PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) && $(ON_ERROR) PRINT_WARNING_PLAIN = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) PRINT_OK = $(SILENT) || printf " $(OK_STRING)" | $(AWK_STATUS) BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING); else $(PRINT_OK); fi; @@ -34,6 +36,7 @@ MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, pleas # Define Messages # English MSG_ERRORS_NONE = Errors: none +MSG_ERRORS = $(ERROR_COLOR)Make finished with errors\n$(NO_COLOR) MSG_BEGIN = -------- begin -------- MSG_END = -------- end -------- MSG_SIZE_BEFORE = Size before: From f29730da36cb2e036c5878327f567532d2533ff1 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Tue, 16 Aug 2016 08:57:10 +0300 Subject: [PATCH 048/120] Better format for non-silent output --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f80d4e99c8..9ca73b4ad7 100644 --- a/Makefile +++ b/Makefile @@ -263,8 +263,7 @@ define PARSE_KEYMAP $$(PRINT_OK); \ fi; COMMAND_false_$$(COMMAND) := \ - printf "$$(MAKE_MSG)\n" | \ - $$(MAKE_MSG_FORMAT); \ + printf "$$(MAKE_MSG)\n\n"; \ $$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; endef From ab4d7adbb96fa034fd20364247d615f527661594 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 19 Aug 2016 09:06:28 +0300 Subject: [PATCH 049/120] Fix the template for the Makefile/rules.mk split --- quantum/template/Makefile | 76 ++------------------------------------- quantum/template/rules.mk | 67 ++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 74 deletions(-) create mode 100644 quantum/template/rules.mk diff --git a/quantum/template/Makefile b/quantum/template/Makefile index 3f6d133c9b..4e2a6f00fd 100644 --- a/quantum/template/Makefile +++ b/quantum/template/Makefile @@ -1,75 +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=512 - - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE ?= no # 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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif - - +endif \ No newline at end of file diff --git a/quantum/template/rules.mk b/quantum/template/rules.mk new file mode 100644 index 0000000000..55898147dd --- /dev/null +++ b/quantum/template/rules.mk @@ -0,0 +1,67 @@ +# 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=512 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # 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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 From e1243339ca4dd0629ef7ae6a38b0852aa709620b Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 19 Aug 2016 09:37:39 +0300 Subject: [PATCH 050/120] Add diffutils to travis.yml and install_dependencies It has been required for a while now, and now actually checked in the makefiles. Before, if you didn't have it installed it would just recompile everything. The readme hasn't been updated to reflect this, I think we need to go through that separately, and see what's really needed. Or just instruct people to run the batch scripts. --- .travis.yml | 1 + util/install_dependencies.sh | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 297cf19a68..138a2c5532 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,5 @@ addons: - gcc-arm-none-eabi - binutils-arm-none-eabi - libnewlib-arm-none-eabi + - diffutils after_success: bash util/travis_compiled_push.sh diff --git a/util/install_dependencies.sh b/util/install_dependencies.sh index 24564a2ac5..49ac86e072 100644 --- a/util/install_dependencies.sh +++ b/util/install_dependencies.sh @@ -20,7 +20,8 @@ if [[ -n "$(type -P pacman )" ]]; then arm-none-eabi-gcc \ arm-none-eabi-binutils \ arm-none-eabi-newlib \ - git + git \ + diffutils elif [[ -n "$(type -P apt-get)" ]]; then # Debian and derivatives @@ -47,7 +48,8 @@ elif [[ -n "$(type -P apt-get)" ]]; then gcc-arm-none-eabi \ binutils-arm-none-eabi \ libnewlib-arm-none-eabi \ - git + git \ + diffutils elif [[ -n "$(type -P yum)" ]]; then # Fedora, CentOS or RHEL and derivatives @@ -69,7 +71,8 @@ elif [[ -n "$(type -P yum)" ]]; then gcc-arm-none-eabi \ binutils-arm-none-eabi \ libnewlib-arm-none-eabi \ - git + git \ + diffutils # The listed eabi pacackes do unfortunately not exist for CentOS, # But at least in Fedora they do, so try to install them anyway # TODO: Build them from sources, if the installation fails @@ -85,7 +88,8 @@ elif [[ -n "$(type -P zypper)" ]]; then patch \ wget \ dfu-programmer \ - git + git \ + diffutils # TODO: The avr and eabi tools are not available as default packages, so we need # another way to install them From b4c75569b0bc2f3ba9a7766ab64ff504fad3836e Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 20 Aug 2016 02:42:38 +0300 Subject: [PATCH 051/120] Update readme with new instructions for make --- readme.md | 102 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 81 insertions(+), 21 deletions(-) diff --git a/readme.md b/readme.md index 37f140839d..c66efadca5 100644 --- a/readme.md +++ b/readme.md @@ -110,43 +110,103 @@ In every keymap folder, the following files are recommended: ## The `make` command -The `make` command is how you compile the firmware into a .hex file, which can be loaded by a dfu programmer (like dfu-progammer via `make dfu`) or the [Teensy loader](https://www.pjrc.com/teensy/loader.html) (only used with Teensys). You can run `make` from the root (`/`), your keyboard folder (`/keyboards//`), or your keymap folder (`/keyboards//keymaps//`) if you have a `Makefile` there (see the example [here](/doc/keymap_makefile_example.mk)). +The `make` command is how you compile the firmware into a .hex file, which can be loaded by a dfu programmer (like dfu-progammer via `make dfu`) or the [Teensy loader](https://www.pjrc.com/teensy/loader.html) (only used with Teensys). -By default, this will generate a `_.hex` file in whichever folder you run `make` from. These files are ignored by git, so don't worry about deleting them when committing/creating pull requests. +**NOTE:** To abort a make command press `Ctrl-c` -Below are some definitions that will be useful: +The following instruction refers to these folders. -* The "root" (`/`) folder is the qmk_firmware folder, in which are `doc`, `keyboard`, `quantum`, etc. -* The "keyboard" folder is any keyboard project's folder, like `/keyboards/planck`. -* The "keymap" folder is any keymap's folder, like `/keyboards/planck/keymaps/default`. +* The `root` (`/`) folder is the qmk_firmware folder, in which are `doc`, `keyboard`, `quantum`, etc. +* The `keyboard` folder is any keyboard project's folder, like `/keyboards/planck`. +* The `keymap` folder is any keymap's folder, like `/keyboards/planck/keymaps/default`. +* The `subproject` folder is the subproject folder of a keyboard, like `/keyboards/ergodox/ez` -Below is a list of the useful `make` commands in QMK: +### Simple instructions for building and uploading a keyboard -* `make` - builds your keyboard and keymap depending on which folder you're in. This defaults to the "default" layout (unless in a keymap folder), and Planck keyboard in the root folder - * `make keyboard=` - specifies the keyboard (only to be used in root) - * `make keymap=` - specifies the keymap (only to be used in root and keyboard folder - not needed when in keymap folder) -* `make clean` - cleans the `.build` folder, ensuring that everything is re-built -* `make dfu` - (requires dfu-programmer) builds and flashes the keymap to your keyboard once placed in reset/dfu mode (button or press `KC_RESET`). This does not work for Teensy-based keyboards like the ErgoDox EZ. - * `keyboard=` and `keymap=` are compatible with this -* `make all-keyboards` - builds all keymaps for all keyboards and outputs status of each (use in root) -* `make all-keyboards-default` - builds all default keymaps for all keyboards and outputs status of each (use in root) -* `make all-keymaps [keyboard=]` - builds all of the keymaps for whatever keyboard folder you're in, or specified by `` -* `make all-keyboards-*`, `make all-keyboards-default-*` and `make all-keymaps-* [keyboard=]` - like the normal "make-all-*" commands, but the last string aftter the `-` (for example clean) is passed to the keyboard make command. -Other, less useful functionality: +**Most keyboards have more specific instructions in the keyboard specific readme.md file, so please check that first** + +If the `keymap` folder contains a file name `Makefile` + +1. Change the directory to the `keymap` folder +2. Run `make -` + +Otherwise, if there's no `Makefile` in the `keymap` folder + +1. Enter the `keyboard` folder +2. Run `make --` + +In the above commands, replace: + +* `` with the name of your keymap +* `` with the name of the subproject (revision or sub-model of your keyboard). For example, for Ergodox it can be `ez` or `infinity`, and for Planck `rev3` or `rev4`. + * If the keyboard doesn't have a subproject, or if you are happy with the default (defined in `rules.mk` file of the `keyboard` folder), you can leave it out. But remember to also remove the dash (`-`) from the command. +* `` The programmer to use. Most keyboards use `dfu`, but some use `teensy`. Infinity keyboards use `dfu-util`. Check the readme file in the keyboard folder to find out which programmer to use. + * If you don't add `----`, where: + +* `` is the name of the keyboard, for example `planck` + * Use `allkb` to compile all keyboards +* `` is the name of the subproject (revision or sub-model of the keyboard). For example, for Ergodox it can be `ez` or `infinity`, and for Planck `rev3` or `rev4`. + * If the keyboard doesn't have any subprojects, it can be left out + * To compile the default subproject, you can leave it out, or specify `defaultsp` + * Use `allsp` to compile all subprojects +* `` is the name of the keymap, for example `algernon` + * Use `allkm` to compile all keymaps +* `` will be explained in more detail below. + +**Note:** When you leave some parts of the command out, you should also remove the dash (`-`). + +As mentioned above, there are some shortcuts, when you are in a: + +* `keyboard` folder, the command will automatically fill the `` part. So you only need to type `--` +* `subproject` folder, it will fill in both `` and `` +* `keymap` folder, then `` and `` will be filled in. If you need to specify the `` use the following syntax `-` + * Note in order to support this shortcut, the keymap needs its own Makefile (see the example [here](/doc/keymap_makefile_example.mk)) +* `keymap` folder of a `subproject`, then everything except the `` will be filled in + +The `` means the following +* If no target is given, then it's the same as `all` below +* `all` compiles the keyboard and generates a `_.hex` file in whichever folder you run `make` from. These files are ignored by git, so don't worry about deleting them when committing/creating pull requests. +* `dfu`, `teensy` or `dfu-util`, compile and upload the firmware to the keyboard. If the compilation fails, then nothing will be uploaded. The programmer to use depends on the keyboard. For most keyboards it's `dfu`, but for Infinity keyboards you should use `dfu-util`, and `teensy` for standard Teensys. To find out which command you should use for your keyboard, check the keyboard specific readme. **Note** that some operating systems needs root access for these commands to work, so in that case you need to run for example `sudo make dfu`. +* `clean`, cleans the build output folders to make sure that everything is built from scratch. Run this before normal compilation if you have some unexplainable problems. + +Some other targets are supported but, but not important enough to be documented here. Check the source code of the make files for more information. + +You can also add extra options at the end of the make command line, after the target * `make COLOR=false` - turns off color output * `make SILENT=true` - turns off output besides errors/warnings -* `make VERBOSE=true` - outputs all of the avr-gcc stuff (not interesting) +* `make VERBOSE=true` - outputs all of the gcc stuff (not interesting, unless you need to debug) + +The make command itself also has some additional options, type `make --help` for more information. The most useful is probably `-jx`, which specifies that you want to compile using more than one CPU, the `x` represents the number of CPUs that you want to use. Setting that can greatly reduce the compile times, especially if you are compiling many keyboards/keymaps. I usually set it to one less than the number of CPUs that I have, so that I have some left for doing other things while it's compiling. Note that not all operating systems and make versions supports that option. + +Here are some examples commands + +* `make allkb-allsp-allkm` builds everything (all keyboards, all subprojects, all keymaps). Running just `make` from the `root` will also run this. +* `make` from within a `keyboard` directory, is the same as `make keyboard-allsp-allkm`, which compiles all subprojects and keymaps of the keyboard. **NOTE** that this behaviour has changed. Previously it compiled just the default keymap. +* `make ergodox-infinity-algernon-clean` will clean the build output of the Ergodox Infinity keyboard. This example uses the full syntax and can be run from any folder with a `Makefile` +* `make dfu COLOR=false` from within a keymap folder, builds and uploads the keymap, but without color output. ## The `Makefile` -There are 3 different `make` and `Makefile` locations: +There are 5 different `make` and `Makefile` locations: * root (`/`) * keyboard (`/keyboards//`) * keymap (`/keyboards//keymaps//`) +* subproject (`/keyboards//`) +* subproject keymap (`/keyboards///keymaps/`) -The root contains the code used to automatically figure out which keymap or keymaps to compile based on your current directory and commandline arguments. It's considered stable, and shouldn't be modified. The keyboard one will contain the MCU set-up and default settings for your keyboard, and shouldn't be modified unless you are the producer of that keyboard. The keymap Makefile can be modified by users, and is optional. It is included automatically if it exists. You can see an example [here](/doc/keymap_makefile_example.mk) - the last few lines are the most important. The settings you set here will override any defaults set in the keyboard Makefile. **It is required if you want to run `make` in the keymap folder.** +The root contains the code used to automatically figure out which keymap or keymaps to compile based on your current directory and commandline arguments. It's considered stable, and shouldn't be modified. The keyboard one will contain the MCU set-up and default settings for your keyboard, and shouldn't be modified unless you are the producer of that keyboard. The keymap Makefile can be modified by users, and is optional. It is included automatically if it exists. You can see an example [here](/doc/keymap_makefile_example.mk) - the last few lines are the most important. The settings you set here will override any defaults set in the keyboard Makefile. **The file is required if you want to run `make` in the keymap folder.** + +For keyboards and subprojects, the make files are split in two parts `Makefile` and `rules.mk`. All settings can be found in the `rules.mk` file, while the `Makefile` is just there for support and including the root `Makefile`. Keymaps contain just one `Makefile` for simplicity. ### Makefile options From da226e61261e0c11e678d2086c00b2a45726083e Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 20 Aug 2016 03:22:16 +0300 Subject: [PATCH 052/120] Update keyboard readme files with new makefile instructions --- keyboards/arrow_pad/readme.md | 8 +++++--- keyboards/atomic/readme.md | 7 ++++--- keyboards/atreus/readme.md | 7 ++++--- keyboards/bantam44/readme.md | 7 ++++--- keyboards/clueboard/readme.md | 26 +++++++++++++------------- keyboards/cluecard/readme.md | 6 +++--- keyboards/ergodox/readme.md | 6 +++--- keyboards/gh60/readme.md | 8 +++++--- keyboards/hhkb/readme.md | 8 +++++--- keyboards/kc60/readme.md | 10 ++++++---- keyboards/kinesis/readme.md | 6 +++--- keyboards/planck/readme.md | 8 +++++--- keyboards/preonic/readme.md | 8 +++++--- keyboards/retro_refit/readme.md | 8 +++++--- keyboards/s60-x/readme.md | 4 ++-- keyboards/tv44/readme.md | 6 +++--- 16 files changed, 75 insertions(+), 58 deletions(-) diff --git a/keyboards/arrow_pad/readme.md b/keyboards/arrow_pad/readme.md index 5aa44cce54..2e9a64f2ef 100644 --- a/keyboards/arrow_pad/readme.md +++ b/keyboards/arrow_pad/readme.md @@ -12,13 +12,15 @@ Download or clone the whole firmware and navigate to the keyboards/arrow_pad fol 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. \ No newline at end of file diff --git a/keyboards/atomic/readme.md b/keyboards/atomic/readme.md index ab1e7ba1ff..674dcf113b 100644 --- a/keyboards/atomic/readme.md +++ b/keyboards/atomic/readme.md @@ -13,13 +13,14 @@ Download or clone the whole firmware and navigate to the keyboards/atomic folder 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 a file in the keymaps folder named `.c` 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. diff --git a/keyboards/atreus/readme.md b/keyboards/atreus/readme.md index 734f58f0f0..a4077668e3 100644 --- a/keyboards/atreus/readme.md +++ b/keyboards/atreus/readme.md @@ -174,13 +174,14 @@ Download or clone the whole firmware and navigate to the keyboards/planck folder 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` 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. diff --git a/keyboards/bantam44/readme.md b/keyboards/bantam44/readme.md index 89d7f9d053..462f67c124 100644 --- a/keyboards/bantam44/readme.md +++ b/keyboards/bantam44/readme.md @@ -12,13 +12,14 @@ Download or clone the whole firmware and navigate to the keyboards/Bantam44 fold 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` 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. \ No newline at end of file diff --git a/keyboards/clueboard/readme.md b/keyboards/clueboard/readme.md index 6c29c09eca..4a76e2908c 100644 --- a/keyboards/clueboard/readme.md +++ b/keyboards/clueboard/readme.md @@ -31,36 +31,36 @@ If you would like to use one of the alternative keymaps, or create your own, see ## Clueboard 1.0 -If you have a first generation Clueboard (one with a black PCB) you will need to use the revision 1 code. To do so add `SUBPROJECT=rev1` to your make command, like this: +If you have a first generation Clueboard (one with a black PCB) you will need to use the revision 1 code. To do so add `rev1` to your make command, like this: ``` -$ make SUBPROJECT=rev1 +$ make rev1 ``` And when flashing your keyboard: ``` -$ make SUBPROJECT=rev1 dfu +$ make rev1-dfu ``` -If you are flashing an alternative layout to your rev1, include both `SUBPROJECT=rev1` and `KEYMAP=` in your command, for example when flashing max: +If you are flashing an alternative layout to your rev1, include both `rev1` and `` in your command, for example when flashing max: ``` -$ make SUBPROJECT=rev1 KEYMAP=max dfu +$ make rev1-max-dfu ``` ## Alternate Keymaps -There are many alternative and user-contributed layouts available in the [keymaps/](keymaps/) directory. To compile and flash an alternative you will want to add `KEYMAP=` to your command: +There are many alternative and user-contributed layouts available in the [keymaps/](keymaps/) directory. To compile and flash an alternative you will want to add `` to your command: ``` -$ make KEYMAP=skully +$ make skully ``` -And when flashing your keyboard, put `KEYMAP=` between "make" and "dfu": +And when flashing your keyboard, put `` between "make" and "dfu": ``` -$ make KEYMAP=skully dfu +$ make skully-dfu ``` ### Notable Layouts @@ -76,15 +76,15 @@ These layouts are notable for one reason or another. If you are looking for idea There are a lot of possibilities when creating your own keymap, and the primary documentation for doing that is [Customizing Your Keymap](/readme.md##customizing-your-keymap) in the main readme.md. As a way to get started, here is the procedure I recommend: * Copy `[keymaps/default](keymaps/default/)` to `keymaps/`. -* Compile the firmware (`$ make KEYMAP=`) -* Flash the firmware (`$ make KEYMAP= dfu`) +* Compile the firmware (`$ make `) +* Flash the firmware (`$ make -dfu`) * Make sure everything works like the default keyboard * Modify `keymaps//readme.md` to tell others about your layout. * Modify `keymaps//keymap.c` to reflect your desired layout. -* Compile your new custom firmware (`$ make KEYMAP=`) +* Compile your new custom firmware (`$ make `) ** If you have warnings you may flash without fixing them, but something may not work right. ** If you have any errors you must fix them before continuing. -* Flash the firmware (`$ make KEYMAP= dfu`) +* Flash the firmware (`$ make -dfu`) ## Share Your Keymap diff --git a/keyboards/cluecard/readme.md b/keyboards/cluecard/readme.md index ae1afbbfdd..be13fc0171 100644 --- a/keyboards/cluecard/readme.md +++ b/keyboards/cluecard/readme.md @@ -13,16 +13,16 @@ Depending on which keymap you would like to use, you will have to compile slight ### 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 a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant 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 **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/` diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md index f81d7cd8df..a96e415def 100644 --- a/keyboards/ergodox/readme.md +++ b/keyboards/ergodox/readme.md @@ -19,10 +19,10 @@ If you are just compiling an existing keymap and don't want to create your own, 3. Set up a build environment as per the readme. 4. Copy `keyboards/ergodox/keymaps/default/keymap.c` into `keymaps/your_name/keymap.c` (for example, `keymaps/german/keymap.c`) 5. Edit this file, changing keycodes to your liking (see "Finding the keycodes you need" below). Try to edit the comments as well, so the "text graphics" represent your layout correctly. See below for more tips on sharing your work. -6. Compile your firmware by running `make keymap=keymap_name`. For example, `make keymap=german`. This will result in a hex file, which will be called `ergodox_ez_keymap_name.hex`, e.g. `ergodox_ez_german.hex`. For **Infinity ErgoDox** you need to add `subproject=infinity` to the make command. -7. **ErgoDox EZ** - Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above. If you prefer you can automatically flash the hex file after successful build by running `make teensy keymap=keymap_name`. +6. Compile your firmware by running `make keymap_name`. For example, `make german`. This will result in a hex file, which will be called `ergodox_ez_keymap_name.hex`, e.g. `ergodox_ez_german.hex`. For **Infinity ErgoDox** you need to add `infinity` to the make command like this `make infinity-german`. +7. **ErgoDox EZ** - Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above. If you prefer you can automatically flash the hex file after successful build by running `make keymap_name-teensy`. - **Infinity ErgoDox** - Flash the firmware by running `make dfu-util keymap=keymap_name subproject=infinity` + **Infinity ErgoDox** - Flash the firmware by running `make infinity-keymap_name-dfu-util` 8. Submit your work as a pull request to this repository, so others can also use it. :) See below on specifics. Good luck! :) diff --git a/keyboards/gh60/readme.md b/keyboards/gh60/readme.md index 92302d507c..20afb0db07 100644 --- a/keyboards/gh60/readme.md +++ b/keyboards/gh60/readme.md @@ -48,13 +48,15 @@ Download or clone the whole firmware and navigate to the keyboards/gh60_rev_c fo 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. diff --git a/keyboards/hhkb/readme.md b/keyboards/hhkb/readme.md index 39d49b32a1..367c0a08f7 100644 --- a/keyboards/hhkb/readme.md +++ b/keyboards/hhkb/readme.md @@ -168,13 +168,15 @@ Download or clone the whole firmware and navigate to the keyboards/planck folder 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 a file in the keymaps folder named `.c` 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. diff --git a/keyboards/kc60/readme.md b/keyboards/kc60/readme.md index acc0df68dc..0639512dd3 100644 --- a/keyboards/kc60/readme.md +++ b/keyboards/kc60/readme.md @@ -10,18 +10,20 @@ Download or clone the whole firmware and navigate to the keyboards/kc60 folder. 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. ## WS2812 Support ![Image of KC60 with RGB Underglow](keymaps/ws2812/ws2812_example.jpg) -Build with WS2812 Support by running `make KEYMAP=ws2812`. +Build with WS2812 Support by running `make ws2812`. diff --git a/keyboards/kinesis/readme.md b/keyboards/kinesis/readme.md index a990f9cb99..79c86581e6 100644 --- a/keyboards/kinesis/readme.md +++ b/keyboards/kinesis/readme.md @@ -27,16 +27,16 @@ Depending on which keymap you would like to use, you will have to compile slight ### 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 a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant 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 **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/` diff --git a/keyboards/planck/readme.md b/keyboards/planck/readme.md index f89fdeb931..4b24a690e0 100644 --- a/keyboards/planck/readme.md +++ b/keyboards/planck/readme.md @@ -13,15 +13,17 @@ Download or clone the whole firmware and navigate to the keyboards/planck folder 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. ### Notable forks (which some of the keymap files are from) diff --git a/keyboards/preonic/readme.md b/keyboards/preonic/readme.md index f0be255a09..10763ee97a 100644 --- a/keyboards/preonic/readme.md +++ b/keyboards/preonic/readme.md @@ -13,13 +13,15 @@ Download or clone the whole firmware and navigate to the keyboards/preonic folde 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 a file in the keymaps folder named `.c` 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. diff --git a/keyboards/retro_refit/readme.md b/keyboards/retro_refit/readme.md index b01a1a9ca9..77df861cef 100644 --- a/keyboards/retro_refit/readme.md +++ b/keyboards/retro_refit/readme.md @@ -12,13 +12,15 @@ Download or clone the whole firmware and navigate to the keyboards/retro_refit f 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` 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. \ No newline at end of file diff --git a/keyboards/s60-x/readme.md b/keyboards/s60-x/readme.md index 099d586991..94ce829223 100644 --- a/keyboards/s60-x/readme.md +++ b/keyboards/s60-x/readme.md @@ -42,9 +42,9 @@ The recommended programs for flashing your keyboard are [Atmel FLIP](http://www. ## Building the firmware -To build firmware binary hex file with a certain keymap just run `make` with the `keymap` option like: +To build the firmware binary hex file with a keymap just do `make` with a keymap like this: - $ make keymap=[custom|poker|poker_set|poker_bit|plain|hasu|spacefn|hhkb|] + $ make [custom|poker|poker_set|poker_bit|plain|hasu|spacefn|hhkb|] For a more detailed explanation of the build process and the environment setup, see the ["Getting Started" section](/readme.md#getting-started). diff --git a/keyboards/tv44/readme.md b/keyboards/tv44/readme.md index e3b557fe2d..4f691a4ca0 100644 --- a/keyboards/tv44/readme.md +++ b/keyboards/tv44/readme.md @@ -13,16 +13,16 @@ Depending on which keymap you would like to use, you will have to compile slight ### 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 a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant 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 **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/` \ No newline at end of file From 9e03517ae51ff30d332accae27469ae3b1b25e73 Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Fri, 19 Aug 2016 21:47:00 -0600 Subject: [PATCH 053/120] Restructuring of the ergodox README. --- keyboards/ergodox/readme.md | 134 ++++++++++++++++++++++++++++-------- 1 file changed, 105 insertions(+), 29 deletions(-) diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md index 1c1181dbae..1627883c91 100644 --- a/keyboards/ergodox/readme.md +++ b/keyboards/ergodox/readme.md @@ -1,44 +1,121 @@ -# Infinity on Ubuntu Quickstart +# Customizing Keymap -To build an Infinity firmware under Ubuntu (tested on 15.10): +There are external tools for customizing the layout, but those do not use +the featurs of this qmk firmware. These sites include: + + - [Massdrop configurator](https://keyboard-configurator.massdrop.com/ext/ergodox) for Ez + - [Input Club configurator](https://input.club/configurator-ergodox) for Infinity, provides left and right files + +You can also find an existing firmware that you like, for example from: + + - [Dozens of community-contributed keymaps](http://qmk.fm/keyboards/ergodox/) + +This qmk firmware also provides the ability to customize keymaps, but requires +a toolchain to build the firmware. See below for instructions on building +firmware and customizing keymaps. + +# Customizing Keymaps + +There are many existing keymaps in the "keymaps" directory. If you just want +to use one of them, you don't need to modify keymaps and can just build and +flash the firmware as described below. These directories each have a +"readme.md" file which describe them. + +If none of the existing keymaps suit you, you can create your own custom +keymap. This will require some experience with coding. Follow these steps +to customize a keymap: + + - Read the [qmk firmware README](https://github.com/jackhumbert/qmk_firmware) from top to bottom. Then come back here. :) + + - Clone the qmk_firmware repository + + - Set up your build environment (see below). + + - Make a new directory under "keymaps" to hold your customizations. + + - Copy an existing keymap that is close to what you want, such as + "keymaps/default/keymap.c". + + - Use an editor to modify the new "keymap.c". See "Finding the keycodes you + need" below). Try to edit the comments as well, so the "text graphics" + represent your layout correctly. + + - Compile your new firmware (see below) + + - Flash your firmware (see below) + + - Test the changes. + + - Submit your keymap as a pull request to the qmk_firmware repository so + others can use it. You will want to add a "readme.md" that describes the + keymap. + +# Build Dependencies + +Before you can build, you will need the build dependencies. There is a script +to try to do this for Linux: - Run the `util/install_dependencies.sh` script as root. - - Check out the submodules with `git submodule update --init --recursive` - - Go into the ErgoDox directory with `cd keyboards/ergodox` + +For the Infinity, you need the chibios submodules to be checked out or you +will receive errors about the build process being unable to find the chibios +files. Check them out with: + + - Go to the top level repo directory and run: `git submodule update --init --recursive` + +# Flashing Firmware + +## ErgoDox Ez + +The Ez uses the [Teensy Loader](https://www.pjrc.com/teensy/loader.html). + +Linux users need to modify udev rules as described on the Teensy Linux page. +Some distributions provide a binary, maybe called `teensy-loader-cli`). + +To flash the firmware: + + - Build the firmware with `make keymap=keymapname`, for example `make + keymap=default` + + - This will result in a hex file called `ergodox_ez_keymapname.hex`, e.g. + `ergodox_ez_default.hex` + + - Start the teensy loader. + + - Load the .hex file into it. + + - Press the Reset button by inserting a paperclip gently into the reset hole + in the top right corder. + + - Click the button in the Teensy app to download the firmware. + +## ErgoDox Infinity + +The Infinity is two completely independent keyboards, and needs to be flashed +for the left and right halves seperately. To flash them: + + - Remove the build directory with `rm -rf ../../.build` + - Build the firmware with `make keymap=keymapname subproject=infinity` + - Plug in the left hand keyboard only. + - Press the program button (back of keyboard, above thumb pad). + - Install the firmware with `sudo make dfu-util keymap=keymapname subproject=infinity` - - Install the right hand firmware, but I haven't figured this out yet. -# Getting started + - Remove the left-hand build with `rm -rf ../../.build` -There are two main ways you could customize the ErgoDox (EZ and Infinity) + - Build left hand firmware with `make keymap=keymapname subproject=infinity MASTER=right` -## The Easy Way: Use an existing firmware file and just flash it (ErgoDox EZ only) + - Plug in the right hand keyboard only. -1. Download and install the [Teensy Loader](https://www.pjrc.com/teensy/loader.html). Some Linux distributions already provide a binary (may be called `teensy-loader-cli`), so you may prefer to use this. -2. Find a firmware file you like. There are [dozens of community-contributed keymaps](http://qmk.fm/keyboards/ergodox/) you can browse and download. You can also use the [Massdrop configurator](https://keyboard-configurator.massdrop.com/ext/ergodox) to create a firmware Hex file you like. -3. Download the firmware file -4. Connect the keyboard, press its Reset button (gently insert a paperclip into the hole in the top-right corner) and flash it using the Teensy loader you installed on step 1 and the firmware you downloaded. + - Press the program button (back of keyboard, above thumb pad). -## More technical: compile an existing keymap, or create your own totally custom firmware by editing the source files. + - Install the firmware with `sudo make dfu-util keymap=keymapname subproject=infinity MASTER=right` -This requires a little bit of familiarity with coding. -If you are just compiling an existing keymap and don't want to create your own, you can skip step 4, 5 and 8. - -1. Go to https://github.com/jackhumbert/qmk_firmware and read the readme at the base of this repository, top to bottom. Then come back here :) -2. Clone the repository (download it) -3. Set up a build environment as per the readme. -4. Copy `keyboards/ergodox/keymaps/default/keymap.c` into `keymaps/your_name/keymap.c` (for example, `keymaps/german/keymap.c`) -5. Edit this file, changing keycodes to your liking (see "Finding the keycodes you need" below). Try to edit the comments as well, so the "text graphics" represent your layout correctly. See below for more tips on sharing your work. -6. Compile your firmware by running `make keymap=keymap_name`. For example, `make keymap=german`. This will result in a hex file, which will be called `ergodox_ez_keymap_name.hex`, e.g. `ergodox_ez_german.hex`. For **Infinity ErgoDox** you need to add `subproject=infinity` to the make command. -7. **ErgoDox EZ** - Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above. If you prefer you can automatically flash the hex file after successful build by running `make teensy keymap=keymap_name`. - - **Infinity ErgoDox** - Flash the firmware by running `make dfu-util keymap=keymap_name subproject=infinity` -8. Submit your work as a pull request to this repository, so others can also use it. :) See below on specifics. - -Good luck! :) +More information on the Infinity firmware is available in the [TMK/chibios for +Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md) ## Contributing your keymap @@ -49,7 +126,6 @@ The QMK firmware is open-source, so it would be wonderful to have your contribut 3. `readme.md` - a readme file, which GitHub would display by default when people go to your directory. Explain what's different about your keymap, what you tweaked or how it works. No specific format to follow, just communicate what you did. :) 4. Any graphics you wish to add. This is absolutely not a must. If you feel like it, you can use [Keyboard Layout Editor](http://keyboard-layout-editor.com) to make something and grab a screenshot, but it's really not a must. If you do have graphics, your readme can just embed the graphic as a link, just like I did with the default layout. - ## Finding the keycodes you need Let's say you want a certain key in your layout to send a colon; to figure out what keycode to use to make it do that, you're going to need `quantum/keymap_common.h`. From d98e5ddf30e6ced925e3d4fa705ae5449808074b Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Fri, 19 Aug 2016 21:50:04 -0600 Subject: [PATCH 054/120] Tweaks after review. --- keyboards/ergodox/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md index 1627883c91..349a0ce40c 100644 --- a/keyboards/ergodox/readme.md +++ b/keyboards/ergodox/readme.md @@ -1,4 +1,4 @@ -# Customizing Keymap +# Keymap Options There are external tools for customizing the layout, but those do not use the featurs of this qmk firmware. These sites include: @@ -117,7 +117,7 @@ for the left and right halves seperately. To flash them: More information on the Infinity firmware is available in the [TMK/chibios for Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md) -## Contributing your keymap +# Contributing your keymap The QMK firmware is open-source, so it would be wonderful to have your contribution! Within a very short time after launching we already amassed dozens of user-contributed keymaps, with all sorts of creative improvements and tweaks. This is very valuable for people who aren't comfortable coding, but do want to customize their ErgoDox. To make it easy for these people to use your layout, I recommend submitting your PR in the following format. @@ -126,7 +126,7 @@ The QMK firmware is open-source, so it would be wonderful to have your contribut 3. `readme.md` - a readme file, which GitHub would display by default when people go to your directory. Explain what's different about your keymap, what you tweaked or how it works. No specific format to follow, just communicate what you did. :) 4. Any graphics you wish to add. This is absolutely not a must. If you feel like it, you can use [Keyboard Layout Editor](http://keyboard-layout-editor.com) to make something and grab a screenshot, but it's really not a must. If you do have graphics, your readme can just embed the graphic as a link, just like I did with the default layout. -## Finding the keycodes you need +# Finding the keycodes you need Let's say you want a certain key in your layout to send a colon; to figure out what keycode to use to make it do that, you're going to need `quantum/keymap_common.h`. From 48f8ab1ae2612960cbd82c1f9967fd118aae4c67 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 20 Aug 2016 12:44:04 +0300 Subject: [PATCH 055/120] Fix the clean target It now properly cleans all the outputs --- tmk_core/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 977a2d0e53..21011c2808 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -352,8 +352,7 @@ $(foreach OUTPUT,$(OUTPUTS),$(eval $(call GEN_OBJRULE,$(OUTPUT)))) # Target: clean project. clean: - $(REMOVE) -r $(OBJDIR) 2>/dev/null - $(REMOVE) -r $(KBOBJDIR) 2>/dev/null + $(foreach OUTPUT,$(OUTPUTS), $(REMOVE) -r $(OUTPUT) 2>/dev/null) $(REMOVE) $(BUILD_DIR)/$(TARGET).* show_path: From b26ded3ab1c09e2a127feb5f4e22e97242ce77d7 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 20 Aug 2016 14:53:29 +0300 Subject: [PATCH 056/120] Comment the Makefile Also move some messages to message.mk --- Makefile | 129 ++++++++++++++++++++++++++++++++++++++++++++++------- message.mk | 13 +++++- 2 files changed, 124 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 9ca73b4ad7..d70ac9a3b8 100644 --- a/Makefile +++ b/Makefile @@ -2,15 +2,18 @@ ifndef VERBOSE .SILENT: endif +# Allow the silent with lower caps to work the same way as upper caps ifdef silent SILENT = $(silent) endif ifdef SILENT - SUB_IS_SILENT := $(silent) + SUB_IS_SILENT := $(SILENT) endif -override SILENT = false +# We need to make sure that silent is always turned off at the top level +# Otherwise the [OK], [ERROR] and [WARN] messags won't be displayed correctly +override SILENT := false ON_ERROR := error_occured=1 @@ -26,27 +29,44 @@ ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE)) ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE)) STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR)) -PATH_ELEMENTS := $(subst /, ,$(STARTING_DIR)) - MAKEFILE_INCLUDED=yes +# Helper function to process the newt element of a space separated path +# It works a bit like the traditional functional head tail +# so the CURRENT_PATH_ELEMENT will beome the new head +# and the PATH_ELEMENTS are the rest that are still unprocessed define NEXT_PATH_ELEMENT $$(eval CURRENT_PATH_ELEMENT := $$(firstword $$(PATH_ELEMENTS))) $$(eval PATH_ELEMENTS := $$(wordlist 2,9999,$$(PATH_ELEMENTS))) endef +# We change the / to spaces so that we more easily can work with the elements +# separately +PATH_ELEMENTS := $(subst /, ,$(STARTING_DIR)) +# Initialize the path elements list for further processing $(eval $(call NEXT_PATH_ELEMENT)) +# This function sets the KEYBOARD; KEYMAP and SUBPROJECT to the correct +# variables depending on which directory you stand in. +# It's really a very simple if else chain, if you squint enough, +# but the makefile syntax makes it very verbose. +# If we are in a subfolder of keyboards ifeq ($(CURRENT_PATH_ELEMENT),keyboards) $(eval $(call NEXT_PATH_ELEMENT)) KEYBOARD := $(CURRENT_PATH_ELEMENT) $(eval $(call NEXT_PATH_ELEMENT)) + # If we are in a subfolder of keymaps, or in other words in a keymap + # folder ifeq ($(CURRENT_PATH_ELEMENT),keymaps) $(eval $(call NEXT_PATH_ELEMENT)) KEYMAP := $(CURRENT_PATH_ELEMENT) + # else if we are not in the keyboard folder itself else ifneq ($(CURRENT_PATH_ELEMENT),) + # the we can assume it's a subproject, as no other folders + # should have make files in them SUBPROJECT := $(CURRENT_PATH_ELEMENT) $(eval $(call NEXT_PATH_ELEMENT)) + # if we are inside a keymap folder of a subproject ifeq ($(CURRENT_PATH_ELEMENT),keymaps) $(eval $(call NEXT_PATH_ELEMENT)) KEYMAP := $(CURRENT_PATH_ELEMENT) @@ -57,7 +77,8 @@ endif # Only consider folders with makefiles, to prevent errors in case there are extra folders KEYBOARDS := $(notdir $(patsubst %/Makefile,%,$(wildcard $(ROOT_DIR)/keyboards/*/Makefile))) -#Compability with the old make variables +#Compability with the old make variables, anything you specify directly on the command line +# always overrides the detected folders ifdef keyboard KEYBOARD := $(keyboard) endif @@ -71,29 +92,41 @@ ifdef keymap KEYMAP := $(keymap) endif +# Uncomment these for debugging #$(info Keyboard: $(KEYBOARD)) #$(info Keymap: $(KEYMAP)) #$(info Subproject: $(SUBPROJECT)) #$(info Keyboards: $(KEYBOARDS)) + +# Set the default goal depening on where we are running make from +# this handles the case where you run make without any arguments .DEFAULT_GOAL := all ifneq ($(KEYMAP),) ifeq ($(SUBPROJECT),) + # Inside a keymap folder, just build the keymap, with the + # default subproject .DEFAULT_GOAL := $(KEYBOARD)-$(KEYMAP) else + # Inside a subproject keyamp folder, build the keymap + # for that subproject .DEFAULT_GOAL := $(KEYBOARD)-$(SUBPROJECT)-$(KEYMAP) endif else ifneq ($(SUBPROJECT),) + # Inside a subproject folder, build all keymaps for that subproject .DEFAULT_GOAL := $(KEYBOARD)-$(SUBPROJECT)-allkm else ifneq ($(KEYBOARD),) + # Inside a keyboard folder, build all keymaps for all subprojects + # Note that this is different from the old behaviour, which would + # build only the default keymap of the default keyboard .DEFAULT_GOAL := $(KEYBOARD)-allsp-allkm endif -# Compare the start of the RULE_VARIABLE with the first argument($1) +# Compare the start of the RULE variable with the first argument($1) # If the rules equals $1 or starts with $1-, RULE_FOUND is set to true # and $1 is removed from the RULE variable -# Otherwise the RULE_FOUND variable is set to false +# Otherwise the RULE_FOUND variable is set to false, and RULE left as it was # The function is a bit tricky, since there's no built in $(startswith) function define COMPARE_AND_REMOVE_FROM_RULE_HELPER ifeq ($1,$$(RULE)) @@ -110,10 +143,12 @@ define COMPARE_AND_REMOVE_FROM_RULE_HELPER endif endef +# This makes it easier to call COMPARE_AND_REMOVE_FROM_RULE, since it makes it behave like +# a function that returns the value COMPARE_AND_REMOVE_FROM_RULE = $(eval $(call COMPARE_AND_REMOVE_FROM_RULE_HELPER,$1))$(RULE_FOUND) -# Recursively try to find a match +# Recursively try to find a match for the start of the rule to be checked # $1 The list to be checked # If a match is found, then RULE_FOUND is set to true # and MATCHED_ITEM to the item that was matched @@ -127,6 +162,7 @@ define TRY_TO_MATCH_RULE_FROM_LIST_HELPER endif endef +# Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST TRY_TO_MATCH_RULE_FROM_LIST = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$1))$(RULE_FOUND) define ALL_IN_LIST_LOOP @@ -139,47 +175,70 @@ define PARSE_ALL_IN_LIST $$(foreach ITEM$1,$2,$$(eval $$(call ALL_IN_LIST_LOOP,$1))) endef +# The entry point for rule parsing +# parses a rule in the format --- +# but this particular function only deals with the first part define PARSE_RULE RULE := $1 COMMANDS := + # If the rule starts with allkb, then continue the parsing from + # PARSE_ALL_KEYBOARDS ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkb),true) $$(eval $$(call PARSE_ALL_KEYBOARDS)) + # If the rule starts with the name of a known keyboard, then continue + # the parsing from PARSE_KEYBOARD else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) + # Otherwise use the KEYBOARD variable, which is determined either by + # the current directory you run make from, or passed in as an argument else ifneq ($$(KEYBOARD),) $$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD))) else $$(info make: *** No rule to make target '$1'. Stop.) + # Notice the tab instead of spaces below! exit 1 endif endef # $1 = Keyboard +# Parses a rule in the format -- +# the keyboard is already known when entering this function define PARSE_KEYBOARD CURRENT_KB := $1 # A subproject is any keyboard subfolder with a makefile SUBPROJECTS := $$(notdir $$(patsubst %/Makefile,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/*/Makefile))) + # if the rule starts with allsp, then continue with looping over all subprojects ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allsp),true) $$(eval $$(call PARSE_ALL_SUBPROJECTS)) + # A special case for matching the defaultsp (default subproject) else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,defaultsp),true) $$(eval $$(call PARSE_SUBPROJECT,defaultsp)) + # If the rule starts with the name of a known subproject else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(SUBPROJECTS)),true) $$(eval $$(call PARSE_SUBPROJECT,$$(MATCHED_ITEM))) + # Try to use the SUBPROJECT variable, which is either determined by the + # directory which invoked make, or passed as an argument to make else ifneq ($$(SUBPROJECT),) $$(eval $$(call PARSE_SUBPROJECT,$$(SUBPROJECT))) + # If there's no matching subproject, we assume it's the default + # This will allow you to leave the subproject part of the target out else - # If there's no matching subproject, we assume it's the default - # This will allow you to leave the subproject part of the target out $$(eval $$(call PARSE_SUBPROJECT,defaultsp)) endif endef +# if we are going to compile all keyboards, match the rest of the rule +# for each of them define PARSE_ALL_KEYBOARDS $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(KEYBOARDS))) endef # $1 Subproject +# When entering this, the keyboard and subproject are known, so now we need +# to determine which keymaps are going to get compiled define PARSE_SUBPROJECT + # If we want to compile the default subproject, then we need to + # include the correct makefile to determine the actual name of it ifeq ($1,defaultsp) SUBPROJECT_DEFAULT= $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/Makefile) @@ -188,39 +247,54 @@ define PARSE_SUBPROJECT CURRENT_SP := $1 endif # If current subproject is empty (the default was not defined), and we have a list of subproject - # then make all + # then make all of them ifeq ($$(CURRENT_SP),) ifneq ($$(SUBPROJECTS),) CURRENT_SP := allsp endif endif + # The special allsp is handled later ifneq ($$(CURRENT_SP),allsp) + # get a list of all keymaps KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/keymaps/*/.))) ifneq ($$(CURRENT_SP),) + # if the subproject is defined, then also look for keymaps inside the subproject folder SP_KEYMAPS := $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/$$(CURRENT_SP)/keymaps/*/.))) KEYMAPS := $$(sort $$(KEYMAPS) $$(SP_KEYMAPS)) endif + # if the rule after removing the start of it is empty (we haven't specified a kemap or target) + # compile all the keymaps ifeq ($$(RULE),) $$(eval $$(call PARSE_ALL_KEYMAPS)) + # The same if allkm was specified else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkm),true) $$(eval $$(call PARSE_ALL_KEYMAPS)) + # Try to match the specified keyamp with the list of known keymaps else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true) $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM))) + # Otherwise try to match the keymap from the current folder, or arguments to the make command else ifneq ($$(KEYMAP),) $$(eval $$(call PARSE_KEYMAP,$$(KEYMAP))) else + # Otherwise something is wrong with the target + # Try to give as much information as possible of what it it was trying to do ifeq ($$(CURRENT_SP),) $$(info make: *** No rule to make target '$$(CURRENT_KB)-$$(RULE)'. Stop.) else $$(info make: *** No rule to make target '$$(CURRENT_KB)-$$(CURRENT_SP)-$$(RULE)'. Stop.) endif + # Notice the tab instead of spaces below! exit 1 endif else + # As earlier mentione,d when allsb is specified, we call our self recursively + # for all of the subprojects $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$(SUBPROJECTS))) endif endef +# If we want to parse all subprojects, but the keyboard doesn't have any, +# then use defaultsp instead define PARSE_ALL_SUBPROJECTS ifeq ($$(SUBPROJECTS),) $$(eval $$(call PARSE_SUBPROJECT,defaultsp)) @@ -230,27 +304,36 @@ define PARSE_ALL_SUBPROJECTS endef # $1 Keymap +# This is the meat of compiling a keyboard, when entering this, everything is known +# keyboard, subproject, and keymap +# Note that we are not directly calling the command here, but instead building a list, +# which will later be processed define PARSE_KEYMAP CURRENT_KM = $1 # The rest of the rule is the target # Remove the leading "-" from the target, as it acts as a separator MAKE_TARGET := $$(patsubst -%,%,$$(RULE)) + # We need to generate an unique indentifer to append to the COMMANDS list COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) COMMANDS += $$(COMMAND) + # If we are compiling a keyboard without a subproject, we want to display just the name + # of the keyboard, otherwise keyboard/subproject ifeq ($$(CURRENT_SP),) KB_SP := $(CURRENT_KB) else KB_SP := $(CURRENT_KB)/$$(CURRENT_SP) endif + # Format it in bold KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) + # Specify the variables that we are passing forward to submake MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) + # And the first part of the make command MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET) - MAKE_MSG := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR) - ifneq ($$(MAKE_TARGET),) - MAKE_MSG += and target $(BOLD)$$(MAKE_TARGET)$(NO_COLOR) - endif - MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}' + # The message to display + MAKE_MSG := $$(MSG_MAKE_KB) + # We run the command differently, depending on if we want more output or not + # The true version for silent output and the false version otherwise COMMAND_true_$$(COMMAND) := \ printf "$$(MAKE_MSG)" | \ $$(MAKE_MSG_FORMAT); \ @@ -267,10 +350,14 @@ define PARSE_KEYMAP $$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; endef +# Just parse all the keymaps for a specifc keyboard define PARSE_ALL_KEYMAPS $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS))) endef +# Set the silent mode depending on if we are trying to compile multiple keyboards or not +# By default it's on in that case, but it can be overriden by specifying silent=false +# from the command line define SET_SILENT_MODE ifdef SUB_IS_SILENT SILENT_MODE := $(SUB_IS_SILENT) @@ -291,9 +378,12 @@ SUBPROJECTS := $(notdir $(patsubst %/Makefile,%,$(wildcard ./*/Makefile))) .PHONY: $(SUBPROJECTS) $(SUBPROJECTS): %: %-allkm +# Let's match everything, we handle all the rule parsing ourselves .PHONY: % %: + # Check if we have the CMP tool installed cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; + # Check if the submodules are dirty, and display a warning if they are git submodule status --recursive 2>/dev/null | \ while IFS= read -r x; do \ case "$$x" in \ @@ -303,14 +393,20 @@ $(SUBPROJECTS): %: %-allkm done $(eval $(call PARSE_RULE,$@)) $(eval $(call SET_SILENT_MODE)) + # Run all the commands in the same shell, notice the + at the first line + # it has to be there to allow parallel execution of the submake + # This always tries to compile everything, even if error occurs in the middle + # But we return the error code at the end, to trigger travis failures +error_occured=0; \ $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) \ if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi +# All should compile everything .PHONY: all all: all-keyboards +# Define some shortcuts, mostly for compability with the old syntax .PHONY: all-keyboards all-keyboards: allkb-allsp-allkm @@ -318,6 +414,7 @@ all-keyboards: allkb-allsp-allkm all-keyboards-defaults: allkb-allsp-default +# Generate the version.h file GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) diff --git a/message.mk b/message.mk index f8fd387121..fb1a7a1f9a 100644 --- a/message.mk +++ b/message.mk @@ -31,7 +31,7 @@ PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $ PRINT_WARNING_PLAIN = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) PRINT_OK = $(SILENT) || printf " $(OK_STRING)" | $(AWK_STATUS) BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING); else $(PRINT_OK); fi; -MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR) +MAKE_MSG_FORMAT = $(AWK) '{ printf "%-118s", $$0;}' # Define Messages # English @@ -59,4 +59,13 @@ MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR)\n \ git submodule sync --recursive\n\ git submodule update --init --recursive$(NO_COLOR)\n\n\ You can ignore this warning if you are not compiling any ChibiOS keyboards,\n\ - or if you have modified the ChibiOS libraries yourself. \n\n \ No newline at end of file + or if you have modified the ChibiOS libraries yourself. \n\n +MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR) + +define GENERATE_MSG_MAKE_KB + MSG_MAKE_KB_ACTUAL := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR) + ifneq ($$(MAKE_TARGET),) + MSG_MAKE_KB_ACTUAL += and target $(BOLD)$$(MAKE_TARGET)$(NO_COLOR) + endif +endef +MSG_MAKE_KB = $(eval $(call GENERATE_MSG_MAKE_KB))$(MSG_MAKE_KB_ACTUAL) From 5febdb0a3c9e63d79d6695ebc1f58259669dd168 Mon Sep 17 00:00:00 2001 From: IBNobody Date: Sat, 20 Aug 2016 10:26:36 -0500 Subject: [PATCH 057/120] Initial Commmit --- keyboards/vision_division/Makefile | 75 ++++++++ keyboards/vision_division/config.h | 162 ++++++++++++++++++ .../vision_division/keymaps/default/Makefile | 21 +++ .../vision_division/keymaps/default/config.h | 8 + .../vision_division/keymaps/default/keymap.c | 44 +++++ .../vision_division/keymaps/default/readme.md | 1 + keyboards/vision_division/readme.md | 28 +++ keyboards/vision_division/vision_division.c | 28 +++ keyboards/vision_division/vision_division.h | 19 ++ tmk_core/rules.mk | 2 +- 10 files changed, 387 insertions(+), 1 deletion(-) create mode 100644 keyboards/vision_division/Makefile create mode 100644 keyboards/vision_division/config.h create mode 100644 keyboards/vision_division/keymaps/default/Makefile create mode 100644 keyboards/vision_division/keymaps/default/config.h create mode 100644 keyboards/vision_division/keymaps/default/keymap.c create mode 100644 keyboards/vision_division/keymaps/default/readme.md create mode 100644 keyboards/vision_division/readme.md create mode 100644 keyboards/vision_division/vision_division.c create mode 100644 keyboards/vision_division/vision_division.h diff --git a/keyboards/vision_division/Makefile b/keyboards/vision_division/Makefile new file mode 100644 index 0000000000..3f6d133c9b --- /dev/null +++ b/keyboards/vision_division/Makefile @@ -0,0 +1,75 @@ + + +# 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=512 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # 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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 + +ifndef QUANTUM_DIR + include ../../Makefile +endif + + diff --git a/keyboards/vision_division/config.h b/keyboards/vision_division/config.h new file mode 100644 index 0000000000..106cf384c3 --- /dev/null +++ b/keyboards/vision_division/config.h @@ -0,0 +1,162 @@ +/* +Copyright 2012 Jun Wako + +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 . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER You +#define PRODUCT vision_division +#define DESCRIPTION A custom keyboard + +/* key matrix size */ +#define MATRIX_ROWS 2 +#define MATRIX_COLS 3 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { D0, D5 } +#define MATRIX_COL_PINS { F1, F0, B0 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +// #define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +// #define BACKLIGHT_LEVELS 3 + + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +#endif diff --git a/keyboards/vision_division/keymaps/default/Makefile b/keyboards/vision_division/keymaps/default/Makefile new file mode 100644 index 0000000000..f4671a9d11 --- /dev/null +++ b/keyboards/vision_division/keymaps/default/Makefile @@ -0,0 +1,21 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +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 +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/vision_division/keymaps/default/config.h b/keyboards/vision_division/keymaps/default/config.h new file mode 100644 index 0000000000..df06a26206 --- /dev/null +++ b/keyboards/vision_division/keymaps/default/config.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here + +#endif \ No newline at end of file diff --git a/keyboards/vision_division/keymaps/default/keymap.c b/keyboards/vision_division/keymaps/default/keymap.c new file mode 100644 index 0000000000..599c2cb522 --- /dev/null +++ b/keyboards/vision_division/keymaps/default/keymap.c @@ -0,0 +1,44 @@ +#include "vision_division.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = KEYMAP( /* Base */ + KC_A, KC_1, KC_H, \ + KC_TAB, KC_SPC \ +), +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +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; + } + return MACRO_NONE; +}; + + +void matrix_init_user(void) { + +} + +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) { + +} \ No newline at end of file diff --git a/keyboards/vision_division/keymaps/default/readme.md b/keyboards/vision_division/keymaps/default/readme.md new file mode 100644 index 0000000000..bb0ed38622 --- /dev/null +++ b/keyboards/vision_division/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for vision_division \ No newline at end of file diff --git a/keyboards/vision_division/readme.md b/keyboards/vision_division/readme.md new file mode 100644 index 0000000000..0a637fd068 --- /dev/null +++ b/keyboards/vision_division/readme.md @@ -0,0 +1,28 @@ +vision_division keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme.md](/doc/readme.md). + +## Building + +Download or clone the whole firmware and navigate to the keyboards/vision_division 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`. + +### 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 a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. + +To build the firmware binary hex file with a keymap just do `make` with `keymap` option like: + +``` +$ make keymap=[default|jack|] +``` + +Keymaps follow the format **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/` \ No newline at end of file diff --git a/keyboards/vision_division/vision_division.c b/keyboards/vision_division/vision_division.c new file mode 100644 index 0000000000..eb9336fa33 --- /dev/null +++ b/keyboards/vision_division/vision_division.c @@ -0,0 +1,28 @@ +#include "vision_division.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + + led_set_user(usb_led); +} diff --git a/keyboards/vision_division/vision_division.h b/keyboards/vision_division/vision_division.h new file mode 100644 index 0000000000..d30fc84998 --- /dev/null +++ b/keyboards/vision_division/vision_division.h @@ -0,0 +1,19 @@ +#ifndef VISION_DIVISION_H +#define VISION_DIVISION_H + +#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 arguements +// The second converts the arguments into a two-dimensional array +#define KEYMAP( \ + k00, k01, k02, \ + k10, k11 \ +) \ +{ \ + { k00, k01, k02 }, \ + { k10, KC_NO, k11 }, \ +} + +#endif diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 86ad90f5d1..d2350f27c1 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -532,4 +532,4 @@ build elf hex eep lss sym coff extcoff check_submodule \ clean clean_list debug gdb-config show_path \ program teensy dfu flip dfu-ee flip-ee dfu-start \ all-keyboards-defaults all-keyboards all-keymaps \ -all-keyboards-defaults-% all-keyboards-% all-keymaps-% \ No newline at end of file +all-keyboards-defaults-% all-keyboards-% all-keymaps-% From 4807feec8a8ea51db40b881b5057784b2b00310b Mon Sep 17 00:00:00 2001 From: IBNobody Date: Sat, 20 Aug 2016 14:49:16 -0500 Subject: [PATCH 058/120] In Progress Merge --- keyboards/vision_division/Makefile | 11 +- keyboards/vision_division/config.h | 31 +++-- .../vision_division/keymaps/default/Makefile | 2 +- keyboards/vision_division/vision_division.h | 111 +++++++++++++++++- 4 files changed, 137 insertions(+), 18 deletions(-) diff --git a/keyboards/vision_division/Makefile b/keyboards/vision_division/Makefile index 3f6d133c9b..4f3130c483 100644 --- a/keyboards/vision_division/Makefile +++ b/keyboards/vision_division/Makefile @@ -1,8 +1,9 @@ # MCU name -#MCU = at90usb1287 -MCU = atmega32u4 +MCU = at90usb1286 +# MCU = at90usb1287 +# MCU = atmega32u4 # Processor frequency. # This will define a symbol, F_CPU, in all source code files equal to the @@ -47,13 +48,13 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Atmel DFU loader 4096 # LUFA bootloader 4096 # USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=512 +OPT_DEFS += -DBOOTLOADER_SIZE=1024 # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) +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) @@ -61,7 +62,7 @@ COMMAND_ENABLE ?= yes # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover +NKRO_ENABLE ?= yes # USB Nkey Rollover BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default MIDI_ENABLE ?= no # MIDI controls UNICODE_ENABLE ?= no # Unicode diff --git a/keyboards/vision_division/config.h b/keyboards/vision_division/config.h index 106cf384c3..1faea335ad 100644 --- a/keyboards/vision_division/config.h +++ b/keyboards/vision_division/config.h @@ -22,15 +22,21 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 +#define PRODUCT_ID 0x2525 #define DEVICE_VER 0x0001 #define MANUFACTURER You -#define PRODUCT vision_division -#define DESCRIPTION A custom keyboard +#define PRODUCT Vision Division +#define DESCRIPTION Split or Full Keyboard +#define MATRIX_EXTENDED /* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 +#ifdef MATRIX_EXTENDED + #define MATRIX_ROWS 6 + #define MATRIX_COLS 24 +#else + #define MATRIX_ROWS 6 + #define MATRIX_COLS 12 +#endif /* * Keyboard Matrix Assignments @@ -42,8 +48,19 @@ along with this program. If not, see . * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -#define MATRIX_ROW_PINS { D0, D5 } -#define MATRIX_COL_PINS { F1, F0, B0 } + +#ifdef MATRIX_EXTENDED + // Note that the extended colums are reversed because the second PCB has col 1 on the far right. + #define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 } + #define MATRIX_COL_PINS { C1, C0, E1, E0, F3, F2, F1, F0, B0, B1, B2, B3, E6, A4, A0, A1, A5, A2, A6, A3, A7, C4, C5, C7} +#else #ifdef MATRIX_LEFT + #define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 } + #define MATRIX_COL_PINS { C1, C0, E1, E0, F3, F2, F1, F0, B0, B1, B2, B3 } + + + #define MATRIX_COL_PINS { B3, B2, B1, B0, F0, F1, F2, F3, E0, E1, C0, C1 } +#endif + #define UNUSED_PINS /* COL2ROW or ROW2COL */ diff --git a/keyboards/vision_division/keymaps/default/Makefile b/keyboards/vision_division/keymaps/default/Makefile index f4671a9d11..43fee26686 100644 --- a/keyboards/vision_division/keymaps/default/Makefile +++ b/keyboards/vision_division/keymaps/default/Makefile @@ -2,7 +2,7 @@ # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +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 = no # Console for debug(+400) diff --git a/keyboards/vision_division/vision_division.h b/keyboards/vision_division/vision_division.h index d30fc84998..deeb85c1fb 100644 --- a/keyboards/vision_division/vision_division.h +++ b/keyboards/vision_division/vision_division.h @@ -7,13 +7,114 @@ // The following is an example using the Planck MIT layout // The first section contains all of the arguements // The second converts the arguments into a two-dimensional array -#define KEYMAP( \ - k00, k01, k02, \ - k10, k11 \ +#define KEYMAP_EXTENDED( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ + k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ + k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ ) \ { \ - { k00, k01, k02 }, \ - { k10, KC_NO, k11 }, \ + { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C },\ + { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C },\ + { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C },\ + { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C },\ + { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C },\ + { k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C },\ } +#define KEYMAP_LEFT( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ + k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ + k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ +) \ +{ \ + { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C },\ + { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C },\ + { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C },\ + { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C },\ + { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C },\ + { k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C },\ +} + +#define KEYMAP_RIGHT( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ + k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ + k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ +) \ +{ \ + { k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C },\ + { k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C },\ + { k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C },\ + { k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C },\ + { k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C },\ + { k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C },\ +} + +#ifdef MATRIX_EXTENDED +#define KEYMAP( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ + k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ + k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ +) \ +KEYMAP_EXTENDED( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ + k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ + k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ +) +#endif + +#ifdef MATRIX_LEFT +#define KEYMAP( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ + k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ + k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ +) \ +KEYMAP_LEFT( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ + k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ + k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ +) +#endif + +#ifdef MATRIX_RIGHT +#define KEYMAP( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ + k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ + k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ +) \ +KEYMAP_RIGHT( \ + k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ + k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ + k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ + k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ + k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ + k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ +) + +#endif + + #endif From 1c69acb7d518893ee77e326342d4603da87470e5 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 21 Aug 2016 13:10:34 +0300 Subject: [PATCH 059/120] Add longest match to the rule-checking This fixes cases where you have several keyboards with a common prefix, like algernon, and algernon-master --- Makefile | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d70ac9a3b8..c8122e5765 100644 --- a/Makefile +++ b/Makefile @@ -152,16 +152,55 @@ COMPARE_AND_REMOVE_FROM_RULE = $(eval $(call COMPARE_AND_REMOVE_FROM_RULE_HELPER # $1 The list to be checked # If a match is found, then RULE_FOUND is set to true # and MATCHED_ITEM to the item that was matched -define TRY_TO_MATCH_RULE_FROM_LIST_HELPER +define TRY_TO_MATCH_RULE_FROM_LIST_HELPER3 ifneq ($1,) ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1)),true) MATCHED_ITEM := $$(firstword $1) else - $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$$(wordlist 2,9999,$1))) + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$$(wordlist 2,9999,$1))) endif endif endef +# A recursive helper function for finding the longest match +# $1 The list to be checed +# It works by always removing the currently matched item from the list +# and call itself recursively, until a match is found +define TRY_TO_MATCH_RULE_FROM_LIST_HELPER2 + # Stop the recursion when the list is empty + ifneq ($1,) + RULE_BEFORE := $$(RULE) + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$1)) + # If a match is found in the current list, otherwise just return what we had before + ifeq ($$(RULE_FOUND),true) + # Save the best match so far and call itself recursivel + BEST_MATCH := $$(MATCHED_ITEM) + BEST_MATCH_RULE := $$(RULE) + RULE_FOUND := false + RULE := $$(RULE_BEFORE) + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER2,$$(filter-out $$(MATCHED_ITEM),$1))) + endif + endif +endef + + +# Recursively try to find the longest match for the start of the rule to be checked +# $1 The list to be checked +# If a match is found, then RULE_FOUND is set to true +# and MATCHED_ITEM to the item that was matched +define TRY_TO_MATCH_RULE_FROM_LIST_HELPER + BEST_MATCH := + $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER2,$1)) + ifneq ($$(BEST_MATCH),) + RULE_FOUND := true + RULE := $$(BEST_MATCH_RULE) + MATCHED_ITEM := $$(BEST_MATCH) + else + RULE_FOUND := false + MATCHED_ITEM := + endif +endef + # Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST TRY_TO_MATCH_RULE_FROM_LIST = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$1))$(RULE_FOUND) From 8f16403179dde51af1826fbc9b65ce0e29fd33ad Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 21 Aug 2016 13:53:36 +0300 Subject: [PATCH 060/120] Change order of variable assignment BUILD_DIR and TARGET was assigned too late, so the dfu-util target, which depends on them did not work. --- build_keyboard.mk | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index e8d8f3572b..a2a2871e6e 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -16,6 +16,19 @@ LIB_PATH = $(TOP_DIR)/lib QUANTUM_DIR = quantum QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR) +BUILD_DIR := $(TOP_DIR)/.build + +ifneq ($(SUBPROJECT),) + TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP) + KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)_$(SUBPROJECT) +else + TARGET ?= $(KEYBOARD)_$(KEYMAP) + KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD) +endif + +# Force expansion +TARGET := $(TARGET) + MASTER ?= left ifdef master @@ -93,15 +106,6 @@ else $(error "$(MAIN_KEYMAP_C)/keymap.c" does not exist) endif -BUILD_DIR = $(TOP_DIR)/.build - -ifneq ($(SUBPROJECT),) - TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP) - KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD)_$(SUBPROJECT) -else - TARGET ?= $(KEYBOARD)_$(KEYMAP) - KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD) -endif # Object files directory # To put object files in current directory, use a dot (.), do NOT make From d7b6d74842cb8c0406996e1a890c40c23b063bb6 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Sun, 21 Aug 2016 23:20:24 +0200 Subject: [PATCH 061/120] - Inverted key Tab and Esc - Reorganised bottom row --- keyboards/planck/keymaps/dbroqua/keymap.c | 24 ++++++++++---------- keyboards/planck/keymaps/dbroqua/layout.png | Bin 20479 -> 21724 bytes 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c index 3d89ff1d34..e02d98f6ae 100644 --- a/keyboards/planck/keymaps/dbroqua/keymap.c +++ b/keyboards/planck/keymaps/dbroqua/keymap.c @@ -17,7 +17,7 @@ extern keymap_config_t keymap_config; #define _QWERTY 0 #define _LOWER 1 #define _RAISE 2 -#define _ESC 3 +#define _MULTIMEDIA 3 #define _ADJUST 4 enum planck_keycodes { @@ -32,31 +32,31 @@ enum planck_keycodes { #define XXXXXXX KC_NO // Func macro definitions. -#define SFT_ESC FUNC(0) // Tap for Enter, hold for Shift +#define SFT_TAB FUNC(0) // Tap for Enter, hold for Shift // Enable these functions using FUNC(n) macro. const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_TAP_KEY(_ESC, KC_ESC) + [0] = ACTION_LAYER_TAP_KEY(_MULTIMEDIA, KC_TAB) }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty * ,-----------------------------------------------------------------------------------. - * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp | + * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Esc | A | S | D | F | G | H | J | K | L | ; | " | + * | Tab | A | S | D | F | G | H | J | K | L | ; | " | * |------+------+------+------+------+------+------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | GUI | Lower| Raise| Alt | Space |AltGr | Left | Down | Up |Right | + * | Ctrl | GUI | AltGr| Alt | Lower| Space | Raise| Left | Down | Up |Right | * `-----------------------------------------------------------------------------------' */ [_QWERTY] = { - {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, - {SFT_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, - {KC_LCTL, KC_LGUI, LOWER, RAISE, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT} + {KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, + {SFT_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, + {KC_LCTL, KC_LGUI, KC_RALT, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT} }, /* Lower @@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} }, -/* Esc +/* _MULTIMEDIA * ,-----------------------------------------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | Prev | Play | Next | Del | * `-----------------------------------------------------------------------------------' */ -[_ESC] = { +[_MULTIMEDIA] = { {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD, _______, _______, _______, KC_INS}, diff --git a/keyboards/planck/keymaps/dbroqua/layout.png b/keyboards/planck/keymaps/dbroqua/layout.png index 0deafefe2730d056941450918b4424b41043cd3c..846a385f0a497400c6dc0614dda641d0095d499b 100644 GIT binary patch literal 21724 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 b|ICa{jEY~D@cm(6U|{fc^>bP0l+XkKP8rPW From 705c775a4a433249081321cea0c2def2627817dc Mon Sep 17 00:00:00 2001 From: IBNobody Date: Sun, 21 Aug 2016 22:05:55 -0500 Subject: [PATCH 062/120] Nightly Only major change to qmk was the addition of A0-A7 pins for the AT90USB --- .../vision_division/Potential Layouts.txt | 84 +++++++++ keyboards/vision_division/config.h | 44 +---- .../vision_division/keymaps/default/config.h | 36 +++- .../vision_division/keymaps/default/keymap.c | 28 ++- keyboards/vision_division/matrix_types.h | 167 ++++++++++++++++++ keyboards/vision_division/vision_division.h | 114 ------------ quantum/config_common.h | 9 + 7 files changed, 321 insertions(+), 161 deletions(-) create mode 100644 keyboards/vision_division/Potential Layouts.txt create mode 100644 keyboards/vision_division/matrix_types.h diff --git a/keyboards/vision_division/Potential Layouts.txt b/keyboards/vision_division/Potential Layouts.txt new file mode 100644 index 0000000000..f715ac8c65 --- /dev/null +++ b/keyboards/vision_division/Potential Layouts.txt @@ -0,0 +1,84 @@ +/* Numeric Max / Numeric Normal - Full Grid + * .-----------------------------------. .--------------------------------------------------------------_--------------------------------------------------------------. .-----------------------------------. + * | | | | | | | | | | | | | | | | | | | | | | | | | + * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' + * .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. + * | | | | | | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| + * | | | | | | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| + * | | | | | o | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| + * | | | | | | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| + * | | | | | | | | | | | | | | | | | | | | | | | | | + * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' + */ + +//* Numeric Max / Homing Normal - Full Grid + * .-----------------------------------. .--------------------------------------------------------------_--------------------------------------------------------------. .--------------------------. + * | | | | | | | | | | | | | | | | | | | | | | | | + * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '--------------------------' + * .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .--------------------------. + * | | | | | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| + * | | | | | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| + * | | | | | o | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| + * | | | | | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| + * | | | | | | | | | | | | | | | | | | | | | | | | + * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '--------------------------' + */ + +//* Numeric Max / Homing Normal - Traditional + * .-----------------------------------. .-----------------------------------. .-----------------_-----------------. .-----------------------------------. .--------------------------. + * | | | | | | | | | | | | | | | | | | | | | | | | + * '-----------------------------------' '-----------------------------------' '-----------------------------------' '-----------------------------------' '--------------------------' + * .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .--------------------------. + * | | | | | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| + * | | | | | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+ | o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| '--------+--------+--------' + * | | | | | o | | | | | | | | | | | | | | | + * |--------+--------+--------+--------| o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| .--------. + * | | | | | | | | | | | | | | | | | | | | + * |--------+--------+--------+ | |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| .--------+--------+--------. + * | | | | | | | | | | | | | | | | | | | | | | + * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '--------------------------' + */ + +/* Numeric Max / Numeric Normal + * .-----------------------------------. .--------------------------------------------------------------_--------------------------------------------------------------. .-----------------------------------. + * | | | | | | | | | | | | | | | | | | | | | | | | | + * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' + * .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. + * | | | | | | 1U / 2U | | | | | | | | | | | 1U / 2U | | | | | | + * |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| + * | 1U | | | 1U | | | | | | | | | | | | | | | | | 1U | | | 1U | + * | / +--------+--------+ / | o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | / +--------+--------+ / | + * | 2U | | | 2U | o | 1U / 2U | | | | | | | | | | | | | 2U | | | 2U | + * |--------+--------+--------+--------| o |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |--------+--------+--------+--------| + * | | | | | | 1U / 2U | | | | | | | | | | | 1U / 2U | | | | | | + * | '--------+--------' | |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | '--------+--------' | + * | 1U / 2UH / 2UV | 1U / 2UH / 2UV | | | | | | | | 1U / 2U | | | | | | | | 1U / 2UH / 2UV | 1U / 2UH / 2UV | + * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' + */ + +/* Numeric Max / Numeric Max + * .-----------------------------------. .-----------------------------------------------------------------------_-----------------------------------------------------------------------. .-----------------------------------. + * | | | | | | | | | | | | | | | | | | | | | | | | | | | + * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' + * .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------------------------. .-----------------------------------. + * | | | | | | 1U / 2U | | | | | | | | | | | | | 1U / 2U | | | | | | + * |--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------| + * | 1U | | | 1U | | | | | | | | | | | | | | | | | | | 1U | | | 1U | + * | / +--------+--------+ / | o |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | / +--------+--------+ / | + * | 2U | | | 2U | o | 1U / 2U | | | | | | | | | | | | | | | 2U | | | 2U | + * |--------+--------+--------+--------| o |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| |--------+--------+--------+--------| + * | | | | | | 1U / 2U | | | | | | | | | | | | | 1U / 2U | | | | | | + * | '--------+--------' | |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| | '--------+--------' | + * | 1U / 2UH / 2UV | 1U / 2UH / 2UV | | | | | | | | 1U / 2U | 1U / 2U | | | | | | | | 1U / 2UH / 2UV | 1U / 2UH / 2UV | + * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------------------------' '-----------------------------------' + */ diff --git a/keyboards/vision_division/config.h b/keyboards/vision_division/config.h index 1faea335ad..37b834973c 100644 --- a/keyboards/vision_division/config.h +++ b/keyboards/vision_division/config.h @@ -20,52 +20,12 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x2525 -#define DEVICE_VER 0x0001 -#define MANUFACTURER You -#define PRODUCT Vision Division -#define DESCRIPTION Split or Full Keyboard -#define MATRIX_EXTENDED +// Due to the configurability of this keyboard, matrix sizes are determined in the keymap's config.h -/* key matrix size */ -#ifdef MATRIX_EXTENDED - #define MATRIX_ROWS 6 - #define MATRIX_COLS 24 -#else - #define MATRIX_ROWS 6 - #define MATRIX_COLS 12 -#endif - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#ifdef MATRIX_EXTENDED - // Note that the extended colums are reversed because the second PCB has col 1 on the far right. - #define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 } - #define MATRIX_COL_PINS { C1, C0, E1, E0, F3, F2, F1, F0, B0, B1, B2, B3, E6, A4, A0, A1, A5, A2, A6, A3, A7, C4, C5, C7} -#else #ifdef MATRIX_LEFT - #define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 } - #define MATRIX_COL_PINS { C1, C0, E1, E0, F3, F2, F1, F0, B0, B1, B2, B3 } - - - #define MATRIX_COL_PINS { B3, B2, B1, B0, F0, F1, F2, F3, E0, E1, C0, C1 } -#endif - -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - + // #define BACKLIGHT_PIN B7 // #define BACKLIGHT_BREATHING // #define BACKLIGHT_LEVELS 3 diff --git a/keyboards/vision_division/keymaps/default/config.h b/keyboards/vision_division/keymaps/default/config.h index df06a26206..c005aa8c5a 100644 --- a/keyboards/vision_division/keymaps/default/config.h +++ b/keyboards/vision_division/keymaps/default/config.h @@ -2,7 +2,41 @@ #define CONFIG_USER_H #include "../../config.h" +#include "matrix_types.h" -// place overrides here + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID GET_PID(NUMERIC_MAX_TEENSY, NUMERIC_MAX) +#define DEVICE_VER 0x0001 +#define MANUFACTURER IBNobody +#define PRODUCT Vision Division +#define DESCRIPTION Full / Split Keyboard + + +#define MATRIX_ROWS 6 +#define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 } + +#define MATRIX_COLS GET_MATRIX_COLS(NUMERIC_MAX_TEENSY, NUMERIC_MAX) +#define MATRIX_COL_PINS GET_MATRIX_COL_PINS(NUMERIC_MAX_TEENSY, NUMERIC_MAX) + +#define UNUSED_PINS + +#define KEYMAP( \ + k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C, \ + k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C, \ + k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C, \ + k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C, \ + k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C, \ + k601, k602, k603, k604, k605, k606, k607, k608, k609, k60A, k60B, k60C, k611, k612, k613, k614, k615, k616, k617, k618, k619, k61A, k61B, k61C \ +) \ +KEYMAP_MASTER(NUMERIC_MAX_TEENSY, NUMERIC_MAX, \ + k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C, \ + k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C, \ + k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C, \ + k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C, \ + k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C, \ + k601, k602, k603, k604, k605, k606, k607, k608, k609, k60A, k60B, k60C, k611, k612, k613, k614, k615, k616, k617, k618, k619, k61A, k61B, k61C \ +) \ #endif \ No newline at end of file diff --git a/keyboards/vision_division/keymaps/default/keymap.c b/keyboards/vision_division/keymaps/default/keymap.c index 599c2cb522..3fddee78b7 100644 --- a/keyboards/vision_division/keymaps/default/keymap.c +++ b/keyboards/vision_division/keymaps/default/keymap.c @@ -1,10 +1,30 @@ #include "vision_division.h" + + + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Base */ - KC_A, KC_1, KC_H, \ - KC_TAB, KC_SPC \ -), + + [0] = KEYMAP( \ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_A, KC_B, KC_C, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_A, KC_B, KC_C, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_A, KC_B, KC_C, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 \ +) + +/* + KC_VOLU, KC_MUTE, KC_VOLU, KC_F24, KC_F20, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 k119, k11A, k11B, k11C, \ + KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, k219, k21A, k21B, k21C, \ + KC_KP_7, KC_KP_8, KC_KP_9, KC_F23, KC_F19, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, k319, k31A, k31B, k31C, \ + KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_F18, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP, k419, k41A, k41B, k41C, \ + KC_KP_1, KC_KP_2, KC_KP_3, KC_F22, KC_F17, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN, k519, k51A, k51B, k51C. \ + KC_KP_0, KC_F21, KC_PDOT, KC_PENT, KC_F16, KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, k619, k61A, k61B, k61C \ + + ) //-----, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, + +*/ }; const uint16_t PROGMEM fn_actions[] = { diff --git a/keyboards/vision_division/matrix_types.h b/keyboards/vision_division/matrix_types.h new file mode 100644 index 0000000000..d40b2079a6 --- /dev/null +++ b/keyboards/vision_division/matrix_types.h @@ -0,0 +1,167 @@ +#ifndef MATRIX_TYPES_H +#define MATRIX_TYPES_H + +// Because the vision/division keyboard allows for multiple PCB configurations, the configuration +// can get tricky. The PCB itself has 12 columns, but to achieve a full sized 14-column keyboard +// with a 4-column numeric pad on the left and a 3-column homing key cluster on the right, the +// right PCB must have its rightmost column cut off. Also either the rightmost two columns on the +// left PCB or the leftmost two columns on the right PCB need to be cut away. +// +// _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ +// Left Numeric Max = 1 2 3 4 _ 5 6 7 8 9 0 A B C +// Left Homing Max = 2 3 4 _ 5 6 7 8 9 0 A B C +// Left Numeric Extended = 1 2 3 4 _ 5 6 7 8 9 0 A B +// Left Homing Extended = 2 3 4 _ 5 6 7 8 9 0 A B +// Left Numeric Normal = 1 2 3 4 _ 5 6 7 8 9 0 A +// Left Homing Normal = 2 3 4 _ 5 6 7 8 9 0 A +// Right Numeric Max = 1 2 3 4 5 6 7 8 _ 9 A B C +// Right Homing Max = 1 2 3 4 5 6 7 8 _ 9 A B +// Right Numeric Extended = 2 3 4 5 6 7 8 _ 9 A B C +// Right Homing Extended = 2 3 4 5 6 7 8 _ 9 A B +// Right Numeric Normal = 3 4 5 6 7 8 _ 9 A B C +// Right Homing Normal = 3 4 5 6 7 8 _ 9 A B +// +// +// A full keyboard would look like this: +// +// _Left_Numeric_Max__________|_Right_Homing_Normal +// 1 2 3 4 _ 5 6 7 8 9 0 A B C|3 4 5 6 7 8 _ 9 A B +// +// The ideal full keyboard would use a normal and max rather than two extended because the max +// size allows for a centered 2U space key. + + +#define MATRIX_TYPE_ABSENT 0 +#define MATRIX_TYPE_NUMERIC_MAX 1 +#define MATRIX_TYPE_HOMING_MAX 2 +#define MATRIX_TYPE_NUMERIC_EXTENDED 3 +#define MATRIX_TYPE_HOMING_EXTENDED 4 +#define MATRIX_TYPE_NUMERIC_NORMAL 5 +#define MATRIX_TYPE_HOMING_NORMAL 6 +#define MATRIX_TYPE_NUMERIC_MAX_TEENSY 7 +#define MATRIX_TYPE_HOMING_MAX_TEENSY 8 +#define MATRIX_TYPE_NUMERIC_EXTENDED_TEENSY 9 +#define MATRIX_TYPE_HOMING_EXTENDED_TEENSY 10 +#define MATRIX_TYPE_NUMERIC_NORMAL_TEENSY 11 +#define MATRIX_TYPE_HOMING_NORMAL_TEENSY 12 + + +// Column Length + +#define MATRIX_COLS_ABSENT 0 +#define MATRIX_COLS_NUMERIC_MAX 12 +#define MATRIX_COLS_HOMING_MAX 11 +#define MATRIX_COLS_NUMERIC_EXTENDED 11 +#define MATRIX_COLS_HOMING_EXTENDED 10 +#define MATRIX_COLS_NUMERIC_NORMAL 10 +#define MATRIX_COLS_HOMING_NORMAL 9 +#define MATRIX_COLS_NUMERIC_MAX_TEENSY 12 +#define MATRIX_COLS_HOMING_MAX_TEENSY 11 +#define MATRIX_COLS_NUMERIC_EXTENDED_TEENSY 11 +#define MATRIX_COLS_HOMING_EXTENDED_TEENSY 10 +#define MATRIX_COLS_NUMERIC_NORMAL_TEENSY 10 +#define MATRIX_COLS_HOMING_NORMAL_TEENSY 9 + +// Left PCB Pin assignments + +#define MATRIX_COL_PINS_LEFT_ABSENT + +#define MATRIX_COL_PINS_LEFT_NUMERIC_MAX C7, C5, C4, A7, A3, A6, A2, A5, A1, A0, A4, E6 +#define MATRIX_COL_PINS_LEFT_HOMING_MAX C5, C4, A7, A3, A6, A2, A5, A1, A0, A4, E6 +#define MATRIX_COL_PINS_LEFT_NUMERIC_EXTENDED C7, C5, C4, A7, A3, A6, A2, A5, A1, A0, A4 +#define MATRIX_COL_PINS_LEFT_HOMING_EXTENDED C5, C4, A7, A3, A6, A2, A5, A1, A0, A4 +#define MATRIX_COL_PINS_LEFT_NUMERIC_NORMAL C7, C5, C4, A7, A3, A6, A2, A5, A1, A0 +#define MATRIX_COL_PINS_LEFT_HOMING_NORMAL C5, C4, A7, A3, A6, A2, A5, A1, A0 + +#define MATRIX_COL_PINS_LEFT_NUMERIC_MAX_TEENSY C1, C0, E1, E0, F3, F2, F1, F0, B0, B1, B2, B3 +#define MATRIX_COL_PINS_LEFT_HOMING_MAX_TEENSY C0, E1, E0, F3, F2, F1, F0, B0, B1, B2, B3 +#define MATRIX_COL_PINS_LEFT_NUMERIC_EXTENDED_TEENSY C1, C0, E1, E0, F3, F2, F1, F0, B0, B1, B2 +#define MATRIX_COL_PINS_LEFT_HOMING_EXTENDED_TEENSY C0, E1, E0, F3, F2, F1, F0, B0, B1, B2 +#define MATRIX_COL_PINS_LEFT_NUMERIC_NORMAL_TEENSY C1, C0, E1, E0, F3, F2, F1, F0, B0, B1 +#define MATRIX_COL_PINS_LEFT_HOMING_NORMAL_TEENSY C0, E1, E0, F3, F2, F1, F0, B0, B1 + +// Right PCB Pin assignments + +#define MATRIX_COL_PINS_RIGHT_ABSENT + +#define MATRIX_COL_PINS_RIGHT_NUMERIC_MAX E6, A4, A0, A1, A5, A2, A6, A3, A7, C4, C5, C7 +#define MATRIX_COL_PINS_RIGHT_HOMING_MAX E6, A4, A0, A1, A5, A2, A6, A3, A7, C4, C5 +#define MATRIX_COL_PINS_RIGHT_NUMERIC_EXTENDED A4, A0, A1, A5, A2, A6, A3, A7, C4, C5, C7 +#define MATRIX_COL_PINS_RIGHT_HOMING_EXTENDED A4, A0, A1, A5, A2, A6, A3, A7, C4, C5 +#define MATRIX_COL_PINS_RIGHT_NUMERIC_NORMAL A0, A1, A5, A2, A6, A3, A7, C4, C5, C7 +#define MATRIX_COL_PINS_RIGHT_HOMING_NORMAL A0, A1, A5, A2, A6, A3, A7, C4, C5 + +#define MATRIX_COL_PINS_RIGHT_NUMERIC_MAX_TEENSY B3, B2, B1, B0, F0, F1, F2, F3, E0, E1, C0, C1 +#define MATRIX_COL_PINS_RIGHT_HOMING_MAX_TEENSY B3, B2, B1, B0, F0, F1, F2, F3, E0, E1, C0 +#define MATRIX_COL_PINS_RIGHT_NUMERIC_EXTENDED_TEENSY B2, B1, B0, F0, F1, F2, F3, E0, E1, C0, C1 +#define MATRIX_COL_PINS_RIGHT_HOMING_EXTENDED_TEENSY B2, B1, B0, F0, F1, F2, F3, E0, E1, C0 +#define MATRIX_COL_PINS_RIGHT_NUMERIC_NORMAL_TEENSY B1, B0, F0, F1, F2, F3, E0, E1, C0, C1 +#define MATRIX_COL_PINS_RIGHT_HOMING_NORMAL_TEENSY B1, B0, F0, F1, F2, F3, E0, E1, C0 + +// Fetch Macros + +#define GET_PID(LEFT_TYPE, RIGHT_TYPE) ( ( ( MATRIX_TYPE_ ## LEFT_TYPE ) << 8 ) + ( MATRIX_TYPE_ ## RIGHT_TYPE ) ) +#define GET_MATRIX_COL(TYPE) MATRIX_COLS_ ## TYPE +#define GET_MATRIX_COLS(LEFT_TYPE, RIGHT_TYPE) ( ( GET_MATRIX_COL(LEFT_TYPE) ) + ( GET_MATRIX_COL(RIGHT_TYPE) ) ) +#define GET_MATRIX_COL_PINS(LEFT_TYPE, RIGHT_TYPE) { MATRIX_COL_PINS_LEFT_ ## LEFT_TYPE, MATRIX_COL_PINS_RIGHT_ ## RIGHT_TYPE } + +// Specialized Row Macros + +#define KEYMAP_ROW_LEFT_ABSENT( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) + +#define KEYMAP_ROW_LEFT_NUMERIC_MAX( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_LEFT_HOMING_MAX( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_LEFT_NUMERIC_EXTENDED( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B +#define KEYMAP_ROW_LEFT_HOMING_EXTENDED( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B +#define KEYMAP_ROW_LEFT_NUMERIC_NORMAL( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A +#define KEYMAP_ROW_LEFT_HOMING_NORMAL( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A +#define KEYMAP_ROW_LEFT_NUMERIC_MAX_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_LEFT_HOMING_MAX_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_LEFT_NUMERIC_EXTENDED_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B +#define KEYMAP_ROW_LEFT_HOMING_EXTENDED_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B +#define KEYMAP_ROW_LEFT_NUMERIC_NORMAL_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A +#define KEYMAP_ROW_LEFT_HOMING_NORMAL_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A + +#define KEYMAP_ROW_RIGHT_ABSENT( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) + +#define KEYMAP_ROW_RIGHT_NUMERIC_MAX( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_RIGHT_HOMING_MAX( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B +#define KEYMAP_ROW_RIGHT_NUMERIC_EXTENDED( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_RIGHT_HOMING_EXTENDED( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B +#define KEYMAP_ROW_RIGHT_NUMERIC_NORMAL( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_RIGHT_HOMING_NORMAL( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k03, k04, k05, k06, k07, k08, k09, k0A, k0B +#define KEYMAP_ROW_RIGHT_NUMERIC_MAX_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_RIGHT_HOMING_MAX_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B +#define KEYMAP_ROW_RIGHT_NUMERIC_EXTENDED_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_RIGHT_HOMING_EXTENDED_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B +#define KEYMAP_ROW_RIGHT_NUMERIC_NORMAL_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C +#define KEYMAP_ROW_RIGHT_HOMING_NORMAL_TEENSY( k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C) k03, k04, k05, k06, k07, k08, k09, k0A, k0B + +// Changable Row Macro + +#define KEYMAP_ROW(LEFT_TYPE, RIGHT_TYPE, \ + k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ +) \ +KEYMAP_ROW_LEFT_ ## LEFT_TYPE(k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C), KEYMAP_ROW_RIGHT_ ## RIGHT_TYPE(k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C) + +// Changable Master Macro + +#define KEYMAP_MASTER(LEFT_TYPE, RIGHT_TYPE, \ + k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C, \ + k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C, \ + k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C, \ + k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C, \ + k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C, \ + k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ +) \ +{ \ + { KEYMAP_ROW(LEFT_TYPE, RIGHT_TYPE, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C ) },\ + { KEYMAP_ROW(LEFT_TYPE, RIGHT_TYPE, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C ) },\ + { KEYMAP_ROW(LEFT_TYPE, RIGHT_TYPE, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C ) },\ + { KEYMAP_ROW(LEFT_TYPE, RIGHT_TYPE, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C ) },\ + { KEYMAP_ROW(LEFT_TYPE, RIGHT_TYPE, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C ) },\ + { KEYMAP_ROW(LEFT_TYPE, RIGHT_TYPE, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C ) },\ +} + + +#endif // MATRIX_TYPES_H \ No newline at end of file diff --git a/keyboards/vision_division/vision_division.h b/keyboards/vision_division/vision_division.h index deeb85c1fb..a1f3195e9e 100644 --- a/keyboards/vision_division/vision_division.h +++ b/keyboards/vision_division/vision_division.h @@ -3,118 +3,4 @@ #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 arguements -// The second converts the arguments into a two-dimensional array -#define KEYMAP_EXTENDED( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ -) \ -{ \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C },\ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C },\ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C },\ - { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C },\ - { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C },\ - { k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C },\ -} - -#define KEYMAP_LEFT( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ -) \ -{ \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C },\ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C },\ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C },\ - { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C },\ - { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C },\ - { k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C },\ -} - -#define KEYMAP_RIGHT( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ -) \ -{ \ - { k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C },\ - { k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C },\ - { k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C },\ - { k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C },\ - { k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C },\ - { k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C },\ -} - -#ifdef MATRIX_EXTENDED -#define KEYMAP( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ -) \ -KEYMAP_EXTENDED( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ -) -#endif - -#ifdef MATRIX_LEFT -#define KEYMAP( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ -) \ -KEYMAP_LEFT( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ -) -#endif - -#ifdef MATRIX_RIGHT -#define KEYMAP( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ -) \ -KEYMAP_RIGHT( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k110, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k210, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k310, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k410, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k510, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C \ -) - -#endif - - #endif diff --git a/quantum/config_common.h b/quantum/config_common.h index 09a4fe7010..7ef4b23d48 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -45,6 +45,15 @@ #define F5 0xF5 #define F6 0xF6 #define F7 0xF7 +#define A0 0xA0 +#define A1 0xA1 +#define A2 0xA2 +#define A3 0xA3 +#define A4 0xA4 +#define A5 0xA5 +#define A6 0xA6 +#define A7 0xA7 + /* USART configuration */ #ifdef BLUETOOTH_ENABLE From 0418ecc073d420fff3be2603bfb7a6fa234bd357 Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Mon, 22 Aug 2016 10:26:18 -0600 Subject: [PATCH 063/120] Changes from review by @fredizzimo and @Xyverz --- keyboards/ergodox/readme.md | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md index 349a0ce40c..304f2b01f2 100644 --- a/keyboards/ergodox/readme.md +++ b/keyboards/ergodox/readme.md @@ -1,18 +1,3 @@ -# Keymap Options - -There are external tools for customizing the layout, but those do not use -the featurs of this qmk firmware. These sites include: - - - [Massdrop configurator](https://keyboard-configurator.massdrop.com/ext/ergodox) for Ez - - [Input Club configurator](https://input.club/configurator-ergodox) for Infinity, provides left and right files - -You can also find an existing firmware that you like, for example from: - - - [Dozens of community-contributed keymaps](http://qmk.fm/keyboards/ergodox/) - -This qmk firmware also provides the ability to customize keymaps, but requires -a toolchain to build the firmware. See below for instructions on building -firmware and customizing keymaps. # Customizing Keymaps @@ -94,8 +79,6 @@ To flash the firmware: The Infinity is two completely independent keyboards, and needs to be flashed for the left and right halves seperately. To flash them: - - Remove the build directory with `rm -rf ../../.build` - - Build the firmware with `make keymap=keymapname subproject=infinity` - Plug in the left hand keyboard only. @@ -104,8 +87,6 @@ for the left and right halves seperately. To flash them: - Install the firmware with `sudo make dfu-util keymap=keymapname subproject=infinity` - - Remove the left-hand build with `rm -rf ../../.build` - - Build left hand firmware with `make keymap=keymapname subproject=infinity MASTER=right` - Plug in the right hand keyboard only. @@ -133,3 +114,19 @@ Let's say you want a certain key in your layout to send a colon; to figure out w That file contains a big list of all of the special, fancy keys (like, being able to send % on its own and whatnot). If you want to send a plain vanilla key, you can look up its code under `doc/keycode.txt`. That's where all the boring keys hang out. + +# Other Firmware Options + +There are external tools for customizing the layout, but those do not use +the featurs of this qmk firmware. These sites include: + + - [Massdrop configurator](https://keyboard-configurator.massdrop.com/ext/ergodox) for Ez + - [Input Club configurator](https://input.club/configurator-ergodox) for Infinity, provides left and right files + +You can also find an existing firmware that you like, for example from: + + - [Dozens of community-contributed keymaps](http://qmk.fm/keyboards/ergodox/) + +This qmk firmware also provides the ability to customize keymaps, but requires +a toolchain to build the firmware. See below for instructions on building +firmware and customizing keymaps. From 92fe78a5ea98cc8ca36d74ce86c24fe284729c39 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Mon, 22 Aug 2016 21:19:03 +0200 Subject: [PATCH 064/120] - Added PrintScreen key on multimedia layer --- keyboards/planck/keymaps/dbroqua/keymap.c | 4 ++-- keyboards/planck/keymaps/dbroqua/layout.png | Bin 21724 -> 21895 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c index e02d98f6ae..33929cb3af 100644 --- a/keyboards/planck/keymaps/dbroqua/keymap.c +++ b/keyboards/planck/keymaps/dbroqua/keymap.c @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-----------------------------------------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | + * | | | | | | | | Psc | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| * | | | | | | Mute | Vol+ | Vol- | | | |Insert| * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_MULTIMEDIA] = { {KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12}, - {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}, + {_______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______}, {_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, KC_VOLD, _______, _______, _______, KC_INS}, {_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL} }, diff --git a/keyboards/planck/keymaps/dbroqua/layout.png b/keyboards/planck/keymaps/dbroqua/layout.png index 846a385f0a497400c6dc0614dda641d0095d499b..37b74cdc5ef529fba1c7d05b5463ba410cdc8497 100644 GIT binary patch literal 21895 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%0DSv^ToCEaKi&$f4-Sz#P;eXcr+`{dakpg!kSer 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 DpjSF4 literal 21724 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 Date: Tue, 23 Aug 2016 09:42:11 +0300 Subject: [PATCH 065/120] Split kitten_paw into Makefile/rules.mk --- keyboards/kitten_paw/Makefile | 76 +---------------------------------- keyboards/kitten_paw/rules.mk | 72 +++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 75 deletions(-) create mode 100644 keyboards/kitten_paw/rules.mk diff --git a/keyboards/kitten_paw/Makefile b/keyboards/kitten_paw/Makefile index 9122921737..57b2ef62e5 100644 --- a/keyboards/kitten_paw/Makefile +++ b/keyboards/kitten_paw/Makefile @@ -1,77 +1,3 @@ - - -# MCU name -#MCU = at90usb1287 -MCU = atmega32u2 - -# 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 -# change yes to no to disable -# -BOOTMAGIC_ENABLE ?= no # 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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= no # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 - -CUSTOM_MATRIX = yes -SRC += matrix.c led.c - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile endif - diff --git a/keyboards/kitten_paw/rules.mk b/keyboards/kitten_paw/rules.mk new file mode 100644 index 0000000000..dab7cabc52 --- /dev/null +++ b/keyboards/kitten_paw/rules.mk @@ -0,0 +1,72 @@ + + +# MCU name +#MCU = at90usb1287 +MCU = atmega32u2 + +# 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 +# change yes to no to disable +# +BOOTMAGIC_ENABLE ?= no # 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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= no # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 + +CUSTOM_MATRIX = yes +SRC += matrix.c led.c From 06c82a063bd668cb0b5b80d455c6fd7384131c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Werner?= Date: Tue, 23 Aug 2016 12:15:29 +0200 Subject: [PATCH 066/120] Fixed wrong keycode in default keymap Where I used KC_MENU I should have used KC_APP instead. --- keyboards/kitten_paw/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kitten_paw/keymaps/default/keymap.c b/keyboards/kitten_paw/keymaps/default/keymap.c index f672357455..64aa672d0a 100644 --- a/keyboards/kitten_paw/keymaps/default/keymap.c +++ b/keyboards/kitten_paw/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, KC_END,KC_PGDN, KC_P7, KC_P8, KC_P9,KC_PPLS, \ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ KC_LSFT,KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,KC_PENT, \ - KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI,KC_MENU,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT) + KC_LCTL,KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_APP,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT) }; const uint16_t PROGMEM fn_actions[] = { From 6a61c89477678e3df9aba9189b3dd67fc24e94ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Werner?= Date: Tue, 23 Aug 2016 13:20:59 +0200 Subject: [PATCH 067/120] added my personal keymap I ported my keymap from tmk to QMK. --- keyboards/kitten_paw/keymaps/ickerwx/config.h | 31 +++ keyboards/kitten_paw/keymaps/ickerwx/keymap.c | 220 ++++++++++++++++++ 2 files changed, 251 insertions(+) create mode 100644 keyboards/kitten_paw/keymaps/ickerwx/config.h create mode 100644 keyboards/kitten_paw/keymaps/ickerwx/keymap.c diff --git a/keyboards/kitten_paw/keymaps/ickerwx/config.h b/keyboards/kitten_paw/keymaps/ickerwx/config.h new file mode 100644 index 0000000000..04a2d253c7 --- /dev/null +++ b/keyboards/kitten_paw/keymaps/ickerwx/config.h @@ -0,0 +1,31 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +#undef MOUSEKEY_MOVE_MAX +#define MOUSEKEY_MOVE_MAX 127 +#undef MOUSEKEY_WHEEL_MAX +#define MOUSEKEY_WHEEL_MAX 110 +#undef MOUSEKEY_MOVE_DELTA +#define MOUSEKEY_MOVE_DELTA 5 +#undef MOUSEKEY_WHEEL_DELTA +#define MOUSEKEY_WHEEL_DELTA 1 +#undef MOUSEKEY_DELAY +#define MOUSEKEY_DELAY 50 +#undef MOUSEKEY_INTERVAL +#define MOUSEKEY_INTERVAL 20 +#undef MOUSEKEY_MAX_SPEED +#define MOUSEKEY_MAX_SPEED 4 +#undef MOUSEKEY_TIME_TO_MAX +#define MOUSEKEY_TIME_TO_MAX 30 +#undef MOUSEKEY_WHEEL_MAX_SPEED +#define MOUSEKEY_WHEEL_MAX_SPEED 3 +#undef MOUSEKEY_WHEEL_TIME_TO_MAX +#define MOUSEKEY_WHEEL_TIME_TO_MAX 1000 +#undef ONESHOT_TIMEOUT +#define ONESHOT_TIMEOUT 500 +#undef TAPPING_TOGGLE +#define TAPPING_TOGGLE 2 + +#endif diff --git a/keyboards/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/kitten_paw/keymaps/ickerwx/keymap.c new file mode 100644 index 0000000000..276fc30a80 --- /dev/null +++ b/keyboards/kitten_paw/keymaps/ickerwx/keymap.c @@ -0,0 +1,220 @@ +#include "kitten_paw.h" +#include "mousekey.h" + +#define _______ KC_TRNS +#define XXXXXXX KC_NO +#define LC LCTL +#define KC_SLCT KC_SELECT + +enum layers { + DEFAULT, + PROG1, + PROG2, + MEDIA, + MOUSE1, + MOUSE2, + MISC, +}; + +enum function_id { + LSHFT_PAREN, + RSHFT_PAREN, + LCTRL_BRACKET, + RCTRL_BRACKET, + LALT_CURLY, + RALT_CURLY, + CTRL_CLICK +}; + +enum macro_id { + GRV, + CFLEX +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [DEFAULT] = KEYMAP(\ + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,KC_BSPC, KC_INS,KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,KC_BSLS, KC_DEL, KC_END,KC_PGDN, KC_P7, KC_P8, KC_P9,KC_PPLS, \ + F(0), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ + F(8),KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT, KC_SLSH, F(9), KC_UP, KC_P1, KC_P2, KC_P3,KC_PENT, \ + F(1),KC_LGUI, F(3), LT(MISC, KC_SPC), F(4), F(5), LT(MEDIA, KC_APP), F(2), KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT), + /* Layer 1: Programming Layer 1, emulating US layout */ + [PROG1] = KEYMAP(\ + KC_ESC,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______, \ + M(GRV),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, KC_SLSH, S(KC_0), _______, _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,_______,_______,_______,_______, KC_Z,_______,_______,_______, _______,RALT(KC_8),RALT(KC_9),RALT(KC_MINS), _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,S(KC_COMM),S(KC_BSLS), _______, _______,_______,_______, \ + MO(PROG2),_______, KC_Y,_______,_______,_______,_______,_______,_______,_______, _______, S(KC_7), MO(PROG2), _______, _______,_______,_______,_______, \ + _______,_______,_______, _______, _______, _______, _______, _______, _______,_______,_______, _______,_______), + /* Layer 2: programming layer 2 + all keys that are not FN keys are sent as LSFT+key on this layer + */ + [PROG2] = KEYMAP(\ + _______, _______, _______,_______,_______,_______, _______,_______, _______,_______, _______, _______, _______, _______,_______,_______, \ +RALT(KC_RBRC), _______,RALT(KC_Q),KC_BSLS,_______,_______,M(CFLEX),S(KC_6),S(KC_RBRC),S(KC_8), S(KC_9), S(KC_SLSH), KC_RBRC, _______, _______,_______,_______, _______,_______,_______,_______, \ + _______, _______, _______,_______,_______,_______, _______,_______, _______,_______, _______, RALT(KC_7),RALT(KC_0),RALT(KC_NUBS), _______,_______,_______, _______,_______,_______,_______, \ + _______, _______, _______,_______,_______,_______, _______,_______, _______,_______, S(KC_DOT), S(KC_2), _______, _______,_______,_______, \ + _______,S(KC_NUBS), _______,_______,_______,_______, _______,_______, _______,KC_NUBS,S(KC_NUBS), S(KC_MINS), _______, _______, _______,_______,_______,_______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, _______,_______), \ + /* Layer 3: media layer */ + [MEDIA] = KEYMAP(\ + KC_PWR,KC_SLEP,KC_WAKE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_MPRV,KC_MPLY,KC_MNXT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_VOLD,KC_MUTE,KC_VOLU, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, KC_EJCT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,_______,XXXXXXX, KC_MRWD,KC_MSTP,KC_MFFD, XXXXXXX,XXXXXXX), + /* Layer 4: Mouse layer */ + [MOUSE1] = KEYMAP(\ + F(6),XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,KC_BSPC, KC_INS,KC_HOME,KC_PGUP, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,KC_BTN4, KC_WH_D, KC_MS_U, KC_WH_U, XXXXXXX, KC_Y,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_DEL, KC_END,KC_PGDN, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + F(0),KC_BTN5, KC_MS_L, KC_MS_D, KC_MS_R, F(7),KC_WH_L,KC_WH_D,KC_WH_U, KC_WH_R, XXXXXXX,XXXXXXX, KC_BTN1, XXXXXXX,XXXXXXX,XXXXXXX, \ + MO(MOUSE2),XXXXXXX,LC(KC_Y),LC(KC_X),LC(KC_C),LC(KC_V),XXXXXXX,KC_BTN2,KC_BTN3,LC(KC_PGUP),LC(KC_PGDN),XXXXXXX, KC_RSFT, KC_UP, XXXXXXX,XXXXXXX,XXXXXXX,KC_PENT, \ + KC_LCTL,KC_LGUI,KC_LALT, KC_BTN1, KC_RALT,KC_RGUI, KC_APP,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT, XXXXXXX,XXXXXXX), + /* Layer 5: Mouse layer 2*/ + [MOUSE2] = KEYMAP(\ + _______,_______,_______, _______, _______, _______,_______,_______,_______, _______, _______,_______,_______, _______,_______,_______, \ + _______,_______,_______, _______, _______, _______,_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,KC_BTN2, KC_WH_U, KC_BTN3, _______,_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,KC_WH_L, KC_WH_D, KC_WH_R, _______,KC_MS_L,KC_MS_D,KC_MS_U, KC_MS_R, _______,_______, _______, _______,_______,_______, \ + _______,_______,_______, _______, _______, _______,_______,_______,_______, _______, _______,_______, _______, _______, _______,_______,_______,_______, \ + _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______), + /* Layer 6: Misc layer */ + [MISC] = KEYMAP(\ + XXXXXXX, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,KC_SLCT,LC(KC_W), KC_UP, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,KC_BSPC, KC_DEL, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX,KC_HOME,KC_PGDN,KC_PGUP, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ + KC_LSFT,XXXXXXX,LC(KC_Y),LC(KC_X),LC(KC_C),LC(KC_V), KC_SPC, KC_END,XXXXXXX,LC(KC_PGUP),LC(KC_PGDN),XXXXXXX, KC_RSFT, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + KC_LCTL,KC_LGUI, KC_LALT, LT(MISC, KC_SPC), KC_RALT,KC_RGUI, KC_APP,KC_RCTL, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX), +}; + +const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_LAYER_TAP_TOGGLE(MOUSE1), // toggle enable mouse layer (4) + [1] = ACTION_FUNCTION_TAP(LCTRL_BRACKET), // tap to print [ + [2] = ACTION_FUNCTION_TAP(RCTRL_BRACKET), // tap to print ] + [3] = ACTION_FUNCTION_TAP(LALT_CURLY), // tap to print { + [4] = ACTION_FUNCTION_TAP(RALT_CURLY), // tap to print } + [5] = ACTION_LAYER_TAP_TOGGLE(PROG1), // toggle programming layer 1 (1) + [6] = ACTION_LAYER_SET_CLEAR(DEFAULT), + [7] = ACTION_FUNCTION_TAP(CTRL_CLICK), + [8] = ACTION_FUNCTION_TAP(LSHFT_PAREN), // tap to print ( + [9] = ACTION_FUNCTION_TAP(RSHFT_PAREN), // tap to print ) +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch(id) { + case GRV: // macro to print accent grave + return (record->event.pressed ? + MACRO( D(LSFT), T(EQL), U(RALT), T(SPC), END) : + MACRO_NONE ); + case CFLEX: // print accent circonflex + return (record->event.pressed ? + MACRO( T(GRV), T(SPC), END ) : + MACRO_NONE ); + } + return MACRO_NONE; +}; + + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} + +void tap_helper(keyrecord_t *record, uint16_t orig_mod, uint16_t macro_mod, uint16_t macro_kc ) { + if (record->event.pressed) { + if (record->tap.count > 0 && !record->tap.interrupted) { + if (record->tap.interrupted) { + register_mods(MOD_BIT(orig_mod)); + } + } else { + register_mods(MOD_BIT(orig_mod)); + } + } else { + if (record->tap.count > 0 && !(record->tap.interrupted)) { + add_weak_mods(MOD_BIT(macro_mod)); + send_keyboard_report(); + register_code(macro_kc); + unregister_code(macro_kc); + del_weak_mods(MOD_BIT(macro_mod)); + send_keyboard_report(); + record->tap.count = 0; // ad hoc: cancel tap + } else { + unregister_mods(MOD_BIT(orig_mod)); + } + } +} + +/* if LCTRL is tabbed, print (, or ) if RCTRL is tabbed, same for LALT/RALT and [/] */ +void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { + // The code is copied from keymap_hasu.c in the tmk keyboards hhkb folder + switch (id) { + case LCTRL_BRACKET: + tap_helper(record, KC_LCTL, KC_RALT, KC_8); + break; + case RCTRL_BRACKET: + tap_helper(record, KC_RCTL, KC_RALT, KC_9); + break; + case LALT_CURLY: + tap_helper(record, KC_LALT, KC_RALT, KC_7); + break; + case RALT_CURLY: + tap_helper(record, KC_RALT, KC_RALT, KC_0); + break; + case LSHFT_PAREN: + tap_helper(record, KC_LSFT, KC_LSFT, KC_8); + break; + case RSHFT_PAREN: + tap_helper(record, KC_RSFT, KC_LSFT, KC_9); + break; + case CTRL_CLICK: + if (record->event.pressed) { + mousekey_clear(); + register_mods(MOD_BIT(KC_LCTL)); + send_keyboard_report(); + wait_ms(5); + mousekey_on(KC_BTN1); + mousekey_send(); + wait_ms(10); + mousekey_off(KC_BTN1); + mousekey_send(); + wait_ms(5); + unregister_mods(MOD_BIT(KC_LCTL)); + send_keyboard_report(); + } + break; + } +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + uint8_t layer; + layer = biton32(layer_state); + if (layer == PROG2) { + if (keycode >= KC_A && keycode <= KC_EXSEL && \ + !( // do not send LSFT + these keycodes, they are needed for emulating the US layout + keycode == KC_NONUS_BSLASH || + keycode == KC_RBRC || + keycode == KC_BSLS || + keycode == KC_GRV + )) { + if (record->event.pressed) { + register_mods(MOD_LSFT); + } else { + unregister_mods(MOD_LSFT); + } + } + } + return true; +} From a902206735972a15063d8d9852a87041d82d6e7b Mon Sep 17 00:00:00 2001 From: IBNobody Date: Tue, 23 Aug 2016 23:05:35 -0500 Subject: [PATCH 068/120] Nightly Prep for Vision build --- keyboards/atomic/keymaps/pvc/keymap.c | 32 +- keyboards/planck/keymaps/pvc/keymap.c | 20 +- .../vision_division/keymaps/default/Makefile | 4 +- .../vision_division/keymaps/default/config.h | 19 +- .../vision_division/keymaps/default/keymap.c | 632 +++++++++++++++++- 5 files changed, 652 insertions(+), 55 deletions(-) diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c index f16ec8a6ec..b02e89d2c7 100644 --- a/keyboards/atomic/keymaps/pvc/keymap.c +++ b/keyboards/atomic/keymaps/pvc/keymap.c @@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* UPPER * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. - * | PRINT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE | + * | PRINT | BR TOG | BR SP+ | BR SP- | BR RST | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| * | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | - | | | | INS | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| @@ -180,9 +180,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| * | | $ | { | [ | ( | % | # | ) | ] | } | @ | | | | INS | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| - * | | ^ | * | + | - | ; | : | _ | ' | " | ` | | XXXXXX . | HOME | + * | | ^ | * | + | - | / | \ | _ | ' | " | ` | | XXXXXX . | HOME | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| - * | | | | & | ! | ~ | / | \ | = | < | > | ? | XXXXXX . | | END | + * | | | | & | ! | ~ | ; | : | = | < | > | ? | XXXXXX . | | END | * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| * | | | | | | | | | | | | | | | * '--------------------------------------------------------------------------------------------------------------------------------------' @@ -191,16 +191,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LAYER_LOWER] = { // LOWER { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, { _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, _______, _______, _______, KC_INS }, - { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SCLN, KC_COLN, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, _______, ________________, KC_HOME }, - { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SLSH, KC_BSLS, KC_EQL, KC_LT, KC_GT, KC_QUES, ________________, _______, KC_END }, + { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, _______, ________________, KC_HOME }, + { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL, KC_LT, KC_GT, KC_QUES, ________________, _______, KC_END }, { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ }, }, +/* FUNCTION + * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. + * | NUM LK | | | | | | | | | | | | | XXXXXX . | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| + * | SCR LK | F13 | F14 | F15 | F16 | | | | | | | | | | | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| + * | CAP LK | F17 | F18 | F19 | F20 | | | | | | | | XXXXXX . | | + * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| + * | | F21 | F22 | F23 | F24 | | | | | | | XXXXXX . | VOL UP | MUTE | + * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| + * | | | | | | PLAY/PAUSE | | | | | | PTRACK | VOL DN | NTRACK | + * '--------------------------------------------------------------------------------------------------------------------------------------' + */ + [LAYER_FUNCTION] = { // FUNCTION - { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, - { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_PAUS }, - { KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_PSCR }, - { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, KC_VOLU, KC_MUTE }, + { KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX }, + { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, + { KC_CAPS, KC_F17, KC_F18, KC_F19, KC_F20, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX, XXXXXXX }, + { _______, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ________________, KC_VOLU, KC_MUTE }, { _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT }, }, diff --git a/keyboards/planck/keymaps/pvc/keymap.c b/keyboards/planck/keymaps/pvc/keymap.c index 2fc5f0da16..0bb7f0def2 100644 --- a/keyboards/planck/keymaps/pvc/keymap.c +++ b/keyboards/planck/keymaps/pvc/keymap.c @@ -166,9 +166,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * .-----------------------------------------------------------------------------------------------------------. * | | $ | { | [ | ( | % | # | ) | ] | } | @ | PG UP | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | | ^ | * | + | - | ; | : | _ | ' | " | ` | PG DN | + * | | ^ | * | + | - | / | \ | _ | ' | " | ` | PG DN | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | | | | & | ! | ~ | / | \ | = | < | > | ? | HOME | + * | | | | & | ! | ~ | ; | : | = | < | > | ? | HOME | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| * | | | | | | | | | | | | END | * '-----------------------------------------------------------------------------------------------------------' @@ -176,27 +176,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LAYER_LOWER] = { // LOWER { _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, KC_PGUP }, - { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SCLN, KC_COLN, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, KC_PGDN }, - { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SLSH, KC_BSLS, KC_EQL, KC_LT, KC_GT, KC_QUES, KC_HOME }, + { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, KC_PGDN }, + { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL, KC_LT, KC_GT, KC_QUES, KC_HOME }, { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END }, }, /* FUNCTION * .-----------------------------------------------------------------------------------------------------------. - * | NUM LK | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | PAUSE | + * | NUM LK | F13 | F14 | F15 | F16 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | PAUSE | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | CAP LK | F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | PRINT | + * | CAP LK | F17 | F18 | F19 | F20 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | PRINT | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| - * | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MUTE | + * | SCR LK | F21 | F22 | F23 | F24 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MUTE | * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| * | LCTRL | LWIN | FN | LALT | UPPER | PLAY | PLAY | LOWER | VOL UP | VOL DN | NEXT | PREV | * '-----------------------------------------------------------------------------------------------------------' */ [LAYER_FUNCTION] = { // FUNCTION - { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PAUS }, - { KC_CAPS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_PSCR }, - { KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE }, + { KC_NLCK, KC_F13, KC_F14, KC_F15, KC_F16, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAUS }, + { KC_CAPS, KC_F17, KC_F18, KC_F19, KC_F20, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR }, + { KC_SLCK, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE }, { _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_VOLU, KC_VOLD, KC_MPRV, KC_MNXT }, }, diff --git a/keyboards/vision_division/keymaps/default/Makefile b/keyboards/vision_division/keymaps/default/Makefile index 43fee26686..393a9e23a6 100644 --- a/keyboards/vision_division/keymaps/default/Makefile +++ b/keyboards/vision_division/keymaps/default/Makefile @@ -1,11 +1,11 @@ # 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 # 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 = no # Console for debug(+400) +CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration 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 diff --git a/keyboards/vision_division/keymaps/default/config.h b/keyboards/vision_division/keymaps/default/config.h index c005aa8c5a..34eaaff5b7 100644 --- a/keyboards/vision_division/keymaps/default/config.h +++ b/keyboards/vision_division/keymaps/default/config.h @@ -22,7 +22,7 @@ #define UNUSED_PINS -#define KEYMAP( \ +/*#define KEYMAP( \ k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k10B, k10C, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, k11C, \ k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k20B, k20C, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, k21C, \ k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k30B, k30C, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, k31C, \ @@ -37,6 +37,23 @@ KEYMAP_MASTER(NUMERIC_MAX_TEENSY, NUMERIC_MAX, \ k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k40B, k40C, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, k41C, \ k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k50B, k50C, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, k51C, \ k601, k602, k603, k604, k605, k606, k607, k608, k609, k60A, k60B, k60C, k611, k612, k613, k614, k615, k616, k617, k618, k619, k61A, k61B, k61C \ +)*/ + +#define KEYMAP( \ + k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, \ + k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, \ + k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, \ + k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, \ + k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, \ + k601, k602, k603, k604, k605, k606, k607, k608, k609, k60A, k611, k612, k613, k614, k615, k616, k617, k618, k619, k61A, k61B \ ) \ +KEYMAP_MASTER(NUMERIC_NORMAL, HOMING_MAX_TEENSY, \ + k101, k102, k103, k104, k105, k106, k107, k108, k109, k10A, KC_NO, KC_NO, k111, k112, k113, k114, k115, k116, k117, k118, k119, k11A, k11B, KC_NO, \ + k201, k202, k203, k204, k205, k206, k207, k208, k209, k20A, KC_NO, KC_NO, k211, k212, k213, k214, k215, k216, k217, k218, k219, k21A, k21B, KC_NO, \ + k301, k302, k303, k304, k305, k306, k307, k308, k309, k30A, KC_NO, KC_NO, k311, k312, k313, k314, k315, k316, k317, k318, k319, k31A, k31B, KC_NO, \ + k401, k402, k403, k404, k405, k406, k407, k408, k409, k40A, KC_NO, KC_NO, k411, k412, k413, k414, k415, k416, k417, k418, k419, k41A, k41B, KC_NO, \ + k501, k502, k503, k504, k505, k506, k507, k508, k509, k50A, KC_NO, KC_NO, k511, k512, k513, k514, k515, k516, k517, k518, k519, k51A, k51B, KC_NO, \ + k601, k602, k603, k604, k605, k606, k607, k608, k609, k60A, KC_NO, KC_NO, k611, k612, k613, k614, k615, k616, k617, k618, k619, k61A, k61B, KC_NO \ +) #endif \ No newline at end of file diff --git a/keyboards/vision_division/keymaps/default/keymap.c b/keyboards/vision_division/keymaps/default/keymap.c index 3fddee78b7..b8cef9c759 100644 --- a/keyboards/vision_division/keymaps/default/keymap.c +++ b/keyboards/vision_division/keymaps/default/keymap.c @@ -1,64 +1,630 @@ #include "vision_division.h" +#include "action_layer.h" +#include "eeconfig.h" +#include "led.h" + +#ifdef AUDIO_ENABLE + #include "audio.h" + #include "song_list.h" +#endif + +#define LAYER_QWERTY 0 +#define LAYER_COLEMAK 1 +#define LAYER_DVORAK 2 +#define LAYER_UPPER 3 +#define LAYER_LOWER 4 +#define LAYER_FUNCTION 5 +#define LAYER_MOUSE 6 +#define LAYER_ADJUST 7 + +#define MACRO_QWERTY 0 +#define MACRO_COLEMAK 1 +#define MACRO_DVORAK 2 +#define MACRO_UPPER 3 +#define MACRO_LOWER 4 +#define MACRO_FUNCTION 5 +#define MACRO_MOUSE 6 +#define MACRO_TIMBRE_1 7 +#define MACRO_TIMBRE_2 8 +#define MACRO_TIMBRE_3 9 +#define MACRO_TIMBRE_4 10 +#define MACRO_TEMPO_U 11 +#define MACRO_TEMPO_D 12 +#define MACRO_TONE_DEFAULT 13 +#define MACRO_MUSIC_TOGGLE 14 +#define MACRO_AUDIO_TOGGLE 16 +#define MACRO_INC_VOICE 18 +#define MACRO_DEC_VOICE 19 +#define MACRO_BACKLIGHT 20 +#define MACRO_BREATH_TOGGLE 21 +#define MACRO_BREATH_SPEED_INC 23 +#define MACRO_BREATH_SPEED_DEC 24 +#define MACRO_BREATH_DEFAULT 25 + +#define M_QWRTY M(MACRO_QWERTY) +#define M_COLMK M(MACRO_COLEMAK) +#define M_DVORK M(MACRO_DVORAK) +#define M_UPPER M(MACRO_UPPER) +#define M_LOWER M(MACRO_LOWER) +#define M_FUNCT M(MACRO_FUNCTION) +#define M_MOUSE M(MACRO_MOUSE) +#define TIMBR_1 M(MACRO_TIMBRE_1) +#define TIMBR_2 M(MACRO_TIMBRE_2) +#define TIMBR_3 M(MACRO_TIMBRE_3) +#define TIMBR_4 M(MACRO_TIMBRE_4) +#define TMPO_UP M(MACRO_TEMPO_U) +#define TMPO_DN M(MACRO_TEMPO_D) +#define TMPO_DF M(MACRO_TONE_DEFAULT) +#define M_BACKL M(MACRO_BACKLIGHT) +#define M_BRTOG M(MACRO_BREATH_TOGGLE) +#define M_BSPDU M(MACRO_BREATH_SPEED_INC) +#define M_BSPDD M(MACRO_BREATH_SPEED_DEC) +#define M_BDFLT M(MACRO_BREATH_DEFAULT) +#define VC_UP M(MACRO_INC_VOICE) +#define VC_DOWN M(MACRO_DEC_VOICE) +#define SC_UNDO LCTL(KC_Z) +#define SC_REDO LCTL(KC_Y) +#define SC_CUT LCTL(KC_X) +#define SC_COPY LCTL(KC_C) +#define SC_PSTE LCTL(KC_V) +#define SC_SELA LCTL(KC_A) +#define SC_SAVE LCTL(KC_S) +#define SC_OPEN LCTL(KC_O) +#define SC_ACLS LALT(KC_F4) +#define SC_CCLS LCTL(KC_F4) + +#define OS_SHFT KC_FN0 + +#define _______ KC_TRNS +#define XXXXXXX KC_NO +#define ________________ _______, _______ +#define XXXXXXXXXXXXXXXX XXXXXXX, XXXXXXX + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = KEYMAP( \ - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_A, KC_B, KC_C, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_A, KC_B, KC_C, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_A, KC_B, KC_C, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 \ + +KEYMAP( \ + KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, XXXXXXX, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \ + KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \ + KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, KC_TAB, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \ + KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_CAPS, KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, \ + KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, XXXXXXX, KC_UP, XXXXXXX, \ + KC_KP_0, KC_KP_0, KC_PDOT, KC_PENT, KC_LCTL, KC_LCTL, XXXXXXX, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC, KC_SPC, XXXXXXX, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ) -/* - KC_VOLU, KC_MUTE, KC_VOLU, KC_F24, KC_F20, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 k119, k11A, k11B, k11C, \ - KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, k219, k21A, k21B, k21C, \ - KC_KP_7, KC_KP_8, KC_KP_9, KC_F23, KC_F19, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, k319, k31A, k31B, k31C, \ - KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_F18, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP, k419, k41A, k41B, k41C, \ - KC_KP_1, KC_KP_2, KC_KP_3, KC_F22, KC_F17, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN, k519, k51A, k51B, k51C. \ - KC_KP_0, KC_F21, KC_PDOT, KC_PENT, KC_F16, KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, k619, k61A, k61B, k61C \ - ) //-----, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, -------, +// [LAYER_QWERTY] = { // QWERTY +// { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC }, +// { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, +// { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP }, +// { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, +// { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, +// }, + + +// /* Numeric Max / Homing Normal - Traditional +// * .-----------------------------------. .-----------------------------------. .-----------------_-----------------. .-----------------------------------. .--------------------------. +// * | | | | | | | | | | | | | | | | | | | | | | | | +// * '-----------------------------------' '-----------------------------------' '-----------------------------------' '-----------------------------------' '--------------------------' +// * .-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .--------------------------. +// * | | | | | | ESC | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | | | | | | +// * |--------+--------+--------+--------| | -------+ -------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------| +// * | | | | | | TAB | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | | | | | | +// * |--------+--------+--------+ | o | -------+ -------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| '--------+--------+--------' +// * | | | | | o | CAPS | CAPS | A | S | D | F | G | H | J | K | L | ; | ' | | +// * |--------+--------+--------+--------| o | -------+ -------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---+--------| .--------. +// * | | | | | | LSHIFT | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX | | | | +// * |--------+--------+--------+ | | -------+ -------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+--------+--------| .--------+--------+--------. +// * | | | | | LCTRL | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | | | | | | +// * '-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '--------------------------' +// */ + + +// /* QWERTY +// * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. +// * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| +// * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| +// * | CAPS | A | S | D | F | G | H | J | K | L | ; | ' | XXXXXX . ENTER | PG UP | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| +// * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | +// * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| +// * | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | +// * '--------------------------------------------------------------------------------------------------------------------------------------' +// */ + +// [LAYER_QWERTY] = { // QWERTY +// { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC }, +// { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, +// { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP }, +// { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, +// { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, +// }, + +// /* COLEMAK +// * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. +// * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | XXXXXX . BACKSP | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| +// * | TAB | Q | W | F | P | G | J | L | U | Y | ; | [ | ] | \ | DEL | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| +// * | BACKSP | A | R | S | T | D | H | N | E | I | O | ' | XXXXXX . ENTER | PG UP | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| +// * | LSHIFT | Z | X | C | V | B | K | M | , | . | / | XXXXXX . RSHIFT | UP | PG DN | +// * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| +// * | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | +// * '--------------------------------------------------------------------------------------------------------------------------------------' +// */ + +// [LAYER_COLEMAK] = { // COLEMAK +// { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC }, +// { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL }, +// { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_ENT, KC_PGUP }, +// { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, +// { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, +// }, + +// /* DVORAK +// * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. +// * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | [ | ] | XXXXXX . BACKSP | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| +// * | TAB | ' | , | . | P | Y | F | G | C | R | L | / | = | \ | DEL | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| +// * | CAPS | A | O | E | U | I | D | H | T | N | S | - | XXXXXX . ENTER | PG UP | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| +// * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | XXXXXX . RSHIFT | UP | PG DN | +// * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| +// * | LCTRL | LWIN | FN | LALT | UPPER | XXXXXX . SPACE | LOWER | SHIFT | RALT | APP | RCTRL | LEFT | DOWN | RIGHT | +// * '--------------------------------------------------------------------------------------------------------------------------------------' +// */ + +// [LAYER_DVORAK] = { // DVORAK +// { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_BSPC }, +// { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_DEL }, +// { KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_ENT, KC_PGUP }, +// { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_RSFT, KC_UP, KC_PGDN }, +// { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT }, +// }, + +// /* UPPER +// * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. +// * | PRINT | BR TOG | BR SP+ | BR SP- | BR RST | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| +// * | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | - | | | | INS | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| +// * | CAP LK | F5 | F6 | F7 | F8 | | | 4 | 5 | 6 | + | | XXXXXX . | HOME | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| +// * | | F9 | F10 | F11 | F12 | | | 1 | 2 | 3 | ENTER | XXXXXX . | | END | +// * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| +// * | | | | | | 0 | | RALT | . | ENTER | | | | | +// * '--------------------------------------------------------------------------------------------------------------------------------------' +// */ + +// [LAYER_UPPER] = { // UPPER +// { KC_PSCR, M_BRTOG, M_BSPDU, M_BSPDD, M_BDFLT, XXXXXXX, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, XXXXXXX, XXXXXXX, KC_SLCK, KC_PAUS, KC_PAUS }, +// { _______, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, KC_INS }, +// { KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, XXXXXXX, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, ________________, KC_HOME }, +// { _______, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, ________________, _______, KC_END }, +// { _______, _______, _______, _______, _______, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, _______, _______, _______, _______ }, +// }, + +// /* LOWER +// * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. +// * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX . BACKSP | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| +// * | | $ | { | [ | ( | % | # | ) | ] | } | @ | | | | INS | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| +// * | | ^ | * | + | - | / | \ | _ | ' | " | ` | | XXXXXX . | HOME | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| +// * | | | | & | ! | ~ | ; | : | = | < | > | ? | XXXXXX . | | END | +// * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| +// * | | | | | | | | | | | | | | | +// * '--------------------------------------------------------------------------------------------------------------------------------------' +// */ + +// [LAYER_LOWER] = { // LOWER +// { _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ________________ }, +// { _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, _______, _______, _______, KC_INS }, +// { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, _______, ________________, KC_HOME }, +// { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SCLN, KC_COLN, KC_EQL, KC_LT, KC_GT, KC_QUES, ________________, _______, KC_END }, +// { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ }, +// }, + +// /* FUNCTION +// * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. +// * | NUM LK | | | | | | | | | | | | | XXXXXX . | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| +// * | SCR LK | F13 | F14 | F15 | F16 | | | | | | | | | | | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| +// * | CAP LK | F17 | F18 | F19 | F20 | | | | | | | | XXXXXX . | | +// * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| +// * | | F21 | F22 | F23 | F24 | | | | | | | XXXXXX . | VOL UP | MUTE | +// * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| +// * | | | | | | PLAY/PAUSE | | | | | | PTRACK | VOL DN | NTRACK | +// * '--------------------------------------------------------------------------------------------------------------------------------------' +// */ + +// [LAYER_FUNCTION] = { // FUNCTION +// { KC_NLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX }, +// { KC_SLCK, KC_F13, KC_F14, KC_F15, KC_F16, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, +// { KC_CAPS, KC_F17, KC_F18, KC_F19, KC_F20, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX, XXXXXXX }, +// { _______, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ________________, KC_VOLU, KC_MUTE }, +// { _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT }, +// }, + +// #ifdef MOUSEKEY_ENABLE + +// [LAYER_MOUSE] = { // MOUSE +// { _______, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX }, +// { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, +// { XXXXXXX, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXXXXXXXXXXX, KC_WH_U }, +// { _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ________________, KC_MS_U, KC_WH_D }, +// { _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R }, +// }, + +// #endif + +// [LAYER_ADJUST] = { // ADJUST +// { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, _______, _______, _______, MU_TOG, AU_TOG, ________________ }, +// { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, +// { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______ }, +// { _______, _______, _______, _______, M_BACKL, RESET, _______, M_MOUSE, _______, _______, _______, ________________, MUV_IN, _______ }, +// { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, MUV_DE, _______ }, +// }, + + +// /* +// [LAYER_EMPTY] = { // LAYER +// { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________ }, +// { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, +// { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______ }, +// { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________, _______, _______ }, +// { _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______, _______, _______, _______ }, +// }, +// */ -*/ }; -const uint16_t PROGMEM fn_actions[] = { +#ifdef AUDIO_ENABLE +float tone_my_startup[][2] = SONG(ODE_TO_JOY); +float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY); + +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +float tone_dvorak[][2] = SONG(DVORAK_SOUND); +float tone_colemak[][2] = SONG(COLEMAK_SOUND); + +float tone_audio_on[][2] = SONG(CLOSE_ENCOUNTERS_5_NOTE); +float tone_music_on[][2] = SONG(DOE_A_DEER); +float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); + +float tone_caps_on[][2] = SONG(CAPS_LOCK_ON_SOUND); +float tone_caps_off[][2] = SONG(CAPS_LOCK_OFF_SOUND); +float tone_numlk_on[][2] = SONG(NUM_LOCK_ON_SOUND); +float tone_numlk_off[][2] = SONG(NUM_LOCK_OFF_SOUND); +float tone_scroll_on[][2] = SONG(SCROLL_LOCK_ON_SOUND); +float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND); + +#endif /* AUDIO_ENABLE */ + +void persistant_default_layer_set(uint16_t default_layer) +{ + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_MODS_ONESHOT(MOD_LSFT), }; 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; - } + + // MACRODOWN only works in this function + switch(id) + { + + // case MACRO_BREATH_TOGGLE: + // if (record->event.pressed) + // { + // breathing_toggle(); + // } + // break; + + // case MACRO_BREATH_SPEED_INC: + // if (record->event.pressed) + // { + // breathing_speed_inc(1); + // } + // break; + + // case MACRO_BREATH_SPEED_DEC: + // if (record->event.pressed) + // { + // breathing_speed_dec(1); + // } + // break; + + // case MACRO_BREATH_DEFAULT: + // if (record->event.pressed) + // { + // breathing_defaults(); + // } + // break; + + case MACRO_QWERTY: + if (record->event.pressed) + { + persistant_default_layer_set(1UL<event.pressed) + { + persistant_default_layer_set(1UL<event.pressed) + { + persistant_default_layer_set(1UL<event.pressed) + { + layer_on(LAYER_UPPER); + // breathing_speed_set(2); + // breathing_pulse(); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); + } + else + { + layer_off(LAYER_UPPER); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); + } + break; + + case MACRO_LOWER: + if (record->event.pressed) + { + layer_on(LAYER_LOWER); + // breathing_speed_set(2); + // breathing_pulse(); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); + } + else + { + layer_off(LAYER_LOWER); + update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST); + } + break; + + case MACRO_FUNCTION: + if (record->event.pressed) + { + // breathing_speed_set(3); + // breathing_enable(); + layer_on(LAYER_FUNCTION); + } + else + { + // breathing_speed_set(1); + // breathing_self_disable(); + layer_off(LAYER_FUNCTION); + } + break; + +#ifdef MOUSEKEY_ENABLE + + case MACRO_MOUSE: + if (record->event.pressed) + { + layer_invert(LAYER_MOUSE); + } + break; + +#endif /* MOUSEKEY_ENABLE */ + +#ifdef AUDIO_ENABLE + + case MACRO_TIMBRE_1: + if (record->event.pressed) set_timbre(TIMBRE_12); + break; + + case MACRO_TIMBRE_2: + if (record->event.pressed) set_timbre(TIMBRE_25); + break; + + case MACRO_TIMBRE_3: + if (record->event.pressed) set_timbre(TIMBRE_50); + break; + + case MACRO_TIMBRE_4: + if (record->event.pressed) set_timbre(TIMBRE_75); + break; + + case MACRO_TEMPO_U: + if (record->event.pressed) increase_tempo(10); + break; + + case MACRO_TEMPO_D: + if (record->event.pressed) decrease_tempo(10); + break; + + case MACRO_TONE_DEFAULT: + if (record->event.pressed) + { + set_timbre(TIMBRE_DEFAULT); + set_tempo(TEMPO_DEFAULT); + } + break; + +/* + case MACRO_AUDIO_TOGGLE: + if (record->event.pressed) + { + if (is_audio_on()) + { + audio_off(); + } + else + { + audio_on(); + PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); + } + } + break; + + case MACRO_MUSIC_TOGGLE: + if (record->event.pressed) + { + if (IS_LAYER_ON(LAYER_MUSIC)) + { + layer_off(LAYER_MUSIC); + stop_all_notes(); + } + else + { + PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); + layer_on(LAYER_MUSIC); + } + } + break; + case MACRO_INC_VOICE: + if (record->event.pressed) + { + #ifdef AUDIO_ENABLE + voice_iterate(); + PLAY_NOTE_ARRAY(music_scale, false, STACCATO); + #endif + } + break; + + case MACRO_DEC_VOICE: + if (record->event.pressed) + { + #ifdef AUDIO_ENABLE + voice_deiterate(); + PLAY_NOTE_ARRAY(music_scale, false, STACCATO); + #endif + } + break; +*/ + +#endif /* AUDIO_ENABLE */ + +#ifdef BACKLIGHT_ENABLE + case MACRO_BACKLIGHT: + if (record->event.pressed) + { + backlight_step(); + } +#endif + + default: + break; + + } return MACRO_NONE; }; -void matrix_init_user(void) { +#ifdef AUDIO_ENABLE +void matrix_init_user(void) +{ + set_voice(default_voice); + startup_user(); + println("Matrix Init"); } -void matrix_scan_user(void) { +void led_set_user(uint8_t usb_led) +{ + static uint8_t old_usb_led = 0; + _delay_ms(10); // gets rid of tick + + if (!is_playing_notes()) + { + if ((usb_led & (1< Date: Wed, 24 Aug 2016 10:29:01 +0300 Subject: [PATCH 069/120] Fix slight inconsistency When running make from either a keyboard folder or a subproject it runs all keymaps for all subprojects and the selected subproject respectively. Without this fix, the same doesn't happen if your run make clean for example. As it would just provide you with an error message. Now this will work as expected. --- Makefile | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index c8122e5765..f78cca6c6f 100644 --- a/Makefile +++ b/Makefile @@ -262,7 +262,7 @@ define PARSE_KEYBOARD # If there's no matching subproject, we assume it's the default # This will allow you to leave the subproject part of the target out else - $$(eval $$(call PARSE_SUBPROJECT,defaultsp)) + $$(eval $$(call PARSE_SUBPROJECT,)) endif endef @@ -278,12 +278,14 @@ endef define PARSE_SUBPROJECT # If we want to compile the default subproject, then we need to # include the correct makefile to determine the actual name of it - ifeq ($1,defaultsp) + CURRENT_SP := $1 + ifeq ($$(CURRENT_SP),) + CURRENT_SP := defaultsp + endif + ifeq ($$(CURRENT_SP),defaultsp) SUBPROJECT_DEFAULT= $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/Makefile) CURRENT_SP := $$(SUBPROJECT_DEFAULT) - else - CURRENT_SP := $1 endif # If current subproject is empty (the default was not defined), and we have a list of subproject # then make all of them @@ -314,16 +316,16 @@ define PARSE_SUBPROJECT # Otherwise try to match the keymap from the current folder, or arguments to the make command else ifneq ($$(KEYMAP),) $$(eval $$(call PARSE_KEYMAP,$$(KEYMAP))) + # No matching keymap found, so we assume that the rest of the rule is the target + # If we haven't been able to parse out a subproject, then make all of them + # This is consistent with running make without any arguments from the keyboard + # folder + else ifeq ($1,) + $$(eval $$(call PARSE_ALL_SUBPROJECTS)) + # Otherwise, make all keymaps, again this is consistent with how it works without + # any arguments else - # Otherwise something is wrong with the target - # Try to give as much information as possible of what it it was trying to do - ifeq ($$(CURRENT_SP),) - $$(info make: *** No rule to make target '$$(CURRENT_KB)-$$(RULE)'. Stop.) - else - $$(info make: *** No rule to make target '$$(CURRENT_KB)-$$(CURRENT_SP)-$$(RULE)'. Stop.) - endif - # Notice the tab instead of spaces below! - exit 1 + $$(eval $$(call PARSE_ALL_KEYMAPS)) endif else # As earlier mentione,d when allsb is specified, we call our self recursively From 235d47e747465000dc2725acff4796a933c2fcea Mon Sep 17 00:00:00 2001 From: dbroqua Date: Wed, 24 Aug 2016 12:57:32 +0200 Subject: [PATCH 070/120] - Updated readme by adding link on kle for each layer --- keyboards/planck/keymaps/dbroqua/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/planck/keymaps/dbroqua/readme.md b/keyboards/planck/keymaps/dbroqua/readme.md index b5cdb9f65d..777c76abd4 100644 --- a/keyboards/planck/keymaps/dbroqua/readme.md +++ b/keyboards/planck/keymaps/dbroqua/readme.md @@ -3,6 +3,9 @@ ![Layout](layout.png "Dbroqua Keymap") * Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/e77306f9d14cc93fa26123b93b106474 +* Online keyboard layout editor (lower layer): http://www.keyboard-layout-editor.com/#/gists/786e03f6fbd274cb4f4e77a3d67f85fa +* Online keyboard layout editor (raise layer): http://www.keyboard-layout-editor.com/#/gists/2e22c71f6910103c20d595d1caa713d6 +* Online keyboard layout editor (multimedia layer): http://www.keyboard-layout-editor.com/#/gists/132ebf8053508a7a81dfa8e0756edb40 # Programming Instructions: Enter into programming mode and run the following command. From a058ae40e268b34ba5db45f5fd5d557d50fa5437 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Wed, 24 Aug 2016 15:39:23 +0200 Subject: [PATCH 071/120] quantum: Move qk_ucis_state to process_unicode.c In order to not declare the same variable in multiple objects (which happens when building UCIS-enabled keymap for both the ErgoDox EZ and the ErgoDox Infinity), move the declaration to the .c file, and keep only an extern reference in the header. Many thanks to @fredizzimo for spotting the error in Travis, and suggesting the fix. Signed-off-by: Gergely Nagy --- quantum/process_keycode/process_unicode.c | 2 ++ quantum/process_keycode/process_unicode.h | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c index a1be8d2fc3..06c1694f2e 100644 --- a/quantum/process_keycode/process_unicode.c +++ b/quantum/process_keycode/process_unicode.c @@ -74,6 +74,8 @@ bool process_unicode(uint16_t keycode, keyrecord_t *record) { } #ifdef UCIS_ENABLE +qk_ucis_state_t qk_ucis_state; + void qk_ucis_start(void) { qk_ucis_state.count = 0; qk_ucis_state.in_progress = true; diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h index 85364e8eb3..02ce3dd7e0 100644 --- a/quantum/process_keycode/process_unicode.h +++ b/quantum/process_keycode/process_unicode.h @@ -29,11 +29,13 @@ typedef struct { char *code; } qk_ucis_symbol_t; -struct { +typedef struct { uint8_t count; uint16_t codes[UCIS_MAX_SYMBOL_LENGTH]; bool in_progress:1; -} qk_ucis_state; +} qk_ucis_state_t; + +extern qk_ucis_state_t qk_ucis_state; #define UCIS_TABLE(...) {__VA_ARGS__, {NULL, NULL}} #define UCIS_SYM(name, code) {name, #code} From 7debe7cd777f50ef0adf4d3b4623946232f1eccf Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Wed, 24 Aug 2016 09:26:41 -0600 Subject: [PATCH 072/120] Changes based on @fredizzimo review, flashing Infinity details --- keyboards/ergodox/readme.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md index 304f2b01f2..4730de36f6 100644 --- a/keyboards/ergodox/readme.md +++ b/keyboards/ergodox/readme.md @@ -1,3 +1,15 @@ +# The Easy Way + +If you can find firmware someone else has made that does what you want, that +is the easiest way to customize your ErgoDox. It requires no programming +experience or the setup of a build environment. + +Quickstart: + + - Find and download an [existing firmware](#other-firmware-options) + + - Then flash the firmware to your [ErgoDox Ez](#ergodox-ez) + or [ErgoDox Infinity](#ergodox-infinity) # Customizing Keymaps @@ -98,6 +110,28 @@ for the left and right halves seperately. To flash them: More information on the Infinity firmware is available in the [TMK/chibios for Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md) +### Infinity Master/Two Halves + +The Infinity is two completely independent keyboards, that can connect together. +You have a few options in how you flash the firmware: + +- Flash the left half, rebuild the firmware with "MASTER=right" and then flash + the right half. This allows you to plug in either half directly to the + computer and is what the above instructions do. + +- Flash the left half, then flash the same firmware on the right. This only + works when the left half is plugged directly to the computer and the keymap + is mirrored. It saves the small extra step of rebuilding with + "MASTER=right". + +- The same as the previous one but with "MASTER=right" when you build the + firmware, then flash the same firmware to both halves. You just have to + directly connect the right half to the computer. + +- For minor changes such as changing only the keymap without having updated + any part of the firmware code itself, you can program only the MASTER half. + It is safest to program both halves though. + # Contributing your keymap The QMK firmware is open-source, so it would be wonderful to have your contribution! Within a very short time after launching we already amassed dozens of user-contributed keymaps, with all sorts of creative improvements and tweaks. This is very valuable for people who aren't comfortable coding, but do want to customize their ErgoDox. To make it easy for these people to use your layout, I recommend submitting your PR in the following format. From 0dfd1712bb22be9fe63b8754eb8fe72675906c6f Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Wed, 24 Aug 2016 09:30:29 -0600 Subject: [PATCH 073/120] Making the existing firmware link better --- keyboards/ergodox/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/ergodox/readme.md b/keyboards/ergodox/readme.md index 4730de36f6..b113ca7dd2 100644 --- a/keyboards/ergodox/readme.md +++ b/keyboards/ergodox/readme.md @@ -6,7 +6,8 @@ experience or the setup of a build environment. Quickstart: - - Find and download an [existing firmware](#other-firmware-options) + - Find and download an existing firmware + [from Other Firmware Options](#other-firmware-options) - Then flash the firmware to your [ErgoDox Ez](#ergodox-ez) or [ErgoDox Infinity](#ergodox-infinity) From 5979051de339d0b064aaaeb59948df00aa7c3951 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Wed, 24 Aug 2016 21:53:49 +0200 Subject: [PATCH 074/120] - Updated kc60.h for 2x 1u backspace (K49) - Added dbroqua layout --- keyboards/kc60/kc60.h | 8 +- keyboards/kc60/keymaps/dbroqua/keymap.c | 103 +++++++++++++++++++++++ keyboards/kc60/keymaps/dbroqua/readme.md | 11 +++ 3 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 keyboards/kc60/keymaps/dbroqua/keymap.c create mode 100644 keyboards/kc60/keymaps/dbroqua/readme.md diff --git a/keyboards/kc60/kc60.h b/keyboards/kc60/kc60.h index 34eab4b2a0..f11d3435c9 100644 --- a/keyboards/kc60/kc60.h +++ b/keyboards/kc60/kc60.h @@ -3,6 +3,8 @@ #include "quantum.h" +// K49 key is for the key at row 1 and column 15 when you split the backspace in 2 1U key. + // This a shortcut to help you visually see your layout. // The first section contains all of the arguements // The second converts the arguments into a multi-dimensional array @@ -11,13 +13,13 @@ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K45, K4A, K4B, K4C, K4D \ + K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D \ ) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, }, \ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ - { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO,K4A, K4B, K4C, K4D } \ + { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \ } #endif diff --git a/keyboards/kc60/keymaps/dbroqua/keymap.c b/keyboards/kc60/keymaps/dbroqua/keymap.c new file mode 100644 index 0000000000..e17827fad9 --- /dev/null +++ b/keyboards/kc60/keymaps/dbroqua/keymap.c @@ -0,0 +1,103 @@ +// This is the canonical layout file for the Quantum project. If you want to add another keyboard, +// this is the style you want to emulate. + +#include "kc60.h" + +#define _QWERTY 0 +#define _FNCAPS 1 +#define _FNRIGHTSHIFT 2 + +// Fillers to make layering more clear +#define ______ KC_TRNS +#define XXXXXXX KC_NO + +// Func macro definitions. +#define S_LED FUNC(0) +#define S_LEDI FUNC(1) +#define S_LEDD FUNC(2) + +// Enable these functions using FUNC(n) macro. +const uint16_t PROGMEM fn_actions[] = { + [0] = ACTION_BACKLIGHT_TOGGLE(), + [1] = ACTION_BACKLIGHT_INCREASE(), + [2] = ACTION_BACKLIGHT_DECREASE() + }; + +/* + * | | | + * | | | + * | | | + * | | | + * | | + */ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Qwerty + * ,-----------------------------------------------------------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ` | Bksp| + * |-----------------------------------------------------------------------------------------+ + * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | + * |-----------------------------------------------------------------------------------------+ + * | Caps/FN1| A | S | D | F | G | H | J | K | L | ; | ' | Enter | + * |-----------------------------------------------------------------------------------------+ + * | Shift | Z | X | C | V | B | N | M | , | . | / | Up | FN2 | + * |-----------------------------------------------------------------------------------------+ + * | Ctrl | Gui | Alt | Space | AltGr | Left | Down | Right | + * `-----------------------------------------------------------------------------------------' + */ + [0] = KEYMAP( /* Basic QWERTY */ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ + LT(_FNCAPS, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ + KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(_FNRIGHTSHIFT), KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_BSPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT \ + ), + +/* Layer 1 + * ,-----------------------------------------------------------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del | + * |-----------------------------------------------------------------------------------------+ + * | | | | | | | | | | | | | | | + * |-----------------------------------------------------------------------------------------+ + * | | | | | | | | Psc | | | | | | + * |-----------------------------------------------------------------------------------------+ + * | | Led | Led-| Led+| | Mute| Vol+| Vol-| | | | Play | | + * |-----------------------------------------------------------------------------------------+ + * | | | | | | Prev | Stop | Next | + * `-----------------------------------------------------------------------------------------' + */ + [_FNCAPS] = KEYMAP( /* Layer 1 */ + ______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ + ______, ______, ______, ______, ______, ______, ______, KC_PSCR,______, ______, ______, ______, ______, ______, \ + ______, ______, S_LED, S_LEDI, S_LEDD,______,KC_MUTE,KC_VOLU,KC_VOLD,______, ______, ______, ______,KC_MPLY, \ + ______, ______, ______, ______, KC_DEL, ______, KC_MPRV, KC_MSTP, KC_MNXT \ + ), + +/* Layer 2 + * ,-----------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |-----------------------------------------------------------------------------------------+ + * | | | | | | | | | | | | | | | + * |-----------------------------------------------------------------------------------------+ + * | | | | | | | | | | | | | | + * |-----------------------------------------------------------------------------------------+ + * | | | | | | | | | | | | PgUp | | + * |-----------------------------------------------------------------------------------------+ + * | | | | | | Home | PgDown| End | + * `-----------------------------------------------------------------------------------------' + */ + [_FNRIGHTSHIFT] = KEYMAP( /* Layer 2 */ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_PGUP, \ + ______, ______, ______, ______, ______, ______, KC_HOME,KC_PGDN,KC_END \ + ), +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + return MACRO_NONE; +}; diff --git a/keyboards/kc60/keymaps/dbroqua/readme.md b/keyboards/kc60/keymaps/dbroqua/readme.md new file mode 100644 index 0000000000..b71d10ab04 --- /dev/null +++ b/keyboards/kc60/keymaps/dbroqua/readme.md @@ -0,0 +1,11 @@ +# Dbroqua Layout + +* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/24fa7821d4955ec3c76037c8e159a199 +* Online keyboard layout editor (caps layer): http://www.keyboard-layout-editor.com/#/gists/4136d4d1555d6f0d9403c21aaf50fd37 +* Online keyboard layout editor (fn2 layer): http://www.keyboard-layout-editor.com/#/gists/cf4955f73f339020dbb41c15364e7e4f + +# Programming Instructions: +Enter into programming mode and run the following command. +``` +$ sudo KEYMAP=dbroqua make dfu +``` \ No newline at end of file From e6dcb8de8ce1a051b3c34c3e61fac4f2d6af8773 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Wed, 24 Aug 2016 22:22:14 +0200 Subject: [PATCH 075/120] - Fixed layout for kc60 --- keyboards/kc60/keymaps/default/keymap.c | 2 +- keyboards/kc60/keymaps/sgoodwin/keymap.c | 6 +++--- keyboards/kc60/keymaps/stanleylai/keymap.c | 8 ++++---- keyboards/kc60/keymaps/wigguno/keymap.c | 4 ++-- keyboards/kc60/keymaps/workman-dead/keymap.c | 10 +++++----- keyboards/kc60/keymaps/ws2812/keymap.c | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/keyboards/kc60/keymaps/default/keymap.c b/keyboards/kc60/keymaps/default/keymap.c index 6f8352c695..293ff3ab46 100644 --- a/keyboards/kc60/keymaps/default/keymap.c +++ b/keyboards/kc60/keymaps/default/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, RESET \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_RGUI, KC_RALT, KC_RCTL, RESET \ ), }; diff --git a/keyboards/kc60/keymaps/sgoodwin/keymap.c b/keyboards/kc60/keymaps/sgoodwin/keymap.c index 99e95c2326..3192b25142 100644 --- a/keyboards/kc60/keymaps/sgoodwin/keymap.c +++ b/keyboards/kc60/keymaps/sgoodwin/keymap.c @@ -13,21 +13,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, \ MO(2), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_NO, KC_ENT, \ KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, DF(1) \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_RGUI, KC_RALT, KC_RCTL, DF(1) \ ), [1] = KEYMAP( /* Basic QWERTY */ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ MO(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, DF(0) \ + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_RGUI, KC_RALT, KC_RCTL, DF(0) \ ), [2] = KEYMAP( /* KBP v60-like arrows, media keys, etc */ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, BL_INC, BL_DEC, BL_STEP, \ KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_TRNS, \ KC_TRNS, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, DEBUG, RESET, KC_TRNS, KC_NO \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_NO, DEBUG, RESET, KC_TRNS, KC_NO \ ), }; diff --git a/keyboards/kc60/keymaps/stanleylai/keymap.c b/keyboards/kc60/keymaps/stanleylai/keymap.c index 057c73bf4d..212fa88bd0 100644 --- a/keyboards/kc60/keymaps/stanleylai/keymap.c +++ b/keyboards/kc60/keymaps/stanleylai/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ LT(_FL, KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_NO, KC_ENT, \ KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, MO(_FL), KC_UP, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI,KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_RGUI,KC_LEFT, KC_DOWN, KC_RGHT), // Function layer [_FL] = KEYMAP( @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_MPRV,KC_UP, KC_MNXT,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR,KC_SLCK, KC_PAUS, KC_INS, \ KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_TRNS,KC_NO, KC_MUTE,KC_VOLD,KC_VOLU,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, LT(_RGBL, KC_PGUP),\ - KC_TRNS,KC_TRNS,KC_TRNS, KC_MPLY, KC_TRNS,KC_HOME, KC_PGDN, KC_END), + KC_TRNS,KC_TRNS,KC_TRNS, KC_MPLY, KC_NO, KC_TRNS,KC_HOME, KC_PGDN, KC_END), // RGB Layer [_RGBL] = KEYMAP( @@ -39,13 +39,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_TRNS,KC_NO, RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,BL_STEP,BL_TOGG, KC_TRNS, KC_TRNS,\ - KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_NO, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS), #else RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_STEP,BL_TOGG, KC_TRNS, KC_TRNS,\ - KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_NO, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS), #endif }; diff --git a/keyboards/kc60/keymaps/wigguno/keymap.c b/keyboards/kc60/keymaps/wigguno/keymap.c index 50b1d0f981..dca2826eb1 100644 --- a/keyboards/kc60/keymaps/wigguno/keymap.c +++ b/keyboards/kc60/keymaps/wigguno/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \ KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, KC_RSFT, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_RALT, MO(1), KC_RGUI, KC_RCTL \ ), /* @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, BL_DEC, BL_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, \ - RESET, KC_TRNS, KC_TRNS, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ + RESET, KC_TRNS, KC_TRNS, BL_TOGG, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ ), }; diff --git a/keyboards/kc60/keymaps/workman-dead/keymap.c b/keyboards/kc60/keymaps/workman-dead/keymap.c index 103adeef61..9786e37d8c 100644 --- a/keyboards/kc60/keymaps/workman-dead/keymap.c +++ b/keyboards/kc60/keymaps/workman-dead/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TABM, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, \ KC_LCTL, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT, _______, KC_ENT, \ KC_LSFT, _______, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, DK_ACT, KC_DOT, KC_SLSH, _______, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPFN, KC_RALT, KC_RGUI, KC_RCTL, KC_DFQW), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPFN, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, KC_DFQW), // QWERTY /* @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TABM, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, _______, KC_ENT, \ KC_LSFT, _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, DK_ACT, KC_DOT, KC_SLSH, _______, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPFN, KC_RALT, KC_RGUI, KC_RCTL, KC_DOWN), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPFN, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, KC_DOWN), // dead key layer /* @@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, KC_PERC, KC_AMPR, KC_QUES, KC_PLUS, KC_AT, KC_DLR, KC_UNDS, KC_LBRC, KC_RBRC, KC_EXLM, KC_TILD, KC_CIRC, _______, \ _______, KC_HASH, KC_LPRN, KC_EQL, KC_0, KC_LCBR, KC_RCBR, KC_1, KC_ASTR, KC_RPRN, KC_MINS, KC_GRV, _______, KC_CENT, \ _______, _______, KC_6, KC_7, KC_8, KC_9, KC_PIPE, KC_BSLS, KC_2, DK_REL, KC_4, KC_5, _______, _______, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_COMS, KC_RALT, KC_RGUI, KC_RCTL, _______), + KC_LCTL, KC_LALT, KC_LGUI, KC_COMS, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, _______), // function layer /* @@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_CMDQ, KC_CMDD, KC_CSTB, KC_C_TB, _______, _______, KC_PGDN, KC_UP, KC_PGUP, _______, _______, _______, KC_INS, \ KC_LSFT, KC_CMDA, KC_CMDS, KC_C_LF, KC_C_RT, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_END, _______, KC_BSPC, \ KC_LSFT, _______, KC_CMDZ, KC_CMDX, _______, KC_CMDC, KC_CMDV, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_RALT, KC_RGUI, KC_RCTL, RESET), + KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, RESET), // mouse layer /* @@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, KC_ACL2, KC_ACL1, KC_ACL0, _______, _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, KC_BTN1, _______, _______, _______, _______), + _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______), }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) diff --git a/keyboards/kc60/keymaps/ws2812/keymap.c b/keyboards/kc60/keymaps/ws2812/keymap.c index 1c0574df09..ae11ebf91c 100644 --- a/keyboards/kc60/keymaps/ws2812/keymap.c +++ b/keyboards/kc60/keymaps/ws2812/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_NO, KC_ENT, \ KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_NO, KC_RSFT, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,KC_RGUI, MO(_FL), KC_RCTL), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_RALT,KC_RGUI, MO(_FL), KC_RCTL), /* Keymap _FL: Function Layer * ,-----------------------------------------------------------. @@ -53,13 +53,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_INC, BL_TOGG, \ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RESET), #else KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, \ KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_INC, BL_TOGG, \ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RESET), #endif }; From a72d46d1ecf7c317830aca91aadc3fae01f00bca Mon Sep 17 00:00:00 2001 From: Joshua T Date: Wed, 24 Aug 2016 23:58:59 -0500 Subject: [PATCH 076/120] Added replicaJunction keymap --- .../atreus-replica-base-colemakdh.png | Bin 0 -> 76319 bytes .../replicaJunction/atreus-replica-extend.png | Bin 0 -> 91555 bytes .../atreus-replica-function.png | Bin 0 -> 92516 bytes .../replicaJunction/atreus-replica-game.png | Bin 0 -> 72509 bytes .../replicaJunction/atreus-replica-num.png | Bin 0 -> 73171 bytes .../atreus/keymaps/replicaJunction/config.h | 94 +++++++++++++++ .../atreus/keymaps/replicaJunction/keymap.c | 107 ++++++++++++++++++ .../atreus/keymaps/replicaJunction/readme.md | 57 ++++++++++ 8 files changed, 258 insertions(+) create mode 100644 keyboards/atreus/keymaps/replicaJunction/atreus-replica-base-colemakdh.png create mode 100644 keyboards/atreus/keymaps/replicaJunction/atreus-replica-extend.png create mode 100644 keyboards/atreus/keymaps/replicaJunction/atreus-replica-function.png create mode 100644 keyboards/atreus/keymaps/replicaJunction/atreus-replica-game.png create mode 100644 keyboards/atreus/keymaps/replicaJunction/atreus-replica-num.png create mode 100644 keyboards/atreus/keymaps/replicaJunction/config.h create mode 100644 keyboards/atreus/keymaps/replicaJunction/keymap.c create mode 100644 keyboards/atreus/keymaps/replicaJunction/readme.md diff --git a/keyboards/atreus/keymaps/replicaJunction/atreus-replica-base-colemakdh.png b/keyboards/atreus/keymaps/replicaJunction/atreus-replica-base-colemakdh.png new file mode 100644 index 0000000000000000000000000000000000000000..4640f9f529970fed031da9e838cfbc95a172bdf2 GIT binary patch literal 76319 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
%nXN~;9=zXI%3t`? zvij-_nO2U9dwbh>&pirUQg#N?6>%$D6n1%s7MGwechkc8?7k|W@a*6&`GQXnPyO(?#(w$ui`f?y zTBjM^k+y5ws_3DA=W47k`;W>y?Uz)J&v&eSyz6IRQ1=h3fA6wBuUi+)SYs6M{a$tc z*{7>{9_H>+Co*E^U|Hx!j1~!lgme_-oAtM|RHw5f+iv7nF=O19+;!-b^ao zbm}2nsax=a8&}ON)>b}X>hhQ;$lCCE4gb4FjV#eQ7P1XzzO$+O-IBN)3aVHV7&rO+ z2)ur4L3U~IjHqRakEa*;|8VX~k7ckwTYYhN@TFa`rV@&?)-j2!D&4)>I`xL>P6j*2 zmQ9zR(+fo$+&RMQ7mYS`gbnKMnaoc@wKd-y{@5jf-uKVl$ zK6&OUpZfgu%IvwIxuiQYUfQhZnRxBZ$KxkYGp*B6tYg;Ocj>8HXyX3A-%h{2q%`;V zG}V@PuVrVZspgpc5WW`TZYp_F=>fxmcB8_dPp6x|owcv%8gJ?O`g`r%OMRk#e|xKR zwpYn6C3`-2p!#OG|CE{CM*YiJ51QQz-^_GW%T=VA%eq5@Y0Cnu8Lai0dmXfr&M=8z zkz5<-)yl0AG(kAz2BWRJ?w-uM>0-wVb@wdUo$>lj`*sIW9f!Rqn)&S{b}8=t{cbnw z`{y&$=S8l%edzp#MsrcY8xtO-SBOh5WSsT(s`NsmC8-u&`4ih@EQ?Yurp3Ru6|Rd57K+5x$Tn=dv5${ieS={d9$z0NkZyK+&Zz+`2V{-;mbPr zWv^GewS9GOME8y;=8?9&M?WG)RQzj^ma_cqgQw9e!neEdLR0rP*_swSBmzr zkEaAWm(Tp4R&;>7&rTgp_IWvir+xjbb1Bw08XUs}H+W ze9BGpQt!nn3OjVmShLtJ796mjWVqzMpUuZ3KJmAfu=6hp+3<5ggkUJ&<_Qy@J6&W` zUU67H^tRTgDPLx7`X|RN5NNRI&aVY49{>COe!WZhf;G8M`r~!E1q5whuh~4Os5N!( zVuPJdv)2cHZ|3h_bSmJ>-^bRO^8B@ZIl_$1TG{{ie>lW_X~{B?Ib9Ee^AorEuj_I; z(qx|A#rO7hx7^)q(_a1kKQlKjIX!J@SVxAJKu-4bJ3I~(HL?O+Cd%6Ft~4n*ZB?*u ziNx7$`?c=6mPG5HU>}!^^KefM- zrc-cCGX2Dfbt~P^)yNqpxu~Y7ReygMD?YWY=qLx%kJP#yCCBEN=g;F20Zpe|dX#p4 zp6>2|pyCBaIe|()Qup|q>0MB)`t~N$efs6y2liQioU`lndZ*t{T)U@rJ>C4g!?db& z_0E6l^D0AQ>hDJ{<(p!n${}ZxF=0y1qOWW0GF&zs=Cc-Ar7HccX;;G|Ms^tm<=z7S zvj@Kis4E;|l+b(JAspyZ{jF1dp1|eh{?q54crfSN`}^_RPQ;|oEqygFSMvSzY$gq- zsS*|i39;(xmu89FniCHD+5h3FG)zn4t*TlG`auIsyy zeblqW$J3Si*?N=T@BOY9dpiA%=Yhv>x8D~7O({!f{J44L!+`O50muPH1s6P%9x>EAD~ zx1C>bu2rc3`e0As_VDt!*-l5+SkCX5+qWxTVSVJaizNy(rZXCTQCJYsdc}AF$K9(7 zu6&+hn7kx-gJ_@TIdKJvds3|7OZGmvKaEkM-Bsk~$KaBp)4JPF{C*x6U;8z5-D(Fbr)HFRNiM6^s9@QzG1so z&ApP#zDx7l-PknL9-V$L>*GrXSEh)PYfrvkV2u#|ez!b+rYDO5`_D^CN5K=7VO>k6m8P#8GBx&Y-AYHKX`)_pUE)LR>t`|JLpL`Xus+;}@n#`OT}P zFLF2NO}zhh`~A2JW|94moHZ3skJ9ib-esiCUlVGbcKr zs_0-7Ytro8ZJNGc4n2FA^XQMs;>7m#K~rBzPT6a*IYhgC{|qM`1_k9?(N7aNuP_#0 ze!nO_HT8vp7PFny{J#7H&mT*3#C?eT!)zyI;QfK=zl_+PfGIl<^V`R;IiE3|@WS@B z^EAPlrIUGXq{fV;h(&)?#$tJzCYOTXK(=!-vcM_PUkTcla;L%ws-3dH-kUC+xRa>c1b3R>ux!#_Ib0^ zAM24cnq7I@)j6AQXG&&w#GaIyFZP~n%bcS%IeEvHrv80D@{4#iv~$WU)T40 zNy^;QG_7E}^S@obPJ@xdKF9Cpo~~<~83R^cY+2v^KT3LA!zmks?G?u>ub*UjB7DJ!Cr4Bn*>#5}}GuN8x=vuM4=3hgC zndzPFD+M<0SsGgN>u1tU%XK-)KZ~UNw|2SapBKBkt87(p`-7@{XfJQ6?t(lkfgI&? zt4|(2qMo}bm`!9u(A$!$dHU};k8fq1)-+3qL4=Xl(a*a3wa@IJhg}*>B9&~8x27?8 znCa)ld^skTCB9BW?$7P3v+cB&Hf31*oqw`?qhyEmiw7>JCjCrv(<}IQC;F1B*1N4L ze{BL|&19CX;rE;E%6WlNg3mjB)#ugEKOAJ2U&C}P;R1Nv^lE~g`h^rv;~|MOIL<6%B$*Y)$ZX7OakcwaCKTN9yq zP>;1h_x(B1wc25)_Lsl75Lfc*M%c-qobMd~l!eS|4&PR4YVrp6*`vSMQe1&YQ&R!0;h$y0VOI zF>jUM%=Yei%)G5#IiK(Ckl%Xq$@{FuNss5Re$L?V?0wg*N1CFk^CWM^%vm;v+ldOCajX9D;NYjmmtPEnr#de0S6yf{ zqfz)?`PAIjtmW4_G>nh4e#n&!JlFp}VeT@Edokjh78$whoWJ3`0{f}WNxAbsU5QM( z&|sRqZ_#%De{VLsKDu;TPBeYq#^pCE7MC98ll}d@A^HWc$2{HqNX4jW+qx=2!V%?3_aoQ6cbRTDE3G^^;?aVxGy06RXQ_{-m($818D|GTL z^IWN5bfP=k?P>vsi>JTs*N~NhHBYC8yY=lky7#@xd~;3FKhfJo{~uFa^dsStM2Kl| z!2aJV4uQEzAs?9%W`2I%+7PHA%3$L#({p7&tK2d#)`s2{JdeL#kDo567FB-v;fhyP zOLBD1K5vuLENgk5>UO^(zT?ydhnDxMx=J6XbgASgo9+{yekx(N_Ef*{x+wjyL+zgr zTW9ATnB}-%I!pePaoRMtNVh-N&)5Ge-nsAyyWri_+JpLBQ8N(MW`sn2( zdmC=ig^wf;YO;x}GMkvY(RiwFe{?;cmRGV}y9W34>)wSFl6_>s1{Z1ZI0*Nrg=;ZXBOx!dwnVV2zWl( zSHtDQpDJEyo&R${W7yfcD-0gmG9FsNBjfB=ZoOr4eVXB^H3An)6n=mffqlPMoiBF& zV&xeV4N)`Ou!cqV>Sv3yit;?UbZXsX>2C@h8jsEdwiJU?$xhzAY;lgSC{V`g) z4%`d5q;?D3^)R}$EM(8mXS0JO8TIBd9W<-rD{@?-d3wS9oXvB4=N&Fi@H=$Xtn!XU z#yedgDCgpycAUDs>N1NOJlzlPJ_H+IHgf(7AFuQ+6XrIA)^;|9IIloJ5 zuQfl|q9ggx;>5ihaX&cX{l6*)YKmIOlzp*KEDk@<$|&NQ%UH28<5_#-V!hpdc{3bC zm&w=_O6)HrLa%2kN?&wXMS6i zgO(GkEzbW+h}+=scH8Z|%-ABe;|I5SESNc)=j!WuPJF?a&OHg9)Wmx#&t>NWldi}q zQ5``m0~~zyk2tsN@5$VyVW#!USm#P$sASId7mJKuBy7JJ#Us5wHnZY!{8^^ZXSyr@ zE|Gq-XI?k=gW%~7WxW4S?0v!f;k@l99+6NTT`gy+?{aJ(EZr~6ns{vIV>#uOen#2m zjq)lsm0?%HCe$iSF#q~Je(U~g$KB`a2;FU4qpvA=LG05aqa$0}e^#F7%)8QLxZmH^ z&ics3#qQI)%vaxU^IXXwvU1Tzg_rsbN|}GU_4h@*a(czL`;FDkb;sRr_3?7ICMP-w zUf^I&xw0ZK=>FtJm2;rg--{7X%_%s#y6Eh)f2S;Fb@46aIis>jqG5$%%tn)~@t^BDRy8z#{$$kpalxb)PsChT z20VIhvYmsui@|TlMVE+&ZjT=nwk$atvM~DI`8KXk)8ndE`fZr^TH$J!GxL_2LOxaj zXMWFmJm>t@14-qV)~w@@x|8rs`#ksEpj96y21lpQEnVX5Gnq?hYS6(LL-Sc#j7`(e zxt;D$;NI|a=YuA0r{LF_L6Vm$#J2UY{Y(Gz<73b)tuz0Z6v{@*FgKi^WA@r(mg79b z&i|gLj|HyaNz|SHIIcU(!KLwQe*O*j9K${Jcbum@`|MKx|M`03BTKi}T-9jyDT{Ou zZc4aR5~8Hk<##LQdL8SBhhH?bychkQ^}YE>;9*g>I28}~>8}|Tn3yhIIC*yS*AKDf zcU6N|IZoZ@=pg9eX=*ZSw}!z6g?<^!OO^K{?e(L#9GaSSw9@GNsySJzyV}o8={{~- z{LF__Z{7ZXzd~>S`IzbbnAC&$bn$wzVN7oH#9@phX}NK9U})OD%v5&=>tgxCV7F&uKddo@R>z{|90 zD_g1TlgC|G49gk+OpmXNT=zK9aiKxA+EOEvs2C46)sAP2xsJNeHFD~?Q+#>DY5k+` z)%V+l`&2%z{rIe%IkipTl%##h_SAn^3-W0Xu#a25bx5=qRd5KtfqCCyDt}<51*NF^Zo3tFWOosxt<6sX?AS3s0;`R3AGI@nq##m z!)$)Yi~kS#>nF(meX!T`)K{NR0at5Tx4vh)GJWUX^hv*cUt6zAIL;#5b)U~c?@^`O zPJ6TS=WV~w`C|I4;Hrv)q{8DVX~&dKeLeQmN8&(#&>pWNqQ1qO`f>^$urViGxaG>f zcf~`dA6v50=Y|VSNxVK|$|-^6Pm5>x8GY_3Z%Jp0;Ca=xJoxN7%eDD8a-aVC9a(HA z7<})?^cjC{?LTrlzdYt@U(I1&^C{n*%ns$OIkZ18!0Pv#%||)a=Lkf6p7Pq4WzL#R z2ZLkB5@oC3Y<%>fnSb5x(6XAuTk9F@zFJ`R%{zg-FTKPlcB(y942++8+iJ?F5Ny5v(?h=5u|yrPpohUB-COB2z4K@@>(yg4hZ1 zt)HfT)7Dfg%XbaZ>R44M+k4{2lBJWSw|?Ew8+6dy#Y(2MQPMcgqfdXqHL<`ejY@vA z!e%xku3*VwShwqymSpJ_*@PRP{XT!sWH@TFUj1yc>cy8Pm)C%{2;H%fD>|Y0=~BTT z8{-3R6E9Xz7qDlIPf`2R!PXSZn|osqQ%cjV1J85grT0(qVco)RmLBl@mplCjI;KbM-FajortW*%({w`}II|$qKH9)ol98W;@>R`@Q7w;mFBx z3oTZ!=yUk8J)NaAN9oheHM)@xQ#b!M=l)j_E@AyG)84YPG$bol+A z&why)tM!gtog~Wcn|8E6iu;C?;KT5ncUTJDE3dJL+}I&z`$6(Y{pVQT*Abi%3m^K< zZ0BWR&U*N?ow4SC%BRU0S3lW2WS*R;EX8?ufk%Q5%X~GLXHmQd*#E35pZc?ti}&Wi z4JVfT)9JqCnby1bntDdF$FrF}kpaJ-EctxFHT8j1gtM@CLL1{IfmA79#-_@Oh6J^#mIW7VRG!TIF?o7)e$GOdADusrWiIzV75y^hmGyZO zO;HO&wgZ<~x>lL4W$NmEv2m8!>87B@wGk~IJ6F01nfytZX!CN(}Tg6G&3|i+D%KBb$Oqt{A2h1zkW@kn*|K>qaXU;aGA}$ zv-@7~xALi9dwMMn_AIbm&0v>s?8`=%526Q-o8?3>9=1t-z+UA#Gcp>AepM$Yrvd_MO#0X1cgc>!}6Tf4-1rGb(X8 znL9UQagM|W-Z|;l8WxntnHGAUZp)NeuIaEr*Q;^z1GZRS&H|POyQ_ZT?`_w+_cWK8 zy<%MAyOJS+dBX#ZAe*)e^#TD$CO+I!&;(k(Q1Pf!UF8DH2jhi>92T1u-agzhS)JFb zHL8H&pv#@QFN@_*p6KBe`Pz|m=k=M-pFJCtt{-34>nnc#r0M!kd&ED-=q>0lZh4%l zXXf%ga>fqzd&))?E(p5IO#Hsq@_hQ~ZHyl}1s>-w;QGYl`=RY@g!c#6s*4sSR&Uz)^)|h@$oc`a zy!Q0>XX5rhw^^h;32QX#a!!44bJe+-4Z&P;u}loTIT9khsvXVz2lS)2t<`kcpuK2C zL(&}c=yHoCZ9mK%BKMkDS@2C(?RH)nz$?$dyX5Cg9UY}ahlw20Mk*p48(#l^(9Ey$ z;((<<@99a#*|E$ScVTM*7KbpjJTRL5jq$e?uo_6 z*hFr=-DJSZ=-S8Gal~?Sa$4TX9G1Y~Ih(UYWy=1ose8}Fv!ZarN-g7rf}2N01ziqH zcskiP=`y67o%?-i8HW~2-I*z&+J}yL-V3iyo_^g_JJP;p2UEeE=(W~avRtJSk5ihGBmWmyIuD6Jv18$IX2jT2ig==9CB= zJ`$>{k$W*bcIlxdAqNyyRlS#lFh0`Y=8uWlbuv(7MY$jI3I(=!7pqBU+q-tmtkF}t zsKaU(14;f`i8TbYTIu6GvY_SP+v3_gBJEpg(~O`^Fb zzjQADsk?KA*RJ8cOx=%%lcYkvcud-PQPVCne*eySD;k)xIqW8v+vV7D?pC`tS!1U3 zl!OI$CRVyM&o%9<5;yyzVUV-oAY0<{Q%}Ap&XjgA5YZ04seJnRv}?VO(l1)`1wFWE z{-h+c)_%z2&#Pj9G zV8`@p$K<;{HykQ^mlZDRwz6R}n}bUp$0YmaDNX_bE&Go?w@^FRGp z&+R_{%Ms~Iymvih>gS1thp*3wI;h82Kl9QXPm4d90h@C|*c#S#y<26f^tK~AgwOuy zDv!`fYVE>4tLAJy9%?i1`kvCj%@O+pWmhcPBl|B#wDR?~kltz$Q|{ipsHwt|&vv$e zmKXM}D)7x+al&HN{`9Xki<$oHc{brSD4r`Lo398r9Xa<>j=g>wW2?gIV-kTHq7B8x zLZ6r>Oj44nIl##7adX}Rzrrd*E^F7L6Bli0{}MV~FLsF)^Mi^L6BJv|n9e>UcJ=24 z#ioWut8eX@Fnhxs6CRC8`;1IOFYln@iU3oUQWYBIS0rF4PLo#!hU?7M#oeV;Lv{ose> zMGUSyi=*}iJ!sTooM;l;roHatq?$O_Zyjxu^p;4nH-yTs@^}u~M7p45#>(SfS7uEA zdqmiOicN6E5fcrE`KG;#cBp(mSaq~-3JTIp8k+mDi(Ppu<=nWd&Lw-Ue(TZ+h29K zGj5t!cyT39)e~LN%Btelue@<)tgF&k?q9RB?ESo~k|&&H{-Tl{8xtA!uZcR5Skx=> z`qHX9JtfVlHyAX2In4@b+cIx1_k-yxZEK%88UzNEd8WOxe8K9zslAQ+L*NDB7A=Qa z3s)?(>I;0D)f8IxAwc?v;lU|-0q6ZDxVHB)Ox?tj!3OHeu^j%;(=Da9z~iIb#YL;Q zuIz45YON0lZc_SDX~!+T)am1OUoTc^ahaS6PlAlM&(K|5mpZRl_0`S^i+EmtII+9- zyzO_7Q0ZOei=^j<-ZFhv`g!LPS-FqfFDP|9T2-#aujM?an){bdmSe!nkj7FG+iz~? zXCD22IpdCV*bHBW*N+|?Y~H-%jLUHr9-*0LnzPIAmQH8cDRN+hrus^B40z_bbBdq+jJzf^PujumUDT%6 z>vpeW`f=s>f}%h*-IUu=ix}*7G%%Id?)WADVYj4lT1VyQXD3ZXGM#qa5HpNnkbiUZ zkIvy0HXLoMU0bfRifFbe2YETl{83yaCh(N8bIH1gmqiRORqbqEH+RLc+4=i4e|>+i z?|SsJ+`8$~eZnv0jn6LrQNHe(TIGHB3qLD%YC4!Kj(c-&;+{Z3S22laYExwAND4{@ zIoz>cFylmID4WAXRs`RQkMxwz=&CD!SVk-N=Z6^G}4Y3N=%28h*3EX(P zxTVEC7~yc7+NG7;ubwx^5w>Y z2OBO_u}B!3-&|uLeskw^!>k@<)k`ft{sGsPzT(#W9CZDL-XZyrhjUycHA}LO@#@Ta z(E zv54>8OB`l>J~@rIZIScEnh3KQk2fw0xPHKmAvVu7-;trgLH^*3JZd8J)(r z>VCgXeK?NB-E!s!cvVmBmy&>kHT7AjumnpCkWRzqguc za#iNwHqL9a6q))3bOP=D%^7!J_j;@`HfGb)A;yI?m&`r=pl9(NcS*bC z$xE+%J$<@h?zZd#*X0kM1o!5@zOYo@*jual<}b1N2LtS!w(h&Sd;Uk+XO$C__-C5C zZ8qEW@ZO@bUftVwN>=hd%&&Zw$S~i5#W%2G-vyN~j`c0=a#bq?^tNz6DE7aSBx0+@ z+w}5}+pObvER7W>EY%9GcKPhM`xe(Fy_p?O(M(+ohqPQoCU1#LWn}(wc)H0~i^7I8 ztUs!}wukGM1$Z(XU$wFIY-Eb($^)Jke=zVStW#fO9DI@QY}vn69NVW~t@~Aa^Om}~ z^XcM6!3Ft|3ogz`&sB_e-=^R*RZ(-Qxu1Q{Xx9G;7jMcj5V;Smi z=Wbsc%*?qtdEWl?w~HfeI+n|b9Zc`jI`wdIznxaZ{0Fwi>5>e4y!CdvyxIMJ-zGQJ z_YawVu*d~OYE^}Zu}ro~KYsX$q5Ebx5z!f^c3&;N<2j2(8-u3gl zmAY0WUg%(TEUR_MOxR%9Z4|Ofc=m-Wt@W>MABLJ}czdx1rmF_jKWr60#T3GobLQLJ zhTm(q-`f>(^_rtuS!!&-5l7iii)>bJ`!UmE?W@xn@_%?3*(N7*zjgn3c&EG4y+5AM zts62#Lfe*vur>7D+-unR_QZjSo<^aSA*-t@j;YTr2|By5^TFfn2UXK6O^gq)A2-;4 zMxnD?ij(aUqg^(O5~IkWw;PYkeG1$pHoxLgXVal)3bTB!oww$BFx^pc(I$l(V!at+ z3qYIutfi@c*#ge|db(9sK3(+4?qW;r2Bp}p2W212mF{uO zI6n2I;w3f(HQv?#=CLkqD(@)KZu-r2VREUYby<#V!Gk!BN1DaI{q9MNF;CWJzp&gR z?b@11SKsBQ=52rV`QcIV_%*kG7|1`cUj0IZL1L@8+4d^ORazmNZTF~zv~5vq;(oBW z`+VB@C(}RebH1)sJy{^S;3(^d)mzdw6&n84$W}YW|KrArgQ7J?woDe+HY6VAy53O6 zShMJ$>vsQjIvj4zQ?;s!!*BCU-Y40RbSHK#pUCAXflU^Dx{Ew+b)67$Elg|iWbaz# z;i$VM#rTHEhL?d|0)^|XbG=wsX}e4YooI79dsWpnRj()d>(1W(^*r~h#MuvW%Id8> ziZ7EFW!%Z0VAQ~3S+c;#TUxob(5h^V2A%>+m7O% zQ%wnFZ!%W6-IYCR=p{GbchbL%Hr6(ctf|Uf+c<>g&eUM)*mYnEi=7mE|*mLk@{i(RMvyrJX%gp&MYZP`&t|BGO?H~GxX5>i=7`LW22Ri zm%1uFVmj)!PPzO2GRe*c^_q*W;wMXNLOS=j2`p`Dm3f}MDkwnp{2XWZ+22=5?rcfz zaC!3e&1IW@ZQ=0JJbUTjpf`@QOYbq?6aVp7t=`!8w^`AeB~#X}D*heIu>V!-r?Xri zPA|9^7b%eQI_e6KgJGA7m$IMH>GwjajhnNU@vl7BzD53sXLj4FPuJtBeT!zF*|x;& zrbd_f#4QWGuY%gyH7W~_x5b|i5Iy>eTVsjGRt&v?W zqQcir)v@5}>dCRUD)kn4eA)2k6{lX|n;i}tbGUoGACaVcgoGPHJP_f<#9*s4E@AcHb1^wzuyxK+6$0$pn);) z%*r25hsl@a1o zugpt0#h$g=VWO-hw})}rETu=)2U*3hcy`=uP|`e|KCjX(%Svo*x-6T>%ztM!T;j#% zo|n4S+Had{5>)`4k&rq|gEpO9FHDAet`c~56o&q_qBUr?J-!GqgJ4@iR z%esz7?D91V+)I2Gc$74{9`}hnZd3Y9zW&?I^wey($?;ytm81jKIL&^&rSTEyh@R4k z6BD$mcCegXm>s~9Ql_J1>;7f7npCRXx;5O=g0tTKn0SV1UEf@h3ax+{Z(iK2KP@)b zDR^qBidS~|Gl8?c3&dk8pH5x zcRbv9D`lO2;@Z26R;kN3-cb4>qUk@wU|}X>-9=ezZO$f5wMVI@rM$CQHH2hanpgH~ zxr7I(DBKmhvhDKInoyCZN36x-bAEFrStd#ZJlVBy(~HAwB9>wgiq6}9=kZRDg8l$7tx zc3p{uCi`#hn4QgYQ%ClJbM~%xyI#B8-&dR3z%5znnY};)UM|Fu#>&XWtHPZyL6EQ>_39ntl`fIDsAvT9&F_0+UwPn zFw0fpV(_!+H@-PcW^!GWC!#sEbo#l!w;Gi64Y^$f0z%3T-DEsgP_s%{s++ey{B3i0 zm8XUN?vgFFXJ3fz{_^qh@oozT!3iIJJnrv)yZ!#Y4~s0`on;m2+`}UJCv>T1ul8%F zgZJxxzYTw~W!0CRo{sikuLMuMtFSTgd9B&cr8yI3e0O}AF8n~)R@O9Y$`U6*OEs^` zbC%Cfd@=ndX8%5106XbX~`nsu~?Gljqnd|M1F|+`oQT@~84^ma6v4uQhMz zOV?_OFKc*zh|R{_Xyvm4#y_i)n-_^HX>m5?o)QS1&tta0!)0PqkJj?y90$V_iVPb{ zo}W18_`YY`(`nJCT2Eg!v*>Mgv1fCbSUhWD*46|z#-nK+9fETibl6HKD_I{jW;ipw zwD?(9hhysk$qxCGIt&+_*V}3^2bI+y-EEn9Nrf}&tYCVww^_>?zQE)c{GcHPoi^wA zAG5O8O|*Ahpf>a9;`-G+|GE@7_sMKny=c#!iCN73{DF@BFUo(_&sS;6{~XQ|@rmt+ z=R3xFSGB84su@1)E_tbBJ|~p--%f_QiL9rlG9P?%p_6HL-*(AMOdskh7+1}yDq}pl z;Dncq`$C!J_f~pZ2A<=#P^+5Yx-fFmmCUI!?{8(VkNvI@Gf~v;%(EU2%Wi3I3Hw); zCYxp)ohiKT{H6!fu6|rr+V3iVTy#Rh<0HQ#z8GxX_))%r=LNUpMb}H48KR|+db0mm z^^!MMe&LIc=a^f5>V1{Hkn3|{QoC)=OzlPY`R#rrtT_{U=QZylBY_(MbH9YNOt-&$ z$EKZCW!Azt4Go3BrKQK%K6LYVgz&M1+p>ypbKV}>@F?f>xs98bipR?A-obb6j}7;% zqFt-JXBF+RxUoe;G*M=^hO0^My=<}j{LEc*j8}Nw`zrIrW1nAcV)3Cv)5Q&n3g2}3 z9ZdbG(`}J9b46y=^dl!Ht9#q6e8(Mf#L$aPQ|Ip*=0EN7brCf`9=5OUiir$iy!gR< ze%-H^PJhZGc%7w=t^-ZA&)D6NaO=|Nd*PN7QdTE!2)sPYQDA{bR@7664QnM9b8#{6 zd6DR_G4klX&bB!BXZGg*g$=&Ic{=S-x>kDnDc88Fkq=uOb!a2G2TDr)Mg?*+Vkw zsIb3HpmI4!_>8hUzu)c7SLD+2yqdGa+>Aj@-y&Pfc~W{x9lM^vL^rFyri*9s3f36$ zoYmmv)?K+m>FKG)gy}l``s*WE=N&se^_gMJqKg*uR=J5pPPmX6liX{Xb!O?VzPVMe zR&M&bZso%n%W@aXXmc)Y;`3qH_U`WP>vNQRraj+$-cGyqSMzB-y~Nt8o115_m7eQL z%D$a`BJ0J28T&uSgjAX6dbO@D4!gL?ruW8rpZi-+hTgJLJ+}9of)=x2{IiZn6IOAo zKe@Q4TJP`Yl=T*MBC*9G3K}K0f4^Mz-uiFH6D`k$m$&_uzW>9mcV@`J)r&e;WaM89 zX>*$=dcXGn-|wv1Jhm)1BFq=Bv&>Gvy8Gm&OjGj+7PjswtJlbY*Uw-1wq}*XZeEQ= zrkn{qN*C^}IDF#KZ@tE{pz|IJK&O-hx!kKMi;VG~le|kqRA^%*?c;^hB$Po~`Au;UI#N}ipW*(j@LX+Jw;p1gCe$)!E(w)DG(v5WGVT+fWo z=bj?ia0Qd-HbwPVoi_zoTM_L2IovyDWdbSe*Tb>H8Un-#gAU z$5sS13Mf4IaF}1btltT26Z@7q*ZTD1 z1=2RTw@h}f+rXK;_}s5WPxu0L8tbN;yQ=qAr^OZ4+g5*DV?AfpTFym2VT=!ipC}jz zhP3b=(DzbY6r^xNtaL?J+DdK>p+FhKq?RlBChfh;ryld3e$BAM%E8r8xywcN#q+vb znafWGYnJl6JnP(~5ZF3-+5Ep37CJM>|J$<8@a^Lrb1pTpa;t=II`u`S;n75QInAX% z`Rsl?*mCyzg^w{)xJnbmgf{=0pL4pAT}~tI?5wL7e*T^Q|2&h1i_P~t#ij4{>LjZ- zPkd6j(xV=fz~=L6-Ugj1r7+d)p*;6?%T)q15|lmCF0zE^Nrf-o=KcA%OT|yc(QVc(7vgB%G20K|9nCxC~YpD%5-r1-Lly}7iUeL-FcQp|MC;Qs*^Deh2P%XRMJ>< zqOc;6A(TgKf=+kmB&+rfSBw+H_ZeSIkde&H%3!g`SR`tp+hBOEM}CfEW>wi2R}UW7 zjm*2l*VW(IQCP~&dy#X_RLvvuPj^(-wta8woq6){zw7(|scKX(X)I#(c4=j8I}s7k zqO|^XZ;{;9$Wv--_!&N&5(w0h{A;}Ji?Msa%F=rux2SGh6rcFT-^gBX&j%;a&Z1K% zl)hMVtvyp2KlS_UoQ|0vAN*x=VRUI?s4K}{`q^_``n^4sLL1J{wGLm$|6?w%`JI3` z>qeGq?7tX3ME=prKH~P*PHcD1_Jw;oKc={xn9J~SVwwK6_aJH@Lp;gZbjb-VLYgU_#v z70|B?nB`nwv#P=4zU{1|E|D*vwE4P4ACz|xjI?05B3J!J@xr`T;WK>mV(q&5>W_b% zxbJa!$d5;VI#Lp*zr4KsbcbQz`uhL>CP{BSXZ2d-lrCSi$0|9^ON~nB+gw{;rI@MP zuq*M|w6Ah~AL$YC$8-L#iG8dWa?=xy7YDzTvE9A+LHUF$N?ZLBMK8KJSbya{Q{2Y; zKzPcHwAr~{XZ4@{ifz4dC;I}Mop$%@Z*8X-E*yQf=H-tXv&U-+fB4n>t9rdw{jZ(< zZQhyspmPJaN!+_%RXJZbLg$ivHmtEb-5`uby^(S;+iXO;YaaH$@NXOFeL( zYrHL|Vq)FSAcY&xCUh`OcGIvve}z?Kri-KI(G4d>m(I|5eeJN>A!~<;z1#~rn_4uw zRqiv&EZ*HYnWbUlZ&fXZ=^fRIT+Sg4t*bS>TsK>*s75k>c-nrn>tK`1M1|S9W*R95 z1y8az23-;RGV`=WSC7S%i*lJUlXab^AKQ4@iY~7t$N5MXx7ZN2)O-iSf6hNeYffyFu2W;8`-*#qk@9 zmS)^v7yICSCrAFi_Yyy?qgm!#^_oa&xnA_VCh8+K_w z6V*PtDOGpT($dz9%t*y)+qazB%EWPJb9(s2z1homy?}V)sMUdDb5j=G z3E*rN*>u1mlkv}%`?1$rK{NNC<|-aY3bN~3b9Ds|M_H)i=K~BuTr~`9B)se=tq2J; zVKkkY<1q16O_YQAttkqxmiR83EM4|ygI0>z%mq#MYWps=hqn4v$^YCiW#Xcc6(wo& zrf_A*1~9IuTc0FqbY4U@P-fE1Ny=77jF}(wNgAt7VL#*K5n|VIi|Iq_<@BIvi+zhi zo_OYJZsM|hW4r3r``A^sk#{G1rari99{l>(oW(P`PP}ViWL{#X_xY0Q)e|2X16}Uj z(3$loNbIZDi-s!OU9(_o0d{w7%zVw`(e_GYo8{SAr#9qNu8!EZCv?lDkmaeZ8Ikw2 z!h)DDZ)|>XXJ_+^9d-2=7dls8+*#~yx%9`I!-|9+rU}BSv30W|NXG)O|Oe@i{sqJ%Y3o?8dLO!)f!jlooYyM z*--!UbiCU&ozMkd?}L^yh&Rk&UwEKU?x;6|>w&hFVh%17|8Fjwv1pG>Z{4zq*ACZA zcV!aDZ_-?Hp@ZrD-tYHH9WILL`X(QrYr2#v(}ZD>?yZEfDOq2BrhNRnp)bfqy5fG5 zn7e8G4!!HUoxP@{FI=H}qvueV>&k#D)AneH#`sUHni6Sqe3MM^=d|w z*P5Kp6!m7@>rx#Z-f?cORTrP^txi8?_71OvzYc*Eq9z6SeB~sx#s@?uHt8BCjJwC zkjC_9kET^-zC_olOQCEmx2=Sa&TX;sb+|4cD(Epqyuy*;R3?}I?V$4vu3g6%WEzgv ze!HpuPB-=2PXjMjK4v|$ZQMb;9ND%~p*v!p$E|c?-h4Phr2Q(#(x#(~4(#h^bEuj0 z^P1gQplK~^s9w3wQAEs4-y-^J-VEu}7Uvs1Lgr23GSlaY7n#2Abi?m{egpAm7U@}2 zPBGlrx^lXPd{UVfi_62~O;5h;C^NFFS$=A+&BH_|Rg?BpT`LZSE4|DKIvgUoP4d@L zod9pARE164H{NpGczeTxg&uxx zt+4K@cYExQA8V;XqG55kig!1%oZjvaYPyW#WG0$;sc}yMh{x52|g; zSg`squV7Nevfdn%ODhibdaX>56Nn5j(z8$!t6QP->wwyw=$o@=JDlIRb;A;Yb@BV_ z9;w^^^gO%w&lshKyHJlFG5Jk*?U zT(~$;t6-JRn?Mawi)5vP>+V`iXWWpa=&03pGHzPZB9+Or#AkFUMeTQVnE1}1ch8zc zX{iG zaOcjW`jc!=PC9j9ciO7Q1?iql;(PedIRBYycjfnnlWMcCuqHg($A2@z_RorKI!or& z*}dEGcuCOV_3Q6m)^cW>+W5%iK>Fg4whycOzI8$m0$sn0fBpZpvzMM%tdcrb-dDEl zjongl@t}}3o07GZ_~jIweG*)ABMt~TGT3JoXy$4;OI>4R*}ReE&2vjF=BC08{I*{v z?D+X?_UA4B4|e)^wR(xO1Zr6@@J-{`baP+O$sEDCP0LwUD9L`ko1{MM1ySah)K|Jq&EAN_WQNKOin3~6rE-F|0NBA4`o<|M7l?#I6-pIkHT?e-Xk z`NqOOm##dPzi!=h)0jhQzd`7=&UxF%cw=lsh_!ag78*adWK z__=Y*xw%g)s!pe~mQ4+rf64RMd9AwLljgN-a(eKzMc7XuCr;y-nspvi%?kk;|CceZ z|4l1hf96j5=G{3$ztw*Fr8*dxyH63hDYaS3{$y|ZN7>CB{0mqc7JtxPQLD!{%|rPp z=k)lxojD8(S4}$|+068HRSPG_b-%85 zoWk|5|ER%>nHT*^*YEu{Nm}euXC%W>op+aQmT9|YbuUPX{2)Fx=;14?v>>erlNaks zzFrOg%~2pX`PKjV&6Q5O#D1@CV=u@%3=XSHyL4x_q)wDvyX75kgFkmk@n^3KjC&&) zuFVLvzMA=2FVd}j>(WKnH}Hn7G+I*Xn<@JoblhLTy~WkfXF11}+^)%X(_UM=yKnId zo;8oxO*>y$GAWa-=$)_e5*CHl(Fce|Ia3tH;z|7L^2)S@Vf8UZ-Xkn z;~PT{KdzX{#SzGs^YL~3|EM&BHXcbOKD!?YD?=rh3r~8z>#&As*R7<*Arl;T{eHJw zRb0a1nfo@egn!D~ZEJ7dxqU?mbl7L1`ySyR(q<2yo!GTavG+B9b$in-b!Hn4Ay@Xw zr)#8N@qPTbJibfLnZ0WrW7M9=_~I*%^`o|gY}scX{v~Sdv}2!+7_aYIoi|@br`vyCU`NBc;>*6~YqLV< z9k2Xa9Kyv?{7`4xl0^%7X1pz#c-V2bDfi5II&wS?f)iZ5ls(+d-^_^=7jB(<|Lbpy z(5nq187wZfUk~<8bDjF4B5HxwE8C5e)A}|(zSjOK$GJ35WP!xjn##JqYUdqy?iB9c z^|-@d-?UCib! z@3wm#FBCQS+!x%kY}KdESIZq!Jx<%Ldz5-_Cb!;>1?w_)a?QSHVCnKEo%vukk9>^9 z(}TPpqK_QP-26&JNo~JfxJ==>ib!sOE3vvK=XiRhc3k>&Q%CQ~ud0&QI=jk#dWlEM z@2~ojTKKv--}~RLmGN_*?ECbqZ|z2|64NEx-K(yz;NhryyY>2!qvG*8mC+L1&llf% zx#`8G$40kbIw`R`Xcpv5K7TS>XvTBJRmT>|s_bVz(ICC#l2l=kl~$9(&;M8o%EHRq?EusJ%TE+xCsv6+pvY;)6UkC6F`PT7>)oP1}g_pwXM%Foq0 z?sPQUc;+zchsfx>T^a3GRxA@A%#-HV(iLT@ULUbB=*;|2(;}AppSSwFSm0odbJyfq z4J(wnwVJKUL*}Nud)>V~&2yH!xv~)df&1T&um`_4lD=w}IKTULMC;>?^MWeQ?Rxl9 zfKg2Ct4|lNr`DylzY-2zGW7Y{(tdvl%g;!jPA3+$#K3~4-b@f{2 zNs*-G76sSVL<)VFH8K32d(;)SrPD6&6aQPmkhsWh&TW|`TNo`}U8OhedA~_U+P>E< zQ#tgt>%H#P3k4l#C>))#fiK1NUVq&?gNFK7iP9bK<#v^xeX19;C8Xou>#lihR~>3I zzP;%`qM!GBvBl#rwnu-xzJA%`)2{E8>wUQ2$ZWs)?|au|f4j(-s+UV2z1e(TOxe9} z&CVq{D|xnoi=5R8jMJBFntgd|eB_>~J4_Z#ZxVmjt+5al zQJf%>%OpqtX<%6@|dJMNaTCKptr5d54+?xs)MxGFKmr=Ao_WAJ43)8jQTF-#`h7fAE?>Vt3>SMVyzSaIy?EcYmiMfp8m`va zcJsNibNLN+f{tVq-&}FBXk*IDqKnm&d9(l3zq};&@yLz+o$YdUfiYDl9g|M$vM*co zVDc3qv(}Eq`u}Ffv>)IXk1d(V)2G>KXy7Ok+NKiHwqe@&!grV1K0IW-Z8hzfW!;tY zw^s0EnuJ|k-0BV?c*XR+ql=(jfwF_)`|Q3dJL!Oyd53qmFdJ#I2K0Uj z*~Z!Q(Eon%dE27HD>dvIp4hNAv>cUNsaR`ZKQr8A-QN?}m|je`1C6zPX4g8kec#u$ zp&=cd!fGAA-|hDQ#g+2?ih~)yq{cjP!98xXULM&SJllzdp}|Bq!Mr10O7y|;z4J`$ z^H1lzWcXh%zvAqsNxS~n92DC4tz+S8y{B`_?L-#W{pq-ocboSp=l$D}UkswemRFt) z?B7~&%lgyewBJuo=hsE)yxg>OPBPE6YNg%)=SM4yR=n;2mu;4>_U>e`gaREEuSNnSl$j%Cff))vAV ztK=T6vWl60{on>KE|=?#TYVdpG(<)E4$e$bf6CM)GHFADz(K!TYx{ot?f$yKZzV%X z0l(FJcFEn3`|a%v7VS7|cKb@_rOgvIXe<);F=P%@7CX48_Yp()|FbPVG^}-bfA6d7ijV8peazR1 z+vB5C``mV;+xk3H_QkcIRu~4WEC^bq%3^lz|2a1!-u$|_T1#Fn=f~w=uL{O6{I6Hj zpM2Nz?770g^K-?fD!!;$cTDT;ZRhtfidN;X6vE8sNgfXp{Ikc%aVh)3Z5>M7aueq- z$XL1VuUCrWR;O#fqhGhCIr1B7d$nfmI$(KoW*ejHfxm0F-_sIjp5?wm!#t3a!N_5; z;L{cp4beS54dG_m4bCsrL{9X`TAP_HlK9$s_H*&NjtNl)O$|z)CoVEBd)}K9v1w1Z zc)%9XKaR4G_I;V6|GD3nYqoLJ%*%HtoZt9hL3gLw`kS@dr++`Xu`MG!@U6w>efN#z z?6cT7_WLw2m&)vzwW?Z$+p3r|N>ujWf|RG073-U8vLr$^GLq*%FMa)->lDkRxf}QP z2edMrc>nKdd+C7>i~YqqukN>tD0y|oQEZ{_{Ev+l|9+YuEv~PN-Sg{Jb<*tIwvO8G zH=SfYyj{x`JTYS18dsf)&$8e{zOy6Dc`-KDFv|0p;8KRD@N&_4bC zz$yV5(@g?LBX%k5zjveQ%kF!+JPmWqmNrdc6c&?WVXYJR<|)p;l<({brl~(%TsziX z3}F7?lWJGv^JcP}yXoaRJulXCDk~-)0d4x+Dv+sq=9!9@i{Yu_)4z>98y4+yd&8EH z@_ErFL6<)><5L-qffh&eXX+ZiW-@L6ZDc;@M(0nS6Hj*QEMZ6$lL@^r^ZDk@qW>4z z&n>%UaQ^qIOFMIBT2Fq&s@r?axLv+($CO*n+;e_9yI-*VekV96n?vBqN`t1kGo62! zeU3f4J|s`LJUdlbgu%eqGT@*CXZN9$P;OU;re2kUTvsRhU3JpbI($uf z>xrsT31WnVAX_xJXy8aS}=IPgqhJ-}8t z*SAmd`*9`4=hK+jN+LTwn7lSI95Ab%7!!IYyLhH(cd_dSY!&i7J?)>x zSFwbPu4d=`1!3~W`o(d8S_7b;*_b+B+IN4RH{QVh`;s?VS?AJ^61vNid;V{wTYU%Y@b-DUKg+F~(vZWsPo7J#iePx*c>>$U5 z;@u2~{#umZPD*6%0`0Z>age`GK~tdMMMsXPWlV#!rL3@qS@)a(fqa%P#(UkSHs3Rn5wGZEENeU&c@Q?)96Gd7PfM zm8;=H)ar-72}bHoLaC^YXgNXou_0H`P4;E?QdZx|DI>tvjFZ$(G+K zG>UdykUM)}{JO4pZV&B_FEv{7wPZ2FpDpK7t^HOyZs67sntLgA+ZEnPi&$+QyZl^u zL(8{wt;Q6tsZB<`eDRa6oVo08ud6KEv%+EGBRMe^F|JE3uKdw16R$|!F)o|yvg>Q$ z)Q+SX8*I)Wm?Dtyr@^T8-qOBH2YAZa$8|JT&^4wtE%OsLn$Sp7N)<5~4VmGl)m$<~g#=p3C}+w-S?TN!M9 zZ<6Ziql>nuU*GEA7GHHO^t?OM4~9C6b*a*34gSBMfDXSu@HX|bMcx^`(&_sibgL#^ zoPOHnxu2}-tdO=XIW8>wv#0-hWTEuqfr@JW^lLwx`hv3rYTj%-e#)ecQzY_3huMs^ zTAlOm)_%V`DcP;cH~;yprGm|UzMEO+NJs7brLd^`7W0E9udHAuAAj4=l6}ojMEbgZ zGp<>%edqswzn|B7uRb^3WD&=VMFp!?3A&nv>WDcO8=Y^TI3?&{OwvNLZYjpD6pdeB zU#oXZeNEiveeSc}<2k3Vz3pD4?Iw55_qf~WUZTQBEp zoxsX}HUADieq9o``huOMSNT?hhW{^;^*g2WYP{ZTJiaXHc>V2&oNX_w7RB$s%FX^? zuc4nshWY09iPhJ%;&r0-_+0pqa@N;O=Z{>@XA_OOA;Ubm;YP`;S z)o15y@{~PreA5q$O`3c314AS~RZ4x^%+T;L*+uB)1K}JlreGIg%{DFPWS;3~bN&R) z(%+z2`Rd(b75^}KwFB-O6Ta=1@ARC!tb6~S57TDYRBqc*a>b+Y!1iqGjAuXJEMoZc zT+XUClsl<3H}uAy1qK@nZml`MvF}pFxm(wkvK`cLzR{qRX%u?rux~($3L>B*=*w6al z+o!&kpWAEJsr`%mkS`)JGty>yeRut|Kl>A39o_Wt>D=(DHC=TXViP9%xr?p7zTwa9 z>&G`vTDx0{OYq0`z~wzFx~JV@uv@!O{{Q;vN8ca+?;P`K@x&xyW}D+X*O}P8X8Muh z|87s#`4b91x?R1GY+9)1?PmezcFqSN(+gMPEB*k&j!ZcB+$?lqcp?vBdDNvqsN7`v;mWf$Jr@xs#cx%ajEi&u1b7|c#9{^0YeU`gctE@TIZ&kQm#O*Tz{r@FxpLKg>m(!8-_2(xDW!mn#o&`EZ_fP1|bp{Ro z7ZOfQDL?w+zl?g>-O?RD?vH{(67^i~C}ApU>f_lVj|;)bwD5rsTF+Ep;C*`nAYO@wciKp@YeOAI2NEE98g{QY)&Y4FqbZP#n&{dAiwTyfrn zDIrktmxl=_WAU@pn=gb+V%k38*7};C$Dw-+q%L)@K1f;|G2ZQi}XGmZ08Q&>hJeo z?~pUd6M}!mDqCRrNTSf9$V(p#O+pc$r7Rj)QEqmv(Lt>6;|- zVDZo0$3CogcsJR9pHkcmlh~NTn+G?oJX&x6dsW4&l_wu950_WmRrYqup-?sJ7VZbn z9aFV+Ir^ev99t&Ny#U%hwfotH6OH1tv%byF+qKd_v~|OyE(P0bX$)N#Y#2JzOtx@E zZ7#@)6vz>DUDPY`o8ejK0)@%PVw9yFcku@Jur)ijNL=u)npfR!xA4nk#uGYDF0p4% zWE+`J`V$?qe{HPM9XA;l(TY3UzL+W~_CM-+;=jOhzvT86J9EN37S&CDYO9i4>%HB; z?BNf|+iG)4+ogp62w$4($eQxmE=J>5k3^K$SC-Ur>HQ_2UKbxtOz)pule;;44(Esa zRn_w(cKo}wwBz5a&zd|BHqV>!sVt49{?Ctam+9-~9+BH!AL?M9dMfARgTs@LJhivm z5g@SV!P%LcUdIHm%zu4m*NUB66f9Pq@tg2iaVcYJgGP*C3FEqxYMY(IRTeEg%O+B| zB++VC>hzmMoKJ-VSzQhg?KM65yoR=AL;+jgn1OlE8@(>v5QS3a%)9bPK< zc#(!^O3V(k5|i`R@Au4#UfE^DvPwMU>FidYl0&Dw)6~5gLXIY@Pu#9^xpo(q?(;J< zl~3@@T;-Y>Qy&7_W>R*bfpN9jRnHd@bEfCbzpyj!|H*d~e=g0uQyg_XVq?d&k85Sk{ay>ISoLu~xc~DA`^?kP)5KWZMPvL^zV_^YA{68PTD(2k+csQMW0z7_ z0BgwUD?MlD|M*}gXYTNE>-9L{;^*hqYJUq0tMaDy%PHJ8g4fm%{Xnpanj1(*h z>-ROL9=y7Ny?%*Q!3MdNX77He-4pFvd8Tm_f62OF{@V^U-!H7quG77({yjeYi^&SM z!uOW1&!4YOo%LdKTECUU?wkL4hf_!V-S2yTe7WrU=*{MDS~7ojEB#=f z^U32`Z=V-u)8cLS&ircis`|4iI$v$?JB|B`HwzqIGv``#{wzUPi`g!A%~pS0Ez{%X zD=s?mD6K5Dn9+4zuWxTw(!zf#%nPFw7xTY*v_jl-rNScD5~~&5a=Z)|T+B*aKUc{G zo_~C5mqNL_$&LORU4gAnYxjkV#%@w!fUO1io0B56@cK*QNamu-g zkwKCoJC448@$2C#M)oVZe`a3Ncvk#lXWZVZt1lIpKiqude4Q)Ha1Uhkt!TUdwvXPR zGctqhw(2tdk#lChc0o2^-;ax`{N2v{cinRK-wnUC+Lce~hrG``wQFy0uYPCL@gP0+ zMvRw0PPdYVB1^7+7QR*k&vcgr5VSlqvEr@6}~$<%(0OOZWC z6*U%}IHuEa{On#seNC1iXV-*^Wjae%Wly;$>BX2L9jngo#hNA1AX;%I`FP*j=ntLu zKA(}wygFxVacOF-$NO`$OtoKoe>lE9f+6p3@p;>D^Ysx|GJZ@hSKnd5e=018bHUOI zo_Rk-!($X34USqjJk?prLl4O<(%Dx|)=d z{<}DeOypan;A*vymBaQ6i-+pozuET-KA)Za@80a|N$;W}IrmfszdLhh_j}9VZ))e& z%7`RLy_{#1ubg{t`q35X+{b6dG4rVY%Vm(ilP=L1!u8Gg`PL0Lw=LM%683Gn%TmSs z^z7d$%UKRin76Csi@d63z`Jt;})@9hR9r7lB5L!ooa zL}PO%uV3XVV#v8RYO9x+#vu=<>_-PVKWF&H#K`=XPKeZ4)6dzv+xuo$P~+zVDSHba zyB+g%`@-J9!p%^~{QkntmzFawe1CiUxS0N-wvO0VqZZ#d;k(wMt6mp;{m77|_5A$& z^!NNb&QB11%)3P?Mb04Zf$ianezp%sxswjw+}d*L0I$V@rX&BiEqUh3`{3{i&cF{} zlqaixkL-+J^}BJy;WmTaC#>r`wYm??omFcjB67(%M*6}3jo-}_cc`)b*jd>+W%6wO z&IkWD{*+KviCOx;`lp@iuX(b0;WrhpDE*ibf3(q5`TSW;M}wG06Y|QRb|gJLHC5HM z@=jT>-l7OOH8vNqHLP83c6Xk=@y<F6%$k ztxSzQFtKckV)wo3sIp>4pt)8R%)R>gEcKg>4)b|-dw9bYgG=t^MWjQ3U-Pp z2A!``?rQ6kN_*qu&vH=A;bKqlmWp6o%|re6|8AuGXISI3po4>}VY;A9RCIurfv57} zCQg}e=QBD|6c?$wpD&!chFk2+BM+NRdfWOGBK~an>%A``&bVrYU_+pw*l~tm5gw~n z9+U7)HF$OL;-b2fq7#-bOP`#7c-NEX=~-@xS1cvB%Bz-d^_mzQ*|Lx6f%MhO$KJ9F z{<%{uuDN8={*!)!2e)sn-4xvP;L|Bp=T)39-`%hK?fdD=4zE{{-QH?!T^(6WGFH_t zf>$4O2z7A(tJuhKX=c&_jtL#Dj4v!1)^2z=&$?XC_}GgZ8#NiijvZU4 zaD^;Uw(7c~Q`dZ-gEw&F9pN44Jk~FqbZ4ftTJh2~-D`KIoV%lct|0H}&TY)^-S6+K zow-gg=grYSQ92Vg^2VQ$a!oaOwJ%GQk^fC(uN(jW__@s8*Blj@YHoM1xy^0!{l;9E z>7i=>Oin%L!Stkq|MOXX96T#!aYrfgZJM}^`BTOx$`6RfguWSNL>Ji0Q|jQHnfo z^SP&GamPs}hqyI+vp08dNI1SDuOY#*eLvUk6mF|457tjfpDO?1tl>0gTh~1eM=IE> zr1iC0jhZ)`u6>j{&%maWCwE=!KhSG14M|0H@-cE8DUlY=48 z_swvaWwdMi$*nuN4(zXdViL;r&6N8Av&S!!6^}0o)>ya_06Zm8_6=3#MI7_Yz7!qh6?8Sx zUBGda-6bqgL3xRQLQvpEn)*d0EoR)6!+VEyL`xf z`R8Sc!j3)F=MJZG$oM2)HqNm6HF2wm22)BS|C?2Ut}f*dE%n*DG&UUATF7Y_(&4&Nchf?ZJOskS;}&_O%$x?TE`(0$kOO|`A$bt zB}3PPzNXJQc{|LO@abOMyyYmf{&s%`*CpqkDs@#gDseqp@LzM<*XRuijMh)I*Y8PM zf7;NJ?}fkurw&nV1`$WwNskMiHJK+bSp8|o#)3wcnEiEsWiCAzW&az`f55Zo?yge3 z-4_o1W@gZNcI@-_<*BEq2{rV8XLn@g`>-+M_t)$3k&3Gd?2DhBNp#&3Fs;BPcvbTQ zhWcMC_)HdrYflbl-hX9vTrQWu%s`7rf2Q`$l&YU*V|!P%gd->Z`@G7WoapaY1-kMA zPd{a_Tf9WZ+BtFIrKVKVhWfv5YKu2o7#|3a+H)gH@z6^LgDHwng3hmFST@C?%ft3? zQZS!}k`&Xw)P6bJIhisO=X47N#O$pyT^qUC&1_M}T!lxCoQ$qY=eSyQS-WZ$G4JQ& zHup(8bmCgCwE2sz*W(snTC1R8%~;U~^laMe0ez#GTO*5iSAZ8oNqb1NJfaN0eWfn8IIeRJr^CY~E}ru&Fi&*6Qb zeb-;LeCsEs539quC+Q?Ge8?5OQJ^IdGttVpTw?S6Z&53aE%WAlcr%6N@j+3y772!( zzO&7EbY5*#F#B{$m$A!9&iqn#__~;d!s>no*EM{KGMd@>(=KJ%*)6mC<~DElt$kY> zl=f*)FLhMm7FJo|dG6HHu+zIjZm8aV&3U<8CVc4*#mmhZn)l)@S2}E66sdT$H@(YX zU858mr)$B-^|8B;H7RunoId&Ig9etPoXw+{v8uM4!z zWfx0!_igxho#{u~+Z%n-%Vq6P|57?||H>8@?gxwcwYO)a95*)oAK=BX|NiOvTRo4S zg(&RUBOZ9-WKL(d#+mw@H=lWR7wpKmsC2B;bi3sxE0O1`LR5RtUs1E1F}vjby}Oy3 zau)SI`>MaaNu0X%5L?x`KR-XGny&s?_Cs&cU50}ZGZbF&?oIr2Te4wePzzsXmdneW zP?yAapJO-LZhWL~X&Y-3KOvx4%vo&RcHRPxtAahe72l4!N&K0Y^sxUsOPXX9mmtHg z2_e!Z838wy8$ArJs0JL+Ja_EIqCV64mBdO|Igq2%a}RQBDiwruF{-s-w>b8zE>Pg={FH?(ZoDHBk_n#y5Y zWK|^Sn(fBo68^EdQR=vRh;Y5M@5&7<8joxY8XxYnDh_7qI~aKrEAlQthVi2_i0Cc`jova7mm(oTEi=!-E!Vk ztg2$)l~)o1x~>Auj~k{vR^oarBqWq^XGdYGOxe;XrfNIps7=$m)4wcQH`ixzyHhJi z%8yBtjWtY6Cb(uyoh7Hm+^}x>^xZnsub;3B)K>7`S327%+SJVYP|lN|nQy&UHu&&9 zNS?n=A%8jB2l4ejn>ybt1^H8FO<#KepT@4H*iExGSOuMD2ytsp*xBgN8Ps@4!*4Oe z(kB0esAf*P?JOF*x>{yTGtF8ZwpL~8+p1qa74j|IqKaEtg#v$UU%Ns#AkmQ}Fo&t> zR9Q6F>enylcjfw2ADGDIQ6qT#;JORPBp9aKFRti2!a6PL`^4x~uM1DL^jRG9n(>^Y z`%QpBN0gx6))l2bi|xY~?JQ(oBF=8MU}1l$fu+ul&0Z@@-C}nfzH2(`RKk(1%o=vK zX~NMO=POLTL?1{O+C;x$7A%QyzP>_CTqZ&(p`%Ggv0P6KU3T5eXF4V;6~C zSitjl6`RP%eJ3v#uh}VYGgqhQ(dXX@CQF?<=QXdGqpNGS_T~Kg*X0W*c6+SU^^H6d z!q&sgaG>IU<+Y}M_DAJ+Fa2KRrhRCmxu9bx5g8jwr^iP zae4a3eGDHa^Qi_@L~PJGu)Wo(<#I#9(hNqmz#9Qp)vqG^#dlkL?U^DIBD_H3!5LrO zMI7^PZ%jUZlLFN%%`!dNmpx~Kd**a{=GSE z{PKDajcz?+lk#18;GaPy_tRws_dI+T-}-l`m3!Ncp03)ci_8HX4cd!m#CLo0R$Y0P z!t*6SGG}J%gS!j@Jkvc2E<6m-$Xhqz>ES=kI`e+)<6zu(Beu79uBz&k$-xKeoV(7% zg|KPMIsW=F`|X#@ZP{B&UIsn8*6wiN&_-XMvYC^k9d=f-id@>X(X@Tj&+@5UCm24R zpKI-2Bv@nFQ2**n>8%|fIrjeY(w{wl^F3yTQ?gMvp4cUSgxwGk2%rB958ThUSypMXXC-sTc+wU}(8wWKuGBXJP|CA77Y{t#iNV z#Ca!9ct{y0wInHaZjMoQ5Rvk~e|oOCSnLk-)nRKV#qj?)aDmw@{n57XTOaQ|c*uuG zWPRM;Q(RLMR2q|H45wd=d%m(gXyFpECRfRKb1ObJb?$bOJQP=cVb9|gSF0byo$77e zw!~;g`L|Ee#npK%1$F=bmQR;eFME4SRde1^3&Wx(9%5(x?2T@Ayxa8K&Y{+0&m^zi z=fl)3%9Hq<59%l#w0WV%_G3ZilJqA*S3QCYa=uRvw^Uf}e8RP9`I*}uv%jYr_LkT( z*gw2tdTXO{<2>nmS2Ohjc^@R-6O|5%tbXLj+>~h6Fs0`QQ>^M&o&_8S6!n$_bZaO% zb-oZ)I(RNirIFo7a}mc^mX5v6@vWhz?-cJW{J_+t9=66if6RskKivwr0cCf24y1#s~%J!gF z)Fg(kf+nW_Ld;xK^f&B!c7>V8rlaKXX5;j81_?d#BF2n1*H;7{PLxSnYaZ77y8ZQG zTjAYnGT&alH(&c=F@uP+lamAon=N}@Sn{!+!duk`fAju5$G9PgMedmVwhoaSzwb>w z{#Y~hSHapH>rZ@pxP3#!*_po|9_F`K>1ossTa(aTAI|?kBlVX--RY0svZeX|?iEkt zlilyddGcXuf;jies;{p$Du^88bXm{XQxYR4&IG;!q6)Uw2njhM0d`!9PK{(@sd-v5Q#|p8{zMFpd6r1LSm=Bhh zuJ6#hz$qjwe6!{FK|?h`i?s_o&R*;lZ+&p*$QK!(YdgZ%Ih=Q#-^I9CLc?hv7XxdE zSd6~QlfVZrc)lOJ^L&Amk&HTEL<(_`sq)C$^6b-o20(p8mW=l;y ze>K}KK*nZ6x~Y`yoqZ)Pic=ZS^Ksq$&|K%Pz*@|{X~hip3qNcwZ7h_!x<1x5NJMSV z?+0g-{0=Sh_ES_cwVhofeNENgKEFxwL^`**@h*q2ua;H4zGfS^!qaeTjhUDF&Y&kD zWw}LyH4J|qr175OdN@t*w(Hkdp-XT0opb&lFsXrg-HP(>)os^nELb_hR?D$*yt}b+ zaq#jf8$PwL^hXsQJT70KbIm$ge{Rg$$w8~-jybf1JlOu;Ug=|^_WHu{%x-Qo@eIv-(vUPvgeT-TIIBu#e@p3AKvS@jJ@{W zmS4KBZml$Q-M%7IFqGLfY~jL%SC%E}`AXis{p3s}qvWNJg1kCAlzy(i5v(qGeVNEX zai*F%FVpAeFPmo@6?j?AlxKHXcKH&Prj79oHH)v-&tYO&?aC=o%B(NZntJZkTBZP& z8v?)guYTzf^=W~{p{fX9ccJgBG1^NRg{B@>J*wJu=yAkN#jRUQze`$86*;9Q^F>u@ z;*Ir-HAES@GKx+KteY_NLQxY_zw{}Aj#J;?-QAt@kxhzYk@k!)j7_a`tbAN%v=~S- zIwUJSx-w18cb3JR@E#3W4LJz~?ODa&8Yc1WQ9dVj-g1S5!G;4CZRv8K1&+x!D9?*( zKg9eZro-XU%=Tsa+YVN5sQX*R)^d>7O>MKys{_iXdK(%9j}|@)lKjE6CwOtns(9;` zMbTG+YC=A7cb$4ORWMLjM?=ZH+}urCpxArk0_}#{LB1udlDSNtyCo-d#OAul+@Z*B{AGAHPl6 zo4+lfqkv0b%@d6y)w7usT~_YM)mAHr=Kl10@9iuH!QTfC{5-_1|Kjf4o40RXs=6WM zuGnyY%NLnL2U?!7wHxa5fBK}e^)SnIt|N6z+d^)%o?h{4tNqfZ)#?r1dgdz~FLAc^ zoJ){hbEV$viwvJg<&xObx_q}6+vnZcagc#YOw%cg`xiquli}8*f>XHSR`!dOx)z_4 z3t07g!`GWi-tEsNLey-IGwhk;-t~t4K!e5BzE-&=y@(0jx)WQUce5IAYyHJAh5bm> z%XJ$vt`)Jke)+mlF0?dQDaSLlp~^Y%qO6o-qM`9yh7Vu9eNy4)H~+LEx|>m>!S~Mf zDUZ`n-aqc0ba-``L)+iG9w!$`1q3t}{A^<)m@D|CJ(>3c3(PE(x6$!4yK zi~*OB{$@v={SW%w_q1F8tf<`Z*05t`<&oRXL5y*lOAZGZ>WY0ozM$&$HQn}|)-P+- z9L_sV-5cS=<52kY)Ks1=rzFKc{AE^Hv2v>~ek3kaXwIJfB`drtFTh9g?}2F{Y-|(WNfa$>Kl^P zPp7Xn7keK2f8KY_Df{yG{d8L-pvdxL=Jw*ugH66)KArv^s4BgxUSem$k8jg!x4dkS zjxLb8I){m6@d*ymZ4w?jxiP^)pR9`FKGH57OU0jR3%LWVK^a93f`Lgc4p+Dy zud!t>-nV{wP-7EEL5ZPe$8R1%ryE&HK}98J4JIE}=9*KYJo(UVv&%NRc^f;g);yFg z=-EH>!>;All~p^8nfABup6#nCy2H(-yW+|A{QLWQ^sRGmnM}?u5Z(Rc?d|QGIpclK zNA9b!jJ|S0^v^>l#(9p_3=C`n&$zw+NY}59JYBS^WwC~+)4I*in!`6XI#)4Vy!8EE zb-(YqYbJ_Q8Mm;cXdDS)TWHif;S|FJt_!Q5)M*g!&6wU z)m=OMWX_t0!5?KmigT9Dxgp=MQCCxRM;Om7=Qf^1tE*mL=6o_(sHocWTEu(L!~Z)q zdHb0j-#oUvdBvtXhbE;*U-5B%&gI zrn@c5K%psrNo~upv-#PnfF!{lL)lro4z;EK{QLcW zI>V>i`TI?O_IwNq4qD;Pe>tJ?p=|b3KEwWnD?)6xaXvTHF_EkJ;8^wXsQAmH>^3t+ zX2x9hPGxw&8nLO=+q!Pr$CjhFb|s6eZRTmZW0Ur}cvH!LhTSWs3$D_6_>+xYLMv*q zd%s@s|HC$BNe-o)2hQ)9>n&HB71(g1$LZZ1mCx^FySUy-zp55k`CLTQRBQ3l>)PM< z7I8K?wmVo|zR1S%EJ$mE?IQmNj$P_C54ofmm{+lTuqUa$)j8@i&2GjW*8E>9_`>!k zOp}ZMVVkWf8sXZUZu0c;+A~U$!rEaMI@nG#9=&lR;^veUg4dId*fDrbycP1e@U-Zk zM)jL(qs_bLavv4jK4*8nw-;;BnHdKRG#|^Z$yj%h`QyirCS`9T%+wy$GVc&tWhCL4 zD&SVp$|iG7LMSuv{)OLO@5P>(h3hVJbrVjISXXgaewC}U{Og2IDc1VJu(bdS8m%VG zoqPVrCbwY8o{B{WYjtO}#jD**-7rLxGP&m=8-A80m_M>AvLmsSA{KS^f$|%n;!~V*TKIQICowwE^-W$F= z`1Ej6MuXr=G4J!91o=sX=D&ZsHn`-dLF!a(~)&)`)S)xy$KD~JK?c!dGDK~#R2t51H zxjJ>)d8az-iq}aq13uhtRNmodwB&J%V5QuZnKt>{r~Ur?`~6<%l#-v&#RqflGzE$F zJ`!@X+`>Nf;2S=n+QcJ0!fXC@T`pd8SAO4n5d{hLLob=u@A=fVN~Kp&Jh#7=L8FP8 zr|H+;_&-jHzO%gfs(-&qJ+-T>bKU#=vAHK*2$&6 zn4Ufr4Z5nuIO*=TcmH|4zbj69wd&CKtS@tTrOgateKwlR+VFt?O4HG9@y$$XIv*+? zr>S|^uf8br<&O5edC#VB{gHmI@Z?o?pq9l7b`G;5hbzVZL~lpjXXdC`AR)EN@&UUx ztNoP~JQZ;QH@7Zdylj??+MOp39}7~OWmytGx`htt zPu0*?H2;1{$t69H;roB{=N8ch%G!x3&(3E$800aqxwU*aIM;Pn@QI&As(iZaT_5!F z?LIQEx~F$-&2w#2#d&%0yM1IQ`&-Yo(`J{i;5Zt{xF=-$rA?YTr;4WXZ?-yhs5f8E z@@!D@qb+=Fd@joiaADj8zK`=1*V@(nsW6KRF}ePN(PcM7!@)?A z;68>b$99Jl@$=0SPCek+^! z$WFPM^HqUC<4`8M&FOX8|0l|{xtedv3-&A&+_`h-$&Agbt|=9nhNiFCI1tC{7u*>NFw=K&8^tg-9C2WuT`SGQw841 zmS|Z+|F7a9bwZh{$xGiKHL6bTxde>HCO398{?8i8Ls~N z`g(K1@e>o3d07wfu^;UCr{wk2{()rHmje#hj{ck}Ii*T#9^*c>aQ~S%UN-SJHM&LE zG=_@&NO@qG^kGfl;)^ggA_CuIrZaaHOlbbt8Bu**?0NcGyQwbk52ha5yglWl(8=8sr%gMy z=m3N4jkIrXZt}c&WSwz(n(pGs>i(NLR&NdA@Ltc$ojPZBMbojS&%fXAPuJYk^-Rik z!4nzvGaeSNr)qd6Io)NNYd~o>FucM8;Do1<1?Tfr7wYuRqPiPNsp`(t1QSz}KBUAP4^+y*f zNNB5TIN$mG^Sp@A#h}ko3_mO^*40`zHYU4tNSo*R+!5puwo=;Q@!F~@h%unQBdP99 z?Ug^B&wbaeHc+44#m&9)ajdS$`t2I_^SipcG~Qic-KJZ2K|r*wgU3$J6257FQcb=VI~ezwZ>E z-}t=wva-P6@{r)!3$z_JEPmIOdOVcrV8^sWXPnlAYTIyGy!N=Q9Gs{f)pspaQ`cl? z_p@ob(J^Iz4kQK7$$Q2i|6Tp>i4@Q82WlMqEhmNTzxAm&g5~+#{VJU^iaxV?%v5r2 z%&>UHBXReAU+A7`TFt5`4xT)-U|#85nFIIt=yx|BZB2f=-6JsC;K5wh ztDYxn&5lQ~UhjNSIQ?L}(YeinS2)_666T2syL%TdWKcfJ`t!}RR|`2A6z)%+9P*5} z|Gi~bP$Q$%+Gi^~h3pFI+^n`{-|w)gtvy@yTu_lsLhsD^#m?>ehFY$Lj*gM{XE?8P zhnAmEH|XB0p_Eolw@%owy^pC&gjs%t@|OXPJj=-DvW9QSJuA zOWu;|=e@ZeZwTsr^SLu`K}K`%=BnvcN|uj8blFryE^`KNWsq91XV2Gb(LHGmI;WHS zZPUK~jNHuJP;Ig^M7Lt`gu+#zMwG<&Lit1=<(x+z23ofZ^D7rha-DZr=x}gj#l*bx z+Q*%QChv?Wb?Pl@@d@(r>Crl{{kiE0S?(>oe%3Zmwe^2rLbk97+1I?~{zZi?sbAYu){e zyYsic{SqYEVwA_QM^<{dp)0rUyW*9>^Y`?bEV{Ep{esN)ZI&V|$pzdM-|U4JaBP@9 zeWIJ(ytp^NBpzt%=sZ5l^uch}0ohXxG3pjwL5<>UtnwMPVQ-b*D+DKg-LpmHmB8&e zbN36bU9q6SOTjUfb!pRg(eRZAPKj$Ld2BJszc=S&^84NI?aFr9RK?3FGu0drV0Mk! zuD!(gYJ-xPsR65_>Anqxb}~jrdmhR$|M~Xva=Yb5#ssUVT>&dI*juaIc-!3e^o#z! z@Q(3{cg(I5&(D!ZoOqsz2&?<0I11Xd2WU!I6f98uRC_C3Yd`Be*9(h|%t^KBp7Fs^ z^%B#MX>zxx-4A|b{dk7VgVP_qCo+D?4(YF{?VWi!r?l5g(m}&zj(z>SM%MsI$KS7R zZ`ZfIcXs-OHusIQf;LYBP0X!gEnD>KoVw0|bMGbAXXGs^<+~OnxhVR|l&3n6cVr#Y zitsrwL3zoh`AZgD^!T09-jr}+BhM`nv+EYZVW}2S%RbvinXfI>Jyt z$C-Op!|dJFngQ1yT)5R0)VSsIionGy%HQ8>Nos1}cEo$$`Z=>tUfH=@^QyyZ#Vt>Y z7i);>^5-YI*3D=z*r4pnqRjd6l+en#UwEEBZ+qz}+u5k}OP-li&DLF{?d9J8Sq_4C z3@%tcQA=+~UMM4_bU1jq-_j>fQp|o@8ofHUK34ZvTh~LbQjWd;osYLaPVR^aV|p+7 zd=dB4UkdNrUGIH)d0F<|jTKvNJlU$?)$N;-wX5XiqaV@*&v_0cKb1PI@y%IGz#%|q zV%u5EqxlKvv-G057af`Fs>^XqK;*8{gUx9l6(S$Zo*nLSM(u`!R&yYKv(!=kXOheP z=P!F}Z?mS-B05NNLxP5eMpECV7tXfFv@+Gt2~C~A;^O>w(Y?FxFSc@vo2>WDW^Qjx zaG5Q@IW5@VfL)_#76Zelh05aImRrg*nDXS7?ujht7nwO#%Rs|aLqEc6rNfjrXJ#7r z7Dkc8Y~5==k8Bj|JjBx5$<(acpjdJBj^No9pEsx3 zYrNy&Ctn$pFTI3wsK`5NB7?PId|_pIl{mPT~gQocjd?Q6X&nbuBr7YWC&?gNar%1VBWTE zlE_5G1CuAsI;@Kl1z)PpmueU^m1;cei58F?o3@UQTNE1sFoY>9d_HRM+9wp}{k zB}3#{zUnMBa;TT!X4}Cr?UkVTs~0<5IS2F$%2{oIZJCaGQYK^xKTZvcWFF1}6&)dJZ}MIeS*F$0FVK_l2UG zLv~MeVi^?#=N6e<2;J?rwChjsa=(ond~Aoho<-R*2=JWZ)d)Yt)^O(T)d>?NjMI3y z4SFODn^x*Qh;%);Y;lNJ!8(Qs9Bdk*3z%$9?9KkRAf&L}ts&M@-L^q`UxoSePEGz_ zAG{(DfJUa3r?0wTe!oU}^-Auy)%V#-H543P@nrkS-ztjMZQy^WBWA?#Dy|cS(EKO zEogdho568COIzjkOP4pTj56KR@-2AMg~u`~=9MpBmfJn#kX`q|*6tyL40FaUuiqiO z8jEI}n7VZKfl!;07ZX%?`EtV;7IRga*!r(1&Rx7jK=I0&V@$$d*aJ%As^6L}`(<49 zB_k|>Ej`ekDbZB(P(uSl)Rv5iS_ig&%R3P$xxv7Fe!+9seFo--%%b{(S8UdHdGbsw z;M`3Yu9YcKGVFCPvy1;FCihI@UbQ(s`q|rxT{Y>CG*5lqI?G%9h5R+XrfK)?cfF6i$IQ`` z@M)s)(t|9$N6l`9$JZYHl5JSHxN&*kF768n6SjW*Sm;y2$8FFMyD??aG)>-nl{NnP zm%URT2*&OGy*0)9i)9A$?Yb(rpp>N|EQuzY&ct}_DQMP<_gq^2zIVX^hT|#R2i<*b z>!uxY`k&6;Uw5G>yqP8D>kE#i9LXsXbw3K#O}kfkcJKSqeNXQ4{HX0(bH!zEGJM$V zr|xw{zlAmB&ZsxL`Z^c+ z8#5ag$t+#8WJk-MKg=hbRSJ(OFOBd$!>;iTt! z1A|h~X!B)v(ez8bKAX2H89JPs^VfQDfJsI`FW)iMOU-|82i@NG)%V+Z_MjWiTAXdK zU!GsH#zt#bNo%AU_w7@@$1~1_ACDAq^^u}#b;OQ#P6F^xNm}y zQ|R6eh1F5v+lpCPId{zyJ-fAvLD)#lJnGw%8*CHn3Ysd#SREw(AFFL|>Qt7xXU>qY zahYNL{U>iu9#lPd`gCwi$*rza2`>LXco>MO=iA*5VOqqXa`0=5(~)_5(=(6vu~-#s z2-&|a_BNZ&j*E*bbytOIFFEt}Ovh)Va(OS-l+yPzk28t9-Y2D`*(JN)lAi?c>{`;Wrr@1K(_-00EV=ul^%;u_ zx?bN|+iUv$^t1bCchB`~?~hYk&k%fy&EjC?>gfSrUtP_7n{MlK?r_lVCvV==NEv@q zuX?s}x2BrgO?}zhzH`56^UB|wsx+%D`VM>M@$;Le+Z?!WB4l5dXtcTT=ner+d`;MLWaz z9r{JL7)J1NON;G!u=4whK&xX5B1&IgTI#d($jo`cAEqXDs9amime4+lbzV3_>Bp^! za~NY814C2Vc4#&0uHnhcen566_duX$9Qb{hH;n#U*>Jy$5Rw{GVF< zc<|3D^*D##>b2|QI-C2MHhsTeKYwq3QbT_+;|X^c3GTR*yb8v(%0JIW)wX2MGS8RO zUUleq>wPy?r!9TCU!HTc{HUlF+SGNZ&7tGoPu`b5|Lk$%61}L^V;5fheYx5G*4EaI zALIS5YU=NwptU`K&uM10+_oEWybq$KISM&Aj;$)XyQ}o6m`2*Ro`owWuAgngy}`Tf zrMpi~akPzc+uP#r-xl}0Q{0wfXP#x?E#6zZuJxH$1m|5B7|4ZeG>5_#jk zI$VB9^2h0!M?T-xP&Msd=KH^QUdxJ*_))LfR znf&Rck+};)avVd`s`Lhf2E#wG7kgea>a1WWVVv|q`hoa@rthXNEPmKaB=E@F&Doo* z(brr(XSLqB2_K!0gy$8u{olOh#I+r}lYY(_k?kW!9ZRp6PiJq3 zEcR`A%D(lmIb(viUi{R6M+fv{KU~gqHlACyLuRt`id3ts40bOB&ha%(WvJUf{eMcN zU$#aeALBudu88@w^clN4rUZFz{LFkb*ZqXHLV%b?lF=U4BgEnWC!S%|@j#Tmk%+-K~V_^zj;qk!u$ z$J&1)_2*K1Km32RLPY6I#m~xHH}BNm&aU3N#rS}jk-lR;-(-;+T<80<8@SgVa$Ni1 z!3_7FO2cV;*PRXRXP&3WperUZBj)2dj@4(svxlU2Pki+@Np*Th;f4RZclzwHx3HKY znSA16iNZoPlY+uy`7=!Vw#S1uaf#o1TyMS9$s?8F!qNR7 zrT;QHh{%UDXKm?U+VH_@(nr77az|`$x9|17(Z3^M@@3YToe9D=fByabeOl^$#@Ak5 zyW0wOPnu|{|H(hw(Re^CE}-z)lS@7G^6%dkK~(KPu@&EJMrX}qo%KJE|;6> zlYO=S%ba%IZH7V*nwxg~KTx@AfBBMNovbSi{~k^C)KSjJEau=irnUcXy8UjQfIHh? zvuO7Sn<)lN(fzS`a_pw1{7n1U7xys#KJR7HBsi z#$&y;0j~{G=V!mvIP~=W>-GDWNttF{*!s12*No%;zEmF{)Ys}QOvn&xwMJ-;3uDz7o1aX2w!VqI-Ko& zrKY9!_?kD}-QKa*+}t4ysjUrveKBUIR?$Wojiwm20^oP02E_c6F z2l=86-A8NoR(*|V<9^TEmGn{aeA9!U@1E36d(|Gg>;>D^RR7{1@53cKjwzkE$~*bc zDz-_xXU{%addPs2d&5!Vs=(`h%VciWOCNAAeB9)3e(^{rzjZ6)G^qpiRcF+kHXON> zRxZ%PxZSat?b9iNrz{#>%E1NeoK-BgWp8<6ch_R7!|Y`~%YIzlA3XP)?25OO{R3yK z&r`{-{~I-F+P#{O-)9&d*|@q#SSLrl?$0D9{y%3K7Thqp9F)r8(oi3}u|Fw!_J&0} zjvSf&<(sv4=9d+}R~9aQwI%DTqm$@6_0RK`MHYu$e!c!{qJl)`^`G2kfe{e~ymBhO z+qJ&7&U#?xaBWlSX^mHRkFJ_*lkzApez(qPOV_7X4N*~1Qk!SF1oE@{^(_j?$ehNs z;k4*w$*(q&8|6)dnQXXi>+h&U`Yg+GhUnBo(CVFtY zo8qB&3K19ec5ayP$@o%Aqr-#7l56<8;?(7P#@cYtP>^+9$#7pN zq2S~s)k!Bz4p=QZu&rpr<=f?1w=-{EW@@q9q8hh}`$ggLvQ8!Q^75m1otb44cC6Uo zkhS{V!;??=ZQnIm{n5Q{u~bP_ao(&L+t6u-1#Didi)tRc`IKbpm;T@tPt^*ZiZU-Q z?i)-@+&};8D%|l_em!sA6|-G&k?|+L3jV4*|1J4Rv}=^Zv9sk<-t2K~7nmI=@i9hn zE5B+hM*x39aJN&mvWmFwQX>=Hoo5>Kly*-Q<l6ye+v^61s$7oA3h0<`fyWTL@sV-+~56iK8A9T}Oa9)kVzWE`|9Y+O8NSnL z32&O*?{9CDSwjvT!||>9>IMZo z23g!*tjmo)aI6oQ+9-csNUQl}X?4)-7r)LtIWDx_yGOfVfr!4^j~z_Ux0k*3`uT59 zYD$Vhb&6r)=aT6R3x@xycX*xH^j-jphN;KYsU4#tNH z6W9K2eNytu=4ZIuau0i>$fC%C@Zz%W#1zHP=i(QgI=JlIl7jH+(qm?kx8y}cE*Z~} ze~_*=MQTa}*9XDE*3I+!`_&hwsqb-9eRci3Py72VPq|e5eR>uBzd!ku1lljE0zek^!WW4mhQv1dtt0F)A)2GkLF~@@B z7B9Ee_YIU}5|nl^(SKJHZB%f_2e#Vy^R5St{!+iOhtmO z0TBYC?=Nhe@;-;f;ga`ChbX?#+Yxt}&J=jLPFC|RnOWJu)z~Q!XjbSYHpfBaxW#Us zJNEzo9R3xXZ9(Y^fNOIcctDA*u&ZB z$)K`O>+nP=UrAFJzp0JoZE;%6(H~a2Tsr$QM)jua3~og$RrAK3T{-8z5iZc(K-d`+TL6-62r1wDVB zemCupaf4g6nJT9tpUCfZ_s({$YSGo#ZM8aLmi{ud@GwjD+Y^Gf{+)E6Qu4>5w6>UM ztJDXBSnH}OkLv&T?&_~?Z%k*{&~!)U6DOBhw0yY#e~p`}ivu#=clU2(+-bA^k8ZEV zEg^-6`wG2S8?5?&abAAgF~#vvNA_AJuU(m!)!d2?v~;cER!dBDmJ*+=ziRK?od;Ez z86xHg{eRHRAF<`k-rLN4u|BJVwC>nS#5!~bHGW_H>(=`jS|?Y9t`0eCTkv1L=7Xb{ zr2fwLfnfp~a@jxrnlznCxUzYni=y?O7tUNZ+uC*0Vtz`pu8;H4K4jeWou6CAqv_GV zB**S*jj+@M{}V5A-(p_AI>IT{Aw`@)Vqz?RdAZolR_C;pqU(%IJzmjQ1m=D#`Pt7**9{qU3Ahl|$z%33|Q95=EoSp05v6ifY~KZkuz-Pm@0~?pL{F`Mv`QIGd$*W8=y-KaimPF;=4(y$_R%1_T zHk(N9#VZYu-iga4YI{WXE%G@i@9^j1{jh+`zpH`+zP`$NTL1P#;w_V0qph`%G(Ua% zzI=)B@s+Qo^EY~1?k{Ga`@34ZRNj2vq(}W1H%{FjIF*f8at+|O@RTa@8_PIHR-1Uc6u98(zA1vNfr5!S!+eu7k!u5QrE zM<#-cav0>!tvkF*EcLMI?8&8p()x#xU1&x}cSNg8*YkB;AHFKZU$l$ARnUF4gXazC%mDLP59vtd zq|?9W)%*}?4f&MJ%_7|J{|Q%n;QyXoak{VKD^I^zmii=M@9z7HxyAJ&uC$i19`yLG z@N0>d*As%fq{=5q-KphgZrzsgGct0`p%|H3 zK_*vE7s0ZV;K`C@Q>X5fe7WVeQpz8mn z4`yv$arS{?$kxtnHIi!=f2SZEJ_NjJpGB&LaGrhXzSZSfS zjiu(HJ5!=Xio>~MyEET#Kgj$2r~l=zi^^A$?^Jx^U+bm${QSjh-|sKp9alNESKZBI zp5cxC-%TFN{BHBGd~2|TF=V&DQ5?VbM)2DOTZKV7T5cvJcN zxX63IzTdAuzbM$IiQjUQVBkNK1&cSWo+TK zg;ujZeI~j|s_(+JbFmJ~mWe%i#Sp)i<4)jKTQ}RuSq%R_JUpCQJm2#8W^InJkhTDZ zE-&#(g>R+SRzJ_(RsV`-w^)BBqwA90>+Jq@oy=686%jJQU-o^L;?6nB`*oH#+y8Tj zy;sqlwLRCpV@A$A!(OR-w_DG>zu|YWnJsuOpJC3WJ2tgiu6ORYGsZGJYFKr3#nWc~ zjkQc7%ofU7HA!!!yl(7hyr}i5c+<=N%-|KTrIS~L-QHI6_eP+Y<2No2h5Y*ZR|X{& zGnrb2^50)OGEpaVd1z?XIp_5Exl>npE#&T06AxsO-%;DHCM36A_gt*_(nE)vMW1SZ zJi^#B`(1?R{Q7^EvQ{M>ylf|SX@uS@e|f3(WUys+@ajGCmPIP7{iZXwSf-uQY3kbY z^snWY19$o(+}g}t+CHxPGWW0E;+UiB<6Ng^U0ZVN?XB4*lJ|U9?E1mN_DWAGxaxY= zzda3aqtE^2&@A;yc+|tH&2q*k{gm;vqKb*Bzy57>f6*ylw?xghYFey(e1$uIWmDib zv-5L~+2wz~a`}m@K*qJji(Qm|?~V3$WfhLe&&gSHT5E>QmkZ81R;@igUte8)xp-Yr zU9Mjp<5S0(2NSfKBhB3tlUFD{k+E@7Y}}_7ont%AW4)fPY;w<~Uh_vaXK%I(?Jv1^ z{dUIBXVRM(?gv>06rVfYk-L>)-`dc5Jv-Qz)~;Zz@fKBj!_{OsVew36k*8M733+#| zlOvZbb31)aBx3EXlPoN)t#9S)T|CwO0~S~B+VCQ?!N=v~o!LuSMb7qWC@~fPJWzM* z|66mNs@Ksgg^t>Mw=sQxd%l^EjQ{t(x?a~pLDM+%Je}X>Au8MUn71#IlRt84YsQQt z471+<+8>^Ac82-Nn}2IpdiKlZEHYv|@%q}ObNTUFJ%wT?3Jc8e+|Tiv^S>&=Sk6R$6JTUqe^+eDYQg>NovPYd|4 zZ~u$E-|r<)ObEZ0z&fM--=+LIqXZ|;2I z;o{>@Z(TKeng7xmiHA?$v)reQ1&h7BI}pH80_+5ScSm2Iij)t(-s-5KTPYo0MT zi%v~{BBB(~{@_*AwQh0!W#;#5ChMK6cPsL~wCPjC#aZ>YgTnQcSMof&Q@=D<@^0>V z$5m2q@;7-#h3U20{AB!XugV^n9^TQ=oB^2vtIEyd5}YRGELo_3=4SgW!z-71uXFM( za(nrAc5$3r&T6&~6Eho47VbQ|PT|MOuq-|9Y#UhU~x=KcHI#jVNi z8Y`-J#W-{Ct+!vy-m*Q*wRiXTC7*9^zqs*!c+mZu#S(K52(4mxA7Z-T#GB~jXC{TD zMJG*-yALR^3)UT~wIQjMU%gNnhlV|UiUL1Jm^Q-z5ZmX~9bZsg=Si{A` zz4+J0xi`~GlagLsn|Zn9^BKu$?_61S{=WVAMp@jyIuYYLTLQQyo`|iNSKEIfYtr-f z?8<5B+MdcvUC;JaT+89Vu(|%crc$~2Cq9#>`<-`-X+B#Sy!?{>{y$2AZ5sZ0G1v5# z74rY9DmQE0-nZmg?Ni+yj1B+im^SnM`C#kHFXwdkSda4lQ&Ugp$!`jpo$j;r_ww^f z|FwRl{JtV~*}08p;!t85#Sey0t!{U;!ClpWl`KBgw z8}S)@y7~L;^()zrQp8g48B{85mHfkUH7j{viqK_+^qP#zE0mU~UX9^3+_x~|%uH#q zw1_pG+!hN34t7U8KQgPR)Un!Q?_B4^^5YhtmtNeOTdiT^BK39s?^oZ?RKA=4^zh1k z9_ucN-npv4Jgw@FPHXF|IO!it6(_m^mj z#3;|nn`7mARY~c^muL3>+(l2EOG?;z{6@LNd*9WHTJ0HaQUO!8dhaW3{@8f-=|#m~ z)iqzW!hVPa?YE1yE}F4x?^mqOb{>dIczpBhg-fJo z`mN_&`OMNT`J&*oWju5Do%nKV4U1UR`ALEESD*a)@nrdf1C46!&Wf^X`VxW`#lb;s zGfXmtR8>_co@e&=62BZdQ{?KdZIL#4x&l3ROcHlKU!9&aaqi5LxsU4OBi%Gt-Cn3H z`>Rs(>nxkl?Lobll73yduy0GkL8i!7j)0TL`sMvE-d|_DGgo8RX1e=pchhIC6-Da7wJGV<>iO^P zxF7sy=M(39V~5j`FM+Zd4(r3z<}-R!U0vii? z|KQ!t#>1?dRq$&6Tfn_JKxLl*Pe%V3+$`D zZ17#UdEV!1n|V#P2l}X9+w2y2r;S(oM)96+te0K6917C>>{`prp3Zn}InQ>x=k3~t znQ1>NXM4@-y&HPs*!g*~Oe%VdG@mT%nm4CPtw!r(gXeT? zVDPxHWn$mDAFY}`B~m|yCi^=dkqBJ>@BKMb&*zVHZ*2Z-(Jj&)JoSObG*_cIF5}9? z7*-bToo5mjFwfwsdZfB+yH*ZsF_kgG(SNqt zS|9rv@6U^N^>%f2aZF5TuqzA>Zo7~?UFV)WgTbQt4=!%6$zTW$xA=P8?bg;8#Zn(m zGHu(zk}meAN@P{n=71mD1CF}B-j~^UF!%O0&38;QxBPm4#+2pH=VpdG`n%R!FP`QY zC$v8>g*!_$>Y z8d*B<_A@ujf_vKTSPdW4d~Wj(m1u( zK;lULon5}6QD$XX+bz~k3E$1X&rl>J<1YJRJAGDB_ejIVI|}8t&oOFQ-P~na{A`29 zwyoWniSrX{7+POF;Qy~$P&4~px%}5T2A!h2IHyJ~c%ZaIgzI0L19UftU!O?|97Ki2>Bq7A#PHFj;2G!2W`JpWIV)2Tb<9W&E7 zZZG`oY4YLn+8!p*Rz%GM`zvQ>ZRu1H$y8Nc8r&;2Rm0%G6#l%km64xf8RA`pKI_LU znlp!qi|dnWy<{-|2XFB|B~ii;qKo*x{py>?lTpd?e?(^{@3|yl6CNtWag8Xk5B*ivxM;{3wvPqKYpVRJy+81M{X{i znZ1J1)#dssK55;Va{`uJQQI}o+ePH>s#$JTA1^2@>e#X?<`v8Q=TF1}s?zkB4|>e3 zyt4M_8jHC{og%eMo3aBIJ&%|bx9z&Za?!vel{LTLZl82{XXR(LuWx?ZOX^h5U2l2( z;^eq(Wrl0N*91tgt4isti{_PZs6RI=(oOS}r*|^H zzK-y^|Byj`Qjb$^Y0vTvMf#eW%QkeRmDC;QV{1CQHe2BP#wbUHihCMdQx?B>adoxa zyOH~ab=Mke)q~Pvgc+t-u>gG<+10`zqU)RD~snz&tA+>H#O!9pX`1oX7{y0EI*zu6&+)(UAwV~Df^n)%Vckhu4{Y@ z&+6p8n5)Z=c`J1>d^o*pTgvXq(ocRA3JB`yXe`^)d@~=;zj$4!hNM~-MwO@aUJvT^Q)p}b+KOjDkG)+{?MT$H75Rl23)Eel-L!%eJV*m z%Gx239GbVhP{ijj%c_ z;Cw^Da%sl&IWrw|Z<}3Mdm-WE)-FxgED`0Uf3^1}*41|x?; zM@PfP;$w@CxCLu%nNys%{guYT=NmedCWby^p7yQZ^8V%{H4Z!K8@T@@D6tzHyFcT| z-Me>v4{VJ1ePvGZmXheDSBk#ByE{{_?7Y1B&NoR>XYC~3B}MsqDl%!A^qG}kv?@1k zo!gwxmwtZ!=9#-6{5`OnG3v&_X7-!AoAz&XIQ;XGIoJIU_fDAVym0VNdY6@7YI^g? zOi`r|^Hk^T_j`C%Yx3=n!cQK)^J7%{_h!n{+ZmsiJ_>5k*HT~()dMfbG3XV@wo|rR z!LzjC`nH*_B7Tqe+1)koX|ua_@W~eA&7V55T7v@?=qui~_%?TGNqm3UmG$#ejas8> zlU_bA@Zw!9rP2G~exaA{dbWsXS}r$OS+sAeDt~>$K;A*1!As=jhR+8;>gfW7~0bb6@gf*#rBJN^))ex1;K-R^jY?%j-L`S8mt*bFXh& z*-GF2=D$B*6%oEU!OGQqS(Ebd6`MM?CHB^C5}Mk`>T>7q=@mTl=DpK7l>NTVqu}+m zwUKFVd=Cx>SuIIjx&OeW)ZI7UA8bx~TRUsj@!+72iljSrR^{(x_F8Oc)H+bUs#|a_ z4@2EnEk+?Pu6MWBL~g!u$R~d@H%Hu#0!3NtvNbVGt}mRQ9lz&(cD_MrV)4`tB{kLe z4^C|=TgGtUAW(ah~l zJr>Jee{s_L=HqL{0$J`l`bi#|l>E^8QHLRe(JTQOW)%s?l?^kG@2mZ-VR7TjK83e7 z_5W(b0w)(FadT_hE1!M2Sud;m<+n)BoDbKsCd{;n-MsQmh49r?%Oc$rqmFMn`aFwG z|AfS;o9d4%`#L)(797#Fwf9S9xbZYF?&0S%jq3sz%s%~Vsa~Zslgi}Fn>CgMTemaV zuKgFiE6x1wxpPa?<@QB~DL!&4vMQbTN87R5=I@D=lkXB{1qL~ZTv!sPS?kz#>cP`c zuBzT8Mj5fwuRVWowoLMm>f>pPBtm`IQ_3z$?hG;A#Cbck%8gI-iFi<`xq+b8-m(N(;A6r1!}er&U`&;GWS?ZZQZpGSoKU)+r$){T}Dv z%&Vq*FIaIR@QlauvbWL`m!D7z`962!<+dzAR|`c&rs9;p8mq#!kNBl8sgtms!j;oJ z-O}R1^gk||d$^|uYiv5NzNX^QLfwy(ns+j77t(8B=bsb&q%iqlrV7Wj-O3Rz3_PFZ z7i)-W7&r+_^E)IJet&mYL{ic-QrYL}vI(V{r_L_zE1xb_WR=})#ng2uL0%`PwfK0z z>aevXKkq3oD0q2Eb^1Hzlq*MC8(%QHEPtZ5;mwG5*8nT}JNeN(S|_?(PwR9*FF=Haq-K3SulQwbsQ3@rT8W<5%G^)J6*_c?3$K&o9#Bw2R;mJKU9&c*L? z^nJBjJbh{UvkPBmXO_IWV_Nn9bP)HuoB4KrVTC2eO&;@@9i zH4BeRa30t{6TA(rM9MN?r`;)w%0AZWBNG!66;6aQ*7^C_J)OH>WvBj(`)9ZMZ{y~0 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 Ib4q9e05yZNdH?_b literal 0 HcmV?d00001 diff --git a/keyboards/atreus/keymaps/replicaJunction/atreus-replica-extend.png b/keyboards/atreus/keymaps/replicaJunction/atreus-replica-extend.png new file mode 100644 index 0000000000000000000000000000000000000000..08c2e6140cb1594e342bf796c6dcf6fddac6f90c GIT binary patch literal 91555 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

_DejfS5Dt%LJ8{^;Gn>0RZZ@zwM>S{@o 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 literal 0 HcmV?d00001 diff --git a/keyboards/atreus/keymaps/replicaJunction/atreus-replica-num.png b/keyboards/atreus/keymaps/replicaJunction/atreus-replica-num.png new file mode 100644 index 0000000000000000000000000000000000000000..6598acb27b7f815ab068dec204de4b644674ff5e GIT binary patch literal 73171 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⁣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 literal 0 HcmV?d00001 diff --git a/keyboards/atreus/keymaps/replicaJunction/config.h b/keyboards/atreus/keymaps/replicaJunction/config.h new file mode 100644 index 0000000000..437aa662c8 --- /dev/null +++ b/keyboards/atreus/keymaps/replicaJunction/config.h @@ -0,0 +1,94 @@ +/* +Config file - Atreus QMK with replicaJunction layout + +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 . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ + +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Technomancy +#define PRODUCT Atreus +#define DESCRIPTION q.m.k. keyboard firmware for Atreus + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 11 + +// Change this to how you wired your keyboard +// COLS: Left to right, ROWS: Top to bottom +#if defined(ATREUS_ASTAR) +# define MATRIX_ROW_PINS { D0, D1, D3, D2 } +# define MATRIX_COL_PINS { D7, C6, B5, B4, E6, D4, B6, F6, F7, D6, B7 } +# define UNUSED_PINS +#elif defined(ATREUS_TEENSY2) +# define MATRIX_ROW_PINS { D0, D1, D2, D3 } +# define MATRIX_COL_PINS { F6, F5, F4, B7, B6, B5, B4, B3, B2, B1, B0 } +# define UNUSED_PINS +#endif + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +//#define BACKLIGHT_LEVELS 3 + +/* Set 0 if debouncing isn't needed */ +// Default: 5 +#define DEBOUNCING_DELAY 6 + +// I don't have any locking keys, so I don't need these features + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +//#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +//#define LOCKING_RESYNC_ENABLE + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* Prevent modifiers from sticking when switching layers */ +#define PREVENT_STUCK_MODIFIERS + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +#endif diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c new file mode 100644 index 0000000000..52d3677fa7 --- /dev/null +++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c @@ -0,0 +1,107 @@ +/* + * Keyboard: Atreus + * Keymap: replicaJunction + * Version: 0.3 + * + * This keymap is designed to complement my Ergodox keyboard layout, found in keyboards/ergodox_ez. + * The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox. I now + * have both keyboards, so I've designed these layouts in an effort to make switching between the + * two as easy as possible. + * + * Clearly, the Atreus is the limiting factor in this equation, so I've taken heavy advantage of + * function and dual-role keys. + * + * The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found + * here: https://colemakmods.github.io/mod-dh/ + */ + +#include "atreus.h" + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + +// Note that whatever is set as layer 0 will be the default layer of the keyboard. + +#define _CO 0 // Colemak +#define _QW 1 // QWERTY +#define _GA 2 // Gaming +#define _EX 3 // Extend +#define _NU 4 // Numpad +#define _FN 5 // Function + +// Some quick aliases, just to make it look pretty +#define _______ KC_TRNS +#define KCX_CA LCTL(KC_LALT) +#define KCX_CS LCTL(KC_LSFT) +#define KCX_CSA LCTL(LSFT(KC_LALT)) +#define KCX_LST LSFT(KC_TAB) +#define KX_COPY LCTL(KC_C) +#define KX_CUT LCTL(KC_X) +#define KX_PAST LCTL(KC_V) +#define KX_UNDO LCTL(KC_Z) + +; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements. + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_CO] = KEYMAP( + KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, + KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, + SFT_T(KC_Z), KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, SFT_T(KC_SLSH), + KC_ESC, KC_LGUI, KC_TAB, KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL +), + +[_QW] = KEYMAP( /* Qwerty */ + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + SFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SFT_T(KC_SLSH), + KC_ESC, KC_LGUI, KC_TAB, KC_LALT, KC_BSPC, CTL_T(KC_DEL), ALT_T(KC_ENT), LT(_NU, KC_SPC), MO(_EX), KC_MINS, KC_QUOT, KC_EQL +), + +[_EX] = KEYMAP( /* Extend */ + KC_CAPS, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, + _______, KC_LGUI, KC_LALT, KC_LCTL, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, + _______, KX_CUT, KX_COPY, _______, KX_PAST, _______, KC_TAB, KCX_LST, _______, KC_INSERT, + _______, _______, _______, _______, _______, _______, _______, KC_SPC, _______, _______, _______, KC_PSCR +), + +[_NU] = KEYMAP( /* Numbers and symbols */ + KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR, + KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_TILD, KC_PIPE, KC_4, KC_5, KC_6, KC_MINS, + KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, KC_BSLS, KC_1, KC_2, KC_3, KC_PLUS, + _______, TG(_GA), _______, MO(_FN), _______, _______, _______, _______, KC_0, KC_DOT, KC_EQL, _______ +), + +[_FN] = KEYMAP( /* Functions */ + KC_DEL, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, KC_F7, KC_F8, KC_F9, KC_F10, + KC_BSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_DOWN, _______, KC_F4, KC_F5, KC_F6, KC_F11, + _______, KC_VOLU, KC_MUTE, KC_VOLD, KC_MPLY, _______, KC_F1, KC_F2, KC_F3, KC_F12, + _______, _______, _______, _______, KC_MSTP, _______, _______, _______, KC_NO, DF(_CO), DF(_QW), RESET +), + +[_GA] = KEYMAP( /* Gaming */ + _______, _______, _______, _______, _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, + _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, + KC_Z, _______, _______, _______, _______, KC_BTN3, _______, KC_MS_D, _______, _______, + _______, TG(_GA), _______, KC_LSFT, KC_SPC, KC_BSPC, KC_BTN2, KC_BTN1, _______, _______, _______, _______ +)}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +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; + } + return MACRO_NONE; +}; diff --git a/keyboards/atreus/keymaps/replicaJunction/readme.md b/keyboards/atreus/keymaps/replicaJunction/readme.md new file mode 100644 index 0000000000..21af48e8fd --- /dev/null +++ b/keyboards/atreus/keymaps/replicaJunction/readme.md @@ -0,0 +1,57 @@ +# replicaJunction - Atreus Layout # + +This layout is designed to make the absolute most out of the Atreus 40% keyboard. + +I was enchanted with the idea of the Atreus keyboard after using my Ergodox for several months. I wanted something of a similar form factor that was easily portable, so I could bring and transport a keyboard to my workplace without much hassle. After building the Atreus keyboard, though, I realized very quickly that the 40% form factor requires a lot more creativity than a full-size keyboard (even one as strangely-shaped as the Ergodox). + +The default Atreus keyboard layout provides all the necessary keys in order to function with the keyboard, but as a programmer, I needed quicker access to just about everything. I noticed that the default layer didn't include any dual-role keys, and so I started on my journey to build my perfect layout for the Atreus. + +I won't claim that this layout is perfect for everyone. It does make several significant changes from the "normal" Atreus layout. In my own use, though, I've found this keyboard turbocharges my Atreus, and gives it the power of a full-size keyboard without the size. + +## Base Layer ## + +![Atreus base layout](atreus-replica-base-colemakdh.png) + +The letters on this layout are arranged in the [Colemak Mod-DH layout](https://colemakmods.github.io/mod-dh/). + +Note that there are four dual-purpose keys: Shift (Backspace), Ctrl (Delete), Alt (Enter), and Space (Number layer). In QMK, these dual-role keys can be made to hold their primary key by double-tapping the key and holding on the second tap. For example, if I wanted to insert a long string of Spaces, I would tap the Space key, then tap it again and hold. A single press and hold would trigger the secondary function of the key instead. + +The secondary Alt on the left bottom row exists to provide a single-hand Alt+Tab shortcut, which would take two rows otherwise. + +## Extend Layer ## + +![Atreus extend layer](atreus-replica-extend.png) + +This layout is designed primarily for keyboard navigation. Arrow keys are easily accessible under the right hand (a welcome change from the original Atreus layout, which places them under the left hand), along with Home/End and PgUp/PgDn. + +Modifiers are also placed under the home row of the left hand. One of the single keyboard actions I use most is Shift+Ctrl+Left/Right to select a whole word; this layer makes those keypresses simple by adding the Ctrl key in an easy-to-reach location. + +For the common Ctrl shortcuts, I also added some hotkeys to this layer over the letter keys they are associated with. This gives the Extend key some extra utility by letting it "feel" like a Ctrl key in some cases. + +The Space key exists to prevent going from this layer directly into the Number layer. Similarly, the Shift key on the left pinky helps make sure that the normal letter (Z) doesn't fire. + +## Number and Symbol Layer ## + +![Atreus number and symbol layer](atreus-replica-num.png) + +This layer provides the only way of accessing number keys on this keyboard, since it's too small for its own number row. Note that even though they are laid out in the number pad fashion, they send the "regular" number keystrokes. Games and programs that specifically use NumPad keys are not supported in this layout at the moment. + +This layer also provides plenty of symbol shortcuts. Most of these can be accessed through other means (like Shift+8 for the asterisk), but having shortcut keys to them makes for one less keypress, which adds up quickly when using these symbols on a regular basis. I've been through many revisions of this concept on my Ergodox as well as the Atreus, and I've finally arrived at this layout as the one that provides the symbols I need most frequently in places I can think to expect them. The Ordinary layout from the Ergodox-EZ keyboard in this repository was a large influence in this design. + +## Function Layer ## + +![Atreus function layer](atreus-replica-function.png) + +Function keys (F1-F12) are on this layer, as well as some more generic "functions" such as media keys. I've also set up a mirror image of the arrows from the Extend layer in case I need to use these with my left hand, but I don't do this very often. + +The reset key is on this layer, as well as a toggle from Colemak to QWERTY and back. The QWERTY layer is not currently documented, but it is functionally identical to the base layer except for letter positions. + +## Gaming Layer ## + +![Atreus gaming layer](atreus-replica-game.png) + +This is a small layer developed to allow some simple gameplay without a mouse. This layer is a toggle (from the Number layer), so it is designed to stay on while in use. + +The keys on the left hand bring Space into the left thumb's reach, as well as overriding the dual-role Shift with its standard function (Z in both QWERTY and in Colemak). This allows easy Shift presses without blocking the Z key, commonly used in games. + +I would probably not consider this a hard-core gaming keyboard, and this layout does have the huge problem of blocking access to the number keys, but for more casual games, it plays quite well. I've used it quite a bit on Minecraft, for example, and I'm quite pleased with it. \ No newline at end of file From 936a26d04ffa12801031c058f27e221174e3fabd Mon Sep 17 00:00:00 2001 From: IBNobody Date: Thu, 25 Aug 2016 00:15:41 -0500 Subject: [PATCH 077/120] Added pin support for A0-A7 Vision Division - It works! --- keyboards/vision_division/config.h | 2 +- .../vision_division/keymaps/default/Makefile | 2 +- .../vision_division/keymaps/default/config.h | 6 +++--- quantum/config_common.h | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/keyboards/vision_division/config.h b/keyboards/vision_division/config.h index 37b834973c..f50378ffa8 100644 --- a/keyboards/vision_division/config.h +++ b/keyboards/vision_division/config.h @@ -24,7 +24,7 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW +#define DIODE_DIRECTION ROW2COL // #define BACKLIGHT_PIN B7 // #define BACKLIGHT_BREATHING diff --git a/keyboards/vision_division/keymaps/default/Makefile b/keyboards/vision_division/keymaps/default/Makefile index 393a9e23a6..ecbe7e1ab2 100644 --- a/keyboards/vision_division/keymaps/default/Makefile +++ b/keyboards/vision_division/keymaps/default/Makefile @@ -10,7 +10,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration 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 MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 +AUDIO_ENABLE = yes # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. diff --git a/keyboards/vision_division/keymaps/default/config.h b/keyboards/vision_division/keymaps/default/config.h index 34eaaff5b7..16740fb15b 100644 --- a/keyboards/vision_division/keymaps/default/config.h +++ b/keyboards/vision_division/keymaps/default/config.h @@ -7,7 +7,7 @@ /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID GET_PID(NUMERIC_MAX_TEENSY, NUMERIC_MAX) +#define PRODUCT_ID GET_PID(NUMERIC_NORMAL, HOMING_MAX_TEENSY) #define DEVICE_VER 0x0001 #define MANUFACTURER IBNobody #define PRODUCT Vision Division @@ -17,8 +17,8 @@ #define MATRIX_ROWS 6 #define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 } -#define MATRIX_COLS GET_MATRIX_COLS(NUMERIC_MAX_TEENSY, NUMERIC_MAX) -#define MATRIX_COL_PINS GET_MATRIX_COL_PINS(NUMERIC_MAX_TEENSY, NUMERIC_MAX) +#define MATRIX_COLS GET_MATRIX_COLS(NUMERIC_NORMAL, HOMING_MAX_TEENSY) +#define MATRIX_COL_PINS GET_MATRIX_COL_PINS(NUMERIC_NORMAL, HOMING_MAX_TEENSY) #define UNUSED_PINS diff --git a/quantum/config_common.h b/quantum/config_common.h index 7ef4b23d48..8ed5f4a106 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -45,14 +45,14 @@ #define F5 0xF5 #define F6 0xF6 #define F7 0xF7 -#define A0 0xA0 -#define A1 0xA1 -#define A2 0xA2 -#define A3 0xA3 -#define A4 0xA4 -#define A5 0xA5 -#define A6 0xA6 -#define A7 0xA7 +#define A0 0x00 +#define A1 0x01 +#define A2 0x02 +#define A3 0x03 +#define A4 0x04 +#define A5 0x05 +#define A6 0x06 +#define A7 0x07 /* USART configuration */ From 601feed87e3ab303fbc7b5987dd6d451b6fa3453 Mon Sep 17 00:00:00 2001 From: JeeBak Kim Date: Tue, 23 Aug 2016 20:08:06 -0700 Subject: [PATCH 078/120] [jd45] Add "jeebak" keymap folder as a copy of the "default" folder --- keyboards/jd45/keymaps/jeebak/keymap.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 keyboards/jd45/keymaps/jeebak/keymap.c diff --git a/keyboards/jd45/keymaps/jeebak/keymap.c b/keyboards/jd45/keymaps/jeebak/keymap.c new file mode 100644 index 0000000000..95abb1505c --- /dev/null +++ b/keyboards/jd45/keymaps/jeebak/keymap.c @@ -0,0 +1,17 @@ +#include "jd45.h" + +/* this keymap is to provide a basic keyboard layout for testing the matrix + * for more practical and complicated keymap refer to other keymaps in the same folder + */ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = KEYMAP( + ESC, Q, W, E, R, T, Y, U, I, O, P, QUOT, BSPC, + TAB, A, S, D, F, G, H, J, K, L, SCLN, ENT, + LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, + PAUSE, LCTL, LALT, DEL, SPC, DEL, LEFT, UP, DOWN, RIGHT ), +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; From 9c0c8c307d36aa7a1909718e5da58a0eb8fcedb6 Mon Sep 17 00:00:00 2001 From: JeeBak Kim Date: Tue, 23 Aug 2016 20:56:19 -0700 Subject: [PATCH 079/120] [jd45] Port jeebak's planck keymap to jd45 --- keyboards/jd45/keymaps/jeebak/config.h | 16 + keyboards/jd45/keymaps/jeebak/keymap.c | 424 +++++++++++++++++++++++- keyboards/jd45/keymaps/jeebak/readme.md | 129 +++++++ 3 files changed, 560 insertions(+), 9 deletions(-) create mode 100644 keyboards/jd45/keymaps/jeebak/config.h create mode 100644 keyboards/jd45/keymaps/jeebak/readme.md diff --git a/keyboards/jd45/keymaps/jeebak/config.h b/keyboards/jd45/keymaps/jeebak/config.h new file mode 100644 index 0000000000..53a1f0a307 --- /dev/null +++ b/keyboards/jd45/keymaps/jeebak/config.h @@ -0,0 +1,16 @@ +#include "../../config.h" + +/** + *JD45 keymap definition macro + */ +#define KEYMAP_JD45( \ + K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, \ + K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, \ + K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, \ + K38, K39, K40, K41, K42, K43, K44, K45, K46, K47 \ +) { \ + { K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13 }, \ + { K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, KC_NO }, \ + { K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, KC_NO }, \ + { K38, K39, K40, K41, K42, KC_NO, K43, KC_NO, K44, K45, K46, K47, KC_NO } \ +} diff --git a/keyboards/jd45/keymaps/jeebak/keymap.c b/keyboards/jd45/keymaps/jeebak/keymap.c index 95abb1505c..ac3e010a91 100644 --- a/keyboards/jd45/keymaps/jeebak/keymap.c +++ b/keyboards/jd45/keymaps/jeebak/keymap.c @@ -1,17 +1,423 @@ #include "jd45.h" -/* this keymap is to provide a basic keyboard layout for testing the matrix - * for more practical and complicated keymap refer to other keymaps in the same folder +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. +#define _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _PLOVER 5 +#define _TOUCHCURSOR 6 +#define _MOUSECURSOR 7 +#define _ADJUST 16 + +// Keycodes +enum planck_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + PLOVER, + LOWER, + RAISE, + BACKLIT, + EXT_PLV +}; + +enum macro_keycodes { + KC_ALT_TAB, + KC_CMD_TAB, + KC_CTL_TAB, + KC_CMD_SLSH, + KC_AG_FIND, + KC_AG_AGAIN, + KC_AG_UNDO, + KC_AG_CUT, + KC_AG_COPY, + KC_AG_PASTE, + KC_AG_DESK_L, + KC_AG_DESK_R, + KC_AG_TAB_C, + KC_AG_TAB_N, + KC_AG_TAB_R, +}; + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +// Custom macros +#define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl +#define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift +#define HPR_TAB ALL_T(KC_TAB) // Tap for Tab, hold for Hyper +#define GUI_SEM GUI_T(KC_SCLN) // Tap for Semicolon, hold for GUI +#define ALT_QUO ALT_T(KC_QUOT) // Tap for Quote, hold for Alt +// Requires KC_TRNS/_______ for the trigger key in the destination layer +#define LT_TC LT(_TOUCHCURSOR, KC_SPC) // L-ayer T-ap T-ouch C-ursor +#define LT_MC(kc) LT(_MOUSECURSOR, kc) // L-ayer T-ap M-ouse C-ursor +#define ALT_TAB M(KC_ALT_TAB) // Macro for Alt-Tab +#define CMD_TAB M(KC_CMD_TAB) // Macro for Cmd-Tab +#define CTL_TAB M(KC_CTL_TAB) // Macro for Ctl-Tab +#define CMD_SLSH M(KC_CMD_SLSH) // Macro for Cmd-Slash (personal shortcut to toggle iTerm2 visibility) +#define AG_FIND M(KC_AG_FIND) // Macros for Cmd-[x] vs Ctrl-[x] based on current AG_NORM or AG_SWAP settings +#define AG_AGAIN M(KC_AG_AGAIN) +#define AG_UNDO M(KC_AG_UNDO) +#define AG_CUT M(KC_AG_CUT) +#define AG_COPY M(KC_AG_COPY) +#define AG_PASTE M(KC_AG_PASTE) +#define AG_D_L M(KC_AG_DESK_L) // For Virtual Desktop Switching: Left, and +#define AG_D_R M(KC_AG_DESK_R) // Right +#define AG_T_C M(KC_AG_TAB_C) // For Chrome, etc. Tab Close, +#define AG_T_N M(KC_AG_TAB_N) // Tab New, and +#define AG_T_R M(KC_AG_TAB_R) // Tab Reopen Closed + +/* Qwerty + * + * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + * |Hyper/Tab| Q | W | E | R | T | Y | U | I | O | P | [ | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`------`------| + * | Ctrl/Esc | A | S | MC/D | F | G | H | J | K | L |GUI/; | Alt/" | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | Shift | Z | X | C | V | B | N | M | , | . | / | Sft/Ent | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | RGUI | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol- | Vol+ | Play | + * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( - ESC, Q, W, E, R, T, Y, U, I, O, P, QUOT, BSPC, - TAB, A, S, D, F, G, H, J, K, L, SCLN, ENT, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, - PAUSE, LCTL, LALT, DEL, SPC, DEL, LEFT, UP, DOWN, RIGHT ), +[_QWERTY] = KEYMAP_JD45( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ + HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ + CTL_ESC , KC_A, KC_S,LT_MC(KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, GUI_SEM, ALT_QUO , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_LSFT , KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + KC_RGUI , KC_LALT , KC_LGUI , LOWER , LT_TC , LT_TC , RAISE , KC_VOLD , KC_VOLU , KC_MPLY), +/*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/ + +/* Colemak + * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + * |Hyper/Tab| Q | W | F | P | G | J | L | U | Y | ; | [ | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`------`------| + * | Ctrl/Esc | A | R | MC/S | T | D | H | N | E | I | O | " | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | Shift | Z | X | C | V | B | K | M | , | . | / | Sft/Ent | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | RGUI | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol- | Vol+ | Play | + * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' + */ +[_COLEMAK] = KEYMAP_JD45( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ + HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_BSPC, +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ + CTL_ESC , KC_A, KC_R,LT_MC(KC_S), KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_LSFT , KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + KC_RGUI , KC_LALT , KC_LGUI , LOWER , LT_TC , LT_TC , RAISE , KC_VOLD , KC_VOLU , KC_MPLY), +/*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/ + +/* Dvorak + * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + * |Hyper/Tab| " | , | . | P | Y | F | G | C | R | L | / | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`------`------| + * | Ctrl/Esc | A | O | MC/E | U | I | D | H | T | N | S | / | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | Shift | ; | Q | J | K | X | B | M | W | V | Z | Sft/Ent | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | RGUI | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol- | Vol+ | Play | + * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' + */ +[_DVORAK] = KEYMAP_JD45( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ + HPR_TAB,KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_BSPC, +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ + CTL_ESC , KC_A, KC_O,LT_MC(KC_E), KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_LSFT , KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + KC_RGUI , KC_LALT , KC_LGUI , LOWER , LT_TC , LT_TC , RAISE , KC_VOLD , KC_VOLU , KC_MPLY), +/*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/ + +/* Lower + * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`------`------| + * | [ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | "|" | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | ] | F7 | F8 | F9 | F10 | F11 | F12 | - | = | [ | ] | \ | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | Brite | | | | | | | Prev | Next | Mute | + * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' + */ +[_LOWER] = KEYMAP_JD45( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ + KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, KC_BSPC, +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ + KC_LBRC , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_RBRC , KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + BACKLIT , _______, _______, _______, _______ , _______ , _______, KC_MPRV, KC_MNXT, KC_MUTE), +/*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/ + +/* Raise + * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`------`------| + * | $ | 4 | 5 | 6 | . | + | . | 4 | 5 | 6 | * | "|" | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | = | 7 | 8 | 9 | 0 | - | . | 1 | 2 | 3 | / | \ | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | Brite | | | | | | | Prev | Next | Mute | + * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' + */ +[_RAISE] = KEYMAP_JD45( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ + KC_0 , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, KC_BSPC, +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ + KC_DLR , KC_4, KC_5, KC_6, KC_DOT, KC_PLUS, KC_DOT, KC_4, KC_5, KC_6, KC_ASTR, KC_PIPE , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_EQL , KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_DOT, KC_1, KC_2, KC_3, KC_SLSH, KC_BSLS , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + BACKLIT , _______, _______, _______, _______ , _______ , _______, KC_MPRV, KC_MNXT, KC_MUTE), +/*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/ + +/* TouchCursor layer (http://martin-stone.github.io/touchcursor/) plus personal customizations + * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + * | AltTab |CmdTab|CtlTab| GUI |Shift | ~ |Insert| Home | Up | End | Bksp | | | + * |---------`------`------`------`------`------`------`------`------`------`------`------`------| + * | | Alt |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L| Desk_R | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | | Undo | Cut | Copy |Paste | ` | PgDn | Del |Tab_N |Tab_R |iTerm2| | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | | | | | | | | | | | + * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' + * + * The KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND, and KC_AGAIN keycodes don't + * seem to work on Mac. Presumably they'll work under Windows. + */ + +[_TOUCHCURSOR] = KEYMAP_JD45( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ + ALT_TAB,CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD, KC_INS, KC_HOME, KC_UP, KC_END, KC_BSPC, _______, _______, +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ + _______ ,KC_LALT, KC_SPC, AG_T_C, AG_FIND,AG_AGAIN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, AG_D_L, AG_D_R , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + _______ ,AG_UNDO, AG_CUT, AG_COPY,AG_PASTE, KC_GRV, KC_PGDN, KC_DEL, AG_T_N, AG_T_R,CMD_SLSH, _______ , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + _______ , _______, _______, _______, _______ , _______ , _______, _______, _______, _______), +/*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/ + +/* Mouse Layer + * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + * | | |ACCL0 | | | | |WHL_L | Up |WHL_R | BTN2 | | | + * |---------`------`------`------`------`------`------`------`------`------`------`------`------| + * | |ACCL2 | BTN2 | | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 | BTN5 | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | | | | | BTN3 | |WHL_Dn| BTN1 | | | BTN3 | | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | | | | | | | | | | | + * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' + */ + +[_MOUSECURSOR] = KEYMAP_JD45( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ + _______,_______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______, _______, +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ + _______ ,KC_ACL2, KC_BTN2, _______, KC_BTN1, KC_ACL1, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN4, KC_BTN5 , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + _______ ,_______, _______, _______, KC_BTN3, _______, KC_WH_D, KC_BTN1, _______, _______, KC_BTN3, _______ , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______), +/*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/ + +/* Plover layer (http://opensteno.org) + * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + * | # | # | # | # | # | # | # | # | # | # | # | # | # | + * |---------`------`------`------`------`------`------`------`------`------`------`------`------| + * | | S | T | P | H | * | * | F | P | L | T | D | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | TogOut | S | K | W | R | * | * | R | B | G | S | Z | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | Exit | | A | O | | | E | U | | | + * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' + */ + +[_PLOVER] = KEYMAP_JD45( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ + KC_1 , KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ + XXXXXXX , KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + XXXXXXX , KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + EXT_PLV , XXXXXXX, KC_C, KC_V, XXXXXXX , XXXXXXX , KC_N, KC_M, XXXXXXX, XXXXXXX), +/*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/ + +/* Adjust (Lower + Raise) + * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + * | | | | | | | | | | | | | Del | + * |---------`------`------`------`------`------`------`------`------`------`------`------`------| + * | | | | | |AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | | | | | | | | | | | | | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | | | | | | | | | | Reset | + * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' + */ +[_ADJUST] = KEYMAP_JD45( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ + _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ + _______ ,_______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______ , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + _______ ,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + _______ , _______, _______, _______, _______ , _______ , _______, _______, _______, RESET) +/*`----------+-----------+-----------+-----------+----^^^----+----^^^----+-----------+-----------+-----------+--------'*/ }; -const uint16_t PROGMEM fn_actions[] = { +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} -}; +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + default_layer_set(1UL<<_DVORAK); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case BACKLIT: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + return false; + break; + case PLOVER: + if (record->event.pressed) { + layer_off(_RAISE); + layer_off(_LOWER); + layer_off(_ADJUST); + layer_on(_PLOVER); + if (!eeconfig_is_enabled()) { + eeconfig_init(); + } + keymap_config.raw = eeconfig_read_keymap(); + keymap_config.nkro = 1; + eeconfig_update_keymap(keymap_config.raw); + } + return false; + break; + case EXT_PLV: + if (record->event.pressed) { + layer_off(_PLOVER); + } + return false; + break; + } + return true; +} + +/* + * Macro definition + */ +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + if (!eeconfig_is_enabled()) { + eeconfig_init(); + } + + bool use_cmd = true; // Use, for example, Cmd-Tab, Cmd-C, Cmd-V, etc. + // Compare to MAGIC_SWAP_ALT_GUI and MAGIC_UNSWAP_ALT_GUI configs, set in: + // quantum/quantum.c + if(keymap_config.swap_lalt_lgui == 1 && keymap_config.swap_ralt_rgui == 1) { + use_cmd = false; // ... or, Alt-Tab, Ctrl-C, Ctrl-V, etc. + } + + switch (id) { + case KC_ALT_TAB: + if(use_cmd) { return (record->event.pressed ? MACRO( D(LALT), D(TAB), END ) : MACRO( U(TAB), END )); } + else { return (record->event.pressed ? MACRO( D(LGUI), D(TAB), END ) : MACRO( U(TAB), END )); } + case KC_CMD_TAB: + if(use_cmd) { return (record->event.pressed ? MACRO( D(LGUI), D(TAB), END ) : MACRO( U(TAB), END )); } + else { return (record->event.pressed ? MACRO( D(LALT), D(TAB), END ) : MACRO( U(TAB), END )); } + + case KC_CTL_TAB: + return (record->event.pressed ? MACRO( D(LCTRL), D(TAB), END ) : MACRO( U(TAB), END )); + case KC_CMD_SLSH: + return (record->event.pressed ? MACRO( D(LGUI), D(SLSH),END ) : MACRO( U(SLSH),END )); + + case KC_AG_FIND: + return use_cmd ? MACRODOWN( D(LGUI), T(F), END ) : MACRODOWN( D(LCTRL), T(F), END ); + case KC_AG_AGAIN: + return use_cmd ? MACRODOWN( D(LGUI), T(G), END ) : MACRODOWN( D(LCTRL), T(G), END ); + case KC_AG_UNDO: + return use_cmd ? MACRODOWN( D(LGUI), T(Z), END ) : MACRODOWN( D(LCTRL), T(Z), END ); + case KC_AG_CUT: + return use_cmd ? MACRODOWN( D(LGUI), T(X), END ) : MACRODOWN( D(LCTRL), T(X), END ); + case KC_AG_COPY: + return use_cmd ? MACRODOWN( D(LGUI), T(C), END ) : MACRODOWN( D(LCTRL), T(C), END ); + case KC_AG_PASTE: + return use_cmd ? MACRODOWN( D(LGUI), T(V), END ) : MACRODOWN( D(LCTRL), T(V), END ); + + case KC_AG_DESK_L: + return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(SCLN), END ) : MACRODOWN( D(LALT), D(LCTRL), T(SCLN), END ); + case KC_AG_DESK_R: + return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(QUOT), END ) : MACRODOWN( D(LALT), D(LCTRL), T(QUOT), END ); + + case KC_AG_TAB_C: + return use_cmd ? MACRODOWN( D(LGUI), T(W), END ) : MACRODOWN( D(LCTRL), T(W), END ); + case KC_AG_TAB_N: + return use_cmd ? MACRODOWN( D(LGUI), T(T), END ) : MACRODOWN( D(LCTRL), T(T), END ); + case KC_AG_TAB_R: + return use_cmd ? MACRODOWN( D(LGUI), D(LSHIFT), T(T), END ) : MACRODOWN( D(LCTRL), D(LSHIFT), T(T), END ); + } + + return MACRO_NONE; +} diff --git a/keyboards/jd45/keymaps/jeebak/readme.md b/keyboards/jd45/keymaps/jeebak/readme.md new file mode 100644 index 0000000000..2e45a46d9b --- /dev/null +++ b/keyboards/jd45/keymaps/jeebak/readme.md @@ -0,0 +1,129 @@ +jeebak's JD45 layout +======================= +NOTE: This is a port of jeebak's planck layout, for jd45. + +This WIP keymap attempts to minimize fingers straying away from the home row. +To aid in this endeavor, when additional modifyer keys to switch layers are +needed, they will be mapped to home row keys. The `keymap.c` file will contain +the exact changes. The diagrams in this README shows the highlights of the +changes from the default mappings. + +I also decided to change all calls to `persistant_default_layer_set()` to +`default_layer_set()` since this is my personal perference. + +## Macros +``` +#define ALT_TAB M(KC_ALT_TAB) +``` + +## Base Layers (Qwerty/Colemak/Dvorak) +These base layers are mostly the same as the default mappings. The interesting +changes are shown below. + +- The `Ctrl/Esc`, will emit an `Escape` when tapped, and act as a `Control` key when held, +- `GUI/;` as `;` and `GUI`, +- `Alt/"` as `"` and `Alt`, +- `Sft/Ent` as `Enter` and `Shift`, and +- `Hyper/Tab` as `Tab` and `Hyper` + +A `TODO` item is to see if it can also act as a `CapsLock` when double-tapped. +The arrow keys, which have been moved to the +[TouchCursor](http://martin-stone.github.io/touchcursor/) layer, have been +replaced with the Media keys as shown. The `MC/kc` key activates the +`MouseCursor` layer when held, and emits the corresponding `kc` for its layer, +when tapped. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + |Hyper/Tab| Q | W | E | R | T | Y | U | I | O | P | [ | Bksp | + |---------`------`------`------`------`------`------`------`------`------`------`------`------| + | Ctrl/Esc | A | S | MC/D | F | G | H | J | K | L |GUI/; | Alt/" | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | Shift | Z | X | C | V | B | N | M | , | . | / | Sft/Ent | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | RGUI | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol- | Vol+ | Play | + `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' +``` + +## Lower Layer (Symbols and Function Keys) +The symbols and functions keys are essentially the same as the default mapping. +The most notable changes are that the symbol keys from the `RAISE` layer have +been moved here. The remaining Media keys replace those that are now on the +base layers. The `BACKLIT` key has also been moved here. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | Bksp | + |---------`------`------`------`------`------`------`------`------`------`------`------`------| + | [ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | "|" | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | ] | F7 | F8 | F9 | F10 | F11 | F12 | - | = | [ | ] | \ | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | Brite | | | | | | | Prev | Next | Mute | + `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' +``` + +## Raise Layer (Numbers and Arithmetic Operators) +All of the numbers and arithmetic operators are available on this layer. Some +keys are duplicated for the convenience of their positions. The `0` and `$` +keys at the far left are for quick access to beginning and end of line in vim. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | Bksp | + |---------`------`------`------`------`------`------`------`------`------`------`------`------| + | $ | 4 | 5 | 6 | . | + | . | 4 | 5 | 6 | * | "|" | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | = | 7 | 8 | 9 | 0 | - | . | 1 | 2 | 3 | / | \ | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | Brite | | | | | | | Prev | Next | Mute | + `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' +``` + +## TouchCursor layer plus personal customizations +[TouchCursor](http://martin-stone.github.io/touchcursor/) uses the `Space` key +as the modifier, with the `IJKL` home row keys representing the inverted-T of +the arrow keys. All of the default TouchCursor keymappings for the right hand +are represented below. My personalizations include all of the keys shown for +the left hand. Having the `Alt` and `Shift` keys (as well as the `Control` key +from the base layers) readily accessible from the home row allows quick word +jumps and highlighting when used in conjunction with the arrow keys. The +`Alt-Tab` macro is not only useful under Windows, but also under Mac when used +with alternative switchers like [HyperSwitch](https://bahoom.com/hyperswitch). +The `Cmd-Tab` and `Ctrl-Tab` sequences are duplicated for easy access while in +this layer. The `KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND,` and `KC_AGAIN` +keycodes do not seem to work. There are macros in place that'll "automatically" +choose the correct version (`Cmd-Tab` vs. `Alt-Tab`, `Cmd-C` vs. `Ctrl-C`, +etc.) depending on which layout you've currently selected (`AG_NORM` or +`AG_SWAP`) in the `_ADJUST` layer. The `Desk_L` and `Desk_R` macros are what I +use to switch between Virtual Desktops Left/Right. The `Tab_C`, `Tab_N` and +`Tab_R` are for "Close Tab," "New Tab" and "Reopen Closed Tab" for apps such as +Google Chrome. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + | AltTab |CmdTab|CtlTab| GUI |Shift | ~ |Insert| Home | Up | End | Bksp | | | + |---------`------`------`------`------`------`------`------`------`------`------`------`------| + | | Alt |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L| Desk_R | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | | Undo | Cut | Copy |Paste | ` | PgDn | Del |Tab_N |Tab_R |iTerm2| | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | | | | | | | | | | | + `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' +``` + +## Mouse Layer +The Mouse layer, closely mimics the layout/behaviour of the TouchCursor layer. +The `D` key (on QWERTY) is used to activate this layer. All 16 keycodes for the +mouse from the `doc/keycode.txt` file are represented, and logically located, +IMHO. The left and right click buttons are duplicated; on the right hand side, +for a quick click here and there, and again on the left hand side for when the +buttons need to be held for dragging things or highlighting text, thus allowing +the right hand to be free to use the up/down/left/right actions. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+------+------. + | | |ACCL0 | | | | |WHL_L | Up |WHL_R | BTN2 | | | + |---------`------`------`------`------`------`------`------`------`------`------`------`------| + | |ACCL2 | BTN2 | | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 | BTN5 | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | | | | | BTN3 | |WHL_Dn| BTN1 | | | BTN3 | | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | | | | | | | | | | | + `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' +``` From c34399c5924c321d037e154bb3d5781dcc5c433a Mon Sep 17 00:00:00 2001 From: dbroqua Date: Thu, 25 Aug 2016 08:29:30 +0200 Subject: [PATCH 080/120] - Updated kc60/readme - Added layout examples for kc60 --- keyboards/kc60/kc60.h | 69 ++++++++++++++++++++++++++++++++++++++++ keyboards/kc60/readme.md | 7 ++++ 2 files changed, 76 insertions(+) diff --git a/keyboards/kc60/kc60.h b/keyboards/kc60/kc60.h index f11d3435c9..c3a0165c09 100644 --- a/keyboards/kc60/kc60.h +++ b/keyboards/kc60/kc60.h @@ -8,6 +8,19 @@ // This a shortcut to help you visually see your layout. // The first section contains all of the arguements // The second converts the arguments into a multi-dimensional array +/* + * ,-----------------------------------------------------------------------------------------. + * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | K49 | + * |-----------------------------------------------------------------------------------------+ + * | K10 | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C | K1D | + * |-----------------------------------------------------------------------------------------+ + * | K20 | K21 | K22 | K23 | K24 | K25 | K26 | K17 | K28 | K29 | K2A | K2B | K2C | + * |-----------------------------------------------------------------------------------------+ + * | K30 | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B | K3D | K3C | + * |-----------------------------------------------------------------------------------------+ + * | K40 | K41 | K42 | K45 | K4A | K4B | K4C | K4D | + * `-----------------------------------------------------------------------------------------' + */ #define KEYMAP( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ @@ -23,3 +36,59 @@ } #endif + +/* Default layout + * ,-----------------------------------------------------------------------------------------. + * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | + * |-----------------------------------------------------------------------------------------+ + * | K10 | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C | K1D | + * |-----------------------------------------------------------------------------------------+ + * | K20 | K21 | K22 | K23 | K24 | K25 | K26 | K17 | K28 | K29 | K2A | K2B | K2C | + * |-----------------------------------------------------------------------------------------+ + * | K30 | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B | K3C | + * |-----------------------------------------------------------------------------------------+ + * | K40 | K41 | K42 | K45 | K4A | K4B | K4C | K4D | + * `-----------------------------------------------------------------------------------------' + */ + +/* Mini Lshift + * ,-----------------------------------------------------------------------------------------. + * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | + * |-----------------------------------------------------------------------------------------+ + * | K10 | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C | K1D | + * |-----------------------------------------------------------------------------------------+ + * | K20 | K21 | K22 | K23 | K24 | K25 | K26 | K17 | K28 | K29 | K2A | K2B | K2C | + * |-----------------------------------------------------------------------------------------+ + * | K30 |K31| K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B | K3C | + * |-----------------------------------------------------------------------------------------+ + * | K40 | K41 | K42 | K45 | K4A | K4B | K4C | K4D | + * `-----------------------------------------------------------------------------------------' + */ + +/* Mini Rshift + * ,-----------------------------------------------------------------------------------------. + * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | + * |-----------------------------------------------------------------------------------------+ + * | K10 | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C | K1D | + * |-----------------------------------------------------------------------------------------+ + * | K20 | K21 | K22 | K23 | K24 | K25 | K26 | K17 | K28 | K29 | K2A | K2B | K2C | + * |-----------------------------------------------------------------------------------------+ + * | K30 | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B | K3C | K3D | + * |-----------------------------------------------------------------------------------------+ + * | K40 | K41 | K42 | K45 | K4A | K4B | K4C | K4D | + * `-----------------------------------------------------------------------------------------' + */ + +/* Mini Enter + * ,-----------------------------------------------------------------------------------------. + * | K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | + * |-----------------------------------------------------------------------------------------+ + * | K10 | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C | K1D | + * |-----------------------------------------------------------------------------------------+ + * | K20 | K21 | K22 | K23 | K24 | K25 | K26 | K17 | K28 | K29 | K2A | K2B | K2C | K2D | + * |-----------------------------------------------------------------------------------------+ + * | K30 | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B | K3C | + * |-----------------------------------------------------------------------------------------+ + * | K40 | K41 | K42 | K45 | K4A | K4B | K4C | K4D | + * `-----------------------------------------------------------------------------------------' + */ \ No newline at end of file diff --git a/keyboards/kc60/readme.md b/keyboards/kc60/readme.md index acc0df68dc..b29c6be302 100644 --- a/keyboards/kc60/readme.md +++ b/keyboards/kc60/readme.md @@ -25,3 +25,10 @@ Keymaps follow the format **__\.c__** and are stored in the `keymaps` fol ![Image of KC60 with RGB Underglow](keymaps/ws2812/ws2812_example.jpg) Build with WS2812 Support by running `make KEYMAP=ws2812`. + +## Warning +For those who want to use 2x1U instead of classic backspace you need to use K0D and K49 like this: +* K0D represents the key at the right of =. +* K49 represents the last key of the row (is wired at the right of the space key on the PCB) + +In kc60.h I've put several definitions' examples of possible layouts proposed by online editor (http://123.57.250.164:9128/). \ No newline at end of file From 94597a27c5d138eb269d864c57e2de89207f7f91 Mon Sep 17 00:00:00 2001 From: JeeBak Kim Date: Thu, 25 Aug 2016 03:06:42 -0700 Subject: [PATCH 081/120] Make the "extra" key in the top row another backspace --- keyboards/jd45/keymaps/jeebak/keymap.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/jd45/keymaps/jeebak/keymap.c b/keyboards/jd45/keymaps/jeebak/keymap.c index ac3e010a91..8d26cbde12 100644 --- a/keyboards/jd45/keymaps/jeebak/keymap.c +++ b/keyboards/jd45/keymaps/jeebak/keymap.c @@ -78,7 +78,7 @@ enum macro_keycodes { /* Qwerty * * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. - * |Hyper/Tab| Q | W | E | R | T | Y | U | I | O | P | [ | Bksp | + * |Hyper/Tab| Q | W | E | R | T | Y | U | I | O | P | Bksp | Bksp | * |---------`------`------`------`------`------`------`------`------`------`------`------`------| * | Ctrl/Esc | A | S | MC/D | F | G | H | J | K | L |GUI/; | Alt/" | * |----------`------`------`------`------`------`------`------`------`------`------`------------| @@ -91,7 +91,7 @@ enum macro_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = KEYMAP_JD45( /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ - HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, + HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_BSPC, /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ CTL_ESC , KC_A, KC_S,LT_MC(KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, GUI_SEM, ALT_QUO , /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ @@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Colemak * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. - * |Hyper/Tab| Q | W | F | P | G | J | L | U | Y | ; | [ | Bksp | + * |Hyper/Tab| Q | W | F | P | G | J | L | U | Y | ; | Bksp | Bksp | * |---------`------`------`------`------`------`------`------`------`------`------`------`------| * | Ctrl/Esc | A | R | MC/S | T | D | H | N | E | I | O | " | * |----------`------`------`------`------`------`------`------`------`------`------`------------| @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_COLEMAK] = KEYMAP_JD45( /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ - HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_BSPC, + HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC, /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ CTL_ESC , KC_A, KC_R,LT_MC(KC_S), KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT , /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ @@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Dvorak * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. - * |Hyper/Tab| " | , | . | P | Y | F | G | C | R | L | / | Bksp | + * |Hyper/Tab| " | , | . | P | Y | F | G | C | R | L | Bksp | Bksp | * |---------`------`------`------`------`------`------`------`------`------`------`------`------| * | Ctrl/Esc | A | O | MC/E | U | I | D | H | T | N | S | / | * |----------`------`------`------`------`------`------`------`------`------`------`------------| @@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_DVORAK] = KEYMAP_JD45( /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ - HPR_TAB,KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_BSPC, + HPR_TAB,KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_BSPC, /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ CTL_ESC , KC_A, KC_O,LT_MC(KC_E), KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH , /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ @@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Lower * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | | Bksp | + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | Bksp | * |---------`------`------`------`------`------`------`------`------`------`------`------`------| * | [ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | "|" | * |----------`------`------`------`------`------`------`------`------`------`------`------------| @@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = KEYMAP_JD45( /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ - KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, KC_BSPC, + KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_BSPC, /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ KC_LBRC , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE , /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ @@ -168,7 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Raise * ,---------+------+------+------+------+------+------+------+------+------+------+------+------. - * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | | Bksp | + * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | Bksp | * |---------`------`------`------`------`------`------`------`------`------`------`------`------| * | $ | 4 | 5 | 6 | . | + | . | 4 | 5 | 6 | * | "|" | * |----------`------`------`------`------`------`------`------`------`------`------`------------| @@ -179,7 +179,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_RAISE] = KEYMAP_JD45( /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ - KC_0 , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, KC_BSPC, + KC_0 , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_BSPC, /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ KC_DLR , KC_4, KC_5, KC_6, KC_DOT, KC_PLUS, KC_DOT, KC_4, KC_5, KC_6, KC_ASTR, KC_PIPE , /*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ From 1bbd3c1eea78abf0b36a289fb37f80dfc4f9c8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Werner?= Date: Thu, 25 Aug 2016 12:25:57 +0200 Subject: [PATCH 082/120] fixed defaulf keymap, added my own keymap now the LEDs are working like they should --- keyboards/kitten_paw/Makefile | 2 +- keyboards/kitten_paw/keymaps/ickerwx/keymap.c | 128 ++++++++++-------- .../kitten_paw/keymaps/ickerwx/readme.md | 18 +++ keyboards/kitten_paw/kitten_paw.c | 17 ++- keyboards/kitten_paw/kitten_paw.h | 11 ++ keyboards/kitten_paw/led.c | 47 ------- keyboards/kitten_paw/matrix.c | 3 +- 7 files changed, 122 insertions(+), 104 deletions(-) create mode 100644 keyboards/kitten_paw/keymaps/ickerwx/readme.md delete mode 100644 keyboards/kitten_paw/led.c diff --git a/keyboards/kitten_paw/Makefile b/keyboards/kitten_paw/Makefile index 9122921737..3b5585ed6f 100644 --- a/keyboards/kitten_paw/Makefile +++ b/keyboards/kitten_paw/Makefile @@ -69,7 +69,7 @@ BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE ?= no # Audio output on port C6 CUSTOM_MATRIX = yes -SRC += matrix.c led.c +SRC += matrix.c ifndef QUANTUM_DIR include ../../Makefile diff --git a/keyboards/kitten_paw/keymaps/ickerwx/keymap.c b/keyboards/kitten_paw/keymaps/ickerwx/keymap.c index 276fc30a80..9a00c80dc8 100644 --- a/keyboards/kitten_paw/keymaps/ickerwx/keymap.c +++ b/keyboards/kitten_paw/keymaps/ickerwx/keymap.c @@ -3,8 +3,14 @@ #define _______ KC_TRNS #define XXXXXXX KC_NO -#define LC LCTL +#define C(kc) LCTL(KC_##kc) +#define RA(kc) RALT(KC_##kc) #define KC_SLCT KC_SELECT +#define MEDAPP LT(MEDIA, KC_APP) +#undef S +#define S(kc) LSFT(KC_##kc) + +uint8_t current_layer_global = 255; enum layers { DEFAULT, @@ -33,75 +39,75 @@ enum macro_id { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [DEFAULT] = KEYMAP(\ - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,KC_BSPC, KC_INS,KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,KC_BSLS, KC_DEL, KC_END,KC_PGDN, KC_P7, KC_P8, KC_P9,KC_PPLS, \ - F(0), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ - F(8),KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT, KC_SLSH, F(9), KC_UP, KC_P1, KC_P2, KC_P3,KC_PENT, \ - F(1),KC_LGUI, F(3), LT(MISC, KC_SPC), F(4), F(5), LT(MEDIA, KC_APP), F(2), KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT), - /* Layer 1: Programming Layer 1, emulating US layout */ + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,KC_SLCK,KC_PAUS, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,KC_MINS, KC_EQL,KC_BSPC, KC_INS,KC_HOME,KC_PGUP, KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_DEL, KC_END,KC_PGDN, KC_P7, KC_P8, KC_P9,KC_PPLS, \ + F(0), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,KC_SCLN,KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, \ + F(8),KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M,KC_COMM, KC_DOT,KC_SLSH, F(9), KC_UP, KC_P1, KC_P2, KC_P3,KC_PENT, \ + F(1),KC_LGUI, F(3), LT(MISC, KC_SPC), F(4), F(5), MEDAPP, F(2), KC_LEFT,KC_DOWN,KC_RGHT, KC_P0,KC_PDOT), + /* Layer 1: Programming Layer 1, emulating US l ayout */ [PROG1] = KEYMAP(\ - KC_ESC,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______, \ - M(GRV),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, KC_SLSH, S(KC_0), _______, _______,_______,_______, _______,_______,_______,_______, \ - _______,_______,_______,_______,_______,_______, KC_Z,_______,_______,_______, _______,RALT(KC_8),RALT(KC_9),RALT(KC_MINS), _______,_______,_______, _______,_______,_______,_______, \ - _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,S(KC_COMM),S(KC_BSLS), _______, _______,_______,_______, \ - MO(PROG2),_______, KC_Y,_______,_______,_______,_______,_______,_______,_______, _______, S(KC_7), MO(PROG2), _______, _______,_______,_______,_______, \ - _______,_______,_______, _______, _______, _______, _______, _______, _______,_______,_______, _______,_______), + KC_ESC,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \ + M(GRV),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_SLSH, S(0),_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,_______,_______,_______,_______, KC_Z,_______,_______,_______,_______, RA(8), RA(9),RA(MINS), _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,S(COMM),S(BSLS), _______, _______,_______,_______, \ + MO(PROG2),_______, KC_Y,_______,_______,_______,_______,_______,_______,_______,_______, S(7), MO(PROG2), _______, _______,_______,_______,_______, \ + _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______), /* Layer 2: programming layer 2 all keys that are not FN keys are sent as LSFT+key on this layer */ [PROG2] = KEYMAP(\ - _______, _______, _______,_______,_______,_______, _______,_______, _______,_______, _______, _______, _______, _______,_______,_______, \ -RALT(KC_RBRC), _______,RALT(KC_Q),KC_BSLS,_______,_______,M(CFLEX),S(KC_6),S(KC_RBRC),S(KC_8), S(KC_9), S(KC_SLSH), KC_RBRC, _______, _______,_______,_______, _______,_______,_______,_______, \ - _______, _______, _______,_______,_______,_______, _______,_______, _______,_______, _______, RALT(KC_7),RALT(KC_0),RALT(KC_NUBS), _______,_______,_______, _______,_______,_______,_______, \ - _______, _______, _______,_______,_______,_______, _______,_______, _______,_______, S(KC_DOT), S(KC_2), _______, _______,_______,_______, \ - _______,S(KC_NUBS), _______,_______,_______,_______, _______,_______, _______,KC_NUBS,S(KC_NUBS), S(KC_MINS), _______, _______, _______,_______,_______,_______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, _______,_______), \ + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \ + RA(RBRC),_______, RA(Q),KC_BSLS,_______,_______,M(CFLEX), S(6),S(RBRC), S(8), S(9),S(SLSH),KC_RBRC,_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, RA(7), RA(0),RA(NUBS), _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, S(DOT), S(2), _______, _______,_______,_______, \ + _______,S(NUBS),_______,_______,_______,_______,_______,_______,_______,KC_NUBS,S(NUBS),S(MINS), _______, _______, _______,_______,_______,_______, \ + _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______), /* Layer 3: media layer */ - [MEDIA] = KEYMAP(\ - KC_PWR,KC_SLEP,KC_WAKE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_MPRV,KC_MPLY,KC_MNXT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_VOLD,KC_MUTE,KC_VOLU, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, KC_EJCT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,_______,XXXXXXX, KC_MRWD,KC_MSTP,KC_MFFD, XXXXXXX,XXXXXXX), + [MEDIA] = KEYMAP(\ + KC_PWR,KC_SLEP,KC_WAKE,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_MPRV,KC_MPLY,KC_MNXT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_VOLD,KC_MUTE,KC_VOLU, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, KC_EJCT, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ + XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,_______,XXXXXXX, KC_MRWD,KC_MSTP,KC_MFFD, XXXXXXX,XXXXXXX), /* Layer 4: Mouse layer */ [MOUSE1] = KEYMAP(\ - F(6),XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,KC_BSPC, KC_INS,KC_HOME,KC_PGUP, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,KC_BTN4, KC_WH_D, KC_MS_U, KC_WH_U, XXXXXXX, KC_Y,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_DEL, KC_END,KC_PGDN, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ - F(0),KC_BTN5, KC_MS_L, KC_MS_D, KC_MS_R, F(7),KC_WH_L,KC_WH_D,KC_WH_U, KC_WH_R, XXXXXXX,XXXXXXX, KC_BTN1, XXXXXXX,XXXXXXX,XXXXXXX, \ - MO(MOUSE2),XXXXXXX,LC(KC_Y),LC(KC_X),LC(KC_C),LC(KC_V),XXXXXXX,KC_BTN2,KC_BTN3,LC(KC_PGUP),LC(KC_PGDN),XXXXXXX, KC_RSFT, KC_UP, XXXXXXX,XXXXXXX,XXXXXXX,KC_PENT, \ - KC_LCTL,KC_LGUI,KC_LALT, KC_BTN1, KC_RALT,KC_RGUI, KC_APP,KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT, XXXXXXX,XXXXXXX), + F(6),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \ + _______,KC_ACL0,KC_ACL1,KC_ACL2,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,KC_BTN4,KC_WH_D,KC_MS_U,KC_WH_U,_______, C(Z),_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,KC_BTN5,KC_MS_L,KC_MS_D,KC_MS_R, F(7),KC_WH_L,KC_WH_D,KC_WH_U,KC_WH_R,_______,_______, _______, _______,_______,_______, \ + MO(MOUSE2),_______, C(Y), C(X), C(C), C(V),_______,KC_BTN2,KC_BTN3,C(PGUP),C(PGDN),_______, KC_RSFT, _______, _______,_______,_______,_______, \ + KC_LCTL,_______,KC_LALT, KC_BTN1, KC_RALT,KC_RGUI, KC_APP,KC_RCTL, _______,_______,_______, _______,_______), /* Layer 5: Mouse layer 2*/ [MOUSE2] = KEYMAP(\ - _______,_______,_______, _______, _______, _______,_______,_______,_______, _______, _______,_______,_______, _______,_______,_______, \ - _______,_______,_______, _______, _______, _______,_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ - _______,_______,KC_BTN2, KC_WH_U, KC_BTN3, _______,_______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ - _______,_______,KC_WH_L, KC_WH_D, KC_WH_R, _______,KC_MS_L,KC_MS_D,KC_MS_U, KC_MS_R, _______,_______, _______, _______,_______,_______, \ - _______,_______,_______, _______, _______, _______,_______,_______,_______, _______, _______,_______, _______, _______, _______,_______,_______,_______, \ - _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______), + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \ + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,KC_BTN2,KC_WH_U,KC_BTN3,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,KC_WH_L,KC_WH_D,KC_WH_R,_______,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,_______,_______, _______, _______,_______,_______, \ + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______, \ + _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______, _______,_______), /* Layer 6: Misc layer */ [MISC] = KEYMAP(\ - XXXXXXX, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,KC_SLCT,LC(KC_W), KC_UP, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,KC_BSPC, KC_DEL, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ - XXXXXXX,XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX,KC_HOME,KC_PGDN,KC_PGUP, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX, \ - KC_LSFT,XXXXXXX,LC(KC_Y),LC(KC_X),LC(KC_C),LC(KC_V), KC_SPC, KC_END,XXXXXXX,LC(KC_PGUP),LC(KC_PGDN),XXXXXXX, KC_RSFT, XXXXXXX, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, \ - KC_LCTL,KC_LGUI, KC_LALT, LT(MISC, KC_SPC), KC_RALT,KC_RGUI, KC_APP,KC_RCTL, XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX), + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______,_______,_______, \ + _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,KC_SLCT, C(W), KC_UP,_______,_______,_______,_______,KC_BSPC, KC_DEL,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______,_______, \ + _______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,KC_HOME,KC_PGDN,KC_PGUP,_______,_______,_______, _______, _______,_______,_______, \ + KC_LSFT,_______, C(Y), C(X), C(C), C(V), KC_SPC, KC_END,_______,C(PGUP),C(PGDN),_______, _______, _______, _______,_______,_______,_______, \ + _______,_______,_______, LT(MISC, KC_SPC), _______,_______,_______,_______, _______,_______,_______, _______,_______), }; const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_TAP_TOGGLE(MOUSE1), // toggle enable mouse layer (4) - [1] = ACTION_FUNCTION_TAP(LCTRL_BRACKET), // tap to print [ - [2] = ACTION_FUNCTION_TAP(RCTRL_BRACKET), // tap to print ] - [3] = ACTION_FUNCTION_TAP(LALT_CURLY), // tap to print { - [4] = ACTION_FUNCTION_TAP(RALT_CURLY), // tap to print } - [5] = ACTION_LAYER_TAP_TOGGLE(PROG1), // toggle programming layer 1 (1) + [0] = ACTION_LAYER_TAP_TOGGLE(MOUSE1), // tap-toggle mouse layer (4) + [1] = ACTION_FUNCTION_TAP(LCTRL_BRACKET), // tap to print [ + [2] = ACTION_FUNCTION_TAP(RCTRL_BRACKET), // tap to print ] + [3] = ACTION_FUNCTION_TAP(LALT_CURLY), // tap to print { + [4] = ACTION_FUNCTION_TAP(RALT_CURLY), // tap to print } + [5] = ACTION_LAYER_TAP_TOGGLE(PROG1), // tap-toggle programming layer 1 [6] = ACTION_LAYER_SET_CLEAR(DEFAULT), [7] = ACTION_FUNCTION_TAP(CTRL_CLICK), - [8] = ACTION_FUNCTION_TAP(LSHFT_PAREN), // tap to print ( - [9] = ACTION_FUNCTION_TAP(RSHFT_PAREN), // tap to print ) + [8] = ACTION_FUNCTION_TAP(LSHFT_PAREN), // tap to print ( + [9] = ACTION_FUNCTION_TAP(RSHFT_PAREN), // tap to print ) }; const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) @@ -126,7 +132,22 @@ void matrix_init_user(void) { } void matrix_scan_user(void) { + uint8_t layer; + layer = biton32(layer_state); + if (current_layer_global != layer) { + current_layer_global = layer; + + // unset CAPSLOCK and SCROLL LOCK LEDs + led_set_kb(host_keyboard_leds() & ~(1<event.pressed) { register_mods(MOD_LSFT); } else { diff --git a/keyboards/kitten_paw/keymaps/ickerwx/readme.md b/keyboards/kitten_paw/keymaps/ickerwx/readme.md new file mode 100644 index 0000000000..0d23be4eac --- /dev/null +++ b/keyboards/kitten_paw/keymaps/ickerwx/readme.md @@ -0,0 +1,18 @@ +# My personal keymap for the Kitten Paw controller + +This keymap only works correctly when you have your OS configured with a German keymap. Use the keymap however you like. It's most likely a living thing that will never be quite finished. + +## Description of the layers +Layer 0 (DEFAULT) works just like you would expect a keyboard to work, mostly, except: +Caps Lock switches to the mouse layer, RGUI and APP are switches to the programming layer and media layer. +Mouse and programming layer switches can be held or double-tapped to lock. +Holding space switches to the MISC layer where I currently accumulate useful shortcuts. +Tapping left and right Shift, Ctrl and Alt will send (), [] and {} respectively. + +Layers 1 and 2 (PROG1 and PROG2) emulate the US layout while still using a German OS keymap setting. I was annoyed of having to change the OS settings every time I wanted to use the US layout for coding, so I made these layers to behave just like the US layout even though the OS still uses German. The shift keys were a bit tricky, I had to use them as MO(PROG2) switches, so to get the actual expected behavior I enable LSFT for almost every keypress on PROG2 in ```process_record_user```. Since the shift keys are MO() function keys, they do not print () at the moment, which sucks. I'm working on it. + +Layer 3 (MEDIA) just has a couple of media keys on it, mainly around the cursor keys and nav key cluster. + +Layers 4 and 5 (MOUSE1 and MOUSE2) are mouse layers. Move the cursor using ESDF, scroll using HJKL, Space for left click, N and M for right and middle click. There's more, look at the keymap. + +Layer 6 is a layer I don't have a good name for, so I call it MISC. You'll find cursor keys at ESDF, other navigation keys around the HJKL cluster and F12 to F24 on the F-keys. For now. \ No newline at end of file diff --git a/keyboards/kitten_paw/kitten_paw.c b/keyboards/kitten_paw/kitten_paw.c index 8713baf433..92f64b06b4 100644 --- a/keyboards/kitten_paw/kitten_paw.c +++ b/keyboards/kitten_paw/kitten_paw.c @@ -4,7 +4,6 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - matrix_init_quantum(); matrix_init_user(); } @@ -12,7 +11,6 @@ void matrix_scan_kb(void) { // put your looping keyboard code here // runs every cycle (a lot) - matrix_scan_quantum(); matrix_scan_user(); } @@ -25,6 +23,21 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + CONFIG_LED_IO; + CONFIG_LED_IO; + print_dec(usb_led); + if (usb_led & (1< - - 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 . -*/ - -#include -#include "stdint.h" -#include "led.h" - -/* LED pin configuration - * - * Scroll Lock PC5 - * Caps Lock PC6 - * Num Lock PB7 - * - */ -void led_set(uint8_t usb_led) { - DDRB |= (1<<7); - DDRC |= (1<<5) | (1<<6); - - if (usb_led & (1< Date: Thu, 25 Aug 2016 08:16:18 -0500 Subject: [PATCH 083/120] Fixed naming of Analog pins to differentiate them from DIO pins used by Quantum Matrix --- keyboards/lets_split/pro_micro.h | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/keyboards/lets_split/pro_micro.h b/keyboards/lets_split/pro_micro.h index 09e219b7b1..f9e7ed75d9 100644 --- a/keyboards/lets_split/pro_micro.h +++ b/keyboards/lets_split/pro_micro.h @@ -111,18 +111,18 @@ static const uint8_t SCK = 15; // Mapping of analog pins as digital I/O // A6-A11 share with digital pins -static const uint8_t A0 = 18; -static const uint8_t A1 = 19; -static const uint8_t A2 = 20; -static const uint8_t A3 = 21; -static const uint8_t A4 = 22; -static const uint8_t A5 = 23; -static const uint8_t A6 = 24; // D4 -static const uint8_t A7 = 25; // D6 -static const uint8_t A8 = 26; // D8 -static const uint8_t A9 = 27; // D9 -static const uint8_t A10 = 28; // D10 -static const uint8_t A11 = 29; // D12 +static const uint8_t ADC0 = 18; +static const uint8_t ADC1 = 19; +static const uint8_t ADC2 = 20; +static const uint8_t ADC3 = 21; +static const uint8_t ADC4 = 22; +static const uint8_t ADC5 = 23; +static const uint8_t ADC6 = 24; // D4 +static const uint8_t ADC7 = 25; // D6 +static const uint8_t ADC8 = 26; // D8 +static const uint8_t ADC9 = 27; // D9 +static const uint8_t ADC10 = 28; // D10 +static const uint8_t ADC11 = 29; // D12 #define digitalPinToPCICR(p) ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCICR) : ((uint8_t *)0)) #define digitalPinToPCICRbit(p) 0 @@ -220,26 +220,26 @@ const uint8_t PROGMEM digital_pin_to_port_PGM[] = { PC, // D5 - PC6 PD, // D6 - PD7 PE, // D7 - PE6 - + PB, // D8 - PB4 PB, // D9 - PB5 PB, // D10 - PB6 PB, // D11 - PB7 PD, // D12 - PD6 PC, // D13 - PC7 - + PB, // D14 - MISO - PB3 PB, // D15 - SCK - PB1 PB, // D16 - MOSI - PB2 PB, // D17 - SS - PB0 - + PF, // D18 - A0 - PF7 PF, // D19 - A1 - PF6 PF, // D20 - A2 - PF5 PF, // D21 - A3 - PF4 PF, // D22 - A4 - PF1 PF, // D23 - A5 - PF0 - + PD, // D24 - PD5 PD, // D25 / D6 - A7 - PD7 PB, // D26 / D8 - A8 - PB4 @@ -257,26 +257,26 @@ const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = { _BV(6), // D5 - PC6 _BV(7), // D6 - PD7 _BV(6), // D7 - PE6 - + _BV(4), // D8 - PB4 _BV(5), // D9 - PB5 _BV(6), // D10 - PB6 _BV(7), // D11 - PB7 _BV(6), // D12 - PD6 _BV(7), // D13 - PC7 - + _BV(3), // D14 - MISO - PB3 _BV(1), // D15 - SCK - PB1 _BV(2), // D16 - MOSI - PB2 _BV(0), // D17 - SS - PB0 - + _BV(7), // D18 - A0 - PF7 _BV(6), // D19 - A1 - PF6 _BV(5), // D20 - A2 - PF5 _BV(4), // D21 - A3 - PF4 _BV(1), // D22 - A4 - PF1 _BV(0), // D23 - A5 - PF0 - + _BV(5), // D24 - PD5 _BV(7), // D25 / D6 - A7 - PD7 _BV(4), // D26 / D8 - A8 - PB4 @@ -286,24 +286,24 @@ const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = { }; const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { - NOT_ON_TIMER, + NOT_ON_TIMER, NOT_ON_TIMER, NOT_ON_TIMER, TIMER0B, /* 3 */ NOT_ON_TIMER, TIMER3A, /* 5 */ TIMER4D, /* 6 */ - NOT_ON_TIMER, - - NOT_ON_TIMER, + NOT_ON_TIMER, + + NOT_ON_TIMER, TIMER1A, /* 9 */ TIMER1B, /* 10 */ TIMER0A, /* 11 */ - - NOT_ON_TIMER, + + NOT_ON_TIMER, TIMER4A, /* 13 */ - - NOT_ON_TIMER, + + NOT_ON_TIMER, NOT_ON_TIMER, NOT_ON_TIMER, NOT_ON_TIMER, @@ -324,11 +324,11 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { const uint8_t PROGMEM analog_pin_to_channel_PGM[] = { 7, // A0 PF7 ADC7 - 6, // A1 PF6 ADC6 - 5, // A2 PF5 ADC5 + 6, // A1 PF6 ADC6 + 5, // A2 PF5 ADC5 4, // A3 PF4 ADC4 - 1, // A4 PF1 ADC1 - 0, // A5 PF0 ADC0 + 1, // A4 PF1 ADC1 + 0, // A5 PF0 ADC0 8, // A6 D4 PD4 ADC8 10, // A7 D6 PD7 ADC10 11, // A8 D8 PB4 ADC11 From 8d0aed39d11efaf51a0831e78b5641b4b5686197 Mon Sep 17 00:00:00 2001 From: dbroqua Date: Thu, 25 Aug 2016 20:39:55 +0200 Subject: [PATCH 084/120] - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works) --- keyboards/kc60/Makefile | 3 ++- keyboards/kc60/led.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 keyboards/kc60/led.c diff --git a/keyboards/kc60/Makefile b/keyboards/kc60/Makefile index b00a488b91..0d17d32dac 100644 --- a/keyboards/kc60/Makefile +++ b/keyboards/kc60/Makefile @@ -1,4 +1,5 @@ - +# project specific files +SRC = led.c # MCU name #MCU = at90usb1287 diff --git a/keyboards/kc60/led.c b/keyboards/kc60/led.c new file mode 100644 index 0000000000..50659d7247 --- /dev/null +++ b/keyboards/kc60/led.c @@ -0,0 +1,31 @@ +/* +Copyright 2012 Jun Wako +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 . +*/ + +#include +#include "stdint.h" +#include "led.h" + + +void led_set(uint8_t usb_led) +{ + if (usb_led & (1< Date: Thu, 25 Aug 2016 23:28:10 +0300 Subject: [PATCH 085/120] Split vision_division into Makefile/rules.mk --- keyboards/vision_division/Makefile | 77 +----------------------------- keyboards/vision_division/rules.mk | 70 +++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 75 deletions(-) create mode 100644 keyboards/vision_division/rules.mk diff --git a/keyboards/vision_division/Makefile b/keyboards/vision_division/Makefile index 4f3130c483..4e2a6f00fd 100644 --- a/keyboards/vision_division/Makefile +++ b/keyboards/vision_division/Makefile @@ -1,76 +1,3 @@ - - -# MCU name -MCU = at90usb1286 -# 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=1024 - - -# Build Options -# change yes to no to disable -# -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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE ?= yes # USB Nkey Rollover -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE ?= no # MIDI controls -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 - -ifndef QUANTUM_DIR +ifndef MAKEFILE_INCLUDED include ../../Makefile -endif - - +endif \ No newline at end of file diff --git a/keyboards/vision_division/rules.mk b/keyboards/vision_division/rules.mk new file mode 100644 index 0000000000..063fba29bd --- /dev/null +++ b/keyboards/vision_division/rules.mk @@ -0,0 +1,70 @@ + + +# MCU name +MCU = at90usb1286 +# 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=1024 + + +# Build Options +# change yes to no to disable +# +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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE ?= yes # USB Nkey Rollover +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE ?= no # MIDI controls +UNICODE_ENABLE ?= no # Unicode +BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE ?= no # Audio output on port C6 \ No newline at end of file From 3300203157e8c0fe9004e759aa5c18f1a1996e7e Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Thu, 25 Aug 2016 23:37:18 +0300 Subject: [PATCH 086/120] Remove google test submodule It had been added for some strange reason, allthough it's supposed to be there only in another branch. --- lib/googletest | 1 - 1 file changed, 1 deletion(-) delete mode 160000 lib/googletest diff --git a/lib/googletest b/lib/googletest deleted file mode 160000 index ec44c6c167..0000000000 --- a/lib/googletest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 From 86ece6417644d2e9b5ea2548ff1dd4aa2ee8e354 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Thu, 25 Aug 2016 23:54:05 +0300 Subject: [PATCH 087/120] Fix minor typo in the readme --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index b1808b6d13..db0bf87837 100644 --- a/readme.md +++ b/readme.md @@ -54,10 +54,10 @@ Here are the steps 1. Install the Windows 10 subsystem for Linux, following [these instructions](http://www.howtogeek.com/249966/how-to-install-and-use-the-linux-bash-shell-on-windows-10/). 2. If you have previously cloned the repository using the normal Git bash, you will need to clean up the line endings. If you have cloned it after 20th of August 2016, you are likely fine. To clean up the line endings do the following 1. Make sure that you have no changes you haven't committed by running `git status`, if you do commit them first - 2. From within the Git bash run ´git rm --cached -r .` + 2. From within the Git bash run `git rm --cached -r .` 3. Followed by `git reset --hard` 3. Start the "Bash On Ubuntu On Windows" from the start menu -4. With the bash open, navigate to your git checkout. The harddisk can be accessed from `/mnt` for example `/mnt/c` for the `c:\` drive. +4. With the bash open, navigate to your Git checkout. The harddisk can be accessed from `/mnt` for example `/mnt/c` for the `c:\` drive. 5. Run `sudo util/install_dependencies.sh`. 6. After a while the installation will finish, and you are good to go From 6cfdd077b5bcdcfe8b390e4c07965eaf6c081c76 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 26 Aug 2016 00:05:58 +0300 Subject: [PATCH 088/120] Fix bad merge Led should have been added to KC60, not GH60 --- keyboards/gh60/rules.mk | 3 --- keyboards/kc60/rules.mk | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/gh60/rules.mk b/keyboards/gh60/rules.mk index b3c5c7271c..aba680e45b 100644 --- a/keyboards/gh60/rules.mk +++ b/keyboards/gh60/rules.mk @@ -1,6 +1,3 @@ -# project specific files -SRC = led.c - # MCU name #MCU = at90usb1287 MCU = atmega32u4 diff --git a/keyboards/kc60/rules.mk b/keyboards/kc60/rules.mk index 4efd6f9887..a935ed19ee 100644 --- a/keyboards/kc60/rules.mk +++ b/keyboards/kc60/rules.mk @@ -1,4 +1,5 @@ - +# project specific files +SRC = led.c # MCU name #MCU = at90usb1287 From 3f0e1b3a8ea2e8013a77a8ce948d2f69bbdcd869 Mon Sep 17 00:00:00 2001 From: zs Date: Thu, 25 Aug 2016 20:56:15 +0200 Subject: [PATCH 089/120] Correct typo in kc60 workman-dead keymap and rename README.md to readme.md --- keyboards/kc60/keymaps/workman-dead/keymap.c | 8 ++++---- .../kc60/keymaps/workman-dead/{README.md => readme.md} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename keyboards/kc60/keymaps/workman-dead/{README.md => readme.md} (100%) diff --git a/keyboards/kc60/keymaps/workman-dead/keymap.c b/keyboards/kc60/keymaps/workman-dead/keymap.c index 9786e37d8c..9e3b9bb656 100644 --- a/keyboards/kc60/keymaps/workman-dead/keymap.c +++ b/keyboards/kc60/keymaps/workman-dead/keymap.c @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TABM, KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, \ KC_LCTL, KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, KC_I, KC_QUOT, _______, KC_ENT, \ KC_LSFT, _______, KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, DK_ACT, KC_DOT, KC_SLSH, _______, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPFN, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, KC_DFQW), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPFN, _______, KC_RALT, KC_RGUI, KC_RCTL, KC_DFQW), // QWERTY /* @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TABM, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, _______, KC_ENT, \ KC_LSFT, _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, DK_ACT, KC_DOT, KC_SLSH, _______, KC_RSFT, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_SPFN, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, KC_DOWN), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPFN, _______, KC_RALT, KC_RGUI, KC_RCTL, KC_DFWM), // dead key layer /* @@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, KC_PERC, KC_AMPR, KC_QUES, KC_PLUS, KC_AT, KC_DLR, KC_UNDS, KC_LBRC, KC_RBRC, KC_EXLM, KC_TILD, KC_CIRC, _______, \ _______, KC_HASH, KC_LPRN, KC_EQL, KC_0, KC_LCBR, KC_RCBR, KC_1, KC_ASTR, KC_RPRN, KC_MINS, KC_GRV, _______, KC_CENT, \ _______, _______, KC_6, KC_7, KC_8, KC_9, KC_PIPE, KC_BSLS, KC_2, DK_REL, KC_4, KC_5, _______, _______, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_COMS, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, _______), + KC_LCTL, KC_LALT, KC_LGUI, KC_COMS, _______, KC_RALT, KC_RGUI, KC_RCTL, _______), // function layer /* @@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_CMDQ, KC_CMDD, KC_CSTB, KC_C_TB, _______, _______, KC_PGDN, KC_UP, KC_PGUP, _______, _______, _______, KC_INS, \ KC_LSFT, KC_CMDA, KC_CMDS, KC_C_LF, KC_C_RT, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, KC_END, _______, KC_BSPC, \ KC_LSFT, _______, KC_CMDZ, KC_CMDX, _______, KC_CMDC, KC_CMDV, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, \ - KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_NO, KC_RALT, KC_RGUI, KC_RCTL, RESET), + KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, _______, KC_RALT, KC_RGUI, KC_RCTL, RESET), // mouse layer /* diff --git a/keyboards/kc60/keymaps/workman-dead/README.md b/keyboards/kc60/keymaps/workman-dead/readme.md similarity index 100% rename from keyboards/kc60/keymaps/workman-dead/README.md rename to keyboards/kc60/keymaps/workman-dead/readme.md From ff0e0ee4595cb6d9cfa5a742c58b8f7705d9a3f3 Mon Sep 17 00:00:00 2001 From: JeeBak Kim Date: Fri, 26 Aug 2016 14:48:03 -0700 Subject: [PATCH 090/120] [tv44] Add "jeebak" keymap folder as a copy of the "default" folder --- keyboards/tv44/keymaps/jeebak/Makefile | 21 ++++++ keyboards/tv44/keymaps/jeebak/config.h | 8 ++ keyboards/tv44/keymaps/jeebak/keymap.c | 97 +++++++++++++++++++++++++ keyboards/tv44/keymaps/jeebak/readme.md | 1 + 4 files changed, 127 insertions(+) create mode 100644 keyboards/tv44/keymaps/jeebak/Makefile create mode 100644 keyboards/tv44/keymaps/jeebak/config.h create mode 100644 keyboards/tv44/keymaps/jeebak/keymap.c create mode 100644 keyboards/tv44/keymaps/jeebak/readme.md diff --git a/keyboards/tv44/keymaps/jeebak/Makefile b/keyboards/tv44/keymaps/jeebak/Makefile new file mode 100644 index 0000000000..f4671a9d11 --- /dev/null +++ b/keyboards/tv44/keymaps/jeebak/Makefile @@ -0,0 +1,21 @@ +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +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 +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/tv44/keymaps/jeebak/config.h b/keyboards/tv44/keymaps/jeebak/config.h new file mode 100644 index 0000000000..df06a26206 --- /dev/null +++ b/keyboards/tv44/keymaps/jeebak/config.h @@ -0,0 +1,8 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// place overrides here + +#endif \ No newline at end of file diff --git a/keyboards/tv44/keymaps/jeebak/keymap.c b/keyboards/tv44/keymaps/jeebak/keymap.c new file mode 100644 index 0000000000..f3f989f2d1 --- /dev/null +++ b/keyboards/tv44/keymaps/jeebak/keymap.c @@ -0,0 +1,97 @@ +#include "tv44.h" +#include "action_layer.h" +#include "eeconfig.h" + +extern keymap_config_t keymap_config; + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + +#define _QW 0 +#define _DV 1 +#define _CM 2 +#define _L1 3 +#define _L2 4 +#define _L3 5 + +// Macro name shortcuts +#define QWERTY M(_QW) +#define DVORAK M(_DV) +#define COLEMAK M(_CM) + +// Fillers to make layering more clear +#define _______ KC_TRNS +#define XXXXXXX KC_NO + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QW] = { /* Qwerty */ + {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC }, + {MO(_L1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, MO(_L1) }, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_F, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(_L2) }, + {KC_LCTL, MO(_L2), KC_LGUI, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_RALT, KC_ESC, XXXXXXX, TG(_L3) } + }, + [_DV] = { /* Dvorak */ + {KC_TAB, KC_SLSH, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC }, + {MO(_L1), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, MO(_L1) }, + {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, MO(_L2) }, + {KC_LCTL, MO(_L2), KC_LGUI, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_RALT, KC_ESC, XXXXXXX, TG(_L3) } + }, + [_CM] = { /* Colemak */ + {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC }, + {MO(_L1), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, MO(_L1) }, + {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(_L2) }, + {KC_LCTL, MO(_L2), KC_LGUI, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_RALT, KC_ESC, XXXXXXX, TG(_L3) } + }, + [_L1] = { /* LAYER 1 */ + {KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL }, + {_______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT, _______ }, + {_______, KC_ESC, _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_RSFT }, + {_______, KC_LGUI, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, _______ } + }, + [_L2] = { /* LAYER 2 */ + {_______, QWERTY, DVORAK, COLEMAK, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______ }, + {KC_ESC, KC_PIPE, KC_DQUO, KC_UNDS, KC_PLUS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_4, KC_5, KC_6, KC_VOLU, KC_ENT }, + {_______, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, KC_VOLD, _______ }, + {_______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, _______ } + }, + [_L3] = { /* LAYER 3 */ + {_______, _______, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, _______ }, + {KC_ESC, _______, _______, _______, _______, _______, _______, KC_F5, KC_F6, KC_F7, KC_F8, _______ }, + {KC_LSFT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_F9, KC_F10, KC_F11, KC_F12, _______ }, + {_______, KC_LSFT, KC_B, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_C, _______, _______, XXXXXXX, _______ } + } +}; + +const uint16_t PROGMEM fn_actions[] = { + +}; + +void persistant_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case _DV: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_DV); + } + break; + case _QW: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_QW); + } + break; + case _CM: + if (record->event.pressed) { + persistant_default_layer_set(1UL<<_CM); + } + break; + } + return MACRO_NONE; +}; diff --git a/keyboards/tv44/keymaps/jeebak/readme.md b/keyboards/tv44/keymaps/jeebak/readme.md new file mode 100644 index 0000000000..ac84c08cfa --- /dev/null +++ b/keyboards/tv44/keymaps/jeebak/readme.md @@ -0,0 +1 @@ +# The default keymap for tv44 \ No newline at end of file From 5fe883e74b7f8a1265c2069d16e8dcbd25fab18b Mon Sep 17 00:00:00 2001 From: JeeBak Kim Date: Fri, 26 Aug 2016 15:05:51 -0700 Subject: [PATCH 091/120] [tv44] Port jeebak's planck keymap to tv44 --- keyboards/tv44/keymaps/jeebak/config.h | 17 +- keyboards/tv44/keymaps/jeebak/keymap.c | 460 ++++++++++++++++++++---- keyboards/tv44/keymaps/jeebak/readme.md | 130 ++++++- 3 files changed, 538 insertions(+), 69 deletions(-) diff --git a/keyboards/tv44/keymaps/jeebak/config.h b/keyboards/tv44/keymaps/jeebak/config.h index df06a26206..a59ef2b70a 100644 --- a/keyboards/tv44/keymaps/jeebak/config.h +++ b/keyboards/tv44/keymaps/jeebak/config.h @@ -3,6 +3,19 @@ #include "../../config.h" -// place overrides here +/** + *TV44 keymap definition macro + */ +#define KEYMAP_TV44( \ + K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, \ + K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, \ + K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, \ + K37, K38, K39, K40, K41, K42, K43, K44 \ +) { \ + { K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, }, \ + { K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, }, \ + { K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, }, \ + { K37, K38, K39, K40, KC_NO, KC_NO, KC_NO, K41, K42, K43, KC_NO, K44 } \ +} -#endif \ No newline at end of file +#endif diff --git a/keyboards/tv44/keymaps/jeebak/keymap.c b/keyboards/tv44/keymaps/jeebak/keymap.c index f3f989f2d1..1bb1015c36 100644 --- a/keyboards/tv44/keymaps/jeebak/keymap.c +++ b/keyboards/tv44/keymaps/jeebak/keymap.c @@ -8,65 +8,281 @@ extern keymap_config_t keymap_config; // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them // entirely and just use numbers. +#define _QWERTY 0 +#define _COLEMAK 1 +#define _DVORAK 2 +#define _LOWER 3 +#define _RAISE 4 +#define _PLOVER 5 +#define _TOUCHCURSOR 6 +#define _MOUSECURSOR 7 +#define _ADJUST 16 -#define _QW 0 -#define _DV 1 -#define _CM 2 -#define _L1 3 -#define _L2 4 -#define _L3 5 +// Keycodes +enum planck_keycodes { + QWERTY = SAFE_RANGE, + COLEMAK, + DVORAK, + PLOVER, + LOWER, + RAISE, + BACKLIT, + EXT_PLV +}; -// Macro name shortcuts -#define QWERTY M(_QW) -#define DVORAK M(_DV) -#define COLEMAK M(_CM) +enum macro_keycodes { + KC_ALT_TAB, + KC_CMD_TAB, + KC_CTL_TAB, + KC_CMD_SLSH, + KC_AG_FIND, + KC_AG_AGAIN, + KC_AG_UNDO, + KC_AG_CUT, + KC_AG_COPY, + KC_AG_PASTE, + KC_AG_DESK_L, + KC_AG_DESK_R, + KC_AG_TAB_C, + KC_AG_TAB_N, + KC_AG_TAB_R, +}; // Fillers to make layering more clear #define _______ KC_TRNS #define XXXXXXX KC_NO +// Custom macros +#define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl +#define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift +#define HPR_TAB ALL_T(KC_TAB) // Tap for Tab, hold for Hyper +#define GUI_SEM GUI_T(KC_SCLN) // Tap for Semicolon, hold for GUI +#define ALT_QUO ALT_T(KC_QUOT) // Tap for Quote, hold for Alt +// Requires KC_TRNS/_______ for the trigger key in the destination layer +#define LT_TC LT(_TOUCHCURSOR, KC_SPC) // L-ayer T-ap T-ouch C-ursor +#define LT_MC(kc) LT(_MOUSECURSOR, kc) // L-ayer T-ap M-ouse C-ursor +#define ALT_TAB M(KC_ALT_TAB) // Macro for Alt-Tab +#define CMD_TAB M(KC_CMD_TAB) // Macro for Cmd-Tab +#define CTL_TAB M(KC_CTL_TAB) // Macro for Ctl-Tab +#define CMD_SLSH M(KC_CMD_SLSH) // Macro for Cmd-Slash (personal shortcut to toggle iTerm2 visibility) +#define AG_FIND M(KC_AG_FIND) // Macros for Cmd-[x] vs Ctrl-[x] based on current AG_NORM or AG_SWAP settings +#define AG_AGAIN M(KC_AG_AGAIN) +#define AG_UNDO M(KC_AG_UNDO) +#define AG_CUT M(KC_AG_CUT) +#define AG_COPY M(KC_AG_COPY) +#define AG_PASTE M(KC_AG_PASTE) +#define AG_D_L M(KC_AG_DESK_L) // For Virtual Desktop Switching: Left, and +#define AG_D_R M(KC_AG_DESK_R) // Right +#define AG_T_C M(KC_AG_TAB_C) // For Chrome, etc. Tab Close, +#define AG_T_N M(KC_AG_TAB_N) // Tab New, and +#define AG_T_R M(KC_AG_TAB_R) // Tab Reopen Closed const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QW] = { /* Qwerty */ - {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC }, - {MO(_L1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, MO(_L1) }, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_F, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(_L2) }, - {KC_LCTL, MO(_L2), KC_LGUI, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_RALT, KC_ESC, XXXXXXX, TG(_L3) } - }, - [_DV] = { /* Dvorak */ - {KC_TAB, KC_SLSH, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC }, - {MO(_L1), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, MO(_L1) }, - {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, MO(_L2) }, - {KC_LCTL, MO(_L2), KC_LGUI, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_RALT, KC_ESC, XXXXXXX, TG(_L3) } - }, - [_CM] = { /* Colemak */ - {KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC }, - {MO(_L1), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, MO(_L1) }, - {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, MO(_L2) }, - {KC_LCTL, MO(_L2), KC_LGUI, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, KC_RALT, KC_ESC, XXXXXXX, TG(_L3) } - }, - [_L1] = { /* LAYER 1 */ - {KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL }, - {_______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT, _______ }, - {_______, KC_ESC, _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_RSFT }, - {_______, KC_LGUI, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, _______ } - }, - [_L2] = { /* LAYER 2 */ - {_______, QWERTY, DVORAK, COLEMAK, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______ }, - {KC_ESC, KC_PIPE, KC_DQUO, KC_UNDS, KC_PLUS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_4, KC_5, KC_6, KC_VOLU, KC_ENT }, - {_______, _______, _______, _______, _______, _______, KC_0, KC_1, KC_2, KC_3, KC_VOLD, _______ }, - {_______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, XXXXXXX, _______ } - }, - [_L3] = { /* LAYER 3 */ - {_______, _______, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, KC_F4, _______ }, - {KC_ESC, _______, _______, _______, _______, _______, _______, KC_F5, KC_F6, KC_F7, KC_F8, _______ }, - {KC_LSFT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_F9, KC_F10, KC_F11, KC_F12, _______ }, - {_______, KC_LSFT, KC_B, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, KC_C, _______, _______, XXXXXXX, _______ } - } -}; -const uint16_t PROGMEM fn_actions[] = { +/* Qwerty + * + * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + * |Hyper/Tab| Q | W | E | R | T | Y | U | I | O | P | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`-------------| + * | Ctrl/Esc | A | S | MC/D | F | G | H | J | K | L |GUI/; | Alt/" | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | Shift | Z | X | C | V | B | N | M | , | . | / | Sft/Ent | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | + * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' + */ +[_QWERTY] = KEYMAP_TV44( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ + HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ + CTL_ESC , KC_A, KC_S,LT_MC(KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, GUI_SEM, ALT_QUO , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_LSFT , KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + KC_LALT , KC_LGUI , LOWER , LT_TC , LT_TC , RAISE , KC_VOLU , KC_MPLY ), +/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ +/* Colemak + * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + * |Hyper/Tab| Q | W | F | P | G | J | L | U | Y | ; | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`-------------| + * | Ctrl/Esc | A | R | MC/S | T | D | H | N | E | I | O | " | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | Shift | Z | X | C | V | B | K | M | , | . | / | Sft/Ent | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | + * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' + */ +[_COLEMAK] = KEYMAP_TV44( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ + HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ + CTL_ESC , KC_A, KC_R,LT_MC(KC_S), KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_LSFT , KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + KC_LALT , KC_LGUI , LOWER , LT_TC , LT_TC , RAISE , KC_VOLU , KC_MPLY ), +/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ + +/* Dvorak + * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + * |Hyper/Tab| " | , | . | P | Y | F | G | C | R | L | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`-------------| + * | Ctrl/Esc | A | O | MC/E | U | I | D | H | T | N | S | / | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | Shift | ; | Q | J | K | X | B | M | W | V | Z | Sft/Ent | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | + * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' + */ +[_DVORAK] = KEYMAP_TV44( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ + HPR_TAB,KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ + CTL_ESC , KC_A, KC_O,LT_MC(KC_E), KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_LSFT , KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + KC_LALT , KC_LGUI , LOWER , LT_TC , LT_TC , RAISE , KC_VOLU , KC_MPLY ), +/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ + +/* Lower + * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`-------------| + * | [ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | "|" | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | ] | F7 | F8 | F9 | F10 | F11 | F12 | - | = | [ | ] | \ | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | Brite | | | | | | Vol- | Mute | + * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' + */ +[_LOWER] = KEYMAP_TV44( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ + KC_TILD,KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ + KC_LBRC , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_RBRC , KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + BACKLIT , _______ , _______ , _______ , _______ , _______ , KC_VOLD , KC_MUTE ), +/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ + +/* Raise + * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + * |---------`------`------`------`------`------`------`------`------`------`------`-------------| + * | $ | 4 | 5 | 6 | . | + | . | 4 | 5 | 6 | * | "|" | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | = | 7 | 8 | 9 | 0 | - | . | 1 | 2 | 3 | / | \ | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | Brite | | | | | | Vol- | Mute | + * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' + */ +[_RAISE] = KEYMAP_TV44( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ + KC_0 , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ + KC_DLR , KC_4, KC_5, KC_6, KC_DOT, KC_PLUS, KC_DOT, KC_4, KC_5, KC_6, KC_ASTR, KC_PIPE , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + KC_EQL , KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_DOT, KC_1, KC_2, KC_3, KC_SLSH, KC_BSLS , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + BACKLIT , _______ , _______ , _______ , _______ , _______ , KC_VOLD , KC_MUTE ), +/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ + +/* TouchCursor layer (http://martin-stone.github.io/touchcursor/) plus personal customizations + * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + * | AltTab |CmdTab|CtlTab| GUI |Shift | ~ |Insert| Home | Up | End | Bksp | | + * |---------`------`------`------`------`------`------`------`------`------`------`-------------| + * | | Alt |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L| Desk_R | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | | Undo | Cut | Copy |Paste | ` | PgDn | Del |Tab_N |Tab_R |iTerm2| | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | | | | | | | | | + * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' + * + * The KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND, and KC_AGAIN keycodes don't + * seem to work on Mac. Presumably they'll work under Windows. + */ + +[_TOUCHCURSOR] = KEYMAP_TV44( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ + ALT_TAB,CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD, KC_INS, KC_HOME, KC_UP, KC_END, KC_BSPC, _______ , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ + _______ ,KC_LALT, KC_SPC, AG_T_C, AG_FIND,AG_AGAIN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, AG_D_L, AG_D_R , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + _______ ,AG_UNDO, AG_CUT, AG_COPY,AG_PASTE, KC_GRV, KC_PGDN, KC_DEL, AG_T_N, AG_T_R,CMD_SLSH, _______ , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ), +/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ + +/* Mouse Layer + * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + * | | |ACCL0 | | | | |WHL_L | Up |WHL_R | BTN2 | | + * |---------`------`------`------`------`------`------`------`------`------`------`-------------| + * | |ACCL2 | BTN2 | | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 | BTN5 | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | | | | | BTN3 | |WHL_Dn| BTN1 | | | BTN3 | | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | | | | | | | | | + * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' + */ + +[_MOUSECURSOR] = KEYMAP_TV44( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ + _______,_______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______ , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ + _______ ,KC_ACL2, KC_BTN2, _______, KC_BTN1, KC_ACL1, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN4, KC_BTN5 , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + _______ ,_______, _______, _______, KC_BTN3, _______, KC_WH_D, KC_BTN1, _______, _______, KC_BTN3, _______ , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ), +/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ + +/* Plover layer (http://opensteno.org) + * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + * | # | # | # | # | # | # | # | # | # | # | # | # | + * |---------`------`------`------`------`------`------`------`------`------`------`-------------| + * | | S | T | P | H | * | * | F | P | L | T | D | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | TogOut | S | K | W | R | * | * | R | B | G | S | Z | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | Exit | A | O | | | E | U | | + * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' + */ + +[_PLOVER] = KEYMAP_TV44( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ + KC_1 , KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ + XXXXXXX , KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + XXXXXXX , KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + EXT_PLV , KC_C , KC_V , XXXXXXX , XXXXXXX , KC_N , KC_M , XXXXXXX ), +/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ + +/* Adjust (Lower + Raise) + * ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + * | | | | | | | | | | | | Del | + * |---------`------`------`------`------`------`------`------`------`------`------`-------------| + * | | | | | |AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| | + * |----------`------`------`------`------`------`------`------`------`------`------`------------| + * | | | | | | | | | | | | | + * |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + * | | | | | | | | Reset | + * `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' + */ +[_ADJUST] = KEYMAP_TV44( +/*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------.*/ + _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL , +/*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`-----------------|*/ + _______ ,_______, _______, _______, _______, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______ , +/*|---------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`----------------|*/ + _______ ,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ , +/*|----------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`---------------|*/ + _______ , _______ , _______ , _______ , _______ , _______ , _______ , RESET ) +/*`-----------+---------------+---------+-------^^^------+-------^^^-------+---------+-----------------+--------------'*/ }; void persistant_default_layer_set(uint16_t default_layer) { @@ -74,24 +290,136 @@ void persistant_default_layer_set(uint16_t default_layer) { default_layer_set(default_layer); } +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + default_layer_set(1UL<<_QWERTY); + } + return false; + break; + case COLEMAK: + if (record->event.pressed) { + default_layer_set(1UL<<_COLEMAK); + } + return false; + break; + case DVORAK: + if (record->event.pressed) { + default_layer_set(1UL<<_DVORAK); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case BACKLIT: + if (record->event.pressed) { + register_code(KC_RSFT); + #ifdef BACKLIGHT_ENABLE + backlight_step(); + #endif + } else { + unregister_code(KC_RSFT); + } + return false; + break; + case PLOVER: + if (record->event.pressed) { + layer_off(_RAISE); + layer_off(_LOWER); + layer_off(_ADJUST); + layer_on(_PLOVER); + if (!eeconfig_is_enabled()) { + eeconfig_init(); + } + keymap_config.raw = eeconfig_read_keymap(); + keymap_config.nkro = 1; + eeconfig_update_keymap(keymap_config.raw); + } + return false; + break; + case EXT_PLV: + if (record->event.pressed) { + layer_off(_PLOVER); + } + return false; + break; + } + return true; +} + +/* + * Macro definition + */ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - switch(id) { - case _DV: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_DV); - } - break; - case _QW: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_QW); - } - break; - case _CM: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_CM); - } - break; - } + if (!eeconfig_is_enabled()) { + eeconfig_init(); + } + + bool use_cmd = true; // Use, for example, Cmd-Tab, Cmd-C, Cmd-V, etc. + // Compare to MAGIC_SWAP_ALT_GUI and MAGIC_UNSWAP_ALT_GUI configs, set in: + // quantum/quantum.c + if(keymap_config.swap_lalt_lgui == 1 && keymap_config.swap_ralt_rgui == 1) { + use_cmd = false; // ... or, Alt-Tab, Ctrl-C, Ctrl-V, etc. + } + + switch (id) { + case KC_ALT_TAB: + if(use_cmd) { return (record->event.pressed ? MACRO( D(LALT), D(TAB), END ) : MACRO( U(TAB), END )); } + else { return (record->event.pressed ? MACRO( D(LGUI), D(TAB), END ) : MACRO( U(TAB), END )); } + case KC_CMD_TAB: + if(use_cmd) { return (record->event.pressed ? MACRO( D(LGUI), D(TAB), END ) : MACRO( U(TAB), END )); } + else { return (record->event.pressed ? MACRO( D(LALT), D(TAB), END ) : MACRO( U(TAB), END )); } + + case KC_CTL_TAB: + return (record->event.pressed ? MACRO( D(LCTRL), D(TAB), END ) : MACRO( U(TAB), END )); + case KC_CMD_SLSH: + return (record->event.pressed ? MACRO( D(LGUI), D(SLSH),END ) : MACRO( U(SLSH),END )); + + case KC_AG_FIND: + return use_cmd ? MACRODOWN( D(LGUI), T(F), END ) : MACRODOWN( D(LCTRL), T(F), END ); + case KC_AG_AGAIN: + return use_cmd ? MACRODOWN( D(LGUI), T(G), END ) : MACRODOWN( D(LCTRL), T(G), END ); + case KC_AG_UNDO: + return use_cmd ? MACRODOWN( D(LGUI), T(Z), END ) : MACRODOWN( D(LCTRL), T(Z), END ); + case KC_AG_CUT: + return use_cmd ? MACRODOWN( D(LGUI), T(X), END ) : MACRODOWN( D(LCTRL), T(X), END ); + case KC_AG_COPY: + return use_cmd ? MACRODOWN( D(LGUI), T(C), END ) : MACRODOWN( D(LCTRL), T(C), END ); + case KC_AG_PASTE: + return use_cmd ? MACRODOWN( D(LGUI), T(V), END ) : MACRODOWN( D(LCTRL), T(V), END ); + + case KC_AG_DESK_L: + return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(SCLN), END ) : MACRODOWN( D(LALT), D(LCTRL), T(SCLN), END ); + case KC_AG_DESK_R: + return use_cmd ? MACRODOWN( D(LGUI), D(LCTRL), T(QUOT), END ) : MACRODOWN( D(LALT), D(LCTRL), T(QUOT), END ); + + case KC_AG_TAB_C: + return use_cmd ? MACRODOWN( D(LGUI), T(W), END ) : MACRODOWN( D(LCTRL), T(W), END ); + case KC_AG_TAB_N: + return use_cmd ? MACRODOWN( D(LGUI), T(T), END ) : MACRODOWN( D(LCTRL), T(T), END ); + case KC_AG_TAB_R: + return use_cmd ? MACRODOWN( D(LGUI), D(LSHIFT), T(T), END ) : MACRODOWN( D(LCTRL), D(LSHIFT), T(T), END ); + } + return MACRO_NONE; -}; +} diff --git a/keyboards/tv44/keymaps/jeebak/readme.md b/keyboards/tv44/keymaps/jeebak/readme.md index ac84c08cfa..43d20958a6 100644 --- a/keyboards/tv44/keymaps/jeebak/readme.md +++ b/keyboards/tv44/keymaps/jeebak/readme.md @@ -1 +1,129 @@ -# The default keymap for tv44 \ No newline at end of file +jeebak's TV44 layout +======================= +NOTE: This is a port of jeebak's planck layout, for tv44. + +This WIP keymap attempts to minimize fingers straying away from the home row. +To aid in this endeavor, when additional modifyer keys to switch layers are +needed, they will be mapped to home row keys. The `keymap.c` file will contain +the exact changes. The diagrams in this README shows the highlights of the +changes from the default mappings. + +I also decided to change all calls to `persistant_default_layer_set()` to +`default_layer_set()` since this is my personal perference. + +## Macros +``` +#define ALT_TAB M(KC_ALT_TAB) +``` + +## Base Layers (Qwerty/Colemak/Dvorak) +These base layers are mostly the same as the default mappings. The interesting +changes are shown below. + +- The `Ctrl/Esc`, will emit an `Escape` when tapped, and act as a `Control` key when held, +- `GUI/;` as `;` and `GUI`, +- `Alt/"` as `"` and `Alt`, +- `Sft/Ent` as `Enter` and `Shift`, and +- `Hyper/Tab` as `Tab` and `Hyper` + +A `TODO` item is to see if it can also act as a `CapsLock` when double-tapped. +The arrow keys, which have been moved to the +[TouchCursor](http://martin-stone.github.io/touchcursor/) layer, have been +replaced with the Media keys as shown. The `MC/kc` key activates the +`MouseCursor` layer when held, and emits the corresponding `kc` for its layer, +when tapped. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + |Hyper/Tab| Q | W | E | R | T | Y | U | I | O | P | Bksp | + |---------`------`------`------`------`------`------`------`------`------`------`-------------| + | Ctrl/Esc | A | S | MC/D | F | G | H | J | K | L |GUI/; | Alt/" | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | Shift | Z | X | C | V | B | N | M | , | . | / | Sft/Ent | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol+ | Play | + `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' +``` + +## Lower Layer (Symbols and Function Keys) +The symbols and functions keys are essentially the same as the default mapping. +The most notable changes are that the symbol keys from the `RAISE` layer have +been moved here. The remaining Media keys replace those that are now on the +base layers. The `BACKLIT` key has also been moved here. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | + |---------`------`------`------`------`------`------`------`------`------`------`-------------| + | [ | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | "|" | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | ] | F7 | F8 | F9 | F10 | F11 | F12 | - | = | [ | ] | \ | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | Brite | | | | | | Vol- | Mute | + `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' +``` + +## Raise Layer (Numbers and Arithmetic Operators) +All of the numbers and arithmetic operators are available on this layer. Some +keys are duplicated for the convenience of their positions. The `0` and `$` +keys at the far left are for quick access to beginning and end of line in vim. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | + |---------`------`------`------`------`------`------`------`------`------`------`-------------| + | $ | 4 | 5 | 6 | . | + | . | 4 | 5 | 6 | * | "|" | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | = | 7 | 8 | 9 | 0 | - | . | 1 | 2 | 3 | / | \ | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | Brite | | | | | | Vol- | Mute | + `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' +``` + +## TouchCursor layer plus personal customizations +[TouchCursor](http://martin-stone.github.io/touchcursor/) uses the `Space` key +as the modifier, with the `IJKL` home row keys representing the inverted-T of +the arrow keys. All of the default TouchCursor keymappings for the right hand +are represented below. My personalizations include all of the keys shown for +the left hand. Having the `Alt` and `Shift` keys (as well as the `Control` key +from the base layers) readily accessible from the home row allows quick word +jumps and highlighting when used in conjunction with the arrow keys. The +`Alt-Tab` macro is not only useful under Windows, but also under Mac when used +with alternative switchers like [HyperSwitch](https://bahoom.com/hyperswitch). +The `Cmd-Tab` and `Ctrl-Tab` sequences are duplicated for easy access while in +this layer. The `KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND,` and `KC_AGAIN` +keycodes do not seem to work. There are macros in place that'll "automatically" +choose the correct version (`Cmd-Tab` vs. `Alt-Tab`, `Cmd-C` vs. `Ctrl-C`, +etc.) depending on which layout you've currently selected (`AG_NORM` or +`AG_SWAP`) in the `_ADJUST` layer. The `Desk_L` and `Desk_R` macros are what I +use to switch between Virtual Desktops Left/Right. The `Tab_C`, `Tab_N` and +`Tab_R` are for "Close Tab," "New Tab" and "Reopen Closed Tab" for apps such as +Google Chrome. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + | AltTab |CmdTab|CtlTab| GUI |Shift | ~ |Insert| Home | Up | End | Bksp | | + |---------`------`------`------`------`------`------`------`------`------`------`-------------| + | | Alt |Space |Tab_C | Find |Again | PgUp | Left | Down |Right |Desk_L| Desk_R | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | | Undo | Cut | Copy |Paste | ` | PgDn | Del |Tab_N |Tab_R |iTerm2| | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | | | | | | | | | + `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' +``` + +## Mouse Layer +The Mouse layer, closely mimics the layout/behaviour of the TouchCursor layer. +The `D` key (on QWERTY) is used to activate this layer. All 16 keycodes for the +mouse from the `doc/keycode.txt` file are represented, and logically located, +IMHO. The left and right click buttons are duplicated; on the right hand side, +for a quick click here and there, and again on the left hand side for when the +buttons need to be held for dragging things or highlighting text, thus allowing +the right hand to be free to use the up/down/left/right actions. +``` + ,---------+------+------+------+------+------+------+------+------+------+------+-------------. + | | |ACCL0 | | | | |WHL_L | Up |WHL_R | BTN2 | | + |---------`------`------`------`------`------`------`------`------`------`------`-------------| + | |ACCL2 | BTN2 | | BTN1 |ACCL1 |WHL_Up| Left | Down |Right | BTN4 | BTN5 | + |----------`------`------`------`------`------`------`------`------`------`------`------------| + | | | | | BTN3 | |WHL_Dn| BTN1 | | | BTN3 | | + |-----------`------`------`------`------`-----'-------`------`------`------`------`-----------| + | | | | | | | | | + `--------+---------+---------+------^^^-------+-----^^^--------+---------+---------+---------' +``` From de58ec9738deebe73a43b9511c8df441c6f81efa Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 18:37:28 +0300 Subject: [PATCH 092/120] Set eep files to binary mode --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 8fd1fd7525..92dfc3c617 100644 --- a/.gitattributes +++ b/.gitattributes @@ -91,3 +91,4 @@ GRAPHICS # hex files *.hex binary +*.eep binary From a5b1af4999345239df5086351b52a5b4d2daa97e Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 18:40:50 +0300 Subject: [PATCH 093/120] Normalize line endings --- .../boards/GENERIC_STM32_F103/board.c | 98 +- .../boards/GENERIC_STM32_F103/board.h | 332 +-- .../boards/GENERIC_STM32_F103/board.mk | 10 +- keyboards/chibios_test/ld/MKL26Z64.ld | 210 +- .../ld/STM32F103x8_stm32duino_bootloader.ld | 176 +- .../chibios_test/stm32_f072_onekey/mcuconf.h | 342 +-- .../chibios_test/stm32_f103_onekey/mcuconf.h | 418 ++-- .../chibios_test/teensy_lc_onekey/chconf.h | 1048 ++++----- .../chibios_test/teensy_lc_onekey/halconf.h | 374 ++-- .../chibios_test/teensy_lc_onekey/mcuconf.h | 110 +- keyboards/gh60/Makefile | 148 +- keyboards/gh60/config.h | 322 +-- keyboards/gh60/gh60.c | 50 +- keyboards/gh60/gh60.h | 148 +- keyboards/gh60/keymaps/robotmaxtron/Makefile | 224 +- keyboards/gh60/keymaps/robotmaxtron/config.h | 380 ++-- keyboards/gh60/pinout.txt | 34 +- keyboards/gh60/readme.md | 120 +- keyboards/infinity_chibios/chconf.h | 1048 ++++----- keyboards/infinity_chibios/halconf.h | 706 +++--- keyboards/infinity_chibios/mcuconf.h | 110 +- tmk_core/common/avr/xprintf.S | 1000 ++++----- tmk_core/common/avr/xprintf.h | 222 +- tmk_core/protocol/iwrap/suart.S | 312 +-- tmk_core/protocol/iwrap/suart.h | 16 +- tmk_core/protocol/iwrap/wd.h | 318 +-- .../lufa/LUFA-git/Bootloaders/CDC/asf.xml | 322 +-- .../lufa/LUFA-git/Bootloaders/DFU/asf.xml | 312 +-- .../lufa/LUFA-git/Bootloaders/HID/asf.xml | 246 +-- .../MassStorage/BootloaderAPITable.S | 204 +- .../LUFA-git/Bootloaders/MassStorage/asf.xml | 312 +-- .../LUFA-git/Bootloaders/MassStorage/makefile | 136 +- .../Bootloaders/Printer/BootloaderAPITable.S | 182 +- .../lufa/LUFA-git/Bootloaders/Printer/asf.xml | 318 +-- .../LUFA-git/Bootloaders/Printer/makefile | 110 +- .../LUFA/Build/HID_EEPROM_Loader/makefile | 84 +- .../LUFA/CodeTemplates/DeviceTemplate/asf.xml | 110 +- .../LUFA/CodeTemplates/HostTemplate/asf.xml | 82 +- .../LUFA/DoxygenPages/BuildSystem.txt | 1950 ++++++++--------- 39 files changed, 6322 insertions(+), 6322 deletions(-) diff --git a/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.c b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.c index 31319ef575..2809c9d184 100644 --- a/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.c +++ b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.c @@ -1,49 +1,49 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#include "hal.h" - -/** - * @brief PAL setup. - * @details Digital I/O ports static configuration as defined in @p board.h. - * This variable is used by the HAL when initializing the PAL driver. - */ -#if HAL_USE_PAL || defined(__DOXYGEN__) -const PALConfig pal_default_config = -{ - {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH}, - {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH}, - {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH}, - {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH}, - {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH}, -}; -#endif - -/* - * Early initialization code. - * This initialization must be performed just after stack setup and before - * any other initialization. - */ -void __early_init(void) { - - stm32_clock_init(); -} - -/* - * Board-specific initialization code. - */ -void boardInit(void) { -} +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#include "hal.h" + +/** + * @brief PAL setup. + * @details Digital I/O ports static configuration as defined in @p board.h. + * This variable is used by the HAL when initializing the PAL driver. + */ +#if HAL_USE_PAL || defined(__DOXYGEN__) +const PALConfig pal_default_config = +{ + {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH}, + {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH}, + {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH}, + {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH}, + {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH}, +}; +#endif + +/* + * Early initialization code. + * This initialization must be performed just after stack setup and before + * any other initialization. + */ +void __early_init(void) { + + stm32_clock_init(); +} + +/* + * Board-specific initialization code. + */ +void boardInit(void) { +} diff --git a/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.h b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.h index 7253e77826..b31d74307b 100644 --- a/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.h +++ b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.h @@ -1,166 +1,166 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#ifndef _BOARD_H_ -#define _BOARD_H_ - -/* - * Setup for a Generic STM32F103 board. - */ - -/* - * Board identifier. - */ -#define BOARD_GENERIC_STM32_F103 -#define BOARD_NAME "Generic STM32F103x board" - -/* - * Board frequencies. - */ -#define STM32_LSECLK 32768 -#define STM32_HSECLK 8000000 - -/* - * MCU type, supported types are defined in ./os/hal/platforms/hal_lld.h. - */ -#define STM32F103xB - -/* - * IO pins assignments - */ - -/* on-board */ - -#define GPIOC_LED 13 -#define GPIOD_OSC_IN 0 -#define GPIOD_OSC_OUT 1 - -/* In case your board has a "USB enable" hardware - controlled by a pin, define it here. (It could be just - a 1.5k resistor connected to D+ line.) -*/ -/* -#define GPIOB_USB_DISC 10 -*/ - -/* - * I/O ports initial setup, this configuration is established soon after reset - * in the initialization code. - * - * The digits have the following meaning: - * 0 - Analog input. - * 1 - Push Pull output 10MHz. - * 2 - Push Pull output 2MHz. - * 3 - Push Pull output 50MHz. - * 4 - Digital input. - * 5 - Open Drain output 10MHz. - * 6 - Open Drain output 2MHz. - * 7 - Open Drain output 50MHz. - * 8 - Digital input with PullUp or PullDown resistor depending on ODR. - * 9 - Alternate Push Pull output 10MHz. - * A - Alternate Push Pull output 2MHz. - * B - Alternate Push Pull output 50MHz. - * C - Reserved. - * D - Alternate Open Drain output 10MHz. - * E - Alternate Open Drain output 2MHz. - * F - Alternate Open Drain output 50MHz. - * Please refer to the STM32 Reference Manual for details. - */ - -/* - * Port A setup. - * Everything input with pull-up except: - * PA2 - Alternate output (USART2 TX). - * PA3 - Normal input (USART2 RX). - * PA9 - Alternate output (USART1 TX). - * PA10 - Normal input (USART1 RX). - */ -#define VAL_GPIOACRL 0x88884B88 /* PA7...PA0 */ -#define VAL_GPIOACRH 0x888884B8 /* PA15...PA8 */ -#define VAL_GPIOAODR 0xFFFFFFFF - -/* - * Port B setup. - * Everything input with pull-up except: - * PB10 - Push Pull output (USB switch). - */ -#define VAL_GPIOBCRL 0x88888888 /* PB7...PB0 */ -#define VAL_GPIOBCRH 0x88888388 /* PB15...PB8 */ -#define VAL_GPIOBODR 0xFFFFFFFF - -/* - * Port C setup. - * Everything input with pull-up except: - * PC13 - Push Pull output (LED). - */ -#define VAL_GPIOCCRL 0x88888888 /* PC7...PC0 */ -#define VAL_GPIOCCRH 0x88388888 /* PC15...PC8 */ -#define VAL_GPIOCODR 0xFFFFFFFF - -/* - * Port D setup. - * Everything input with pull-up except: - * PD0 - Normal input (XTAL). - * PD1 - Normal input (XTAL). - */ -#define VAL_GPIODCRL 0x88888844 /* PD7...PD0 */ -#define VAL_GPIODCRH 0x88888888 /* PD15...PD8 */ -#define VAL_GPIODODR 0xFFFFFFFF - -/* - * Port E setup. - * Everything input with pull-up except: - */ -#define VAL_GPIOECRL 0x88888888 /* PE7...PE0 */ -#define VAL_GPIOECRH 0x88888888 /* PE15...PE8 */ -#define VAL_GPIOEODR 0xFFFFFFFF - -/* - * USB bus activation macro, required by the USB driver. - */ -/* The point is that most of the generic STM32F103* boards - have a 1.5k resistor connected on one end to the D+ line - and on the other end to some pin. Or even a slightly more - complicated "USB enable" circuit, controlled by a pin. - That should go here. - - However on some boards (e.g. one that I have), there's no - such hardware. In which case it's better to not do anything. -*/ -/* -#define usb_lld_connect_bus(usbp) palClearPad(GPIOB, GPIOB_USB_DISC) -*/ -#define usb_lld_connect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_INPUT); - -/* - * USB bus de-activation macro, required by the USB driver. - */ -/* -#define usb_lld_disconnect_bus(usbp) palSetPad(GPIOB, GPIOB_USB_DISC) -*/ -#define usb_lld_disconnect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_OUTPUT_PUSHPULL); palClearPad(GPIOA, 12); - -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ - -#endif /* _BOARD_H_ */ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#ifndef _BOARD_H_ +#define _BOARD_H_ + +/* + * Setup for a Generic STM32F103 board. + */ + +/* + * Board identifier. + */ +#define BOARD_GENERIC_STM32_F103 +#define BOARD_NAME "Generic STM32F103x board" + +/* + * Board frequencies. + */ +#define STM32_LSECLK 32768 +#define STM32_HSECLK 8000000 + +/* + * MCU type, supported types are defined in ./os/hal/platforms/hal_lld.h. + */ +#define STM32F103xB + +/* + * IO pins assignments + */ + +/* on-board */ + +#define GPIOC_LED 13 +#define GPIOD_OSC_IN 0 +#define GPIOD_OSC_OUT 1 + +/* In case your board has a "USB enable" hardware + controlled by a pin, define it here. (It could be just + a 1.5k resistor connected to D+ line.) +*/ +/* +#define GPIOB_USB_DISC 10 +*/ + +/* + * I/O ports initial setup, this configuration is established soon after reset + * in the initialization code. + * + * The digits have the following meaning: + * 0 - Analog input. + * 1 - Push Pull output 10MHz. + * 2 - Push Pull output 2MHz. + * 3 - Push Pull output 50MHz. + * 4 - Digital input. + * 5 - Open Drain output 10MHz. + * 6 - Open Drain output 2MHz. + * 7 - Open Drain output 50MHz. + * 8 - Digital input with PullUp or PullDown resistor depending on ODR. + * 9 - Alternate Push Pull output 10MHz. + * A - Alternate Push Pull output 2MHz. + * B - Alternate Push Pull output 50MHz. + * C - Reserved. + * D - Alternate Open Drain output 10MHz. + * E - Alternate Open Drain output 2MHz. + * F - Alternate Open Drain output 50MHz. + * Please refer to the STM32 Reference Manual for details. + */ + +/* + * Port A setup. + * Everything input with pull-up except: + * PA2 - Alternate output (USART2 TX). + * PA3 - Normal input (USART2 RX). + * PA9 - Alternate output (USART1 TX). + * PA10 - Normal input (USART1 RX). + */ +#define VAL_GPIOACRL 0x88884B88 /* PA7...PA0 */ +#define VAL_GPIOACRH 0x888884B8 /* PA15...PA8 */ +#define VAL_GPIOAODR 0xFFFFFFFF + +/* + * Port B setup. + * Everything input with pull-up except: + * PB10 - Push Pull output (USB switch). + */ +#define VAL_GPIOBCRL 0x88888888 /* PB7...PB0 */ +#define VAL_GPIOBCRH 0x88888388 /* PB15...PB8 */ +#define VAL_GPIOBODR 0xFFFFFFFF + +/* + * Port C setup. + * Everything input with pull-up except: + * PC13 - Push Pull output (LED). + */ +#define VAL_GPIOCCRL 0x88888888 /* PC7...PC0 */ +#define VAL_GPIOCCRH 0x88388888 /* PC15...PC8 */ +#define VAL_GPIOCODR 0xFFFFFFFF + +/* + * Port D setup. + * Everything input with pull-up except: + * PD0 - Normal input (XTAL). + * PD1 - Normal input (XTAL). + */ +#define VAL_GPIODCRL 0x88888844 /* PD7...PD0 */ +#define VAL_GPIODCRH 0x88888888 /* PD15...PD8 */ +#define VAL_GPIODODR 0xFFFFFFFF + +/* + * Port E setup. + * Everything input with pull-up except: + */ +#define VAL_GPIOECRL 0x88888888 /* PE7...PE0 */ +#define VAL_GPIOECRH 0x88888888 /* PE15...PE8 */ +#define VAL_GPIOEODR 0xFFFFFFFF + +/* + * USB bus activation macro, required by the USB driver. + */ +/* The point is that most of the generic STM32F103* boards + have a 1.5k resistor connected on one end to the D+ line + and on the other end to some pin. Or even a slightly more + complicated "USB enable" circuit, controlled by a pin. + That should go here. + + However on some boards (e.g. one that I have), there's no + such hardware. In which case it's better to not do anything. +*/ +/* +#define usb_lld_connect_bus(usbp) palClearPad(GPIOB, GPIOB_USB_DISC) +*/ +#define usb_lld_connect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_INPUT); + +/* + * USB bus de-activation macro, required by the USB driver. + */ +/* +#define usb_lld_disconnect_bus(usbp) palSetPad(GPIOB, GPIOB_USB_DISC) +*/ +#define usb_lld_disconnect_bus(usbp) palSetPadMode(GPIOA, 12, PAL_MODE_OUTPUT_PUSHPULL); palClearPad(GPIOA, 12); + +#if !defined(_FROM_ASM_) +#ifdef __cplusplus +extern "C" { +#endif + void boardInit(void); +#ifdef __cplusplus +} +#endif +#endif /* _FROM_ASM_ */ + +#endif /* _BOARD_H_ */ diff --git a/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk index d692c0ee46..48e0e51fe6 100644 --- a/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk +++ b/keyboards/chibios_test/boards/GENERIC_STM32_F103/board.mk @@ -1,5 +1,5 @@ -# List of all the board related files. -BOARDSRC = $(KEYBOARD_PATH)/boards/GENERIC_STM32_F103/board.c - -# Required include directories -BOARDINC = $(KEYBOARD_PATH)/boards/GENERIC_STM32_F103 +# List of all the board related files. +BOARDSRC = $(KEYBOARD_PATH)/boards/GENERIC_STM32_F103/board.c + +# Required include directories +BOARDINC = $(KEYBOARD_PATH)/boards/GENERIC_STM32_F103 diff --git a/keyboards/chibios_test/ld/MKL26Z64.ld b/keyboards/chibios_test/ld/MKL26Z64.ld index fb141f888c..c4ca8b874c 100644 --- a/keyboards/chibios_test/ld/MKL26Z64.ld +++ b/keyboards/chibios_test/ld/MKL26Z64.ld @@ -1,105 +1,105 @@ -/* - * Copyright (C) 2013-2016 Fabio Utzig, http://fabioutzig.com - * (C) 2016 flabbergast - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/* - * KL26Z64 memory setup. - */ -MEMORY -{ - flash0 : org = 0x00000000, len = 0x100 - flash1 : org = 0x00000400, len = 0x10 - flash2 : org = 0x00000410, len = 62k - 0x410 - flash3 : org = 0x0000F800, len = 2k - flash4 : org = 0x00000000, len = 0 - flash5 : org = 0x00000000, len = 0 - flash6 : org = 0x00000000, len = 0 - flash7 : org = 0x00000000, len = 0 - ram0 : org = 0x1FFFF800, len = 8k - ram1 : org = 0x00000000, len = 0 - ram2 : org = 0x00000000, len = 0 - ram3 : org = 0x00000000, len = 0 - ram4 : org = 0x00000000, len = 0 - ram5 : org = 0x00000000, len = 0 - ram6 : org = 0x00000000, len = 0 - ram7 : org = 0x00000000, len = 0 -} - -/* Flash region for the configuration bytes.*/ -SECTIONS -{ - .cfmprotect : ALIGN(4) SUBALIGN(4) - { - KEEP(*(.cfmconfig)) - } > flash1 -} - -/* For each data/text section two region are defined, a virtual region - and a load region (_LMA suffix).*/ - -/* Flash region to be used for exception vectors.*/ -REGION_ALIAS("VECTORS_FLASH", flash0); -REGION_ALIAS("VECTORS_FLASH_LMA", flash0); - -/* Flash region to be used for constructors and destructors.*/ -REGION_ALIAS("XTORS_FLASH", flash2); -REGION_ALIAS("XTORS_FLASH_LMA", flash2); - -/* Flash region to be used for code text.*/ -REGION_ALIAS("TEXT_FLASH", flash2); -REGION_ALIAS("TEXT_FLASH_LMA", flash2); - -/* Flash region to be used for read only data.*/ -REGION_ALIAS("RODATA_FLASH", flash2); -REGION_ALIAS("RODATA_FLASH_LMA", flash2); - -/* Flash region to be used for various.*/ -REGION_ALIAS("VARIOUS_FLASH", flash2); -REGION_ALIAS("VARIOUS_FLASH_LMA", flash2); - -/* Flash region to be used for RAM(n) initialization data.*/ -REGION_ALIAS("RAM_INIT_FLASH_LMA", flash2); - -/* RAM region to be used for Main stack. This stack accommodates the processing - of all exceptions and interrupts.*/ -REGION_ALIAS("MAIN_STACK_RAM", ram0); - -/* RAM region to be used for the process stack. This is the stack used by - the main() function.*/ -REGION_ALIAS("PROCESS_STACK_RAM", ram0); - -/* RAM region to be used for data segment.*/ -REGION_ALIAS("DATA_RAM", ram0); -REGION_ALIAS("DATA_RAM_LMA", flash2); - -/* RAM region to be used for BSS segment.*/ -REGION_ALIAS("BSS_RAM", ram0); - -/* RAM region to be used for the default heap.*/ -REGION_ALIAS("HEAP_RAM", ram0); - -__eeprom_workarea_start__ = ORIGIN(flash3); -__eeprom_workarea_size__ = LENGTH(flash3); -__eeprom_workarea_end__ = __eeprom_workarea_start__ + __eeprom_workarea_size__; - -/* Generic rules inclusion.*/ -INCLUDE rules.ld +/* + * Copyright (C) 2013-2016 Fabio Utzig, http://fabioutzig.com + * (C) 2016 flabbergast + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/* + * KL26Z64 memory setup. + */ +MEMORY +{ + flash0 : org = 0x00000000, len = 0x100 + flash1 : org = 0x00000400, len = 0x10 + flash2 : org = 0x00000410, len = 62k - 0x410 + flash3 : org = 0x0000F800, len = 2k + flash4 : org = 0x00000000, len = 0 + flash5 : org = 0x00000000, len = 0 + flash6 : org = 0x00000000, len = 0 + flash7 : org = 0x00000000, len = 0 + ram0 : org = 0x1FFFF800, len = 8k + ram1 : org = 0x00000000, len = 0 + ram2 : org = 0x00000000, len = 0 + ram3 : org = 0x00000000, len = 0 + ram4 : org = 0x00000000, len = 0 + ram5 : org = 0x00000000, len = 0 + ram6 : org = 0x00000000, len = 0 + ram7 : org = 0x00000000, len = 0 +} + +/* Flash region for the configuration bytes.*/ +SECTIONS +{ + .cfmprotect : ALIGN(4) SUBALIGN(4) + { + KEEP(*(.cfmconfig)) + } > flash1 +} + +/* For each data/text section two region are defined, a virtual region + and a load region (_LMA suffix).*/ + +/* Flash region to be used for exception vectors.*/ +REGION_ALIAS("VECTORS_FLASH", flash0); +REGION_ALIAS("VECTORS_FLASH_LMA", flash0); + +/* Flash region to be used for constructors and destructors.*/ +REGION_ALIAS("XTORS_FLASH", flash2); +REGION_ALIAS("XTORS_FLASH_LMA", flash2); + +/* Flash region to be used for code text.*/ +REGION_ALIAS("TEXT_FLASH", flash2); +REGION_ALIAS("TEXT_FLASH_LMA", flash2); + +/* Flash region to be used for read only data.*/ +REGION_ALIAS("RODATA_FLASH", flash2); +REGION_ALIAS("RODATA_FLASH_LMA", flash2); + +/* Flash region to be used for various.*/ +REGION_ALIAS("VARIOUS_FLASH", flash2); +REGION_ALIAS("VARIOUS_FLASH_LMA", flash2); + +/* Flash region to be used for RAM(n) initialization data.*/ +REGION_ALIAS("RAM_INIT_FLASH_LMA", flash2); + +/* RAM region to be used for Main stack. This stack accommodates the processing + of all exceptions and interrupts.*/ +REGION_ALIAS("MAIN_STACK_RAM", ram0); + +/* RAM region to be used for the process stack. This is the stack used by + the main() function.*/ +REGION_ALIAS("PROCESS_STACK_RAM", ram0); + +/* RAM region to be used for data segment.*/ +REGION_ALIAS("DATA_RAM", ram0); +REGION_ALIAS("DATA_RAM_LMA", flash2); + +/* RAM region to be used for BSS segment.*/ +REGION_ALIAS("BSS_RAM", ram0); + +/* RAM region to be used for the default heap.*/ +REGION_ALIAS("HEAP_RAM", ram0); + +__eeprom_workarea_start__ = ORIGIN(flash3); +__eeprom_workarea_size__ = LENGTH(flash3); +__eeprom_workarea_end__ = __eeprom_workarea_start__ + __eeprom_workarea_size__; + +/* Generic rules inclusion.*/ +INCLUDE rules.ld diff --git a/keyboards/chibios_test/ld/STM32F103x8_stm32duino_bootloader.ld b/keyboards/chibios_test/ld/STM32F103x8_stm32duino_bootloader.ld index 00613328ed..f9bfe9c005 100644 --- a/keyboards/chibios_test/ld/STM32F103x8_stm32duino_bootloader.ld +++ b/keyboards/chibios_test/ld/STM32F103x8_stm32duino_bootloader.ld @@ -1,88 +1,88 @@ -/* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/* - * ST32F103xB memory setup for use with the maplemini bootloader. - * You will have to - * #define CORTEX_VTOR_INIT 0x5000 - * in your projects chconf.h - */ -MEMORY -{ - flash0 : org = 0x08002000, len = 128k - 0x2000 - flash1 : org = 0x00000000, len = 0 - flash2 : org = 0x00000000, len = 0 - flash3 : org = 0x00000000, len = 0 - flash4 : org = 0x00000000, len = 0 - flash5 : org = 0x00000000, len = 0 - flash6 : org = 0x00000000, len = 0 - flash7 : org = 0x00000000, len = 0 - ram0 : org = 0x20000000, len = 20k - ram1 : org = 0x00000000, len = 0 - ram2 : org = 0x00000000, len = 0 - ram3 : org = 0x00000000, len = 0 - ram4 : org = 0x00000000, len = 0 - ram5 : org = 0x00000000, len = 0 - ram6 : org = 0x00000000, len = 0 - ram7 : org = 0x00000000, len = 0 -} - -/* For each data/text section two region are defined, a virtual region - and a load region (_LMA suffix).*/ - -/* Flash region to be used for exception vectors.*/ -REGION_ALIAS("VECTORS_FLASH", flash0); -REGION_ALIAS("VECTORS_FLASH_LMA", flash0); - -/* Flash region to be used for constructors and destructors.*/ -REGION_ALIAS("XTORS_FLASH", flash0); -REGION_ALIAS("XTORS_FLASH_LMA", flash0); - -/* Flash region to be used for code text.*/ -REGION_ALIAS("TEXT_FLASH", flash0); -REGION_ALIAS("TEXT_FLASH_LMA", flash0); - -/* Flash region to be used for read only data.*/ -REGION_ALIAS("RODATA_FLASH", flash0); -REGION_ALIAS("RODATA_FLASH_LMA", flash0); - -/* Flash region to be used for various.*/ -REGION_ALIAS("VARIOUS_FLASH", flash0); -REGION_ALIAS("VARIOUS_FLASH_LMA", flash0); - -/* Flash region to be used for RAM(n) initialization data.*/ -REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0); - -/* RAM region to be used for Main stack. This stack accommodates the processing - of all exceptions and interrupts.*/ -REGION_ALIAS("MAIN_STACK_RAM", ram0); - -/* RAM region to be used for the process stack. This is the stack used by - the main() function.*/ -REGION_ALIAS("PROCESS_STACK_RAM", ram0); - -/* RAM region to be used for data segment.*/ -REGION_ALIAS("DATA_RAM", ram0); -REGION_ALIAS("DATA_RAM_LMA", flash0); - -/* RAM region to be used for BSS segment.*/ -REGION_ALIAS("BSS_RAM", ram0); - -/* RAM region to be used for the default heap.*/ -REGION_ALIAS("HEAP_RAM", ram0); - -/* Generic rules inclusion.*/ -INCLUDE rules.ld +/* + ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/* + * ST32F103xB memory setup for use with the maplemini bootloader. + * You will have to + * #define CORTEX_VTOR_INIT 0x5000 + * in your projects chconf.h + */ +MEMORY +{ + flash0 : org = 0x08002000, len = 128k - 0x2000 + flash1 : org = 0x00000000, len = 0 + flash2 : org = 0x00000000, len = 0 + flash3 : org = 0x00000000, len = 0 + flash4 : org = 0x00000000, len = 0 + flash5 : org = 0x00000000, len = 0 + flash6 : org = 0x00000000, len = 0 + flash7 : org = 0x00000000, len = 0 + ram0 : org = 0x20000000, len = 20k + ram1 : org = 0x00000000, len = 0 + ram2 : org = 0x00000000, len = 0 + ram3 : org = 0x00000000, len = 0 + ram4 : org = 0x00000000, len = 0 + ram5 : org = 0x00000000, len = 0 + ram6 : org = 0x00000000, len = 0 + ram7 : org = 0x00000000, len = 0 +} + +/* For each data/text section two region are defined, a virtual region + and a load region (_LMA suffix).*/ + +/* Flash region to be used for exception vectors.*/ +REGION_ALIAS("VECTORS_FLASH", flash0); +REGION_ALIAS("VECTORS_FLASH_LMA", flash0); + +/* Flash region to be used for constructors and destructors.*/ +REGION_ALIAS("XTORS_FLASH", flash0); +REGION_ALIAS("XTORS_FLASH_LMA", flash0); + +/* Flash region to be used for code text.*/ +REGION_ALIAS("TEXT_FLASH", flash0); +REGION_ALIAS("TEXT_FLASH_LMA", flash0); + +/* Flash region to be used for read only data.*/ +REGION_ALIAS("RODATA_FLASH", flash0); +REGION_ALIAS("RODATA_FLASH_LMA", flash0); + +/* Flash region to be used for various.*/ +REGION_ALIAS("VARIOUS_FLASH", flash0); +REGION_ALIAS("VARIOUS_FLASH_LMA", flash0); + +/* Flash region to be used for RAM(n) initialization data.*/ +REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0); + +/* RAM region to be used for Main stack. This stack accommodates the processing + of all exceptions and interrupts.*/ +REGION_ALIAS("MAIN_STACK_RAM", ram0); + +/* RAM region to be used for the process stack. This is the stack used by + the main() function.*/ +REGION_ALIAS("PROCESS_STACK_RAM", ram0); + +/* RAM region to be used for data segment.*/ +REGION_ALIAS("DATA_RAM", ram0); +REGION_ALIAS("DATA_RAM_LMA", flash0); + +/* RAM region to be used for BSS segment.*/ +REGION_ALIAS("BSS_RAM", ram0); + +/* RAM region to be used for the default heap.*/ +REGION_ALIAS("HEAP_RAM", ram0); + +/* Generic rules inclusion.*/ +INCLUDE rules.ld diff --git a/keyboards/chibios_test/stm32_f072_onekey/mcuconf.h b/keyboards/chibios_test/stm32_f072_onekey/mcuconf.h index 3d877aaa2b..faca3defdf 100644 --- a/keyboards/chibios_test/stm32_f072_onekey/mcuconf.h +++ b/keyboards/chibios_test/stm32_f072_onekey/mcuconf.h @@ -1,171 +1,171 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#ifndef _MCUCONF_H_ -#define _MCUCONF_H_ - -/* - * STM32F0xx drivers configuration. - * The following settings override the default settings present in - * the various device driver implementation headers. - * Note that the settings for each driver only have effect if the whole - * driver is enabled in halconf.h. - * - * IRQ priorities: - * 3...0 Lowest...Highest. - * - * DMA priorities: - * 0...3 Lowest...Highest. - */ - -#define STM32F0xx_MCUCONF - -/* - * HAL driver system settings. - */ -#define STM32_NO_INIT FALSE -#define STM32_PVD_ENABLE FALSE -#define STM32_PLS STM32_PLS_LEV0 -#define STM32_HSI_ENABLED TRUE -#define STM32_HSI14_ENABLED TRUE -#define STM32_HSI48_ENABLED FALSE -#define STM32_LSI_ENABLED TRUE -#define STM32_HSE_ENABLED FALSE -#define STM32_LSE_ENABLED FALSE -#define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 -#define STM32_PREDIV_VALUE 1 -#define STM32_PLLMUL_VALUE 12 -#define STM32_HPRE STM32_HPRE_DIV1 -#define STM32_PPRE STM32_PPRE_DIV1 -#define STM32_ADCSW STM32_ADCSW_HSI14 -#define STM32_ADCPRE STM32_ADCPRE_DIV4 -#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK -#define STM32_ADCPRE STM32_ADCPRE_DIV4 -#define STM32_ADCSW STM32_ADCSW_HSI14 -#define STM32_USBSW STM32_USBSW_HSI48 -#define STM32_CECSW STM32_CECSW_HSI -#define STM32_I2C1SW STM32_I2C1SW_HSI -#define STM32_USART1SW STM32_USART1SW_PCLK -#define STM32_RTCSEL STM32_RTCSEL_LSI - -/* - * ADC driver system settings. - */ -#define STM32_ADC_USE_ADC1 FALSE -#define STM32_ADC_ADC1_DMA_PRIORITY 2 -#define STM32_ADC_IRQ_PRIORITY 2 -#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 2 - -/* - * EXT driver system settings. - */ -#define STM32_EXT_EXTI0_1_IRQ_PRIORITY 3 -#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3 -#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3 -#define STM32_EXT_EXTI16_IRQ_PRIORITY 3 -#define STM32_EXT_EXTI17_IRQ_PRIORITY 3 - -/* - * GPT driver system settings. - */ -#define STM32_GPT_USE_TIM1 FALSE -#define STM32_GPT_USE_TIM2 FALSE -#define STM32_GPT_USE_TIM3 FALSE -#define STM32_GPT_USE_TIM14 FALSE -#define STM32_GPT_TIM1_IRQ_PRIORITY 2 -#define STM32_GPT_TIM2_IRQ_PRIORITY 2 -#define STM32_GPT_TIM3_IRQ_PRIORITY 2 -#define STM32_GPT_TIM14_IRQ_PRIORITY 2 - -/* - * I2C driver system settings. - */ -#define STM32_I2C_USE_I2C1 FALSE -#define STM32_I2C_USE_I2C2 FALSE -#define STM32_I2C_BUSY_TIMEOUT 50 -#define STM32_I2C_I2C1_IRQ_PRIORITY 3 -#define STM32_I2C_I2C2_IRQ_PRIORITY 3 -#define STM32_I2C_USE_DMA TRUE -#define STM32_I2C_I2C1_DMA_PRIORITY 1 -#define STM32_I2C_I2C2_DMA_PRIORITY 1 -#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure") - -/* - * ICU driver system settings. - */ -#define STM32_ICU_USE_TIM1 FALSE -#define STM32_ICU_USE_TIM2 FALSE -#define STM32_ICU_USE_TIM3 FALSE -#define STM32_ICU_TIM1_IRQ_PRIORITY 3 -#define STM32_ICU_TIM2_IRQ_PRIORITY 3 -#define STM32_ICU_TIM3_IRQ_PRIORITY 3 - -/* - * PWM driver system settings. - */ -#define STM32_PWM_USE_ADVANCED FALSE -#define STM32_PWM_USE_TIM1 FALSE -#define STM32_PWM_USE_TIM2 FALSE -#define STM32_PWM_USE_TIM3 FALSE -#define STM32_PWM_TIM1_IRQ_PRIORITY 3 -#define STM32_PWM_TIM2_IRQ_PRIORITY 3 -#define STM32_PWM_TIM3_IRQ_PRIORITY 3 - -/* - * SERIAL driver system settings. - */ -#define STM32_SERIAL_USE_USART1 FALSE -#define STM32_SERIAL_USE_USART2 FALSE -#define STM32_SERIAL_USART1_PRIORITY 3 -#define STM32_SERIAL_USART2_PRIORITY 3 - -/* - * SPI driver system settings. - */ -#define STM32_SPI_USE_SPI1 FALSE -#define STM32_SPI_USE_SPI2 FALSE -#define STM32_SPI_SPI1_DMA_PRIORITY 1 -#define STM32_SPI_SPI2_DMA_PRIORITY 1 -#define STM32_SPI_SPI1_IRQ_PRIORITY 2 -#define STM32_SPI_SPI2_IRQ_PRIORITY 2 -#define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure") - -/* - * ST driver system settings. - */ -#define STM32_ST_IRQ_PRIORITY 2 -#define STM32_ST_USE_TIMER 2 - -/* - * UART driver system settings. - */ -#define STM32_UART_USE_USART1 FALSE -#define STM32_UART_USE_USART2 FALSE -#define STM32_UART_USART1_IRQ_PRIORITY 3 -#define STM32_UART_USART2_IRQ_PRIORITY 3 -#define STM32_UART_USART1_DMA_PRIORITY 0 -#define STM32_UART_USART2_DMA_PRIORITY 0 -#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure") - -/* - * USB driver system settings. - */ -#define STM32_USB_USE_USB1 TRUE -#define STM32_USB_LOW_POWER_ON_SUSPEND FALSE -#define STM32_USB_USB1_LP_IRQ_PRIORITY 3 - -#endif /* _MCUCONF_H_ */ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#ifndef _MCUCONF_H_ +#define _MCUCONF_H_ + +/* + * STM32F0xx drivers configuration. + * The following settings override the default settings present in + * the various device driver implementation headers. + * Note that the settings for each driver only have effect if the whole + * driver is enabled in halconf.h. + * + * IRQ priorities: + * 3...0 Lowest...Highest. + * + * DMA priorities: + * 0...3 Lowest...Highest. + */ + +#define STM32F0xx_MCUCONF + +/* + * HAL driver system settings. + */ +#define STM32_NO_INIT FALSE +#define STM32_PVD_ENABLE FALSE +#define STM32_PLS STM32_PLS_LEV0 +#define STM32_HSI_ENABLED TRUE +#define STM32_HSI14_ENABLED TRUE +#define STM32_HSI48_ENABLED FALSE +#define STM32_LSI_ENABLED TRUE +#define STM32_HSE_ENABLED FALSE +#define STM32_LSE_ENABLED FALSE +#define STM32_SW STM32_SW_PLL +#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2 +#define STM32_PREDIV_VALUE 1 +#define STM32_PLLMUL_VALUE 12 +#define STM32_HPRE STM32_HPRE_DIV1 +#define STM32_PPRE STM32_PPRE_DIV1 +#define STM32_ADCSW STM32_ADCSW_HSI14 +#define STM32_ADCPRE STM32_ADCPRE_DIV4 +#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK +#define STM32_ADCPRE STM32_ADCPRE_DIV4 +#define STM32_ADCSW STM32_ADCSW_HSI14 +#define STM32_USBSW STM32_USBSW_HSI48 +#define STM32_CECSW STM32_CECSW_HSI +#define STM32_I2C1SW STM32_I2C1SW_HSI +#define STM32_USART1SW STM32_USART1SW_PCLK +#define STM32_RTCSEL STM32_RTCSEL_LSI + +/* + * ADC driver system settings. + */ +#define STM32_ADC_USE_ADC1 FALSE +#define STM32_ADC_ADC1_DMA_PRIORITY 2 +#define STM32_ADC_IRQ_PRIORITY 2 +#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 2 + +/* + * EXT driver system settings. + */ +#define STM32_EXT_EXTI0_1_IRQ_PRIORITY 3 +#define STM32_EXT_EXTI2_3_IRQ_PRIORITY 3 +#define STM32_EXT_EXTI4_15_IRQ_PRIORITY 3 +#define STM32_EXT_EXTI16_IRQ_PRIORITY 3 +#define STM32_EXT_EXTI17_IRQ_PRIORITY 3 + +/* + * GPT driver system settings. + */ +#define STM32_GPT_USE_TIM1 FALSE +#define STM32_GPT_USE_TIM2 FALSE +#define STM32_GPT_USE_TIM3 FALSE +#define STM32_GPT_USE_TIM14 FALSE +#define STM32_GPT_TIM1_IRQ_PRIORITY 2 +#define STM32_GPT_TIM2_IRQ_PRIORITY 2 +#define STM32_GPT_TIM3_IRQ_PRIORITY 2 +#define STM32_GPT_TIM14_IRQ_PRIORITY 2 + +/* + * I2C driver system settings. + */ +#define STM32_I2C_USE_I2C1 FALSE +#define STM32_I2C_USE_I2C2 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 +#define STM32_I2C_I2C1_IRQ_PRIORITY 3 +#define STM32_I2C_I2C2_IRQ_PRIORITY 3 +#define STM32_I2C_USE_DMA TRUE +#define STM32_I2C_I2C1_DMA_PRIORITY 1 +#define STM32_I2C_I2C2_DMA_PRIORITY 1 +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure") + +/* + * ICU driver system settings. + */ +#define STM32_ICU_USE_TIM1 FALSE +#define STM32_ICU_USE_TIM2 FALSE +#define STM32_ICU_USE_TIM3 FALSE +#define STM32_ICU_TIM1_IRQ_PRIORITY 3 +#define STM32_ICU_TIM2_IRQ_PRIORITY 3 +#define STM32_ICU_TIM3_IRQ_PRIORITY 3 + +/* + * PWM driver system settings. + */ +#define STM32_PWM_USE_ADVANCED FALSE +#define STM32_PWM_USE_TIM1 FALSE +#define STM32_PWM_USE_TIM2 FALSE +#define STM32_PWM_USE_TIM3 FALSE +#define STM32_PWM_TIM1_IRQ_PRIORITY 3 +#define STM32_PWM_TIM2_IRQ_PRIORITY 3 +#define STM32_PWM_TIM3_IRQ_PRIORITY 3 + +/* + * SERIAL driver system settings. + */ +#define STM32_SERIAL_USE_USART1 FALSE +#define STM32_SERIAL_USE_USART2 FALSE +#define STM32_SERIAL_USART1_PRIORITY 3 +#define STM32_SERIAL_USART2_PRIORITY 3 + +/* + * SPI driver system settings. + */ +#define STM32_SPI_USE_SPI1 FALSE +#define STM32_SPI_USE_SPI2 FALSE +#define STM32_SPI_SPI1_DMA_PRIORITY 1 +#define STM32_SPI_SPI2_DMA_PRIORITY 1 +#define STM32_SPI_SPI1_IRQ_PRIORITY 2 +#define STM32_SPI_SPI2_IRQ_PRIORITY 2 +#define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure") + +/* + * ST driver system settings. + */ +#define STM32_ST_IRQ_PRIORITY 2 +#define STM32_ST_USE_TIMER 2 + +/* + * UART driver system settings. + */ +#define STM32_UART_USE_USART1 FALSE +#define STM32_UART_USE_USART2 FALSE +#define STM32_UART_USART1_IRQ_PRIORITY 3 +#define STM32_UART_USART2_IRQ_PRIORITY 3 +#define STM32_UART_USART1_DMA_PRIORITY 0 +#define STM32_UART_USART2_DMA_PRIORITY 0 +#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure") + +/* + * USB driver system settings. + */ +#define STM32_USB_USE_USB1 TRUE +#define STM32_USB_LOW_POWER_ON_SUSPEND FALSE +#define STM32_USB_USB1_LP_IRQ_PRIORITY 3 + +#endif /* _MCUCONF_H_ */ diff --git a/keyboards/chibios_test/stm32_f103_onekey/mcuconf.h b/keyboards/chibios_test/stm32_f103_onekey/mcuconf.h index 626332a6aa..276829216e 100644 --- a/keyboards/chibios_test/stm32_f103_onekey/mcuconf.h +++ b/keyboards/chibios_test/stm32_f103_onekey/mcuconf.h @@ -1,209 +1,209 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#ifndef _MCUCONF_H_ -#define _MCUCONF_H_ - -#define STM32F103_MCUCONF - -/* - * STM32F103 drivers configuration. - * The following settings override the default settings present in - * the various device driver implementation headers. - * Note that the settings for each driver only have effect if the whole - * driver is enabled in halconf.h. - * - * IRQ priorities: - * 15...0 Lowest...Highest. - * - * DMA priorities: - * 0...3 Lowest...Highest. - */ - -/* - * HAL driver system settings. - */ -#define STM32_NO_INIT FALSE -#define STM32_HSI_ENABLED TRUE -#define STM32_LSI_ENABLED FALSE -#define STM32_HSE_ENABLED TRUE -#define STM32_LSE_ENABLED FALSE -#define STM32_SW STM32_SW_PLL -#define STM32_PLLSRC STM32_PLLSRC_HSE -#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1 -#define STM32_PLLMUL_VALUE 9 -#define STM32_HPRE STM32_HPRE_DIV1 -#define STM32_PPRE1 STM32_PPRE1_DIV2 -#define STM32_PPRE2 STM32_PPRE2_DIV2 -#define STM32_ADCPRE STM32_ADCPRE_DIV4 -#define STM32_USB_CLOCK_REQUIRED TRUE -#define STM32_USBPRE STM32_USBPRE_DIV1P5 -#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK -#define STM32_RTCSEL STM32_RTCSEL_HSEDIV -#define STM32_PVD_ENABLE FALSE -#define STM32_PLS STM32_PLS_LEV0 - -/* - * ADC driver system settings. - */ -#define STM32_ADC_USE_ADC1 FALSE -#define STM32_ADC_ADC1_DMA_PRIORITY 2 -#define STM32_ADC_ADC1_IRQ_PRIORITY 6 - -/* - * CAN driver system settings. - */ -#define STM32_CAN_USE_CAN1 FALSE -#define STM32_CAN_CAN1_IRQ_PRIORITY 11 - -/* - * EXT driver system settings. - */ -#define STM32_EXT_EXTI0_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI1_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI2_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI3_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI4_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI5_9_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI10_15_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI16_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI17_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI18_IRQ_PRIORITY 6 -#define STM32_EXT_EXTI19_IRQ_PRIORITY 6 - -/* - * GPT driver system settings. - */ -#define STM32_GPT_USE_TIM1 FALSE -#define STM32_GPT_USE_TIM2 FALSE -#define STM32_GPT_USE_TIM3 FALSE -#define STM32_GPT_USE_TIM4 FALSE -#define STM32_GPT_USE_TIM5 FALSE -#define STM32_GPT_USE_TIM8 FALSE -#define STM32_GPT_TIM1_IRQ_PRIORITY 7 -#define STM32_GPT_TIM2_IRQ_PRIORITY 7 -#define STM32_GPT_TIM3_IRQ_PRIORITY 7 -#define STM32_GPT_TIM4_IRQ_PRIORITY 7 -#define STM32_GPT_TIM5_IRQ_PRIORITY 7 -#define STM32_GPT_TIM8_IRQ_PRIORITY 7 - -/* - * I2C driver system settings. - */ -#define STM32_I2C_USE_I2C1 FALSE -#define STM32_I2C_USE_I2C2 FALSE -#define STM32_I2C_BUSY_TIMEOUT 50 -#define STM32_I2C_I2C1_IRQ_PRIORITY 5 -#define STM32_I2C_I2C2_IRQ_PRIORITY 5 -#define STM32_I2C_I2C1_DMA_PRIORITY 3 -#define STM32_I2C_I2C2_DMA_PRIORITY 3 -#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure") - -/* - * ICU driver system settings. - */ -#define STM32_ICU_USE_TIM1 FALSE -#define STM32_ICU_USE_TIM2 FALSE -#define STM32_ICU_USE_TIM3 FALSE -#define STM32_ICU_USE_TIM4 FALSE -#define STM32_ICU_USE_TIM5 FALSE -#define STM32_ICU_USE_TIM8 FALSE -#define STM32_ICU_TIM1_IRQ_PRIORITY 7 -#define STM32_ICU_TIM2_IRQ_PRIORITY 7 -#define STM32_ICU_TIM3_IRQ_PRIORITY 7 -#define STM32_ICU_TIM4_IRQ_PRIORITY 7 -#define STM32_ICU_TIM5_IRQ_PRIORITY 7 -#define STM32_ICU_TIM8_IRQ_PRIORITY 7 - -/* - * PWM driver system settings. - */ -#define STM32_PWM_USE_ADVANCED FALSE -#define STM32_PWM_USE_TIM1 FALSE -#define STM32_PWM_USE_TIM2 FALSE -#define STM32_PWM_USE_TIM3 FALSE -#define STM32_PWM_USE_TIM4 FALSE -#define STM32_PWM_USE_TIM5 FALSE -#define STM32_PWM_USE_TIM8 FALSE -#define STM32_PWM_TIM1_IRQ_PRIORITY 7 -#define STM32_PWM_TIM2_IRQ_PRIORITY 7 -#define STM32_PWM_TIM3_IRQ_PRIORITY 7 -#define STM32_PWM_TIM4_IRQ_PRIORITY 7 -#define STM32_PWM_TIM5_IRQ_PRIORITY 7 -#define STM32_PWM_TIM8_IRQ_PRIORITY 7 - -/* - * RTC driver system settings. - */ -#define STM32_RTC_IRQ_PRIORITY 15 - -/* - * SERIAL driver system settings. - */ -#define STM32_SERIAL_USE_USART1 FALSE -#define STM32_SERIAL_USE_USART2 FALSE -#define STM32_SERIAL_USE_USART3 FALSE -#define STM32_SERIAL_USE_UART4 FALSE -#define STM32_SERIAL_USE_UART5 FALSE -#define STM32_SERIAL_USART1_PRIORITY 12 -#define STM32_SERIAL_USART2_PRIORITY 12 -#define STM32_SERIAL_USART3_PRIORITY 12 -#define STM32_SERIAL_UART4_PRIORITY 12 -#define STM32_SERIAL_UART5_PRIORITY 12 - -/* - * SPI driver system settings. - */ -#define STM32_SPI_USE_SPI1 FALSE -#define STM32_SPI_USE_SPI2 FALSE -#define STM32_SPI_USE_SPI3 FALSE -#define STM32_SPI_SPI1_DMA_PRIORITY 1 -#define STM32_SPI_SPI2_DMA_PRIORITY 1 -#define STM32_SPI_SPI3_DMA_PRIORITY 1 -#define STM32_SPI_SPI1_IRQ_PRIORITY 10 -#define STM32_SPI_SPI2_IRQ_PRIORITY 10 -#define STM32_SPI_SPI3_IRQ_PRIORITY 10 -#define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure") - -/* - * ST driver system settings. - */ -#define STM32_ST_IRQ_PRIORITY 8 -#define STM32_ST_USE_TIMER 2 - -/* - * UART driver system settings. - */ -#define STM32_UART_USE_USART1 FALSE -#define STM32_UART_USE_USART2 FALSE -#define STM32_UART_USE_USART3 FALSE -#define STM32_UART_USART1_IRQ_PRIORITY 12 -#define STM32_UART_USART2_IRQ_PRIORITY 12 -#define STM32_UART_USART3_IRQ_PRIORITY 12 -#define STM32_UART_USART1_DMA_PRIORITY 0 -#define STM32_UART_USART2_DMA_PRIORITY 0 -#define STM32_UART_USART3_DMA_PRIORITY 0 -#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure") - -/* - * USB driver system settings. - */ -#define STM32_USB_USE_USB1 TRUE -#define STM32_USB_LOW_POWER_ON_SUSPEND FALSE -#define STM32_USB_USB1_HP_IRQ_PRIORITY 13 -#define STM32_USB_USB1_LP_IRQ_PRIORITY 14 - -#endif /* _MCUCONF_H_ */ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#ifndef _MCUCONF_H_ +#define _MCUCONF_H_ + +#define STM32F103_MCUCONF + +/* + * STM32F103 drivers configuration. + * The following settings override the default settings present in + * the various device driver implementation headers. + * Note that the settings for each driver only have effect if the whole + * driver is enabled in halconf.h. + * + * IRQ priorities: + * 15...0 Lowest...Highest. + * + * DMA priorities: + * 0...3 Lowest...Highest. + */ + +/* + * HAL driver system settings. + */ +#define STM32_NO_INIT FALSE +#define STM32_HSI_ENABLED TRUE +#define STM32_LSI_ENABLED FALSE +#define STM32_HSE_ENABLED TRUE +#define STM32_LSE_ENABLED FALSE +#define STM32_SW STM32_SW_PLL +#define STM32_PLLSRC STM32_PLLSRC_HSE +#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1 +#define STM32_PLLMUL_VALUE 9 +#define STM32_HPRE STM32_HPRE_DIV1 +#define STM32_PPRE1 STM32_PPRE1_DIV2 +#define STM32_PPRE2 STM32_PPRE2_DIV2 +#define STM32_ADCPRE STM32_ADCPRE_DIV4 +#define STM32_USB_CLOCK_REQUIRED TRUE +#define STM32_USBPRE STM32_USBPRE_DIV1P5 +#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK +#define STM32_RTCSEL STM32_RTCSEL_HSEDIV +#define STM32_PVD_ENABLE FALSE +#define STM32_PLS STM32_PLS_LEV0 + +/* + * ADC driver system settings. + */ +#define STM32_ADC_USE_ADC1 FALSE +#define STM32_ADC_ADC1_DMA_PRIORITY 2 +#define STM32_ADC_ADC1_IRQ_PRIORITY 6 + +/* + * CAN driver system settings. + */ +#define STM32_CAN_USE_CAN1 FALSE +#define STM32_CAN_CAN1_IRQ_PRIORITY 11 + +/* + * EXT driver system settings. + */ +#define STM32_EXT_EXTI0_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI1_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI2_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI3_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI4_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI5_9_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI10_15_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI16_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI17_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI18_IRQ_PRIORITY 6 +#define STM32_EXT_EXTI19_IRQ_PRIORITY 6 + +/* + * GPT driver system settings. + */ +#define STM32_GPT_USE_TIM1 FALSE +#define STM32_GPT_USE_TIM2 FALSE +#define STM32_GPT_USE_TIM3 FALSE +#define STM32_GPT_USE_TIM4 FALSE +#define STM32_GPT_USE_TIM5 FALSE +#define STM32_GPT_USE_TIM8 FALSE +#define STM32_GPT_TIM1_IRQ_PRIORITY 7 +#define STM32_GPT_TIM2_IRQ_PRIORITY 7 +#define STM32_GPT_TIM3_IRQ_PRIORITY 7 +#define STM32_GPT_TIM4_IRQ_PRIORITY 7 +#define STM32_GPT_TIM5_IRQ_PRIORITY 7 +#define STM32_GPT_TIM8_IRQ_PRIORITY 7 + +/* + * I2C driver system settings. + */ +#define STM32_I2C_USE_I2C1 FALSE +#define STM32_I2C_USE_I2C2 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 +#define STM32_I2C_I2C1_IRQ_PRIORITY 5 +#define STM32_I2C_I2C2_IRQ_PRIORITY 5 +#define STM32_I2C_I2C1_DMA_PRIORITY 3 +#define STM32_I2C_I2C2_DMA_PRIORITY 3 +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure") + +/* + * ICU driver system settings. + */ +#define STM32_ICU_USE_TIM1 FALSE +#define STM32_ICU_USE_TIM2 FALSE +#define STM32_ICU_USE_TIM3 FALSE +#define STM32_ICU_USE_TIM4 FALSE +#define STM32_ICU_USE_TIM5 FALSE +#define STM32_ICU_USE_TIM8 FALSE +#define STM32_ICU_TIM1_IRQ_PRIORITY 7 +#define STM32_ICU_TIM2_IRQ_PRIORITY 7 +#define STM32_ICU_TIM3_IRQ_PRIORITY 7 +#define STM32_ICU_TIM4_IRQ_PRIORITY 7 +#define STM32_ICU_TIM5_IRQ_PRIORITY 7 +#define STM32_ICU_TIM8_IRQ_PRIORITY 7 + +/* + * PWM driver system settings. + */ +#define STM32_PWM_USE_ADVANCED FALSE +#define STM32_PWM_USE_TIM1 FALSE +#define STM32_PWM_USE_TIM2 FALSE +#define STM32_PWM_USE_TIM3 FALSE +#define STM32_PWM_USE_TIM4 FALSE +#define STM32_PWM_USE_TIM5 FALSE +#define STM32_PWM_USE_TIM8 FALSE +#define STM32_PWM_TIM1_IRQ_PRIORITY 7 +#define STM32_PWM_TIM2_IRQ_PRIORITY 7 +#define STM32_PWM_TIM3_IRQ_PRIORITY 7 +#define STM32_PWM_TIM4_IRQ_PRIORITY 7 +#define STM32_PWM_TIM5_IRQ_PRIORITY 7 +#define STM32_PWM_TIM8_IRQ_PRIORITY 7 + +/* + * RTC driver system settings. + */ +#define STM32_RTC_IRQ_PRIORITY 15 + +/* + * SERIAL driver system settings. + */ +#define STM32_SERIAL_USE_USART1 FALSE +#define STM32_SERIAL_USE_USART2 FALSE +#define STM32_SERIAL_USE_USART3 FALSE +#define STM32_SERIAL_USE_UART4 FALSE +#define STM32_SERIAL_USE_UART5 FALSE +#define STM32_SERIAL_USART1_PRIORITY 12 +#define STM32_SERIAL_USART2_PRIORITY 12 +#define STM32_SERIAL_USART3_PRIORITY 12 +#define STM32_SERIAL_UART4_PRIORITY 12 +#define STM32_SERIAL_UART5_PRIORITY 12 + +/* + * SPI driver system settings. + */ +#define STM32_SPI_USE_SPI1 FALSE +#define STM32_SPI_USE_SPI2 FALSE +#define STM32_SPI_USE_SPI3 FALSE +#define STM32_SPI_SPI1_DMA_PRIORITY 1 +#define STM32_SPI_SPI2_DMA_PRIORITY 1 +#define STM32_SPI_SPI3_DMA_PRIORITY 1 +#define STM32_SPI_SPI1_IRQ_PRIORITY 10 +#define STM32_SPI_SPI2_IRQ_PRIORITY 10 +#define STM32_SPI_SPI3_IRQ_PRIORITY 10 +#define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure") + +/* + * ST driver system settings. + */ +#define STM32_ST_IRQ_PRIORITY 8 +#define STM32_ST_USE_TIMER 2 + +/* + * UART driver system settings. + */ +#define STM32_UART_USE_USART1 FALSE +#define STM32_UART_USE_USART2 FALSE +#define STM32_UART_USE_USART3 FALSE +#define STM32_UART_USART1_IRQ_PRIORITY 12 +#define STM32_UART_USART2_IRQ_PRIORITY 12 +#define STM32_UART_USART3_IRQ_PRIORITY 12 +#define STM32_UART_USART1_DMA_PRIORITY 0 +#define STM32_UART_USART2_DMA_PRIORITY 0 +#define STM32_UART_USART3_DMA_PRIORITY 0 +#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure") + +/* + * USB driver system settings. + */ +#define STM32_USB_USE_USB1 TRUE +#define STM32_USB_LOW_POWER_ON_SUSPEND FALSE +#define STM32_USB_USB1_HP_IRQ_PRIORITY 13 +#define STM32_USB_USB1_LP_IRQ_PRIORITY 14 + +#endif /* _MCUCONF_H_ */ diff --git a/keyboards/chibios_test/teensy_lc_onekey/chconf.h b/keyboards/chibios_test/teensy_lc_onekey/chconf.h index cb36996c33..3294ac7eee 100644 --- a/keyboards/chibios_test/teensy_lc_onekey/chconf.h +++ b/keyboards/chibios_test/teensy_lc_onekey/chconf.h @@ -1,524 +1,524 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/** - * @file templates/chconf.h - * @brief Configuration file template. - * @details A copy of this file must be placed in each project directory, it - * contains the application specific kernel settings. - * - * @addtogroup config - * @details Kernel related settings and hooks. - * @{ - */ - -#ifndef CHCONF_H -#define CHCONF_H - -#define _CHIBIOS_RT_CONF_ - -/*===========================================================================*/ -/** - * @name System timers settings - * @{ - */ -/*===========================================================================*/ - -/** - * @brief System time counter resolution. - * @note Allowed values are 16 or 32 bits. - */ -#define CH_CFG_ST_RESOLUTION 32 - -/** - * @brief System tick frequency. - * @details Frequency of the system timer that drives the system ticks. This - * setting also defines the system tick time unit. - */ -#define CH_CFG_ST_FREQUENCY 1000 - -/** - * @brief Time delta constant for the tick-less mode. - * @note If this value is zero then the system uses the classic - * periodic tick. This value represents the minimum number - * of ticks that is safe to specify in a timeout directive. - * The value one is not valid, timeouts are rounded up to - * this value. - */ -#define CH_CFG_ST_TIMEDELTA 0 - -/** @} */ - -/*===========================================================================*/ -/** - * @name Kernel parameters and options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Round robin interval. - * @details This constant is the number of system ticks allowed for the - * threads before preemption occurs. Setting this value to zero - * disables the preemption for threads with equal priority and the - * round robin becomes cooperative. Note that higher priority - * threads can still preempt, the kernel is always preemptive. - * @note Disabling the round robin preemption makes the kernel more compact - * and generally faster. - * @note The round robin preemption is not supported in tickless mode and - * must be set to zero in that case. - */ -#define CH_CFG_TIME_QUANTUM 20 - -/** - * @brief Managed RAM size. - * @details Size of the RAM area to be managed by the OS. If set to zero - * then the whole available RAM is used. The core memory is made - * available to the heap allocator and/or can be used directly through - * the simplified core memory allocator. - * - * @note In order to let the OS manage the whole RAM the linker script must - * provide the @p __heap_base__ and @p __heap_end__ symbols. - * @note Requires @p CH_CFG_USE_MEMCORE. - */ -#define CH_CFG_MEMCORE_SIZE 0 - -/** - * @brief Idle thread automatic spawn suppression. - * @details When this option is activated the function @p chSysInit() - * does not spawn the idle thread. The application @p main() - * function becomes the idle thread and must implement an - * infinite loop. - */ -#define CH_CFG_NO_IDLE_THREAD FALSE - -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - -/** @} */ - -/*===========================================================================*/ -/** - * @name Performance options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief OS optimization. - * @details If enabled then time efficient rather than space efficient code - * is used when two possible implementations exist. - * - * @note This is not related to the compiler optimization options. - * @note The default is @p TRUE. - */ -#define CH_CFG_OPTIMIZE_SPEED TRUE - -/** @} */ - -/*===========================================================================*/ -/** - * @name Subsystem options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Time Measurement APIs. - * @details If enabled then the time measurement APIs are included in - * the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_TM FALSE - -/** - * @brief Threads registry APIs. - * @details If enabled then the registry APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_REGISTRY TRUE - -/** - * @brief Threads synchronization APIs. - * @details If enabled then the @p chThdWait() function is included in - * the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_WAITEXIT TRUE - -/** - * @brief Semaphores APIs. - * @details If enabled then the Semaphores APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_SEMAPHORES TRUE - -/** - * @brief Semaphores queuing mode. - * @details If enabled then the threads are enqueued on semaphores by - * priority rather than in FIFO order. - * - * @note The default is @p FALSE. Enable this if you have special - * requirements. - * @note Requires @p CH_CFG_USE_SEMAPHORES. - */ -#define CH_CFG_USE_SEMAPHORES_PRIORITY FALSE - -/** - * @brief Mutexes APIs. - * @details If enabled then the mutexes APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_MUTEXES TRUE - -/** - * @brief Enables recursive behavior on mutexes. - * @note Recursive mutexes are heavier and have an increased - * memory footprint. - * - * @note The default is @p FALSE. - * @note Requires @p CH_CFG_USE_MUTEXES. - */ -#define CH_CFG_USE_MUTEXES_RECURSIVE FALSE - -/** - * @brief Conditional Variables APIs. - * @details If enabled then the conditional variables APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_MUTEXES. - */ -#define CH_CFG_USE_CONDVARS TRUE - -/** - * @brief Conditional Variables APIs with timeout. - * @details If enabled then the conditional variables APIs with timeout - * specification are included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_CONDVARS. - */ -#define CH_CFG_USE_CONDVARS_TIMEOUT TRUE - -/** - * @brief Events Flags APIs. - * @details If enabled then the event flags APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_EVENTS TRUE - -/** - * @brief Events Flags APIs with timeout. - * @details If enabled then the events APIs with timeout specification - * are included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_EVENTS. - */ -#define CH_CFG_USE_EVENTS_TIMEOUT TRUE - -/** - * @brief Synchronous Messages APIs. - * @details If enabled then the synchronous messages APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_MESSAGES TRUE - -/** - * @brief Synchronous Messages queuing mode. - * @details If enabled then messages are served by priority rather than in - * FIFO order. - * - * @note The default is @p FALSE. Enable this if you have special - * requirements. - * @note Requires @p CH_CFG_USE_MESSAGES. - */ -#define CH_CFG_USE_MESSAGES_PRIORITY FALSE - -/** - * @brief Mailboxes APIs. - * @details If enabled then the asynchronous messages (mailboxes) APIs are - * included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_SEMAPHORES. - */ -#define CH_CFG_USE_MAILBOXES TRUE - -/** - * @brief Core Memory Manager APIs. - * @details If enabled then the core memory manager APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_MEMCORE TRUE - -/** - * @brief Heap Allocator APIs. - * @details If enabled then the memory heap allocator APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or - * @p CH_CFG_USE_SEMAPHORES. - * @note Mutexes are recommended. - */ -#define CH_CFG_USE_HEAP TRUE - -/** - * @brief Memory Pools Allocator APIs. - * @details If enabled then the memory pools allocator APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_MEMPOOLS TRUE - -/** - * @brief Dynamic Threads APIs. - * @details If enabled then the dynamic threads creation APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_WAITEXIT. - * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS. - */ -#define CH_CFG_USE_DYNAMIC TRUE - -/** @} */ - -/*===========================================================================*/ -/** - * @name Debug options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Debug option, kernel statistics. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_STATISTICS FALSE - -/** - * @brief Debug option, system state check. - * @details If enabled the correct call protocol for system APIs is checked - * at runtime. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_SYSTEM_STATE_CHECK TRUE - -/** - * @brief Debug option, parameters checks. - * @details If enabled then the checks on the API functions input - * parameters are activated. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_ENABLE_CHECKS TRUE - -/** - * @brief Debug option, consistency checks. - * @details If enabled then all the assertions in the kernel code are - * activated. This includes consistency checks inside the kernel, - * runtime anomalies and port-defined checks. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_ENABLE_ASSERTS TRUE - -/** - * @brief Debug option, trace buffer. - * @details If enabled then the trace buffer is activated. - * - * @note The default is @p CH_DBG_TRACE_MASK_DISABLED. - */ -#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_DISABLED - -/** - * @brief Trace buffer entries. - * @note The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is - * different from @p CH_DBG_TRACE_MASK_DISABLED. - */ -#define CH_DBG_TRACE_BUFFER_SIZE 128 - -/** - * @brief Debug option, stack checks. - * @details If enabled then a runtime stack check is performed. - * - * @note The default is @p FALSE. - * @note The stack check is performed in a architecture/port dependent way. - * It may not be implemented or some ports. - * @note The default failure mode is to halt the system with the global - * @p panic_msg variable set to @p NULL. - */ -#define CH_DBG_ENABLE_STACK_CHECK TRUE - -/** - * @brief Debug option, stacks initialization. - * @details If enabled then the threads working area is filled with a byte - * value when a thread is created. This can be useful for the - * runtime measurement of the used stack. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_FILL_THREADS TRUE - -/** - * @brief Debug option, threads profiling. - * @details If enabled then a field is added to the @p thread_t structure that - * counts the system ticks occurred while executing the thread. - * - * @note The default is @p FALSE. - * @note This debug option is not currently compatible with the - * tickless mode. - */ -#define CH_DBG_THREADS_PROFILING FALSE - -/** @} */ - -/*===========================================================================*/ -/** - * @name Kernel hooks - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Threads descriptor structure extension. - * @details User fields added to the end of the @p thread_t structure. - */ -#define CH_CFG_THREAD_EXTRA_FIELDS \ - /* Add threads custom fields here.*/ - -/** - * @brief Threads initialization hook. - * @details User initialization code added to the @p chThdInit() API. - * - * @note It is invoked from within @p chThdInit() and implicitly from all - * the threads creation APIs. - */ -#define CH_CFG_THREAD_INIT_HOOK(tp) { \ - /* Add threads initialization code here.*/ \ -} - -/** - * @brief Threads finalization hook. - * @details User finalization code added to the @p chThdExit() API. - */ -#define CH_CFG_THREAD_EXIT_HOOK(tp) { \ - /* Add threads finalization code here.*/ \ -} - -/** - * @brief Context switch hook. - * @details This hook is invoked just before switching between threads. - */ -#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \ - /* Context switch code here.*/ \ -} - -/** - * @brief ISR enter hook. - */ -#define CH_CFG_IRQ_PROLOGUE_HOOK() { \ - /* IRQ prologue code here.*/ \ -} - -/** - * @brief ISR exit hook. - */ -#define CH_CFG_IRQ_EPILOGUE_HOOK() { \ - /* IRQ epilogue code here.*/ \ -} - -/** - * @brief Idle thread enter hook. - * @note This hook is invoked within a critical zone, no OS functions - * should be invoked from here. - * @note This macro can be used to activate a power saving mode. - */ -#define CH_CFG_IDLE_ENTER_HOOK() { \ - /* Idle-enter code here.*/ \ -} - -/** - * @brief Idle thread leave hook. - * @note This hook is invoked within a critical zone, no OS functions - * should be invoked from here. - * @note This macro can be used to deactivate a power saving mode. - */ -#define CH_CFG_IDLE_LEAVE_HOOK() { \ - /* Idle-leave code here.*/ \ -} - -/** - * @brief Idle Loop hook. - * @details This hook is continuously invoked by the idle thread loop. - */ -#define CH_CFG_IDLE_LOOP_HOOK() { \ - /* Idle loop code here.*/ \ -} - -/** - * @brief System tick event hook. - * @details This hook is invoked in the system tick handler immediately - * after processing the virtual timers queue. - */ -#define CH_CFG_SYSTEM_TICK_HOOK() { \ - /* System tick event code here.*/ \ -} - -/** - * @brief System halt hook. - * @details This hook is invoked in case to a system halting error before - * the system is halted. - */ -#define CH_CFG_SYSTEM_HALT_HOOK(reason) { \ - /* System halt code here.*/ \ -} - -/** - * @brief Trace hook. - * @details This hook is invoked each time a new record is written in the - * trace buffer. - */ -#define CH_CFG_TRACE_HOOK(tep) { \ - /* Trace code here.*/ \ -} - -/** @} */ - -/*===========================================================================*/ -/* Port-specific settings (override port settings defaulted in chcore.h). */ -/*===========================================================================*/ - -#endif /* CHCONF_H */ - -/** @} */ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/** + * @file templates/chconf.h + * @brief Configuration file template. + * @details A copy of this file must be placed in each project directory, it + * contains the application specific kernel settings. + * + * @addtogroup config + * @details Kernel related settings and hooks. + * @{ + */ + +#ifndef CHCONF_H +#define CHCONF_H + +#define _CHIBIOS_RT_CONF_ + +/*===========================================================================*/ +/** + * @name System timers settings + * @{ + */ +/*===========================================================================*/ + +/** + * @brief System time counter resolution. + * @note Allowed values are 16 or 32 bits. + */ +#define CH_CFG_ST_RESOLUTION 32 + +/** + * @brief System tick frequency. + * @details Frequency of the system timer that drives the system ticks. This + * setting also defines the system tick time unit. + */ +#define CH_CFG_ST_FREQUENCY 1000 + +/** + * @brief Time delta constant for the tick-less mode. + * @note If this value is zero then the system uses the classic + * periodic tick. This value represents the minimum number + * of ticks that is safe to specify in a timeout directive. + * The value one is not valid, timeouts are rounded up to + * this value. + */ +#define CH_CFG_ST_TIMEDELTA 0 + +/** @} */ + +/*===========================================================================*/ +/** + * @name Kernel parameters and options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Round robin interval. + * @details This constant is the number of system ticks allowed for the + * threads before preemption occurs. Setting this value to zero + * disables the preemption for threads with equal priority and the + * round robin becomes cooperative. Note that higher priority + * threads can still preempt, the kernel is always preemptive. + * @note Disabling the round robin preemption makes the kernel more compact + * and generally faster. + * @note The round robin preemption is not supported in tickless mode and + * must be set to zero in that case. + */ +#define CH_CFG_TIME_QUANTUM 20 + +/** + * @brief Managed RAM size. + * @details Size of the RAM area to be managed by the OS. If set to zero + * then the whole available RAM is used. The core memory is made + * available to the heap allocator and/or can be used directly through + * the simplified core memory allocator. + * + * @note In order to let the OS manage the whole RAM the linker script must + * provide the @p __heap_base__ and @p __heap_end__ symbols. + * @note Requires @p CH_CFG_USE_MEMCORE. + */ +#define CH_CFG_MEMCORE_SIZE 0 + +/** + * @brief Idle thread automatic spawn suppression. + * @details When this option is activated the function @p chSysInit() + * does not spawn the idle thread. The application @p main() + * function becomes the idle thread and must implement an + * infinite loop. + */ +#define CH_CFG_NO_IDLE_THREAD FALSE + +/* Use __WFI in the idle thread for waiting. Does lower the power + * consumption. */ +#define CORTEX_ENABLE_WFI_IDLE TRUE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Performance options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief OS optimization. + * @details If enabled then time efficient rather than space efficient code + * is used when two possible implementations exist. + * + * @note This is not related to the compiler optimization options. + * @note The default is @p TRUE. + */ +#define CH_CFG_OPTIMIZE_SPEED TRUE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Subsystem options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Time Measurement APIs. + * @details If enabled then the time measurement APIs are included in + * the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_TM FALSE + +/** + * @brief Threads registry APIs. + * @details If enabled then the registry APIs are included in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_REGISTRY TRUE + +/** + * @brief Threads synchronization APIs. + * @details If enabled then the @p chThdWait() function is included in + * the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_WAITEXIT TRUE + +/** + * @brief Semaphores APIs. + * @details If enabled then the Semaphores APIs are included in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_SEMAPHORES TRUE + +/** + * @brief Semaphores queuing mode. + * @details If enabled then the threads are enqueued on semaphores by + * priority rather than in FIFO order. + * + * @note The default is @p FALSE. Enable this if you have special + * requirements. + * @note Requires @p CH_CFG_USE_SEMAPHORES. + */ +#define CH_CFG_USE_SEMAPHORES_PRIORITY FALSE + +/** + * @brief Mutexes APIs. + * @details If enabled then the mutexes APIs are included in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_MUTEXES TRUE + +/** + * @brief Enables recursive behavior on mutexes. + * @note Recursive mutexes are heavier and have an increased + * memory footprint. + * + * @note The default is @p FALSE. + * @note Requires @p CH_CFG_USE_MUTEXES. + */ +#define CH_CFG_USE_MUTEXES_RECURSIVE FALSE + +/** + * @brief Conditional Variables APIs. + * @details If enabled then the conditional variables APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_MUTEXES. + */ +#define CH_CFG_USE_CONDVARS TRUE + +/** + * @brief Conditional Variables APIs with timeout. + * @details If enabled then the conditional variables APIs with timeout + * specification are included in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_CONDVARS. + */ +#define CH_CFG_USE_CONDVARS_TIMEOUT TRUE + +/** + * @brief Events Flags APIs. + * @details If enabled then the event flags APIs are included in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_EVENTS TRUE + +/** + * @brief Events Flags APIs with timeout. + * @details If enabled then the events APIs with timeout specification + * are included in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_EVENTS. + */ +#define CH_CFG_USE_EVENTS_TIMEOUT TRUE + +/** + * @brief Synchronous Messages APIs. + * @details If enabled then the synchronous messages APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_MESSAGES TRUE + +/** + * @brief Synchronous Messages queuing mode. + * @details If enabled then messages are served by priority rather than in + * FIFO order. + * + * @note The default is @p FALSE. Enable this if you have special + * requirements. + * @note Requires @p CH_CFG_USE_MESSAGES. + */ +#define CH_CFG_USE_MESSAGES_PRIORITY FALSE + +/** + * @brief Mailboxes APIs. + * @details If enabled then the asynchronous messages (mailboxes) APIs are + * included in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_SEMAPHORES. + */ +#define CH_CFG_USE_MAILBOXES TRUE + +/** + * @brief Core Memory Manager APIs. + * @details If enabled then the core memory manager APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_MEMCORE TRUE + +/** + * @brief Heap Allocator APIs. + * @details If enabled then the memory heap allocator APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or + * @p CH_CFG_USE_SEMAPHORES. + * @note Mutexes are recommended. + */ +#define CH_CFG_USE_HEAP TRUE + +/** + * @brief Memory Pools Allocator APIs. + * @details If enabled then the memory pools allocator APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_MEMPOOLS TRUE + +/** + * @brief Dynamic Threads APIs. + * @details If enabled then the dynamic threads creation APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_WAITEXIT. + * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS. + */ +#define CH_CFG_USE_DYNAMIC TRUE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Debug options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Debug option, kernel statistics. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_STATISTICS FALSE + +/** + * @brief Debug option, system state check. + * @details If enabled the correct call protocol for system APIs is checked + * at runtime. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_SYSTEM_STATE_CHECK TRUE + +/** + * @brief Debug option, parameters checks. + * @details If enabled then the checks on the API functions input + * parameters are activated. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_ENABLE_CHECKS TRUE + +/** + * @brief Debug option, consistency checks. + * @details If enabled then all the assertions in the kernel code are + * activated. This includes consistency checks inside the kernel, + * runtime anomalies and port-defined checks. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_ENABLE_ASSERTS TRUE + +/** + * @brief Debug option, trace buffer. + * @details If enabled then the trace buffer is activated. + * + * @note The default is @p CH_DBG_TRACE_MASK_DISABLED. + */ +#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_DISABLED + +/** + * @brief Trace buffer entries. + * @note The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is + * different from @p CH_DBG_TRACE_MASK_DISABLED. + */ +#define CH_DBG_TRACE_BUFFER_SIZE 128 + +/** + * @brief Debug option, stack checks. + * @details If enabled then a runtime stack check is performed. + * + * @note The default is @p FALSE. + * @note The stack check is performed in a architecture/port dependent way. + * It may not be implemented or some ports. + * @note The default failure mode is to halt the system with the global + * @p panic_msg variable set to @p NULL. + */ +#define CH_DBG_ENABLE_STACK_CHECK TRUE + +/** + * @brief Debug option, stacks initialization. + * @details If enabled then the threads working area is filled with a byte + * value when a thread is created. This can be useful for the + * runtime measurement of the used stack. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_FILL_THREADS TRUE + +/** + * @brief Debug option, threads profiling. + * @details If enabled then a field is added to the @p thread_t structure that + * counts the system ticks occurred while executing the thread. + * + * @note The default is @p FALSE. + * @note This debug option is not currently compatible with the + * tickless mode. + */ +#define CH_DBG_THREADS_PROFILING FALSE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Kernel hooks + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Threads descriptor structure extension. + * @details User fields added to the end of the @p thread_t structure. + */ +#define CH_CFG_THREAD_EXTRA_FIELDS \ + /* Add threads custom fields here.*/ + +/** + * @brief Threads initialization hook. + * @details User initialization code added to the @p chThdInit() API. + * + * @note It is invoked from within @p chThdInit() and implicitly from all + * the threads creation APIs. + */ +#define CH_CFG_THREAD_INIT_HOOK(tp) { \ + /* Add threads initialization code here.*/ \ +} + +/** + * @brief Threads finalization hook. + * @details User finalization code added to the @p chThdExit() API. + */ +#define CH_CFG_THREAD_EXIT_HOOK(tp) { \ + /* Add threads finalization code here.*/ \ +} + +/** + * @brief Context switch hook. + * @details This hook is invoked just before switching between threads. + */ +#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \ + /* Context switch code here.*/ \ +} + +/** + * @brief ISR enter hook. + */ +#define CH_CFG_IRQ_PROLOGUE_HOOK() { \ + /* IRQ prologue code here.*/ \ +} + +/** + * @brief ISR exit hook. + */ +#define CH_CFG_IRQ_EPILOGUE_HOOK() { \ + /* IRQ epilogue code here.*/ \ +} + +/** + * @brief Idle thread enter hook. + * @note This hook is invoked within a critical zone, no OS functions + * should be invoked from here. + * @note This macro can be used to activate a power saving mode. + */ +#define CH_CFG_IDLE_ENTER_HOOK() { \ + /* Idle-enter code here.*/ \ +} + +/** + * @brief Idle thread leave hook. + * @note This hook is invoked within a critical zone, no OS functions + * should be invoked from here. + * @note This macro can be used to deactivate a power saving mode. + */ +#define CH_CFG_IDLE_LEAVE_HOOK() { \ + /* Idle-leave code here.*/ \ +} + +/** + * @brief Idle Loop hook. + * @details This hook is continuously invoked by the idle thread loop. + */ +#define CH_CFG_IDLE_LOOP_HOOK() { \ + /* Idle loop code here.*/ \ +} + +/** + * @brief System tick event hook. + * @details This hook is invoked in the system tick handler immediately + * after processing the virtual timers queue. + */ +#define CH_CFG_SYSTEM_TICK_HOOK() { \ + /* System tick event code here.*/ \ +} + +/** + * @brief System halt hook. + * @details This hook is invoked in case to a system halting error before + * the system is halted. + */ +#define CH_CFG_SYSTEM_HALT_HOOK(reason) { \ + /* System halt code here.*/ \ +} + +/** + * @brief Trace hook. + * @details This hook is invoked each time a new record is written in the + * trace buffer. + */ +#define CH_CFG_TRACE_HOOK(tep) { \ + /* Trace code here.*/ \ +} + +/** @} */ + +/*===========================================================================*/ +/* Port-specific settings (override port settings defaulted in chcore.h). */ +/*===========================================================================*/ + +#endif /* CHCONF_H */ + +/** @} */ diff --git a/keyboards/chibios_test/teensy_lc_onekey/halconf.h b/keyboards/chibios_test/teensy_lc_onekey/halconf.h index b1d2cd5502..0436408b09 100644 --- a/keyboards/chibios_test/teensy_lc_onekey/halconf.h +++ b/keyboards/chibios_test/teensy_lc_onekey/halconf.h @@ -1,187 +1,187 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/** - * @file templates/halconf.h - * @brief HAL configuration header. - * @details HAL configuration file, this file allows to enable or disable the - * various device drivers from your application. You may also use - * this file in order to override the device drivers default settings. - * - * @addtogroup HAL_CONF - * @{ - */ - -#ifndef _HALCONF_H_ -#define _HALCONF_H_ - -#include "mcuconf.h" - -/** - * @brief Enables the PAL subsystem. - */ -#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__) -#define HAL_USE_PAL TRUE -#endif - -/** - * @brief Enables the ADC subsystem. - */ -#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__) -#define HAL_USE_ADC FALSE -#endif - -/** - * @brief Enables the CAN subsystem. - */ -#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__) -#define HAL_USE_CAN FALSE -#endif - -/** - * @brief Enables the DAC subsystem. - */ -#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__) -#define HAL_USE_DAC FALSE -#endif - -/** - * @brief Enables the EXT subsystem. - */ -#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__) -#define HAL_USE_EXT FALSE -#endif - -/** - * @brief Enables the GPT subsystem. - */ -#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) -#define HAL_USE_GPT FALSE -#endif - -/** - * @brief Enables the I2C subsystem. - */ -#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__) -#define HAL_USE_I2C FALSE -#endif - -/** - * @brief Enables the I2S subsystem. - */ -#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__) -#define HAL_USE_I2S FALSE -#endif - -/** - * @brief Enables the ICU subsystem. - */ -#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__) -#define HAL_USE_ICU FALSE -#endif - -/** - * @brief Enables the MAC subsystem. - */ -#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__) -#define HAL_USE_MAC FALSE -#endif - -/** - * @brief Enables the MMC_SPI subsystem. - */ -#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__) -#define HAL_USE_MMC_SPI FALSE -#endif - -/** - * @brief Enables the PWM subsystem. - */ -#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) -#define HAL_USE_PWM FALSE -#endif - -/** - * @brief Enables the RTC subsystem. - */ -#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__) -#define HAL_USE_RTC FALSE -#endif - -/** - * @brief Enables the SDC subsystem. - */ -#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__) -#define HAL_USE_SDC FALSE -#endif - -/** - * @brief Enables the SERIAL subsystem. - */ -#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL FALSE -#endif - -/** - * @brief Enables the SERIAL over USB subsystem. - */ -#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL_USB FALSE -#endif - -/** - * @brief Enables the SPI subsystem. - */ -#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__) -#define HAL_USE_SPI FALSE -#endif - -/** - * @brief Enables the UART subsystem. - */ -#if !defined(HAL_USE_UART) || defined(__DOXYGEN__) -#define HAL_USE_UART FALSE -#endif - -/** - * @brief Enables the USB subsystem. - */ -#if !defined(HAL_USE_USB) || defined(__DOXYGEN__) -#define HAL_USE_USB TRUE -#endif - -/** - * @brief Enables the WDG subsystem. - */ -#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__) -#define HAL_USE_WDG FALSE -#endif - -/*===========================================================================*/ -/* USB driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__) -#define USB_USE_WAIT TRUE -#endif - -#endif /* _HALCONF_H_ */ - -/** @} */ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/** + * @file templates/halconf.h + * @brief HAL configuration header. + * @details HAL configuration file, this file allows to enable or disable the + * various device drivers from your application. You may also use + * this file in order to override the device drivers default settings. + * + * @addtogroup HAL_CONF + * @{ + */ + +#ifndef _HALCONF_H_ +#define _HALCONF_H_ + +#include "mcuconf.h" + +/** + * @brief Enables the PAL subsystem. + */ +#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__) +#define HAL_USE_PAL TRUE +#endif + +/** + * @brief Enables the ADC subsystem. + */ +#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__) +#define HAL_USE_ADC FALSE +#endif + +/** + * @brief Enables the CAN subsystem. + */ +#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__) +#define HAL_USE_CAN FALSE +#endif + +/** + * @brief Enables the DAC subsystem. + */ +#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__) +#define HAL_USE_DAC FALSE +#endif + +/** + * @brief Enables the EXT subsystem. + */ +#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__) +#define HAL_USE_EXT FALSE +#endif + +/** + * @brief Enables the GPT subsystem. + */ +#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) +#define HAL_USE_GPT FALSE +#endif + +/** + * @brief Enables the I2C subsystem. + */ +#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__) +#define HAL_USE_I2C FALSE +#endif + +/** + * @brief Enables the I2S subsystem. + */ +#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__) +#define HAL_USE_I2S FALSE +#endif + +/** + * @brief Enables the ICU subsystem. + */ +#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__) +#define HAL_USE_ICU FALSE +#endif + +/** + * @brief Enables the MAC subsystem. + */ +#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__) +#define HAL_USE_MAC FALSE +#endif + +/** + * @brief Enables the MMC_SPI subsystem. + */ +#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__) +#define HAL_USE_MMC_SPI FALSE +#endif + +/** + * @brief Enables the PWM subsystem. + */ +#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) +#define HAL_USE_PWM FALSE +#endif + +/** + * @brief Enables the RTC subsystem. + */ +#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__) +#define HAL_USE_RTC FALSE +#endif + +/** + * @brief Enables the SDC subsystem. + */ +#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__) +#define HAL_USE_SDC FALSE +#endif + +/** + * @brief Enables the SERIAL subsystem. + */ +#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__) +#define HAL_USE_SERIAL FALSE +#endif + +/** + * @brief Enables the SERIAL over USB subsystem. + */ +#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) +#define HAL_USE_SERIAL_USB FALSE +#endif + +/** + * @brief Enables the SPI subsystem. + */ +#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__) +#define HAL_USE_SPI FALSE +#endif + +/** + * @brief Enables the UART subsystem. + */ +#if !defined(HAL_USE_UART) || defined(__DOXYGEN__) +#define HAL_USE_UART FALSE +#endif + +/** + * @brief Enables the USB subsystem. + */ +#if !defined(HAL_USE_USB) || defined(__DOXYGEN__) +#define HAL_USE_USB TRUE +#endif + +/** + * @brief Enables the WDG subsystem. + */ +#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__) +#define HAL_USE_WDG FALSE +#endif + +/*===========================================================================*/ +/* USB driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables synchronous APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__) +#define USB_USE_WAIT TRUE +#endif + +#endif /* _HALCONF_H_ */ + +/** @} */ diff --git a/keyboards/chibios_test/teensy_lc_onekey/mcuconf.h b/keyboards/chibios_test/teensy_lc_onekey/mcuconf.h index c636590197..2764e88989 100644 --- a/keyboards/chibios_test/teensy_lc_onekey/mcuconf.h +++ b/keyboards/chibios_test/teensy_lc_onekey/mcuconf.h @@ -1,55 +1,55 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#ifndef _MCUCONF_H_ -#define _MCUCONF_H_ - -#define KL2x_MCUCONF - -/* - * HAL driver system settings. - */ -#if 1 -/* PEE mode - 48MHz system clock driven by (16 MHz) external crystal. */ -#define KINETIS_MCG_MODE KINETIS_MCG_MODE_PEE -#define KINETIS_PLLCLK_FREQUENCY 96000000UL -#define KINETIS_SYSCLK_FREQUENCY 48000000UL -#endif - -#if 0 -/* crystal-less FEI mode - 48 MHz with internal 32.768 kHz crystal */ -#define KINETIS_MCG_MODE KINETIS_MCG_MODE_FEI -#define KINETIS_MCG_FLL_DMX32 1 /* Fine-tune for 32.768 kHz */ -#define KINETIS_MCG_FLL_DRS 1 /* 1464x FLL factor */ -#define KINETIS_SYSCLK_FREQUENCY 47972352UL /* 32.768 kHz * 1464 (~48 MHz) */ -#define KINETIS_CLKDIV1_OUTDIV1 1 /* do not divide system clock */ -#endif - -/* - * SERIAL driver system settings. - */ -#define KINETIS_SERIAL_USE_UART0 TRUE - -/* - * USB driver settings - */ -#define KINETIS_USB_USE_USB0 TRUE -/* Need to redefine this, since the default is for K20x */ -/* This is for Teensy LC; you should comment it out (or change to 5) - * for Teensy 3.x */ -#define KINETIS_USB_USB0_IRQ_PRIORITY 2 - -#endif /* _MCUCONF_H_ */ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#ifndef _MCUCONF_H_ +#define _MCUCONF_H_ + +#define KL2x_MCUCONF + +/* + * HAL driver system settings. + */ +#if 1 +/* PEE mode - 48MHz system clock driven by (16 MHz) external crystal. */ +#define KINETIS_MCG_MODE KINETIS_MCG_MODE_PEE +#define KINETIS_PLLCLK_FREQUENCY 96000000UL +#define KINETIS_SYSCLK_FREQUENCY 48000000UL +#endif + +#if 0 +/* crystal-less FEI mode - 48 MHz with internal 32.768 kHz crystal */ +#define KINETIS_MCG_MODE KINETIS_MCG_MODE_FEI +#define KINETIS_MCG_FLL_DMX32 1 /* Fine-tune for 32.768 kHz */ +#define KINETIS_MCG_FLL_DRS 1 /* 1464x FLL factor */ +#define KINETIS_SYSCLK_FREQUENCY 47972352UL /* 32.768 kHz * 1464 (~48 MHz) */ +#define KINETIS_CLKDIV1_OUTDIV1 1 /* do not divide system clock */ +#endif + +/* + * SERIAL driver system settings. + */ +#define KINETIS_SERIAL_USE_UART0 TRUE + +/* + * USB driver settings + */ +#define KINETIS_USB_USE_USB0 TRUE +/* Need to redefine this, since the default is for K20x */ +/* This is for Teensy LC; you should comment it out (or change to 5) + * for Teensy 3.x */ +#define KINETIS_USB_USB0_IRQ_PRIORITY 2 + +#endif /* _MCUCONF_H_ */ diff --git a/keyboards/gh60/Makefile b/keyboards/gh60/Makefile index 39a9cc0ae1..075b77256f 100644 --- a/keyboards/gh60/Makefile +++ b/keyboards/gh60/Makefile @@ -1,74 +1,74 @@ - - -# 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 - include ../../Makefile -endif - + + +# 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 + include ../../Makefile +endif + diff --git a/keyboards/gh60/config.h b/keyboards/gh60/config.h index 4813c4e786..97753bc069 100644 --- a/keyboards/gh60/config.h +++ b/keyboards/gh60/config.h @@ -1,161 +1,161 @@ -/* -Copyright 2012 Jun Wako - -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 . -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER geekhack -#define PRODUCT GH60 -#define DESCRIPTION t.m.k. keyboard firmware for GH60 - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -// Rev A -// #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 } -// Rev B/C - #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } -#define UNUSED_PINS - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCING_DELAY 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -#define BACKLIGHT_LEVELS 3 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Magic Key Options - * - * Magic keys are hotkey commands that allow control over firmware functions of - * the keyboard. They are best used in combination with the HID Listen program, - * found here: https://www.pjrc.com/teensy/hid_listen.html - * - * The options below allow the magic key functionality to be changed. This is - * useful if your keyboard/keypad is missing keys and you want magic key support. - * - */ - -/* key combination for magic key command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* control how magic key switches layers */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false - -/* override magic key keymap */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM -//#define MAGIC_KEY_HELP1 H -//#define MAGIC_KEY_HELP2 SLASH -//#define MAGIC_KEY_DEBUG D -//#define MAGIC_KEY_DEBUG_MATRIX X -//#define MAGIC_KEY_DEBUG_KBD K -//#define MAGIC_KEY_DEBUG_MOUSE M -//#define MAGIC_KEY_VERSION V -//#define MAGIC_KEY_STATUS S -//#define MAGIC_KEY_CONSOLE C -//#define MAGIC_KEY_LAYER0_ALT1 ESC -//#define MAGIC_KEY_LAYER0_ALT2 GRAVE -//#define MAGIC_KEY_LAYER0 0 -//#define MAGIC_KEY_LAYER1 1 -//#define MAGIC_KEY_LAYER2 2 -//#define MAGIC_KEY_LAYER3 3 -//#define MAGIC_KEY_LAYER4 4 -//#define MAGIC_KEY_LAYER5 5 -//#define MAGIC_KEY_LAYER6 6 -//#define MAGIC_KEY_LAYER7 7 -//#define MAGIC_KEY_LAYER8 8 -//#define MAGIC_KEY_LAYER9 9 -//#define MAGIC_KEY_BOOTLOADER PAUSE -//#define MAGIC_KEY_LOCK CAPS -//#define MAGIC_KEY_EEPROM E -//#define MAGIC_KEY_NKRO N -//#define MAGIC_KEY_SLEEP_LED Z - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -#endif +/* +Copyright 2012 Jun Wako + +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 . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER geekhack +#define PRODUCT GH60 +#define DESCRIPTION t.m.k. keyboard firmware for GH60 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ + #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } +// Rev A +// #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 } +// Rev B/C + #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +#define BACKLIGHT_LEVELS 3 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +#endif diff --git a/keyboards/gh60/gh60.c b/keyboards/gh60/gh60.c index 255d87de99..f5a158e12f 100644 --- a/keyboards/gh60/gh60.c +++ b/keyboards/gh60/gh60.c @@ -1,25 +1,25 @@ -#include "gh60.h" - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - - if (usb_led & (1< - -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 . -*/ - -#ifndef CONFIG_H -#define CONFIG_H - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER geekhack -#define PRODUCT GH60 -#define DESCRIPTION t.m.k. keyboard firmware for GH60 - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -// Rev A -// #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 } -// Rev B/C - #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } -#define UNUSED_PINS - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCING_DELAY 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -#define BACKLIGHT_LEVELS 3 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Magic Key Options - * - * Magic keys are hotkey commands that allow control over firmware functions of - * the keyboard. They are best used in combination with the HID Listen program, - * found here: https://www.pjrc.com/teensy/hid_listen.html - * - * The options below allow the magic key functionality to be changed. This is - * useful if your keyboard/keypad is missing keys and you want magic key support. - * - */ - -/* key combination for magic key command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* control how magic key switches layers */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false - -/* override magic key keymap */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM -//#define MAGIC_KEY_HELP1 H -//#define MAGIC_KEY_HELP2 SLASH -//#define MAGIC_KEY_DEBUG D -//#define MAGIC_KEY_DEBUG_MATRIX X -//#define MAGIC_KEY_DEBUG_KBD K -//#define MAGIC_KEY_DEBUG_MOUSE M -//#define MAGIC_KEY_VERSION V -//#define MAGIC_KEY_STATUS S -//#define MAGIC_KEY_CONSOLE C -//#define MAGIC_KEY_LAYER0_ALT1 ESC -//#define MAGIC_KEY_LAYER0_ALT2 GRAVE -//#define MAGIC_KEY_LAYER0 0 -//#define MAGIC_KEY_LAYER1 1 -//#define MAGIC_KEY_LAYER2 2 -//#define MAGIC_KEY_LAYER3 3 -//#define MAGIC_KEY_LAYER4 4 -//#define MAGIC_KEY_LAYER5 5 -//#define MAGIC_KEY_LAYER6 6 -//#define MAGIC_KEY_LAYER7 7 -//#define MAGIC_KEY_LAYER8 8 -//#define MAGIC_KEY_LAYER9 9 -//#define MAGIC_KEY_BOOTLOADER PAUSE -//#define MAGIC_KEY_LOCK CAPS -//#define MAGIC_KEY_EEPROM E -//#define MAGIC_KEY_NKRO N -//#define MAGIC_KEY_SLEEP_LED Z - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - -/* - * RGB Underglow - * These settings are for the F4 by default: - * - * - * #define ws2812_PORTREG PORTF - * #define ws2812_DDRREG DDRF - * #define ws2812_pin PF4 - * #define RGBLED_NUM 14 // Number of LEDs - * #define RGBLIGHT_HUE_STEP 10 - * #define RGBLIGHT_SAT_STEP 17 - * #define RGBLIGHT_VAL_STEP 17 - * - * The firmware supports 5 different light effects, and the color (hue, saturation, brightness) can be customized in most effects. - * To control the underglow, you need to modify your keymap file to assign those functions to some keys/key combinations. - * For details, please check this keymap. keyboard/planck/keymaps/yang/keymap.c -*/ - -/* Deprecated code below -#define ws2812_PORTREG PORTF -#define ws2812_DDRREG DDRF -#define ws2812_pin PF4 -*/ -#define RGB_DI_PIN F4 -#define RGBLIGHT_TIMER -#define RGBLED_NUM 8 // Number of LEDs -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif +/* +Copyright 2012 Jun Wako + +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 . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER geekhack +#define PRODUCT GH60 +#define DESCRIPTION t.m.k. keyboard firmware for GH60 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ + #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } +// Rev A +// #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B5, B4, D7, D6, B3 } +// Rev B/C + #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* number of backlight levels */ +#define BACKLIGHT_LEVELS 3 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Magic Key Options + * + * Magic keys are hotkey commands that allow control over firmware functions of + * the keyboard. They are best used in combination with the HID Listen program, + * found here: https://www.pjrc.com/teensy/hid_listen.html + * + * The options below allow the magic key functionality to be changed. This is + * useful if your keyboard/keypad is missing keys and you want magic key support. + * + */ + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* control how magic key switches layers */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false + +/* override magic key keymap */ +//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS +//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM +//#define MAGIC_KEY_HELP1 H +//#define MAGIC_KEY_HELP2 SLASH +//#define MAGIC_KEY_DEBUG D +//#define MAGIC_KEY_DEBUG_MATRIX X +//#define MAGIC_KEY_DEBUG_KBD K +//#define MAGIC_KEY_DEBUG_MOUSE M +//#define MAGIC_KEY_VERSION V +//#define MAGIC_KEY_STATUS S +//#define MAGIC_KEY_CONSOLE C +//#define MAGIC_KEY_LAYER0_ALT1 ESC +//#define MAGIC_KEY_LAYER0_ALT2 GRAVE +//#define MAGIC_KEY_LAYER0 0 +//#define MAGIC_KEY_LAYER1 1 +//#define MAGIC_KEY_LAYER2 2 +//#define MAGIC_KEY_LAYER3 3 +//#define MAGIC_KEY_LAYER4 4 +//#define MAGIC_KEY_LAYER5 5 +//#define MAGIC_KEY_LAYER6 6 +//#define MAGIC_KEY_LAYER7 7 +//#define MAGIC_KEY_LAYER8 8 +//#define MAGIC_KEY_LAYER9 9 +//#define MAGIC_KEY_BOOTLOADER PAUSE +//#define MAGIC_KEY_LOCK CAPS +//#define MAGIC_KEY_EEPROM E +//#define MAGIC_KEY_NKRO N +//#define MAGIC_KEY_SLEEP_LED Z + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +/* + * RGB Underglow + * These settings are for the F4 by default: + * + * + * #define ws2812_PORTREG PORTF + * #define ws2812_DDRREG DDRF + * #define ws2812_pin PF4 + * #define RGBLED_NUM 14 // Number of LEDs + * #define RGBLIGHT_HUE_STEP 10 + * #define RGBLIGHT_SAT_STEP 17 + * #define RGBLIGHT_VAL_STEP 17 + * + * The firmware supports 5 different light effects, and the color (hue, saturation, brightness) can be customized in most effects. + * To control the underglow, you need to modify your keymap file to assign those functions to some keys/key combinations. + * For details, please check this keymap. keyboard/planck/keymaps/yang/keymap.c +*/ + +/* Deprecated code below +#define ws2812_PORTREG PORTF +#define ws2812_DDRREG DDRF +#define ws2812_pin PF4 +*/ +#define RGB_DI_PIN F4 +#define RGBLIGHT_TIMER +#define RGBLED_NUM 8 // Number of LEDs +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#endif diff --git a/keyboards/gh60/pinout.txt b/keyboards/gh60/pinout.txt index 3787f938e7..e9bf1983a5 100644 --- a/keyboards/gh60/pinout.txt +++ b/keyboards/gh60/pinout.txt @@ -1,18 +1,18 @@ - /* 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 + /* 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 \ No newline at end of file diff --git a/keyboards/gh60/readme.md b/keyboards/gh60/readme.md index 92302d507c..ad042483d8 100644 --- a/keyboards/gh60/readme.md +++ b/keyboards/gh60/readme.md @@ -1,60 +1,60 @@ -## 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`. - -### 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: -``` -$ make KEYMAP=[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`. + +### 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: +``` +$ make KEYMAP=[default|jack|] +``` +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboards/infinity_chibios/chconf.h b/keyboards/infinity_chibios/chconf.h index b886c383bb..43c845739a 100644 --- a/keyboards/infinity_chibios/chconf.h +++ b/keyboards/infinity_chibios/chconf.h @@ -1,524 +1,524 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/** - * @file templates/chconf.h - * @brief Configuration file template. - * @details A copy of this file must be placed in each project directory, it - * contains the application specific kernel settings. - * - * @addtogroup config - * @details Kernel related settings and hooks. - * @{ - */ - -#ifndef CHCONF_H -#define CHCONF_H - -#define _CHIBIOS_RT_CONF_ - -/*===========================================================================*/ -/** - * @name System timers settings - * @{ - */ -/*===========================================================================*/ - -/** - * @brief System time counter resolution. - * @note Allowed values are 16 or 32 bits. - */ -#define CH_CFG_ST_RESOLUTION 32 - -/** - * @brief System tick frequency. - * @details Frequency of the system timer that drives the system ticks. This - * setting also defines the system tick time unit. - */ -#define CH_CFG_ST_FREQUENCY 1000 - -/** - * @brief Time delta constant for the tick-less mode. - * @note If this value is zero then the system uses the classic - * periodic tick. This value represents the minimum number - * of ticks that is safe to specify in a timeout directive. - * The value one is not valid, timeouts are rounded up to - * this value. - */ -#define CH_CFG_ST_TIMEDELTA 0 - -/** @} */ - -/*===========================================================================*/ -/** - * @name Kernel parameters and options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Round robin interval. - * @details This constant is the number of system ticks allowed for the - * threads before preemption occurs. Setting this value to zero - * disables the preemption for threads with equal priority and the - * round robin becomes cooperative. Note that higher priority - * threads can still preempt, the kernel is always preemptive. - * @note Disabling the round robin preemption makes the kernel more compact - * and generally faster. - * @note The round robin preemption is not supported in tickless mode and - * must be set to zero in that case. - */ -#define CH_CFG_TIME_QUANTUM 20 - -/** - * @brief Managed RAM size. - * @details Size of the RAM area to be managed by the OS. If set to zero - * then the whole available RAM is used. The core memory is made - * available to the heap allocator and/or can be used directly through - * the simplified core memory allocator. - * - * @note In order to let the OS manage the whole RAM the linker script must - * provide the @p __heap_base__ and @p __heap_end__ symbols. - * @note Requires @p CH_CFG_USE_MEMCORE. - */ -#define CH_CFG_MEMCORE_SIZE 0 - -/** - * @brief Idle thread automatic spawn suppression. - * @details When this option is activated the function @p chSysInit() - * does not spawn the idle thread. The application @p main() - * function becomes the idle thread and must implement an - * infinite loop. - */ -#define CH_CFG_NO_IDLE_THREAD FALSE - -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - -/** @} */ - -/*===========================================================================*/ -/** - * @name Performance options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief OS optimization. - * @details If enabled then time efficient rather than space efficient code - * is used when two possible implementations exist. - * - * @note This is not related to the compiler optimization options. - * @note The default is @p TRUE. - */ -#define CH_CFG_OPTIMIZE_SPEED TRUE - -/** @} */ - -/*===========================================================================*/ -/** - * @name Subsystem options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Time Measurement APIs. - * @details If enabled then the time measurement APIs are included in - * the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_TM FALSE - -/** - * @brief Threads registry APIs. - * @details If enabled then the registry APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_REGISTRY TRUE - -/** - * @brief Threads synchronization APIs. - * @details If enabled then the @p chThdWait() function is included in - * the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_WAITEXIT TRUE - -/** - * @brief Semaphores APIs. - * @details If enabled then the Semaphores APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_SEMAPHORES TRUE - -/** - * @brief Semaphores queuing mode. - * @details If enabled then the threads are enqueued on semaphores by - * priority rather than in FIFO order. - * - * @note The default is @p FALSE. Enable this if you have special - * requirements. - * @note Requires @p CH_CFG_USE_SEMAPHORES. - */ -#define CH_CFG_USE_SEMAPHORES_PRIORITY FALSE - -/** - * @brief Mutexes APIs. - * @details If enabled then the mutexes APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_MUTEXES TRUE - -/** - * @brief Enables recursive behavior on mutexes. - * @note Recursive mutexes are heavier and have an increased - * memory footprint. - * - * @note The default is @p FALSE. - * @note Requires @p CH_CFG_USE_MUTEXES. - */ -#define CH_CFG_USE_MUTEXES_RECURSIVE FALSE - -/** - * @brief Conditional Variables APIs. - * @details If enabled then the conditional variables APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_MUTEXES. - */ -#define CH_CFG_USE_CONDVARS TRUE - -/** - * @brief Conditional Variables APIs with timeout. - * @details If enabled then the conditional variables APIs with timeout - * specification are included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_CONDVARS. - */ -#define CH_CFG_USE_CONDVARS_TIMEOUT TRUE - -/** - * @brief Events Flags APIs. - * @details If enabled then the event flags APIs are included in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_EVENTS TRUE - -/** - * @brief Events Flags APIs with timeout. - * @details If enabled then the events APIs with timeout specification - * are included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_EVENTS. - */ -#define CH_CFG_USE_EVENTS_TIMEOUT TRUE - -/** - * @brief Synchronous Messages APIs. - * @details If enabled then the synchronous messages APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_MESSAGES TRUE - -/** - * @brief Synchronous Messages queuing mode. - * @details If enabled then messages are served by priority rather than in - * FIFO order. - * - * @note The default is @p FALSE. Enable this if you have special - * requirements. - * @note Requires @p CH_CFG_USE_MESSAGES. - */ -#define CH_CFG_USE_MESSAGES_PRIORITY FALSE - -/** - * @brief Mailboxes APIs. - * @details If enabled then the asynchronous messages (mailboxes) APIs are - * included in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_SEMAPHORES. - */ -#define CH_CFG_USE_MAILBOXES TRUE - -/** - * @brief Core Memory Manager APIs. - * @details If enabled then the core memory manager APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_MEMCORE TRUE - -/** - * @brief Heap Allocator APIs. - * @details If enabled then the memory heap allocator APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or - * @p CH_CFG_USE_SEMAPHORES. - * @note Mutexes are recommended. - */ -#define CH_CFG_USE_HEAP TRUE - -/** - * @brief Memory Pools Allocator APIs. - * @details If enabled then the memory pools allocator APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - */ -#define CH_CFG_USE_MEMPOOLS TRUE - -/** - * @brief Dynamic Threads APIs. - * @details If enabled then the dynamic threads creation APIs are included - * in the kernel. - * - * @note The default is @p TRUE. - * @note Requires @p CH_CFG_USE_WAITEXIT. - * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS. - */ -#define CH_CFG_USE_DYNAMIC TRUE - -/** @} */ - -/*===========================================================================*/ -/** - * @name Debug options - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Debug option, kernel statistics. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_STATISTICS FALSE - -/** - * @brief Debug option, system state check. - * @details If enabled the correct call protocol for system APIs is checked - * at runtime. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_SYSTEM_STATE_CHECK FALSE - -/** - * @brief Debug option, parameters checks. - * @details If enabled then the checks on the API functions input - * parameters are activated. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_ENABLE_CHECKS FALSE - -/** - * @brief Debug option, consistency checks. - * @details If enabled then all the assertions in the kernel code are - * activated. This includes consistency checks inside the kernel, - * runtime anomalies and port-defined checks. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_ENABLE_ASSERTS FALSE - -/** - * @brief Debug option, trace buffer. - * @details If enabled then the trace buffer is activated. - * - * @note The default is @p CH_DBG_TRACE_MASK_DISABLED. - */ -#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_DISABLED - -/** - * @brief Trace buffer entries. - * @note The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is - * different from @p CH_DBG_TRACE_MASK_DISABLED. - */ -#define CH_DBG_TRACE_BUFFER_SIZE 128 - -/** - * @brief Debug option, stack checks. - * @details If enabled then a runtime stack check is performed. - * - * @note The default is @p FALSE. - * @note The stack check is performed in a architecture/port dependent way. - * It may not be implemented or some ports. - * @note The default failure mode is to halt the system with the global - * @p panic_msg variable set to @p NULL. - */ -#define CH_DBG_ENABLE_STACK_CHECK FALSE - -/** - * @brief Debug option, stacks initialization. - * @details If enabled then the threads working area is filled with a byte - * value when a thread is created. This can be useful for the - * runtime measurement of the used stack. - * - * @note The default is @p FALSE. - */ -#define CH_DBG_FILL_THREADS FALSE - -/** - * @brief Debug option, threads profiling. - * @details If enabled then a field is added to the @p thread_t structure that - * counts the system ticks occurred while executing the thread. - * - * @note The default is @p FALSE. - * @note This debug option is not currently compatible with the - * tickless mode. - */ -#define CH_DBG_THREADS_PROFILING FALSE - -/** @} */ - -/*===========================================================================*/ -/** - * @name Kernel hooks - * @{ - */ -/*===========================================================================*/ - -/** - * @brief Threads descriptor structure extension. - * @details User fields added to the end of the @p thread_t structure. - */ -#define CH_CFG_THREAD_EXTRA_FIELDS \ - /* Add threads custom fields here.*/ - -/** - * @brief Threads initialization hook. - * @details User initialization code added to the @p chThdInit() API. - * - * @note It is invoked from within @p chThdInit() and implicitly from all - * the threads creation APIs. - */ -#define CH_CFG_THREAD_INIT_HOOK(tp) { \ - /* Add threads initialization code here.*/ \ -} - -/** - * @brief Threads finalization hook. - * @details User finalization code added to the @p chThdExit() API. - */ -#define CH_CFG_THREAD_EXIT_HOOK(tp) { \ - /* Add threads finalization code here.*/ \ -} - -/** - * @brief Context switch hook. - * @details This hook is invoked just before switching between threads. - */ -#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \ - /* Context switch code here.*/ \ -} - -/** - * @brief ISR enter hook. - */ -#define CH_CFG_IRQ_PROLOGUE_HOOK() { \ - /* IRQ prologue code here.*/ \ -} - -/** - * @brief ISR exit hook. - */ -#define CH_CFG_IRQ_EPILOGUE_HOOK() { \ - /* IRQ epilogue code here.*/ \ -} - -/** - * @brief Idle thread enter hook. - * @note This hook is invoked within a critical zone, no OS functions - * should be invoked from here. - * @note This macro can be used to activate a power saving mode. - */ -#define CH_CFG_IDLE_ENTER_HOOK() { \ - /* Idle-enter code here.*/ \ -} - -/** - * @brief Idle thread leave hook. - * @note This hook is invoked within a critical zone, no OS functions - * should be invoked from here. - * @note This macro can be used to deactivate a power saving mode. - */ -#define CH_CFG_IDLE_LEAVE_HOOK() { \ - /* Idle-leave code here.*/ \ -} - -/** - * @brief Idle Loop hook. - * @details This hook is continuously invoked by the idle thread loop. - */ -#define CH_CFG_IDLE_LOOP_HOOK() { \ - /* Idle loop code here.*/ \ -} - -/** - * @brief System tick event hook. - * @details This hook is invoked in the system tick handler immediately - * after processing the virtual timers queue. - */ -#define CH_CFG_SYSTEM_TICK_HOOK() { \ - /* System tick event code here.*/ \ -} - -/** - * @brief System halt hook. - * @details This hook is invoked in case to a system halting error before - * the system is halted. - */ -#define CH_CFG_SYSTEM_HALT_HOOK(reason) { \ - /* System halt code here.*/ \ -} - -/** - * @brief Trace hook. - * @details This hook is invoked each time a new record is written in the - * trace buffer. - */ -#define CH_CFG_TRACE_HOOK(tep) { \ - /* Trace code here.*/ \ -} - -/** @} */ - -/*===========================================================================*/ -/* Port-specific settings (override port settings defaulted in chcore.h). */ -/*===========================================================================*/ - -#endif /* CHCONF_H */ - -/** @} */ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/** + * @file templates/chconf.h + * @brief Configuration file template. + * @details A copy of this file must be placed in each project directory, it + * contains the application specific kernel settings. + * + * @addtogroup config + * @details Kernel related settings and hooks. + * @{ + */ + +#ifndef CHCONF_H +#define CHCONF_H + +#define _CHIBIOS_RT_CONF_ + +/*===========================================================================*/ +/** + * @name System timers settings + * @{ + */ +/*===========================================================================*/ + +/** + * @brief System time counter resolution. + * @note Allowed values are 16 or 32 bits. + */ +#define CH_CFG_ST_RESOLUTION 32 + +/** + * @brief System tick frequency. + * @details Frequency of the system timer that drives the system ticks. This + * setting also defines the system tick time unit. + */ +#define CH_CFG_ST_FREQUENCY 1000 + +/** + * @brief Time delta constant for the tick-less mode. + * @note If this value is zero then the system uses the classic + * periodic tick. This value represents the minimum number + * of ticks that is safe to specify in a timeout directive. + * The value one is not valid, timeouts are rounded up to + * this value. + */ +#define CH_CFG_ST_TIMEDELTA 0 + +/** @} */ + +/*===========================================================================*/ +/** + * @name Kernel parameters and options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Round robin interval. + * @details This constant is the number of system ticks allowed for the + * threads before preemption occurs. Setting this value to zero + * disables the preemption for threads with equal priority and the + * round robin becomes cooperative. Note that higher priority + * threads can still preempt, the kernel is always preemptive. + * @note Disabling the round robin preemption makes the kernel more compact + * and generally faster. + * @note The round robin preemption is not supported in tickless mode and + * must be set to zero in that case. + */ +#define CH_CFG_TIME_QUANTUM 20 + +/** + * @brief Managed RAM size. + * @details Size of the RAM area to be managed by the OS. If set to zero + * then the whole available RAM is used. The core memory is made + * available to the heap allocator and/or can be used directly through + * the simplified core memory allocator. + * + * @note In order to let the OS manage the whole RAM the linker script must + * provide the @p __heap_base__ and @p __heap_end__ symbols. + * @note Requires @p CH_CFG_USE_MEMCORE. + */ +#define CH_CFG_MEMCORE_SIZE 0 + +/** + * @brief Idle thread automatic spawn suppression. + * @details When this option is activated the function @p chSysInit() + * does not spawn the idle thread. The application @p main() + * function becomes the idle thread and must implement an + * infinite loop. + */ +#define CH_CFG_NO_IDLE_THREAD FALSE + +/* Use __WFI in the idle thread for waiting. Does lower the power + * consumption. */ +#define CORTEX_ENABLE_WFI_IDLE TRUE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Performance options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief OS optimization. + * @details If enabled then time efficient rather than space efficient code + * is used when two possible implementations exist. + * + * @note This is not related to the compiler optimization options. + * @note The default is @p TRUE. + */ +#define CH_CFG_OPTIMIZE_SPEED TRUE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Subsystem options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Time Measurement APIs. + * @details If enabled then the time measurement APIs are included in + * the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_TM FALSE + +/** + * @brief Threads registry APIs. + * @details If enabled then the registry APIs are included in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_REGISTRY TRUE + +/** + * @brief Threads synchronization APIs. + * @details If enabled then the @p chThdWait() function is included in + * the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_WAITEXIT TRUE + +/** + * @brief Semaphores APIs. + * @details If enabled then the Semaphores APIs are included in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_SEMAPHORES TRUE + +/** + * @brief Semaphores queuing mode. + * @details If enabled then the threads are enqueued on semaphores by + * priority rather than in FIFO order. + * + * @note The default is @p FALSE. Enable this if you have special + * requirements. + * @note Requires @p CH_CFG_USE_SEMAPHORES. + */ +#define CH_CFG_USE_SEMAPHORES_PRIORITY FALSE + +/** + * @brief Mutexes APIs. + * @details If enabled then the mutexes APIs are included in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_MUTEXES TRUE + +/** + * @brief Enables recursive behavior on mutexes. + * @note Recursive mutexes are heavier and have an increased + * memory footprint. + * + * @note The default is @p FALSE. + * @note Requires @p CH_CFG_USE_MUTEXES. + */ +#define CH_CFG_USE_MUTEXES_RECURSIVE FALSE + +/** + * @brief Conditional Variables APIs. + * @details If enabled then the conditional variables APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_MUTEXES. + */ +#define CH_CFG_USE_CONDVARS TRUE + +/** + * @brief Conditional Variables APIs with timeout. + * @details If enabled then the conditional variables APIs with timeout + * specification are included in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_CONDVARS. + */ +#define CH_CFG_USE_CONDVARS_TIMEOUT TRUE + +/** + * @brief Events Flags APIs. + * @details If enabled then the event flags APIs are included in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_EVENTS TRUE + +/** + * @brief Events Flags APIs with timeout. + * @details If enabled then the events APIs with timeout specification + * are included in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_EVENTS. + */ +#define CH_CFG_USE_EVENTS_TIMEOUT TRUE + +/** + * @brief Synchronous Messages APIs. + * @details If enabled then the synchronous messages APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_MESSAGES TRUE + +/** + * @brief Synchronous Messages queuing mode. + * @details If enabled then messages are served by priority rather than in + * FIFO order. + * + * @note The default is @p FALSE. Enable this if you have special + * requirements. + * @note Requires @p CH_CFG_USE_MESSAGES. + */ +#define CH_CFG_USE_MESSAGES_PRIORITY FALSE + +/** + * @brief Mailboxes APIs. + * @details If enabled then the asynchronous messages (mailboxes) APIs are + * included in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_SEMAPHORES. + */ +#define CH_CFG_USE_MAILBOXES TRUE + +/** + * @brief Core Memory Manager APIs. + * @details If enabled then the core memory manager APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_MEMCORE TRUE + +/** + * @brief Heap Allocator APIs. + * @details If enabled then the memory heap allocator APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or + * @p CH_CFG_USE_SEMAPHORES. + * @note Mutexes are recommended. + */ +#define CH_CFG_USE_HEAP TRUE + +/** + * @brief Memory Pools Allocator APIs. + * @details If enabled then the memory pools allocator APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + */ +#define CH_CFG_USE_MEMPOOLS TRUE + +/** + * @brief Dynamic Threads APIs. + * @details If enabled then the dynamic threads creation APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + * @note Requires @p CH_CFG_USE_WAITEXIT. + * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS. + */ +#define CH_CFG_USE_DYNAMIC TRUE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Debug options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Debug option, kernel statistics. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_STATISTICS FALSE + +/** + * @brief Debug option, system state check. + * @details If enabled the correct call protocol for system APIs is checked + * at runtime. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_SYSTEM_STATE_CHECK FALSE + +/** + * @brief Debug option, parameters checks. + * @details If enabled then the checks on the API functions input + * parameters are activated. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_ENABLE_CHECKS FALSE + +/** + * @brief Debug option, consistency checks. + * @details If enabled then all the assertions in the kernel code are + * activated. This includes consistency checks inside the kernel, + * runtime anomalies and port-defined checks. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_ENABLE_ASSERTS FALSE + +/** + * @brief Debug option, trace buffer. + * @details If enabled then the trace buffer is activated. + * + * @note The default is @p CH_DBG_TRACE_MASK_DISABLED. + */ +#define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_DISABLED + +/** + * @brief Trace buffer entries. + * @note The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is + * different from @p CH_DBG_TRACE_MASK_DISABLED. + */ +#define CH_DBG_TRACE_BUFFER_SIZE 128 + +/** + * @brief Debug option, stack checks. + * @details If enabled then a runtime stack check is performed. + * + * @note The default is @p FALSE. + * @note The stack check is performed in a architecture/port dependent way. + * It may not be implemented or some ports. + * @note The default failure mode is to halt the system with the global + * @p panic_msg variable set to @p NULL. + */ +#define CH_DBG_ENABLE_STACK_CHECK FALSE + +/** + * @brief Debug option, stacks initialization. + * @details If enabled then the threads working area is filled with a byte + * value when a thread is created. This can be useful for the + * runtime measurement of the used stack. + * + * @note The default is @p FALSE. + */ +#define CH_DBG_FILL_THREADS FALSE + +/** + * @brief Debug option, threads profiling. + * @details If enabled then a field is added to the @p thread_t structure that + * counts the system ticks occurred while executing the thread. + * + * @note The default is @p FALSE. + * @note This debug option is not currently compatible with the + * tickless mode. + */ +#define CH_DBG_THREADS_PROFILING FALSE + +/** @} */ + +/*===========================================================================*/ +/** + * @name Kernel hooks + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Threads descriptor structure extension. + * @details User fields added to the end of the @p thread_t structure. + */ +#define CH_CFG_THREAD_EXTRA_FIELDS \ + /* Add threads custom fields here.*/ + +/** + * @brief Threads initialization hook. + * @details User initialization code added to the @p chThdInit() API. + * + * @note It is invoked from within @p chThdInit() and implicitly from all + * the threads creation APIs. + */ +#define CH_CFG_THREAD_INIT_HOOK(tp) { \ + /* Add threads initialization code here.*/ \ +} + +/** + * @brief Threads finalization hook. + * @details User finalization code added to the @p chThdExit() API. + */ +#define CH_CFG_THREAD_EXIT_HOOK(tp) { \ + /* Add threads finalization code here.*/ \ +} + +/** + * @brief Context switch hook. + * @details This hook is invoked just before switching between threads. + */ +#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) { \ + /* Context switch code here.*/ \ +} + +/** + * @brief ISR enter hook. + */ +#define CH_CFG_IRQ_PROLOGUE_HOOK() { \ + /* IRQ prologue code here.*/ \ +} + +/** + * @brief ISR exit hook. + */ +#define CH_CFG_IRQ_EPILOGUE_HOOK() { \ + /* IRQ epilogue code here.*/ \ +} + +/** + * @brief Idle thread enter hook. + * @note This hook is invoked within a critical zone, no OS functions + * should be invoked from here. + * @note This macro can be used to activate a power saving mode. + */ +#define CH_CFG_IDLE_ENTER_HOOK() { \ + /* Idle-enter code here.*/ \ +} + +/** + * @brief Idle thread leave hook. + * @note This hook is invoked within a critical zone, no OS functions + * should be invoked from here. + * @note This macro can be used to deactivate a power saving mode. + */ +#define CH_CFG_IDLE_LEAVE_HOOK() { \ + /* Idle-leave code here.*/ \ +} + +/** + * @brief Idle Loop hook. + * @details This hook is continuously invoked by the idle thread loop. + */ +#define CH_CFG_IDLE_LOOP_HOOK() { \ + /* Idle loop code here.*/ \ +} + +/** + * @brief System tick event hook. + * @details This hook is invoked in the system tick handler immediately + * after processing the virtual timers queue. + */ +#define CH_CFG_SYSTEM_TICK_HOOK() { \ + /* System tick event code here.*/ \ +} + +/** + * @brief System halt hook. + * @details This hook is invoked in case to a system halting error before + * the system is halted. + */ +#define CH_CFG_SYSTEM_HALT_HOOK(reason) { \ + /* System halt code here.*/ \ +} + +/** + * @brief Trace hook. + * @details This hook is invoked each time a new record is written in the + * trace buffer. + */ +#define CH_CFG_TRACE_HOOK(tep) { \ + /* Trace code here.*/ \ +} + +/** @} */ + +/*===========================================================================*/ +/* Port-specific settings (override port settings defaulted in chcore.h). */ +/*===========================================================================*/ + +#endif /* CHCONF_H */ + +/** @} */ diff --git a/keyboards/infinity_chibios/halconf.h b/keyboards/infinity_chibios/halconf.h index 53538de149..46b37a4f46 100644 --- a/keyboards/infinity_chibios/halconf.h +++ b/keyboards/infinity_chibios/halconf.h @@ -1,353 +1,353 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/** - * @file templates/halconf.h - * @brief HAL configuration header. - * @details HAL configuration file, this file allows to enable or disable the - * various device drivers from your application. You may also use - * this file in order to override the device drivers default settings. - * - * @addtogroup HAL_CONF - * @{ - */ - -#ifndef _HALCONF_H_ -#define _HALCONF_H_ - -#include "mcuconf.h" - -/** - * @brief Enables the PAL subsystem. - */ -#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__) -#define HAL_USE_PAL TRUE -#endif - -/** - * @brief Enables the ADC subsystem. - */ -#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__) -#define HAL_USE_ADC FALSE -#endif - -/** - * @brief Enables the CAN subsystem. - */ -#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__) -#define HAL_USE_CAN FALSE -#endif - -/** - * @brief Enables the DAC subsystem. - */ -#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__) -#define HAL_USE_DAC FALSE -#endif - -/** - * @brief Enables the EXT subsystem. - */ -#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__) -#define HAL_USE_EXT FALSE -#endif - -/** - * @brief Enables the GPT subsystem. - */ -#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) -#define HAL_USE_GPT FALSE -#endif - -/** - * @brief Enables the I2C subsystem. - */ -#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__) -#define HAL_USE_I2C FALSE -#endif - -/** - * @brief Enables the I2S subsystem. - */ -#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__) -#define HAL_USE_I2S FALSE -#endif - -/** - * @brief Enables the ICU subsystem. - */ -#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__) -#define HAL_USE_ICU FALSE -#endif - -/** - * @brief Enables the MAC subsystem. - */ -#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__) -#define HAL_USE_MAC FALSE -#endif - -/** - * @brief Enables the MMC_SPI subsystem. - */ -#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__) -#define HAL_USE_MMC_SPI FALSE -#endif - -/** - * @brief Enables the PWM subsystem. - */ -#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) -#define HAL_USE_PWM FALSE -#endif - -/** - * @brief Enables the RTC subsystem. - */ -#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__) -#define HAL_USE_RTC FALSE -#endif - -/** - * @brief Enables the SDC subsystem. - */ -#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__) -#define HAL_USE_SDC FALSE -#endif - -/** - * @brief Enables the SERIAL subsystem. - */ -#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL FALSE -#endif - -/** - * @brief Enables the SERIAL over USB subsystem. - */ -#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL_USB TRUE -#endif - -/** - * @brief Enables the SPI subsystem. - */ -#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__) -#define HAL_USE_SPI FALSE -#endif - -/** - * @brief Enables the UART subsystem. - */ -#if !defined(HAL_USE_UART) || defined(__DOXYGEN__) -#define HAL_USE_UART FALSE -#endif - -/** - * @brief Enables the USB subsystem. - */ -#if !defined(HAL_USE_USB) || defined(__DOXYGEN__) -#define HAL_USE_USB TRUE -#endif - -/** - * @brief Enables the WDG subsystem. - */ -#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__) -#define HAL_USE_WDG FALSE -#endif - -/*===========================================================================*/ -/* ADC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__) -#define ADC_USE_WAIT TRUE -#endif - -/** - * @brief Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define ADC_USE_MUTUAL_EXCLUSION TRUE -#endif - -/*===========================================================================*/ -/* CAN driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Sleep mode related APIs inclusion switch. - */ -#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) -#define CAN_USE_SLEEP_MODE TRUE -#endif - -/*===========================================================================*/ -/* I2C driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables the mutual exclusion APIs on the I2C bus. - */ -#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define I2C_USE_MUTUAL_EXCLUSION TRUE -#endif - -/*===========================================================================*/ -/* MAC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables an event sources for incoming packets. - */ -#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__) -#define MAC_USE_ZERO_COPY FALSE -#endif - -/** - * @brief Enables an event sources for incoming packets. - */ -#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__) -#define MAC_USE_EVENTS TRUE -#endif - -/*===========================================================================*/ -/* MMC_SPI driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Delays insertions. - * @details If enabled this options inserts delays into the MMC waiting - * routines releasing some extra CPU time for the threads with - * lower priority, this may slow down the driver a bit however. - * This option is recommended also if the SPI driver does not - * use a DMA channel and heavily loads the CPU. - */ -#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__) -#define MMC_NICE_WAITING TRUE -#endif - -/*===========================================================================*/ -/* SDC driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Number of initialization attempts before rejecting the card. - * @note Attempts are performed at 10mS intervals. - */ -#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__) -#define SDC_INIT_RETRY 100 -#endif - -/** - * @brief Include support for MMC cards. - * @note MMC support is not yet implemented so this option must be kept - * at @p FALSE. - */ -#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__) -#define SDC_MMC_SUPPORT FALSE -#endif - -/** - * @brief Delays insertions. - * @details If enabled this options inserts delays into the MMC waiting - * routines releasing some extra CPU time for the threads with - * lower priority, this may slow down the driver a bit however. - */ -#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__) -#define SDC_NICE_WAITING TRUE -#endif - -/*===========================================================================*/ -/* SERIAL driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Default bit rate. - * @details Configuration parameter, this is the baud rate selected for the - * default configuration. - */ -#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__) -#define SERIAL_DEFAULT_BITRATE 38400 -#endif - -/** - * @brief Serial buffers size. - * @details Configuration parameter, you can change the depth of the queue - * buffers depending on the requirements of your application. - * @note The default is 64 bytes for both the transmission and receive - * buffers. - */ -#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__) -#define SERIAL_BUFFERS_SIZE 16 -#endif - -/*===========================================================================*/ -/* SERIAL_USB driver related setting. */ -/*===========================================================================*/ - -/** - * @brief Serial over USB buffers size. - * @details Configuration parameter, the buffer size must be a multiple of - * the USB data endpoint maximum packet size. - * @note The default is 64 bytes for both the transmission and receive - * buffers. - */ -#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__) -#define SERIAL_USB_BUFFERS_SIZE 256 -#endif - -/*===========================================================================*/ -/* SPI driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__) -#define SPI_USE_WAIT TRUE -#endif - -/** - * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define SPI_USE_MUTUAL_EXCLUSION TRUE -#endif - -/*===========================================================================*/ -/* USB driver related settings. */ -/*===========================================================================*/ - -/** - * @brief Enables synchronous APIs. - * @note Disabling this option saves both code and data space. - */ -#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__) -#define USB_USE_WAIT TRUE -#endif - -#endif /* _HALCONF_H_ */ - -/** @} */ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/** + * @file templates/halconf.h + * @brief HAL configuration header. + * @details HAL configuration file, this file allows to enable or disable the + * various device drivers from your application. You may also use + * this file in order to override the device drivers default settings. + * + * @addtogroup HAL_CONF + * @{ + */ + +#ifndef _HALCONF_H_ +#define _HALCONF_H_ + +#include "mcuconf.h" + +/** + * @brief Enables the PAL subsystem. + */ +#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__) +#define HAL_USE_PAL TRUE +#endif + +/** + * @brief Enables the ADC subsystem. + */ +#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__) +#define HAL_USE_ADC FALSE +#endif + +/** + * @brief Enables the CAN subsystem. + */ +#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__) +#define HAL_USE_CAN FALSE +#endif + +/** + * @brief Enables the DAC subsystem. + */ +#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__) +#define HAL_USE_DAC FALSE +#endif + +/** + * @brief Enables the EXT subsystem. + */ +#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__) +#define HAL_USE_EXT FALSE +#endif + +/** + * @brief Enables the GPT subsystem. + */ +#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) +#define HAL_USE_GPT FALSE +#endif + +/** + * @brief Enables the I2C subsystem. + */ +#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__) +#define HAL_USE_I2C FALSE +#endif + +/** + * @brief Enables the I2S subsystem. + */ +#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__) +#define HAL_USE_I2S FALSE +#endif + +/** + * @brief Enables the ICU subsystem. + */ +#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__) +#define HAL_USE_ICU FALSE +#endif + +/** + * @brief Enables the MAC subsystem. + */ +#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__) +#define HAL_USE_MAC FALSE +#endif + +/** + * @brief Enables the MMC_SPI subsystem. + */ +#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__) +#define HAL_USE_MMC_SPI FALSE +#endif + +/** + * @brief Enables the PWM subsystem. + */ +#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) +#define HAL_USE_PWM FALSE +#endif + +/** + * @brief Enables the RTC subsystem. + */ +#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__) +#define HAL_USE_RTC FALSE +#endif + +/** + * @brief Enables the SDC subsystem. + */ +#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__) +#define HAL_USE_SDC FALSE +#endif + +/** + * @brief Enables the SERIAL subsystem. + */ +#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__) +#define HAL_USE_SERIAL FALSE +#endif + +/** + * @brief Enables the SERIAL over USB subsystem. + */ +#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) +#define HAL_USE_SERIAL_USB TRUE +#endif + +/** + * @brief Enables the SPI subsystem. + */ +#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__) +#define HAL_USE_SPI FALSE +#endif + +/** + * @brief Enables the UART subsystem. + */ +#if !defined(HAL_USE_UART) || defined(__DOXYGEN__) +#define HAL_USE_UART FALSE +#endif + +/** + * @brief Enables the USB subsystem. + */ +#if !defined(HAL_USE_USB) || defined(__DOXYGEN__) +#define HAL_USE_USB TRUE +#endif + +/** + * @brief Enables the WDG subsystem. + */ +#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__) +#define HAL_USE_WDG FALSE +#endif + +/*===========================================================================*/ +/* ADC driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables synchronous APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__) +#define ADC_USE_WAIT TRUE +#endif + +/** + * @brief Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) +#define ADC_USE_MUTUAL_EXCLUSION TRUE +#endif + +/*===========================================================================*/ +/* CAN driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Sleep mode related APIs inclusion switch. + */ +#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) +#define CAN_USE_SLEEP_MODE TRUE +#endif + +/*===========================================================================*/ +/* I2C driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables the mutual exclusion APIs on the I2C bus. + */ +#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) +#define I2C_USE_MUTUAL_EXCLUSION TRUE +#endif + +/*===========================================================================*/ +/* MAC driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables an event sources for incoming packets. + */ +#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__) +#define MAC_USE_ZERO_COPY FALSE +#endif + +/** + * @brief Enables an event sources for incoming packets. + */ +#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__) +#define MAC_USE_EVENTS TRUE +#endif + +/*===========================================================================*/ +/* MMC_SPI driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Delays insertions. + * @details If enabled this options inserts delays into the MMC waiting + * routines releasing some extra CPU time for the threads with + * lower priority, this may slow down the driver a bit however. + * This option is recommended also if the SPI driver does not + * use a DMA channel and heavily loads the CPU. + */ +#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__) +#define MMC_NICE_WAITING TRUE +#endif + +/*===========================================================================*/ +/* SDC driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Number of initialization attempts before rejecting the card. + * @note Attempts are performed at 10mS intervals. + */ +#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__) +#define SDC_INIT_RETRY 100 +#endif + +/** + * @brief Include support for MMC cards. + * @note MMC support is not yet implemented so this option must be kept + * at @p FALSE. + */ +#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__) +#define SDC_MMC_SUPPORT FALSE +#endif + +/** + * @brief Delays insertions. + * @details If enabled this options inserts delays into the MMC waiting + * routines releasing some extra CPU time for the threads with + * lower priority, this may slow down the driver a bit however. + */ +#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__) +#define SDC_NICE_WAITING TRUE +#endif + +/*===========================================================================*/ +/* SERIAL driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Default bit rate. + * @details Configuration parameter, this is the baud rate selected for the + * default configuration. + */ +#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__) +#define SERIAL_DEFAULT_BITRATE 38400 +#endif + +/** + * @brief Serial buffers size. + * @details Configuration parameter, you can change the depth of the queue + * buffers depending on the requirements of your application. + * @note The default is 64 bytes for both the transmission and receive + * buffers. + */ +#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__) +#define SERIAL_BUFFERS_SIZE 16 +#endif + +/*===========================================================================*/ +/* SERIAL_USB driver related setting. */ +/*===========================================================================*/ + +/** + * @brief Serial over USB buffers size. + * @details Configuration parameter, the buffer size must be a multiple of + * the USB data endpoint maximum packet size. + * @note The default is 64 bytes for both the transmission and receive + * buffers. + */ +#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__) +#define SERIAL_USB_BUFFERS_SIZE 256 +#endif + +/*===========================================================================*/ +/* SPI driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables synchronous APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__) +#define SPI_USE_WAIT TRUE +#endif + +/** + * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) +#define SPI_USE_MUTUAL_EXCLUSION TRUE +#endif + +/*===========================================================================*/ +/* USB driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables synchronous APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__) +#define USB_USE_WAIT TRUE +#endif + +#endif /* _HALCONF_H_ */ + +/** @} */ diff --git a/keyboards/infinity_chibios/mcuconf.h b/keyboards/infinity_chibios/mcuconf.h index 66b6ce25de..f453304b75 100644 --- a/keyboards/infinity_chibios/mcuconf.h +++ b/keyboards/infinity_chibios/mcuconf.h @@ -1,55 +1,55 @@ -/* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#ifndef _MCUCONF_H_ -#define _MCUCONF_H_ - -#define K20x_MCUCONF - -/* - * HAL driver system settings. - */ - -/* Select the MCU clocking mode below by enabling the appropriate block. */ - -#define KINETIS_NO_INIT FALSE - -/* FEI mode - 48 MHz with internal 32.768 kHz crystal */ -#define KINETIS_MCG_MODE KINETIS_MCG_MODE_FEI -#define KINETIS_MCG_FLL_DMX32 1 /* Fine-tune for 32.768 kHz */ -#define KINETIS_MCG_FLL_DRS 1 /* 1464x FLL factor */ -#define KINETIS_SYSCLK_FREQUENCY 47972352UL /* 32.768 kHz * 1464 (~48 MHz) */ -#define KINETIS_CLKDIV1_OUTDIV1 1 -#define KINETIS_CLKDIV1_OUTDIV2 1 -#define KINETIS_CLKDIV1_OUTDIV4 2 -#define KINETIS_BUSCLK_FREQUENCY KINETIS_SYSCLK_FREQUENCY -#define KINETIS_FLASHCLK_FREQUENCY KINETIS_SYSCLK_FREQUENCY/2 - -/* - * SERIAL driver system settings. - */ -#define KINETIS_SERIAL_USE_UART0 TRUE - -/* - * USB driver settings - */ -#define KINETIS_USB_USE_USB0 TRUE -/* Need to redefine this, since the default is for K20x */ -/* This is for Teensy LC; you should comment it out (or change to 5) - * for Teensy 3.x */ -#define KINETIS_USB_USB0_IRQ_PRIORITY 2 - -#endif /* _MCUCONF_H_ */ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#ifndef _MCUCONF_H_ +#define _MCUCONF_H_ + +#define K20x_MCUCONF + +/* + * HAL driver system settings. + */ + +/* Select the MCU clocking mode below by enabling the appropriate block. */ + +#define KINETIS_NO_INIT FALSE + +/* FEI mode - 48 MHz with internal 32.768 kHz crystal */ +#define KINETIS_MCG_MODE KINETIS_MCG_MODE_FEI +#define KINETIS_MCG_FLL_DMX32 1 /* Fine-tune for 32.768 kHz */ +#define KINETIS_MCG_FLL_DRS 1 /* 1464x FLL factor */ +#define KINETIS_SYSCLK_FREQUENCY 47972352UL /* 32.768 kHz * 1464 (~48 MHz) */ +#define KINETIS_CLKDIV1_OUTDIV1 1 +#define KINETIS_CLKDIV1_OUTDIV2 1 +#define KINETIS_CLKDIV1_OUTDIV4 2 +#define KINETIS_BUSCLK_FREQUENCY KINETIS_SYSCLK_FREQUENCY +#define KINETIS_FLASHCLK_FREQUENCY KINETIS_SYSCLK_FREQUENCY/2 + +/* + * SERIAL driver system settings. + */ +#define KINETIS_SERIAL_USE_UART0 TRUE + +/* + * USB driver settings + */ +#define KINETIS_USB_USE_USB0 TRUE +/* Need to redefine this, since the default is for K20x */ +/* This is for Teensy LC; you should comment it out (or change to 5) + * for Teensy 3.x */ +#define KINETIS_USB_USB0_IRQ_PRIORITY 2 + +#endif /* _MCUCONF_H_ */ diff --git a/tmk_core/common/avr/xprintf.S b/tmk_core/common/avr/xprintf.S index 0cec70ce22..06434b98d9 100644 --- a/tmk_core/common/avr/xprintf.S +++ b/tmk_core/common/avr/xprintf.S @@ -1,500 +1,500 @@ -;---------------------------------------------------------------------------; -; Extended itoa, puts, printf and atoi (C)ChaN, 2011 -;---------------------------------------------------------------------------; - - // Base size is 152 bytes -#define CR_CRLF 0 // Convert \n to \r\n (+10 bytes) -#define USE_XPRINTF 1 // Enable xprintf function (+194 bytes) -#define USE_XSPRINTF 0 // Add xsprintf function (+78 bytes) -#define USE_XFPRINTF 0 // Add xfprintf function (+54 bytes) -#define USE_XATOI 0 // Enable xatoi function (+182 bytes) - - -#if FLASHEND > 0x1FFFF -#error xitoa module does not support 256K devices -#endif - -.nolist -#include // Include device specific definitions. -.list - -#ifdef SPM_PAGESIZE // Recent devices have "lpm Rd,Z+" and "movw". -.macro _LPMI reg - lpm \reg, Z+ -.endm -.macro _MOVW dh,dl, sh,sl - movw \dl, \sl -.endm -#else // Earlier devices do not have "lpm Rd,Z+" nor "movw". -.macro _LPMI reg - lpm - mov \reg, r0 - adiw ZL, 1 -.endm -.macro _MOVW dh,dl, sh,sl - mov \dl, \sl - mov \dh, \sh -.endm -#endif - - - -;--------------------------------------------------------------------------- -; Stub function to forward to user output function -; -;Prototype: void xputc (char chr // a character to be output -; ); -;Size: 12/12 words - -.section .bss -.global xfunc_out ; xfunc_out must be initialized before using this module. -xfunc_out: .ds.w 1 -.section .text - - -.func xputc -.global xputc -xputc: -#if CR_CRLF - cpi r24, 10 ;LF --> CRLF - brne 1f ; - ldi r24, 13 ; - rcall 1f ; - ldi r24, 10 ;/ -1: -#endif - push ZH - push ZL - lds ZL, xfunc_out+0 ;Pointer to the registered output function. - lds ZH, xfunc_out+1 ;/ - sbiw ZL, 0 ;Skip if null - breq 2f ;/ - icall -2: pop ZL - pop ZH - ret -.endfunc - - - -;--------------------------------------------------------------------------- -; Direct ROM string output -; -;Prototype: void xputs (const char *str_p // rom string to be output -; ); - -.func xputs -.global xputs -xputs: - _MOVW ZH,ZL, r25,r24 ; Z = pointer to rom string -1: _LPMI r24 - cpi r24, 0 - breq 2f - rcall xputc - rjmp 1b -2: ret -.endfunc - - -;--------------------------------------------------------------------------- -; Extended direct numeral string output (32bit version) -; -;Prototype: void xitoa (long value, // value to be output -; char radix, // radix -; char width); // minimum width -; - -.func xitoa -.global xitoa -xitoa: - ;r25:r22 = value, r20 = base, r18 = digits - clr r31 ;r31 = stack level - ldi r30, ' ' ;r30 = sign - ldi r19, ' ' ;r19 = filler - sbrs r20, 7 ;When base indicates signd format and the value - rjmp 0f ;is minus, add a '-'. - neg r20 ; - sbrs r25, 7 ; - rjmp 0f ; - ldi r30, '-' ; - com r22 ; - com r23 ; - com r24 ; - com r25 ; - adc r22, r1 ; - adc r23, r1 ; - adc r24, r1 ; - adc r25, r1 ;/ -0: sbrs r18, 7 ;When digits indicates zero filled, - rjmp 1f ;filler is '0'. - neg r18 ; - ldi r19, '0' ;/ - ;----- string conversion loop -1: ldi r21, 32 ;r26 = r25:r22 % r20 - clr r26 ;r25:r22 /= r20 -2: lsl r22 ; - rol r23 ; - rol r24 ; - rol r25 ; - rol r26 ; - cp r26, r20 ; - brcs 3f ; - sub r26, r20 ; - inc r22 ; -3: dec r21 ; - brne 2b ;/ - cpi r26, 10 ;r26 is a numeral digit '0'-'F' - brcs 4f ; - subi r26, -7 ; -4: subi r26, -'0' ;/ - push r26 ;Stack it - inc r31 ;/ - cp r22, r1 ;Repeat until r25:r22 gets zero - cpc r23, r1 ; - cpc r24, r1 ; - cpc r25, r1 ; - brne 1b ;/ - - cpi r30, '-' ;Minus sign if needed - brne 5f ; - push r30 ; - inc r31 ;/ -5: cp r31, r18 ;Filler - brcc 6f ; - push r19 ; - inc r31 ; - rjmp 5b ;/ - -6: pop r24 ;Flush stacked digits and exit - rcall xputc ; - dec r31 ; - brne 6b ;/ - - ret -.endfunc - - - -;---------------------------------------------------------------------------; -; Formatted string output (16/32bit version) -; -;Prototype: -; void __xprintf (const char *format_p, ...); -; void __xsprintf(char*, const char *format_p, ...); -; void __xfprintf(void(*func)(char), const char *format_p, ...); -; - -#if USE_XPRINTF - -.func xvprintf -xvprintf: - ld ZL, Y+ ;Z = pointer to format string - ld ZH, Y+ ;/ - -0: _LPMI r24 ;Get a format char - cpi r24, 0 ;End of format string? - breq 90f ;/ - cpi r24, '%' ;Is format? - breq 20f ;/ -1: rcall xputc ;Put a normal character - rjmp 0b ;/ -90: ret - -20: ldi r18, 0 ;r18: digits - clt ;T: filler - _LPMI r21 ;Get flags - cpi r21, '%' ;Is a %? - breq 1b ;/ - cpi r21, '0' ;Zero filled? - brne 23f ; - set ;/ -22: _LPMI r21 ;Get width -23: cpi r21, '9'+1 ; - brcc 24f ; - subi r21, '0' ; - brcs 90b ; - lsl r18 ; - mov r0, r18 ; - lsl r18 ; - lsl r18 ; - add r18, r0 ; - add r18, r21 ; - rjmp 22b ;/ - -24: brtc 25f ;get value (low word) - neg r18 ; -25: ld r24, Y+ ; - ld r25, Y+ ;/ - cpi r21, 'c' ;Is type character? - breq 1b ;/ - cpi r21, 's' ;Is type RAM string? - breq 50f ;/ - cpi r21, 'S' ;Is type ROM string? - breq 60f ;/ - _MOVW r23,r22,r25,r24 ;r25:r22 = value - clr r24 ; - clr r25 ; - clt ;/ - cpi r21, 'l' ;Is long int? - brne 26f ; - ld r24, Y+ ;get value (high word) - ld r25, Y+ ; - set ; - _LPMI r21 ;/ -26: cpi r21, 'd' ;Is type signed decimal? - brne 27f ;/ - ldi r20, -10 ; - brts 40f ; - sbrs r23, 7 ; - rjmp 40f ; - ldi r24, -1 ; - ldi r25, -1 ; - rjmp 40f ;/ -27: cpi r21, 'u' ;Is type unsigned decimal? - ldi r20, 10 ; - breq 40f ;/ - cpi r21, 'X' ;Is type hexdecimal? - ldi r20, 16 ; - breq 40f ;/ - cpi r21, 'b' ;Is type binary? - ldi r20, 2 ; - breq 40f ;/ - ret ;abort -40: push ZH ;Output the value - push ZL ; - rcall xitoa ; -42: pop ZL ; - pop ZH ; - rjmp 0b ;/ - -50: push ZH ;Put a string on the RAM - push ZL - _MOVW ZH,ZL, r25,r24 -51: ld r24, Z+ - cpi r24, 0 - breq 42b - rcall xputc - rjmp 51b - -60: push ZH ;Put a string on the ROM - push ZL - rcall xputs - rjmp 42b -.endfunc - - -.func __xprintf -.global __xprintf -__xprintf: - push YH - push YL - in YL, _SFR_IO_ADDR(SPL) -#ifdef SPH - in YH, _SFR_IO_ADDR(SPH) -#else - clr YH -#endif - adiw YL, 5 ;Y = pointer to arguments - rcall xvprintf - pop YL - pop YH - ret -.endfunc - - -#if USE_XSPRINTF - -.func __xsprintf -putram: - _MOVW ZH,ZL, r15,r14 - st Z+, r24 - _MOVW r15,r14, ZH,ZL - ret -.global __xsprintf -__xsprintf: - push YH - push YL - in YL, _SFR_IO_ADDR(SPL) -#ifdef SPH - in YH, _SFR_IO_ADDR(SPH) -#else - clr YH -#endif - adiw YL, 5 ;Y = pointer to arguments - lds ZL, xfunc_out+0 ;Save registered output function - lds ZH, xfunc_out+1 ; - push ZL ; - push ZH ;/ - ldi ZL, lo8(pm(putram));Set local output function - ldi ZH, hi8(pm(putram)); - sts xfunc_out+0, ZL ; - sts xfunc_out+1, ZH ;/ - push r15 ;Initialize pointer to string buffer - push r14 ; - ld r14, Y+ ; - ld r15, Y+ ;/ - rcall xvprintf - _MOVW ZH,ZL, r15,r14 ;Terminate string - st Z, r1 ; - pop r14 ; - pop r15 ;/ - pop ZH ;Restore registered output function - pop ZL ; - sts xfunc_out+0, ZL ; - sts xfunc_out+1, ZH ;/ - pop YL - pop YH - ret -.endfunc -#endif - - -#if USE_XFPRINTF -.func __xfprintf -.global __xfprintf -__xfprintf: - push YH - push YL - in YL, _SFR_IO_ADDR(SPL) -#ifdef SPH - in YH, _SFR_IO_ADDR(SPH) -#else - clr YH -#endif - adiw YL, 5 ;Y = pointer to arguments - lds ZL, xfunc_out+0 ;Save registered output function - lds ZH, xfunc_out+1 ; - push ZL ; - push ZH ;/ - ld ZL, Y+ ;Set output function - ld ZH, Y+ ; - sts xfunc_out+0, ZL ; - sts xfunc_out+1, ZH ;/ - rcall xvprintf - pop ZH ;Restore registered output function - pop ZL ; - sts xfunc_out+0, ZL ; - sts xfunc_out+1, ZH ;/ - pop YL - pop YH - ret -.endfunc -#endif - -#endif - - - -;--------------------------------------------------------------------------- -; Extended numeral string input -; -;Prototype: -; char xatoi ( /* 1: Successful, 0: Failed */ -; const char **str, /* pointer to pointer to source string */ -; long *res /* result */ -; ); -; - - -#if USE_XATOI -.func xatoi -.global xatoi -xatoi: - _MOVW r1, r0, r23, r22 - _MOVW XH, XL, r25, r24 - ld ZL, X+ - ld ZH, X+ - clr r18 ;r21:r18 = 0; - clr r19 ; - clr r20 ; - clr r21 ;/ - clt ;T = 0; - - ldi r25, 10 ;r25 = 10; - rjmp 41f ;/ -40: adiw ZL, 1 ;Z++; -41: ld r22, Z ;r22 = *Z; - cpi r22, ' ' ;if(r22 == ' ') continue - breq 40b ;/ - brcs 70f ;if(r22 < ' ') error; - cpi r22, '-' ;if(r22 == '-') { - brne 42f ; T = 1; - set ; continue; - rjmp 40b ;} -42: cpi r22, '9'+1 ;if(r22 > '9') error; - brcc 70f ;/ - cpi r22, '0' ;if(r22 < '0') error; - brcs 70f ;/ - brne 51f ;if(r22 > '0') cv_start; - ldi r25, 8 ;r25 = 8; - adiw ZL, 1 ;r22 = *(++Z); - ld r22, Z ;/ - cpi r22, ' '+1 ;if(r22 <= ' ') exit; - brcs 80f ;/ - cpi r22, 'b' ;if(r22 == 'b') { - brne 43f ; r25 = 2; - ldi r25, 2 ; cv_start; - rjmp 50f ;} -43: cpi r22, 'x' ;if(r22 != 'x') error; - brne 51f ;/ - ldi r25, 16 ;r25 = 16; - -50: adiw ZL, 1 ;Z++; - ld r22, Z ;r22 = *Z; -51: cpi r22, ' '+1 ;if(r22 <= ' ') break; - brcs 80f ;/ - cpi r22, 'a' ;if(r22 >= 'a') r22 =- 0x20; - brcs 52f ; - subi r22, 0x20 ;/ -52: subi r22, '0' ;if((r22 -= '0') < 0) error; - brcs 70f ;/ - cpi r22, 10 ;if(r22 >= 10) { - brcs 53f ; r22 -= 7; - subi r22, 7 ; if(r22 < 10) - cpi r22, 10 ; - brcs 70f ;} -53: cp r22, r25 ;if(r22 >= r25) error; - brcc 70f ;/ -60: ldi r24, 33 ;r21:r18 *= r25; - sub r23, r23 ; -61: brcc 62f ; - add r23, r25 ; -62: lsr r23 ; - ror r21 ; - ror r20 ; - ror r19 ; - ror r18 ; - dec r24 ; - brne 61b ;/ - add r18, r22 ;r21:r18 += r22; - adc r19, r24 ; - adc r20, r24 ; - adc r21, r24 ;/ - rjmp 50b ;repeat - -70: ldi r24, 0 - rjmp 81f -80: ldi r24, 1 -81: brtc 82f - clr r22 - com r18 - com r19 - com r20 - com r21 - adc r18, r22 - adc r19, r22 - adc r20, r22 - adc r21, r22 -82: st -X, ZH - st -X, ZL - _MOVW XH, XL, r1, r0 - st X+, r18 - st X+, r19 - st X+, r20 - st X+, r21 - clr r1 - ret -.endfunc -#endif - - +;---------------------------------------------------------------------------; +; Extended itoa, puts, printf and atoi (C)ChaN, 2011 +;---------------------------------------------------------------------------; + + // Base size is 152 bytes +#define CR_CRLF 0 // Convert \n to \r\n (+10 bytes) +#define USE_XPRINTF 1 // Enable xprintf function (+194 bytes) +#define USE_XSPRINTF 0 // Add xsprintf function (+78 bytes) +#define USE_XFPRINTF 0 // Add xfprintf function (+54 bytes) +#define USE_XATOI 0 // Enable xatoi function (+182 bytes) + + +#if FLASHEND > 0x1FFFF +#error xitoa module does not support 256K devices +#endif + +.nolist +#include // Include device specific definitions. +.list + +#ifdef SPM_PAGESIZE // Recent devices have "lpm Rd,Z+" and "movw". +.macro _LPMI reg + lpm \reg, Z+ +.endm +.macro _MOVW dh,dl, sh,sl + movw \dl, \sl +.endm +#else // Earlier devices do not have "lpm Rd,Z+" nor "movw". +.macro _LPMI reg + lpm + mov \reg, r0 + adiw ZL, 1 +.endm +.macro _MOVW dh,dl, sh,sl + mov \dl, \sl + mov \dh, \sh +.endm +#endif + + + +;--------------------------------------------------------------------------- +; Stub function to forward to user output function +; +;Prototype: void xputc (char chr // a character to be output +; ); +;Size: 12/12 words + +.section .bss +.global xfunc_out ; xfunc_out must be initialized before using this module. +xfunc_out: .ds.w 1 +.section .text + + +.func xputc +.global xputc +xputc: +#if CR_CRLF + cpi r24, 10 ;LF --> CRLF + brne 1f ; + ldi r24, 13 ; + rcall 1f ; + ldi r24, 10 ;/ +1: +#endif + push ZH + push ZL + lds ZL, xfunc_out+0 ;Pointer to the registered output function. + lds ZH, xfunc_out+1 ;/ + sbiw ZL, 0 ;Skip if null + breq 2f ;/ + icall +2: pop ZL + pop ZH + ret +.endfunc + + + +;--------------------------------------------------------------------------- +; Direct ROM string output +; +;Prototype: void xputs (const char *str_p // rom string to be output +; ); + +.func xputs +.global xputs +xputs: + _MOVW ZH,ZL, r25,r24 ; Z = pointer to rom string +1: _LPMI r24 + cpi r24, 0 + breq 2f + rcall xputc + rjmp 1b +2: ret +.endfunc + + +;--------------------------------------------------------------------------- +; Extended direct numeral string output (32bit version) +; +;Prototype: void xitoa (long value, // value to be output +; char radix, // radix +; char width); // minimum width +; + +.func xitoa +.global xitoa +xitoa: + ;r25:r22 = value, r20 = base, r18 = digits + clr r31 ;r31 = stack level + ldi r30, ' ' ;r30 = sign + ldi r19, ' ' ;r19 = filler + sbrs r20, 7 ;When base indicates signd format and the value + rjmp 0f ;is minus, add a '-'. + neg r20 ; + sbrs r25, 7 ; + rjmp 0f ; + ldi r30, '-' ; + com r22 ; + com r23 ; + com r24 ; + com r25 ; + adc r22, r1 ; + adc r23, r1 ; + adc r24, r1 ; + adc r25, r1 ;/ +0: sbrs r18, 7 ;When digits indicates zero filled, + rjmp 1f ;filler is '0'. + neg r18 ; + ldi r19, '0' ;/ + ;----- string conversion loop +1: ldi r21, 32 ;r26 = r25:r22 % r20 + clr r26 ;r25:r22 /= r20 +2: lsl r22 ; + rol r23 ; + rol r24 ; + rol r25 ; + rol r26 ; + cp r26, r20 ; + brcs 3f ; + sub r26, r20 ; + inc r22 ; +3: dec r21 ; + brne 2b ;/ + cpi r26, 10 ;r26 is a numeral digit '0'-'F' + brcs 4f ; + subi r26, -7 ; +4: subi r26, -'0' ;/ + push r26 ;Stack it + inc r31 ;/ + cp r22, r1 ;Repeat until r25:r22 gets zero + cpc r23, r1 ; + cpc r24, r1 ; + cpc r25, r1 ; + brne 1b ;/ + + cpi r30, '-' ;Minus sign if needed + brne 5f ; + push r30 ; + inc r31 ;/ +5: cp r31, r18 ;Filler + brcc 6f ; + push r19 ; + inc r31 ; + rjmp 5b ;/ + +6: pop r24 ;Flush stacked digits and exit + rcall xputc ; + dec r31 ; + brne 6b ;/ + + ret +.endfunc + + + +;---------------------------------------------------------------------------; +; Formatted string output (16/32bit version) +; +;Prototype: +; void __xprintf (const char *format_p, ...); +; void __xsprintf(char*, const char *format_p, ...); +; void __xfprintf(void(*func)(char), const char *format_p, ...); +; + +#if USE_XPRINTF + +.func xvprintf +xvprintf: + ld ZL, Y+ ;Z = pointer to format string + ld ZH, Y+ ;/ + +0: _LPMI r24 ;Get a format char + cpi r24, 0 ;End of format string? + breq 90f ;/ + cpi r24, '%' ;Is format? + breq 20f ;/ +1: rcall xputc ;Put a normal character + rjmp 0b ;/ +90: ret + +20: ldi r18, 0 ;r18: digits + clt ;T: filler + _LPMI r21 ;Get flags + cpi r21, '%' ;Is a %? + breq 1b ;/ + cpi r21, '0' ;Zero filled? + brne 23f ; + set ;/ +22: _LPMI r21 ;Get width +23: cpi r21, '9'+1 ; + brcc 24f ; + subi r21, '0' ; + brcs 90b ; + lsl r18 ; + mov r0, r18 ; + lsl r18 ; + lsl r18 ; + add r18, r0 ; + add r18, r21 ; + rjmp 22b ;/ + +24: brtc 25f ;get value (low word) + neg r18 ; +25: ld r24, Y+ ; + ld r25, Y+ ;/ + cpi r21, 'c' ;Is type character? + breq 1b ;/ + cpi r21, 's' ;Is type RAM string? + breq 50f ;/ + cpi r21, 'S' ;Is type ROM string? + breq 60f ;/ + _MOVW r23,r22,r25,r24 ;r25:r22 = value + clr r24 ; + clr r25 ; + clt ;/ + cpi r21, 'l' ;Is long int? + brne 26f ; + ld r24, Y+ ;get value (high word) + ld r25, Y+ ; + set ; + _LPMI r21 ;/ +26: cpi r21, 'd' ;Is type signed decimal? + brne 27f ;/ + ldi r20, -10 ; + brts 40f ; + sbrs r23, 7 ; + rjmp 40f ; + ldi r24, -1 ; + ldi r25, -1 ; + rjmp 40f ;/ +27: cpi r21, 'u' ;Is type unsigned decimal? + ldi r20, 10 ; + breq 40f ;/ + cpi r21, 'X' ;Is type hexdecimal? + ldi r20, 16 ; + breq 40f ;/ + cpi r21, 'b' ;Is type binary? + ldi r20, 2 ; + breq 40f ;/ + ret ;abort +40: push ZH ;Output the value + push ZL ; + rcall xitoa ; +42: pop ZL ; + pop ZH ; + rjmp 0b ;/ + +50: push ZH ;Put a string on the RAM + push ZL + _MOVW ZH,ZL, r25,r24 +51: ld r24, Z+ + cpi r24, 0 + breq 42b + rcall xputc + rjmp 51b + +60: push ZH ;Put a string on the ROM + push ZL + rcall xputs + rjmp 42b +.endfunc + + +.func __xprintf +.global __xprintf +__xprintf: + push YH + push YL + in YL, _SFR_IO_ADDR(SPL) +#ifdef SPH + in YH, _SFR_IO_ADDR(SPH) +#else + clr YH +#endif + adiw YL, 5 ;Y = pointer to arguments + rcall xvprintf + pop YL + pop YH + ret +.endfunc + + +#if USE_XSPRINTF + +.func __xsprintf +putram: + _MOVW ZH,ZL, r15,r14 + st Z+, r24 + _MOVW r15,r14, ZH,ZL + ret +.global __xsprintf +__xsprintf: + push YH + push YL + in YL, _SFR_IO_ADDR(SPL) +#ifdef SPH + in YH, _SFR_IO_ADDR(SPH) +#else + clr YH +#endif + adiw YL, 5 ;Y = pointer to arguments + lds ZL, xfunc_out+0 ;Save registered output function + lds ZH, xfunc_out+1 ; + push ZL ; + push ZH ;/ + ldi ZL, lo8(pm(putram));Set local output function + ldi ZH, hi8(pm(putram)); + sts xfunc_out+0, ZL ; + sts xfunc_out+1, ZH ;/ + push r15 ;Initialize pointer to string buffer + push r14 ; + ld r14, Y+ ; + ld r15, Y+ ;/ + rcall xvprintf + _MOVW ZH,ZL, r15,r14 ;Terminate string + st Z, r1 ; + pop r14 ; + pop r15 ;/ + pop ZH ;Restore registered output function + pop ZL ; + sts xfunc_out+0, ZL ; + sts xfunc_out+1, ZH ;/ + pop YL + pop YH + ret +.endfunc +#endif + + +#if USE_XFPRINTF +.func __xfprintf +.global __xfprintf +__xfprintf: + push YH + push YL + in YL, _SFR_IO_ADDR(SPL) +#ifdef SPH + in YH, _SFR_IO_ADDR(SPH) +#else + clr YH +#endif + adiw YL, 5 ;Y = pointer to arguments + lds ZL, xfunc_out+0 ;Save registered output function + lds ZH, xfunc_out+1 ; + push ZL ; + push ZH ;/ + ld ZL, Y+ ;Set output function + ld ZH, Y+ ; + sts xfunc_out+0, ZL ; + sts xfunc_out+1, ZH ;/ + rcall xvprintf + pop ZH ;Restore registered output function + pop ZL ; + sts xfunc_out+0, ZL ; + sts xfunc_out+1, ZH ;/ + pop YL + pop YH + ret +.endfunc +#endif + +#endif + + + +;--------------------------------------------------------------------------- +; Extended numeral string input +; +;Prototype: +; char xatoi ( /* 1: Successful, 0: Failed */ +; const char **str, /* pointer to pointer to source string */ +; long *res /* result */ +; ); +; + + +#if USE_XATOI +.func xatoi +.global xatoi +xatoi: + _MOVW r1, r0, r23, r22 + _MOVW XH, XL, r25, r24 + ld ZL, X+ + ld ZH, X+ + clr r18 ;r21:r18 = 0; + clr r19 ; + clr r20 ; + clr r21 ;/ + clt ;T = 0; + + ldi r25, 10 ;r25 = 10; + rjmp 41f ;/ +40: adiw ZL, 1 ;Z++; +41: ld r22, Z ;r22 = *Z; + cpi r22, ' ' ;if(r22 == ' ') continue + breq 40b ;/ + brcs 70f ;if(r22 < ' ') error; + cpi r22, '-' ;if(r22 == '-') { + brne 42f ; T = 1; + set ; continue; + rjmp 40b ;} +42: cpi r22, '9'+1 ;if(r22 > '9') error; + brcc 70f ;/ + cpi r22, '0' ;if(r22 < '0') error; + brcs 70f ;/ + brne 51f ;if(r22 > '0') cv_start; + ldi r25, 8 ;r25 = 8; + adiw ZL, 1 ;r22 = *(++Z); + ld r22, Z ;/ + cpi r22, ' '+1 ;if(r22 <= ' ') exit; + brcs 80f ;/ + cpi r22, 'b' ;if(r22 == 'b') { + brne 43f ; r25 = 2; + ldi r25, 2 ; cv_start; + rjmp 50f ;} +43: cpi r22, 'x' ;if(r22 != 'x') error; + brne 51f ;/ + ldi r25, 16 ;r25 = 16; + +50: adiw ZL, 1 ;Z++; + ld r22, Z ;r22 = *Z; +51: cpi r22, ' '+1 ;if(r22 <= ' ') break; + brcs 80f ;/ + cpi r22, 'a' ;if(r22 >= 'a') r22 =- 0x20; + brcs 52f ; + subi r22, 0x20 ;/ +52: subi r22, '0' ;if((r22 -= '0') < 0) error; + brcs 70f ;/ + cpi r22, 10 ;if(r22 >= 10) { + brcs 53f ; r22 -= 7; + subi r22, 7 ; if(r22 < 10) + cpi r22, 10 ; + brcs 70f ;} +53: cp r22, r25 ;if(r22 >= r25) error; + brcc 70f ;/ +60: ldi r24, 33 ;r21:r18 *= r25; + sub r23, r23 ; +61: brcc 62f ; + add r23, r25 ; +62: lsr r23 ; + ror r21 ; + ror r20 ; + ror r19 ; + ror r18 ; + dec r24 ; + brne 61b ;/ + add r18, r22 ;r21:r18 += r22; + adc r19, r24 ; + adc r20, r24 ; + adc r21, r24 ;/ + rjmp 50b ;repeat + +70: ldi r24, 0 + rjmp 81f +80: ldi r24, 1 +81: brtc 82f + clr r22 + com r18 + com r19 + com r20 + com r21 + adc r18, r22 + adc r19, r22 + adc r20, r22 + adc r21, r22 +82: st -X, ZH + st -X, ZL + _MOVW XH, XL, r1, r0 + st X+, r18 + st X+, r19 + st X+, r20 + st X+, r21 + clr r1 + ret +.endfunc +#endif + + diff --git a/tmk_core/common/avr/xprintf.h b/tmk_core/common/avr/xprintf.h index 59c6f25312..e53c0dd8e0 100644 --- a/tmk_core/common/avr/xprintf.h +++ b/tmk_core/common/avr/xprintf.h @@ -1,111 +1,111 @@ -/*--------------------------------------------------------------------------- - Extended itoa, puts and printf (C)ChaN, 2011 ------------------------------------------------------------------------------*/ - -#ifndef XPRINTF_H -#define XPRINTF_H - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern void (*xfunc_out)(uint8_t); -#define xdev_out(func) xfunc_out = (void(*)(uint8_t))(func) - -/* This is a pointer to user defined output function. It must be initialized - before using this modle. -*/ - -void xputc(char chr); - -/* This is a stub function to forward outputs to user defined output function. - All outputs from this module are output via this function. -*/ - - -/*-----------------------------------------------------------------------------*/ -void xputs(const char *string_p); - -/* The string placed in the ROM is forwarded to xputc() directly. -*/ - - -/*-----------------------------------------------------------------------------*/ -void xitoa(long value, char radix, char width); - -/* Extended itoa(). - - value radix width output - 100 10 6 " 100" - 100 10 -6 "000100" - 100 10 0 "100" - 4294967295 10 0 "4294967295" - 4294967295 -10 0 "-1" - 655360 16 -8 "000A0000" - 1024 16 0 "400" - 0x55 2 -8 "01010101" -*/ - - -/*-----------------------------------------------------------------------------*/ -#define xprintf(format, ...) __xprintf(PSTR(format), ##__VA_ARGS__) -#define xsprintf(str, format, ...) __xsprintf(str, PSTR(format), ##__VA_ARGS__) -#define xfprintf(func, format, ...) __xfprintf(func, PSTR(format), ##__VA_ARGS__) - -void __xprintf(const char *format_p, ...); /* Send formatted string to the registered device */ -void __xsprintf(char*, const char *format_p, ...); /* Put formatted string to the memory */ -void __xfprintf(void(*func)(uint8_t), const char *format_p, ...); /* Send formatted string to the specified device */ - -/* Format string is placed in the ROM. The format flags is similar to printf(). - - %[flag][width][size]type - - flag - A '0' means filled with '0' when output is shorter than width. - ' ' is used in default. This is effective only numeral type. - width - Minimum width in decimal number. This is effective only numeral type. - Default width is zero. - size - A 'l' means the argument is long(32bit). Default is short(16bit). - This is effective only numeral type. - type - 'c' : Character, argument is the value - 's' : String placed on the RAM, argument is the pointer - 'S' : String placed on the ROM, argument is the pointer - 'd' : Signed decimal, argument is the value - 'u' : Unsigned decimal, argument is the value - 'X' : Hexdecimal, argument is the value - 'b' : Binary, argument is the value - '%' : '%' - -*/ - - -/*-----------------------------------------------------------------------------*/ -char xatoi(char **str, long *ret); - -/* Get value of the numeral string. - - str - Pointer to pointer to source string - - "0b11001010" binary - "0377" octal - "0xff800" hexdecimal - "1250000" decimal - "-25000" decimal - - ret - Pointer to return value -*/ - -#ifdef __cplusplus -} -#endif - -#endif - +/*--------------------------------------------------------------------------- + Extended itoa, puts and printf (C)ChaN, 2011 +-----------------------------------------------------------------------------*/ + +#ifndef XPRINTF_H +#define XPRINTF_H + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern void (*xfunc_out)(uint8_t); +#define xdev_out(func) xfunc_out = (void(*)(uint8_t))(func) + +/* This is a pointer to user defined output function. It must be initialized + before using this modle. +*/ + +void xputc(char chr); + +/* This is a stub function to forward outputs to user defined output function. + All outputs from this module are output via this function. +*/ + + +/*-----------------------------------------------------------------------------*/ +void xputs(const char *string_p); + +/* The string placed in the ROM is forwarded to xputc() directly. +*/ + + +/*-----------------------------------------------------------------------------*/ +void xitoa(long value, char radix, char width); + +/* Extended itoa(). + + value radix width output + 100 10 6 " 100" + 100 10 -6 "000100" + 100 10 0 "100" + 4294967295 10 0 "4294967295" + 4294967295 -10 0 "-1" + 655360 16 -8 "000A0000" + 1024 16 0 "400" + 0x55 2 -8 "01010101" +*/ + + +/*-----------------------------------------------------------------------------*/ +#define xprintf(format, ...) __xprintf(PSTR(format), ##__VA_ARGS__) +#define xsprintf(str, format, ...) __xsprintf(str, PSTR(format), ##__VA_ARGS__) +#define xfprintf(func, format, ...) __xfprintf(func, PSTR(format), ##__VA_ARGS__) + +void __xprintf(const char *format_p, ...); /* Send formatted string to the registered device */ +void __xsprintf(char*, const char *format_p, ...); /* Put formatted string to the memory */ +void __xfprintf(void(*func)(uint8_t), const char *format_p, ...); /* Send formatted string to the specified device */ + +/* Format string is placed in the ROM. The format flags is similar to printf(). + + %[flag][width][size]type + + flag + A '0' means filled with '0' when output is shorter than width. + ' ' is used in default. This is effective only numeral type. + width + Minimum width in decimal number. This is effective only numeral type. + Default width is zero. + size + A 'l' means the argument is long(32bit). Default is short(16bit). + This is effective only numeral type. + type + 'c' : Character, argument is the value + 's' : String placed on the RAM, argument is the pointer + 'S' : String placed on the ROM, argument is the pointer + 'd' : Signed decimal, argument is the value + 'u' : Unsigned decimal, argument is the value + 'X' : Hexdecimal, argument is the value + 'b' : Binary, argument is the value + '%' : '%' + +*/ + + +/*-----------------------------------------------------------------------------*/ +char xatoi(char **str, long *ret); + +/* Get value of the numeral string. + + str + Pointer to pointer to source string + + "0b11001010" binary + "0377" octal + "0xff800" hexdecimal + "1250000" decimal + "-25000" decimal + + ret + Pointer to return value +*/ + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/tmk_core/protocol/iwrap/suart.S b/tmk_core/protocol/iwrap/suart.S index 1b02909638..a873515e10 100644 --- a/tmk_core/protocol/iwrap/suart.S +++ b/tmk_core/protocol/iwrap/suart.S @@ -1,156 +1,156 @@ -;---------------------------------------------------------------------------; -; Software implemented UART module ; -; (C)ChaN, 2005 (http://elm-chan.org/) ; -;---------------------------------------------------------------------------; -; Bit rate settings: -; -; 1MHz 2MHz 4MHz 6MHz 8MHz 10MHz 12MHz 16MHz 20MHz -; 2.4kbps 138 - - - - - - - - -; 4.8kbps 68 138 - - - - - - - -; 9.6kbps 33 68 138 208 - - - - - -; 19.2kbps - 33 68 102 138 173 208 - - -; 38.4kbps - - 33 50 68 85 102 138 172 -; 57.6kbps - - 21 33 44 56 68 91 114 -; 115.2kbps - - - - 21 27 33 44 56 - -.nolist -#include -.list - -#define BPS 102 /* Bit delay. (see above table) */ -#define BIDIR 0 /* 0:Separated Tx/Rx, 1:Shared Tx/Rx */ - -#define OUT_1 sbi _SFR_IO_ADDR(SUART_OUT_PORT), SUART_OUT_BIT /* Output 1 */ -#define OUT_0 cbi _SFR_IO_ADDR(SUART_OUT_PORT), SUART_OUT_BIT /* Output 0 */ -#define SKIP_IN_1 sbis _SFR_IO_ADDR(SUART_IN_PIN), SUART_IN_BIT /* Skip if 1 */ -#define SKIP_IN_0 sbic _SFR_IO_ADDR(SUART_IN_PIN), SUART_IN_BIT /* Skip if 0 */ - - - -#ifdef SPM_PAGESIZE -.macro _LPMI reg - lpm \reg, Z+ -.endm -.macro _MOVW dh,dl, sh,sl - movw \dl, \sl -.endm -#else -.macro _LPMI reg - lpm - mov \reg, r0 - adiw ZL, 1 -.endm -.macro _MOVW dh,dl, sh,sl - mov \dl, \sl - mov \dh, \sh -.endm -#endif - - - -;---------------------------------------------------------------------------; -; Transmit a byte in serial format of N81 -; -;Prototype: void xmit (uint8_t data); -;Size: 16 words - -.global xmit -.func xmit -xmit: -#if BIDIR - ldi r23, BPS-1 ;Pre-idle time for bidirectional data line -5: dec r23 ; - brne 5b ;/ -#endif - in r0, _SFR_IO_ADDR(SREG) ;Save flags - - com r24 ;C = start bit - ldi r25, 10 ;Bit counter - cli ;Start critical section - -1: ldi r23, BPS-1 ;----- Bit transferring loop -2: dec r23 ;Wait for a bit time - brne 2b ;/ - brcs 3f ;MISO = bit to be sent - OUT_1 ; -3: brcc 4f ; - OUT_0 ;/ -4: lsr r24 ;Get next bit into C - dec r25 ;All bits sent? - brne 1b ; no, coutinue - - out _SFR_IO_ADDR(SREG), r0 ;End of critical section - ret -.endfunc - - - -;---------------------------------------------------------------------------; -; Receive a byte -; -;Prototype: uint8_t rcvr (void); -;Size: 19 words - -.global rcvr -.func rcvr -rcvr: - in r0, _SFR_IO_ADDR(SREG) ;Save flags - - ldi r24, 0x80 ;Receiving shift reg - cli ;Start critical section - -1: SKIP_IN_1 ;Wait for idle - rjmp 1b -2: SKIP_IN_0 ;Wait for start bit - rjmp 2b - ldi r25, BPS/2 ;Wait for half bit time -3: dec r25 - brne 3b - -4: ldi r25, BPS ;----- Bit receiving loop -5: dec r25 ;Wait for a bit time - brne 5b ;/ - lsr r24 ;Next bit - SKIP_IN_0 ;Get a data bit into r24.7 - ori r24, 0x80 - brcc 4b ;All bits received? no, continue - - out _SFR_IO_ADDR(SREG), r0 ;End of critical section - ret -.endfunc - - -; Not wait for start bit. This should be called after detecting start bit. -.global recv -.func recv -recv: - in r0, _SFR_IO_ADDR(SREG) ;Save flags - - ldi r24, 0x80 ;Receiving shift reg - cli ;Start critical section - -;1: SKIP_IN_1 ;Wait for idle -; rjmp 1b -;2: SKIP_IN_0 ;Wait for start bit -; rjmp 2b - ldi r25, BPS/2 ;Wait for half bit time -3: dec r25 - brne 3b - -4: ldi r25, BPS ;----- Bit receiving loop -5: dec r25 ;Wait for a bit time - brne 5b ;/ - lsr r24 ;Next bit - SKIP_IN_0 ;Get a data bit into r24.7 - ori r24, 0x80 - brcc 4b ;All bits received? no, continue - - ldi r25, BPS/2 ;Wait for half bit time -6: dec r25 - brne 6b -7: SKIP_IN_1 ;Wait for stop bit - rjmp 7b - - out _SFR_IO_ADDR(SREG), r0 ;End of critical section - ret -.endfunc +;---------------------------------------------------------------------------; +; Software implemented UART module ; +; (C)ChaN, 2005 (http://elm-chan.org/) ; +;---------------------------------------------------------------------------; +; Bit rate settings: +; +; 1MHz 2MHz 4MHz 6MHz 8MHz 10MHz 12MHz 16MHz 20MHz +; 2.4kbps 138 - - - - - - - - +; 4.8kbps 68 138 - - - - - - - +; 9.6kbps 33 68 138 208 - - - - - +; 19.2kbps - 33 68 102 138 173 208 - - +; 38.4kbps - - 33 50 68 85 102 138 172 +; 57.6kbps - - 21 33 44 56 68 91 114 +; 115.2kbps - - - - 21 27 33 44 56 + +.nolist +#include +.list + +#define BPS 102 /* Bit delay. (see above table) */ +#define BIDIR 0 /* 0:Separated Tx/Rx, 1:Shared Tx/Rx */ + +#define OUT_1 sbi _SFR_IO_ADDR(SUART_OUT_PORT), SUART_OUT_BIT /* Output 1 */ +#define OUT_0 cbi _SFR_IO_ADDR(SUART_OUT_PORT), SUART_OUT_BIT /* Output 0 */ +#define SKIP_IN_1 sbis _SFR_IO_ADDR(SUART_IN_PIN), SUART_IN_BIT /* Skip if 1 */ +#define SKIP_IN_0 sbic _SFR_IO_ADDR(SUART_IN_PIN), SUART_IN_BIT /* Skip if 0 */ + + + +#ifdef SPM_PAGESIZE +.macro _LPMI reg + lpm \reg, Z+ +.endm +.macro _MOVW dh,dl, sh,sl + movw \dl, \sl +.endm +#else +.macro _LPMI reg + lpm + mov \reg, r0 + adiw ZL, 1 +.endm +.macro _MOVW dh,dl, sh,sl + mov \dl, \sl + mov \dh, \sh +.endm +#endif + + + +;---------------------------------------------------------------------------; +; Transmit a byte in serial format of N81 +; +;Prototype: void xmit (uint8_t data); +;Size: 16 words + +.global xmit +.func xmit +xmit: +#if BIDIR + ldi r23, BPS-1 ;Pre-idle time for bidirectional data line +5: dec r23 ; + brne 5b ;/ +#endif + in r0, _SFR_IO_ADDR(SREG) ;Save flags + + com r24 ;C = start bit + ldi r25, 10 ;Bit counter + cli ;Start critical section + +1: ldi r23, BPS-1 ;----- Bit transferring loop +2: dec r23 ;Wait for a bit time + brne 2b ;/ + brcs 3f ;MISO = bit to be sent + OUT_1 ; +3: brcc 4f ; + OUT_0 ;/ +4: lsr r24 ;Get next bit into C + dec r25 ;All bits sent? + brne 1b ; no, coutinue + + out _SFR_IO_ADDR(SREG), r0 ;End of critical section + ret +.endfunc + + + +;---------------------------------------------------------------------------; +; Receive a byte +; +;Prototype: uint8_t rcvr (void); +;Size: 19 words + +.global rcvr +.func rcvr +rcvr: + in r0, _SFR_IO_ADDR(SREG) ;Save flags + + ldi r24, 0x80 ;Receiving shift reg + cli ;Start critical section + +1: SKIP_IN_1 ;Wait for idle + rjmp 1b +2: SKIP_IN_0 ;Wait for start bit + rjmp 2b + ldi r25, BPS/2 ;Wait for half bit time +3: dec r25 + brne 3b + +4: ldi r25, BPS ;----- Bit receiving loop +5: dec r25 ;Wait for a bit time + brne 5b ;/ + lsr r24 ;Next bit + SKIP_IN_0 ;Get a data bit into r24.7 + ori r24, 0x80 + brcc 4b ;All bits received? no, continue + + out _SFR_IO_ADDR(SREG), r0 ;End of critical section + ret +.endfunc + + +; Not wait for start bit. This should be called after detecting start bit. +.global recv +.func recv +recv: + in r0, _SFR_IO_ADDR(SREG) ;Save flags + + ldi r24, 0x80 ;Receiving shift reg + cli ;Start critical section + +;1: SKIP_IN_1 ;Wait for idle +; rjmp 1b +;2: SKIP_IN_0 ;Wait for start bit +; rjmp 2b + ldi r25, BPS/2 ;Wait for half bit time +3: dec r25 + brne 3b + +4: ldi r25, BPS ;----- Bit receiving loop +5: dec r25 ;Wait for a bit time + brne 5b ;/ + lsr r24 ;Next bit + SKIP_IN_0 ;Get a data bit into r24.7 + ori r24, 0x80 + brcc 4b ;All bits received? no, continue + + ldi r25, BPS/2 ;Wait for half bit time +6: dec r25 + brne 6b +7: SKIP_IN_1 ;Wait for stop bit + rjmp 7b + + out _SFR_IO_ADDR(SREG), r0 ;End of critical section + ret +.endfunc diff --git a/tmk_core/protocol/iwrap/suart.h b/tmk_core/protocol/iwrap/suart.h index 72725b998f..7d92be0692 100644 --- a/tmk_core/protocol/iwrap/suart.h +++ b/tmk_core/protocol/iwrap/suart.h @@ -1,8 +1,8 @@ -#ifndef SUART -#define SUART - -void xmit(uint8_t); -uint8_t rcvr(void); -uint8_t recv(void); - -#endif /* SUART */ +#ifndef SUART +#define SUART + +void xmit(uint8_t); +uint8_t rcvr(void); +uint8_t recv(void); + +#endif /* SUART */ diff --git a/tmk_core/protocol/iwrap/wd.h b/tmk_core/protocol/iwrap/wd.h index 99058f0331..12395bf696 100644 --- a/tmk_core/protocol/iwrap/wd.h +++ b/tmk_core/protocol/iwrap/wd.h @@ -1,159 +1,159 @@ -/* This is from http://www.mtcnet.net/~henryvm/wdt/ */ -#ifndef _AVR_WD_H_ -#define _AVR_WD_H_ - -#include - -/* -Copyright (c) 2009, Curt Van Maanen - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -include usage- - #include "wd.h" //if in same directory as project - #include //if wd.h is in avr directory - -set watchdog modes and prescale - -usage- - WD_SET(mode,[timeout]); //prescale always set - -modes- - WD_OFF disabled - WD_RST normal reset mode - WD_IRQ interrupt only mode (if supported) - WD_RST_IRQ interrupt+reset mode (if supported) - -timeout- - WDTO_15MS default if no timeout provided - WDTO_30MS - WDTO_60MS - WDTO_120MS - WDTO_250MS - WDTO_500MS - WDTO_1S - WDTO_2S - WDTO_4S (if supported) - WDTO_8S (if supported) - -examples- - WD_SET(WD_RST,WDTO_1S); //reset mode, 1s timeout - WD_SET(WD_OFF); //watchdog disabled (if not fused on) - WD_SET(WD_RST); //reset mode, 15ms (default timeout) - WD_SET(WD_IRQ,WDTO_120MS); //interrupt only mode, 120ms timeout - WD_SET(WD_RST_IRQ,WDTO_2S); //interrupt+reset mode, 2S timeout - - -for enhanced watchdogs, if the watchdog is not being used WDRF should be -cleared on every power up or reset, along with disabling the watchdog- - WD_DISABLE(); //clear WDRF, then turn off watchdog - -*/ - -//reset registers to the same name (MCUCSR) -#if !defined(MCUCSR) -#define MCUCSR MCUSR -#endif - -//watchdog registers to the same name (WDTCSR) -#if !defined(WDTCSR) -#define WDTCSR WDTCR -#endif - -//if enhanced watchdog, define irq values, create disable macro -#if defined(WDIF) -#define WD_IRQ 0xC0 -#define WD_RST_IRQ 0xC8 -#define WD_DISABLE() do{ \ - MCUCSR &= ~(1< + +/* +Copyright (c) 2009, Curt Van Maanen + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +include usage- + #include "wd.h" //if in same directory as project + #include //if wd.h is in avr directory + +set watchdog modes and prescale + +usage- + WD_SET(mode,[timeout]); //prescale always set + +modes- + WD_OFF disabled + WD_RST normal reset mode + WD_IRQ interrupt only mode (if supported) + WD_RST_IRQ interrupt+reset mode (if supported) + +timeout- + WDTO_15MS default if no timeout provided + WDTO_30MS + WDTO_60MS + WDTO_120MS + WDTO_250MS + WDTO_500MS + WDTO_1S + WDTO_2S + WDTO_4S (if supported) + WDTO_8S (if supported) + +examples- + WD_SET(WD_RST,WDTO_1S); //reset mode, 1s timeout + WD_SET(WD_OFF); //watchdog disabled (if not fused on) + WD_SET(WD_RST); //reset mode, 15ms (default timeout) + WD_SET(WD_IRQ,WDTO_120MS); //interrupt only mode, 120ms timeout + WD_SET(WD_RST_IRQ,WDTO_2S); //interrupt+reset mode, 2S timeout + + +for enhanced watchdogs, if the watchdog is not being used WDRF should be +cleared on every power up or reset, along with disabling the watchdog- + WD_DISABLE(); //clear WDRF, then turn off watchdog + +*/ + +//reset registers to the same name (MCUCSR) +#if !defined(MCUCSR) +#define MCUCSR MCUSR +#endif + +//watchdog registers to the same name (WDTCSR) +#if !defined(WDTCSR) +#define WDTCSR WDTCR +#endif + +//if enhanced watchdog, define irq values, create disable macro +#if defined(WDIF) +#define WD_IRQ 0xC0 +#define WD_RST_IRQ 0xC8 +#define WD_DISABLE() do{ \ + MCUCSR &= ~(1< - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CDC Class Bootloader, capable of reprogramming a device using avrdude or other AVR109 protocol compliant software when plugged into a host. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CDC Class Bootloader, capable of reprogramming a device using avrdude or other AVR109 protocol compliant software when plugged into a host. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/asf.xml b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/asf.xml index 6f3312b764..f56aba69f5 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/asf.xml +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/asf.xml @@ -1,156 +1,156 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DFU Class Bootloader, capable of reprogramming a device using the Atmel FLIP or other AVR DFU programming software when plugged into a host. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DFU Class Bootloader, capable of reprogramming a device using the Atmel FLIP or other AVR DFU programming software when plugged into a host. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/HID/asf.xml b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/HID/asf.xml index 9394b13530..c67b9419ed 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/HID/asf.xml +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/HID/asf.xml @@ -1,123 +1,123 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HID Class Bootloader, capable of reprogramming a device via a custom cross-platform command line utility when plugged into a host. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HID Class Bootloader, capable of reprogramming a device via a custom cross-platform command line utility when plugged into a host. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/BootloaderAPITable.S b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/BootloaderAPITable.S index 6844d4b01c..91fc949666 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/BootloaderAPITable.S +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/BootloaderAPITable.S @@ -1,102 +1,102 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2014. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -/* - Copyright 2014 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - Permission to use, copy, modify, distribute, and sell this - software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in - all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the - software without specific, written prior permission. - - The author disclaims all warranties with regard to this - software, including all implied warranties of merchantability - and fitness. In no event shall the author be liable for any - special, indirect or consequential damages or any damages - whatsoever resulting from loss of use, data or profits, whether - in an action of contract, negligence or other tortious action, - arising out of or in connection with the use or performance of - this software. -*/ - -#if AUX_BOOT_SECTION_SIZE > 0 -#warning Using a AUX bootloader section in addition to the defined bootloader space (see documentation). - -; Trampoline to jump over the AUX bootloader section to the start of the bootloader, -; on devices where an AUX bootloader section is used. -.section .boot_aux_trampoline, "ax" -.global Boot_AUX_Trampoline -Boot_AUX_Trampoline: - jmp BOOT_START_ADDR -#endif - -; Trampolines to actual API implementations if the target address is outside the -; range of a rjmp instruction (can happen with large bootloader sections) -.section .apitable_trampolines, "ax" -.global BootloaderAPI_Trampolines -BootloaderAPI_Trampolines: - - BootloaderAPI_ErasePage_Trampoline: - jmp BootloaderAPI_ErasePage - BootloaderAPI_WritePage_Trampoline: - jmp BootloaderAPI_WritePage - BootloaderAPI_FillWord_Trampoline: - jmp BootloaderAPI_FillWord - BootloaderAPI_ReadSignature_Trampoline: - jmp BootloaderAPI_ReadSignature - BootloaderAPI_ReadFuse_Trampoline: - jmp BootloaderAPI_ReadFuse - BootloaderAPI_ReadLock_Trampoline: - jmp BootloaderAPI_ReadLock - BootloaderAPI_WriteLock_Trampoline: - jmp BootloaderAPI_WriteLock - BootloaderAPI_UNUSED1: - ret - BootloaderAPI_UNUSED2: - ret - BootloaderAPI_UNUSED3: - ret - BootloaderAPI_UNUSED4: - ret - BootloaderAPI_UNUSED5: - ret - - - -; API function jump table -.section .apitable_jumptable, "ax" -.global BootloaderAPI_JumpTable -BootloaderAPI_JumpTable: - - rjmp BootloaderAPI_ErasePage_Trampoline - rjmp BootloaderAPI_WritePage_Trampoline - rjmp BootloaderAPI_FillWord_Trampoline - rjmp BootloaderAPI_ReadSignature_Trampoline - rjmp BootloaderAPI_ReadFuse_Trampoline - rjmp BootloaderAPI_ReadLock_Trampoline - rjmp BootloaderAPI_WriteLock_Trampoline - rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1 - rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2 - rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3 - rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4 - rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5 - - - -; Bootloader table signatures and information -.section .apitable_signatures, "ax" -.global BootloaderAPI_Signatures -BootloaderAPI_Signatures: - - .long BOOT_START_ADDR ; Start address of the bootloader - .word 0xDF30 ; Signature for the MS class bootloader, V1 - .word 0xDCFB ; Signature for a LUFA class bootloader +/* + LUFA Library + Copyright (C) Dean Camera, 2014. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2014 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaims all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +#if AUX_BOOT_SECTION_SIZE > 0 +#warning Using a AUX bootloader section in addition to the defined bootloader space (see documentation). + +; Trampoline to jump over the AUX bootloader section to the start of the bootloader, +; on devices where an AUX bootloader section is used. +.section .boot_aux_trampoline, "ax" +.global Boot_AUX_Trampoline +Boot_AUX_Trampoline: + jmp BOOT_START_ADDR +#endif + +; Trampolines to actual API implementations if the target address is outside the +; range of a rjmp instruction (can happen with large bootloader sections) +.section .apitable_trampolines, "ax" +.global BootloaderAPI_Trampolines +BootloaderAPI_Trampolines: + + BootloaderAPI_ErasePage_Trampoline: + jmp BootloaderAPI_ErasePage + BootloaderAPI_WritePage_Trampoline: + jmp BootloaderAPI_WritePage + BootloaderAPI_FillWord_Trampoline: + jmp BootloaderAPI_FillWord + BootloaderAPI_ReadSignature_Trampoline: + jmp BootloaderAPI_ReadSignature + BootloaderAPI_ReadFuse_Trampoline: + jmp BootloaderAPI_ReadFuse + BootloaderAPI_ReadLock_Trampoline: + jmp BootloaderAPI_ReadLock + BootloaderAPI_WriteLock_Trampoline: + jmp BootloaderAPI_WriteLock + BootloaderAPI_UNUSED1: + ret + BootloaderAPI_UNUSED2: + ret + BootloaderAPI_UNUSED3: + ret + BootloaderAPI_UNUSED4: + ret + BootloaderAPI_UNUSED5: + ret + + + +; API function jump table +.section .apitable_jumptable, "ax" +.global BootloaderAPI_JumpTable +BootloaderAPI_JumpTable: + + rjmp BootloaderAPI_ErasePage_Trampoline + rjmp BootloaderAPI_WritePage_Trampoline + rjmp BootloaderAPI_FillWord_Trampoline + rjmp BootloaderAPI_ReadSignature_Trampoline + rjmp BootloaderAPI_ReadFuse_Trampoline + rjmp BootloaderAPI_ReadLock_Trampoline + rjmp BootloaderAPI_WriteLock_Trampoline + rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1 + rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2 + rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3 + rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4 + rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5 + + + +; Bootloader table signatures and information +.section .apitable_signatures, "ax" +.global BootloaderAPI_Signatures +BootloaderAPI_Signatures: + + .long BOOT_START_ADDR ; Start address of the bootloader + .word 0xDF30 ; Signature for the MS class bootloader, V1 + .word 0xDCFB ; Signature for a LUFA class bootloader diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/asf.xml b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/asf.xml index f1d550d1eb..700ffa26ff 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/asf.xml +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/asf.xml @@ -1,156 +1,156 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Mass Storage Class Bootloader, capable of reprogramming a device via binary BIN files copied to the virtual FAT12 file-system it creates when plugged into a host. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mass Storage Class Bootloader, capable of reprogramming a device via binary BIN files copied to the virtual FAT12 file-system it creates when plugged into a host. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/makefile b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/makefile index 91bb4038e8..a0edb2c4f5 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/makefile +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/MassStorage/makefile @@ -1,68 +1,68 @@ -# -# LUFA Library -# Copyright (C) Dean Camera, 2014. -# -# dean [at] fourwalledcubicle [dot] com -# www.lufa-lib.org -# -# -------------------------------------- -# LUFA Project Makefile. -# -------------------------------------- - -# Run "make help" for target help. - -MCU = at90usb1287 -ARCH = AVR8 -BOARD = USBKEY -F_CPU = 8000000 -F_USB = $(F_CPU) -OPTIMIZATION = s -TARGET = BootloaderMassStorage -SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S Lib/SCSI.c Lib/VirtualFAT.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) -LUFA_PATH = ../../LUFA -CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET) -LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS) - -# Flash size and bootloader section sizes of the target, in KB. These must -# match the target's total FLASH size and the bootloader size set in the -# device's fuses. -FLASH_SIZE_KB = 128 -BOOT_SECTION_SIZE_KB = 8 - -# Bootloader address calculation formulas -# Do not modify these macros, but rather modify the dependent values above. -CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) ) -BOOT_START_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 ) -BOOT_SEC_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - ($(strip $(1))) ) - -# Bootloader linker section flags for relocating the API table sections to -# known FLASH addresses - these should not normally be user-edited. -BOOT_SECTION_LD_FLAG = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2)) -BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96) -BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable, BootloaderAPI_JumpTable, 32) -BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures, BootloaderAPI_Signatures, 8) - -# Check if the bootloader needs an AUX section, located before the real bootloader section to store some of the -# bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum -# bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices. -ifeq ($(BOOT_SECTION_SIZE_KB),8) - CC_FLAGS += -DAUX_BOOT_SECTION_SIZE=0 -else - AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB)) - - CC_FLAGS += -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)' - LD_FLAGS += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16)) - LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024) -endif - -# Default target -all: - -# Include LUFA build script makefiles -include $(LUFA_PATH)/Build/lufa_core.mk -include $(LUFA_PATH)/Build/lufa_sources.mk -include $(LUFA_PATH)/Build/lufa_build.mk -include $(LUFA_PATH)/Build/lufa_cppcheck.mk -include $(LUFA_PATH)/Build/lufa_doxygen.mk -include $(LUFA_PATH)/Build/lufa_avrdude.mk -include $(LUFA_PATH)/Build/lufa_atprogram.mk +# +# LUFA Library +# Copyright (C) Dean Camera, 2014. +# +# dean [at] fourwalledcubicle [dot] com +# www.lufa-lib.org +# +# -------------------------------------- +# LUFA Project Makefile. +# -------------------------------------- + +# Run "make help" for target help. + +MCU = at90usb1287 +ARCH = AVR8 +BOARD = USBKEY +F_CPU = 8000000 +F_USB = $(F_CPU) +OPTIMIZATION = s +TARGET = BootloaderMassStorage +SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S Lib/SCSI.c Lib/VirtualFAT.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) +LUFA_PATH = ../../LUFA +CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET) +LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS) + +# Flash size and bootloader section sizes of the target, in KB. These must +# match the target's total FLASH size and the bootloader size set in the +# device's fuses. +FLASH_SIZE_KB = 128 +BOOT_SECTION_SIZE_KB = 8 + +# Bootloader address calculation formulas +# Do not modify these macros, but rather modify the dependent values above. +CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) ) +BOOT_START_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 ) +BOOT_SEC_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - ($(strip $(1))) ) + +# Bootloader linker section flags for relocating the API table sections to +# known FLASH addresses - these should not normally be user-edited. +BOOT_SECTION_LD_FLAG = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2)) +BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96) +BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable, BootloaderAPI_JumpTable, 32) +BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures, BootloaderAPI_Signatures, 8) + +# Check if the bootloader needs an AUX section, located before the real bootloader section to store some of the +# bootloader code. This is required for 32KB and smaller devices, where the actual bootloader is 6KB but the maximum +# bootloader section size is 4KB. The actual usable application space will be reduced by 6KB for these devices. +ifeq ($(BOOT_SECTION_SIZE_KB),8) + CC_FLAGS += -DAUX_BOOT_SECTION_SIZE=0 +else + AUX_BOOT_SECTION_SIZE_KB = (6 - $(BOOT_SECTION_SIZE_KB)) + + CC_FLAGS += -DAUX_BOOT_SECTION_SIZE='($(AUX_BOOT_SECTION_SIZE_KB) * 1024)' + LD_FLAGS += -Wl,--section-start=.boot_aux=$(call BOOT_SEC_OFFSET, (($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024 - 16)) + LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .boot_aux_trampoline, Boot_AUX_Trampoline, ($(BOOT_SECTION_SIZE_KB) + $(AUX_BOOT_SECTION_SIZE_KB)) * 1024) +endif + +# Default target +all: + +# Include LUFA build script makefiles +include $(LUFA_PATH)/Build/lufa_core.mk +include $(LUFA_PATH)/Build/lufa_sources.mk +include $(LUFA_PATH)/Build/lufa_build.mk +include $(LUFA_PATH)/Build/lufa_cppcheck.mk +include $(LUFA_PATH)/Build/lufa_doxygen.mk +include $(LUFA_PATH)/Build/lufa_avrdude.mk +include $(LUFA_PATH)/Build/lufa_atprogram.mk diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/BootloaderAPITable.S b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/BootloaderAPITable.S index ec499b74e5..88c51da825 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/BootloaderAPITable.S +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/BootloaderAPITable.S @@ -1,91 +1,91 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2014. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -/* - Copyright 2014 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - Permission to use, copy, modify, distribute, and sell this - software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in - all copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the - software without specific, written prior permission. - - The author disclaims all warranties with regard to this - software, including all implied warranties of merchantability - and fitness. In no event shall the author be liable for any - special, indirect or consequential damages or any damages - whatsoever resulting from loss of use, data or profits, whether - in an action of contract, negligence or other tortious action, - arising out of or in connection with the use or performance of - this software. -*/ - -; Trampolines to actual API implementations if the target address is outside the -; range of a rjmp instruction (can happen with large bootloader sections) -.section .apitable_trampolines, "ax" -.global BootloaderAPI_Trampolines -BootloaderAPI_Trampolines: - - BootloaderAPI_ErasePage_Trampoline: - jmp BootloaderAPI_ErasePage - BootloaderAPI_WritePage_Trampoline: - jmp BootloaderAPI_WritePage - BootloaderAPI_FillWord_Trampoline: - jmp BootloaderAPI_FillWord - BootloaderAPI_ReadSignature_Trampoline: - jmp BootloaderAPI_ReadSignature - BootloaderAPI_ReadFuse_Trampoline: - jmp BootloaderAPI_ReadFuse - BootloaderAPI_ReadLock_Trampoline: - jmp BootloaderAPI_ReadLock - BootloaderAPI_WriteLock_Trampoline: - jmp BootloaderAPI_WriteLock - BootloaderAPI_UNUSED1: - ret - BootloaderAPI_UNUSED2: - ret - BootloaderAPI_UNUSED3: - ret - BootloaderAPI_UNUSED4: - ret - BootloaderAPI_UNUSED5: - ret - - - -; API function jump table -.section .apitable_jumptable, "ax" -.global BootloaderAPI_JumpTable -BootloaderAPI_JumpTable: - - rjmp BootloaderAPI_ErasePage_Trampoline - rjmp BootloaderAPI_WritePage_Trampoline - rjmp BootloaderAPI_FillWord_Trampoline - rjmp BootloaderAPI_ReadSignature_Trampoline - rjmp BootloaderAPI_ReadFuse_Trampoline - rjmp BootloaderAPI_ReadLock_Trampoline - rjmp BootloaderAPI_WriteLock_Trampoline - rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1 - rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2 - rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3 - rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4 - rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5 - - - -; Bootloader table signatures and information -.section .apitable_signatures, "ax" -.global BootloaderAPI_Signatures -BootloaderAPI_Signatures: - - .long BOOT_START_ADDR ; Start address of the bootloader - .word 0xDF20 ; Signature for the Printer class bootloader - .word 0xDCFB ; Signature for a LUFA class bootloader +/* + LUFA Library + Copyright (C) Dean Camera, 2014. + + dean [at] fourwalledcubicle [dot] com + www.lufa-lib.org +*/ + +/* + Copyright 2014 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaims all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +; Trampolines to actual API implementations if the target address is outside the +; range of a rjmp instruction (can happen with large bootloader sections) +.section .apitable_trampolines, "ax" +.global BootloaderAPI_Trampolines +BootloaderAPI_Trampolines: + + BootloaderAPI_ErasePage_Trampoline: + jmp BootloaderAPI_ErasePage + BootloaderAPI_WritePage_Trampoline: + jmp BootloaderAPI_WritePage + BootloaderAPI_FillWord_Trampoline: + jmp BootloaderAPI_FillWord + BootloaderAPI_ReadSignature_Trampoline: + jmp BootloaderAPI_ReadSignature + BootloaderAPI_ReadFuse_Trampoline: + jmp BootloaderAPI_ReadFuse + BootloaderAPI_ReadLock_Trampoline: + jmp BootloaderAPI_ReadLock + BootloaderAPI_WriteLock_Trampoline: + jmp BootloaderAPI_WriteLock + BootloaderAPI_UNUSED1: + ret + BootloaderAPI_UNUSED2: + ret + BootloaderAPI_UNUSED3: + ret + BootloaderAPI_UNUSED4: + ret + BootloaderAPI_UNUSED5: + ret + + + +; API function jump table +.section .apitable_jumptable, "ax" +.global BootloaderAPI_JumpTable +BootloaderAPI_JumpTable: + + rjmp BootloaderAPI_ErasePage_Trampoline + rjmp BootloaderAPI_WritePage_Trampoline + rjmp BootloaderAPI_FillWord_Trampoline + rjmp BootloaderAPI_ReadSignature_Trampoline + rjmp BootloaderAPI_ReadFuse_Trampoline + rjmp BootloaderAPI_ReadLock_Trampoline + rjmp BootloaderAPI_WriteLock_Trampoline + rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1 + rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2 + rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3 + rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4 + rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5 + + + +; Bootloader table signatures and information +.section .apitable_signatures, "ax" +.global BootloaderAPI_Signatures +BootloaderAPI_Signatures: + + .long BOOT_START_ADDR ; Start address of the bootloader + .word 0xDF20 ; Signature for the Printer class bootloader + .word 0xDCFB ; Signature for a LUFA class bootloader diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/asf.xml b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/asf.xml index 86a56911ed..b5c0c6b3a5 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/asf.xml +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/asf.xml @@ -1,159 +1,159 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Printer Class Bootloader, capable of reprogramming a device by "printing" new HEX files to the virtual Plain-Text printer it creates when plugged into a host. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Printer Class Bootloader, capable of reprogramming a device by "printing" new HEX files to the virtual Plain-Text printer it creates when plugged into a host. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/makefile b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/makefile index 0716c3bbe8..0db035de3b 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/makefile +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/Printer/makefile @@ -1,55 +1,55 @@ -# -# LUFA Library -# Copyright (C) Dean Camera, 2014. -# -# dean [at] fourwalledcubicle [dot] com -# www.lufa-lib.org -# -# -------------------------------------- -# LUFA Project Makefile. -# -------------------------------------- - -# Run "make help" for target help. - -MCU = at90usb1287 -ARCH = AVR8 -BOARD = USBKEY -F_CPU = 8000000 -F_USB = $(F_CPU) -OPTIMIZATION = s -TARGET = BootloaderPrinter -SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) -LUFA_PATH = ../../LUFA -CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET) -LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS) - -# Flash size and bootloader section sizes of the target, in KB. These must -# match the target's total FLASH size and the bootloader size set in the -# device's fuses. -FLASH_SIZE_KB = 128 -BOOT_SECTION_SIZE_KB = 8 - -# Bootloader address calculation formulas -# Do not modify these macros, but rather modify the dependent values above. -CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) ) -BOOT_START_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 ) -BOOT_SEC_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - ($(strip $(1))) ) - -# Bootloader linker section flags for relocating the API table sections to -# known FLASH addresses - these should not normally be user-edited. -BOOT_SECTION_LD_FLAG = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2)) -BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96) -BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable, BootloaderAPI_JumpTable, 32) -BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures, BootloaderAPI_Signatures, 8) - -# Default target -all: - -# Include LUFA build script makefiles -include $(LUFA_PATH)/Build/lufa_core.mk -include $(LUFA_PATH)/Build/lufa_sources.mk -include $(LUFA_PATH)/Build/lufa_build.mk -include $(LUFA_PATH)/Build/lufa_cppcheck.mk -include $(LUFA_PATH)/Build/lufa_doxygen.mk -include $(LUFA_PATH)/Build/lufa_avrdude.mk -include $(LUFA_PATH)/Build/lufa_atprogram.mk +# +# LUFA Library +# Copyright (C) Dean Camera, 2014. +# +# dean [at] fourwalledcubicle [dot] com +# www.lufa-lib.org +# +# -------------------------------------- +# LUFA Project Makefile. +# -------------------------------------- + +# Run "make help" for target help. + +MCU = at90usb1287 +ARCH = AVR8 +BOARD = USBKEY +F_CPU = 8000000 +F_USB = $(F_CPU) +OPTIMIZATION = s +TARGET = BootloaderPrinter +SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) +LUFA_PATH = ../../LUFA +CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET) +LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS) + +# Flash size and bootloader section sizes of the target, in KB. These must +# match the target's total FLASH size and the bootloader size set in the +# device's fuses. +FLASH_SIZE_KB = 128 +BOOT_SECTION_SIZE_KB = 8 + +# Bootloader address calculation formulas +# Do not modify these macros, but rather modify the dependent values above. +CALC_ADDRESS_IN_HEX = $(shell printf "0x%X" $$(( $(1) )) ) +BOOT_START_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024 ) +BOOT_SEC_OFFSET = $(call CALC_ADDRESS_IN_HEX, ($(FLASH_SIZE_KB) * 1024) - ($(strip $(1))) ) + +# Bootloader linker section flags for relocating the API table sections to +# known FLASH addresses - these should not normally be user-edited. +BOOT_SECTION_LD_FLAG = -Wl,--section-start=$(strip $(1))=$(call BOOT_SEC_OFFSET, $(3)) -Wl,--undefined=$(strip $(2)) +BOOT_API_LD_FLAGS = $(call BOOT_SECTION_LD_FLAG, .apitable_trampolines, BootloaderAPI_Trampolines, 96) +BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_jumptable, BootloaderAPI_JumpTable, 32) +BOOT_API_LD_FLAGS += $(call BOOT_SECTION_LD_FLAG, .apitable_signatures, BootloaderAPI_Signatures, 8) + +# Default target +all: + +# Include LUFA build script makefiles +include $(LUFA_PATH)/Build/lufa_core.mk +include $(LUFA_PATH)/Build/lufa_sources.mk +include $(LUFA_PATH)/Build/lufa_build.mk +include $(LUFA_PATH)/Build/lufa_cppcheck.mk +include $(LUFA_PATH)/Build/lufa_doxygen.mk +include $(LUFA_PATH)/Build/lufa_avrdude.mk +include $(LUFA_PATH)/Build/lufa_atprogram.mk diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/Build/HID_EEPROM_Loader/makefile b/tmk_core/protocol/lufa/LUFA-git/LUFA/Build/HID_EEPROM_Loader/makefile index 9fd188c936..e839ba6b1d 100644 --- a/tmk_core/protocol/lufa/LUFA-git/LUFA/Build/HID_EEPROM_Loader/makefile +++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/Build/HID_EEPROM_Loader/makefile @@ -1,42 +1,42 @@ -# -# LUFA Library -# Copyright (C) Dean Camera, 2014. -# -# dean [at] fourwalledcubicle [dot] com -# www.lufa-lib.org -# -# -------------------------------------- -# LUFA Project Makefile. -# -------------------------------------- - -# Run "make help" for target help. - -MCU = at90usb1287 -ARCH = AVR8 -F_CPU = 1000000 -F_USB = $(F_CPU) -OPTIMIZATION = s -TARGET = HID_EEPROM_Loader -SRC = $(TARGET).c -LUFA_PATH = ../../../LUFA -CC_FLAGS = -LD_FLAGS = -OBJECT_FILES = InputEEData.o - -# Default target -all: - -# Determine the AVR sub-architecture of the build main application object file -FIND_AVR_SUBARCH = avr$(shell avr-objdump -f $(TARGET).o | grep architecture | cut -d':' -f3 | cut -d',' -f1) - -# Create a linkable object file with the input binary EEPROM data stored in the FLASH section -InputEEData.o: InputEEData.bin $(TARGET).o $(MAKEFILE_LIST) - @echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a object file \"$@\" - avr-objcopy -I binary -O elf32-avr -B $(call FIND_AVR_SUBARCH) --rename-section .data=.progmem.data,contents,alloc,readonly,data $< $@ - -# Include LUFA build script makefiles -include $(LUFA_PATH)/Build/lufa_core.mk -include $(LUFA_PATH)/Build/lufa_build.mk -include $(LUFA_PATH)/Build/lufa_cppcheck.mk -include $(LUFA_PATH)/Build/lufa_doxygen.mk -include $(LUFA_PATH)/Build/lufa_hid.mk +# +# LUFA Library +# Copyright (C) Dean Camera, 2014. +# +# dean [at] fourwalledcubicle [dot] com +# www.lufa-lib.org +# +# -------------------------------------- +# LUFA Project Makefile. +# -------------------------------------- + +# Run "make help" for target help. + +MCU = at90usb1287 +ARCH = AVR8 +F_CPU = 1000000 +F_USB = $(F_CPU) +OPTIMIZATION = s +TARGET = HID_EEPROM_Loader +SRC = $(TARGET).c +LUFA_PATH = ../../../LUFA +CC_FLAGS = +LD_FLAGS = +OBJECT_FILES = InputEEData.o + +# Default target +all: + +# Determine the AVR sub-architecture of the build main application object file +FIND_AVR_SUBARCH = avr$(shell avr-objdump -f $(TARGET).o | grep architecture | cut -d':' -f3 | cut -d',' -f1) + +# Create a linkable object file with the input binary EEPROM data stored in the FLASH section +InputEEData.o: InputEEData.bin $(TARGET).o $(MAKEFILE_LIST) + @echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a object file \"$@\" + avr-objcopy -I binary -O elf32-avr -B $(call FIND_AVR_SUBARCH) --rename-section .data=.progmem.data,contents,alloc,readonly,data $< $@ + +# Include LUFA build script makefiles +include $(LUFA_PATH)/Build/lufa_core.mk +include $(LUFA_PATH)/Build/lufa_build.mk +include $(LUFA_PATH)/Build/lufa_cppcheck.mk +include $(LUFA_PATH)/Build/lufa_doxygen.mk +include $(LUFA_PATH)/Build/lufa_hid.mk diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/DeviceTemplate/asf.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/DeviceTemplate/asf.xml index fd65db283f..e952714e16 100644 --- a/tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/DeviceTemplate/asf.xml +++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/DeviceTemplate/asf.xml @@ -1,55 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - Template for a LUFA USB device mode application. - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + Template for a LUFA USB device mode application. + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/HostTemplate/asf.xml b/tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/HostTemplate/asf.xml index c1996ec711..c3860c056d 100644 --- a/tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/HostTemplate/asf.xml +++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/CodeTemplates/HostTemplate/asf.xml @@ -1,41 +1,41 @@ - - - - - - - - - - - - - - - - Template for a LUFA USB host mode application. - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Template for a LUFA USB host mode application. + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/DoxygenPages/BuildSystem.txt b/tmk_core/protocol/lufa/LUFA-git/LUFA/DoxygenPages/BuildSystem.txt index 7ddfa1be3f..0ae1dd678f 100644 --- a/tmk_core/protocol/lufa/LUFA-git/LUFA/DoxygenPages/BuildSystem.txt +++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/DoxygenPages/BuildSystem.txt @@ -1,975 +1,975 @@ -/** \file - * - * This file contains special DoxyGen information for the generation of the main page and other special - * documentation pages. It is not a project source file. - */ - -/** \page Page_BuildSystem The LUFA Build System - * - * \section Sec_BuildSystem_Overview Overview of the LUFA Build System - * The LUFA build system is an attempt at making a set of re-usable, modular build make files which - * can be referenced in a LUFA powered project, to minimize the amount of code required in an - * application makefile. The system is written in GNU Make, and each module is independent of - * one-another. - * - * For details on the prerequisites needed for Linux and Windows machines to be able to use the LUFA - * build system, see \ref Sec_CompilingApps_Prerequisites. - * - * To use a LUFA build system module, simply add an include to your project makefile. All user projects - * should at a minimum include \ref Page_BuildModule_CORE for base functionality: - * \code - * include $(LUFA_PATH)/Build/lufa_core.mk - * \endcode - * - * Once included in your project makefile, the associated build module targets will be added to your - * project's build makefile targets automatically. To call a build target, run make {TARGET_NAME} - * from the command line, substituting in the appropriate target name. - * - * \see \ref Sec_ConfiguringApps_AppMakefileParams for a copy of the sample LUFA project makefile. - * - * Each build module may have one or more mandatory parameters (GNU Make variables) which must - * be supplied in the project makefile for the module to work, and one or more optional parameters which - * may be defined and which will assume a sensible default if not. - * - * \section SSec_BuildSystem_Modules Available Modules - * - * The following modules are included in this LUFA release: - * - * \li \subpage Page_BuildModule_ATPROGRAM - Device Programming - * \li \subpage Page_BuildModule_AVRDUDE - Device Programming - * \li \subpage Page_BuildModule_BUILD - Compiling/Assembling/Linking - * \li \subpage Page_BuildModule_CORE - Core Build System Functions - * \li \subpage Page_BuildModule_CPPCHECK - Static Code Analysis - * \li \subpage Page_BuildModule_DFU - Device Programming - * \li \subpage Page_BuildModule_DOXYGEN - Automated Source Code Documentation - * \li \subpage Page_BuildModule_HID - Device Programming - * \li \subpage Page_BuildModule_SOURCES - LUFA Module Source Code Variables - * - * If you have problems building using the LUFA build system, see \subpage Page_BuildTroubleshooting for resolution steps. - */ - - /** \page Page_BuildModule_BUILD The BUILD build module - * - * The BUILD LUFA build system module, providing targets for the compilation, - * assembling and linking of an application from source code into binary files - * suitable for programming into a target device, using the GCC compiler. - * - * To use this module in your application makefile, add the following code: - * \code - * include $(LUFA_PATH)/Build/lufa_build.mk - * \endcode - * - * \section SSec_BuildModule_BUILD_Requirements Requirements - * This module requires the the architecture appropriate binaries of the GCC compiler are available in your - * system's PATH variable. The GCC compiler and associated toolchain is distributed in Atmel AVR Studio - * 5.x and Atmel Studio 6.x installation directories, as well as in many third party distribution packages. - * - * \section SSec_BuildModule_BUILD_Targets Targets - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
sizeDisplay size of the compiled application FLASH and SRAM segments.
symbol-sizesDisplay a size-sorted list of symbols from the compiled application, in decimal bytes.
libBuild and archive all source files into a library A binary file.
allBuild and link the application into ELF debug and HEX binary files.
elfBuild and link the application into an ELF debug file.
binBuild and link the application and produce a BIN binary file.
hexBuild and link the application and produce HEX and EEP binary files.
lssBuild and link the application and produce a LSS source code/assembly code mixed listing file.
cleanRemove all intermediary files and binary output files.
mostlycleanRemove all intermediary files but preserve any binary output files.
<filename>.sCreate an assembly listing of a given input C/C++ source file.
- * - * \section SSec_BuildModule_BUILD_MandatoryParams Mandatory Parameters - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
TARGETName of the application output file prefix (e.g. TestApplication).
ARCHArchitecture of the target processor (see \ref Page_DeviceSupport).
MCUName of the Atmel processor model (e.g. at90usb1287).
SRCList of relative or absolute paths to the application C (.c), C++ (.cpp) and Assembly (.S) source files.
F_USBSpeed in Hz of the input clock frequency to the target's USB controller.
LUFA_PATHPath to the LUFA library core, either relative or absolute (e.g. ../LUFA-000000/LUFA/).
- * - * \section SSec_BuildModule_BUILD_OptionalParams Optional Parameters - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
BOARDLUFA board hardware drivers to use (see \ref Page_DeviceSupport).
OPTIMIZATIONOptimization level to use when compiling source files (see GCC manual).
C_STANDARDVersion of the C standard to apply when compiling C++ source files (see GCC manual).
CPP_STANDARDVersion of the C++ standard to apply when compiling C++ source files (see GCC manual).
DEBUG_FORMATFormat of the debug information to embed in the generated object files (see GCC manual).
DEBUG_LEVELLevel of the debugging information to embed in the generated object files (see GCC manual).
F_CPUSpeed of the processor CPU clock, in Hz.
C_FLAGSFlags to pass to the C compiler only, after the automatically generated flags.
CPP_FLAGSFlags to pass to the C++ compiler only, after the automatically generated flags.
ASM_FLAGSFlags to pass to the assembler only, after the automatically generated flags.
CC_FLAGSCommon flags to pass to the C/C++ compiler and assembler, after the automatically generated flags.
COMPILER_PATHDirectory where the C/C++ toolchain is located, if not available in the system PATH.
LD_FLAGSFlags to pass to the linker, after the automatically generated flags.
LINKER_RELAXATIONSEnables or disables linker relaxations when linking the application binary. This can reduce the total size - * of the application by replacing full \c CALL instructions with smaller \c RCALL instructions where possible. - * \note On some unpatched versions of binutils, this can cause link failures in some circumstances. If you - * receive a link error relocation truncated to fit: R_AVR_13_PCREL, disable this setting.
OBJDIRDirectory to place the generated object and dependency files. If set to "." the same folder as the source file will be used. - * \note When this option is enabled, all source filenames must be unique.
OBJECT_FILESList of additional object files that should be linked into the resulting binary.
- * - * \section SSec_BuildModule_BUILD_ProvidedVariables Module Provided Variables - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_BUILD_ProvidedMacros Module Provided Macros - * - * - * - * - * - *
None
- */ - -/** \page Page_BuildModule_CORE The CORE build module - * - * The core LUFA build system module, providing common build system help and information targets. - * - * To use this module in your application makefile, add the following code: - * \code - * include $(LUFA_PATH)/Build/lufa_core.mk - * \endcode - * - * \section SSec_BuildModule_CORE_Requirements Requirements - * This module has no requirements outside a standard *nix shell like environment; the sh - * shell, GNU make and *nix CoreUtils (echo, printf, etc.). - * - * \section SSec_BuildModule_CORE_Targets Targets - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
helpDisplay build system help and configuration information.
list_targetsList all available build targets from the build system.
list_modulesList all available build modules from the build system.
list_mandatoryList all mandatory parameters required by the included modules.
list_optionalList all optional parameters required by the included modules.
list_providedList all variables provided by the included modules.
list_macrosList all macros provided by the included modules.
- * - * \section SSec_BuildModule_CORE_MandatoryParams Mandatory Parameters - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_CORE_OptionalParams Optional Parameters - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_CORE_ProvidedVariables Module Provided Variables - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_CORE_ProvidedMacros Module Provided Macros - * - * - * - * - * - *
None
- */ - -/** \page Page_BuildModule_ATPROGRAM The ATPROGRAM build module - * - * The ATPROGRAM programming utility LUFA build system module, providing targets to reprogram an - * Atmel processor FLASH and EEPROM memories with a project's compiled binary output files. - * - * To use this module in your application makefile, add the following code: - * \code - * include $(LUFA_PATH)/Build/lufa_atprogram.mk - * \endcode - * - * \section SSec_BuildModule_ATPROGRAM_Requirements Requirements - * This module requires the atprogram.exe utility to be available in your system's PATH - * variable. The atprogram.exe utility is distributed in Atmel AVR Studio 5.x and Atmel Studio 6.x - * inside the application install folder's "\atbackend" subdirectory. - * - * \section SSec_BuildModule_ATPROGRAM_Targets Targets - * - * - * - * - * - * - * - * - * - * - *
atprogramProgram the device FLASH memory with the application's executable data.
atprogram-eeProgram the device EEPROM memory with the application's EEPROM data.
- * - * \section SSec_BuildModule_ATPROGRAM_MandatoryParams Mandatory Parameters - * - * - * - * - * - * - * - * - * - * - *
MCUName of the Atmel processor model (e.g. at90usb1287).
TARGETName of the application output file prefix (e.g. TestApplication).
- * - * \section SSec_BuildModule_ATPROGRAM_OptionalParams Optional Parameters - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
ATPROGRAM_PROGRAMMERName of the Atmel programmer or debugger tool to communicate with (e.g. jtagice3).
ATPROGRAM_INTERFACEName of the programming interface to use when programming the target (e.g. spi).
ATPROGRAM_PORTName of the communication port to use when when programming with a serially connected tool (e.g. COM2).
- * - * \section SSec_BuildModule_ATPROGRAM_ProvidedVariables Module Provided Variables - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_ATPROGRAM_ProvidedMacros Module Provided Macros - * - * - * - * - * - *
None
- */ - -/** \page Page_BuildModule_AVRDUDE The AVRDUDE build module - * - * The AVRDUDE programming utility LUFA build system module, providing targets to reprogram an - * Atmel processor FLASH and EEPROM memories with a project's compiled binary output files. - * - * To use this module in your application makefile, add the following code: - * \code - * include $(LUFA_PATH)/Build/lufa_avrdude.mk - * \endcode - * - * \section SSec_BuildModule_AVRDUDE_Requirements Requirements - * This module requires the avrdude utility to be available in your system's PATH - * variable. The avrdude utility is distributed in the old WinAVR project releases for - * Windows (http://winavr.sourceforge.net) or can be installed on *nix systems via the project's - * source code (https://savannah.nongnu.org/projects/avrdude) or through the package manager. - * - * \section SSec_BuildModule_AVRDUDE_Targets Targets - * - * - * - * - * - * - * - * - * - * - *
avrdudeProgram the device FLASH memory with the application's executable data.
avrdude-eeProgram the device EEPROM memory with the application's EEPROM data.
- * - * \section SSec_BuildModule_AVRDUDE_MandatoryParams Mandatory Parameters - * - * - * - * - * - * - * - * - * - * - *
MCUName of the Atmel processor model (e.g. at90usb1287).
TARGETName of the application output file prefix (e.g. TestApplication).
- * - * \section SSec_BuildModule_AVRDUDE_OptionalParams Optional Parameters - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
AVRDUDE_PROGRAMMERName of the programmer or debugger tool to communicate with (e.g. jtagicemkii).
AVRDUDE_PORTName of the communication port to use when when programming with the connected tool (e.g. COM2, /dev/ttyUSB0 or usb).
AVRDUDE_FLAGSAdditional flags to pass to avrdude when programming, applied after the automatically generated flags.
- * - * \section SSec_BuildModule_AVRDUDE_ProvidedVariables Module Provided Variables - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_AVRDUDE_ProvidedMacros Module Provided Macros - * - * - * - * - * - *
None
- */ - - /** \page Page_BuildModule_CPPCHECK The CPPCHECK build module - * - * The CPPCHECK programming utility LUFA build system module, providing targets to statically - * analyze C and C++ source code for errors and performance/style issues. - * - * To use this module in your application makefile, add the following code: - * \code - * include $(LUFA_PATH)/Build/lufa_cppcheck.mk - * \endcode - * - * \section SSec_BuildModule_CPPCHECK_Requirements Requirements - * This module requires the cppcheck utility to be available in your system's PATH - * variable. The cppcheck utility is distributed through the project's home page - * (http://cppcheck.sourceforge.net) for Windows, and can be installed on *nix systems via - * the project's source code or through the package manager. - * - * \section SSec_BuildModule_CPPCHECK_Targets Targets - * - * - * - * - * - * - * - * - * - * - *
cppcheckStatically analyze the project source code for issues.
cppcheck-configCheck the cppcheck configuration - scan source code and warn about missing header files and other issues.
- * - * \section SSec_BuildModule_CPPCHECK_MandatoryParams Mandatory Parameters - * - * - * - * - * - * - *
SRCList of source files to statically analyze.
- * - * \section SSec_BuildModule_CPPCHECK_OptionalParams Optional Parameters - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
CPPCHECK_INCLUDESPath of extra directories to check when attemting to resolve C/C++ header file includes.
CPPCHECK_EXCLUDESPaths or path fragments to exclude when analyzing.
CPPCHECK_MSG_TEMPLATEOutput message template to use when printing errors, warnings and information (see cppcheck documentation).
CPPCHECK_ENABLEAnalysis rule categories to enable (see cppcheck documentation).
CPPCHECK_SUPPRESSSpecific analysis rules to suppress (see cppcheck documentation).
CPPCHECK_FAIL_ON_WARNINGSet to Y to fail the analysis job with an error exit code if warnings are found, N to continue without failing.
CPPCHECK_QUIETSet to Y to suppress all output except warnings and errors, N to show verbose output information.
CPPCHECK_FLAGSExtra flags to pass to cppcheck, after the automatically generated flags.
- * - * \section SSec_BuildModule_CPPCHECK_ProvidedVariables Module Provided Variables - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_CPPCHECK_ProvidedMacros Module Provided Macros - * - * - * - * - * - *
None
- */ - - /** \page Page_BuildModule_DFU The DFU build module - * - * The DFU programming utility LUFA build system module, providing targets to reprogram an - * Atmel processor FLASH and EEPROM memories with a project's compiled binary output files. - * This module requires a DFU class bootloader to be running in the target, compatible with - * the DFU bootloader protocol as published by Atmel. - * - * To use this module in your application makefile, add the following code: - * \code - * include $(LUFA_PATH)/Build/lufa_dfu.mk - * \endcode - * - * \section SSec_BuildModule_DFU_Requirements Requirements - * This module requires either the batchisp utility from Atmel's FLIP utility, or the open - * source dfu-programmer utility (http://dfu-programmer.sourceforge.net/) to be - * available in your system's PATH variable. On *nix systems the dfu-programmer utility - * can be installed via the project's source code or through the package manager. - * - * \section SSec_BuildModule_DFU_Targets Targets - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
dfuProgram the device FLASH memory with the application's executable data using dfu-programmer.
dfu-eeProgram the device EEPROM memory with the application's EEPROM data using dfu-programmer.
flipProgram the device FLASH memory with the application's executable data using batchisp.
flip-eeProgram the device EEPROM memory with the application's EEPROM data using batchisp.
- * - * \section SSec_BuildModule_DFU_MandatoryParams Mandatory Parameters - * - * - * - * - * - * - * - * - * - * - *
MCUName of the Atmel processor model (e.g. at90usb1287).
TARGETName of the application output file prefix (e.g. TestApplication).
- * - * \section SSec_BuildModule_DFU_OptionalParams Optional Parameters - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_DFU_ProvidedVariables Module Provided Variables - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_DFU_ProvidedMacros Module Provided Macros - * - * - * - * - * - *
None
- */ - - /** \page Page_BuildModule_DOXYGEN The DOXYGEN build module - * - * The DOXYGEN code documentation utility LUFA build system module, providing targets to generate - * project HTML and other format documentation from a set of source files that include special - * Doxygen comments. - * - * To use this module in your application makefile, add the following code: - * \code - * include $(LUFA_PATH)/Build/lufa_doxygen.mk - * \endcode - * - * \section SSec_BuildModule_DOXYGEN_Requirements Requirements - * This module requires the doxygen utility from the Doxygen website - * (http://www.doxygen.org/) to be available in your system's PATH variable. On *nix - * systems the doxygen utility can be installed via the project's source code or through - * the package manager. - * - * \section SSec_BuildModule_DOXYGEN_Targets Targets - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
doxygenGenerate project documentation.
doxygen_createCreate a new Doxygen configuration file using the latest template.
doxygen_upgradeUpgrade an existing Doxygen configuration file to the latest template
- * - * \section SSec_BuildModule_DOXYGEN_MandatoryParams Mandatory Parameters - * - * - * - * - * - * - *
LUFA_PATHPath to the LUFA library core, either relative or absolute (e.g. ../LUFA-000000/LUFA/).
- * - * \section SSec_BuildModule_DOXYGEN_OptionalParams Optional Parameters - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
DOXYGEN_CONFName and path of the base Doxygen configuration file for the project.
DOXYGEN_FAIL_ON_WARNINGSet to Y to fail the generation with an error exit code if warnings are found other than unsupported configuration parameters, N to continue without failing.
DOXYGEN_OVERRIDE_PARAMSExtra Doxygen configuration parameters to apply, overriding the corresponding config entry in the project's configuration file (e.g. QUIET=YES).
- * - * \section SSec_BuildModule_DOXYGEN_ProvidedVariables Module Provided Variables - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_DOXYGEN_ProvidedMacros Module Provided Macros - * - * - * - * - * - *
None
- */ - - /** \page Page_BuildModule_HID The HID build module - * - * The HID programming utility LUFA build system module, providing targets to reprogram an - * Atmel processor's FLASH memory with a project's compiled binary output file. This module - * requires a HID class bootloader to be running in the target, using a protocol compatible - * with the PJRC "HalfKay" protocol (http://www.pjrc.com/teensy/halfkay_protocol.html). - * - * To use this module in your application makefile, add the following code: - * \code - * include $(LUFA_PATH)/Build/lufa_hid.mk - * \endcode - * - * \section SSec_BuildModule_HID_Requirements Requirements - * This module requires either the hid_bootloader_cli utility from the included LUFA HID - * class bootloader API subdirectory, or the teensy_loader_cli utility from PJRC - * (http://www.pjrc.com/teensy/loader_cli.html) to be available in your system's PATH - * variable. - * - * \section SSec_BuildModule_HID_Targets Targets - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
hidProgram the device FLASH memory with the application's executable data using hid_bootloader_cli.
hid-eeProgram the device EEPROM memory with the application's EEPROM data using hid_bootloader_cli and - * a temporary AVR application programmed into the target's FLASH. - * \note This will erase the currently loaded application in the target.
teensyProgram the device FLASH memory with the application's executable data using teensy_loader_cli.
teensy-eeProgram the device EEPROM memory with the application's EEPROM data using teensy_loader_cli and - * a temporary AVR application programmed into the target's FLASH. - * \note This will erase the currently loaded application in the target.
- * - * \section SSec_BuildModule_HID_MandatoryParams Mandatory Parameters - * - * - * - * - * - * - * - * - * - * - *
MCUName of the Atmel processor model (e.g. at90usb1287).
TARGETName of the application output file prefix (e.g. TestApplication).
- * - * \section SSec_BuildModule_HID_OptionalParams Optional Parameters - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_HID_ProvidedVariables Module Provided Variables - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_HID_ProvidedMacros Module Provided Macros - * - * - * - * - * - *
None
- */ - - /** \page Page_BuildModule_SOURCES The SOURCES build module - * - * The SOURCES LUFA build system module, providing variables listing the various LUFA source files - * required to be build by a project for a given LUFA module. This module gives a way to reference - * LUFA source files symbolically, so that changes to the library structure do not break the library - * makefile. - * - * To use this module in your application makefile, add the following code: - * \code - * include $(LUFA_PATH)/Build/lufa_sources.mk - * \endcode - * - * \section SSec_BuildModule_SOURCES_Requirements Requirements - * None. - * - * \section SSec_BuildModule_SOURCES_Targets Targets - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_SOURCES_MandatoryParams Mandatory Parameters - * - * - * - * - * - * - * - * - * - * - *
LUFA_PATHPath to the LUFA library core, either relative or absolute (e.g. ../LUFA-000000/LUFA/).
ARCHArchitecture of the target processor (see \ref Page_DeviceSupport).
- * - * \section SSec_BuildModule_SOURCES_OptionalParams Optional Parameters - * - * - * - * - * - *
None
- * - * \section SSec_BuildModule_SOURCES_ProvidedVariables Module Provided Variables - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
LUFA_SRC_USBList of LUFA USB driver source files.
LUFA_SRC_USBCLASSList of LUFA USB Class driver source files.
LUFA_SRC_TEMPERATUREList of LUFA temperature sensor driver source files.
LUFA_SRC_SERIALList of LUFA Serial U(S)ART driver source files.
LUFA_SRC_TWIList of LUFA TWI driver source files.
LUFA_SRC_PLATFORMList of LUFA architecture specific platform management source files.
- * - * \section SSec_BuildModule_SOURCES_ProvidedMacros Module Provided Macros - * - * - * - * - * - *
None
- */ - -/** \page Page_BuildTroubleshooting Troubleshooting Information - * - * LUFA uses a lot of advanced features of the AVR-GCC compiler, linker, and surrounding binaries. This can sometimes lead to problems compiling applications if one of these - * features is buggy in the version of the tools used in a build environment. Missing utilities and incorrectly set makefile configuration options can also result in different - * errors being produced when compilation or other operations are attempted. The table below lists a set of commonly encountered errors and their resolutions. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
ProblemResolution
Error "relocation truncated to fit: R_AVR_13_PCREL against symbol {X}" shown when compiling.Try compiling with the setting LINKER_RELAXATIONS=N in your LUFA Build System 2.0 makefile, or remove the line -Wl,--relax - * from other makefiles. Alternatively, make sure you have the latest version of the Atmel Toolchain installed for your system.
Error "error: ld terminated with signal 11 [Segmentation fault]" shown when compiling.Try compiling with the setting DEBUG_LEVEL=2 in your LUFA Build System 2.0 makefile, or make sure you are using binutils version 2.22 or later.
Error "EMERGENCY ABORT: INFINITE RECURSION DETECTED" shown when compiling.Make sure you are using an up to date version of GNU Make when compiling. This error is a safety system added to the mid-level makefiles, to prevent an issue with - * GNU make or other variants of Make causing an infinitely recursive build.
Error "Unsupported architecture "{X}"" shown when compiling.Ensure your makefile's ARCH setting is set to one of the architecture names (case-sensitive) supported by the version of LUFA you are compiling against.
Error "Makefile {X} value not set" shown when compiling.The specified Makefile value was not configured in your project's makefile or on the command line, and the nominated setting is required by one or more LUFA - * build system modules. Define the value in your project makefile and try again.
Error "Makefile {X} option cannot be blank" shown when compiling.The specified Makefile value was configured in your project's makefile or on the command line, but was set to an empty value. For the nominated configuration - * option, an empty value is not allowed. Define the nominated setting to a correct non-blank value and try again.
Error "Makefile {X} option must be Y or N" shown when compiling.The specified Makefile value was configured in your project's makefile or on the command line, but was set to a value other than a Y (for "Yes") or "N" (for "No"). - * This configuration option is required to be one of the aforementioned boolean values, and other values are invalid. Set this option to either Y or N and try again.
Error "Unknown input source file formats: {X}" shown when compiling.The nominated source files, specified in your project's makefile in the SRC configuration option, has an extension that the LUFA build system does not - * recognise. The file extensions are case sensitive, and must be one of the supported formats (*.c, *.cpp or *.S).
Error "Cannot build with OBJDIR parameter set - one or more object file name is not unique" shown when compiling.When a project is built with a non-empty OBJDIR object directory name set, all input source files must have unique names, excluding extension and path. - * This means that input files that are named identically and differ only by their path or extension are invalid when this mode is used.
Error "Source file does not exist: {X}" shown when compiling.The nominated input source file, specified in the user project's SRC parameter, could not be found. Ensure the source file exists and the absolute or - * relative path given in the user project makefile is correct and try again.
Error "Doxygen configuration file {X} does not exist" shown when upgrading a Doxygen configuration file.The nominated Doxygen configuration file, specified in the user project's DOXYGEN_CONF parameter, could not be found. Ensure the configuration file exists - * and the absolute or relative path given in the user project makefile is correct and try again, or run the appropriate makefile target to generate a new configuration - * file.
Error "avr-gcc: error: unrecognized option '{X}'" shown when compiling.An unrecognised option was supplied to the compiler, usually in the C_FLAGS, CPP_FLAGS, ASM_FLAGS or CC_FLAGS configuration - * options. The nominated compiler switch may be invalid, or unsupported by the version of AVR-GCC on the host system. Remove the unrecognised flag if invalid, or - * upgrade to the latest AVR-GCC. If the option is a valid linker option, use the prefix "-Wl," to ensure it is passed to the linker correctly.
Error "makefile:{X}: {Y}.mk: No such file or directory" shown when make is invoked.The path to the nominated makefile module was incorrect. This usually indicates that the makefile LUFA_PATH option is not set to a valid relative or - * absolute path to the LUFA library core.
Error "fatal error: LUFAConfig.h: No such file or directory" shown when compiling.The USE_LUFA_CONFIG_HEADER compile time option was set in the user project makefile, but the user supplied LUFAConfig.h header could not be - * found. Ensure that the directory that contains this configuration file is correctly passed to the compiler via the -I switch in the makefile CC_FLAGS - * parameter.
Error "ld.exe: section .apitable_trampolines loaded at {X} overlaps section .text" shown when compiling a bootloader.The bootloader is compiling too large for the given FLASH_SIZE_KB and BOOT_SECTION_SIZE_KB parameters set in the bootloader makefile. This - * usually indicates that these values are incorrect for the specified device the bootloader is targeting. If these values are correct, a newer version of the - * compiler may need to be used to ensure that the bootloader is built within the section size constraints of the target device.
Error "unknown MCU '{X}' specified" shown when compiling.The specified microcontroller device model name set in the user application's makefile as the MCU parameter is incorrect, or unsupported by the - * version of the compiler being used. Make sure the model name is correct, or upgrade to the latest Atmel Toolchain to obtain newer device support.
Error "undefined reference to `{X}'" shown when compiling.This is usually caused by a missing source file in the user application's SRC configuration parameter. If the indicated symbol is one from the LUFA - * library, you may be missing a LUFA source makefile module (see \ref Page_BuildModule_SOURCES).
- * - * For troubleshooting other errors you encounter, please see \ref Sec_ProjectHelp. - */ +/** \file + * + * This file contains special DoxyGen information for the generation of the main page and other special + * documentation pages. It is not a project source file. + */ + +/** \page Page_BuildSystem The LUFA Build System + * + * \section Sec_BuildSystem_Overview Overview of the LUFA Build System + * The LUFA build system is an attempt at making a set of re-usable, modular build make files which + * can be referenced in a LUFA powered project, to minimize the amount of code required in an + * application makefile. The system is written in GNU Make, and each module is independent of + * one-another. + * + * For details on the prerequisites needed for Linux and Windows machines to be able to use the LUFA + * build system, see \ref Sec_CompilingApps_Prerequisites. + * + * To use a LUFA build system module, simply add an include to your project makefile. All user projects + * should at a minimum include \ref Page_BuildModule_CORE for base functionality: + * \code + * include $(LUFA_PATH)/Build/lufa_core.mk + * \endcode + * + * Once included in your project makefile, the associated build module targets will be added to your + * project's build makefile targets automatically. To call a build target, run make {TARGET_NAME} + * from the command line, substituting in the appropriate target name. + * + * \see \ref Sec_ConfiguringApps_AppMakefileParams for a copy of the sample LUFA project makefile. + * + * Each build module may have one or more mandatory parameters (GNU Make variables) which must + * be supplied in the project makefile for the module to work, and one or more optional parameters which + * may be defined and which will assume a sensible default if not. + * + * \section SSec_BuildSystem_Modules Available Modules + * + * The following modules are included in this LUFA release: + * + * \li \subpage Page_BuildModule_ATPROGRAM - Device Programming + * \li \subpage Page_BuildModule_AVRDUDE - Device Programming + * \li \subpage Page_BuildModule_BUILD - Compiling/Assembling/Linking + * \li \subpage Page_BuildModule_CORE - Core Build System Functions + * \li \subpage Page_BuildModule_CPPCHECK - Static Code Analysis + * \li \subpage Page_BuildModule_DFU - Device Programming + * \li \subpage Page_BuildModule_DOXYGEN - Automated Source Code Documentation + * \li \subpage Page_BuildModule_HID - Device Programming + * \li \subpage Page_BuildModule_SOURCES - LUFA Module Source Code Variables + * + * If you have problems building using the LUFA build system, see \subpage Page_BuildTroubleshooting for resolution steps. + */ + + /** \page Page_BuildModule_BUILD The BUILD build module + * + * The BUILD LUFA build system module, providing targets for the compilation, + * assembling and linking of an application from source code into binary files + * suitable for programming into a target device, using the GCC compiler. + * + * To use this module in your application makefile, add the following code: + * \code + * include $(LUFA_PATH)/Build/lufa_build.mk + * \endcode + * + * \section SSec_BuildModule_BUILD_Requirements Requirements + * This module requires the the architecture appropriate binaries of the GCC compiler are available in your + * system's PATH variable. The GCC compiler and associated toolchain is distributed in Atmel AVR Studio + * 5.x and Atmel Studio 6.x installation directories, as well as in many third party distribution packages. + * + * \section SSec_BuildModule_BUILD_Targets Targets + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
sizeDisplay size of the compiled application FLASH and SRAM segments.
symbol-sizesDisplay a size-sorted list of symbols from the compiled application, in decimal bytes.
libBuild and archive all source files into a library A binary file.
allBuild and link the application into ELF debug and HEX binary files.
elfBuild and link the application into an ELF debug file.
binBuild and link the application and produce a BIN binary file.
hexBuild and link the application and produce HEX and EEP binary files.
lssBuild and link the application and produce a LSS source code/assembly code mixed listing file.
cleanRemove all intermediary files and binary output files.
mostlycleanRemove all intermediary files but preserve any binary output files.
<filename>.sCreate an assembly listing of a given input C/C++ source file.
+ * + * \section SSec_BuildModule_BUILD_MandatoryParams Mandatory Parameters + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
TARGETName of the application output file prefix (e.g. TestApplication).
ARCHArchitecture of the target processor (see \ref Page_DeviceSupport).
MCUName of the Atmel processor model (e.g. at90usb1287).
SRCList of relative or absolute paths to the application C (.c), C++ (.cpp) and Assembly (.S) source files.
F_USBSpeed in Hz of the input clock frequency to the target's USB controller.
LUFA_PATHPath to the LUFA library core, either relative or absolute (e.g. ../LUFA-000000/LUFA/).
+ * + * \section SSec_BuildModule_BUILD_OptionalParams Optional Parameters + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
BOARDLUFA board hardware drivers to use (see \ref Page_DeviceSupport).
OPTIMIZATIONOptimization level to use when compiling source files (see GCC manual).
C_STANDARDVersion of the C standard to apply when compiling C++ source files (see GCC manual).
CPP_STANDARDVersion of the C++ standard to apply when compiling C++ source files (see GCC manual).
DEBUG_FORMATFormat of the debug information to embed in the generated object files (see GCC manual).
DEBUG_LEVELLevel of the debugging information to embed in the generated object files (see GCC manual).
F_CPUSpeed of the processor CPU clock, in Hz.
C_FLAGSFlags to pass to the C compiler only, after the automatically generated flags.
CPP_FLAGSFlags to pass to the C++ compiler only, after the automatically generated flags.
ASM_FLAGSFlags to pass to the assembler only, after the automatically generated flags.
CC_FLAGSCommon flags to pass to the C/C++ compiler and assembler, after the automatically generated flags.
COMPILER_PATHDirectory where the C/C++ toolchain is located, if not available in the system PATH.
LD_FLAGSFlags to pass to the linker, after the automatically generated flags.
LINKER_RELAXATIONSEnables or disables linker relaxations when linking the application binary. This can reduce the total size + * of the application by replacing full \c CALL instructions with smaller \c RCALL instructions where possible. + * \note On some unpatched versions of binutils, this can cause link failures in some circumstances. If you + * receive a link error relocation truncated to fit: R_AVR_13_PCREL, disable this setting.
OBJDIRDirectory to place the generated object and dependency files. If set to "." the same folder as the source file will be used. + * \note When this option is enabled, all source filenames must be unique.
OBJECT_FILESList of additional object files that should be linked into the resulting binary.
+ * + * \section SSec_BuildModule_BUILD_ProvidedVariables Module Provided Variables + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_BUILD_ProvidedMacros Module Provided Macros + * + * + * + * + * + *
None
+ */ + +/** \page Page_BuildModule_CORE The CORE build module + * + * The core LUFA build system module, providing common build system help and information targets. + * + * To use this module in your application makefile, add the following code: + * \code + * include $(LUFA_PATH)/Build/lufa_core.mk + * \endcode + * + * \section SSec_BuildModule_CORE_Requirements Requirements + * This module has no requirements outside a standard *nix shell like environment; the sh + * shell, GNU make and *nix CoreUtils (echo, printf, etc.). + * + * \section SSec_BuildModule_CORE_Targets Targets + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
helpDisplay build system help and configuration information.
list_targetsList all available build targets from the build system.
list_modulesList all available build modules from the build system.
list_mandatoryList all mandatory parameters required by the included modules.
list_optionalList all optional parameters required by the included modules.
list_providedList all variables provided by the included modules.
list_macrosList all macros provided by the included modules.
+ * + * \section SSec_BuildModule_CORE_MandatoryParams Mandatory Parameters + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_CORE_OptionalParams Optional Parameters + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_CORE_ProvidedVariables Module Provided Variables + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_CORE_ProvidedMacros Module Provided Macros + * + * + * + * + * + *
None
+ */ + +/** \page Page_BuildModule_ATPROGRAM The ATPROGRAM build module + * + * The ATPROGRAM programming utility LUFA build system module, providing targets to reprogram an + * Atmel processor FLASH and EEPROM memories with a project's compiled binary output files. + * + * To use this module in your application makefile, add the following code: + * \code + * include $(LUFA_PATH)/Build/lufa_atprogram.mk + * \endcode + * + * \section SSec_BuildModule_ATPROGRAM_Requirements Requirements + * This module requires the atprogram.exe utility to be available in your system's PATH + * variable. The atprogram.exe utility is distributed in Atmel AVR Studio 5.x and Atmel Studio 6.x + * inside the application install folder's "\atbackend" subdirectory. + * + * \section SSec_BuildModule_ATPROGRAM_Targets Targets + * + * + * + * + * + * + * + * + * + * + *
atprogramProgram the device FLASH memory with the application's executable data.
atprogram-eeProgram the device EEPROM memory with the application's EEPROM data.
+ * + * \section SSec_BuildModule_ATPROGRAM_MandatoryParams Mandatory Parameters + * + * + * + * + * + * + * + * + * + * + *
MCUName of the Atmel processor model (e.g. at90usb1287).
TARGETName of the application output file prefix (e.g. TestApplication).
+ * + * \section SSec_BuildModule_ATPROGRAM_OptionalParams Optional Parameters + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
ATPROGRAM_PROGRAMMERName of the Atmel programmer or debugger tool to communicate with (e.g. jtagice3).
ATPROGRAM_INTERFACEName of the programming interface to use when programming the target (e.g. spi).
ATPROGRAM_PORTName of the communication port to use when when programming with a serially connected tool (e.g. COM2).
+ * + * \section SSec_BuildModule_ATPROGRAM_ProvidedVariables Module Provided Variables + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_ATPROGRAM_ProvidedMacros Module Provided Macros + * + * + * + * + * + *
None
+ */ + +/** \page Page_BuildModule_AVRDUDE The AVRDUDE build module + * + * The AVRDUDE programming utility LUFA build system module, providing targets to reprogram an + * Atmel processor FLASH and EEPROM memories with a project's compiled binary output files. + * + * To use this module in your application makefile, add the following code: + * \code + * include $(LUFA_PATH)/Build/lufa_avrdude.mk + * \endcode + * + * \section SSec_BuildModule_AVRDUDE_Requirements Requirements + * This module requires the avrdude utility to be available in your system's PATH + * variable. The avrdude utility is distributed in the old WinAVR project releases for + * Windows (http://winavr.sourceforge.net) or can be installed on *nix systems via the project's + * source code (https://savannah.nongnu.org/projects/avrdude) or through the package manager. + * + * \section SSec_BuildModule_AVRDUDE_Targets Targets + * + * + * + * + * + * + * + * + * + * + *
avrdudeProgram the device FLASH memory with the application's executable data.
avrdude-eeProgram the device EEPROM memory with the application's EEPROM data.
+ * + * \section SSec_BuildModule_AVRDUDE_MandatoryParams Mandatory Parameters + * + * + * + * + * + * + * + * + * + * + *
MCUName of the Atmel processor model (e.g. at90usb1287).
TARGETName of the application output file prefix (e.g. TestApplication).
+ * + * \section SSec_BuildModule_AVRDUDE_OptionalParams Optional Parameters + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
AVRDUDE_PROGRAMMERName of the programmer or debugger tool to communicate with (e.g. jtagicemkii).
AVRDUDE_PORTName of the communication port to use when when programming with the connected tool (e.g. COM2, /dev/ttyUSB0 or usb).
AVRDUDE_FLAGSAdditional flags to pass to avrdude when programming, applied after the automatically generated flags.
+ * + * \section SSec_BuildModule_AVRDUDE_ProvidedVariables Module Provided Variables + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_AVRDUDE_ProvidedMacros Module Provided Macros + * + * + * + * + * + *
None
+ */ + + /** \page Page_BuildModule_CPPCHECK The CPPCHECK build module + * + * The CPPCHECK programming utility LUFA build system module, providing targets to statically + * analyze C and C++ source code for errors and performance/style issues. + * + * To use this module in your application makefile, add the following code: + * \code + * include $(LUFA_PATH)/Build/lufa_cppcheck.mk + * \endcode + * + * \section SSec_BuildModule_CPPCHECK_Requirements Requirements + * This module requires the cppcheck utility to be available in your system's PATH + * variable. The cppcheck utility is distributed through the project's home page + * (http://cppcheck.sourceforge.net) for Windows, and can be installed on *nix systems via + * the project's source code or through the package manager. + * + * \section SSec_BuildModule_CPPCHECK_Targets Targets + * + * + * + * + * + * + * + * + * + * + *
cppcheckStatically analyze the project source code for issues.
cppcheck-configCheck the cppcheck configuration - scan source code and warn about missing header files and other issues.
+ * + * \section SSec_BuildModule_CPPCHECK_MandatoryParams Mandatory Parameters + * + * + * + * + * + * + *
SRCList of source files to statically analyze.
+ * + * \section SSec_BuildModule_CPPCHECK_OptionalParams Optional Parameters + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
CPPCHECK_INCLUDESPath of extra directories to check when attemting to resolve C/C++ header file includes.
CPPCHECK_EXCLUDESPaths or path fragments to exclude when analyzing.
CPPCHECK_MSG_TEMPLATEOutput message template to use when printing errors, warnings and information (see cppcheck documentation).
CPPCHECK_ENABLEAnalysis rule categories to enable (see cppcheck documentation).
CPPCHECK_SUPPRESSSpecific analysis rules to suppress (see cppcheck documentation).
CPPCHECK_FAIL_ON_WARNINGSet to Y to fail the analysis job with an error exit code if warnings are found, N to continue without failing.
CPPCHECK_QUIETSet to Y to suppress all output except warnings and errors, N to show verbose output information.
CPPCHECK_FLAGSExtra flags to pass to cppcheck, after the automatically generated flags.
+ * + * \section SSec_BuildModule_CPPCHECK_ProvidedVariables Module Provided Variables + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_CPPCHECK_ProvidedMacros Module Provided Macros + * + * + * + * + * + *
None
+ */ + + /** \page Page_BuildModule_DFU The DFU build module + * + * The DFU programming utility LUFA build system module, providing targets to reprogram an + * Atmel processor FLASH and EEPROM memories with a project's compiled binary output files. + * This module requires a DFU class bootloader to be running in the target, compatible with + * the DFU bootloader protocol as published by Atmel. + * + * To use this module in your application makefile, add the following code: + * \code + * include $(LUFA_PATH)/Build/lufa_dfu.mk + * \endcode + * + * \section SSec_BuildModule_DFU_Requirements Requirements + * This module requires either the batchisp utility from Atmel's FLIP utility, or the open + * source dfu-programmer utility (http://dfu-programmer.sourceforge.net/) to be + * available in your system's PATH variable. On *nix systems the dfu-programmer utility + * can be installed via the project's source code or through the package manager. + * + * \section SSec_BuildModule_DFU_Targets Targets + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
dfuProgram the device FLASH memory with the application's executable data using dfu-programmer.
dfu-eeProgram the device EEPROM memory with the application's EEPROM data using dfu-programmer.
flipProgram the device FLASH memory with the application's executable data using batchisp.
flip-eeProgram the device EEPROM memory with the application's EEPROM data using batchisp.
+ * + * \section SSec_BuildModule_DFU_MandatoryParams Mandatory Parameters + * + * + * + * + * + * + * + * + * + * + *
MCUName of the Atmel processor model (e.g. at90usb1287).
TARGETName of the application output file prefix (e.g. TestApplication).
+ * + * \section SSec_BuildModule_DFU_OptionalParams Optional Parameters + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_DFU_ProvidedVariables Module Provided Variables + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_DFU_ProvidedMacros Module Provided Macros + * + * + * + * + * + *
None
+ */ + + /** \page Page_BuildModule_DOXYGEN The DOXYGEN build module + * + * The DOXYGEN code documentation utility LUFA build system module, providing targets to generate + * project HTML and other format documentation from a set of source files that include special + * Doxygen comments. + * + * To use this module in your application makefile, add the following code: + * \code + * include $(LUFA_PATH)/Build/lufa_doxygen.mk + * \endcode + * + * \section SSec_BuildModule_DOXYGEN_Requirements Requirements + * This module requires the doxygen utility from the Doxygen website + * (http://www.doxygen.org/) to be available in your system's PATH variable. On *nix + * systems the doxygen utility can be installed via the project's source code or through + * the package manager. + * + * \section SSec_BuildModule_DOXYGEN_Targets Targets + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
doxygenGenerate project documentation.
doxygen_createCreate a new Doxygen configuration file using the latest template.
doxygen_upgradeUpgrade an existing Doxygen configuration file to the latest template
+ * + * \section SSec_BuildModule_DOXYGEN_MandatoryParams Mandatory Parameters + * + * + * + * + * + * + *
LUFA_PATHPath to the LUFA library core, either relative or absolute (e.g. ../LUFA-000000/LUFA/).
+ * + * \section SSec_BuildModule_DOXYGEN_OptionalParams Optional Parameters + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
DOXYGEN_CONFName and path of the base Doxygen configuration file for the project.
DOXYGEN_FAIL_ON_WARNINGSet to Y to fail the generation with an error exit code if warnings are found other than unsupported configuration parameters, N to continue without failing.
DOXYGEN_OVERRIDE_PARAMSExtra Doxygen configuration parameters to apply, overriding the corresponding config entry in the project's configuration file (e.g. QUIET=YES).
+ * + * \section SSec_BuildModule_DOXYGEN_ProvidedVariables Module Provided Variables + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_DOXYGEN_ProvidedMacros Module Provided Macros + * + * + * + * + * + *
None
+ */ + + /** \page Page_BuildModule_HID The HID build module + * + * The HID programming utility LUFA build system module, providing targets to reprogram an + * Atmel processor's FLASH memory with a project's compiled binary output file. This module + * requires a HID class bootloader to be running in the target, using a protocol compatible + * with the PJRC "HalfKay" protocol (http://www.pjrc.com/teensy/halfkay_protocol.html). + * + * To use this module in your application makefile, add the following code: + * \code + * include $(LUFA_PATH)/Build/lufa_hid.mk + * \endcode + * + * \section SSec_BuildModule_HID_Requirements Requirements + * This module requires either the hid_bootloader_cli utility from the included LUFA HID + * class bootloader API subdirectory, or the teensy_loader_cli utility from PJRC + * (http://www.pjrc.com/teensy/loader_cli.html) to be available in your system's PATH + * variable. + * + * \section SSec_BuildModule_HID_Targets Targets + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
hidProgram the device FLASH memory with the application's executable data using hid_bootloader_cli.
hid-eeProgram the device EEPROM memory with the application's EEPROM data using hid_bootloader_cli and + * a temporary AVR application programmed into the target's FLASH. + * \note This will erase the currently loaded application in the target.
teensyProgram the device FLASH memory with the application's executable data using teensy_loader_cli.
teensy-eeProgram the device EEPROM memory with the application's EEPROM data using teensy_loader_cli and + * a temporary AVR application programmed into the target's FLASH. + * \note This will erase the currently loaded application in the target.
+ * + * \section SSec_BuildModule_HID_MandatoryParams Mandatory Parameters + * + * + * + * + * + * + * + * + * + * + *
MCUName of the Atmel processor model (e.g. at90usb1287).
TARGETName of the application output file prefix (e.g. TestApplication).
+ * + * \section SSec_BuildModule_HID_OptionalParams Optional Parameters + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_HID_ProvidedVariables Module Provided Variables + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_HID_ProvidedMacros Module Provided Macros + * + * + * + * + * + *
None
+ */ + + /** \page Page_BuildModule_SOURCES The SOURCES build module + * + * The SOURCES LUFA build system module, providing variables listing the various LUFA source files + * required to be build by a project for a given LUFA module. This module gives a way to reference + * LUFA source files symbolically, so that changes to the library structure do not break the library + * makefile. + * + * To use this module in your application makefile, add the following code: + * \code + * include $(LUFA_PATH)/Build/lufa_sources.mk + * \endcode + * + * \section SSec_BuildModule_SOURCES_Requirements Requirements + * None. + * + * \section SSec_BuildModule_SOURCES_Targets Targets + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_SOURCES_MandatoryParams Mandatory Parameters + * + * + * + * + * + * + * + * + * + * + *
LUFA_PATHPath to the LUFA library core, either relative or absolute (e.g. ../LUFA-000000/LUFA/).
ARCHArchitecture of the target processor (see \ref Page_DeviceSupport).
+ * + * \section SSec_BuildModule_SOURCES_OptionalParams Optional Parameters + * + * + * + * + * + *
None
+ * + * \section SSec_BuildModule_SOURCES_ProvidedVariables Module Provided Variables + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
LUFA_SRC_USBList of LUFA USB driver source files.
LUFA_SRC_USBCLASSList of LUFA USB Class driver source files.
LUFA_SRC_TEMPERATUREList of LUFA temperature sensor driver source files.
LUFA_SRC_SERIALList of LUFA Serial U(S)ART driver source files.
LUFA_SRC_TWIList of LUFA TWI driver source files.
LUFA_SRC_PLATFORMList of LUFA architecture specific platform management source files.
+ * + * \section SSec_BuildModule_SOURCES_ProvidedMacros Module Provided Macros + * + * + * + * + * + *
None
+ */ + +/** \page Page_BuildTroubleshooting Troubleshooting Information + * + * LUFA uses a lot of advanced features of the AVR-GCC compiler, linker, and surrounding binaries. This can sometimes lead to problems compiling applications if one of these + * features is buggy in the version of the tools used in a build environment. Missing utilities and incorrectly set makefile configuration options can also result in different + * errors being produced when compilation or other operations are attempted. The table below lists a set of commonly encountered errors and their resolutions. + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
ProblemResolution
Error "relocation truncated to fit: R_AVR_13_PCREL against symbol {X}" shown when compiling.Try compiling with the setting LINKER_RELAXATIONS=N in your LUFA Build System 2.0 makefile, or remove the line -Wl,--relax + * from other makefiles. Alternatively, make sure you have the latest version of the Atmel Toolchain installed for your system.
Error "error: ld terminated with signal 11 [Segmentation fault]" shown when compiling.Try compiling with the setting DEBUG_LEVEL=2 in your LUFA Build System 2.0 makefile, or make sure you are using binutils version 2.22 or later.
Error "EMERGENCY ABORT: INFINITE RECURSION DETECTED" shown when compiling.Make sure you are using an up to date version of GNU Make when compiling. This error is a safety system added to the mid-level makefiles, to prevent an issue with + * GNU make or other variants of Make causing an infinitely recursive build.
Error "Unsupported architecture "{X}"" shown when compiling.Ensure your makefile's ARCH setting is set to one of the architecture names (case-sensitive) supported by the version of LUFA you are compiling against.
Error "Makefile {X} value not set" shown when compiling.The specified Makefile value was not configured in your project's makefile or on the command line, and the nominated setting is required by one or more LUFA + * build system modules. Define the value in your project makefile and try again.
Error "Makefile {X} option cannot be blank" shown when compiling.The specified Makefile value was configured in your project's makefile or on the command line, but was set to an empty value. For the nominated configuration + * option, an empty value is not allowed. Define the nominated setting to a correct non-blank value and try again.
Error "Makefile {X} option must be Y or N" shown when compiling.The specified Makefile value was configured in your project's makefile or on the command line, but was set to a value other than a Y (for "Yes") or "N" (for "No"). + * This configuration option is required to be one of the aforementioned boolean values, and other values are invalid. Set this option to either Y or N and try again.
Error "Unknown input source file formats: {X}" shown when compiling.The nominated source files, specified in your project's makefile in the SRC configuration option, has an extension that the LUFA build system does not + * recognise. The file extensions are case sensitive, and must be one of the supported formats (*.c, *.cpp or *.S).
Error "Cannot build with OBJDIR parameter set - one or more object file name is not unique" shown when compiling.When a project is built with a non-empty OBJDIR object directory name set, all input source files must have unique names, excluding extension and path. + * This means that input files that are named identically and differ only by their path or extension are invalid when this mode is used.
Error "Source file does not exist: {X}" shown when compiling.The nominated input source file, specified in the user project's SRC parameter, could not be found. Ensure the source file exists and the absolute or + * relative path given in the user project makefile is correct and try again.
Error "Doxygen configuration file {X} does not exist" shown when upgrading a Doxygen configuration file.The nominated Doxygen configuration file, specified in the user project's DOXYGEN_CONF parameter, could not be found. Ensure the configuration file exists + * and the absolute or relative path given in the user project makefile is correct and try again, or run the appropriate makefile target to generate a new configuration + * file.
Error "avr-gcc: error: unrecognized option '{X}'" shown when compiling.An unrecognised option was supplied to the compiler, usually in the C_FLAGS, CPP_FLAGS, ASM_FLAGS or CC_FLAGS configuration + * options. The nominated compiler switch may be invalid, or unsupported by the version of AVR-GCC on the host system. Remove the unrecognised flag if invalid, or + * upgrade to the latest AVR-GCC. If the option is a valid linker option, use the prefix "-Wl," to ensure it is passed to the linker correctly.
Error "makefile:{X}: {Y}.mk: No such file or directory" shown when make is invoked.The path to the nominated makefile module was incorrect. This usually indicates that the makefile LUFA_PATH option is not set to a valid relative or + * absolute path to the LUFA library core.
Error "fatal error: LUFAConfig.h: No such file or directory" shown when compiling.The USE_LUFA_CONFIG_HEADER compile time option was set in the user project makefile, but the user supplied LUFAConfig.h header could not be + * found. Ensure that the directory that contains this configuration file is correctly passed to the compiler via the -I switch in the makefile CC_FLAGS + * parameter.
Error "ld.exe: section .apitable_trampolines loaded at {X} overlaps section .text" shown when compiling a bootloader.The bootloader is compiling too large for the given FLASH_SIZE_KB and BOOT_SECTION_SIZE_KB parameters set in the bootloader makefile. This + * usually indicates that these values are incorrect for the specified device the bootloader is targeting. If these values are correct, a newer version of the + * compiler may need to be used to ensure that the bootloader is built within the section size constraints of the target device.
Error "unknown MCU '{X}' specified" shown when compiling.The specified microcontroller device model name set in the user application's makefile as the MCU parameter is incorrect, or unsupported by the + * version of the compiler being used. Make sure the model name is correct, or upgrade to the latest Atmel Toolchain to obtain newer device support.
Error "undefined reference to `{X}'" shown when compiling.This is usually caused by a missing source file in the user application's SRC configuration parameter. If the indicated symbol is one from the LUFA + * library, you may be missing a LUFA source makefile module (see \ref Page_BuildModule_SOURCES).
+ * + * For troubleshooting other errors you encounter, please see \ref Sec_ProjectHelp. + */ From 265df7d5da5ead27bef3d00fce7d0f2bf133e9cc Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 20:18:26 +0300 Subject: [PATCH 094/120] Fix travis_compiled_push --- util/travis_compiled_push.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index c2a994ef02..f432976d03 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -7,7 +7,7 @@ rev=$(git rev-parse --short HEAD) git config --global user.name "Travis CI" git config --global user.email "jack.humb+travis.ci@gmail.com" -make all-keymaps keyboard=ergodox/ez AUTOGEN=true +make ergodox-ez AUTOGEN=true find . -name ".build" | xargs rm -rf cd .. @@ -24,4 +24,4 @@ cp ../qmk_firmware/readme.md qmk_readme.md git add -A git commit -m "generated from qmk_firmware/$TRAVIS_BRANCH@${rev}" -git push \ No newline at end of file +git push From cfddec17d5a4ea2c3ce9afe0f15de3fa604dee63 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 23 Jul 2016 13:27:23 +0300 Subject: [PATCH 095/120] Add Google Test submodule --- .gitmodules | 3 +++ lib/googletest | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/googletest diff --git a/.gitmodules b/.gitmodules index 7e3c92d031..12b7cb918f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "lib/ugfx"] path = lib/ugfx url = https://bitbucket.org/Tectu/ugfx +[submodule "lib/googletest"] + path = lib/googletest + url = https://github.com/google/googletest diff --git a/lib/googletest b/lib/googletest new file mode 160000 index 0000000000..ec44c6c167 --- /dev/null +++ b/lib/googletest @@ -0,0 +1 @@ +Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 From 6d7cd639a5e4503f00162c7cfa4bc7302b82c71c Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 21 Aug 2016 16:29:54 +0300 Subject: [PATCH 096/120] Basic framework for parsing test targets --- Makefile | 16 +++++++++++++++- quantum/serial_link/tests/testlist.mk | 6 ++++++ testlist.mk | 13 +++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 quantum/serial_link/tests/testlist.mk create mode 100644 testlist.mk diff --git a/Makefile b/Makefile index f78cca6c6f..16e90f8e49 100644 --- a/Makefile +++ b/Makefile @@ -224,6 +224,8 @@ define PARSE_RULE # PARSE_ALL_KEYBOARDS ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkb),true) $$(eval $$(call PARSE_ALL_KEYBOARDS)) + else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,test),true) + $$(eval $$(call PARSE_TEST)) # If the rule starts with the name of a known keyboard, then continue # the parsing from PARSE_KEYBOARD else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) @@ -396,6 +398,16 @@ define PARSE_ALL_KEYMAPS $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS))) endef +define PARSE_TEST + TEST_NAME := $$(firstword $$(subst -, ,$$(RULE))) + TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME)-,,$$(RULE))) + MATCHED_TESTS := $$(foreach TEST,$$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME),$$(TEST)),$$(TEST),)) + $$(info Test name $$(TEST_NAME)) + $$(info Test target $$(TEST_TARGET)) + $$(info $$(MATCHED_TESTS)) +endef + + # Set the silent mode depending on if we are trying to compile multiple keyboards or not # By default it's on in that case, but it can be overriden by specifying silent=false # from the command line @@ -459,4 +471,6 @@ all-keyboards-defaults: allkb-allsp-default GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) -$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) \ No newline at end of file +$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) + +include $(ROOT_DIR)/testlist.mk \ No newline at end of file diff --git a/quantum/serial_link/tests/testlist.mk b/quantum/serial_link/tests/testlist.mk new file mode 100644 index 0000000000..4a734b1e1c --- /dev/null +++ b/quantum/serial_link/tests/testlist.mk @@ -0,0 +1,6 @@ +TEST_LIST +=\ + serial_link_byte_stuffer\ + serial_link_frame_router\ + serial_link_frame_validator\ + serial_link_transport\ + serial_link_triple_buffered_object \ No newline at end of file diff --git a/testlist.mk b/testlist.mk new file mode 100644 index 0000000000..1884d6d3f6 --- /dev/null +++ b/testlist.mk @@ -0,0 +1,13 @@ +include $(ROOT_DIR)/quantum/serial_link/tests/testlist.mk + +define VALIDATE_TEST_LIST + ifneq ($1,) + ifeq ($$(findstring -,$1),-) + $$(error Test names can't contain '-', but '$1' does) + else + $$(eval $$(call VALIDATE_TEST_LIST,$$(firstword $2),$$(wordlist 2,9999,$2))) + endif + endif +endef + +$(eval $(call VALIDATE_TEST_LIST,$(firstword $(TEST_LIST)),$(wordlist 2,9999,$(TEST_LIST)))) \ No newline at end of file From 27a673f5cf75747fe73641059aae60e9b53a1c78 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 21 Aug 2016 17:14:38 +0300 Subject: [PATCH 097/120] The makefile actually calls build_test --- Makefile | 22 +++++++++++++++++----- build_keyboard.mk | 14 +------------- build_test.mk | 5 +++++ common.mk | 12 ++++++++++++ message.mk | 7 +++++++ 5 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 build_test.mk create mode 100644 common.mk diff --git a/Makefile b/Makefile index 16e90f8e49..67b981d51e 100644 --- a/Makefile +++ b/Makefile @@ -358,7 +358,6 @@ define PARSE_KEYMAP MAKE_TARGET := $$(patsubst -%,%,$$(RULE)) # We need to generate an unique indentifer to append to the COMMANDS list COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) - COMMANDS += $$(COMMAND) # If we are compiling a keyboard without a subproject, we want to display just the name # of the keyboard, otherwise keyboard/subproject ifeq ($$(CURRENT_SP),) @@ -370,13 +369,18 @@ define PARSE_KEYMAP KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) # Specify the variables that we are passing forward to submake MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) - MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) # And the first part of the make command MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET) # The message to display MAKE_MSG := $$(MSG_MAKE_KB) # We run the command differently, depending on if we want more output or not # The true version for silent output and the false version otherwise + $$(eval $$(call BUILD)) +endef + +define BUILD + MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) + COMMANDS += $$(COMMAND) COMMAND_true_$$(COMMAND) := \ printf "$$(MAKE_MSG)" | \ $$(MAKE_MSG_FORMAT); \ @@ -398,13 +402,21 @@ define PARSE_ALL_KEYMAPS $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS))) endef +define BUILD_TEST + TEST_NAME := $1 + MAKE_TARGET := $2 + COMMAND := $1 + MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET) + MAKE_VARS := TEST=$$(TEST_NAME) + MAKE_MSG := $$(MSG_MAKE_TEST) + $$(eval $$(call BUILD)) +endef + define PARSE_TEST TEST_NAME := $$(firstword $$(subst -, ,$$(RULE))) TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME)-,,$$(RULE))) MATCHED_TESTS := $$(foreach TEST,$$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME),$$(TEST)),$$(TEST),)) - $$(info Test name $$(TEST_NAME)) - $$(info Test target $$(TEST_TARGET)) - $$(info $$(MATCHED_TESTS)) + $$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET)))) endef diff --git a/build_keyboard.mk b/build_keyboard.mk index f843572f66..bbe5718459 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -4,19 +4,7 @@ endif .DEFAULT_GOAL := all -include message.mk - - -# Directory common source filess exist -TOP_DIR = . -TMK_DIR = tmk_core -TMK_PATH = $(TOP_DIR)/$(TMK_DIR) -LIB_PATH = $(TOP_DIR)/lib - -QUANTUM_DIR = quantum -QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR) - -BUILD_DIR := $(TOP_DIR)/.build +include common.mk ifneq ($(SUBPROJECT),) TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP) diff --git a/build_test.mk b/build_test.mk new file mode 100644 index 0000000000..37ed8b5683 --- /dev/null +++ b/build_test.mk @@ -0,0 +1,5 @@ +include common.mk + + +all: + echo Done $(TEST) \ No newline at end of file diff --git a/common.mk b/common.mk new file mode 100644 index 0000000000..689fdf5a50 --- /dev/null +++ b/common.mk @@ -0,0 +1,12 @@ +include message.mk + +# Directory common source files exist +TOP_DIR = . +TMK_DIR = tmk_core +TMK_PATH = $(TOP_DIR)/$(TMK_DIR) +LIB_PATH = $(TOP_DIR)/lib + +QUANTUM_DIR = quantum +QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR) + +BUILD_DIR := $(TOP_DIR)/.build \ No newline at end of file diff --git a/message.mk b/message.mk index fb1a7a1f9a..96814986b5 100644 --- a/message.mk +++ b/message.mk @@ -69,3 +69,10 @@ define GENERATE_MSG_MAKE_KB endif endef MSG_MAKE_KB = $(eval $(call GENERATE_MSG_MAKE_KB))$(MSG_MAKE_KB_ACTUAL) +define GENERATE_MSG_MAKE_TEST + MSG_MAKE_TEST_ACTUAL := Making test $(BOLD)$(TEST_NAME)$(NO_COLOR) + ifneq ($$(MAKE_TARGET),) + MSG_MAKE_TEST_ACTUAL += with target $(BOLD)$$(MAKE_TARGET)$(NO_COLOR) + endif +endef +MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL) From 8a9aac6e3237a505682cc7249a8dfff6cb964343 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 22 Aug 2016 09:16:08 +0300 Subject: [PATCH 098/120] Rules for compiling and linking google test --- build_keyboard.mk | 8 ++++++++ build_test.mk | 42 ++++++++++++++++++++++++++++++++++++++++-- tmk_core/native.mk | 24 ++++++++++++++++++++++++ tmk_core/rules.mk | 19 +++++++++---------- 4 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 tmk_core/native.mk diff --git a/build_keyboard.mk b/build_keyboard.mk index bbe5718459..869d672b01 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -204,6 +204,14 @@ $(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG) +# Default target. +all: build sizeafter + +# Change the build target to build a HEX file or a library. +build: elf hex +#build: elf hex eep lss sym +#build: lib + include $(TMK_PATH)/rules.mk diff --git a/build_test.mk b/build_test.mk index 37ed8b5683..dac59a8f48 100644 --- a/build_test.mk +++ b/build_test.mk @@ -1,5 +1,43 @@ +ifndef VERBOSE +.SILENT: +endif + +.DEFAULT_GOAL := all + include common.mk +TARGET=test/$(TEST) + +GTEST_OUTPUT = $(BUILD_DIR)/gtest + +OUTPUTS := $(GTEST_OUTPUT) + +GTEST_INC := \ + $(LIB_PATH)/googletest/googletest/include\ + $(LIB_PATH)/googletest/googlemock/include\ + +GTEST_INTERNAL_INC :=\ + $(LIB_PATH)/googletest/googletest\ + $(LIB_PATH)/googletest/googlemock + +$(GTEST_OUTPUT)_SRC :=\ + googletest/src/gtest-all.cc\ + googletest/src/gtest_main.cc\ + googlemock/src/gmock-all.cc + +$(GTEST_OUTPUT)_DEFS := +$(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC) + +LDFLAGS += -lstdc++ -lpthread -shared-libgcc + +VPATH +=\ + $(LIB_PATH)/googletest\ + $(LIB_PATH)/googlemock + +all: elf + +include $(TMK_PATH)/native.mk +include $(TMK_PATH)/rules.mk + +$(shell mkdir $(BUILD_DIR)/test 2>/dev/null) -all: - echo Done $(TEST) \ No newline at end of file diff --git a/tmk_core/native.mk b/tmk_core/native.mk new file mode 100644 index 0000000000..50232ee9b7 --- /dev/null +++ b/tmk_core/native.mk @@ -0,0 +1,24 @@ +CC = gcc +OBJCOPY = +OBJDUMP = +SIZE = +AR = +NM = +HEX = +EEP = +BIN = + + +COMPILEFLAGS += -funsigned-char +COMPILEFLAGS += -funsigned-bitfields +COMPILEFLAGS += -ffunction-sections +COMPILEFLAGS += -fdata-sections +COMPILEFLAGS += -fshort-enums + +CFLAGS += $(COMPILEFLAGS) +CFLAGS += -fno-inline-small-functions +CFLAGS += -fno-strict-aliasing + +CPPFLAGS += $(COMPILEFLAGS) +CPPFLAGS += -fno-exceptions +CPPFLAGS += -std=gnu++11 \ No newline at end of file diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 21011c2808..317f55e083 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -21,13 +21,14 @@ VPATH_SRC := $(VPATH) vpath %.c $(VPATH_SRC) vpath %.h $(VPATH_SRC) vpath %.cpp $(VPATH_SRC) +vpath %.cc $(VPATH_SRC) vpath %.hpp $(VPATH_SRC) vpath %.S $(VPATH_SRC) VPATH := # Convert all SRC to OBJ define OBJ_FROM_SRC -$(patsubst %.c,$1/%.o,$(patsubst %.cpp,$1/%.o,$(patsubst %.S,$1/%.o,$($1_SRC)))) +$(patsubst %.c,$1/%.o,$(patsubst %.cpp,$1/%.o,$(patsubst %.cc,$1/%.o,$(patsubst %.S,$1/%.o,$($1_SRC))))) endef $(foreach OUTPUT,$(OUTPUTS),$(eval $(OUTPUT)_OBJ +=$(call OBJ_FROM_SRC,$(OUTPUT)))) @@ -202,14 +203,6 @@ ALL_ASFLAGS = $(MCUFLAGS) -x assembler-with-cpp $(ASFLAGS) $(EXTRAFLAGS) MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@) -# Default target. -all: build sizeafter - -# Change the build target to build a HEX file or a library. -build: elf hex -#build: elf hex eep lss sym -#build: lib - elf: $(BUILD_DIR)/$(TARGET).elf hex: $(BUILD_DIR)/$(TARGET).hex @@ -305,7 +298,13 @@ $1/%.o : %.cpp $1/%.d $1/cppflags.txt $1/compiler.txt | $(BEGIN) @mkdir -p $$(@D) @$$(SILENT) || printf "$$(MSG_COMPILING_CPP) $$<" | $$(AWK_CMD) $$(eval CMD=$$(CC) -c $$($1_CPPFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP)) - @$(BUILD_CMD) + @$$(BUILD_CMD) + +$1/%.o : %.cc $1/%.d $1/cppflags.txt $1/compiler.txt | $(BEGIN) + @mkdir -p $$(@D) + @$$(SILENT) || printf "$$(MSG_COMPILING_CPP) $$<" | $$(AWK_CMD) + $$(eval CMD=$$(CC) -c $$($1_CPPFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP)) + @$$(BUILD_CMD) # Assemble: create object files from assembler source files. $1/%.o : %.S $1/asflags.txt $1/compiler.txt | $(BEGIN) From 0a11460175d6a838c71343c19eb4ce4699936247 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 24 Aug 2016 22:23:17 +0300 Subject: [PATCH 099/120] Build actual tests, convert byte_stuffer_tests --- build_keyboard.mk | 6 +- build_test.mk | 14 +- common.mk | 16 +- quantum/serial_link/protocol/byte_stuffer.c | 3 - quantum/serial_link/protocol/byte_stuffer.h | 3 + ...stuffer_tests.c => byte_stuffer_tests.cpp} | 317 ++++++++---------- quantum/serial_link/tests/rules.mk | 3 + 7 files changed, 181 insertions(+), 181 deletions(-) rename quantum/serial_link/tests/{byte_stuffer_tests.c => byte_stuffer_tests.cpp} (52%) create mode 100644 quantum/serial_link/tests/rules.mk diff --git a/build_keyboard.mk b/build_keyboard.mk index 869d672b01..164794c634 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -155,12 +155,8 @@ ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) endif ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes) - SERIAL_DIR = $(QUANTUM_DIR)/serial_link - SERIAL_PATH = $(QUANTUM_PATH)/serial_link - SERIAL_SRC = $(wildcard $(SERIAL_PATH)/protocol/*.c) - SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c) SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC)) - OPT_DEFS += -DSERIAL_LINK_ENABLE + OPT_DEFS += $(SERIAL_DEFS) VAPTH += $(SERIAL_PATH) endif diff --git a/build_test.mk b/build_test.mk index dac59a8f48..1d8cb08b15 100644 --- a/build_test.mk +++ b/build_test.mk @@ -10,7 +10,9 @@ TARGET=test/$(TEST) GTEST_OUTPUT = $(BUILD_DIR)/gtest -OUTPUTS := $(GTEST_OUTPUT) +TEST_OBJ = $(BUILD_DIR)/test_obj + +OUTPUTS := $(TEST_OBJ)/$(TEST) $(GTEST_OUTPUT) GTEST_INC := \ $(LIB_PATH)/googletest/googletest/include\ @@ -36,8 +38,16 @@ VPATH +=\ all: elf +include $(QUANTUM_PATH)/serial_link/tests/rules.mk + +$(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC) +$(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC) +$(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS) + include $(TMK_PATH)/native.mk include $(TMK_PATH)/rules.mk -$(shell mkdir $(BUILD_DIR)/test 2>/dev/null) + +$(shell mkdir -p $(BUILD_DIR)/test 2>/dev/null) +$(shell mkdir -p $(TEST_OBJ) 2>/dev/null) diff --git a/common.mk b/common.mk index 689fdf5a50..f9b0773a86 100644 --- a/common.mk +++ b/common.mk @@ -9,4 +9,18 @@ LIB_PATH = $(TOP_DIR)/lib QUANTUM_DIR = quantum QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR) -BUILD_DIR := $(TOP_DIR)/.build \ No newline at end of file +BUILD_DIR := $(TOP_DIR)/.build + +SERIAL_DIR := $(QUANTUM_DIR)/serial_link +SERIAL_PATH := $(QUANTUM_PATH)/serial_link +SERIAL_SRC := $(wildcard $(SERIAL_PATH)/protocol/*.c) +SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c) +SERIAL_DEFS += -DSERIAL_LINK_ENABLE + +VPATH += $(TOP_DIR) +VPATH += $(TMK_PATH) +VPATH += $(QUANTUM_PATH) +VPATH += $(QUANTUM_PATH)/keymap_extras +VPATH += $(QUANTUM_PATH)/audio +VPATH += $(QUANTUM_PATH)/process_keycode +VPATH += $(SERIAL_PATH) \ No newline at end of file diff --git a/quantum/serial_link/protocol/byte_stuffer.c b/quantum/serial_link/protocol/byte_stuffer.c index fb4c45a8dc..2c87d64c29 100644 --- a/quantum/serial_link/protocol/byte_stuffer.c +++ b/quantum/serial_link/protocol/byte_stuffer.c @@ -31,9 +31,6 @@ SOFTWARE. // https://en.wikipedia.org/wiki/Consistent_Overhead_Byte_Stuffing // http://www.stuartcheshire.org/papers/COBSforToN.pdf -#define MAX_FRAME_SIZE 1024 -#define NUM_LINKS 2 - typedef struct byte_stuffer_state { uint16_t next_zero; uint16_t data_pos; diff --git a/quantum/serial_link/protocol/byte_stuffer.h b/quantum/serial_link/protocol/byte_stuffer.h index 2cc88beb42..97e8968564 100644 --- a/quantum/serial_link/protocol/byte_stuffer.h +++ b/quantum/serial_link/protocol/byte_stuffer.h @@ -27,6 +27,9 @@ SOFTWARE. #include +#define MAX_FRAME_SIZE 1024 +#define NUM_LINKS 2 + void init_byte_stuffer(void); void byte_stuffer_recv_byte(uint8_t link, uint8_t data); void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size); diff --git a/quantum/serial_link/tests/byte_stuffer_tests.c b/quantum/serial_link/tests/byte_stuffer_tests.cpp similarity index 52% rename from quantum/serial_link/tests/byte_stuffer_tests.c rename to quantum/serial_link/tests/byte_stuffer_tests.cpp index 64b170e8c1..ff49d727bb 100644 --- a/quantum/serial_link/tests/byte_stuffer_tests.c +++ b/quantum/serial_link/tests/byte_stuffer_tests.cpp @@ -22,70 +22,90 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include -#include +#include "gtest/gtest.h" +#include "gmock/gmock.h" +#include +#include +extern "C" { #include "serial_link/protocol/byte_stuffer.h" -#include "serial_link/protocol/byte_stuffer.c" #include "serial_link/protocol/frame_validator.h" #include "serial_link/protocol/physical.h" - -static uint8_t sent_data[MAX_FRAME_SIZE*2]; -static uint16_t sent_data_size; - -Describe(ByteStuffer); -BeforeEach(ByteStuffer) { - init_byte_stuffer(); - sent_data_size = 0; -} -AfterEach(ByteStuffer) {} - -void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) { - mock(data, size); } -void send_data(uint8_t link, const uint8_t* data, uint16_t size) { - memcpy(sent_data + sent_data_size, data, size); - sent_data_size += size; +using testing::_; +using testing::ElementsAreArray; +using testing::Args; + +class ByteStuffer : public ::testing::Test{ +public: + ByteStuffer() { + Instance = this; + init_byte_stuffer(); + } + + ~ByteStuffer() { + Instance = nullptr; + } + + MOCK_METHOD3(validator_recv_frame, void (uint8_t link, uint8_t* data, uint16_t size)); + + void send_data(uint8_t link, const uint8_t* data, uint16_t size) { + std::copy(data, data + size, std::back_inserter(sent_data)); + } + std::vector sent_data; + + static ByteStuffer* Instance; +}; + +ByteStuffer* ByteStuffer::Instance = nullptr; + +extern "C" { + void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) { + ByteStuffer::Instance->validator_recv_frame(link, data, size); + } + + void send_data(uint8_t link, const uint8_t* data, uint16_t size) { + ByteStuffer::Instance->send_data(link, data, size); + } } -Ensure(ByteStuffer, receives_no_frame_for_a_single_zero_byte) { - never_expect(validator_recv_frame); +TEST_F(ByteStuffer, receives_no_frame_for_a_single_zero_byte) { + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .Times(0); byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_no_frame_for_a_single_FF_byte) { - never_expect(validator_recv_frame); +TEST_F(ByteStuffer, receives_no_frame_for_a_single_FF_byte) { + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .Times(0); byte_stuffer_recv_byte(0, 0xFF); } -Ensure(ByteStuffer, receives_no_frame_for_a_single_random_byte) { - never_expect(validator_recv_frame); +TEST_F(ByteStuffer, receives_no_frame_for_a_single_random_byte) { + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .Times(0); byte_stuffer_recv_byte(0, 0x4A); } -Ensure(ByteStuffer, receives_no_frame_for_a_zero_length_frame) { - never_expect(validator_recv_frame); +TEST_F(ByteStuffer, receives_no_frame_for_a_zero_length_frame) { + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .Times(0); byte_stuffer_recv_byte(0, 1); byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_single_byte_valid_frame) { +TEST_F(ByteStuffer, receives_single_byte_valid_frame) { uint8_t expected[] = {0x37}; - expect(validator_recv_frame, - when(size, is_equal_to(1)), - when(data, is_equal_to_contents_of(expected, 1)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(0, 2); byte_stuffer_recv_byte(0, 0x37); byte_stuffer_recv_byte(0, 0); } - -Ensure(ByteStuffer, receives_three_bytes_valid_frame) { +TEST_F(ByteStuffer, receives_three_bytes_valid_frame) { uint8_t expected[] = {0x37, 0x99, 0xFF}; - expect(validator_recv_frame, - when(size, is_equal_to(3)), - when(data, is_equal_to_contents_of(expected, 3)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(0, 4); byte_stuffer_recv_byte(0, 0x37); byte_stuffer_recv_byte(0, 0x99); @@ -93,23 +113,19 @@ Ensure(ByteStuffer, receives_three_bytes_valid_frame) { byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_single_zero_valid_frame) { +TEST_F(ByteStuffer, receives_single_zero_valid_frame) { uint8_t expected[] = {0}; - expect(validator_recv_frame, - when(size, is_equal_to(1)), - when(data, is_equal_to_contents_of(expected, 1)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(0, 1); byte_stuffer_recv_byte(0, 1); byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_valid_frame_with_zeroes) { +TEST_F(ByteStuffer, receives_valid_frame_with_zeroes) { uint8_t expected[] = {5, 0, 3, 0}; - expect(validator_recv_frame, - when(size, is_equal_to(4)), - when(data, is_equal_to_contents_of(expected, 4)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(0, 2); byte_stuffer_recv_byte(0, 5); byte_stuffer_recv_byte(0, 2); @@ -118,17 +134,14 @@ Ensure(ByteStuffer, receives_valid_frame_with_zeroes) { byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_two_valid_frames) { + +TEST_F(ByteStuffer, receives_two_valid_frames) { uint8_t expected1[] = {5, 0}; uint8_t expected2[] = {3}; - expect(validator_recv_frame, - when(size, is_equal_to(2)), - when(data, is_equal_to_contents_of(expected1, 2)) - ); - expect(validator_recv_frame, - when(size, is_equal_to(1)), - when(data, is_equal_to_contents_of(expected2, 1)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected1))); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected2))); byte_stuffer_recv_byte(1, 2); byte_stuffer_recv_byte(1, 5); byte_stuffer_recv_byte(1, 1); @@ -138,12 +151,10 @@ Ensure(ByteStuffer, receives_two_valid_frames) { byte_stuffer_recv_byte(1, 0); } -Ensure(ByteStuffer, receives_valid_frame_after_unexpected_zero) { +TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_zero) { uint8_t expected[] = {5, 7}; - expect(validator_recv_frame, - when(size, is_equal_to(2)), - when(data, is_equal_to_contents_of(expected, 2)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(1, 3); byte_stuffer_recv_byte(1, 1); byte_stuffer_recv_byte(1, 0); @@ -153,12 +164,10 @@ Ensure(ByteStuffer, receives_valid_frame_after_unexpected_zero) { byte_stuffer_recv_byte(1, 0); } -Ensure(ByteStuffer, receives_valid_frame_after_unexpected_non_zero) { +TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_non_zero) { uint8_t expected[] = {5, 7}; - expect(validator_recv_frame, - when(size, is_equal_to(2)), - when(data, is_equal_to_contents_of(expected, 2)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(0, 2); byte_stuffer_recv_byte(0, 9); byte_stuffer_recv_byte(0, 4); // This should have been zero @@ -169,16 +178,14 @@ Ensure(ByteStuffer, receives_valid_frame_after_unexpected_non_zero) { byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_and_then_end_of_frame) { +TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_and_then_end_of_frame) { uint8_t expected[254]; int i; for (i=0;i<254;i++) { expected[i] = i + 1; } - expect(validator_recv_frame, - when(size, is_equal_to(254)), - when(data, is_equal_to_contents_of(expected, 254)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(0, 0xFF); for (i=0;i<254;i++) { byte_stuffer_recv_byte(0, i+1); @@ -186,17 +193,15 @@ Ensure(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_and_then_end_ byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_non_zero) { +TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_non_zero) { uint8_t expected[255]; int i; for (i=0;i<254;i++) { expected[i] = i + 1; } expected[254] = 7; - expect(validator_recv_frame, - when(size, is_equal_to(255)), - when(data, is_equal_to_contents_of(expected, 255)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(0, 0xFF); for (i=0;i<254;i++) { byte_stuffer_recv_byte(0, i+1); @@ -206,17 +211,15 @@ Ensure(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_ byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_zero) { +TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_zero) { uint8_t expected[255]; int i; for (i=0;i<254;i++) { expected[i] = i + 1; } expected[254] = 0; - expect(validator_recv_frame, - when(size, is_equal_to(255)), - when(data, is_equal_to_contents_of(expected, 255)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(0, 0xFF); for (i=0;i<254;i++) { byte_stuffer_recv_byte(0, i+1); @@ -226,7 +229,7 @@ Ensure(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_ byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_two_long_frames_and_some_more) { +TEST_F(ByteStuffer, receives_two_long_frames_and_some_more) { uint8_t expected[515]; int i; int j; @@ -238,10 +241,8 @@ Ensure(ByteStuffer, receives_two_long_frames_and_some_more) { for (i=0;i<7;i++) { expected[254*2+i] = i + 1; } - expect(validator_recv_frame, - when(size, is_equal_to(515)), - when(data, is_equal_to_contents_of(expected, 510)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); byte_stuffer_recv_byte(0, 0xFF); for (i=0;i<254;i++) { byte_stuffer_recv_byte(0, i+1); @@ -261,12 +262,10 @@ Ensure(ByteStuffer, receives_two_long_frames_and_some_more) { byte_stuffer_recv_byte(0, 0); } -Ensure(ByteStuffer, receives_an_all_zeros_frame_that_is_maximum_size) { +TEST_F(ByteStuffer, receives_an_all_zeros_frame_that_is_maximum_size) { uint8_t expected[MAX_FRAME_SIZE] = {}; - expect(validator_recv_frame, - when(size, is_equal_to(MAX_FRAME_SIZE)), - when(data, is_equal_to_contents_of(expected, MAX_FRAME_SIZE)) - ); + EXPECT_CALL(*this, validator_recv_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); int i; byte_stuffer_recv_byte(0, 1); for(i=0;i(ElementsAreArray(expected))); int i; byte_stuffer_recv_byte(0, 1); for(i=0;i(ElementsAreArray(original_data))); int i; - for(i=0;i(ElementsAreArray(original_data))); int i; - for(i=0;i(ElementsAreArray(original_data))); + for(auto& d : sent_data) { + byte_stuffer_recv_byte(1, d); } } -Ensure(ByteStuffer, sends_and_receives_full_roundtrip_256_bytes) { +TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_256_bytes) { uint8_t original_data[256]; int i; for(i=0;i<254;i++) { @@ -479,16 +460,14 @@ Ensure(ByteStuffer, sends_and_receives_full_roundtrip_256_bytes) { original_data[254] = 22; original_data[255] = 23; byte_stuffer_send_frame(0, original_data, sizeof(original_data)); - expect(validator_recv_frame, - when(size, is_equal_to(sizeof(original_data))), - when(data, is_equal_to_contents_of(original_data, sizeof(original_data))) - ); - for(i=0;i(ElementsAreArray(original_data))); + for(auto& d : sent_data) { + byte_stuffer_recv_byte(1, d); } } -Ensure(ByteStuffer, sends_and_receives_full_roundtrip_254_bytes_and_then_zero) { +TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_254_bytes_and_then_zero) { uint8_t original_data[255]; int i; for(i=0;i<254;i++) { @@ -496,11 +475,9 @@ Ensure(ByteStuffer, sends_and_receives_full_roundtrip_254_bytes_and_then_zero) { } original_data[254] = 0; byte_stuffer_send_frame(0, original_data, sizeof(original_data)); - expect(validator_recv_frame, - when(size, is_equal_to(sizeof(original_data))), - when(data, is_equal_to_contents_of(original_data, sizeof(original_data))) - ); - for(i=0;i(ElementsAreArray(original_data))); + for(auto& d : sent_data) { + byte_stuffer_recv_byte(1, d); } } diff --git a/quantum/serial_link/tests/rules.mk b/quantum/serial_link/tests/rules.mk new file mode 100644 index 0000000000..651f56b950 --- /dev/null +++ b/quantum/serial_link/tests/rules.mk @@ -0,0 +1,3 @@ +serial_link_byte_stuffer_SRC :=\ + $(SERIAL_PATH)/tests/byte_stuffer_tests.cpp \ + $(SERIAL_PATH)/protocol/byte_stuffer.c \ No newline at end of file From f4429ba48ca8346a208b711cd63e7413ac3efeff Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Thu, 25 Aug 2016 11:25:27 +0300 Subject: [PATCH 100/120] Running of unit tests But only if the compilation has succeeded --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 67b981d51e..054aa31ec5 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ ABS_ROOT_MAKEFILE := $(abspath $(ROOT_MAKEFILE)) ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE)) ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE)) STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR)) +TEST_DIR := $(ROOT_DIR)/.build/test MAKEFILE_INCLUDED=yes @@ -394,7 +395,10 @@ define BUILD fi; COMMAND_false_$$(COMMAND) := \ printf "$$(MAKE_MSG)\n\n"; \ - $$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; + $$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; \ + if [ $$$$? -gt 0 ]; \ + then error_occured=1; \ + fi; endef # Just parse all the keymaps for a specifc keyboard @@ -410,6 +414,7 @@ define BUILD_TEST MAKE_VARS := TEST=$$(TEST_NAME) MAKE_MSG := $$(MSG_MAKE_TEST) $$(eval $$(call BUILD)) + TESTS += $$(TEST_DIR)/$$(TEST_NAME).elf endef define PARSE_TEST @@ -464,8 +469,8 @@ $(SUBPROJECTS): %: %-allkm # But we return the error code at the end, to trigger travis failures +error_occured=0; \ $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) \ - if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi - + if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi;\ + $(foreach TEST,$(TESTS),$(TEST)) # All should compile everything .PHONY: all From fc855cb30e86aadee7b1d9ee62f83d85cc0447ea Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 13:29:54 +0300 Subject: [PATCH 101/120] Fix running multiple tests --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 054aa31ec5..5f5c46860c 100644 --- a/Makefile +++ b/Makefile @@ -414,10 +414,12 @@ define BUILD_TEST MAKE_VARS := TEST=$$(TEST_NAME) MAKE_MSG := $$(MSG_MAKE_TEST) $$(eval $$(call BUILD)) - TESTS += $$(TEST_DIR)/$$(TEST_NAME).elf + TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf + TESTS += $$(TEST_EXECUTABLE) endef define PARSE_TEST + TESTS := TEST_NAME := $$(firstword $$(subst -, ,$$(RULE))) TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME)-,,$$(RULE))) MATCHED_TESTS := $$(foreach TEST,$$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME),$$(TEST)),$$(TEST),)) @@ -470,7 +472,7 @@ $(SUBPROJECTS): %: %-allkm +error_occured=0; \ $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) \ if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi;\ - $(foreach TEST,$(TESTS),$(TEST)) + $(foreach TEST,$(TESTS),$(TEST);) # All should compile everything .PHONY: all From c692fd1d55cb2103e9f7c40c8953ec92b5178c52 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 13:43:12 +0300 Subject: [PATCH 102/120] More common settings for unit tests and keyboards --- build_keyboard.mk | 25 +++++++++++----- build_test.mk | 3 ++ common.mk | 14 ++++----- tmk_core/common.mk | 71 ++++++++++++++++++++-------------------------- 4 files changed, 59 insertions(+), 54 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index 164794c634..5bec4ecf66 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -23,6 +23,16 @@ ifdef master MASTER = $(master) endif +ifeq ($(MASTER),right) + OPT_DEFS += -DMASTER_IS_ON_RIGHT +else + ifneq ($(MASTER),left) +$(error MASTER does not have a valid value(left/right)) + endif +endif + + + KEYBOARD_PATH := keyboards/$(KEYBOARD) KEYBOARD_C := $(KEYBOARD_PATH)/$(KEYBOARD).c @@ -169,15 +179,14 @@ ifneq ($(SUBPROJECT),) VPATH += $(SUBPROJECT_PATH) endif VPATH += $(KEYBOARD_PATH) -VPATH += $(TOP_DIR) -VPATH += $(TMK_PATH) -VPATH += $(QUANTUM_PATH) -VPATH += $(QUANTUM_PATH)/keymap_extras -VPATH += $(QUANTUM_PATH)/audio -VPATH += $(QUANTUM_PATH)/process_keycode +VPATH += $(COMMON_VPATH) include $(TMK_PATH)/common.mk +SRC += $(TMK_COMMON_SRC) +OPT_DEFS += $(TMK_COMMON_DEFS) +EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS) + ifeq ($(PLATFORM),AVR) include $(TMK_PATH)/protocol/lufa.mk include $(TMK_PATH)/avr.mk @@ -189,11 +198,13 @@ ifeq ($(strip $(VISUALIZER_ENABLE)), yes) include $(VISUALIZER_PATH)/visualizer.mk endif +$(info $(VPATH)) + OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) $(KEYMAP_OUTPUT)_SRC := $(SRC) $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" -$(KEYMAP_OUTPUT)_INC := $(EXTRAINCDIRS) $(VPATH) +$(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H) $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) diff --git a/build_test.mk b/build_test.mk index 1d8cb08b15..9f5d6e0af2 100644 --- a/build_test.mk +++ b/build_test.mk @@ -38,6 +38,9 @@ VPATH +=\ all: elf +VPATH += $(COMMON_VPATH) + +include $(TMK_PATH)/common.mk include $(QUANTUM_PATH)/serial_link/tests/rules.mk $(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC) diff --git a/common.mk b/common.mk index f9b0773a86..18751cd5ac 100644 --- a/common.mk +++ b/common.mk @@ -17,10 +17,10 @@ SERIAL_SRC := $(wildcard $(SERIAL_PATH)/protocol/*.c) SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c) SERIAL_DEFS += -DSERIAL_LINK_ENABLE -VPATH += $(TOP_DIR) -VPATH += $(TMK_PATH) -VPATH += $(QUANTUM_PATH) -VPATH += $(QUANTUM_PATH)/keymap_extras -VPATH += $(QUANTUM_PATH)/audio -VPATH += $(QUANTUM_PATH)/process_keycode -VPATH += $(SERIAL_PATH) \ No newline at end of file +COMMON_VPATH := $(TOP_DIR) +COMMON_VPATH += $(TMK_PATH) +COMMON_VPATH += $(QUANTUM_PATH) +COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras +COMMON_VPATH += $(QUANTUM_PATH)/audio +COMMON_VPATH += $(QUANTUM_PATH)/process_keycode +COMMON_VPATH += $(SERIAL_PATH) \ No newline at end of file diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 0b767eb047..f826a7b540 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -5,7 +5,7 @@ else ifeq ($(PLATFORM),CHIBIOS) PLATFORM_COMMON_DIR = $(COMMON_DIR)/chibios endif -SRC += $(COMMON_DIR)/host.c \ +TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ $(COMMON_DIR)/keyboard.c \ $(COMMON_DIR)/action.c \ $(COMMON_DIR)/action_tapping.c \ @@ -21,98 +21,89 @@ SRC += $(COMMON_DIR)/host.c \ $(PLATFORM_COMMON_DIR)/bootloader.c \ ifeq ($(PLATFORM),AVR) - SRC += $(PLATFORM_COMMON_DIR)/xprintf.S + TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S endif ifeq ($(PLATFORM),CHIBIOS) - SRC += $(PLATFORM_COMMON_DIR)/printf.c - SRC += $(PLATFORM_COMMON_DIR)/eeprom.c + TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c + TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/eeprom.c endif # Option modules ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes) - OPT_DEFS += -DBOOTMAGIC_ENABLE - SRC += $(COMMON_DIR)/bootmagic.c + TMK_COMMON_DEFS += -DBOOTMAGIC_ENABLE + TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic.c else - OPT_DEFS += -DMAGIC_ENABLE - SRC += $(COMMON_DIR)/magic.c + TMK_COMMON_DEFS += -DMAGIC_ENABLE + TMK_COMMON_SRC += $(COMMON_DIR)/magic.c endif ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) - SRC += $(COMMON_DIR)/mousekey.c - OPT_DEFS += -DMOUSEKEY_ENABLE - OPT_DEFS += -DMOUSE_ENABLE + TMK_COMMON_SRC += $(COMMON_DIR)/mousekey.c + TMK_COMMON_DEFS += -DMOUSEKEY_ENABLE + TMK_COMMON_DEFS += -DMOUSE_ENABLE endif ifeq ($(strip $(EXTRAKEY_ENABLE)), yes) - OPT_DEFS += -DEXTRAKEY_ENABLE + TMK_COMMON_DEFS += -DEXTRAKEY_ENABLE endif ifeq ($(strip $(CONSOLE_ENABLE)), yes) - OPT_DEFS += -DCONSOLE_ENABLE + TMK_COMMON_DEFS += -DCONSOLE_ENABLE else - OPT_DEFS += -DNO_PRINT - OPT_DEFS += -DNO_DEBUG + TMK_COMMON_DEFS += -DNO_PRINT + TMK_COMMON_DEFS += -DNO_DEBUG endif ifeq ($(strip $(COMMAND_ENABLE)), yes) - SRC += $(COMMON_DIR)/command.c - OPT_DEFS += -DCOMMAND_ENABLE + TMK_COMMON_SRC += $(COMMON_DIR)/command.c + TMK_COMMON_DEFS += -DCOMMAND_ENABLE endif ifeq ($(strip $(NKRO_ENABLE)), yes) - OPT_DEFS += -DNKRO_ENABLE + TMK_COMMON_DEFS += -DNKRO_ENABLE endif ifeq ($(strip $(USB_6KRO_ENABLE)), yes) - OPT_DEFS += -DUSB_6KRO_ENABLE + TMK_COMMON_DEFS += -DUSB_6KRO_ENABLE endif ifeq ($(strip $(SLEEP_LED_ENABLE)), yes) - SRC += $(PLATFORM_COMMON_DIR)/sleep_led.c - OPT_DEFS += -DSLEEP_LED_ENABLE - OPT_DEFS += -DNO_SUSPEND_POWER_DOWN + TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/sleep_led.c + TMK_COMMON_DEFS += -DSLEEP_LED_ENABLE + TMK_COMMON_DEFS += -DNO_SUSPEND_POWER_DOWN endif ifeq ($(strip $(BACKLIGHT_ENABLE)), yes) - SRC += $(COMMON_DIR)/backlight.c - OPT_DEFS += -DBACKLIGHT_ENABLE + TMK_COMMON_SRC += $(COMMON_DIR)/backlight.c + TMK_COMMON_DEFS += -DBACKLIGHT_ENABLE endif ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) - OPT_DEFS += -DBLUETOOTH_ENABLE + TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE endif ifeq ($(strip $(ONEHAND_ENABLE)), yes) - OPT_DEFS += -DONEHAND_ENABLE + TMK_COMMON_DEFS += -DONEHAND_ENABLE endif ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes) - OPT_DEFS += -DKEYMAP_SECTION_ENABLE + TMK_COMMON_DEFS += -DKEYMAP_SECTION_ENABLE ifeq ($(strip $(MCU)),atmega32u2) - EXTRALDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr35.x + TMK_COMMON_LDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr35.x else ifeq ($(strip $(MCU)),atmega32u4) - EXTRALDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr5.x + TMK_COMMON_LDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr5.x else - EXTRALDFLAGS = $(error no ldscript for keymap section) + TMK_COMMON_LDFLAGS = $(error no ldscript for keymap section) endif endif -ifeq ($(MASTER),right) - OPT_DEFS += -DMASTER_IS_ON_RIGHT -else - ifneq ($(MASTER),left) -$(error MASTER does not have a valid value(left/right)) - endif -endif - - # Bootloader address ifdef STM32_BOOTLOADER_ADDRESS - OPT_DEFS += -DSTM32_BOOTLOADER_ADDRESS=$(STM32_BOOTLOADER_ADDRESS) + TMK_COMMON_DEFS += -DSTM32_BOOTLOADER_ADDRESS=$(STM32_BOOTLOADER_ADDRESS) endif # Search Path From cdd0913bcc63334fa20f1a7bd46bdce4d4f2843b Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 13:43:46 +0300 Subject: [PATCH 103/120] Convert frame_router_tests to GTest --- .../serial_link/tests/frame_router_tests.c | 231 ------------------ .../serial_link/tests/frame_router_tests.cpp | 229 +++++++++++++++++ quantum/serial_link/tests/rules.mk | 8 +- 3 files changed, 236 insertions(+), 232 deletions(-) delete mode 100644 quantum/serial_link/tests/frame_router_tests.c create mode 100644 quantum/serial_link/tests/frame_router_tests.cpp diff --git a/quantum/serial_link/tests/frame_router_tests.c b/quantum/serial_link/tests/frame_router_tests.c deleted file mode 100644 index 6c806fa939..0000000000 --- a/quantum/serial_link/tests/frame_router_tests.c +++ /dev/null @@ -1,231 +0,0 @@ -/* -The MIT License (MIT) - -Copyright (c) 2016 Fred Sundvik - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include -#include -#include "serial_link/protocol/byte_stuffer.c" -#include "serial_link/protocol/frame_validator.c" -#include "serial_link/protocol/frame_router.c" -#include "serial_link/protocol/transport.h" - -static uint8_t received_data[256]; -static uint16_t received_data_size; - -typedef struct { - uint8_t sent_data[256]; - uint16_t sent_data_size; -} receive_buffer_t; - -typedef struct { - receive_buffer_t send_buffers[2]; -} router_buffer_t; - -router_buffer_t router_buffers[8]; - -router_buffer_t* current_router_buffer; - - -Describe(FrameRouter); -BeforeEach(FrameRouter) { - init_byte_stuffer(); - memset(router_buffers, 0, sizeof(router_buffers)); - current_router_buffer = 0; -} -AfterEach(FrameRouter) {} - -typedef struct { - uint32_t data; - uint8_t extra[16]; -} frame_buffer_t; - - -void send_data(uint8_t link, const uint8_t* data, uint16_t size) { - receive_buffer_t* buffer = ¤t_router_buffer->send_buffers[link]; - memcpy(buffer->sent_data + buffer->sent_data_size, data, size); - buffer->sent_data_size += size; -} - -static void receive_data(uint8_t link, uint8_t* data, uint16_t size) { - int i; - for(i=0;i to) { - receive_data(DOWN_LINK, - router_buffers[from].send_buffers[UP_LINK].sent_data, - router_buffers[from].send_buffers[UP_LINK].sent_data_size); - } - else if(to > from) { - receive_data(UP_LINK, - router_buffers[from].send_buffers[DOWN_LINK].sent_data, - router_buffers[from].send_buffers[DOWN_LINK].sent_data_size); - } -} - -void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) { - mock(from, data, size); -} - - -Ensure(FrameRouter, master_broadcast_is_received_by_everyone) { - frame_buffer_t data; - data.data = 0xAB7055BB; - activate_router(0); - router_send_frame(0xFF, (uint8_t*)&data, 4); - assert_that(router_buffers[0].send_buffers[DOWN_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[0].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); - - expect(transport_recv_frame, - when(from, is_equal_to(0)), - when(size, is_equal_to(4)), - when(data, is_equal_to_contents_of(&data.data, 4)) - ); - simulate_transport(0, 1); - assert_that(router_buffers[1].send_buffers[DOWN_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[1].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); - - expect(transport_recv_frame, - when(from, is_equal_to(0)), - when(size, is_equal_to(4)), - when(data, is_equal_to_contents_of(&data.data, 4)) - ); - simulate_transport(1, 2); - assert_that(router_buffers[2].send_buffers[DOWN_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[2].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); -} - -Ensure(FrameRouter, master_send_is_received_by_targets) { - frame_buffer_t data; - data.data = 0xAB7055BB; - activate_router(0); - router_send_frame((1 << 1) | (1 << 2), (uint8_t*)&data, 4); - assert_that(router_buffers[0].send_buffers[DOWN_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[0].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); - - simulate_transport(0, 1); - assert_that(router_buffers[1].send_buffers[DOWN_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[1].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); - - expect(transport_recv_frame, - when(from, is_equal_to(0)), - when(size, is_equal_to(4)), - when(data, is_equal_to_contents_of(&data.data, 4)) - ); - simulate_transport(1, 2); - assert_that(router_buffers[2].send_buffers[DOWN_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[2].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); - - expect(transport_recv_frame, - when(from, is_equal_to(0)), - when(size, is_equal_to(4)), - when(data, is_equal_to_contents_of(&data.data, 4)) - ); - simulate_transport(2, 3); - assert_that(router_buffers[3].send_buffers[DOWN_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[3].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); -} - -Ensure(FrameRouter, first_link_sends_to_master) { - frame_buffer_t data; - data.data = 0xAB7055BB; - activate_router(1); - router_send_frame(0, (uint8_t*)&data, 4); - assert_that(router_buffers[1].send_buffers[UP_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[1].send_buffers[DOWN_LINK].sent_data_size, is_equal_to(0)); - - expect(transport_recv_frame, - when(from, is_equal_to(1)), - when(size, is_equal_to(4)), - when(data, is_equal_to_contents_of(&data.data, 4)) - ); - simulate_transport(1, 0); - assert_that(router_buffers[0].send_buffers[DOWN_LINK].sent_data_size, is_equal_to(0)); - assert_that(router_buffers[0].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); -} - -Ensure(FrameRouter, second_link_sends_to_master) { - frame_buffer_t data; - data.data = 0xAB7055BB; - activate_router(2); - router_send_frame(0, (uint8_t*)&data, 4); - assert_that(router_buffers[2].send_buffers[UP_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[2].send_buffers[DOWN_LINK].sent_data_size, is_equal_to(0)); - - simulate_transport(2, 1); - assert_that(router_buffers[1].send_buffers[UP_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[1].send_buffers[DOWN_LINK].sent_data_size, is_equal_to(0)); - - expect(transport_recv_frame, - when(from, is_equal_to(2)), - when(size, is_equal_to(4)), - when(data, is_equal_to_contents_of(&data.data, 4)) - ); - simulate_transport(1, 0); - assert_that(router_buffers[0].send_buffers[DOWN_LINK].sent_data_size, is_equal_to(0)); - assert_that(router_buffers[0].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); -} - -Ensure(FrameRouter, master_sends_to_master_does_nothing) { - frame_buffer_t data; - data.data = 0xAB7055BB; - activate_router(0); - router_send_frame(0, (uint8_t*)&data, 4); - assert_that(router_buffers[0].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); - assert_that(router_buffers[0].send_buffers[DOWN_LINK].sent_data_size, is_equal_to(0)); -} - -Ensure(FrameRouter, link_sends_to_other_link_does_nothing) { - frame_buffer_t data; - data.data = 0xAB7055BB; - activate_router(1); - router_send_frame(2, (uint8_t*)&data, 4); - assert_that(router_buffers[1].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); - assert_that(router_buffers[1].send_buffers[DOWN_LINK].sent_data_size, is_equal_to(0)); -} - -Ensure(FrameRouter, master_receives_on_uplink_does_nothing) { - frame_buffer_t data; - data.data = 0xAB7055BB; - activate_router(1); - router_send_frame(0, (uint8_t*)&data, 4); - assert_that(router_buffers[1].send_buffers[UP_LINK].sent_data_size, is_greater_than(0)); - assert_that(router_buffers[1].send_buffers[DOWN_LINK].sent_data_size, is_equal_to(0)); - - never_expect(transport_recv_frame); - activate_router(0); - receive_data(UP_LINK, - router_buffers[1].send_buffers[UP_LINK].sent_data, - router_buffers[1].send_buffers[UP_LINK].sent_data_size); - assert_that(router_buffers[0].send_buffers[UP_LINK].sent_data_size, is_equal_to(0)); - assert_that(router_buffers[0].send_buffers[DOWN_LINK].sent_data_size, is_equal_to(0)); -} diff --git a/quantum/serial_link/tests/frame_router_tests.cpp b/quantum/serial_link/tests/frame_router_tests.cpp new file mode 100644 index 0000000000..2bd5bf830d --- /dev/null +++ b/quantum/serial_link/tests/frame_router_tests.cpp @@ -0,0 +1,229 @@ +/* +The MIT License (MIT) + +Copyright (c) 2016 Fred Sundvik + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#include "gtest/gtest.h" +#include "gmock/gmock.h" +#include +extern "C" { + #include "serial_link/protocol/transport.h" + #include "serial_link/protocol/byte_stuffer.h" + #include "serial_link/protocol/frame_router.h" +} + +using testing::_; +using testing::ElementsAreArray; +using testing::Args; + +class FrameRouter : public testing::Test { +public: + FrameRouter() : + current_router_buffer(nullptr) + { + Instance = this; + init_byte_stuffer(); + } + + ~FrameRouter() { + Instance = nullptr; + } + + void send_data(uint8_t link, const uint8_t* data, uint16_t size) { + auto& buffer = current_router_buffer->send_buffers[link]; + std::copy(data, data + size, std::back_inserter(buffer)); + } + + void receive_data(uint8_t link, uint8_t* data, uint16_t size) { + int i; + for(i=0;i to) { + receive_data(DOWN_LINK, + router_buffers[from].send_buffers[UP_LINK].data(), + router_buffers[from].send_buffers[UP_LINK].size()); + } + else if(to > from) { + receive_data(UP_LINK, + router_buffers[from].send_buffers[DOWN_LINK].data(), + router_buffers[from].send_buffers[DOWN_LINK].size()); + } + } + + MOCK_METHOD3(transport_recv_frame, void (uint8_t from, uint8_t* data, uint16_t size)); + + std::vector received_data; + + struct router_buffer { + std::vector send_buffers[2]; + }; + + router_buffer router_buffers[8]; + router_buffer* current_router_buffer; + + static FrameRouter* Instance; +}; + +FrameRouter* FrameRouter::Instance = nullptr; + + +typedef struct { + std::array data; + uint8_t extra[16]; +} frame_buffer_t; + + +extern "C" { + void send_data(uint8_t link, const uint8_t* data, uint16_t size) { + FrameRouter::Instance->send_data(link, data, size); + } + + + void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) { + FrameRouter::Instance->transport_recv_frame(from, data, size); + } +} + +TEST_F(FrameRouter, master_broadcast_is_received_by_everyone) { + frame_buffer_t data; + data.data = {0xAB, 0x70, 0x55, 0xBB}; + activate_router(0); + router_send_frame(0xFF, (uint8_t*)&data, 4); + EXPECT_GT(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); + EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); + EXPECT_CALL(*this, transport_recv_frame(0, _, _)) + .With(Args<1, 2>(ElementsAreArray(data.data))); + simulate_transport(0, 1); + EXPECT_GT(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); + EXPECT_EQ(router_buffers[1].send_buffers[UP_LINK].size(), 0); + + EXPECT_CALL(*this, transport_recv_frame(0, _, _)) + .With(Args<1, 2>(ElementsAreArray(data.data))); + simulate_transport(1, 2); + EXPECT_GT(router_buffers[2].send_buffers[DOWN_LINK].size(), 0); + EXPECT_EQ(router_buffers[2].send_buffers[UP_LINK].size(), 0); +} + +TEST_F(FrameRouter, master_send_is_received_by_targets) { + frame_buffer_t data; + data.data = {0xAB, 0x70, 0x55, 0xBB}; + activate_router(0); + router_send_frame((1 << 1) | (1 << 2), (uint8_t*)&data, 4); + EXPECT_GT(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); + EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); + + simulate_transport(0, 1); + EXPECT_GT(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); + EXPECT_EQ(router_buffers[1].send_buffers[UP_LINK].size(), 0); + + EXPECT_CALL(*this, transport_recv_frame(0, _, _)) + .With(Args<1, 2>(ElementsAreArray(data.data))); + simulate_transport(1, 2); + EXPECT_GT(router_buffers[2].send_buffers[DOWN_LINK].size(), 0); + EXPECT_EQ(router_buffers[2].send_buffers[UP_LINK].size(), 0); + + EXPECT_CALL(*this, transport_recv_frame(0, _, _)) + .With(Args<1, 2>(ElementsAreArray(data.data))); + simulate_transport(2, 3); + EXPECT_GT(router_buffers[3].send_buffers[DOWN_LINK].size(), 0); + EXPECT_EQ(router_buffers[3].send_buffers[UP_LINK].size(), 0); +} + +TEST_F(FrameRouter, first_link_sends_to_master) { + frame_buffer_t data; + data.data = {0xAB, 0x70, 0x55, 0xBB}; + activate_router(1); + router_send_frame(0, (uint8_t*)&data, 4); + EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0); + EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); + + EXPECT_CALL(*this, transport_recv_frame(1, _, _)) + .With(Args<1, 2>(ElementsAreArray(data.data))); + simulate_transport(1, 0); + EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); + EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); +} + +TEST_F(FrameRouter, second_link_sends_to_master) { + frame_buffer_t data; + data.data = {0xAB, 0x70, 0x55, 0xBB}; + activate_router(2); + router_send_frame(0, (uint8_t*)&data, 4); + EXPECT_GT(router_buffers[2].send_buffers[UP_LINK].size(), 0); + EXPECT_EQ(router_buffers[2].send_buffers[DOWN_LINK].size(), 0); + + simulate_transport(2, 1); + EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0); + EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); + + EXPECT_CALL(*this, transport_recv_frame(2, _, _)) + .With(Args<1, 2>(ElementsAreArray(data.data))); + simulate_transport(1, 0); + EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); + EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); +} + +TEST_F(FrameRouter, master_sends_to_master_does_nothing) { + frame_buffer_t data; + data.data = {0xAB, 0x70, 0x55, 0xBB}; + activate_router(0); + router_send_frame(0, (uint8_t*)&data, 4); + EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); + EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); +} + +TEST_F(FrameRouter, link_sends_to_other_link_does_nothing) { + frame_buffer_t data; + data.data = {0xAB, 0x70, 0x55, 0xBB}; + activate_router(1); + router_send_frame(2, (uint8_t*)&data, 4); + EXPECT_EQ(router_buffers[1].send_buffers[UP_LINK].size(), 0); + EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); +} + +TEST_F(FrameRouter, master_receives_on_uplink_does_nothing) { + frame_buffer_t data; + data.data = {0xAB, 0x70, 0x55, 0xBB}; + activate_router(1); + router_send_frame(0, (uint8_t*)&data, 4); + EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0); + EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); + + EXPECT_CALL(*this, transport_recv_frame(_, _, _)) + .Times(0); + activate_router(0); + receive_data(UP_LINK, + router_buffers[1].send_buffers[UP_LINK].data(), + router_buffers[1].send_buffers[UP_LINK].size()); + EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); + EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); +} diff --git a/quantum/serial_link/tests/rules.mk b/quantum/serial_link/tests/rules.mk index 651f56b950..7d0d6c0d02 100644 --- a/quantum/serial_link/tests/rules.mk +++ b/quantum/serial_link/tests/rules.mk @@ -1,3 +1,9 @@ serial_link_byte_stuffer_SRC :=\ $(SERIAL_PATH)/tests/byte_stuffer_tests.cpp \ - $(SERIAL_PATH)/protocol/byte_stuffer.c \ No newline at end of file + $(SERIAL_PATH)/protocol/byte_stuffer.c + +serial_link_frame_router_SRC := \ + $(SERIAL_PATH)/tests/frame_router_tests.cpp \ + $(SERIAL_PATH)/protocol/byte_stuffer.c \ + $(SERIAL_PATH)/protocol/frame_validator.c \ + $(SERIAL_PATH)/protocol/frame_router.c \ No newline at end of file From b3eba797af74ace19b9f2e762bdd33d9449e3f94 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 13:54:16 +0300 Subject: [PATCH 104/120] Convert frame_validator_tests to GTest --- ...ator_tests.c => frame_validator_tests.cpp} | 90 +++++++++++-------- quantum/serial_link/tests/rules.mk | 8 +- 2 files changed, 58 insertions(+), 40 deletions(-) rename quantum/serial_link/tests/{frame_validator_tests.c => frame_validator_tests.cpp} (52%) diff --git a/quantum/serial_link/tests/frame_validator_tests.c b/quantum/serial_link/tests/frame_validator_tests.cpp similarity index 52% rename from quantum/serial_link/tests/frame_validator_tests.c rename to quantum/serial_link/tests/frame_validator_tests.cpp index d20947e2c9..9223af83b0 100644 --- a/quantum/serial_link/tests/frame_validator_tests.c +++ b/quantum/serial_link/tests/frame_validator_tests.cpp @@ -22,24 +22,47 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include -#include -#include "serial_link/protocol/frame_validator.c" +#include "gtest/gtest.h" +#include "gmock/gmock.h" +extern "C" { +#include "serial_link/protocol/frame_validator.h" +} +using testing::_; +using testing::ElementsAreArray; +using testing::Args; + +class FrameValidator : public testing::Test { +public: + FrameValidator() { + Instance = this; + } + + ~FrameValidator() { + Instance = nullptr; + } + + MOCK_METHOD3(route_incoming_frame, void (uint8_t link, uint8_t* data, uint16_t size)); + MOCK_METHOD3(byte_stuffer_send_frame, void (uint8_t link, uint8_t* data, uint16_t size)); + + static FrameValidator* Instance; +}; + +FrameValidator* FrameValidator::Instance = nullptr; + +extern "C" { void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size) { - mock(data, size); + FrameValidator::Instance->route_incoming_frame(link, data, size); } void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size) { - mock(data, size); + FrameValidator::Instance->byte_stuffer_send_frame(link, data, size); +} } -Describe(FrameValidator); -BeforeEach(FrameValidator) {} -AfterEach(FrameValidator) {} - -Ensure(FrameValidator, doesnt_validate_frames_under_5_bytes) { - never_expect(route_incoming_frame); +TEST_F(FrameValidator, doesnt_validate_frames_under_5_bytes) { + EXPECT_CALL(*this, route_incoming_frame(_, _, _)) + .Times(0); uint8_t data[] = {1, 2}; validator_recv_frame(0, 0, 1); validator_recv_frame(0, data, 2); @@ -47,55 +70,46 @@ Ensure(FrameValidator, doesnt_validate_frames_under_5_bytes) { validator_recv_frame(0, data, 4); } -Ensure(FrameValidator, validates_one_byte_frame_with_correct_crc) { +TEST_F(FrameValidator, validates_one_byte_frame_with_correct_crc) { uint8_t data[] = {0x44, 0x04, 0x6A, 0xB3, 0xA3}; - expect(route_incoming_frame, - when(size, is_equal_to(1)), - when(data, is_equal_to_contents_of(data, 1)) - ); + EXPECT_CALL(*this, route_incoming_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(data, 1))); validator_recv_frame(0, data, 5); } -Ensure(FrameValidator, does_not_validate_one_byte_frame_with_incorrect_crc) { +TEST_F(FrameValidator, does_not_validate_one_byte_frame_with_incorrect_crc) { uint8_t data[] = {0x44, 0, 0, 0, 0}; - never_expect(route_incoming_frame); + EXPECT_CALL(*this, route_incoming_frame(_, _, _)) + .Times(0); validator_recv_frame(1, data, 5); } -Ensure(FrameValidator, validates_four_byte_frame_with_correct_crc) { +TEST_F(FrameValidator, validates_four_byte_frame_with_correct_crc) { uint8_t data[] = {0x44, 0x10, 0xFF, 0x00, 0x74, 0x4E, 0x30, 0xBA}; - expect(route_incoming_frame, - when(size, is_equal_to(4)), - when(data, is_equal_to_contents_of(data, 4)) - ); + EXPECT_CALL(*this, route_incoming_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(data, 4))); validator_recv_frame(1, data, 8); } -Ensure(FrameValidator, validates_five_byte_frame_with_correct_crc) { +TEST_F(FrameValidator, validates_five_byte_frame_with_correct_crc) { uint8_t data[] = {1, 2, 3, 4, 5, 0xF4, 0x99, 0x0B, 0x47}; - expect(route_incoming_frame, - when(size, is_equal_to(5)), - when(data, is_equal_to_contents_of(data, 5)) - ); + EXPECT_CALL(*this, route_incoming_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(data, 5))); validator_recv_frame(0, data, 9); } -Ensure(FrameValidator, sends_one_byte_with_correct_crc) { +TEST_F(FrameValidator, sends_one_byte_with_correct_crc) { uint8_t original[] = {0x44, 0, 0, 0, 0}; uint8_t expected[] = {0x44, 0x04, 0x6A, 0xB3, 0xA3}; - expect(byte_stuffer_send_frame, - when(size, is_equal_to(sizeof(expected))), - when(data, is_equal_to_contents_of(expected, sizeof(expected))) - ); + EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); validator_send_frame(0, original, 1); } -Ensure(FrameValidator, sends_five_bytes_with_correct_crc) { +TEST_F(FrameValidator, sends_five_bytes_with_correct_crc) { uint8_t original[] = {1, 2, 3, 4, 5, 0, 0, 0, 0}; uint8_t expected[] = {1, 2, 3, 4, 5, 0xF4, 0x99, 0x0B, 0x47}; - expect(byte_stuffer_send_frame, - when(size, is_equal_to(sizeof(expected))), - when(data, is_equal_to_contents_of(expected, sizeof(expected))) - ); + EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _)) + .With(Args<1, 2>(ElementsAreArray(expected))); validator_send_frame(0, original, 5); } diff --git a/quantum/serial_link/tests/rules.mk b/quantum/serial_link/tests/rules.mk index 7d0d6c0d02..7f2a8f457c 100644 --- a/quantum/serial_link/tests/rules.mk +++ b/quantum/serial_link/tests/rules.mk @@ -5,5 +5,9 @@ serial_link_byte_stuffer_SRC :=\ serial_link_frame_router_SRC := \ $(SERIAL_PATH)/tests/frame_router_tests.cpp \ $(SERIAL_PATH)/protocol/byte_stuffer.c \ - $(SERIAL_PATH)/protocol/frame_validator.c \ - $(SERIAL_PATH)/protocol/frame_router.c \ No newline at end of file + $(SERIAL_PATH)/protocol/frame_validator.c \ + $(SERIAL_PATH)/protocol/frame_router.c + +serial_link_frame_validator_SRC := \ + $(SERIAL_PATH)/tests/frame_validator_tests.cpp \ + $(SERIAL_PATH)/protocol/frame_validator.c \ No newline at end of file From bcdf9ab76bf3723e6015d4255d53e7c1e7259b61 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 14:18:49 +0300 Subject: [PATCH 105/120] Convert transport_tests to GTest --- quantum/serial_link/protocol/transport.c | 4 + quantum/serial_link/protocol/transport.h | 7 +- quantum/serial_link/tests/rules.mk | 7 +- quantum/serial_link/tests/transport_tests.c | 168 ---------------- quantum/serial_link/tests/transport_tests.cpp | 188 ++++++++++++++++++ 5 files changed, 202 insertions(+), 172 deletions(-) delete mode 100644 quantum/serial_link/tests/transport_tests.c create mode 100644 quantum/serial_link/tests/transport_tests.cpp diff --git a/quantum/serial_link/protocol/transport.c b/quantum/serial_link/protocol/transport.c index f418d11ceb..ff795fe201 100644 --- a/quantum/serial_link/protocol/transport.c +++ b/quantum/serial_link/protocol/transport.c @@ -31,6 +31,10 @@ SOFTWARE. static remote_object_t* remote_objects[MAX_REMOTE_OBJECTS]; static uint32_t num_remote_objects = 0; +void reinitialize_serial_link_transport(void) { + num_remote_objects = 0; +} + void add_remote_objects(remote_object_t** _remote_objects, uint32_t _num_remote_objects) { unsigned int i; for(i=0;i<_num_remote_objects;i++) { diff --git a/quantum/serial_link/protocol/transport.h b/quantum/serial_link/protocol/transport.h index 9a052d8809..2c5d890b21 100644 --- a/quantum/serial_link/protocol/transport.h +++ b/quantum/serial_link/protocol/transport.h @@ -82,7 +82,7 @@ typedef struct { \ remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);\ triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ - return triple_buffer_read_internal(obj->object_size, tb); \ + return (type*)triple_buffer_read_internal(obj->object_size, tb); \ } #define MASTER_TO_SINGLE_SLAVE_OBJECT(name, type) \ @@ -112,7 +112,7 @@ typedef struct { \ remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ uint8_t* start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size);\ triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ - return triple_buffer_read_internal(obj->object_size, tb); \ + return (type*)triple_buffer_read_internal(obj->object_size, tb); \ } #define SLAVE_TO_MASTER_OBJECT(name, type) \ @@ -139,12 +139,13 @@ typedef struct { \ uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);\ start+=slave * REMOTE_OBJECT_SIZE(obj->object_size); \ triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ - return triple_buffer_read_internal(obj->object_size, tb); \ + return (type*)triple_buffer_read_internal(obj->object_size, tb); \ } #define REMOTE_OBJECT(name) (remote_object_t*)&remote_object_##name void add_remote_objects(remote_object_t** remote_objects, uint32_t num_remote_objects); +void reinitialize_serial_link_transport(void); void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size); void update_transport(void); diff --git a/quantum/serial_link/tests/rules.mk b/quantum/serial_link/tests/rules.mk index 7f2a8f457c..bf342c9d26 100644 --- a/quantum/serial_link/tests/rules.mk +++ b/quantum/serial_link/tests/rules.mk @@ -10,4 +10,9 @@ serial_link_frame_router_SRC := \ serial_link_frame_validator_SRC := \ $(SERIAL_PATH)/tests/frame_validator_tests.cpp \ - $(SERIAL_PATH)/protocol/frame_validator.c \ No newline at end of file + $(SERIAL_PATH)/protocol/frame_validator.c + +serial_link_transport_SRC := \ + $(SERIAL_PATH)/tests/transport_tests.cpp \ + $(SERIAL_PATH)/protocol/transport.c \ + $(SERIAL_PATH)/protocol/triple_buffered_object.c \ No newline at end of file diff --git a/quantum/serial_link/tests/transport_tests.c b/quantum/serial_link/tests/transport_tests.c deleted file mode 100644 index 358e1b9fd4..0000000000 --- a/quantum/serial_link/tests/transport_tests.c +++ /dev/null @@ -1,168 +0,0 @@ -/* -The MIT License (MIT) - -Copyright (c) 2016 Fred Sundvik - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include -#include -#include "serial_link/protocol/transport.c" -#include "serial_link/protocol/triple_buffered_object.c" - -void signal_data_written(void) { - mock(); -} - -static uint8_t sent_data[2048]; -static uint16_t sent_data_size; - -void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) { - mock(destination); - memcpy(sent_data + sent_data_size, data, size); - sent_data_size += size; -} - -typedef struct { - uint32_t test; -} test_object1_t; - -typedef struct { - uint32_t test1; - uint32_t test2; -} test_object2_t; - -MASTER_TO_ALL_SLAVES_OBJECT(master_to_slave, test_object1_t); -MASTER_TO_SINGLE_SLAVE_OBJECT(master_to_single_slave, test_object1_t); -SLAVE_TO_MASTER_OBJECT(slave_to_master, test_object1_t); - -static remote_object_t* test_remote_objects[] = { - REMOTE_OBJECT(master_to_slave), - REMOTE_OBJECT(master_to_single_slave), - REMOTE_OBJECT(slave_to_master), -}; - -Describe(Transport); -BeforeEach(Transport) { - add_remote_objects(test_remote_objects, sizeof(test_remote_objects) / sizeof(remote_object_t*)); - sent_data_size = 0; -} -AfterEach(Transport) {} - -Ensure(Transport, write_to_local_signals_an_event) { - begin_write_master_to_slave(); - expect(signal_data_written); - end_write_master_to_slave(); - begin_write_slave_to_master(); - expect(signal_data_written); - end_write_slave_to_master(); - begin_write_master_to_single_slave(1); - expect(signal_data_written); - end_write_master_to_single_slave(1); -} - -Ensure(Transport, writes_from_master_to_all_slaves) { - update_transport(); - test_object1_t* obj = begin_write_master_to_slave(); - obj->test = 5; - expect(signal_data_written); - end_write_master_to_slave(); - expect(router_send_frame, - when(destination, is_equal_to(0xFF))); - update_transport(); - transport_recv_frame(0, sent_data, sent_data_size); - test_object1_t* obj2 = read_master_to_slave(); - assert_that(obj2, is_not_equal_to(NULL)); - assert_that(obj2->test, is_equal_to(5)); -} - -Ensure(Transport, writes_from_slave_to_master) { - update_transport(); - test_object1_t* obj = begin_write_slave_to_master(); - obj->test = 7; - expect(signal_data_written); - end_write_slave_to_master(); - expect(router_send_frame, - when(destination, is_equal_to(0))); - update_transport(); - transport_recv_frame(3, sent_data, sent_data_size); - test_object1_t* obj2 = read_slave_to_master(2); - assert_that(read_slave_to_master(0), is_equal_to(NULL)); - assert_that(obj2, is_not_equal_to(NULL)); - assert_that(obj2->test, is_equal_to(7)); -} - -Ensure(Transport, writes_from_master_to_single_slave) { - update_transport(); - test_object1_t* obj = begin_write_master_to_single_slave(3); - obj->test = 7; - expect(signal_data_written); - end_write_master_to_single_slave(3); - expect(router_send_frame, - when(destination, is_equal_to(4))); - update_transport(); - transport_recv_frame(0, sent_data, sent_data_size); - test_object1_t* obj2 = read_master_to_single_slave(); - assert_that(obj2, is_not_equal_to(NULL)); - assert_that(obj2->test, is_equal_to(7)); -} - -Ensure(Transport, ignores_object_with_invalid_id) { - update_transport(); - test_object1_t* obj = begin_write_master_to_single_slave(3); - obj->test = 7; - expect(signal_data_written); - end_write_master_to_single_slave(3); - expect(router_send_frame, - when(destination, is_equal_to(4))); - update_transport(); - sent_data[sent_data_size - 1] = 44; - transport_recv_frame(0, sent_data, sent_data_size); - test_object1_t* obj2 = read_master_to_single_slave(); - assert_that(obj2, is_equal_to(NULL)); -} - -Ensure(Transport, ignores_object_with_size_too_small) { - update_transport(); - test_object1_t* obj = begin_write_master_to_slave(); - obj->test = 7; - expect(signal_data_written); - end_write_master_to_slave(); - expect(router_send_frame); - update_transport(); - sent_data[sent_data_size - 2] = 0; - transport_recv_frame(0, sent_data, sent_data_size - 1); - test_object1_t* obj2 = read_master_to_slave(); - assert_that(obj2, is_equal_to(NULL)); -} - -Ensure(Transport, ignores_object_with_size_too_big) { - update_transport(); - test_object1_t* obj = begin_write_master_to_slave(); - obj->test = 7; - expect(signal_data_written); - end_write_master_to_slave(); - expect(router_send_frame); - update_transport(); - sent_data[sent_data_size + 21] = 0; - transport_recv_frame(0, sent_data, sent_data_size + 22); - test_object1_t* obj2 = read_master_to_slave(); - assert_that(obj2, is_equal_to(NULL)); -} diff --git a/quantum/serial_link/tests/transport_tests.cpp b/quantum/serial_link/tests/transport_tests.cpp new file mode 100644 index 0000000000..21b7b165f6 --- /dev/null +++ b/quantum/serial_link/tests/transport_tests.cpp @@ -0,0 +1,188 @@ +/* +The MIT License (MIT) + +Copyright (c) 2016 Fred Sundvik + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#include "gtest/gtest.h" +#include "gmock/gmock.h" + +using testing::_; +using testing::ElementsAreArray; +using testing::Args; + +extern "C" { +#include "serial_link/protocol/transport.h" +} + +struct test_object1 { + uint32_t test; +}; + +struct test_object2 { + uint32_t test1; + uint32_t test2; +}; + +MASTER_TO_ALL_SLAVES_OBJECT(master_to_slave, test_object1); +MASTER_TO_SINGLE_SLAVE_OBJECT(master_to_single_slave, test_object1); +SLAVE_TO_MASTER_OBJECT(slave_to_master, test_object1); + +static remote_object_t* test_remote_objects[] = { + REMOTE_OBJECT(master_to_slave), + REMOTE_OBJECT(master_to_single_slave), + REMOTE_OBJECT(slave_to_master), +}; + +class Transport : public testing::Test { +public: + Transport() { + Instance = this; + add_remote_objects(test_remote_objects, sizeof(test_remote_objects) / sizeof(remote_object_t*)); + } + + ~Transport() { + Instance = nullptr; + reinitialize_serial_link_transport(); + } + + MOCK_METHOD0(signal_data_written, void ()); + MOCK_METHOD1(router_send_frame, void (uint8_t destination)); + + void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) { + router_send_frame(destination); + std::copy(data, data + size, std::back_inserter(sent_data)); + } + + static Transport* Instance; + + std::vector sent_data; +}; + +Transport* Transport::Instance = nullptr; + +extern "C" { +void signal_data_written(void) { + Transport::Instance->signal_data_written(); +} + +void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) { + Transport::Instance->router_send_frame(destination, data, size); +} +} + +TEST_F(Transport, write_to_local_signals_an_event) { + begin_write_master_to_slave(); + EXPECT_CALL(*this, signal_data_written()); + end_write_master_to_slave(); + begin_write_slave_to_master(); + EXPECT_CALL(*this, signal_data_written()); + end_write_slave_to_master(); + begin_write_master_to_single_slave(1); + EXPECT_CALL(*this, signal_data_written()); + end_write_master_to_single_slave(1); +} + +TEST_F(Transport, writes_from_master_to_all_slaves) { + update_transport(); + test_object1* obj = begin_write_master_to_slave(); + obj->test = 5; + EXPECT_CALL(*this, signal_data_written()); + end_write_master_to_slave(); + EXPECT_CALL(*this, router_send_frame(0xFF)); + update_transport(); + transport_recv_frame(0, sent_data.data(), sent_data.size()); + test_object1* obj2 = read_master_to_slave(); + EXPECT_NE(obj2, nullptr); + EXPECT_EQ(obj2->test, 5); +} + +TEST_F(Transport, writes_from_slave_to_master) { + update_transport(); + test_object1* obj = begin_write_slave_to_master(); + obj->test = 7; + EXPECT_CALL(*this, signal_data_written()); + end_write_slave_to_master(); + EXPECT_CALL(*this, router_send_frame(0)); + update_transport(); + transport_recv_frame(3, sent_data.data(), sent_data.size()); + test_object1* obj2 = read_slave_to_master(2); + EXPECT_EQ(read_slave_to_master(0), nullptr); + EXPECT_NE(obj2, nullptr); + EXPECT_EQ(obj2->test, 7); +} + +TEST_F(Transport, writes_from_master_to_single_slave) { + update_transport(); + test_object1* obj = begin_write_master_to_single_slave(3); + obj->test = 7; + EXPECT_CALL(*this, signal_data_written()); + end_write_master_to_single_slave(3); + EXPECT_CALL(*this, router_send_frame(4)); + update_transport(); + transport_recv_frame(0, sent_data.data(), sent_data.size()); + test_object1* obj2 = read_master_to_single_slave(); + EXPECT_NE(obj2, nullptr); + EXPECT_EQ(obj2->test, 7); +} + +TEST_F(Transport, ignores_object_with_invalid_id) { + update_transport(); + test_object1* obj = begin_write_master_to_single_slave(3); + obj->test = 7; + EXPECT_CALL(*this, signal_data_written()); + end_write_master_to_single_slave(3); + EXPECT_CALL(*this, router_send_frame(4)); + update_transport(); + sent_data[sent_data.size() - 1] = 44; + transport_recv_frame(0, sent_data.data(), sent_data.size()); + test_object1* obj2 = read_master_to_single_slave(); + EXPECT_EQ(obj2, nullptr); +} + +TEST_F(Transport, ignores_object_with_size_too_small) { + update_transport(); + test_object1* obj = begin_write_master_to_slave(); + obj->test = 7; + EXPECT_CALL(*this, signal_data_written()); + end_write_master_to_slave(); + EXPECT_CALL(*this, router_send_frame(_)); + update_transport(); + sent_data[sent_data.size() - 2] = 0; + transport_recv_frame(0, sent_data.data(), sent_data.size() - 1); + test_object1* obj2 = read_master_to_slave(); + EXPECT_EQ(obj2, nullptr); +} + +TEST_F(Transport, ignores_object_with_size_too_big) { + update_transport(); + test_object1* obj = begin_write_master_to_slave(); + obj->test = 7; + EXPECT_CALL(*this, signal_data_written()); + end_write_master_to_slave(); + EXPECT_CALL(*this, router_send_frame(_)); + update_transport(); + sent_data.resize(sent_data.size() + 22); + sent_data[sent_data.size() - 1] = 0; + transport_recv_frame(0, sent_data.data(), sent_data.size()); + test_object1* obj2 = read_master_to_slave(); + EXPECT_EQ(obj2, nullptr); +} From ffb0a126f5b2484eda7f6b1c62ea61924eec6521 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 14:25:52 +0300 Subject: [PATCH 106/120] Convert tirple_buffered_object_tests to GTest --- quantum/serial_link/tests/rules.mk | 12 +++-- quantum/serial_link/tests/testlist.mk | 6 +-- ...sts.c => triple_buffered_object_tests.cpp} | 52 ++++++++++--------- 3 files changed, 38 insertions(+), 32 deletions(-) rename quantum/serial_link/tests/{triple_buffered_object_tests.c => triple_buffered_object_tests.cpp} (63%) diff --git a/quantum/serial_link/tests/rules.mk b/quantum/serial_link/tests/rules.mk index bf342c9d26..b81515bc55 100644 --- a/quantum/serial_link/tests/rules.mk +++ b/quantum/serial_link/tests/rules.mk @@ -2,17 +2,21 @@ serial_link_byte_stuffer_SRC :=\ $(SERIAL_PATH)/tests/byte_stuffer_tests.cpp \ $(SERIAL_PATH)/protocol/byte_stuffer.c +serial_link_frame_validator_SRC := \ + $(SERIAL_PATH)/tests/frame_validator_tests.cpp \ + $(SERIAL_PATH)/protocol/frame_validator.c + serial_link_frame_router_SRC := \ $(SERIAL_PATH)/tests/frame_router_tests.cpp \ $(SERIAL_PATH)/protocol/byte_stuffer.c \ $(SERIAL_PATH)/protocol/frame_validator.c \ $(SERIAL_PATH)/protocol/frame_router.c -serial_link_frame_validator_SRC := \ - $(SERIAL_PATH)/tests/frame_validator_tests.cpp \ - $(SERIAL_PATH)/protocol/frame_validator.c +serial_link_triple_buffered_object_SRC := \ + $(SERIAL_PATH)/tests/triple_buffered_object_tests.cpp \ + $(SERIAL_PATH)/protocol/triple_buffered_object.c serial_link_transport_SRC := \ $(SERIAL_PATH)/tests/transport_tests.cpp \ $(SERIAL_PATH)/protocol/transport.c \ - $(SERIAL_PATH)/protocol/triple_buffered_object.c \ No newline at end of file + $(SERIAL_PATH)/protocol/triple_buffered_object.c diff --git a/quantum/serial_link/tests/testlist.mk b/quantum/serial_link/tests/testlist.mk index 4a734b1e1c..a80e888849 100644 --- a/quantum/serial_link/tests/testlist.mk +++ b/quantum/serial_link/tests/testlist.mk @@ -1,6 +1,6 @@ TEST_LIST +=\ serial_link_byte_stuffer\ - serial_link_frame_router\ serial_link_frame_validator\ - serial_link_transport\ - serial_link_triple_buffered_object \ No newline at end of file + serial_link_frame_router\ + serial_link_triple_buffered_object\ + serial_link_transport \ No newline at end of file diff --git a/quantum/serial_link/tests/triple_buffered_object_tests.c b/quantum/serial_link/tests/triple_buffered_object_tests.cpp similarity index 63% rename from quantum/serial_link/tests/triple_buffered_object_tests.c rename to quantum/serial_link/tests/triple_buffered_object_tests.cpp index 6f7c82b468..7724bbee9c 100644 --- a/quantum/serial_link/tests/triple_buffered_object_tests.c +++ b/quantum/serial_link/tests/triple_buffered_object_tests.cpp @@ -22,53 +22,55 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include -#include "serial_link/protocol/triple_buffered_object.c" +#include "gtest/gtest.h" +extern "C" { +#include "serial_link/protocol/triple_buffered_object.h" +} -typedef struct { +struct test_object{ uint8_t state; uint32_t buffer[3]; -}test_object_t; +}; -test_object_t test_object; +test_object test_object; -Describe(TripleBufferedObject); -BeforeEach(TripleBufferedObject) { - triple_buffer_init((triple_buffer_object_t*)&test_object); -} -AfterEach(TripleBufferedObject) {} +class TripleBufferedObject : public testing::Test { +public: + TripleBufferedObject() { + triple_buffer_init((triple_buffer_object_t*)&test_object); + } +}; - -Ensure(TripleBufferedObject, writes_and_reads_object) { +TEST_F(TripleBufferedObject, writes_and_reads_object) { *triple_buffer_begin_write(&test_object) = 0x3456ABCC; triple_buffer_end_write(&test_object); - assert_that(*triple_buffer_read(&test_object), is_equal_to(0x3456ABCC)); + EXPECT_EQ(*triple_buffer_read(&test_object), 0x3456ABCC); } -Ensure(TripleBufferedObject, does_not_read_empty) { - assert_that(triple_buffer_read(&test_object), is_equal_to(NULL)); +TEST_F(TripleBufferedObject, does_not_read_empty) { + EXPECT_EQ(triple_buffer_read(&test_object), nullptr); } -Ensure(TripleBufferedObject, writes_twice_and_reads_object) { +TEST_F(TripleBufferedObject, writes_twice_and_reads_object) { *triple_buffer_begin_write(&test_object) = 0x3456ABCC; triple_buffer_end_write(&test_object); *triple_buffer_begin_write(&test_object) = 0x44778899; triple_buffer_end_write(&test_object); - assert_that(*triple_buffer_read(&test_object), is_equal_to(0x44778899)); + EXPECT_EQ(*triple_buffer_read(&test_object), 0x44778899); } -Ensure(TripleBufferedObject, performs_another_write_in_the_middle_of_read) { +TEST_F(TripleBufferedObject, performs_another_write_in_the_middle_of_read) { *triple_buffer_begin_write(&test_object) = 1; triple_buffer_end_write(&test_object); uint32_t* read = triple_buffer_read(&test_object); *triple_buffer_begin_write(&test_object) = 2; triple_buffer_end_write(&test_object); - assert_that(*read, is_equal_to(1)); - assert_that(*triple_buffer_read(&test_object), is_equal_to(2)); - assert_that(triple_buffer_read(&test_object), is_equal_to(NULL)); + EXPECT_EQ(*read, 1); + EXPECT_EQ(*triple_buffer_read(&test_object), 2); + EXPECT_EQ(triple_buffer_read(&test_object), nullptr); } -Ensure(TripleBufferedObject, performs_two_writes_in_the_middle_of_read) { +TEST_F(TripleBufferedObject, performs_two_writes_in_the_middle_of_read) { *triple_buffer_begin_write(&test_object) = 1; triple_buffer_end_write(&test_object); uint32_t* read = triple_buffer_read(&test_object); @@ -76,7 +78,7 @@ Ensure(TripleBufferedObject, performs_two_writes_in_the_middle_of_read) { triple_buffer_end_write(&test_object); *triple_buffer_begin_write(&test_object) = 3; triple_buffer_end_write(&test_object); - assert_that(*read, is_equal_to(1)); - assert_that(*triple_buffer_read(&test_object), is_equal_to(3)); - assert_that(triple_buffer_read(&test_object), is_equal_to(NULL)); + EXPECT_EQ(*read, 1); + EXPECT_EQ(*triple_buffer_read(&test_object), 3); + EXPECT_EQ(triple_buffer_read(&test_object), nullptr); } From 7eefb34e7c4f162b9568ff880d0e4e5214e1b9c9 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 14:53:57 +0300 Subject: [PATCH 107/120] Detect failures when running multiple tests Also add better output. --- Makefile | 13 +++++++++++-- message.mk | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5f5c46860c..b7ef5f92a3 100644 --- a/Makefile +++ b/Makefile @@ -415,7 +415,15 @@ define BUILD_TEST MAKE_MSG := $$(MSG_MAKE_TEST) $$(eval $$(call BUILD)) TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf - TESTS += $$(TEST_EXECUTABLE) + TESTS += $$(TEST_NAME) + TEST_MSG := $$(MSG_TEST) + $$(TEST_NAME)_COMMAND := \ + printf "$$(TEST_MSG)\n"; \ + $$(TEST_EXECUTABLE); \ + if [ $$$$? -gt 0 ]; \ + then error_occured=1; \ + fi; \ + printf "\n"; endef define PARSE_TEST @@ -472,7 +480,8 @@ $(SUBPROJECTS): %: %-allkm +error_occured=0; \ $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND)) \ if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi;\ - $(foreach TEST,$(TESTS),$(TEST);) + $(foreach TEST,$(TESTS),$($(TEST)_COMMAND)) \ + if [ $$error_occured -gt 0 ]; then printf "$(MSG_ERRORS)" & exit $$error_occured; fi;\ # All should compile everything .PHONY: all diff --git a/message.mk b/message.mk index 96814986b5..fa051fd712 100644 --- a/message.mk +++ b/message.mk @@ -76,3 +76,4 @@ define GENERATE_MSG_MAKE_TEST endif endef MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL) +MSG_TEST = Testing $(BOLD)$(TEST_NAME)$(NO_COLOR) From 42baa6cf43ab1da79887e74b9ad71379c13094f9 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 17:43:35 +0300 Subject: [PATCH 108/120] Disable map file creation when building tests It causes strange linker warnings on cygwin. --- build_test.mk | 1 + tmk_core/rules.mk | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build_test.mk b/build_test.mk index 9f5d6e0af2..ee15a45726 100644 --- a/build_test.mk +++ b/build_test.mk @@ -31,6 +31,7 @@ $(GTEST_OUTPUT)_DEFS := $(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC) LDFLAGS += -lstdc++ -lpthread -shared-libgcc +CREATE_MAP := no VPATH +=\ $(LIB_PATH)/googletest\ diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 317f55e083..695fe0badf 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -161,6 +161,7 @@ SCANF_LIB = MATH_LIB = -lm +CREATE_MAP ?= yes #---------------- Linker Options ---------------- @@ -171,7 +172,10 @@ MATH_LIB = -lm # Comennt out "--relax" option to avoid a error such: # (.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12' # -LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref + +ifeq ($(CREATE_MAP),yes) + LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref +endif #LDFLAGS += -Wl,--relax LDFLAGS += $(EXTMEMOPTS) LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS)) From 1b963117fedf91e4bef97d75eb4e3e0b3b1e1dfd Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 18:01:59 +0300 Subject: [PATCH 109/120] Support for running and cleaning all tests --- Makefile | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index b7ef5f92a3..78bf50ed41 100644 --- a/Makefile +++ b/Makefile @@ -414,23 +414,29 @@ define BUILD_TEST MAKE_VARS := TEST=$$(TEST_NAME) MAKE_MSG := $$(MSG_MAKE_TEST) $$(eval $$(call BUILD)) - TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf - TESTS += $$(TEST_NAME) - TEST_MSG := $$(MSG_TEST) - $$(TEST_NAME)_COMMAND := \ - printf "$$(TEST_MSG)\n"; \ - $$(TEST_EXECUTABLE); \ - if [ $$$$? -gt 0 ]; \ - then error_occured=1; \ - fi; \ - printf "\n"; + ifneq ($$(MAKE_TARGET),clean) + TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf + TESTS += $$(TEST_NAME) + TEST_MSG := $$(MSG_TEST) + $$(TEST_NAME)_COMMAND := \ + printf "$$(TEST_MSG)\n"; \ + $$(TEST_EXECUTABLE); \ + if [ $$$$? -gt 0 ]; \ + then error_occured=1; \ + fi; \ + printf "\n"; + endif endef define PARSE_TEST TESTS := TEST_NAME := $$(firstword $$(subst -, ,$$(RULE))) TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME)-,,$$(RULE))) - MATCHED_TESTS := $$(foreach TEST,$$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME),$$(TEST)),$$(TEST),)) + ifeq ($$(TEST_NAME),all) + MATCHED_TESTS := $$(TEST_LIST) + else + MATCHED_TESTS := $$(foreach TEST,$$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME),$$(TEST)),$$(TEST),)) + endif $$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET)))) endef @@ -494,6 +500,11 @@ all-keyboards: allkb-allsp-allkm .PHONY: all-keyboards-defaults all-keyboards-defaults: allkb-allsp-default +.PHONY: test +test: test-all + +.PHONY: test-clean +test-clean: test-all-clean # Generate the version.h file GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S") From 6410f0c021792ebbbd279fc6150f197274e914c8 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 18:13:01 +0300 Subject: [PATCH 110/120] The all target makes all keyboards and all tests --- Makefile | 6 +++++- build_keyboard.mk | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 78bf50ed41..0aaf585786 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,10 @@ ifndef VERBOSE .SILENT: endif +# Never run this makefile in parallel, as it could screw things up +# It won't affect the submakes, so you still get the speedup from specifying -jx +.NOTPARALLEL: + # Allow the silent with lower caps to work the same way as upper caps ifdef silent SILENT = $(silent) @@ -491,7 +495,7 @@ $(SUBPROJECTS): %: %-allkm # All should compile everything .PHONY: all -all: all-keyboards +all: all-keyboards test-all # Define some shortcuts, mostly for compability with the old syntax .PHONY: all-keyboards diff --git a/build_keyboard.mk b/build_keyboard.mk index 5bec4ecf66..04632c1c94 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -198,9 +198,6 @@ ifeq ($(strip $(VISUALIZER_ENABLE)), yes) include $(VISUALIZER_PATH)/visualizer.mk endif -$(info $(VPATH)) - - OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) $(KEYMAP_OUTPUT)_SRC := $(SRC) $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" From 6b92b6280290d87d1c54555652dbc4d7fb7414d1 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 18:13:52 +0300 Subject: [PATCH 111/120] Travis builds the default all target --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 138a2c5532..ebeabc8296 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: global: - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= script: -- make all-keyboards AUTOGEN=true +- make AUTOGEN=true addons: apt: packages: From 03b1d142f2df39a98fd8013f364580c8534d044c Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 18:59:22 +0300 Subject: [PATCH 112/120] Add -p parameter to mkdir So that it's created even when there's a deeper structure --- tmk_core/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 695fe0badf..79fc7119a6 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -364,10 +364,10 @@ show_path: @echo OBJ=$(OBJ) # Create build directory -$(shell mkdir $(BUILD_DIR) 2>/dev/null) +$(shell mkdir -p $(BUILD_DIR) 2>/dev/null) # Create object files directory -$(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir $(OUTPUT) 2>/dev/null))) +$(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null))) # Include the dependency files. -include $(patsubst %.o,%.d,$(OBJ)) From fd93a9bb2969f8779a4d10d1190ab2a29128cd66 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 19:03:24 +0300 Subject: [PATCH 113/120] Make tests and keyboards in two different jobs --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ebeabc8296..3a68139eb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,8 @@ env: global: - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= script: -- make AUTOGEN=true +- make all-keyboards AUTOGEN=true +- make test addons: apt: packages: From ca5145732777ee4ca6cd607fc426fe15a1c3de51 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 19:36:14 +0300 Subject: [PATCH 114/120] Another attempt to make keyboards and tests in parallel --- .travis.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a68139eb8..f4c918a5ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,10 @@ env: global: - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= script: -- make all-keyboards AUTOGEN=true -- make test +- make $TARGET AUTOGEN=$AUTOGEN +env: +- TARGET=all-keyboards AUTOGEN=true +- TARGET=test AUTOGEN=false addons: apt: packages: @@ -23,4 +25,7 @@ addons: - binutils-arm-none-eabi - libnewlib-arm-none-eabi - diffutils -after_success: bash util/travis_compiled_push.sh +after_success: + if [ "$AUTOGEN" == "true" ]; then + bash util/travis_compiled_push.sh; + fi From 922c4ea3bc46f6246d9f67ead11bcf53ff947ef3 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 20:09:01 +0300 Subject: [PATCH 115/120] Add unit test documentation --- readme.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/readme.md b/readme.md index 473fd6a7cf..762c39aa92 100644 --- a/readme.md +++ b/readme.md @@ -1137,3 +1137,54 @@ Here is where you can (optionally) define your `KEYMAP` function to remap your m ``` Each of the `kxx` variables needs to be unique, and usually follows the format `k`. You can place `KC_NO` where your dead keys are in your matrix. + +# Unit Testing + +If you are new to unit testing, then you can find many good resources on internet. However most of it is scattered around in small pieces here and there, and there's also many different opinions, so I won't give any recommendations. + +Instead I recommend these two books, explaining two different styles of Unit Testing in detail. + +* "Test Driven Development: By Example: Kent Beck" +* "Growing Object-Oriented Software, Guided By Tests: Steve Freeman, Nat Pryce" + +If you prefer videos there are Uncle Bob's [Clean Coders Videos](https://cleancoders.com/), which unfortunately cost quite a bit, especially if you want to watch many of them. But James Shore has a free [Let's Play](http://www.jamesshore.com/Blog/Lets-Play) video series. + +## Google Test and Google Mock +It's possible to Unit Test your code using [Google Test](https://github.com/google/googletest). The Google Test framework also includes another component for writing testing mocks and stubs, called "Google Mock". For information how to write the actual tests, please refer to the documentation on that site. + +## Use of C++ + +Note that Google Test and therefore any test has to be written in C++, even if the rest of the QMK codebases is written in C. This should hopefully not be a problem even if you don't know any C++, since there's quite clear documentation and examples of the required C++ features, and you can write the rest of the test code almost as you would write normal C. Note that some compiler errors which you might get can look quite scary, but just read carefully what it says, and you should be ok. + +One thing to remember, is that you have to append `extern "C"` around all of your C file includes. + +## Adding tests for new or existing features + +If you want to unit test some feature, then take a look at the existing serial_link tests, in the `quantum/serial_link/tests folder`, and follow the steps below to create a similar structure. + +1. If it doesn't already exist, add a test subfolder to the folder containing the feature. +2. Create a `testlist.mk` and a `rules.mk` file in that folder. +3. Include those files from the root folder `testlist.mk`and `build_test.mk` respectively. +4. Add a new name for your testgroup to the `testlist.mk` file. Each group defined there will be a separate executable. And that's how you can support mocking out different parts. Note that it's worth adding some common prefix, just like it's done for the serial_link tests. The reason for that is that the make command allows substring filtering, so this way you can easily run a subset of the tests. +5. Define the source files and required options in the `rules.mk` file. + * `_SRC` for source files + * `_DEFS` for additional defines + * `_INC` for additional include folders +6. Write the tests in a new cpp file inside the test folder you created. That file has to be one of the files included from the `rules.mk` file. + +Note how there's several different tests, each mocking out a separate part. Also note that each of them only compiles the very minimum that's needed for the tests. It's recommend that you try to do the same. For a relevant video check out [Matt Hargett "Advanced Unit Testing in C & C++](https://www.youtube.com/watch?v=Wmy6g-aVgZI) + +## Running the tests + +To run all the tests in the codebase, type `make test`. You can also run test matching a substring by typing `make test-matchingsubstring` Note that the tests are always compiled with the native compiler of your platform, so they are also run like any other program on your computer. + +## Debugging the tests + +If there are problems with the tests, you can find the executable in the `./build/test` folder. You should be able to run those with GDB or a similar debugger. + +## Full Integration tests + +It's not yet possible to do a full integration test, where you would compile the whole firmware and define a keymap that you are going to test. However there are plans for doing that, because writing tests that way would probably be easier, at least for people that are not used to unit testing. + +In that model you would emulate the input, and expect a certain output from the emulated keyboard. + From 1f5838a28679975f689e35471a35720ed5c7e7c5 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 23:29:37 +0300 Subject: [PATCH 116/120] Fix the keyboard template with new make syntax Also add proper link to the parent --- quantum/template/readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/quantum/template/readme.md b/quantum/template/readme.md index b2fb4dd98d..b16f4cd768 100644 --- a/quantum/template/readme.md +++ b/quantum/template/readme.md @@ -3,7 +3,7 @@ ## Quantum MK Firmware -For the full Quantum feature list, see [the parent readme.md](/doc/readme.md). +For the full Quantum feature list, see [the parent readme](/). ## Building @@ -13,16 +13,16 @@ Depending on which keymap you would like to use, you will have to compile slight ### 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 a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant 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 **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/` \ No newline at end of file +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. From 53302328d0425bacdf4b0a763699308b9179f5ff Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 23:43:49 +0300 Subject: [PATCH 117/120] Add dfu-util to the instructions --- readme.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/readme.md b/readme.md index 473fd6a7cf..e905fb6b70 100644 --- a/readme.md +++ b/readme.md @@ -69,11 +69,12 @@ Here are the steps ### Windows (Vista and later) 1. If you have ever installed WinAVR, uninstall it. 2. Install [MHV AVR Tools](https://infernoembedded.com/sites/default/files/project/MHV_AVR_Tools_20131101.exe). Disable smatch, but **be sure to leave the option to add the tools to the PATH checked**. -3. Install [MinGW](https://sourceforge.net/projects/mingw/files/Installer/mingw-get-setup.exe/download). During installation, uncheck the option to install a graphical user interface. **DO NOT change the default installation folder.** The scripts depend on the default location. -4. Clone this repository. [This link will download it as a zip file, which you'll need to extract.](https://github.com/jackhumbert/qmk_firmware/archive/master.zip) Open the extracted folder in Windows Explorer. -5. Double-click on the 1-setup-path-win batch script to run it. You'll need to accept a User Account Control prompt. Press the spacebar to dismiss the success message in the command prompt that pops up. -6. Right-click on the 2-setup-environment-win batch script, select "Run as administrator", and accept the User Account Control prompt. This part may take a couple of minutes, and you'll need to approve a driver installation, but once it finishes, your environment is complete! -7. Future build commands should be run from the MHV AVR Shell, which sets up an environment compatible with colorful build output. The standard Command Prompt will also work, but add `COLOR=false` to the end of all make commands when using it. +3. If you are going to flash Infinity based keyboards you will need to install dfu-util, refer to the instructions by [Input Club](https://github.com/kiibohd/controller/wiki/Loading-DFU-Firmware). +4. Install [MinGW](https://sourceforge.net/projects/mingw/files/Installer/mingw-get-setup.exe/download). During installation, uncheck the option to install a graphical user interface. **DO NOT change the default installation folder.** The scripts depend on the default location. +5. Clone this repository. [This link will download it as a zip file, which you'll need to extract.](https://github.com/jackhumbert/qmk_firmware/archive/master.zip) Open the extracted folder in Windows Explorer. +6. Double-click on the 1-setup-path-win batch script to run it. You'll need to accept a User Account Control prompt. Press the spacebar to dismiss the success message in the command prompt that pops up. +7. Right-click on the 2-setup-environment-win batch script, select "Run as administrator", and accept the User Account Control prompt. This part may take a couple of minutes, and you'll need to approve a driver installation, but once it finishes, your environment is complete! +8. Future build commands should be run from the MHV AVR Shell, which sets up an environment compatible with colorful build output. The standard Command Prompt will also work, but add `COLOR=false` to the end of all make commands when using it. ### Mac If you're using [homebrew,](http://brew.sh/) you can use the following commands: @@ -90,6 +91,10 @@ You can also try these instructions: 2. Install the Command Line Tools from `Xcode->Preferences->Downloads`. 3. Install [DFU-Programmer][dfu-prog]. +If you are going to flash Infinity based keyboards you will also need dfu-util + + brew install dfu-util + ### Linux To ensure you are always up to date, you can just run `sudo utils/install_dependencies.sh`. That should always install all the dependencies needed. From 8ab9c5c55a0f90266b1c70e40fc034065ad027de Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 27 Aug 2016 23:14:27 +0300 Subject: [PATCH 118/120] Rename infinity_chibios to infinity60, and add readme --- .../{infinity_chibios => infinity60}/MEMO.txt | 0 .../{infinity_chibios => infinity60}/Makefile | 0 .../bootloader_defs.h | 0 .../{infinity_chibios => infinity60}/chconf.h | 0 .../{infinity_chibios => infinity60}/config.h | 9 +++--- .../halconf.h | 0 .../infinity60.c} | 2 +- .../infinity60.h} | 0 .../keymaps/default/keymap.c | 2 +- .../keymaps/depariel/keymap.c | 2 +- .../keymaps/hasu/keymap.c | 2 +- .../{infinity_chibios => infinity60}/led.c | 0 .../{infinity_chibios => infinity60}/matrix.c | 0 .../mcuconf.h | 0 keyboards/infinity60/readme.md | 29 +++++++++++++++++++ .../{infinity_chibios => infinity60}/rules.mk | 0 16 files changed, 37 insertions(+), 9 deletions(-) rename keyboards/{infinity_chibios => infinity60}/MEMO.txt (100%) rename keyboards/{infinity_chibios => infinity60}/Makefile (100%) rename keyboards/{infinity_chibios => infinity60}/bootloader_defs.h (100%) rename keyboards/{infinity_chibios => infinity60}/chconf.h (100%) rename keyboards/{infinity_chibios => infinity60}/config.h (88%) rename keyboards/{infinity_chibios => infinity60}/halconf.h (100%) rename keyboards/{infinity_chibios/infinity_chibios.c => infinity60/infinity60.c} (95%) rename keyboards/{infinity_chibios/infinity_chibios.h => infinity60/infinity60.h} (100%) rename keyboards/{infinity_chibios => infinity60}/keymaps/default/keymap.c (98%) rename keyboards/{infinity_chibios => infinity60}/keymaps/depariel/keymap.c (99%) rename keyboards/{infinity_chibios => infinity60}/keymaps/hasu/keymap.c (99%) rename keyboards/{infinity_chibios => infinity60}/led.c (100%) rename keyboards/{infinity_chibios => infinity60}/matrix.c (100%) rename keyboards/{infinity_chibios => infinity60}/mcuconf.h (100%) create mode 100644 keyboards/infinity60/readme.md rename keyboards/{infinity_chibios => infinity60}/rules.mk (100%) diff --git a/keyboards/infinity_chibios/MEMO.txt b/keyboards/infinity60/MEMO.txt similarity index 100% rename from keyboards/infinity_chibios/MEMO.txt rename to keyboards/infinity60/MEMO.txt diff --git a/keyboards/infinity_chibios/Makefile b/keyboards/infinity60/Makefile similarity index 100% rename from keyboards/infinity_chibios/Makefile rename to keyboards/infinity60/Makefile diff --git a/keyboards/infinity_chibios/bootloader_defs.h b/keyboards/infinity60/bootloader_defs.h similarity index 100% rename from keyboards/infinity_chibios/bootloader_defs.h rename to keyboards/infinity60/bootloader_defs.h diff --git a/keyboards/infinity_chibios/chconf.h b/keyboards/infinity60/chconf.h similarity index 100% rename from keyboards/infinity_chibios/chconf.h rename to keyboards/infinity60/chconf.h diff --git a/keyboards/infinity_chibios/config.h b/keyboards/infinity60/config.h similarity index 88% rename from keyboards/infinity_chibios/config.h rename to keyboards/infinity60/config.h index 452cc2a9fb..f8346fe165 100644 --- a/keyboards/infinity_chibios/config.h +++ b/keyboards/infinity60/config.h @@ -26,11 +26,10 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 /* in python2: list(u"whatever".encode('utf-16-le')) */ /* at most 32 characters or the ugly hack in usb_main.c borks */ -#define MANUFACTURER "TMK" -#define USBSTR_MANUFACTURER 'T', '\x00', 'M', '\x00', 'K', '\x00', ' ', '\x00', '\xc6', '\x00' -#define PRODUCT "Infinity keyboard/TMK" -#define USBSTR_PRODUCT 'I', '\x00', 'n', '\x00', 'f', '\x00', 'i', '\x00', 'n', '\x00', 'i', '\x00', 't', '\x00', 'y', '\x00', ' ', '\x00', 'k', '\x00', 'e', '\x00', 'y', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '/', '\x00', 'T', '\x00', 'M', '\x00', 'K', '\x00' - +#define MANUFACTURER "Input Club" +#define USBSTR_MANUFACTURER 'I', '\x00', 'n', '\x00', 'p', '\x00', 'u', '\x00', 't', '\x00', ' ', '\x00', 'C', '\x00', 'l', '\x00', 'u', '\x00', 'b', '\x00' +#define PRODUCT "Infinity keyboard/QMK" +#define USBSTR_PRODUCT 'I', '\x00', 'n', '\x00', 'f', '\x00', 'i', '\x00', 'n', '\x00', 'i', '\x00', 't', '\x00', 'y', '\x00', ' ', '\x00', 'k', '\x00', 'e', '\x00', 'y', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '/', '\x00', 'Q', '\x00', 'M', '\x00', 'K', '\x00' /* key matrix size */ #define MATRIX_ROWS 9 #define MATRIX_COLS 7 diff --git a/keyboards/infinity_chibios/halconf.h b/keyboards/infinity60/halconf.h similarity index 100% rename from keyboards/infinity_chibios/halconf.h rename to keyboards/infinity60/halconf.h diff --git a/keyboards/infinity_chibios/infinity_chibios.c b/keyboards/infinity60/infinity60.c similarity index 95% rename from keyboards/infinity_chibios/infinity_chibios.c rename to keyboards/infinity60/infinity60.c index 845eda01b0..e471250feb 100644 --- a/keyboards/infinity_chibios/infinity_chibios.c +++ b/keyboards/infinity60/infinity60.c @@ -14,4 +14,4 @@ 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 . */ -#include "infinity_chibios.h" +#include "infinity60.h" diff --git a/keyboards/infinity_chibios/infinity_chibios.h b/keyboards/infinity60/infinity60.h similarity index 100% rename from keyboards/infinity_chibios/infinity_chibios.h rename to keyboards/infinity60/infinity60.h diff --git a/keyboards/infinity_chibios/keymaps/default/keymap.c b/keyboards/infinity60/keymaps/default/keymap.c similarity index 98% rename from keyboards/infinity_chibios/keymaps/default/keymap.c rename to keyboards/infinity60/keymaps/default/keymap.c index 5f3b46a367..4434128579 100644 --- a/keyboards/infinity_chibios/keymaps/default/keymap.c +++ b/keyboards/infinity60/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -#include "infinity_chibios.h" +#include "infinity60.h" const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 0: Default Layer diff --git a/keyboards/infinity_chibios/keymaps/depariel/keymap.c b/keyboards/infinity60/keymaps/depariel/keymap.c similarity index 99% rename from keyboards/infinity_chibios/keymaps/depariel/keymap.c rename to keyboards/infinity60/keymaps/depariel/keymap.c index e68891f79e..7412b9b9dd 100755 --- a/keyboards/infinity_chibios/keymaps/depariel/keymap.c +++ b/keyboards/infinity60/keymaps/depariel/keymap.c @@ -1,4 +1,4 @@ -#include "infinity_chibios.h" +#include "infinity60.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 0: Default Layer diff --git a/keyboards/infinity_chibios/keymaps/hasu/keymap.c b/keyboards/infinity60/keymaps/hasu/keymap.c similarity index 99% rename from keyboards/infinity_chibios/keymaps/hasu/keymap.c rename to keyboards/infinity60/keymaps/hasu/keymap.c index a1954d2587..d3728869ab 100644 --- a/keyboards/infinity_chibios/keymaps/hasu/keymap.c +++ b/keyboards/infinity60/keymaps/hasu/keymap.c @@ -1,4 +1,4 @@ -#include "infinity_chibios.h" +#include "infinity60.h" const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 0: Default Layer diff --git a/keyboards/infinity_chibios/led.c b/keyboards/infinity60/led.c similarity index 100% rename from keyboards/infinity_chibios/led.c rename to keyboards/infinity60/led.c diff --git a/keyboards/infinity_chibios/matrix.c b/keyboards/infinity60/matrix.c similarity index 100% rename from keyboards/infinity_chibios/matrix.c rename to keyboards/infinity60/matrix.c diff --git a/keyboards/infinity_chibios/mcuconf.h b/keyboards/infinity60/mcuconf.h similarity index 100% rename from keyboards/infinity_chibios/mcuconf.h rename to keyboards/infinity60/mcuconf.h diff --git a/keyboards/infinity60/readme.md b/keyboards/infinity60/readme.md new file mode 100644 index 0000000000..97457b4077 --- /dev/null +++ b/keyboards/infinity60/readme.md @@ -0,0 +1,29 @@ +Infinity 60% keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme](/). + +## Keymaps + +Several versions of keymaps are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. + +Keymaps follow the format **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/` + + +## Compiling + +Download or clone the whole firmware and navigate to the keyboards/infinity60 folder. Once your dev env is setup, you'll be able to use the `make` command to both compile your keymap and flash it to your keyboard. + +To just compile, which generates the output files in the `.build` folder at the root of the repository, run `make keymap`, where keymap is the name of the keymap that you want to compile. + +## Flashing + +To flash the firmware to the keyboard + +1. First press the flash button on the bottom of the keyboard. If you already have a flah button mapped in a keyboard layout running on the keyboard, you can also use that. +2. Then run `make keymap-dfu-util`, where keymap is the name of the keymap you want to flash. On Linux based operating systems you might need to run the comamnd as root, for example `sudo make keymap-dfu-util` on Ubuntu. + +**Tip** `make keymap-dfu-util` will also compile the keymap if needed, so you can skip the compilation step if you want to. + diff --git a/keyboards/infinity_chibios/rules.mk b/keyboards/infinity60/rules.mk similarity index 100% rename from keyboards/infinity_chibios/rules.mk rename to keyboards/infinity60/rules.mk From 3bdebd2270a40593f4779f0013f588e47b3c53fc Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 28 Aug 2016 00:52:32 +0300 Subject: [PATCH 119/120] Update list of community keyboards --- keyboards/readme.md | 47 +++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/keyboards/readme.md b/keyboards/readme.md index 4f17962191..81a23c7e55 100644 --- a/keyboards/readme.md +++ b/keyboards/readme.md @@ -9,38 +9,47 @@ These keyboards are manufactured by the maintainers of QMK. What makes OLKB keyboards shine is a combo of lean aesthetics, compact size, and killer tactile feel. These are available through [olkb.com](http://olkb.com) as well as through [Massdrop](http://massdrop.com) from time to time, as easy to assemble kits. -* [Planck](/keyboards/planck/) - A 40% DIY powerhouse of customizability and modification capability. It's a lean, mean, typing machine. -* [Preonic](/keyboards/preonic/) - Like the Planck, but bigger. 50%. -* [Atomic](/keyboards/atomic/) - Imagine the size of the Planck. Now imagine the size of the Preonic. Now imagine _bigger_. That is the Atomic. A 60% keyboard. +* [Planck](/keyboards/planck/) — A 40% DIY powerhouse of customizability and modification capability. It's a lean, mean, typing machine. +* [Preonic](/keyboards/preonic/) — Like the Planck, but bigger. 50%. +* [Atomic](/keyboards/atomic/) — Imagine the size of the Planck. Now imagine the size of the Preonic. Now imagine _bigger_. That is the Atomic. A 60% keyboard. ### ErgoDox EZ - Erez Zukerman Made in Taiwan using advanced robotic manufacturing, the ErgoDox EZ is a fully-assembled, premium ergonomic keyboard. Its split design allows you to place both halves shoulder width, and its custom-made wrist rests and tilt/tent kit make for incredibly comfortable typing. Available on [ergodox-ez.com](https://ergodox-ez.com). -* [ErgoDox EZ](/keyboards/ergodox/) - Our one and only product. Yes, it's that awesome. Comes with either printed or blank keycaps, and 7 different keyswitch types. +* [ErgoDox EZ](/keyboards/ergodox/) — Our one and only product. Yes, it's that awesome. Comes with either printed or blank keycaps, and 7 different keyswitch types. ### Clueboard - Zach White Designed and built in Felton, CA, Clueboards keyboard emphasize quality and locally sourced components, available on [clueboard.co](http://clueboard.co) -* [Clueboard](/keyboards/clueboard/) - The 66% custom keyboard. -* [Cluepad](/keyboards/cluepad/) - A mechanical numpad with QMK superpowers. +* [Clueboard](/keyboards/clueboard/) — The 66% custom keyboard. +* [Cluecard](/keyboards/cluecard/) — A small board to help you hack on QMK. +* [Cluepad](/keyboards/cluepad/) — A mechanical numpad with QMK superpowers. ## Community-supported QMK Keyboards These keyboards are part of the QMK repository, but their manufacturers are not official maintainers of the repository. -* [alps64](/keyboards/alps64/) — A 60% keyboard for Alps keyswitches. -* [arrow_pad](/keyboards/arrow_pad) — A custom creation by IBNobody. -* [atreus](/keyboards/atreus) — Made by Technomancy. -* [bantam44](/keyboards/bantam44) — It is a 44-key 40% staggered keyboard. -* [gh60](/keyboards/gh60) — A 60% Geekhack community-driven project. -* [hhkb](/keyboards/hhkb) — The Happy Hacking keyboard can be hacked with a custom controller to run QMK. -* [jd45](/keyboards/jd45) — Another Geekhack community project, designed by jdcarpe. -* [kc60](/keyboards/kc60) — A programmable Chinese-made keyboard, lost in the mists of time. -* [kitten_paw](/keyboards/kitten_paw) — A replacement controller (2016 revision) for the Filco Majestouch by [Bathroom Epiphanies](https://github.com/BathroomEpiphanies) -* [phantom](/keyboards/phantom) — A tenkeyless kit by Teel, also from Geekhack. -* [retro_refit](/keyboards/retro_refit) — Another creation by IBNobody. -* [satan](/keyboards/satan) — A GH60 variant. -* [sixkeyboard](/keyboards/sixkeyboard) — A 6-key keyboard made by TechKeys. +* [Alps64](/keyboards/alps64) — A 60% keyboard for Alps keyswitches. +* [AMJ60](/keyboards/amj60) — DIY/Assembled compact 60% keyboard. +* [Arrow Pad](/keyboards/arrow_pad) — A custom creation by IBNobody. +* [Atreus](/keyboards/atreus) — Made by Technomancy. +* [Bantam44](/keyboards/bantam44) — It is a 44-key 40% staggered keyboard. +* [Ergodox Infinity](/keyboards/ergodox) - Ergonomic Split Keyboard by Input Club. +* [GH60](/keyboards/gh60) — A 60% Geekhack community-driven project. +* [Happy Hacking Keyboard](/keyboards/hhkb) — The Happy Hacking keyboard can be hacked with a custom controller to run QMK. +* [Infinity 60%](/keyboards/infinity60) - — Compact community keyboard by Input Club. +* [JD45](/keyboards/jd45) — Another Geekhack community project, designed by jdcarpe. +* [KC60](/keyboards/kc60) — A programmable Chinese-made keyboard, lost in the mists of time. +* [Kinesis Advantage](/keyboards/kinesis) — Contoured ergonomic keyboard by Kinesis Computer Ergonomics. +* [The Kitten Paw](/keyboards/kitten_paw) — A replacement controller (2016 revision) for the Filco Majestouch by [Bathroom Epiphanies](https://github.com/BathroomEpiphanies). +* [Lets Split](/keyboards/lets_split) - Split ortholinear 40% keyboard. +* [Phantom](/keyboards/phantom) — A tenkeyless kit by Teel, also from Geekhack. +* [Retro Refit](/keyboards/retro_refit) — Another creation by IBNobody. +* [S60-x](/keyboards/s60-x) — DIY compact keyboard designed by VinnyCordeiro for Sentraq. +* [Satan](/keyboards/satan) — A GH60 variant. +* [SixKeyBoard](/keyboards/sixkeyboard) — A 6-key keyboard made by TechKeys. +* [TheVan 44](/keyboars/tv44) — A 44-key staggered keybard by Evangs. +* [Vision Division](/keyboards/vision_division) — Full Size / Split Linear Keyboard by IBNobody. From 83eb9e4eed808113a2fc059bcd7546b17707e920 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 28 Aug 2016 01:10:14 +0300 Subject: [PATCH 120/120] Fix the .travis.yml so that GH_TOKEN works properly --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4c918a5ed..e74744a967 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,11 @@ branches: env: global: - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM= + matrix: + - TARGET=all-keyboards AUTOGEN=true + - TARGET=test AUTOGEN=false script: - make $TARGET AUTOGEN=$AUTOGEN -env: -- TARGET=all-keyboards AUTOGEN=true -- TARGET=test AUTOGEN=false addons: apt: packages: