Cleaned and corrected keymap code

diff --git a/keyboards/tada68/keymaps/maartenwut/config.h b/keyboards/tada68/keymaps/maartenwut/config.h
new file mode 100755 (executable)
index 0000000..5dcdad1
--- /dev/null
+++ b/keyboards/tada68/keymaps/maartenwut/config.h
@@ -0,0 +1,9 @@
+#include "../../config.h"
+
+/* WS2812B RGB Underglow LED */
+#define RGB_DI_PIN F5   // See readme.md for wiring your led's
+#define RGBLIGHT_ANIMATIONS       
+#define RGBLED_NUM 16         // Number of LEDs. Change this to match your use case.
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
\ No newline at end of file

diff --git a/keyboards/tada68/keymaps/maartenwut/keymap.c b/keyboards/tada68/keymaps/maartenwut/keymap.c
index b2edb6adcfa2e0805ab842c2fe848cc308f3e88f..b95305a57fdf03c01a12bac687a100aeefcb13a0 100755 (executable)
--- a/keyboards/tada68/keymaps/maartenwut/keymap.c
+++ b/keyboards/tada68/keymaps/maartenwut/keymap.c
@@ -1,4 +1,4 @@
-#include "maarten68.h"
+#include "tada68.h"
 #include "action_layer.h"
 #include "timer.h"
 #include "bootloader.h"
