Cleans up quantum/keymap situation, removes extra lufa folders (#416)

* sorts out keycodes * move midi around * remove mbed * replaces keymap with qmk/keymap_common * fixes keymap.h * keymap, config, quantum rearrange * removes unneeded lufa stuff
2016-06-18 14:30:24 -04:00 · 2016-06-18 14:30:24 -04:00 · db32864ce7
commit db32864ce7
parent 1923cffd41
5186 changed files with 2207 additions and 2306512 deletions
--- a/keyboard/arrow_pad/arrow_pad.h
+++ b/keyboard/arrow_pad/arrow_pad.h
@ -2,7 +2,7 @@
 #define ARROW_PAD_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #ifdef BACKLIGHT_ENABLE
 	#include "backlight.h"
 #endif
--- a/keyboard/atreus/atreus.h
+++ b/keyboard/atreus/atreus.h
@ -2,7 +2,7 @@
 #define ATREUS_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "backlight.h"
 #include <stddef.h>

--- a/keyboard/bantam44/bantam44.h
+++ b/keyboard/bantam44/bantam44.h
@ -2,7 +2,7 @@
 #define BANTAM44_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "backlight.h"
 #include <stddef.h>

--- a/keyboard/clueboard1/clueboard1.h
+++ b/keyboard/clueboard1/clueboard1.h
@ -2,7 +2,7 @@
 #define CLUEBOARD1_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include <stddef.h>


--- a/keyboard/clueboard2/clueboard2.h
+++ b/keyboard/clueboard2/clueboard2.h
@ -2,7 +2,7 @@
 #define CLUEBOARD2_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include <stddef.h>


--- a/keyboard/cluepad/cluepad.h
+++ b/keyboard/cluepad/cluepad.h
@ -2,7 +2,7 @@
 #define CLUEPAD_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include <stddef.h>


--- a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c
@ -1,6 +1,6 @@
 #include "ergodox_ez.h"
 #include "action_layer.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "keymap_extras/keymap_german.h"

 #define UC_ASYMPTOTICALLY_EQUAL_TO 0
--- a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c
@ -3,7 +3,7 @@
 #include "action_layer.h"
 #include "action_util.h"
 #include "led.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "timer.h"

 /*
--- a/keyboard/gh60/gh60.h
+++ b/keyboard/gh60/gh60.h
@ -2,7 +2,7 @@
 #define GH60_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "backlight.h"
 #include <stddef.h>

--- a/keyboard/hhkb/hhkb.h
+++ b/keyboard/hhkb/hhkb.h
@ -2,7 +2,7 @@
 #define HHKB_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 //#include "backlight.h"
 #include <stddef.h>

--- a/keyboard/jd45/jd45.h
+++ b/keyboard/jd45/jd45.h
@ -2,7 +2,7 @@
 #define JD45_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "backlight.h"
 #include <stddef.h>

--- a/keyboard/kc60/kc60.h
+++ b/keyboard/kc60/kc60.h
@ -2,7 +2,7 @@
 #define KC60_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #ifdef BACKLIGHT_ENABLE
 #include "backlight.h"
 #endif
--- a/keyboard/phantom/phantom.h
+++ b/keyboard/phantom/phantom.h
@ -2,7 +2,7 @@
 #define PHANTOM_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include <stddef.h>


--- a/keyboard/planck/keymaps/alexey/keymap.c
+++ b/keyboard/planck/keymaps/alexey/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"
 #include "planck.h"
 #include "backlight.h"

--- a/keyboard/planck/keymaps/angerthosenear/keymap.c
+++ b/keyboard/planck/keymaps/angerthosenear/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = { /* Qwerty */
--- a/keyboard/planck/keymaps/austin/keymap.c
+++ b/keyboard/planck/keymaps/austin/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = { /* Qwerty */
--- a/keyboard/planck/keymaps/charlie/keymap.c
+++ b/keyboard/planck/keymaps/charlie/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = { /* Native */
--- a/keyboard/planck/keymaps/daniel/keymap.c
+++ b/keyboard/planck/keymaps/daniel/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = { /* Qwerty */
--- a/keyboard/planck/keymaps/david/keymap.c
+++ b/keyboard/planck/keymaps/david/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = { /* Qwerty */
--- a/keyboard/planck/keymaps/default/compiled.hex
+++ b/keyboard/planck/keymaps/default/compiled.hex
--- a/keyboard/planck/keymaps/dzobert/keymap.c
+++ b/keyboard/planck/keymaps/dzobert/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = { /* Qwerty */
--- a/keyboard/planck/keymaps/joe/keymap.c
+++ b/keyboard/planck/keymaps/joe/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"
 #include "keymap_colemak.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
--- a/keyboard/planck/keymaps/kyle/keymap.c
+++ b/keyboard/planck/keymaps/kyle/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = { /* Qwerty */
--- a/keyboard/planck/keymaps/leo/keymap.c
+++ b/keyboard/planck/keymaps/leo/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = { /* BASE */
--- a/keyboard/planck/keymaps/lucas/keymap.c
+++ b/keyboard/planck/keymaps/lucas/keymap.c
@ -8,7 +8,7 @@ The "Gaming" layer is mainly customized for CS:GO.
 If you have any question about this keymap feel free to shoot me a message on reddit!
 */

-#include "keymap_common.h"
+#include "keymap.h"
 #include "keymap_extras/keymap_german.h"
 #include "backlight.h"
 #include "debug.h"
--- a/keyboard/planck/keymaps/max/keymap.c
+++ b/keyboard/planck/keymaps/max/keymap.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = { /* Qwerty */
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_brett.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_brett.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = KEYMAP( 
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_dotcom.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_dotcom.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = KEYMAP( 
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_jack.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_jack.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = KEYMAP( /* Jack */
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_joe.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_joe.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = KEYMAP( /* Joe qwerty */
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_matthew.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_matthew.c
@ -20,7 +20,7 @@
 `-----------------------------------------------------------------------------------------------'
 */

-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* 0: dvorak */
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_mitch.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_mitch.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = KEYMAP(
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_nathan.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_nathan.c
@ -1,7 +1,7 @@
 // Author: Nathan Ross Powell <nathanrospowell@gmail.com>
 // https://github.com/nathanrosspowell/tmk_keyboard/blob/planck-jack/keyboard/planck/keymap_nathan.c

-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* 0: main layer
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_paul.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_paul.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = KEYMAP( /* Paul */
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_peasant.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_peasant.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = KEYMAP( /* Native */
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 /*
 * BUILD:
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_sean.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_sean.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = KEYMAP( /* Matrix Dvorak */
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_shane.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_shane.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"
 #include "action_layer.h"
 #include "action.h"
 #include "action_util.h"
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_simon.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_simon.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = KEYMAP( /* Jack */
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_tim.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_tim.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = KEYMAP(
--- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_wilba.c
+++ b/keyboard/planck/old_keymap_files/common_keymaps/keymap_wilba.c
@ -1,4 +1,4 @@
-#include "keymap_common.h"
+#include "keymap.h"

 const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [0] = KEYMAP( /* Wilba */
--- a/keyboard/planck/old_keymap_files/keymap_common.c
+++ b/keyboard/planck/old_keymap_files/keymap_common.c
@ -14,7 +14,7 @@ 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 <http://www.gnu.org/licenses/>.
 */
-#include "keymap_common.h"
+#include "keymap.h"


 /* translates key to keycode */
--- a/keyboard/retro_refit/retro_refit.h
+++ b/keyboard/retro_refit/retro_refit.h
@ -2,7 +2,7 @@
 #define RETRO_REFIT_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include "led.h"
 #include <stddef.h>

--- a/keyboard/satan/satan.h
+++ b/keyboard/satan/satan.h
@ -2,7 +2,7 @@
 #define SATAN_H

 #include "matrix.h"
-#include "keymap_common.h"
+#include "keymap.h"
 #include <stddef.h>