don't do final script

.gitignore

@@ -21,7 +21,6 @@ build/
 quantum/version.h
 .idea/
 CMakeLists.txt
-cmake-build-debug
 .DS_STORE
 /util/wsl_downloaded
 /util/win_downloaded

.travis.yml

@@ -11,15 +11,146 @@ env:
   global:
   - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
 before_install:
-  - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz || wget http://qmk.fm/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
+  - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
 install:
   - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
   - export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin"
 before_script:
   - avr-gcc --version
-script:
-- make test:all AUTOGEN=false
-- bash util/travis_build.sh
+jobs:
+  include:
+    - stage: run tests
+      script: make test:all AUTOGEN=false
+    - stage: build keyboards
+    - script: make 9key
+    - script: make alps64
+    - script: make amj40
+    - script: make amj60
+    - script: make amjpad
+    - script: make atomic
+    - script: make atreus
+    - script: make atreus62
+    - script: make bananasplit
+    - script: make bantam44
+    - script: make chibios_test
+    - script: make chibios_test/stm32_f072_onekey
+    - script: make chibios_test/stm32_f103_onekey
+    - script: make chibios_test/teensy_lc_onekey
+    - script: make clueboard_17
+    - script: make clueboard_60
+    - script: make clueboard_66
+    - script: make clueboard_66/rev1
+    - script: make clueboard_66/rev2
+    - script: make clueboard_66/rev3
+    - script: make cluecard
+    - script: make converter/ibm_terminal
+    - script: make converter/usb_usb
+    - script: make deltasplit75
+    - script: make deltasplit75/v2
+    - script: make dichotemy
+    - script: make dk60
+    - script: make dz60
+    - script: make dz87
+    - script: make eco
+    - script: make eco/rev1
+    - script: make eco/rev2
+    - script: make ergodone
+    - script: make ergodox_ez
+    - script: make ergodox_infinity
+    - script: make felix
+    - script: make four_banger
+    - script: make frosty_flake
+    - script: make gh60
+    - script: make gherkin
+    - script: make gonnerd
+    - script: make hadron
+    - script: make hadron/ver0
+    - script: make hadron/ver2
+    - script: make handwired/CMD60
+    - script: make handwired/MS_sculpt_mobile
+    - script: make handwired/arrow_pad
+    - script: make handwired/atreus50
+    - script: make handwired/fivethirteen
+    - script: make handwired/frenchdev
+    - script: make handwired/gamenum
+    - script: make handwired/kbod
+    - script: make handwired/magicforce61
+    - script: make handwired/magicforce68
+    - script: make handwired/minorca
+    - script: make handwired/numpad20
+    - script: make handwired/onekey
+    - script: make handwired/ortho5x13
+    - script: make handwired/pilcrow
+    - script: make handwired/promethium
+    - script: make handwired/reddot
+    - script: make handwired/retro_refit
+    - script: make handwired/trackpoint
+    - script: make handwired/traveller
+    - script: make handwired/woodpad
+    - script: make hhkb
+    - script: make infinity60
+    - script: make jc65
+    - script: make jd40
+    - script: make jd45
+    - script: make jj40
+    - script: make jm60
+    - script: make kbd75
+    - script: make kc60
+    - script: make kinesis
+    - script: make kinesis/alvicstep
+    - script: make kinesis/stapelberg
+    - script: make kitten_paw
+    - script: make kmac
+    - script: make lets_split
+    - script: make lets_split/rev1
+    - script: make lets_split/rev2
+    - script: make levinson
+    - script: make levinson/rev1
+    - script: make m10a
+    - script: make maxipad
+    - script: make mechmini
+    - script: make mf68
+    - script: make minidox
+    - script: make minidox/rev1
+    - script: make mitosis
+    - script: make miuni32
+    - script: make nyquist
+    - script: make nyquist/rev1
+    - script: make obelus
+    - script: make org60
+    - script: make orthodox
+    - script: make orthodox/rev1
+    - script: make pegasushoof
+    - script: make phantom
+    - script: make planck
+    - script: make planck/rev3
+    - script: make planck/rev4
+    - script: make preonic
+    - script: make ps2avrGB
+    - script: make roadkit
+    - script: make s60_x
+    - script: make s60_x/default
+    - script: make s60_x/rgb
+    - script: make s65_x
+    - script: make satan
+    - script: make sixkeyboard
+    - script: make subatomic
+    - script: make sweet16
+    - script: make tada68
+    - script: make tiger_lily
+    - script: make tomato
+    - script: make tv44
+    - script: make uk78
+    - script: make v60_type_r
+    - script: make vision_division
+    - script: make viterbi
+    - script: make viterbi/rev1
+    - script: make whitefox
+    - script: make xd60
+    - script: make xd75
+    - script: make ymd96
+   # - stage: push to qmk.fm
+   #   script: bash util/travis_compiled_push.sh
 addons:
   apt:
     packages:
