[WIP] [Help Needed] Daisy 40%: Refactor and Configurator update (#3124)

* Refactor KEYMAP to LAYOUT * Configurator update * info.json update * Refactor daisy.h: White space update
7 years ago · 6b1350d764
parent 68d5e364fc
commit 6b1350d764
3 changed files with 102 additions and 86 deletions
--- a/keyboards/daisy/daisy.h
+++ b/keyboards/daisy/daisy.h
@ -3,17 +3,17 @@

 #include "quantum.h"

-#define KEYMAP( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
-	K30, K31, K32, K34, K35, K37, K38, K39 \
+#define LAYOUT( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
+  K30, K31, K32, K34, K35, K37, K38, K39 \
 ) \
 { \
-	{ K00, K01, K02, K03,   K04, K05, K06,   K07, K08, K09, K0A }, \
-	{ K10, K11, K12, K13,   K14, K15, K16,   K17, K18, K19, K1A }, \
-	{ K20, K21, K22, K23,   K24, K25, K26,   K27, K28, K29, K2A }, \
-	{ K30, K31, K32, KC_NO, K34, K35, KC_NO, K37, K38, K39, K3A }  \
+  { K00, K01, K02, K03,   K04, K05, K06,   K07, K08, K09, K0A }, \
+  { K10, K11, K12, K13,   K14, K15, K16,   K17, K18, K19, K1A }, \
+  { K20, K21, K22, K23,   K24, K25, K26,   K27, K28, K29, K2A }, \
+  { K30, K31, K32, KC_NO, K34, K35, KC_NO, K37, K38, K39, K3A }  \
 }

-#endif
+#endif
--- a/keyboards/daisy/info.json
+++ b/keyboards/daisy/info.json
@ -0,0 +1,18 @@
+{
+  "keyboard_name": "Daisy",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 12,
+  "height": 4,
+  "layouts": {
+    "LAYOUT": {
+      "key_count": 42,
+      "layout": [{"label": "K00", "x": 0, "y": 0}, {"label": "K01", "x": 1, "y": 0}, {"label": "K02", "x": 2, "y": 0}, {"label": "K03", "x": 3, "y": 0}, {"label": "K04", "x": 4, "y": 0}, {"label": "K05", "x": 5, "y": 0}, {"label": "K06", "x": 6, "y": 0}, {"label": "K07", "x": 7, "y": 0}, {"label": "K08", "x": 8, "y": 0}, {"label": "K09", "x": 9, "y": 0}, {"label": "K0A", "x": 10, "y": 0}, {"label": "K3A", "x": 11, "y": 0}, {"label": "K10", "x": 0, "y": 1, "w": 1.25}, {"label": "K11", "x": 1.25, "y": 1}, {"label": "K12", "x": 2.25, "y": 1}, {"label": "K13", "x": 3.25, "y": 1}, {"label": "K14", "x": 4.25, "y": 1}, {"label": "K15", "x": 5.25, "y": 1}, {"label": "K16", "x": 6.25, "y": 1}, {"label": "K17", "x": 7.25, "y": 1}, {"label": "K18", "x": 8.25, "y": 1}, {"label": "K19", "x": 9.25, "y": 1}, {"label": "K1A", "x": 10.25, "y": 1, "w": 1.75}, {"label": "K20", "x": 0, "y": 2, "w": 1.75}, {"label": "K21", "x": 1.75, "y": 2}, {"label": "K22", "x": 2.75, "y": 2}, {"label": "K23", "x": 3.75, "y": 2}, {"label": "K24", "x": 4.75, "y": 2}, {"label": "K25", "x": 5.75, "y": 2}, {"label": "K26", "x": 6.75, "y": 2}, {"label": "K27", "x": 7.75, "y": 2}, {"label": "K28", "x": 8.75, "y": 2}, {"label": "K29", "x": 9.75, "y": 2}, {"label": "K2A", "x": 10.75, "y": 2, "w": 1.25}, {"label": "K30", "x": 0, "y": 3, "w": 1.25}, {"label": "K31", "x": 1.25, "y": 3}, {"label": "K32", "x": 2.25, "y": 3, "w": 1.25}, {"label": "K34", "x": 3.5, "y": 3, "w": 2.25}, {"label": "K35", "x": 5.75, "y": 3, "w": 2.75}, {"label": "K37", "x": 8.5, "y": 3, "w": 1.25}, {"label": "K38", "x": 9.75, "y": 3}, {"label": "K39", "x": 10.75, "y": 3, "w": 1.25}]
+    },
+
+    "LAYOUT_625_space": {
+      "key_count": 40,
+      "layout": [{"label": "K00", "x": 0, "y": 0}, {"label": "K01", "x": 1, "y": 0}, {"label": "K02", "x": 2, "y": 0}, {"label": "K03", "x": 3, "y": 0}, {"label": "K04", "x": 4, "y": 0}, {"label": "K05", "x": 5, "y": 0}, {"label": "K06", "x": 6, "y": 0}, {"label": "K07", "x": 7, "y": 0}, {"label": "K08", "x": 8, "y": 0}, {"label": "K09", "x": 9, "y": 0}, {"label": "K0A", "x": 10, "y": 0}, {"label": "K3A", "x": 11, "y": 0}, {"label": "K10", "x": 0, "y": 1, "w": 1.25}, {"label": "K11", "x": 1.25, "y": 1}, {"label": "K12", "x": 2.25, "y": 1}, {"label": "K13", "x": 3.25, "y": 1}, {"label": "K14", "x": 4.25, "y": 1}, {"label": "K15", "x": 5.25, "y": 1}, {"label": "K16", "x": 6.25, "y": 1}, {"label": "K17", "x": 7.25, "y": 1}, {"label": "K18", "x": 8.25, "y": 1}, {"label": "K19", "x": 9.25, "y": 1}, {"label": "K1A", "x": 10.25, "y": 1, "w": 1.75}, {"label": "K20", "x": 0, "y": 2, "w": 1.75}, {"label": "K21", "x": 1.75, "y": 2}, {"label": "K22", "x": 2.75, "y": 2}, {"label": "K23", "x": 3.75, "y": 2}, {"label": "K24", "x": 4.75, "y": 2}, {"label": "K25", "x": 5.75, "y": 2}, {"label": "K26", "x": 6.75, "y": 2}, {"label": "K27", "x": 7.75, "y": 2}, {"label": "K28", "x": 8.75, "y": 2}, {"label": "K29", "x": 9.75, "y": 2}, {"label": "K2A", "x": 10.75, "y": 2, "w": 1.25}, {"label": "K30", "x": 0, "y": 3, "w": 1.25}, {"label": "K31", "x": 1.25, "y": 3}, {"label": "K32", "x": 2.25, "y": 3}, {"x": 3.25, "y": 3, "w": 6.25}, {"label": "K38", "x": 9.5, "y": 3, "w": 1.25}, {"label": "K39", "x": 10.75, "y": 3, "w": 1.25}]
+    }
+  }
+}
--- a/keyboards/daisy/keymaps/default/keymap.c
+++ b/keyboards/daisy/keymaps/default/keymap.c
@ -1,5 +1,4 @@
-	#include "daisy.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H

 extern keymap_config_t keymap_config;

