From d785d7f1f1c3a8498bacf3ceba81035bb329c767 Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Sat, 17 Sep 2022 20:21:35 -0400
Subject: [PATCH 1/6] fix: add layout to info.json, chmod 644 all files
---
keyboards/tau4/common/glcdfont.c | 0
keyboards/tau4/config.h | 0
keyboards/tau4/info.json | 57 ++++++++++++++++++++++++++++++++
keyboards/tau4/rules.mk | 0
keyboards/tau4/tau4.c | 0
keyboards/tau4/tau4.h | 0
6 files changed, 57 insertions(+)
mode change 100755 => 100644 keyboards/tau4/common/glcdfont.c
mode change 100755 => 100644 keyboards/tau4/config.h
mode change 100755 => 100644 keyboards/tau4/rules.mk
mode change 100755 => 100644 keyboards/tau4/tau4.c
mode change 100755 => 100644 keyboards/tau4/tau4.h
diff --git a/keyboards/tau4/common/glcdfont.c b/keyboards/tau4/common/glcdfont.c
old mode 100755
new mode 100644
diff --git a/keyboards/tau4/config.h b/keyboards/tau4/config.h
old mode 100755
new mode 100644
diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json
index 9ec48383c710..e6a8697546b9 100644
--- a/keyboards/tau4/info.json
+++ b/keyboards/tau4/info.json
@@ -7,5 +7,62 @@
"vid": "0xFEED",
"pid": "0x6060",
"device_version": "0.0.1"
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+
+ {"x":0, "y":1},
+ {"x":1, "y":1},
+ {"x":2, "y":1},
+ {"x":3, "y":1},
+ {"x":4, "y":1},
+ {"x":5, "y":1},
+ {"x":6, "y":1},
+ {"x":7, "y":1},
+ {"x":8, "y":1},
+ {"x":9, "y":1},
+ {"x":10, "y":1},
+ {"x":11, "y":1},
+
+ {"x":0, "y":2},
+ {"x":1, "y":2},
+ {"x":2, "y":2},
+ {"x":3, "y":2},
+ {"x":4, "y":2},
+ {"x":5, "y":2},
+ {"x":6, "y":2},
+ {"x":7, "y":2},
+ {"x":8, "y":2},
+ {"x":9, "y":2},
+ {"x":10, "y":2},
+ {"x":11, "y":2},
+
+ {"x":0, "y":3},
+ {"x":1, "y":3},
+ {"x":2, "y":3},
+ {"x":3, "y":3},
+ {"x":4, "y":3},
+ {"x":5, "y":3},
+ {"x":6, "y":3},
+ {"x":7, "y":3},
+ {"x":8, "y":3},
+ {"x":9, "y":3},
+ {"x":10, "y":3},
+ {"x":11, "y":3}
+ ]
+ }
}
}
diff --git a/keyboards/tau4/rules.mk b/keyboards/tau4/rules.mk
old mode 100755
new mode 100644
diff --git a/keyboards/tau4/tau4.c b/keyboards/tau4/tau4.c
old mode 100755
new mode 100644
diff --git a/keyboards/tau4/tau4.h b/keyboards/tau4/tau4.h
old mode 100755
new mode 100644
From c639757f45da7705dd5e7d28d453b41f65590938 Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Sat, 17 Sep 2022 20:27:06 -0400
Subject: [PATCH 2/6] refactor: move matrix to data-driven configuration
---
keyboards/tau4/config.h | 8 ----
keyboards/tau4/info.json | 100 ++++++++++++++++++++-------------------
keyboards/tau4/tau4.h | 12 -----
3 files changed, 52 insertions(+), 68 deletions(-)
diff --git a/keyboards/tau4/config.h b/keyboards/tau4/config.h
index a829fda5be71..cb445fefe642 100644
--- a/keyboards/tau4/config.h
+++ b/keyboards/tau4/config.h
@@ -19,14 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F1, F0, B0, B1 }
-
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json
index e6a8697546b9..412e32eb1c8b 100644
--- a/keyboards/tau4/info.json
+++ b/keyboards/tau4/info.json
@@ -8,60 +8,64 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "rows": [ "F4", "F5", "F6", "F7" ],
+ "cols": [ "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0", "B0", "B1" ]
+ },
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
+ {"label": "Mute", "matrix": [0, 0], "x":0, "y":0},
+ {"label": "Q", "matrix": [0, 1], "x":1, "y":0},
+ {"label": "W", "matrix": [0, 2], "x":2, "y":0},
+ {"label": "E", "matrix": [0, 3], "x":3, "y":0},
+ {"label": "R", "matrix": [0, 4], "x":4, "y":0},
+ {"label": "T", "matrix": [0, 5], "x":5, "y":0},
+ {"label": "Y", "matrix": [0, 6], "x":6, "y":0},
+ {"label": "U", "matrix": [0, 7], "x":7, "y":0},
+ {"label": "I", "matrix": [0, 8], "x":8, "y":0},
+ {"label": "O", "matrix": [0, 9], "x":9, "y":0},
+ {"label": "P", "matrix": [0, 10], "x":10, "y":0},
+ {"label": "Backspace", "matrix": [0, 11], "x":11, "y":0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
+ {"label": "Esc", "matrix": [1, 0], "x":0, "y":1},
+ {"label": "A", "matrix": [1, 1], "x":1, "y":1},
+ {"label": "S", "matrix": [1, 2], "x":2, "y":1},
+ {"label": "D", "matrix": [1, 3], "x":3, "y":1},
+ {"label": "F", "matrix": [1, 4], "x":4, "y":1},
+ {"label": "G", "matrix": [1, 5], "x":5, "y":1},
+ {"label": "H", "matrix": [1, 6], "x":6, "y":1},
+ {"label": "J", "matrix": [1, 7], "x":7, "y":1},
+ {"label": "K", "matrix": [1, 8], "x":8, "y":1},
+ {"label": "L", "matrix": [1, 9], "x":9, "y":1},
+ {"label": ";:", "matrix": [1, 10], "x":10, "y":1},
+ {"label": "'\"", "matrix": [1, 11], "x":11, "y":1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
+ {"label": "Shift", "matrix": [2, 0], "x":0, "y":2},
+ {"label": "Z", "matrix": [2, 1], "x":1, "y":2},
+ {"label": "X", "matrix": [2, 2], "x":2, "y":2},
+ {"label": "C", "matrix": [2, 3], "x":3, "y":2},
+ {"label": "V", "matrix": [2, 4], "x":4, "y":2},
+ {"label": "B", "matrix": [2, 5], "x":5, "y":2},
+ {"label": "N", "matrix": [2, 6], "x":6, "y":2},
+ {"label": "M", "matrix": [2, 7], "x":7, "y":2},
+ {"label": ",<", "matrix": [2, 8], "x":8, "y":2},
+ {"label": ".>", "matrix": [2, 9], "x":9, "y":2},
+ {"label": "/?", "matrix": [2, 10], "x":10, "y":2},
+ {"label": "Enter", "matrix": [2, 11], "x":11, "y":2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3}
+ {"label": "Backspace", "matrix": [3, 0], "x":0, "y":3},
+ {"label": "Ctrl", "matrix": [3, 1], "x":1, "y":3},
+ {"label": "GUI", "matrix": [3, 2], "x":2, "y":3},
+ {"label": "Alt", "matrix": [3, 3], "x":3, "y":3},
+ {"label": "Lower", "matrix": [3, 4], "x":4, "y":3},
+ {"label": "Space", "matrix": [3, 5], "x":5, "y":3},
+ {"label": "Space", "matrix": [3, 6], "x":6, "y":3},
+ {"label": "Raise", "matrix": [3, 7], "x":7, "y":3},
+ {"label": "Left", "matrix": [3, 8], "x":8, "y":3},
+ {"label": "Down", "matrix": [3, 9], "x":9, "y":3},
+ {"label": "Up", "matrix": [3, 10], "x":10, "y":3},
+ {"label": "Right", "matrix": [3, 11], "x":11, "y":3}
]
}
}
diff --git a/keyboards/tau4/tau4.h b/keyboards/tau4/tau4.h
index d9ff502116c5..61e3b6f8ab80 100644
--- a/keyboards/tau4/tau4.h
+++ b/keyboards/tau4/tau4.h
@@ -18,15 +18,3 @@ along with this program. If not, see .
#pragma once
#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 } \
-}
From fd7bca3ffef0a9580b128d894e326067ae41b5cd Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Sat, 17 Sep 2022 20:36:10 -0400
Subject: [PATCH 3/6] refactor: modernize feature implementation
- oled/encoder callbacks at keyboard level to allow user overrides
- encoder mapping on default keymap
- bootmagic on
---
keyboards/tau4/keymaps/default/keymap.c | 57 ++++++-------------------
keyboards/tau4/keymaps/default/rules.mk | 1 +
keyboards/tau4/rules.mk | 2 +-
keyboards/tau4/tau4.c | 43 +++++++++++++++++++
4 files changed, 57 insertions(+), 46 deletions(-)
create mode 100644 keyboards/tau4/keymaps/default/rules.mk
diff --git a/keyboards/tau4/keymaps/default/keymap.c b/keyboards/tau4/keymaps/default/keymap.c
index 37fb6b666bf3..9421a6cce5b6 100755
--- a/keyboards/tau4/keymaps/default/keymap.c
+++ b/keyboards/tau4/keymaps/default/keymap.c
@@ -85,8 +85,10 @@ void keyboard_post_init_user(void) {
rgblight_layers = my_rgb_layers;
// Uncomment for debug mode
- /* debug_enable=true;
- debug_matrix=true; */
+ //debug_enable=true;
+ //debug_matrix=true;
+ //debug_keyboard=true;
+ //debug_mouse=true;
}
layer_state_t layer_state_set_user(layer_state_t state) {
@@ -101,47 +103,12 @@ layer_state_t layer_state_set_user(layer_state_t state) {
return state;
}
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (index == 0) { /* First encoder */
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- }
- return true;
-}
-
-
-#ifdef OLED_ENABLE
-
-static void render_status(void) {
- oled_write_P(PSTR("Tau.4 v1.0\n\n"), false);
- oled_write_P(PSTR("Layer:\n"), false);
-
- switch (get_highest_layer(layer_state)) {
- case _QWERTY:
- oled_write_P(PSTR("Default "), false);
- break;
- case _NUMPAD:
- oled_write_P(PSTR("Numpad "), false);
- break;
- case _LOWER:
- oled_write_P(PSTR("Lower "), false);
- break;
- case _RAISE:
- oled_write_P(PSTR("Raise "), false);
- break;
- case _ADJUST:
- oled_write_P(PSTR("Adjust "), false);
- break;
- default:
- oled_write_P(PSTR("Undefined"), false);
- }
-}
-
-bool oled_task_user(void) {
- render_status();
- return false;
-}
+#ifdef ENCODER_MAP_ENABLE
+ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_NUMPAD] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+ [_LOWER] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+ [_RAISE] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+ [_ADJUST] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+ };
#endif
diff --git a/keyboards/tau4/keymaps/default/rules.mk b/keyboards/tau4/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/tau4/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/tau4/rules.mk b/keyboards/tau4/rules.mk
index 0ddf255b13f9..2e9b765d06e7 100644
--- a/keyboards/tau4/rules.mk
+++ b/keyboards/tau4/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
diff --git a/keyboards/tau4/tau4.c b/keyboards/tau4/tau4.c
index 3002566cea07..671ec23d05ff 100644
--- a/keyboards/tau4/tau4.c
+++ b/keyboards/tau4/tau4.c
@@ -16,3 +16,46 @@ along with this program. If not, see .
*/
#include "tau4.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ if (!encoder_update_user(index, clockwise)) { return false; }
+ if (index == 0) { /* First encoder */
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ }
+ return true;
+}
+#endif
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+ if (!oled_task_user()) { return false; }
+ oled_write_P(PSTR("Tau.4 v1.0\n\n"), false);
+ oled_write_P(PSTR("Layer:\n"), false);
+
+ switch (get_highest_layer(layer_state)) {
+ case 0:
+ oled_write_P(PSTR("Default "), false);
+ break;
+ case 1:
+ oled_write_P(PSTR("Numpad "), false);
+ break;
+ case 2:
+ oled_write_P(PSTR("Lower "), false);
+ break;
+ case 3:
+ oled_write_P(PSTR("Raise "), false);
+ break;
+ case 4:
+ oled_write_P(PSTR("Adjust "), false);
+ break;
+ default:
+ oled_write_P(PSTR("Undefined"), false);
+ }
+ return true;
+}
+#endif
From 52c9585b87821404e3848f542f7231e5b9164a1e Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Sat, 17 Sep 2022 21:04:45 -0400
Subject: [PATCH 4/6] refactor: RGBLIGHT config
---
keyboards/tau4/config.h | 13 ++-----------
keyboards/tau4/info.json | 30 ++++++++++++++++++++++++++++++
keyboards/tau4/rules.mk | 1 -
3 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/keyboards/tau4/config.h b/keyboards/tau4/config.h
index cb445fefe642..0d2fa61cbdc9 100644
--- a/keyboards/tau4/config.h
+++ b/keyboards/tau4/config.h
@@ -25,17 +25,6 @@ along with this program. If not, see .
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_LAYERS
-#define RGBLED_NUM 10
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 128
-#endif
-
#define ENCODERS_PAD_A { B3 }
#define ENCODERS_PAD_B { B7 }
#define ENCODER_RESOLUTION 1
@@ -48,6 +37,8 @@ along with this program. If not, see .
#define EXTERNAL_EEPROM_ADDRESS_SIZE 1
#define EXTERNAL_EEPROM_WRITE_TIME 5 */
+#define RGBLIGHT_LAYERS_RETAIN_VAL
+
#define OLED_DISPLAY_ADDRESS 0x3C
#define OLED_BRIGHTNESS 255
#define OLED_IC OLED_IC_SSD1306
diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json
index 412e32eb1c8b..aef4b1bae5fd 100644
--- a/keyboards/tau4/info.json
+++ b/keyboards/tau4/info.json
@@ -12,6 +12,36 @@
"rows": [ "F4", "F5", "F6", "F7" ],
"cols": [ "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0", "B0", "B1" ]
},
+ "features": {
+ "rgblight": true
+ },
+ "rgblight": {
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ },
+ "brightness_steps": 8,
+ "hue_steps": 8,
+ "layers": {
+ "blink": false,
+ "enabled": true,
+ "max": 5,
+ "override_rgb": false
+ },
+ "led_count": 10,
+ "max_brightness": 128,
+ "pin": "B2",
+ "saturation_steps": 16,
+ "sleep": true
+ },
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
diff --git a/keyboards/tau4/rules.mk b/keyboards/tau4/rules.mk
index 2e9b765d06e7..f05d758a867a 100644
--- a/keyboards/tau4/rules.mk
+++ b/keyboards/tau4/rules.mk
@@ -14,7 +14,6 @@ CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Rotary Encoder support
OLED_ENABLE = yes
From 721f7af7a295c35e91bb4ca002d0545adb026cd0 Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Sat, 24 Sep 2022 01:15:21 -0400
Subject: [PATCH 5/6] refactor: move most info to data-driven config
---
keyboards/tau4/config.h | 13 -------------
keyboards/tau4/info.json | 20 +++++++++++++++++++-
keyboards/tau4/rules.mk | 19 +------------------
keyboards/tau4/tau4.c | 2 +-
keyboards/tau4/tau4.h | 20 --------------------
5 files changed, 21 insertions(+), 53 deletions(-)
delete mode 100644 keyboards/tau4/tau4.h
diff --git a/keyboards/tau4/config.h b/keyboards/tau4/config.h
index 0d2fa61cbdc9..ccc0217bd5ba 100644
--- a/keyboards/tau4/config.h
+++ b/keyboards/tau4/config.h
@@ -19,16 +19,6 @@ along with this program. If not, see .
#include "config_common.h"
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-#define ENCODERS_PAD_A { B3 }
-#define ENCODERS_PAD_B { B7 }
-#define ENCODER_RESOLUTION 1
-
// Buggy, currently disabled
/* #define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10100000
#define EXTERNAL_EEPROM_I2C_ADDRESS(loc) (EXTERNAL_EEPROM_I2C_BASE_ADDRESS | ((((loc) >> 8) & 0x07) << 1))
@@ -39,9 +29,6 @@ along with this program. If not, see .
#define RGBLIGHT_LAYERS_RETAIN_VAL
-#define OLED_DISPLAY_ADDRESS 0x3C
-#define OLED_BRIGHTNESS 255
-#define OLED_IC OLED_IC_SSD1306
#define OLED_DISPLAY_WIDTH 128
#define OLED_DISPLAY_HEIGHT 32
#define OLED_FONT_H "keyboards/tau4/common/glcdfont.c"
diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json
index aef4b1bae5fd..dca138720391 100644
--- a/keyboards/tau4/info.json
+++ b/keyboards/tau4/info.json
@@ -1,20 +1,38 @@
{
"keyboard_name": "tau4",
"manufacturer": "taukeyboards",
- "url": "",
+ "url": "https://gaskell.tech/tau/four.html",
"maintainer": "qmk",
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "bootloader": "atmel-dfu",
+ "build": {
+ "lto": true
+ },
"matrix_pins": {
"rows": [ "F4", "F5", "F6", "F7" ],
"cols": [ "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F1", "F0", "B0", "B1" ]
},
+ "processor": "atmega32u4",
"features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
"rgblight": true
},
+ "community_layouts": [ "ortho_4x12" ],
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ { "pin_a": "B3", "pin_b": "B7", "resolution": 1 }
+ ]
+ },
"rgblight": {
"animations": {
"alternating": true,
diff --git a/keyboards/tau4/rules.mk b/keyboards/tau4/rules.mk
index f05d758a867a..f27ee2a28eef 100644
--- a/keyboards/tau4/rules.mk
+++ b/keyboards/tau4/rules.mk
@@ -1,24 +1,7 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes # Rotary Encoder support
-OLED_ENABLE = yes
+
OLED_DRIVER = SSD1306 # OLED display support
# EEPROM_DRIVER ?= i2c # Driver for external EEPROM chip
# This is currently not working due to QMK not officially supporting the chip used on the Tau4, I am working on a fix.
-
-LAYOUTS = ortho_4x12
diff --git a/keyboards/tau4/tau4.c b/keyboards/tau4/tau4.c
index 671ec23d05ff..aa508aae2c5a 100644
--- a/keyboards/tau4/tau4.c
+++ b/keyboards/tau4/tau4.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#include "tau4.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/tau4/tau4.h b/keyboards/tau4/tau4.h
deleted file mode 100644
index 61e3b6f8ab80..000000000000
--- a/keyboards/tau4/tau4.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2020 Oliver Gaskell
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-#include "quantum.h"
From 9c45ebb251656905ecb2564ec70cf013d63a4d49 Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Wed, 28 Sep 2022 22:50:16 -0400
Subject: [PATCH 6/6] refactor: update readme per current template
---
keyboards/tau4/readme.md | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/keyboards/tau4/readme.md b/keyboards/tau4/readme.md
index beea3f07a9db..6c8b5c7bced4 100644
--- a/keyboards/tau4/readme.md
+++ b/keyboards/tau4/readme.md
@@ -6,11 +6,21 @@ A 40% ortholinear keyboard, developed by Oliver Gaskell. More info on [gaskell.t
* Keyboard Maintainer: [Oliver Gaskell](https://github.com/ogaskell)
* Hardware Supported: Tau4 PCB rev1.0, Tau4 PCB rev1.1
-* Hardware Availability: Group Buy - Opens 05 Feb 2021 [More Details](https://gaskell.tech/tau/four.html)
-
+* Hardware Availability: Group Buy took place between 05 Feb 2021 to 05 Mar 2021. [More Details](https://gaskell.tech/tau/four.html)
Make example for this keyboard (after setting up your build environment):
make tau4:default
+Flashing example for this keyboard:
+
+ make tau4:default:flash
+
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. (If you built with an encoder in the top left, the "key" will be that encoder.) This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Keycode in layout**: By default, `QK_BOOT` is assigned to the top right key on the `ADJUST` (fifth) layer.