summaryrefslogtreecommitdiff
path: root/keyboards/40percentclub
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-20 00:30:40 +0000
committerQMK Bot <hello@qmk.fm>2021-07-20 00:30:40 +0000
commitf9332747e324f4fd131c4251cbc4996c7e9eb0a3 (patch)
tree12b95ad3968d0479e60d6593766bc708ee9b61d5 /keyboards/40percentclub
parentf493f560cc85585b336930ca551a44df10aab90c (diff)
parent7e698c71cd8b9d0cdef6c622cfdd88a13e2a6587 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/40percentclub')
-rw-r--r--keyboards/40percentclub/5x5/info.json2
-rw-r--r--keyboards/40percentclub/6lit/rules.mk2
-rw-r--r--keyboards/40percentclub/sixpack/config.h7
-rw-r--r--keyboards/40percentclub/sixpack/info.json2
-rw-r--r--keyboards/40percentclub/sixpack/keymaps/via/keymap.c4
-rw-r--r--keyboards/40percentclub/sixpack/rules.mk2
6 files changed, 11 insertions, 8 deletions
diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json
index 1c1df8eda9..1e7bac7a69 100644
--- a/keyboards/40percentclub/5x5/info.json
+++ b/keyboards/40percentclub/5x5/info.json
@@ -1,5 +1,5 @@
{
- "keyboard_name": "40percent.club 4x4",
+ "keyboard_name": "40percent.club 5x5",
"url": "",
"maintainer": "qmk",
"height": 4,
diff --git a/keyboards/40percentclub/6lit/rules.mk b/keyboards/40percentclub/6lit/rules.mk
index 8d32d2c3fb..7ff281ecc6 100644
--- a/keyboards/40percentclub/6lit/rules.mk
+++ b/keyboards/40percentclub/6lit/rules.mk
@@ -32,3 +32,5 @@ AUDIO_ENABLE = no # Audio output on port C6
# Enable generic behavior for split boards
SPLIT_KEYBOARD = yes
+
+LAYOUTS = ortho_2x3 ortho_2x6
diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h
index db91ca7b80..2ec676018c 100644
--- a/keyboards/40percentclub/sixpack/config.h
+++ b/keyboards/40percentclub/sixpack/config.h
@@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
-// #define MATRIX_ROW_PINS { B0 } // B0 equivalents the ground pin
-// #define MATRIX_COL_PINS { E6, D7, C6, D4 }
#define DIRECT_PINS { \
{ D4, C6, D7 }, \
{ E6, B4, B5 } \
@@ -56,6 +54,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_LEVELS 6
#define BACKLIGHT_PINS { F4, F5 } // Top Row, Bottom Row
+/* LED Indicators */
+#define LED_PIN_ON_STATE 0
+#define LED_CAPS_LOCK_PIN B0 // RX Led
+#define LED_NUM_LOCK_PIN D5 // TX Led
+
// #define RGB_DI_PIN B1 // PB1 on expansion connector
// #ifdef RGB_DI_PIN
// #define RGBLED_NUM 16
diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json
index 3c78e26fbc..0d85f09257 100644
--- a/keyboards/40percentclub/sixpack/info.json
+++ b/keyboards/40percentclub/sixpack/info.json
@@ -1,5 +1,5 @@
{
- "keyboard_name": "sixpack",
+ "keyboard_name": "Six Pack",
"url": "https://www.40percent.club/2017/05/six-pack-11.html",
"maintainer": "qmk",
"width": 3,
diff --git a/keyboards/40percentclub/sixpack/keymaps/via/keymap.c b/keyboards/40percentclub/sixpack/keymaps/via/keymap.c
index f3268a22ab..e2eaaa1d0a 100644
--- a/keyboards/40percentclub/sixpack/keymaps/via/keymap.c
+++ b/keyboards/40percentclub/sixpack/keymaps/via/keymap.c
@@ -33,9 +33,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS),
[3] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS),
- [4] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS),
- [5] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS),
};
diff --git a/keyboards/40percentclub/sixpack/rules.mk b/keyboards/40percentclub/sixpack/rules.mk
index 9d7d9a2cf0..84e3ea5ea0 100644
--- a/keyboards/40percentclub/sixpack/rules.mk
+++ b/keyboards/40percentclub/sixpack/rules.mk
@@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
+
+LAYOUTS = ortho_2x3