@ -9,67 +8,66 @@ extern keymap_config_t keymap_config;
 #define _RS 2

 enum layer_keycodes {
-	QWERTY = SAFE_RANGE, LOWER, RAISE
+    QWERTY = SAFE_RANGE, LOWER, RAISE
 };

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-/* Base Layer
- * .-----------------------------------------------------------------------.
- * | ESC | Q   | W   | E   | R   | T   | Y   | U   | I   | O   | P   | \|  |
- * |-----------------------------------------------------------------------|
- * | TAB   | A   | S   | D   | F   | G   | H   | J   | K   | L   | ENTER   |
- * |-----------------------------------------------------------------------|
- * | LSHIFT | Z   | X    | C   | V   | B   | N   | M   | ,<  | .>  | /?    |
- * |-----------------------------------------------------------------------|
- * | LCTRL | LGUI | LALT | SPACE   | BACKSPACE      | LW     | RS  | RALT  |
- * '-----------------------------------------------------------------------'
- */
+  /* Base Layer
+   * .-----------------------------------------------------------------------.
+   * | ESC | Q   | W   | E   | R   | T   | Y   | U   | I   | O   | P   | \|  |
+   * |-----------------------------------------------------------------------|
+   * | TAB   | A   | S   | D   | F   | G   | H   | J   | K   | L   | ENTER   |
+   * |-----------------------------------------------------------------------|
+   * | LSHIFT | Z   | X    | C   | V   | B   | N   | M   | ,<  | .>  | /?    |
+   * |-----------------------------------------------------------------------|
+   * | LCTRL | LGUI | LALT | SPACE   | BACKSPACE      | LW     | RS  | RALT  |
+   * '-----------------------------------------------------------------------'
+   */
+  [_BL] = LAYOUT(
+    GRAVE_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,     KC_U,   KC_I,    KC_O,    KC_P,    KC_BSLS,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,     KC_J,   KC_K,    KC_L,    KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,     KC_M,   KC_COMM, KC_DOT,  KC_SLSH,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_BSPC, LOWER, RAISE, KC_RALT
+  ),

