diff options
Diffstat (limited to 'keyboards/dc01')
-rw-r--r-- | keyboards/dc01/arrow/config.h | 6 | ||||
-rw-r--r-- | keyboards/dc01/arrow/matrix.c | 2 | ||||
-rw-r--r-- | keyboards/dc01/left/config.h | 6 | ||||
-rw-r--r-- | keyboards/dc01/left/matrix.c | 8 | ||||
-rw-r--r-- | keyboards/dc01/numpad/config.h | 6 | ||||
-rw-r--r-- | keyboards/dc01/numpad/matrix.c | 2 | ||||
-rw-r--r-- | keyboards/dc01/right/config.h | 6 | ||||
-rw-r--r-- | keyboards/dc01/right/matrix.c | 2 |
8 files changed, 7 insertions, 31 deletions
diff --git a/keyboards/dc01/arrow/config.h b/keyboards/dc01/arrow/config.h index 75c674f63..f734d9b18 100644 --- a/keyboards/dc01/arrow/config.h +++ b/keyboards/dc01/arrow/config.h @@ -52,7 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define BACKLIGHT_BREATHING // #define BACKLIGHT_LEVELS 3 - /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCING_DELAY 5 @@ -104,11 +103,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -/* key combination for magic key command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c index 85591f602..dd5e2ee9c 100644 --- a/keyboards/dc01/arrow/matrix.c +++ b/keyboards/dc01/arrow/matrix.c @@ -218,7 +218,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/dc01/left/config.h b/keyboards/dc01/left/config.h index e3d49404e..9a8ba1b55 100644 --- a/keyboards/dc01/left/config.h +++ b/keyboards/dc01/left/config.h @@ -55,7 +55,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define BACKLIGHT_BREATHING // #define BACKLIGHT_LEVELS 3 - /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCING_DELAY 5 @@ -107,11 +106,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -/* key combination for magic key command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c index 806583580..cbe3b3f3d 100644 --- a/keyboards/dc01/left/matrix.c +++ b/keyboards/dc01/left/matrix.c @@ -158,7 +158,7 @@ void matrix_init(void) { matrix[i] = 0; matrix_debouncing[i] = 0; } - + matrix_init_quantum(); } @@ -209,7 +209,7 @@ uint8_t matrix_scan(void) debouncing = false; } # endif - + if (i2c_transaction(SLAVE_I2C_ADDRESS_RIGHT, 0x3F, 0)){ //error has occured for main right half error_count_right++; if (error_count_right > ERROR_DISCONNECT_COUNT){ //disconnect half @@ -220,7 +220,7 @@ uint8_t matrix_scan(void) }else{ //no error error_count_right = 0; } - + if (i2c_transaction(SLAVE_I2C_ADDRESS_ARROW, 0X3FFF, 8)){ //error has occured for arrow cluster error_count_arrow++; if (error_count_arrow > ERROR_DISCONNECT_COUNT){ //disconnect arrow cluster @@ -258,7 +258,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/dc01/numpad/config.h b/keyboards/dc01/numpad/config.h index 16d75b2a8..982be6645 100644 --- a/keyboards/dc01/numpad/config.h +++ b/keyboards/dc01/numpad/config.h @@ -52,7 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define BACKLIGHT_BREATHING // #define BACKLIGHT_LEVELS 3 - /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCING_DELAY 5 @@ -104,11 +103,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -/* key combination for magic key command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c index 39637241d..5a13f3ff2 100644 --- a/keyboards/dc01/numpad/matrix.c +++ b/keyboards/dc01/numpad/matrix.c @@ -218,7 +218,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline diff --git a/keyboards/dc01/right/config.h b/keyboards/dc01/right/config.h index a1d49cc5c..e7aea97a3 100644 --- a/keyboards/dc01/right/config.h +++ b/keyboards/dc01/right/config.h @@ -52,7 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define BACKLIGHT_BREATHING // #define BACKLIGHT_LEVELS 3 - /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCING_DELAY 5 @@ -104,11 +103,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -/* key combination for magic key command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c index 50fe19b8d..6d981797c 100644 --- a/keyboards/dc01/right/matrix.c +++ b/keyboards/dc01/right/matrix.c @@ -218,7 +218,7 @@ bool matrix_is_modified(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & ((matrix_row_t)1<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline |