From 86ebc8de022d8dc549ce878658a7c8ebc363a231 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Mon, 2 Oct 2017 15:58:21 -0700 Subject: [PATCH] Revert f3094e15383ccbad0785c3edc7e161ef82f3899f Chatter detection wasn't actually detecting chatter. We may reinistate similar code in the future --- src/Kaleidoscope-Model01-TestMode.cpp | 85 +-------------------------- src/Kaleidoscope-Model01-TestMode.h | 7 --- 2 files changed, 2 insertions(+), 90 deletions(-) diff --git a/src/Kaleidoscope-Model01-TestMode.cpp b/src/Kaleidoscope-Model01-TestMode.cpp index ab3e613f..0c76a594 100644 --- a/src/Kaleidoscope-Model01-TestMode.cpp +++ b/src/Kaleidoscope-Model01-TestMode.cpp @@ -4,16 +4,12 @@ #include #include -#define SERIAL_DEBUG 0 cRGB red; cRGB blue; cRGB green; -cRGB white; -TestMode_::chatter_test_state_t TestMode_::chatter_test_state_[ROWS][COLS]; - TestMode_::TestMode_(void) { } @@ -22,9 +18,6 @@ void TestMode_::begin(void) { red.r = 201; blue.b = 201; green.g = 201; - white.r = 160; - white.g = 160; - white.b = 160; Kaleidoscope.useLoopHook(this->loopHook); } @@ -77,7 +70,6 @@ void TestMode_::test_leds(void) { void TestMode_::testMatrix() { LEDControl.set_all_leds_to(200, 0, 0); - memset(chatter_test_state_, 0, sizeof(chatter_test_state_)); while (1) { KeyboardHardware.readMatrix(); if (KeyboardHardware.leftHandState.all == TEST_MODE_KEY_COMBO) { @@ -90,92 +82,19 @@ void TestMode_::testMatrix() { uint8_t keyState = (bitRead(KeyboardHardware.previousLeftHandState.all, keynum) << 0) | (bitRead(KeyboardHardware.leftHandState.all, keynum) << 1); - if (keyState == 2 && chatter_test_state_[row][col].scan_count < 8) { - bitSet(chatter_test_state_[row][col].scan_map, - chatter_test_state_[row][col].scan_count); - } - - if (chatter_test_state_[row][col].scan_map != 0 && - chatter_test_state_[row][col].scan_count < 8) { - chatter_test_state_[row][col].scan_count++; - } - - if (keyState == 3) { - // Serial.print(" Key: "); - // Serial.print(keynum); - // Serial.print(" value "); - // Serial.println(keyState); KeyboardHardware.setCrgbAt(row, 7 - col, green); } else if (keyState == 1) { - bitSet(chatter_test_state_[row][col].scan_map, - chatter_test_state_[row][col].scan_count); - - uint8_t toggle_count = 0; - for (uint8_t i = 1; i < 8; i++) { - if (bitRead(chatter_test_state_[row][col].scan_map, i - 1) == 1 && - bitRead(chatter_test_state_[row][col].scan_map, i) == 0) - toggle_count++; - } -#if SERIAL_DEBUG - Serial.print(" key: "); - Serial.print(keynum); - Serial.print(" toggle_count: "); - Serial.print(toggle_count); - Serial.print(" state#: "); - Serial.print(chatter_test_state_[row][col].scan_count); - Serial.print(" state: "); - Serial.println(chatter_test_state_[row][col].scan_map, BIN); -#endif - if (toggle_count > 2) - KeyboardHardware.setCrgbAt(row, 7 - col, white); - else - KeyboardHardware.setCrgbAt(row, 7 - col, blue); + KeyboardHardware.setCrgbAt(row, 7 - col, blue); } keyState = (bitRead(KeyboardHardware.previousRightHandState.all, keynum) << 0) | (bitRead(KeyboardHardware.rightHandState.all, keynum) << 1); - if (keyState == 2 && chatter_test_state_[row][col + 8].scan_count < 8) { - bitSet(chatter_test_state_[row][col + 8].scan_map, - chatter_test_state_[row][col + 8].scan_count); - } - - if (chatter_test_state_[row][col + 8].scan_map != 0 && - chatter_test_state_[row][col + 8].scan_count < 8) { - chatter_test_state_[row][col + 8].scan_count++; - } - if (keyState == 3) { - // Serial.print(" Key: "); - // Serial.print(keynum); - // Serial.print(" value "); - // Serial.println(keyState); KeyboardHardware.setCrgbAt(row, 15 - col, green); } else if (keyState == 1) { - bitSet(chatter_test_state_[row][col + 8].scan_map, - chatter_test_state_[row][col + 8].scan_count); - - uint8_t toggle_count = 0; - for (uint8_t i = 1; i < 8; i++) { - if (bitRead(chatter_test_state_[row][col + 8].scan_map, i - 1) == 1 && - bitRead(chatter_test_state_[row][col + 8].scan_map, i) == 0) - toggle_count++; - } -#if SERIAL_DEBUG - Serial.print(" key: "); - Serial.print(keynum); - Serial.print(" toggle_count: "); - Serial.print(toggle_count); - Serial.print(" state#: "); - Serial.print(chatter_test_state_[row][col + 8].scan_count); - Serial.print(" state: "); - Serial.println(chatter_test_state_[row][col + 8].scan_map, BIN); -#endif - if (toggle_count > 2) - KeyboardHardware.setCrgbAt(row, 15 - col, white); - else - KeyboardHardware.setCrgbAt(row, 15 - col, blue); + KeyboardHardware.setCrgbAt(row, 15 - col, blue); } } } diff --git a/src/Kaleidoscope-Model01-TestMode.h b/src/Kaleidoscope-Model01-TestMode.h index d7cbc82f..ea15d1d0 100644 --- a/src/Kaleidoscope-Model01-TestMode.h +++ b/src/Kaleidoscope-Model01-TestMode.h @@ -11,11 +11,6 @@ class TestMode_ : public KaleidoscopePlugin { void begin(); private: - typedef struct { - uint8_t scan_map; - uint8_t scan_count; - } chatter_test_state_t; - static void run_tests(); static void test_leds(); static void testMatrix(); @@ -23,8 +18,6 @@ class TestMode_ : public KaleidoscopePlugin { static void waitForKeypress(); static void loopHook(bool postClear); static void set_leds(uint8_t r, uint8_t g, uint8_t b); - - static chatter_test_state_t chatter_test_state_[ROWS][COLS]; }; extern TestMode_ TestMode;