-	[_BL] = KEYMAP(
-  GRAVE_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,     KC_U,   KC_I,    KC_O,    KC_P,    KC_BSLS,
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,     KC_J,   KC_K,    KC_L,    KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,     KC_M,   KC_COMM, KC_DOT,  KC_SLSH,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_BSPC, LOWER, RAISE, KC_RALT ),
- 
+  /* Function Layer
+   * .-----------------------------------------------------------------------.
+   * | GRV | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   | 0   | -_  |
+   * |-----------------------------------------------------------------------|
+   * |       | =+  | UP  |     |     |     | [{  | ]}  | ;:  | '"  |         |
+   * |-----------------------------------------------------------------------|
+   * |        | LEFT| DOWN |RIGHT|     |     |     |     |     |     |       |
+   * |-----------------------------------------------------------------------|
+   * |       |      |      |         | DELETE         |        |     |       |
+   * '-----------------------------------------------------------------------'
+   */
+
+  [_LW] = LAYOUT(
+    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_TRNS, KC_EQL,  KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_DEL,  KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  /* Second Function Layer
+   * .-----------------------------------------------------------------------.
+   * | RST | F1  | F2  | F3  | F4  | F5  | F6  |     | HOME| PGUP|     |     |
+   * |-----------------------------------------------------------------------|
+   * |      | F7  | F8  | F9  | F10 | F11 | F12 |     | END | PGDN|          |
+   * |-----------------------------------------------------------------------|
+   * |       |RGBtog|RGBmod|RGBhud|RGBhui|RGBvad|RGBvai|RGBsad|RGBsai|BL|    |
+   * |-----------------------------------------------------------------------|
+   * |       |      |      |         |                |        |     |       |
+   * '-----------------------------------------------------------------------'
+   */
+  [_RS] = LAYOUT(
+    RESET,   KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_TRNS, KC_HOME, KC_PGUP,  KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_END,  KC_PGDN,  KC_TRNS,
+    KC_TRNS, RGB_TOG, RGB_SMOD, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, BL_STEP,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),

-/* Function Layer
- * .-----------------------------------------------------------------------.
- * | GRV | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   | 0   | -_  |
- * |-----------------------------------------------------------------------|
- * |       | =+  | UP  |     |     |     | [{  | ]}  | ;:  | '"  |         |
- * |-----------------------------------------------------------------------|
- * |        | LEFT| DOWN |RIGHT|     |     |     |     |     |     |       |
- * |-----------------------------------------------------------------------|
- * |       |      |      |         | DELETE         |        |     |       |
- * '-----------------------------------------------------------------------'
- */
- 
-	[_LW] = KEYMAP(
-  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_TRNS, KC_EQL,  KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_TRNS,
-  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_DEL,  KC_TRNS, KC_TRNS, KC_TRNS ),
- 
- 
- /* Second Function Layer
- * .-----------------------------------------------------------------------.
- * | RST | F1  | F2  | F3  | F4  | F5  | F6  |     | HOME| PGUP|     |     |
- * |-----------------------------------------------------------------------|
- * |      | F7  | F8  | F9  | F10 | F11 | F12 |     | END | PGDN|          |
- * |-----------------------------------------------------------------------|
- * |       |RGBtog|RGBmod|RGBhud|RGBhui|RGBvad|RGBvai|RGBsad|RGBsai|BL|    |
- * |-----------------------------------------------------------------------|
- * |       |      |      |         |                |        |     |       |
- * '-----------------------------------------------------------------------'
- */
- 
-	[_RS] = KEYMAP(
-  RESET,   KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_TRNS, KC_HOME, KC_PGUP,  KC_TRNS,  KC_TRNS,
-  KC_TRNS, KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_END,  KC_PGDN,  KC_TRNS,
-  KC_TRNS, RGB_TOG, RGB_SMOD, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, BL_STEP,  KC_TRNS,
-  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
- 
 };

 const uint16_t PROGMEM fn_actions[] = {
@ -77,23 +75,23 @@ const uint16_t PROGMEM fn_actions[] = {
 };

 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		case LOWER:
-		  if(record->event.pressed){
-			   layer_on(_LW);
-		  } else {
-			  layer_off(_LW);
-		  }
-		  return false;
-		  break;
-		  case RAISE:
-		  if(record->event.pressed){
-			   layer_on(_RS);
-		  } else {
-			  layer_off(_RS);
-		  }
-		  return false;
-		  break;
-	}
+  switch (keycode) {
+    case LOWER:
+      if(record->event.pressed){
+        layer_on(_LW);
+      } else {
+        layer_off(_LW);
+      }
+      return false;
+      break;
+    case RAISE:
+      if(record->event.pressed){
+        layer_on(_RS);
+      } else {
+        layer_off(_RS);
+      }
+      return false;
+      break;
+  }
  return true;
-};
+};