@@ -30,8 +161,6 @@ addons:
     - libnewlib-arm-none-eabi
     - diffutils
     - dos2unix
-after_success: 
-  bash util/travis_compiled_push.sh
 notifications:
   webhooks:
     urls:

Makefile

@@ -91,6 +91,11 @@ $(eval $(call NEXT_PATH_ELEMENT))
 #     endif
 # endif
 
+define newline
+
+
+endef
+
 define GET_KEYBOARDS
     All_RULES_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/rules.mk))
     All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk))
@@ -103,6 +108,7 @@ define GET_KEYBOARDS
     KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/keymaps/*/rules.mk))
 
     KEYBOARDS := $$(sort $$(filter-out $$(KEYMAPS_MK), $$(All_RULES_MK)))
+    TRAVIS_KEYBOARDS := $$(patsubst %, "- script: make %\n", $$(KEYBOARDS))
 endef
 
 $(eval $(call GET_KEYBOARDS))
@@ -114,6 +120,10 @@ list-keyboards:
 	echo $(KEYBOARDS)
 	exit 0
 
+travis-keyboards:
+	echo $(TRAVIS_KEYBOARDS)
+	exit 0
+
 #Compatibility with the old make variables, anything you specify directly on the command line
 # always overrides the detected folders
 ifdef keyboard
@@ -304,8 +314,7 @@ define PARSE_KEYBOARD
     KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.)))
     KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
     KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
-    # this might be needed, but in a different form
-    #KEYMAPS := $$(sort $$(filter-out $$(KEYBOARD_FOLDER_1) $$(KEYBOARD_FOLDER_2) \
+    KEYMAPS := $$(sort $$(filter-out $$(KEYBOARD_FOLDER_1) $$(KEYBOARD_FOLDER_2) \
         $$(KEYBOARD_FOLDER_3) $$(KEYBOARD_FOLDER_4) $$(KEYBOARD_FOLDER_5), $$(KEYMAPS)))
 
     KEYBOARD_LAYOUTS :=

build_keyboard.mk

@@ -183,10 +183,6 @@ else
     # this state should never be reached
 endif
 
-# User space stuff
-USER_PATH := users/$(KEYMAP)
--include $(USER_PATH)/rules.mk
-
 # Object files directory
 #     To put object files in current directory, use a dot (.), do NOT make
 #     this an empty or blank macro!
@@ -208,7 +204,6 @@ SRC += $(KEYBOARD_SRC) \
 VPATH += $(KEYMAP_PATH)
 VPATH += $(KEYBOARD_PATHS)
 VPATH += $(COMMON_VPATH)
-VPATH += $(USER_PATH)
 
 include common_features.mk
 include $(TMK_PATH)/protocol.mk

docs/_summary.md

@@ -15,7 +15,6 @@
 * [Features](features.md)
   * [Layouts](feature_layouts.md)
   * [Common Shortcuts](feature_common_shortcuts.md)
-  * [Userspace](feature_userspace.md)
   * [Backlight](feature_backlight.md)
   * [Bootmagic](feature_bootmagic.md)
   * [Dynamic Macros](dynamic_macros.md)

docs/contributing.md

@@ -80,7 +80,7 @@ We have a few different types of changes in QMK, each requiring a different leve
 * Make sure your code change actually compiles.
   * Keymaps: Make sure that `make keyboard:your_new_keymap` does not return an error
   * Keyboards: Make sure that `make keyboard:all` does not return any errors
-  * Core: Make sure that `make all` does not return any errors.
+  * Core: Make sure that `make allkb` does not return any errors.
 * Make sure commit messages are understandable on their own. You should put a short description (no more than 70 characters) on the first line, the second line should be empty, and on the 3rd and later lines you should describe your commit in detail, if required. Example:
 
 ```

docs/dynamic_macros.md

@@ -1,6 +1,6 @@
 # Dynamic macros: record and replay macros in runtime
 
-QMK supports temporary macros created on the fly. We call these Dynamic Macros. They are defined by the user from the keyboard and are lost when the keyboard is unplugged or otherwise rebooted.
+QMK supports temporarily macros created on the fly. We call these Dynamic Macros. They are defined by the user from the keyboard and are lost when the keyboard is unplugged or otherwise rebooted.
 
 You can store one or two macros and they may have a combined total of 128 keypresses. You can increase this size at the cost of RAM.
 
@@ -22,7 +22,7 @@ enum planck_keycodes {
 
 It must be the last element because `dynamic_macros.h` will add some more keycodes after it.
 
-Below it, include the `dynamic_macro.h` header:
+Below it include the `dynamic_macro.h` header:
 
 ```c
 	#include "dynamic_macro.h"`
@@ -58,6 +58,6 @@ For users of the earlier versions of dynamic macros: It is still possible to fin
 	}
 ```
 
-If the LEDs start blinking during the recording with each keypress, it means there is no more space for the macro in the macro buffer. To fit the macro in, either make the other macro shorter (they share the same buffer) or increase the buffer size by setting the `DYNAMIC_MACRO_SIZE` preprocessor macro (default value: 128; please read the comments for it in the header).
+If the LED's start blinking during the recording with each keypress, it means there is no more space for the macro in the macro buffer. To fit the macro in, either make the other macro shorter (they share the same buffer) or increase the buffer size by setting the `DYNAMIC_MACRO_SIZE` preprocessor macro (default value: 128; please read the comments for it in the header).
 
 For the details about the internals of the dynamic macros, please read the comments in the `dynamic_macro.h` header.

docs/faq_build.md

@@ -62,7 +62,7 @@ https://github.com/tmk/tmk_keyboard/wiki/mbed-cortex-porting#compile-error-cstdd
 https://developer.mbed.org/forum/mbed/topic/5205/
 
 
-## `clock_prescale_set` and `clock_div_1` not available
+## 'clock_prescale_set' and 'clock_div_1' not available
 Your toolchain is too old to support the MCU. For example WinAVR 20100110 doesn't support ATMega32u2.
 
 ```

docs/feature_rgblight.md

@@ -49,10 +49,8 @@ If you have `#define RGBLIGHT_ANIMATIONS` in your `config.h` you will have a num
 | Option | Default Value | Description |
 |--------|---------------|-------------|
 | `RGBLIGHT_ANIMATIONS` | | `#define` this to enable animation modes. |
-| `RGBLIGHT_EFFECT_BREATHE_CENTER` | 1.85 | Used to calculate the curve for the breathing animation. Valid values 1.0-2.7. |
-| `RGBLIGHT_EFFECT_BREATHE_MAX` | 255 | The maximum brightness for the breathing mode. Valid values 1-255. |
-| `RGBLIGHT_EFFECT_SNAKE_LENGTH` | 4 | The number of LEDs to light up for the "snake" animation. |
-| `RGBLIGHT_EFFECT_KNIGHT_LENGTH` | 3 | The number of LEDs to light up for the "knight" animation. |
+| `RGBLIGHT_EFFECT_SNAKE_LENGTH` | 4 | The number of LEDs to light up for the "snake" mode. |
+| `RGBLIGHT_EFFECT_KNIGHT_LENGTH` | 3 | The number of LEDs to light up for the "knight" mode. |
 | `RGBLIGHT_EFFECT_KNIGHT_OFFSET` | 0 | Start the knight animation this many LEDs from the start of the strip. |
 | `RGBLIGHT_EFFECT_KNIGHT_LED_NUM` | RGBLED_NUM | The number of LEDs to have the "knight" animation travel. |
 | `RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL` | 1000 | How long to wait between light changes for the "christmas" animation. Specified in ms. |

docs/feature_userspace.md

@@ -1,33 +0,0 @@
-# Userspace: sharing code between keymaps
-
-If you use more than one keyboard with a similar keymap, you might see the benefit in being able to share code between them. Create your own folder in `users/` named the same as your keymap (ideally your github username, `<name>`) with the following structure:
-
-* `/users/<name>/` (added to the path automatically)
-  * `readme.md`
-  * `rules.mk` (included automatically)
-  * `<name>.h` (optional)
-  * `<name>.c` (optional)
-
-`<name>.c` will need to be added to the SRC in `rules.mk` like this:
-
-    SRC += <name>.c
-
-Additional files may be added in the same way - it's recommended you have one named `<name>`.c/.h though.
-
-All this only happens when you build a keymap named `<name>`, like this:
-
-    make planck:<name>
-
-For example, 
-
-    make planck:jack
-
-Will include the `/users/jack/` folder in the path, along with `/users/jack/rules.mk`.
-
-## Readme
-
-Please include authorship (your name, github username, email), and optionally [a license that's GPL compatible](https://www.gnu.org/licenses/license-list.html#GPLCompatibleLicenses).
-
-## Example
-
-For a brief example, checkout `/users/_example/` until we have more reasonable and useful examples.

docs/keymap.md

@@ -79,7 +79,7 @@ Key with `KC_TRANS` (`KC_TRNS` and `_______` are the alias) doesn't has its own
 
 ## Anatomy Of A `keymap.c`
 
-For this example we will walk through the [default Clueboard 66% keymap](https://github.com/qmk/qmk_firmware/blob/master/keyboards/clueboard_66/keymaps/default/keymap.c). You'll find it helpful to open that file in another browser window so you can look at everything in context.
+For this example we will walk through the [default Clueboard keymap](https://github.com/qmk/qmk_firmware/blob/master/keyboards/clueboard/keymaps/default/keymap.c). You'll find it helpful to open that file in another browser window so you can look at everything in context.
 
 There are 3 main sections of a `keymap.c` file you'll want to concern yourself with:
 

docs/tap_dance.md

@@ -63,23 +63,20 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 TD(TD_ESC_CAPS)
 ```
 
-## Complex Examples
+## Complex Example
 
-This section details several complex tap dance examples.
-All the enums used in the examples are declared like this:
+Here's a more complex example involving custom actions:
 
 ```c
-// Enums defined for all examples:
 enum {
  CT_SE = 0,
  CT_CLN,
  CT_EGG,
  CT_FLSH,
- X_TAP_DANCE
 };
-```
-### Example 1: Send `:` on single tap, `;` on double tap
-```c
+
+/* Have the above three on the keymap, TD(CT_SE), etc... */
+
 void dance_cln_finished (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count == 1) {
     register_code (KC_RSFT);
@@ -98,13 +95,6 @@ void dance_cln_reset (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-//All tap dance functions would go here. Only showing this one.
-qk_tap_dance_action_t tap_dance_actions[] = {
- [CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cln_finished, dance_cln_reset)
-};
-```
-### Example 2: Send "Safety Dance!" after 100 taps
-```c
 void dance_egg (qk_tap_dance_state_t *state, void *user_data) {
   if (state->count >= 100) {
     SEND_STRING ("Safety dance!");
@@ -112,14 +102,6 @@ void dance_egg (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-qk_tap_dance_action_t tap_dance_actions[] = {
- [CT_EGG] = ACTION_TAP_DANCE_FN (dance_egg)
-};
-```
-
-### Example 3: Turn LED lights on then off, one at a time
-
-```c
 // on each tap, light up one led, from right to left
 // on the forth tap, turn them off from right to left
 void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
@@ -159,7 +141,6 @@ void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
   ergodox_right_led_3_off();
 }
 
-//All tap dances now put together. Example 3 is "CT_FLASH"
 qk_tap_dance_action_t tap_dance_actions[] = {
   [CT_SE]  = ACTION_TAP_DANCE_DOUBLE (KC_SPC, KC_ENT)
  ,[CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cln_finished, dance_cln_reset)
@@ -167,84 +148,3 @@ qk_tap_dance_action_t tap_dance_actions[] = {
  ,[CT_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED (dance_flsh_each, dance_flsh_finished, dance_flsh_reset)
 };
 ```
-
-### Example 4: 'Quad Function Tap-Dance'
-
-By [DanielGGordon](https://github.com/danielggordon)
-
-Allow one key to have 4 (or more) functions, depending on number of presses, and if the key is held or tapped.
-Below is a specific example:
-*  Tap = Send `x`
-*  Hold = Send `Control`
-*  Double Tap = Send `Escape`
-*  Double Tap and Hold = Send `Alt`
-
-The following example can be easily expanded to more than 4 quite easily:
-```c
-//**************** Definitions needed for quad function to work *********************//
-//Enums used to clearly convey the state of the tap dance
-enum {
-  SINGLE_TAP = 1,
-  SINGLE_HOLD = 2,
-  DOUBLE_TAP = 3,
-  DOUBLE_HOLD = 4, 
-  DOUBLE_SINGLE_TAP = 5 //send SINGLE_TAP twice - NOT DOUBLE_TAP
-  // Add more enums here if you want for triple, quadruple, etc. 
-};
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} tap;
-
-int cur_dance (qk_tap_dance_state_t *state) {
-  if (state->count == 1) {
-    //If count = 1, and it has been interrupted - it doesn't matter if it is pressed or not: Send SINGLE_TAP
-    if (state->interrupted || state->!pressed) return SINGLE_TAP;
-    else return SINGLE_HOLD;
-  }
-  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
-  //with single tap. In example below, that means to send `xx` instead of `Escape`.
-  else if (state->count = 2) {
-    if (state->interrupted) return DOUBLE_SINGLE_TAP;
-    else if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  } 
-  else return 6; //magic number. At some point this method will expand to work for more presses
-}
-
-//**************** Definitions needed for quad function to work *********************//
-
-//instanalize an instance of 'tap' for the 'x' tap dance.
-static tap xtap_state = { 
-  .is_press_action = true,
-  .state = 0
-};
-
-void x_finished (qk_tap_dance_state_t *state, void *user_data) {
-  xtap_state.state = cur_dance(state);
-  switch (xtap_state.state) {
-    case SINGLE_TAP: register_code(KC_X); break;
-    case SINGLE_HOLD: register_code(KC_LCTRL); break;
-    case DOUBLE_TAP: register_code(KC_ESC); break;
-    case DOUBLE_HOLD: register_code(KC_LALT); break;
-    case DOUBLE_SINGLE_TAP: register_code(KC_X); unregister_code(KC_X); register_code(KC_X);
-    //Last case is for fast typing. Assuming your key is `f`:
-    //For example, when typing the word `buffer`, and you want to make sure that you send `ff` and not `Esc`.
-    //In order to type `ff` when typing fast, the next character will have to be hit within the `TAPPING_TERM`, which by default is 200ms.
-  }
-}
-
-void x_reset (qk_tap_dance_state_t *state, void *user_data) {
-  switch (xtap_state.state) {
-    case SINGLE_TAP: unregister_code(KC_X); break;
-    case SINGLE_HOLD: unregister_code(KC_LCTRL); break;
-    case DOUBLE_TAP: unregister_code(KC_ESC); break;
-    case DOUBLE_HOLD: unregister_code(KC_LALT);
-    case DOUBLE_SINGLE_TAP: unregister_code(KC_X);
-  }
-  xtap_state.state = 0;
-}
-```
-And then simply add this to your list of tap dance functions:
-`[X_TAP_DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset)`

keyboards/amj40/keymaps/default/keymap.c

@@ -1,5 +1,7 @@
 
 
+// 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 "amj40.h"
 

keyboards/amj60/keymaps/default/keymap.c

@@ -1,59 +0,0 @@
-
-#include "amj60.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.
-#define _DEF 0
-#define _SPC 1
-
-// dual-role shortcuts
-#define SPACEDUAL LT(_SPC, KC_SPACE)
-
-
-// increase readability 
-#define _______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap _DEF: Default Layer
-     * ,-----------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| \ | ~ |
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| bspc|
-     * |-----------------------------------------------------------|
-     * |Caps   | A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return |
-     * |-----------------------------------------------------------|
-     * |Sft | Fn0|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Sft |Fn2|
-     * |-----------------------------------------------------------|
-     * |Ctrl|Win |Alt |      Space/Fn0         |Alt |Win |Menu|RCtl|
-     * `-----------------------------------------------------------'
-     */
-    [_DEF] = KEYMAP_MAX(
-        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_BSLS, 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_BSPC,  \
-        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_LSFT,  F(0),    KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,    F(1),     \
-        KC_LCTL,  KC_LALT, KC_LGUI,             SPACEDUAL,                       KC_RGUI, KC_RALT, KC_RCTL,    F(2)),
-
-    /* Keymap 1: F-and-vim Layer, modified with Space (by holding space)
-     * ,-----------------------------------------------------------.
-     * |PrSc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |  |
-     * |-----------------------------------------------------------|
-     * |    |Paus| Up| [ | ] |   |   |   | ( | ) |   |   |   | Del |
-     * |-----------------------------------------------------------|
-     * |      |Lft|Dwn|Rgt|   |   |Left|Down|Right|Up|  |   | PLAY |
-     * |-----------------------------------------------------------|
-     * |    |   |   |   | < | > |   |M0 |   |   |   |   | Vol+ |   |
-     * |-----------------------------------------------------------|
-     * |    |    |    |                        |Alt |Prev|Vol-|Next|
-     * `-----------------------------------------------------------'
-     */
-    [_SPC] = KEYMAP_MAX(
-        KC_PSCR, 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_PAUS, KC_UP,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, KC_DEL, \
-        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_LEFT,  KC_DOWN,   KC_UP,     KC_RGHT, _______, _______, KC_MPLY, \
-        _______, _______, _______, _______,  _______, _______, KC_SPACE, M(0),      _______,   _______, _______, _______, KC_VOLU, _______, \
-        _______, _______, _______,                                  _______,                                 _______, KC_MPRV, KC_VOLD, KC_MNXT),
-
-};

keyboards/amj60/keymaps/iso_split_rshift/keymap.c

@@ -1,3 +1,5 @@
+// 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 "amj60.h"
 

keyboards/amj60/keymaps/maximized/keymap.c

@@ -1,3 +1,5 @@
+// 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 "amj60.h"
 

keyboards/clueboard/66/66.c

@@ -1 +0,0 @@
-#include "66.h"

keyboards/clueboard/card/keymaps/default/readme.md

@@ -1,3 +0,0 @@
-# The default keymap for cluecard
-
-Note that this keymap has audio enabled, so the RGB mode button does not go through the different effects.  So the LEDs will still show a static light, that is configurable with the hue, staturation and brightness buttons. You can of course also turn them on and off with the on/off button.

keyboards/clueboard/readme.md

@@ -1,13 +0,0 @@
-# Clueboard
-
-![Clueboard Logo](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/t/59c9703318b27d1ab34f40df/1508257572555/)
-
-Clueboard makes fully customizable custom keyboards in a variety of formfactors. Inside this directory you'll find support for the entire line of Clueboard products.
-
-* Maintainer: [Zach White](https://github.com/skullydazed)
-* Hardware Supported:
-  * [`17`](17/): Clueboard "Cluepad" PCB
-  * [`60`](60/): Clueboard 60% PCB
-  * [`66`](66/): Clueboard 66% PCB
-  * [`card`](card/): Special Cluecard PCB
-* Hardware Availability: [clueboard.co](https://clueboard.co/)

keyboards/clueboard_17/clueboard_17.c

@@ -1,4 +1,4 @@
-#include "17.h"
+#include "clueboard_17.h"
 
 int pwm_level;
 

keyboards/clueboard_17/keymaps/default/keymap.c

@@ -1,4 +1,4 @@
-#include "17.h"
+#include "clueboard_17.h"
 
 #include "backlight.h"
 

keyboards/clueboard_17/readme.md

@@ -1,16 +1,15 @@
-# Clueboard 17% (Formerly Cluepad)
+# Cluepad
 
-![Clueboard 17%](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/5842fbdce3df28eae5ec557e/5844fb2cb8a79bbdfd63bad1/1498501250178/IMGP3931.jpg?format=750w)
+![Cluepad](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/5842fbdce3df28eae5ec557e/5844fb2cb8a79bbdfd63bad1/1498501250178/IMGP3931.jpg?format=750w)
 
 A basic 17 key numpad PCB.
 
 * Keyboard Maintainer: [Zach White](https://github.com/skullydazed)
-* Hardware Supported:
-  * Cluepad PCB 1.0
+* Hardware Supported: Cluepad PCB 1.0
 * Hardware Availability: [clueboard.co](https://clueboard.co/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make clueboard/17:default
+    make clueboard_17:default
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.

keyboards/clueboard_60/clueboard_60.c

@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "60.h"
+#include "clueboard_60.h"
 
 void matrix_init_kb(void) {
 

keyboards/clueboard_60/keymaps/default/keymap.c

@@ -1,4 +1,4 @@
-#include "60.h"
+#include "clueboard_60.h"
 
 #define _______ KC_TRNS
 

keyboards/clueboard_60/keymaps/default_aek/keymap.c

@@ -1,4 +1,4 @@
-#include "60.h"
+#include "clueboard_60.h"
 
 #define _______ KC_TRNS
 

keyboards/clueboard_60/readme.md

@@ -9,6 +9,6 @@ A fully customizable 60% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make clueboard/60:default
+    make clueboard_60:default:dfu-util
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.

keyboards/clueboard_66/clueboard_66.c

@@ -0,0 +1 @@
+#include "clueboard_66.h"

keyboards/clueboard_66/config.h

@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CLUEBOARD_66_CONFIG_H
-#define CLUEBOARD_66_CONFIG_H
+#ifndef CONFIG_H
+#define CONFIG_H
 
 #include "config_common.h"
 

keyboards/clueboard_66/keymaps/bloodlvst/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/caps_fn/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/colemak/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/default/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/jokrik/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/mac_optimized/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/magicmonty/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/maximised/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/mouse_keys/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/serubin/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/shift_fn/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/skully/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/smt/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.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.

keyboards/clueboard_66/keymaps/tetris/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 #include "tetris_text.h"
 
 // Helpful defines

keyboards/clueboard_66/keymaps/unix_optimized/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/win_optimized/keymap.c

@@ -1,4 +1,4 @@
-#include "66.h"
+#include "clueboard_66.h"
 
 // Helpful defines
 #define _______ KC_TRNS

keyboards/clueboard_66/keymaps/xyverz/keymap.c

@@ -1,7 +1,7 @@
 // Xyverz' keymap.
 // It's based on the default keymap, but Dvorak!
 
-#include "66.h"
+#include "clueboard_66.h"
 
 // Used for SHIFT_ESC
 #define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))

keyboards/clueboard_66/readme.md

@@ -13,6 +13,6 @@ A fully customizable 66% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make clueboard/66:default
+    make clueboard/rev3:default
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.

keyboards/clueboard_66/rev1/config.h

@@ -1,5 +1,5 @@
-#ifndef CLUEBOARD_66_REV1_CONFIG_H
-#define CLUEBOARD_66_REV1_CONFIG_H
+#ifndef REV2_CONFIG_H
+#define REV2_CONFIG_H
 
 #include "config_common.h"
 
@@ -33,4 +33,4 @@
 #define RGBLIGHT_VAL_STEP 17
 
 
-#endif
+#endif

keyboards/clueboard_66/rev1/rev1.h

@@ -1,7 +1,7 @@
 #ifndef REV1_H
 #define REV1_H
 
-#include "../66.h"
+#include "../clueboard_66.h"
 
 /* Clueboard matrix layout
  * ,-----------------------------------------------------------.  ,---.

keyboards/clueboard_66/rev2/config.h

@@ -1,5 +1,5 @@
-#ifndef CLUEBOARD_66_REV2_CONFIG_H
-#define CLUEBOARD_66_REV2_CONFIG_H
+#ifndef REV2_CONFIG_H
+#define REV2_CONFIG_H
 
 #include "config_common.h"
 
@@ -36,8 +36,6 @@
 #define RGBLIGHT_VAL_STEP 17
 
 #define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
-#define RGBLIGHT_EFFECT_BREATHE_MAX 200
 #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 666*2
 #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3   // How many LEDs wide to light up