Chatter detection wasn't actually detecting chatter.

We may reinistate similar code in the future
pull/365/head
Jesse Vincent 7 years ago
parent da79e1a91b
commit 86ebc8de02

@ -4,16 +4,12 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#define SERIAL_DEBUG 0
cRGB red; cRGB red;
cRGB blue; cRGB blue;
cRGB green; cRGB green;
cRGB white;
TestMode_::chatter_test_state_t TestMode_::chatter_test_state_[ROWS][COLS];
TestMode_::TestMode_(void) { TestMode_::TestMode_(void) {
} }
@ -22,9 +18,6 @@ void TestMode_::begin(void) {
red.r = 201; red.r = 201;
blue.b = 201; blue.b = 201;
green.g = 201; green.g = 201;
white.r = 160;
white.g = 160;
white.b = 160;
Kaleidoscope.useLoopHook(this->loopHook); Kaleidoscope.useLoopHook(this->loopHook);
} }
@ -77,7 +70,6 @@ void TestMode_::test_leds(void) {
void TestMode_::testMatrix() { void TestMode_::testMatrix() {
LEDControl.set_all_leds_to(200, 0, 0); LEDControl.set_all_leds_to(200, 0, 0);
memset(chatter_test_state_, 0, sizeof(chatter_test_state_));
while (1) { while (1) {
KeyboardHardware.readMatrix(); KeyboardHardware.readMatrix();
if (KeyboardHardware.leftHandState.all == TEST_MODE_KEY_COMBO) { if (KeyboardHardware.leftHandState.all == TEST_MODE_KEY_COMBO) {
@ -90,91 +82,18 @@ void TestMode_::testMatrix() {
uint8_t keyState = (bitRead(KeyboardHardware.previousLeftHandState.all, keynum) << 0) | uint8_t keyState = (bitRead(KeyboardHardware.previousLeftHandState.all, keynum) << 0) |
(bitRead(KeyboardHardware.leftHandState.all, keynum) << 1); (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) { if (keyState == 3) {
// Serial.print(" Key: ");
// Serial.print(keynum);
// Serial.print(" value ");
// Serial.println(keyState);
KeyboardHardware.setCrgbAt(row, 7 - col, green); KeyboardHardware.setCrgbAt(row, 7 - col, green);
} else if (keyState == 1) { } 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) | keyState = (bitRead(KeyboardHardware.previousRightHandState.all, keynum) << 0) |
(bitRead(KeyboardHardware.rightHandState.all, keynum) << 1); (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) { if (keyState == 3) {
// Serial.print(" Key: ");
// Serial.print(keynum);
// Serial.print(" value ");
// Serial.println(keyState);
KeyboardHardware.setCrgbAt(row, 15 - col, green); KeyboardHardware.setCrgbAt(row, 15 - col, green);
} else if (keyState == 1) { } 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);
} }
} }

@ -11,11 +11,6 @@ class TestMode_ : public KaleidoscopePlugin {
void begin(); void begin();
private: private:
typedef struct {
uint8_t scan_map;
uint8_t scan_count;
} chatter_test_state_t;
static void run_tests(); static void run_tests();
static void test_leds(); static void test_leds();
static void testMatrix(); static void testMatrix();
@ -23,8 +18,6 @@ class TestMode_ : public KaleidoscopePlugin {
static void waitForKeypress(); static void waitForKeypress();
static void loopHook(bool postClear); static void loopHook(bool postClear);
static void set_leds(uint8_t r, uint8_t g, uint8_t b); 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; extern TestMode_ TestMode;

Loading…
Cancel
Save