]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2b707f3)
Keymap: Wanleg updates (#3794)
authorwanleg <32079073+wanleg@users.noreply.github.com>
Thu, 30 Aug 2018 16:34:14 +0000 (09:34 -0700)
committerDrashna Jaelre <drashna@live.com>
Thu, 30 Aug 2018 16:34:14 +0000 (09:34 -0700)
* various edits and minor additions

* updates

* updates

* updates

* lets_split LEDs off instructions

* lets_split LEDs off instructions

* turn off lets_split LEDs in userspace

* one-hand setup for right side

14 files changed:
keyboards/4x4/rules.mk patch | blob | history
keyboards/5x5/info.json [deleted file] patch | blob | history
keyboards/5x5/rules.mk patch | blob | history
layouts/community/ortho_4x12/wanleg/config.h patch | blob | history
layouts/community/ortho_4x12/wanleg/keymap.c patch | blob | history
layouts/community/ortho_4x12/wanleg/readme.md patch | blob | history
layouts/community/ortho_4x12/wanleg/rules.mk patch | blob | history
layouts/community/ortho_5x10/layout.json [new file with mode: 0644] patch | blob
layouts/community/ortho_5x10/readme.md [new file with mode: 0644] patch | blob
layouts/community/ortho_5x10/wanleg/config.h [new file with mode: 0644] patch | blob
layouts/community/ortho_5x10/wanleg/keymap.c [new file with mode: 0644] patch | blob
layouts/community/ortho_5x10/wanleg/rules.mk [new file with mode: 0644] patch | blob
users/wanleg/wanleg.c patch | blob | history
users/wanleg/wanleg.h patch | blob | history

diff --git a/keyboards/4x4/rules.mk b/keyboards/4x4/rules.mk
index 3ea4476dbea2de3075f6ebfa85b840f70a630fe8..b8b4bccc42474e12680ed46b3c8000ab8ec8d671 100644 (file)
--- a/keyboards/4x4/rules.mk
+++ b/keyboards/4x4/rules.mk
@@ -71,4 +71,4 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no            # Enable support for HD44780 based LCDs (+400)
 
-LAYOUT = ortho_4x4  ortho_4x8  ortho_4x12  ortho_4x16 
+LAYOUTS = ortho_4x4  ortho_4x8  ortho_4x12  ortho_4x16 
diff --git a/keyboards/5x5/info.json b/keyboards/5x5/info.json
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/keyboards/5x5/rules.mk b/keyboards/5x5/rules.mk
index b04e4a527cd314eb569b74bb6f4f8e9d41ebd136..24e0e020fdad1ccf19f1ca84c421aa8ac451aff2 100644 (file)
--- a/keyboards/5x5/rules.mk
+++ b/keyboards/5x5/rules.mk
@@ -71,4 +71,4 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no            # Enable support for HD44780 based LCDs (+400)
 
-LAYOUT = ortho_5x5  ortho_5x10  ortho_5x15
+LAYOUTS = ortho_5x5  ortho_5x10  ortho_5x15
diff --git a/layouts/community/ortho_4x12/wanleg/config.h b/layouts/community/ortho_4x12/wanleg/config.h
index 2c6fcc75f0818b1c7153639460d5c5675335b2f5..0d2cc591e3f89408dfcddd55d78bf33f30058d9c 100644 (file)
--- a/layouts/community/ortho_4x12/wanleg/config.h
+++ b/layouts/community/ortho_4x12/wanleg/config.h
@@ -12,4 +12,11 @@
 #define EE_HANDS
 #endif
 
+// set top left key as bootloader mode escape key on 4x4 48key layout
+#if defined(KEYBOARD_4x4)
+#define QMK_LED B0
+#define QMK_ESC_OUTPUT C6 // usually COL
+#define QMK_ESC_INPUT B2 // usually ROW
+#endif
+
 #endif
diff --git a/layouts/community/ortho_4x12/wanleg/keymap.c b/layouts/community/ortho_4x12/wanleg/keymap.c
index 8773001d0abcef4bd06f37d0ee360fa3b3146430..f6030469c03f2316fd67a519c835db72ed013c07 100644 (file)
--- a/layouts/community/ortho_4x12/wanleg/keymap.c
+++ b/layouts/community/ortho_4x12/wanleg/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______________Qwerty_Row__0_______________,
   _______________Qwerty_Row__1_______________,
   _______________Qwerty_Row__2_______________,
-  KC_LCTL, KC_LGUI, KC_LALT, GHERKIN, SUBTER, SH_T(KC_SPC), KC_SPC, SUPRA, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL
+  KC_LCTL, KC_LGUI, KC_LALT, GHERKIN, SUBTER, SH_T(KC_SPC), SH_T(KC_SPC), SUPRA, KC_RGUI, KC_RALT, GHERKIN, KC_RCTL
 ),
 #else
 [_GK] = LAYOUT_ortho_4x12_wrapper(
diff --git a/layouts/community/ortho_4x12/wanleg/readme.md b/layouts/community/ortho_4x12/wanleg/readme.md
index 2f89d1de6164bf078c2aadff3f7df5772c9a0ce1..1cd41d116da9a3a8ee12758fb824273141ee93af 100644 (file)
--- a/layouts/community/ortho_4x12/wanleg/readme.md
+++ b/layouts/community/ortho_4x12/wanleg/readme.md
@@ -16,9 +16,39 @@ Change `comPORT` to whatever port is used by the Arduino (e.g. `com11` in Window
 ## Using QMK DFU  
 Once QMK DFU is burned to your ProMicro, you can then flash subsequent hex files with
 `make lets_split/rev2:<keymap>:dfu dfu=qmk`  
-The `dfu=qmk` conditional will set `BOOTLOADER = qmk-dfu` instead of `BOOTLOADER = caterina` 
+The `dfu=qmk` conditional will set `BOOTLOADER = qmk-dfu` instead of `BOOTLOADER = caterina`  
 
----
-# JJ40 
-## To Do
-- [ ] Mousekeys not working with Userspace for some reason (jj40 only)
\ No newline at end of file
+# Let's Split LEDs  
+In `qmk_firmware/keyboards/lets_split/rev2/rev2.c`, replace contents with 
+```  
+#include "lets_split.h"
+
+
+#ifdef SSD1306OLED
+void led_set_kb(uint8_t usb_led) {
+    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+    led_set_user(usb_led);
+}
+#endif
+
+void matrix_init_kb(void) {
+
+    // // green led on
+    // DDRD |= (1<<5);
+    // PORTD &= ~(1<<5);
+
+    // // orange led on
+    // DDRB |= (1<<0);
+    // PORTB &= ~(1<<0);
+       
+       //turn off LEDs on ProMicro
+   DDRD &= ~(1<<5);
+   PORTD &= ~(1<<5);
+
+   DDRB &= ~(1<<0);
+   PORTB &= ~(1<<0);
+
+       matrix_init_user();
+};
+```  
+to turn off LEDs
diff --git a/layouts/community/ortho_4x12/wanleg/rules.mk b/layouts/community/ortho_4x12/wanleg/rules.mk
index 79929689cb8fbe3a1ad85c4c0450443417f28141..69f377a0159f420ada164c98c8290fe912fbb6c4 100644 (file)
--- a/layouts/community/ortho_4x12/wanleg/rules.mk
+++ b/layouts/community/ortho_4x12/wanleg/rules.mk
@@ -3,4 +3,8 @@ SWAP_HANDS_ENABLE = yes
 
 ifeq ($(strip $(KEYBOARD)), jj40)
        SWAP_HANDS_ENABLE = no
+endif
+
+ifeq ($(strip $(KEYBOARD)), 4x4)
+       SWAP_HANDS_ENABLE = no
 endif
\ No newline at end of file
diff --git a/layouts/community/ortho_5x10/layout.json b/layouts/community/ortho_5x10/layout.json
new file mode 100644 (file)
index 0000000..00d8479
--- /dev/null
+++ b/layouts/community/ortho_5x10/layout.json
@@ -0,0 +1,5 @@
+["","","","","","","","","",""],
+["","","","","","","","","",""],
+["","","","","","","","","",""],
+["","","","","","","","","",""],
+["","","","","","","","","",""]
diff --git a/layouts/community/ortho_5x10/readme.md b/layouts/community/ortho_5x10/readme.md
new file mode 100644 (file)
index 0000000..5c94f8e
--- /dev/null
+++ b/layouts/community/ortho_5x10/readme.md
@@ -0,0 +1,3 @@
+# ortho_5x10
+
+    LAYOUT_ortho_5x10
diff --git a/layouts/community/ortho_5x10/wanleg/config.h b/layouts/community/ortho_5x10/wanleg/config.h
new file mode 100644 (file)
index 0000000..2d24f27
--- /dev/null
+++ b/layouts/community/ortho_5x10/wanleg/config.h
@@ -0,0 +1,9 @@
+#pragma once
+
+//QMK DFU settings (ProMicro boards)
+// set top left key as bootloader mode escape key on Gherkin
+#if defined(KEYBOARD_5x5)
+#define QMK_LED B0
+#define QMK_ESC_OUTPUT D7 // usually COL
+#define QMK_ESC_INPUT B2 // usually ROW
+#endif
diff --git a/layouts/community/ortho_5x10/wanleg/keymap.c b/layouts/community/ortho_5x10/wanleg/keymap.c
new file mode 100644 (file)
index 0000000..5d06e53
--- /dev/null
+++ b/layouts/community/ortho_5x10/wanleg/keymap.c
@@ -0,0 +1,38 @@
+#include QMK_KEYBOARD_H
+#include "wanleg.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[gGK] = LAYOUT_ortho_5x10_wrapper(
+  _______________Gherkin_NUM_0_______________,
+  _______________Gherkin_Row_0_______________,
+  _______________Gherkin_Row_1_______________,
+  _______________Gherkin_Row_2_______________,
+  _______, _______, _______, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, _______, _______
+),
+
+
+[gNUM] = LAYOUT_ortho_5x10_wrapper(
+  _______________Gherkin_NUM_0_______________,
+  _______________Gherkin_NUM_0_______________,
+  _______________Gherkin_NUM_1_______________,
+  _______________Gherkin_NUM_2_______________,
+  _______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______
+),
+
+[gDIR] = LAYOUT_ortho_5x10_wrapper(
+  _______________Gherkin_NUM_0_______________,
+  _______________Gherkin_DIR_0_______________,
+  _______________Gherkin_DIR_1_______________,
+  _______________Gherkin_DIR_2_______________,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[gETC] = LAYOUT_ortho_5x10_wrapper(
+  _______________Gherkin_NUM_0_______________,
+  _______________Gherkin_ETC_0_______________,
+  _______________Gherkin_ETC_1_______________,
+  _______________Gherkin_ETC_2_______________,
+  _______, _______, _______, _______, _______, LALT(LCTL(KC_DEL)), _______, _______, _______, _______
+),
+
+};
diff --git a/layouts/community/ortho_5x10/wanleg/rules.mk b/layouts/community/ortho_5x10/wanleg/rules.mk
new file mode 100644 (file)
index 0000000..90841d2
--- /dev/null
+++ b/layouts/community/ortho_5x10/wanleg/rules.mk
@@ -0,0 +1,3 @@
+SWAP_HANDS_ENABLE = no
+
+BOOTLOADER = qmk-dfu
\ No newline at end of file
diff --git a/users/wanleg/wanleg.c b/users/wanleg/wanleg.c
index 0175ae2010a584548f9cf1441d1c1b30de1384ea..931546c153059b4e8ad042eb9a403651552249bc 100644 (file)
--- a/users/wanleg/wanleg.c
+++ b/users/wanleg/wanleg.c
@@ -156,3 +156,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
+
+/// Turn off LEDs on ProMicros of Let's Split ///
+// LEDs only on by default on Let's Split
+// Add reconfigurable functions here, for keymap customization
+// This allows for a global, userspace functions, and continued
+// customization of the keymap.  Use _keymap instead of _user
+// functions in the keymaps
+__attribute__ ((weak))
+void matrix_init_keymap(void) {}
+
+// Call user matrix init, then call the keymap's init function
+void matrix_init_user(void) {
+#if defined(KEYBOARD_lets_split_rev2)
+  DDRD &= ~(1<<5);
+  PORTD &= ~(1<<5);
+
+  DDRB &= ~(1<<0);
+  PORTB &= ~(1<<0);
+#endif
+  matrix_init_keymap();
+}
\ No newline at end of file
diff --git a/users/wanleg/wanleg.h b/users/wanleg/wanleg.h
index da14dcdf5a46e7fde14813dc3a95026c24f781bd..5cec82e6055a69ffbd8a1de7e5175f588d91a9e4 100644 (file)
--- a/users/wanleg/wanleg.h
+++ b/users/wanleg/wanleg.h
@@ -119,6 +119,7 @@ enum {
 #define KEYMAP_wrapper(...)                  LAYOUT(__VA_ARGS__)
 #define LAYOUT_wrapper(...)                  LAYOUT(__VA_ARGS__)
 #define LAYOUT_ortho_3x10_wrapper(...)       LAYOUT_ortho_3x10(__VA_ARGS__)
+#define LAYOUT_ortho_5x10_wrapper(...)       LAYOUT_ortho_5x10(__VA_ARGS__)
 #define LAYOUT_ortho_4x12_wrapper(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
 #define LAYOUT_ortho_5x15_wrapper(...)       LAYOUT_ortho_5x15(__VA_ARGS__)
 
@@ -204,7 +205,7 @@ enum {
 #define _______________GherkinLike_1_______________     KC_TAB, _______________Gherkin_Row_1_______________, KC_QUOT
 #define _______________GherkinLike_2_______________     TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM, KC_V),LT(ETC, KC_B),KC_N, LT(DIR, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT)
 #define _______________GherkinLike_3_______________     KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL
-#define _______________GherkinLike_3_OneHand_______     KC_LCTL, KC_LGUI, KC_LALT, ONEHAND, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL
+#define _______________GherkinLike_3_OneHand_______     KC_LCTL, KC_LGUI, KC_LALT, ONEHAND, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, ONEHAND, KC_RCTL
 
 /* Qwerty
  * .-------------------------------------------------------------------------------------.
@@ -257,7 +258,7 @@ enum {
 
 /* Gherkin Numbers
  * .-----------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    |  DEL   |
+ * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | BACKSP |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * |        | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -267,7 +268,7 @@ enum {
  * |        |        |        |        |        |        | ENTER  | SHIFT  | RGUI   |        |        |        |
  * '-----------------------------------------------------------------------------------------------------------'
  */
-#define _______________NUMBERS_Row_0_______________   _______, _______________Gherkin_NUM_0_______________,  KC_DEL
+#define _______________NUMBERS_Row_0_______________   _______, _______________Gherkin_NUM_0_______________,  KC_BSPC
 #define _______________NUMBERS_Row_1_______________   _______, _______________Gherkin_NUM_1_______________,  _______
 #define _______________NUMBERS_Row_2_______________   _______, _______________Gherkin_NUM_2_______________,  _______
 #define _______________NUMBERS_Row_3_______________   _______, _______, _______, _______, _______, _______, KC_ENT, KC_RSFT, KC_RGUI, _______, _______, _______
Unnamed repository; edit this file 'description' to name the repository.