adds timeout to avr i2c

[qmk_firmware.git] / keyboards / 1up60rgb / 1up60rgb.h

diff --git a/keyboards/1up60rgb/1up60rgb.h b/keyboards/1up60rgb/1up60rgb.h
index 564a82caa6db1ede92aed3bcc6bf9900a06d0fbe..6905fd22050879e4a1740689fa9ca25a8c28b870 100644 (file)
--- a/keyboards/1up60rgb/1up60rgb.h
+++ b/keyboards/1up60rgb/1up60rgb.h
@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-#define KEYMAP( \
+#define LAYOUT_all( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
@@ -19,13 +19,13 @@
 
 
 /* ANSI variant. No extra keys for ISO */
-#define LAYOUT_60_ansi ( \
+#define LAYOUT_60_ansi( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013, \
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
        K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K313, \
        K400, K401,       K403,             K406,                   K410, K411,       K413, K414  \
-) KEYMAP( \
+) LAYOUT_all( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K013,\
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, K214, \
@@ -34,13 +34,13 @@
 )
 
 /* ISO variant. Remove useless ANSI keys */
-#define LAYOUT_60_iso ( \
+#define LAYOUT_60_iso( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013, \
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
        K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K313, \
        K400, K401,       K403,             K406,                   K410, K411,       K413, K414  \
-) KEYMAP( \
+) LAYOUT_all( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K013,\
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K214, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
@@ -49,13 +49,13 @@
 )
 
 /* HHKB Variant */
-#define LAYOUT_60_ansi_split_bs_rshift ( \
+#define LAYOUT_60_ansi_split_bs_rshift( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
        K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
        K400, K401,       K403,             K406,                   K410, K411,       K413, K414  \
-) KEYMAP( \
+) LAYOUT_all( \
        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,\
        K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
        K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, K214, \
@@ -63,4 +63,19 @@
        K400, K401,       K403,             K406,                   K410, K411,       K413, K414  \
 )
 
+/* HHKB Variant */
+#define LAYOUT_60_hhkb( \
+       K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+       K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+       K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
+       K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
+                   K401, K403,             K406,                   K411, K413                    \
+) LAYOUT_all( \
+       K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+       K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+       K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, K214, \
+       K300, KC_NO,K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
+       KC_NO,K401,       K403,             K406,                   KC_NO,K411,       K413, KC_NO \
+)
+
 #endif