summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoroadsleft2018-06-06 09:51:24 -0700
committerDrashna Jaelre2018-06-06 09:51:24 -0700
commitb5ab6a5d01d66f1c2d324be0c73bbedf0bdfa3a1 (patch)
treedba2211a8426bce8dd2ee7a7311d67a90004043b
parent99e849ac89bcd97c9bd5fcb2b368643bf4fb3812 (diff)
Diverge3: Readme Clean-up, Refactor and Configurator support (#3135)
* Readme cleanup * Refactor * Configurator support
-rw-r--r--keyboards/diverge3/diverge3.h36
-rw-r--r--keyboards/diverge3/info.json13
-rw-r--r--keyboards/diverge3/keymaps/default/keymap.c37
-rw-r--r--keyboards/diverge3/readme.md4
4 files changed, 45 insertions, 45 deletions
diff --git a/keyboards/diverge3/diverge3.h b/keyboards/diverge3/diverge3.h
index 37bad2ee7..53364213f 100644
--- a/keyboards/diverge3/diverge3.h
+++ b/keyboards/diverge3/diverge3.h
@@ -28,24 +28,22 @@
// This a shortcut to help you visually see your layout.
// The second converts the arguments into a two-dimensional array
-// Used to create a keymap using only KC_ prefixed keys
#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, LT0, LT1, LT2, RT2, RT1, RT0, R40, R41, R42, R43, R44 \
- ) \
- { \
- { KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06, KC_NO }, \
- { KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16, KC_NO }, \
- { KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26, KC_NO }, \
- { KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_NO }, \
- { KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##LT0, KC_##LT1, KC_##LT2 }, \
- { KC_##R06, KC_##R05, KC_##R04, KC_##R03, KC_##R02, KC_##R01, KC_##R00, KC_NO }, \
- { KC_##R16, KC_##R15, KC_##R14, KC_##R13, KC_##R12, KC_##R11, KC_##R10, KC_NO }, \
- { KC_##R26, KC_##R25, KC_##R24, KC_##R23, KC_##R22, KC_##R21, KC_##R20, KC_NO }, \
- { KC_##R36, KC_##R35, KC_##R34, KC_##R33, KC_##R32, KC_##R31, KC_##R30, KC_NO }, \
- { KC_##R44, KC_##R43, KC_##R42, KC_##R41, KC_##R40, KC_##RT0, KC_##RT1, KC_##RT2 } \
- }
+ L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
+ L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
+ L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
+ L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
+ L40, L41, L42, L43, L44, LT0, LT1, LT2, RT2, RT1, RT0, R40, R41, R42, R43, R44 \
+) { \
+ { L00, L01, L02, L03, L04, L05, L06, KC_NO }, \
+ { L10, L11, L12, L13, L14, L15, L16, KC_NO }, \
+ { L20, L21, L22, L23, L24, L25, L26, KC_NO }, \
+ { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \
+ { L40, L41, L42, L43, L44, LT0, LT1, LT2 }, \
+ { R06, R05, R04, R03, R02, R01, R00, KC_NO }, \
+ { R16, R15, R14, R13, R12, R11, R10, KC_NO }, \
+ { R26, R25, R24, R23, R22, R21, R20, KC_NO }, \
+ { R36, R35, R34, R33, R32, R31, R30, KC_NO }, \
+ { R44, R43, R42, R41, R40, RT0, RT1, RT2 } \
+ }
#endif
diff --git a/keyboards/diverge3/info.json b/keyboards/diverge3/info.json
new file mode 100644
index 000000000..d0240a9ea
--- /dev/null
+++ b/keyboards/diverge3/info.json
@@ -0,0 +1,13 @@
+{
+ "keyboard_name": "Diverge3",
+ "url": "",
+ "maintainer": "qmk",
+ "width": 17,
+ "height": 6.25,
+ "layouts": {
+ "LAYOUT": {
+ "key_count": 72,
+ "layout": [{"x":0, "y":0}, {"x":1, "y":0.75}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0.25}, {"x":6, "y":0.5}, {"x":10, "y":0.5}, {"x":11, "y":0.25}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0.25}, {"x":15, "y":0.75}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1.75}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1.25}, {"x":6, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.25}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1.25}, {"x":15, "y":1.75}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2.75}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2.25}, {"x":6, "y":2.5}, {"x":10, "y":2.5}, {"x":11, "y":2.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2.25}, {"x":15, "y":2.75}, {"x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3.75}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3.25}, {"x":6, "y":3.5}, {"x":10, "y":3.5}, {"x":11, "y":3.25}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3.25}, {"x":15, "y":3.75}, {"x":16, "y":3}, {"x":0, "y":4}, {"x":1, "y":4.75}, {"x":2, "y":4.25}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4.75, "h":1.25}, {"x":6, "y":5, "h":1.25}, {"x":7, "y":5.25}, {"x":9, "y":5.25}, {"x":10, "y":5, "h":1.25}, {"x":11, "y":4.75, "h":1.25}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4.25}, {"x":15, "y":4.75}, {"x":16, "y":4}]
+ }
+ }
+}
diff --git a/keyboards/diverge3/keymaps/default/keymap.c b/keyboards/diverge3/keymaps/default/keymap.c
index 94ff01304..1b704e87e 100644
--- a/keyboards/diverge3/keymaps/default/keymap.c
+++ b/keyboards/diverge3/keymaps/default/keymap.c
@@ -13,9 +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 "diverge3.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
//**************** Definitions needed for quad function to work *********************//
enum {
@@ -98,7 +96,7 @@ enum custom_keycodes {
};
// Make layer undefined do nothing
-#define KC_ KC_TRNS
+#define _______ KC_TRNS
// Macros
#define KC_PMAC PAREN_MACRO
@@ -120,30 +118,21 @@ enum custom_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
- //,----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- ESC, 1 , 2 , 3 , 4 , 5 ,MUTE, MPLY, 6 , 7 , 8 , 9 , 0 ,PSCR,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- GRV, Q , W , E , R , T ,VOLD, VOLU, Y , U , I , O , P ,CAPS,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- TAB, A , S , D , F , G ,PGDN, PGUP, H , J , K , L ,SCLN,BSLS,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- LSFT, Z , X , C , V , B ,WRDLT, WRDRT, N , M ,COMM,DOT ,SLSH,QUOT,
- //|----+----+----+----+----+----+----+----|||----+----+----+----+----+----+----+----|
- LCTL,LGUI, APP,LALT,HOME,SPNT,DEL1,BSHT , ENT ,TAB1,BSHT,END ,DOWN, UP ,LEFT,RIGHT
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MUTE, KC_MPLY, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PSCR,
+ KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_VOLD, KC_VOLU, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_CAPS,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_PGDN, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_BSLS,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_WRDLT, KC_WRDRT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
+ KC_LCTL, KC_LGUI, KC_APP, KC_LALT, KC_HOME, KC_SPNT, KC_DEL1, KC_BSHT, KC_ENT, KC_TAB1, KC_BSHT, KC_END, KC_DOWN, KC_UP, KC_LEFT, KC_RIGHT
),
[_LOWER] = LAYOUT(
- //,----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , F1 , F2 , F3 , F4 , F5 ,F11 , F12, F6 , F7 , F8 , F9 , , ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- TILD,EXLM, AT ,HASH,DLR ,PERC, , ,CIRC,AMPR,ASTR, , , ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , ,LBRC,LPRN,UNDS,LCBR, , ,RCBR, EQL,RPRN,RBRC,COLN, ,
- //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , ,PMAC,MINS,AMAC, , , ,PLUS, , , , ,
- //|----+----+----+----+----+----+----+----|||----+----+----+----+----+----+----+----|
- , , , , , , , , , , , , , , ,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, _______, _______,
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, _______, _______, _______,
+ _______, _______, KC_LBRC, KC_LPRN, KC_UNDS, KC_LCBR, _______, _______, KC_RCBR, KC_EQL, KC_RPRN, KC_RBRC, KC_COLN, _______,
+ _______, _______, _______, KC_PMAC, KC_MINS, KC_AMAC, _______, _______, _______, KC_PLUS, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
+
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/diverge3/readme.md b/keyboards/diverge3/readme.md
index f8ad69a2e..2ecfbca3b 100644
--- a/keyboards/diverge3/readme.md
+++ b/keyboards/diverge3/readme.md
@@ -2,8 +2,8 @@
A split 5x7 keyboard with 3 thumb keys. Made by [Unikeyboard](https://unikeyboard.io).
-Keyboard Maintainer: [IslandMan93](https://github.com/islandman93)
-Hardware Supported: Pro Micro
+Keyboard Maintainer: [IslandMan93](https://github.com/islandman93)
+Hardware Supported: Pro Micro
Hardware Availability: [Diverge 3](https://unikeyboard.io/product/diverge/)
Make example for this keyboard (after setting up your build environment):