diff options
Diffstat (limited to 'keyboards/ok60')
| -rw-r--r-- | keyboards/ok60/config.h | 5 | ||||
| -rw-r--r-- | keyboards/ok60/ok60.h | 108 |
2 files changed, 54 insertions, 59 deletions
diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h index aafed8a40..faccfcc64 100644 --- a/keyboards/ok60/config.h +++ b/keyboards/ok60/config.h | |||
| @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef CONFIG_H | 18 | #pragma once |
| 19 | #define CONFIG_H | ||
| 20 | 19 | ||
| 21 | #include "config_common.h" | 20 | #include "config_common.h" |
| 22 | 21 | ||
| @@ -71,5 +70,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 71 | #define RGBLIGHT_HUE_STEP 8 | 70 | #define RGBLIGHT_HUE_STEP 8 |
| 72 | #define RGBLIGHT_SAT_STEP 8 | 71 | #define RGBLIGHT_SAT_STEP 8 |
| 73 | #define RGBLIGHT_VAL_STEP 8 | 72 | #define RGBLIGHT_VAL_STEP 8 |
| 74 | |||
| 75 | #endif | ||
diff --git a/keyboards/ok60/ok60.h b/keyboards/ok60/ok60.h index d64f951c4..4e6aeb2c3 100644 --- a/keyboards/ok60/ok60.h +++ b/keyboards/ok60/ok60.h | |||
| @@ -1,77 +1,75 @@ | |||
| 1 | #ifndef OK60_H | 1 | #pragma once |
| 2 | #define OK60_H | ||
| 3 | 2 | ||
| 4 | #include "quantum.h" | 3 | #include "quantum.h" |
| 5 | 4 | ||
| 5 | #define XXX KC_NO | ||
| 6 | |||
| 6 | #define LAYOUT_60_ansi( \ | 7 | #define LAYOUT_60_ansi( \ |
| 7 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ | 8 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \ |
| 8 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ | 9 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ |
| 9 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ | 10 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \ |
| 10 | K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ | 11 | k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \ |
| 11 | K400, K401, K402, K406, K410, K411, K412, K413 \ | 12 | k40, k41, k42, k46, k4A, k4B, k4C, k4D \ |
| 12 | ) { \ | 13 | ) { \ |
| 13 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ | 14 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E }, \ |
| 14 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO }, \ | 15 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ |
| 15 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, KC_NO }, \ | 16 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ |
| 16 | { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ | 17 | { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \ |
| 17 | { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, KC_NO } \ | 18 | { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \ |
| 18 | } | 19 | } |
| 19 | 20 | ||
| 20 | #define LAYOUT_60_ansi_split_bksp_rshift( \ | 21 | #define LAYOUT_60_ansi_split_bksp_rshift( \ |
| 21 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ | 22 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ |
| 22 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ | 23 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ |
| 23 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ | 24 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \ |
| 24 | K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ | 25 | k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, \ |
| 25 | K400, K401, K402, K406, K410, K411, K412, K413 \ | 26 | k40, k41, k42, k46, k4A, k4B, k4C, k4D \ |
| 26 | ) { \ | 27 | ) { \ |
| 27 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ | 28 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ |
| 28 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO }, \ | 29 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ |
| 29 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, KC_NO }, \ | 30 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ |
| 30 | { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ | 31 | { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ |
| 31 | { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, KC_NO } \ | 32 | { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \ |
| 32 | } | 33 | } |
| 33 | 34 | ||
| 34 | #define LAYOUT_60_iso( \ | 35 | #define LAYOUT_60_iso( \ |
| 35 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ | 36 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \ |
| 36 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \ | 37 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ |
| 37 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ | 38 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ |
| 38 | K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ | 39 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \ |
| 39 | K400, K401, K402, K406, K410, K411, K412, K413 \ | 40 | k40, k41, k42, k46, k4A, k4B, k4C, k4D \ |
| 40 | ) { \ | 41 | ) { \ |
| 41 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ | 42 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E }, \ |
| 42 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, KC_NO }, \ | 43 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX }, \ |
| 43 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO }, \ | 44 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ |
| 44 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ | 45 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \ |
| 45 | { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, KC_NO } \ | 46 | { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \ |
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | #define LAYOUT_60_iso_split_rshift( \ | 49 | #define LAYOUT_60_iso_split_rshift( \ |
| 49 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ | 50 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \ |
| 50 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \ | 51 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ |
| 51 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ | 52 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ |
| 52 | K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ | 53 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, \ |
| 53 | K400, K401, K402, K406, K410, K411, K412, K413 \ | 54 | k40, k41, k42, k46, k4A, k4B, k4C, k4D \ |
| 54 | ) { \ | 55 | ) { \ |
| 55 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ | 56 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E }, \ |
| 56 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, KC_NO }, \ | 57 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX }, \ |
| 57 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO }, \ | 58 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX }, \ |
| 58 | { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC314 }, \ | 59 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ |
| 59 | { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, KC_NO } \ | 60 | { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, XXX } \ |
| 60 | } | 61 | } |
| 61 | 62 | ||
| 62 | #define LAYOUT_60_hhkb( \ | 63 | #define LAYOUT_60_hhkb( \ |
| 63 | K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ | 64 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ |
| 64 | K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ | 65 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ |
| 65 | K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ | 66 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \ |
| 66 | K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ | 67 | k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, \ |
| 67 | K401, K402, K406, K411, K412 \ | 68 | k41, k42, k46, k4B, k4C \ |
| 68 | ) { \ | 69 | ) { \ |
| 69 | { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ | 70 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ |
| 70 | { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO }, \ | 71 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX }, \ |
| 71 | { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, KC_NO }, \ | 72 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX }, \ |
| 72 | { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ | 73 | { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ |
| 73 | { KC_NO, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, KC_NO, K411, K412, KC_NO, KC_NO } \ | 74 | { XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, XXX, XXX } \ |
| 74 | } | 75 | } |
| 75 | |||
| 76 | |||
| 77 | #endif | ||