@@ -54,9 +54,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = KEYMAP_ANSI(
   KC_ESC,      T1,             T2,             T3,             T4,             T5,             T6,             T7,             T8,             T9,             T10,            T11,            T12,            KC_BSPC,        KC_MPLY, \
   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_PGUP, \
+  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_PGUP, \
   LSHIFT,      END_HOME,       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_PGDN, \
-  KC_LCTL,     KC_LGUI,        KC_LALT,        SPACE,          KC_RALT,        KC_RCTRL,       MO(_FL),        KC_LEFT,        KC_DOWN,        KC_RGHT),
+  KC_LCTL,     KC_LGUI,        KC_LALT,                                                        SPACE,                                                                                  KC_RALT,        KC_RCTRL,       MO(_FL),        KC_LEFT,        KC_DOWN,        KC_RGHT),
 
   /* Keymap _FL: Function Layer
    * ,----------------------------------------------------------------.
@@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |----------------------------------------------------------------|
    * |      |MsL|MsD|MsR|   |   |   |   |   |   |   |   |        |Hme |
    * |----------------------------------------------------------------|
-   * |    |Gam|   |   |   |   |   |   |   |   |   |   |      |MwU|End |
+   * |    |   |   |   |   |   |   |   |   |   |   |   |      |MwU|End |
    * |----------------------------------------------------------------|
    * |    |    |    |                       |   |   |    |MwL|MwD|MwR |  
    * `----------------------------------------------------------------'
@@ -74,29 +74,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_FL] = KEYMAP_ANSI(
   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,         TRNS,           KC_PSCR, \
   TRNS,        KC_BTN1,        KC_MS_U,        KC_BTN2,        TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TO(_LO), \
-  TRNS,        KC_MS_L,        KC_MS_D,        KC_MS_R,        TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           KC_HOME, \
+  TRNS,        KC_MS_L,        KC_MS_D,        KC_MS_R,        TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,                                   TRNS,           KC_HOME, \
   TRNS,        TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           KC_VOLD,        KC_VOLU,        KC_MUTE,        TRNS,           KC_WH_U,        KC_END, \
-  TRNS,        TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           KC_WH_L,        KC_WH_D,        KC_WH_R),
+  TRNS,        TRNS,           TRNS,                                                           TRNS,                                                                                   TRNS,           TRNS,           TRNS,           KC_WH_L,        KC_WH_D,        KC_WH_R),
 
-  /* Keymap _AR: Arrow keys layer
+  /* Keymap _UL: Unlock layer
    * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |P/P |
-   * |----------------------------------------------------------------| 
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
+   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
    * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
+   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |_MA |
    * |----------------------------------------------------------------|
-   * |Shft|End|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
+   * |      |   |   |   |   |   |Lft|Dwn| Up|Rgt|   |   |        |    |
    * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt|Ctrl| FN|Lef|Dow|Rig |
+   * |    |   |   |   |   |   |   |   |   |   |   |   |      |   |    |
+   * |----------------------------------------------------------------|
+   * |    |    |    |                       |   |   |    |   |   |    |
    * `----------------------------------------------------------------'
    */
 [_AR] = KEYMAP_ANSI(
-  TRNS,                TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,   TRNS, \
-  LENNY,       TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,   TRNS, \
-  DWNHRT,      TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           KC_LEFT,        KC_DOWN,        KC_UP,          KC_RGHT,        TRNS,           TRNS,           TRNS,           TRNS, \
-  SHRUG,       RGB_TOG,    RGB_MOD,    RGB_HUI,        RGB_HUD,        RGB_SAI,        RGB_SAD,        RGB_VAI,        RGB_VAD,        TRNS,           TRNS,           TRNS,           TRNS,            TRNS,  TRNS, \
-  TRNS,        TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS),
+  TRNS,                TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS, \
+  LENNY,       TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS, \
+  DWNHRT,      TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           KC_LEFT,        KC_DOWN,        KC_UP,          KC_RGHT,        TRNS,           TRNS,                                   TRNS,           TRNS, \
+  SHRUG,       RGB_TOG,    RGB_MOD,    RGB_HUI,        RGB_HUD,        RGB_SAI,        RGB_SAD,        RGB_VAI,        RGB_VAD,        TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS, \
+  TRNS,        TRNS,           TRNS,                                                           TRNS,                                                                                   TRNS,           TRNS,           TRNS,           TRNS,           TRNS,           TRNS),
 
   /* Keymap _UL: Unlock layer
    * ,----------------------------------------------------------------.
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |----------------------------------------------------------------|
    * |      |   |   |   |   |   |   |   |   |   |   |   |        |    |
    * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |    |
+   * |    |   |   |   |   |   |   |   |   |   |   |   |      |   |    |
    * |----------------------------------------------------------------|
    * |    |    |    |                       |   |   |    |   |   |    |
    * `----------------------------------------------------------------'
@@ -114,9 +114,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_UL] = KEYMAP_ANSI(
   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,          TO(_MA), \
-  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_NO,          KC_NO, \
-  KC_NO,       KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          TRNS,           KC_NO,          KC_NO,          KC_NO),
+  KC_NO,       KC_NO,          KC_NO,                                                          KC_NO,                                                                                  KC_NO,          KC_NO,          TRNS,           KC_NO,          KC_NO,          KC_NO),
 
   /* Keymap _LO: Lock layer
    * ,----------------------------------------------------------------.
@@ -126,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |----------------------------------------------------------------|
    * |      |   |   |   |   |   |   |   |   |   |   |   |        |    |
    * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |    |
+   * |    |   |   |   |   |   |   |   |   |   |   |   |      |   |    |
    * |----------------------------------------------------------------|
    * |    |    |    |                      |   |   | _UL |   |   |    |
    * `----------------------------------------------------------------'
@@ -134,9 +134,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_LO] = KEYMAP_ANSI(
   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_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,          MO(_UL),        KC_NO,          KC_NO,          KC_NO),
+  KC_NO,       KC_NO,          KC_NO,                                                          KC_NO,                                                                                  KC_NO,          KC_NO,          MO(_UL),        KC_NO,          KC_NO,          KC_NO),
 };
 
 void tap(uint16_t keycode){

diff --git a/keyboards/tada68/keymaps/maartenwut/tada68.h b/keyboards/tada68/keymaps/maartenwut/tada68.h
new file mode 100755 (executable)
index 0000000..e7e17a9
--- /dev/null
+++ b/keyboards/tada68/keymaps/maartenwut/tada68.h
@@ -0,0 +1,43 @@
+#ifndef TADA68_H
+#define TADA68_H
+
+#include "quantum.h"
+
+// readability
+#define XXX KC_NO
+
+/* TADA68 ANSI layout
+   * ,----------------------------------------------------------------.
+   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
+   * |----------------------------------------------------------------|
+   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
+   * |----------------------------------------------------------------|
+   * | 20    | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d    | 2e |
+   * |----------------------------------------------------------------|
+   * | 30 | 31| 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
+   * |----------------------------------------------------------------|
+   * | 40 | 41 | 42 |        45             | 49| 4a|  4b| 4c| 4d| 4e |
+   * `----------------------------------------------------------------'
+ */
+// The first section contains all of the arguments
+// The second converts the arguments into a two-dimensional array
+
+#define KEYMAP_ANSI( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+       k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+       k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
+       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+       k40, k41, k42,           k45,                k49, k4a, k4b, k4c, k4d, k4e  \
+) \
+{ \
+       {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+       {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
+       {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
+       {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
+       {k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e}  \
+}
+
+void matrix_init_user(void);
+void matrix_scan_user(void);
+
+#endif