Merge branch 'master' into feature/ws2812_matrix

5 files changed, 82 insertions, 98 deletions

diff --git a/changelog.md b/changelog.md
index 44f1c5d559..1277c2f5cd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,6 @@
-04-12-2019 - Add AltGr/RALT support to Send String #4046  
-04-12-2019 - Port DIRECT_PINS from split_common/matrix.c to matrix.c (qmk#5091)  
-04-16-2019 - Add support for WS2812 based RGB Matrix  
+04-12-2019 - Add AltGr/RALT support to Send String (qmk#4046)
+04-12-2019 - Port DIRECT_PINS from split_common/matrix.c to matrix.c (qmk#5091)
+04-12-2019 - Enhancement for Eager debouncing (and Ergodox EZ host sleep fix) (qmk#5621)
+04-16-2019 - Fix logic for Combo feature (qmk#5610)
+04-16-2019 - Fix info.json for Ergodox EZ
+04-16-2019 - Add support for WS2812 based RGB Matrix
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index 7470ab9068..6f7a941574 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -2,8 +2,8 @@
     "keyboard_name": "ErgoDox EZ",
     "url": "ergodox-ez.com",
     "maintainer": "erez",
-    "width": 19.5,
-    "height": 9.375,
+    "width": 17,
+    "height": 8,
 
     "layouts": {
         "LAYOUT_ergodox": {
diff --git a/quantum/debounce/eager_pk.c b/quantum/debounce/eager_pk.c
index b8ad09cee3..aa0f63a9d4 100644
--- a/quantum/debounce/eager_pk.c
+++ b/quantum/debounce/eager_pk.c
@@ -24,23 +24,21 @@ No further inputs are accepted until DEBOUNCE milliseconds have occurred.
 #include <stdlib.h>
 
 #ifndef DEBOUNCE
-  #define DEBOUNCE 5
+#  define DEBOUNCE 5
 #endif
 
-
 #if (MATRIX_COLS <= 8)
-#    define ROW_SHIFTER ((uint8_t)1)
+#  define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
-#    define ROW_SHIFTER ((uint16_t)1)
+#  define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
-#    define ROW_SHIFTER  ((uint32_t)1)
+#  define ROW_SHIFTER ((uint32_t)1)
 #endif
 
-
-
 #define debounce_counter_t uint8_t
 
 static debounce_counter_t *debounce_counters;
+static bool                counters_need_update;
 
 #define DEBOUNCE_ELAPSED 251
 #define MAX_DEBOUNCE (DEBOUNCE_ELAPSED - 1)
@@ -48,39 +46,39 @@ static debounce_counter_t *debounce_counters;
 void update_debounce_counters(uint8_t num_rows, uint8_t current_time);
 void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, uint8_t current_time);
 
-//we use num_rows rather than MATRIX_ROWS to support split keyboards
-void debounce_init(uint8_t num_rows)
-{
-  debounce_counters = (debounce_counter_t*)malloc(num_rows*MATRIX_COLS * sizeof(debounce_counter_t));
-  int i = 0;
-  for (uint8_t r = 0; r < num_rows; r++)
-  {
-    for (uint8_t c = 0; c < MATRIX_COLS; c++)
-    {
+// we use num_rows rather than MATRIX_ROWS to support split keyboards
+void debounce_init(uint8_t num_rows) {
+  debounce_counters = (debounce_counter_t *)malloc(num_rows * MATRIX_COLS * sizeof(debounce_counter_t));
+  int i             = 0;
+  for (uint8_t r = 0; r < num_rows; r++) {
+    for (uint8_t c = 0; c < MATRIX_COLS; c++) {
       debounce_counters[i++] = DEBOUNCE_ELAPSED;
     }
   }
 }
 
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed)
-{
+void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
   uint8_t current_time = timer_read() % MAX_DEBOUNCE;
-  update_debounce_counters(num_rows, current_time);
-  transfer_matrix_values(raw, cooked, num_rows, current_time);
+  if (counters_need_update) {
+    update_debounce_counters(num_rows, current_time);
+  }
+
+  if (changed) {
+    transfer_matrix_values(raw, cooked, num_rows, current_time);
+  }
 }
 
-//If the current time is > debounce counter, set the counter to enable input.
-void update_debounce_counters(uint8_t num_rows, uint8_t current_time)
-{
+// If the current time is > debounce counter, set the counter to enable input.
+void update_debounce_counters(uint8_t num_rows, uint8_t current_time) {
+  counters_need_update                 = false;
   debounce_counter_t *debounce_pointer = debounce_counters;
-  for (uint8_t row = 0; row < num_rows; row++)
-  {
-    for (uint8_t col = 0; col < MATRIX_COLS; col++)
-    {
-      if (*debounce_pointer != DEBOUNCE_ELAPSED)
-      {
+  for (uint8_t row = 0; row < num_rows; row++) {
+    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+      if (*debounce_pointer != DEBOUNCE_ELAPSED) {
         if (TIMER_DIFF(current_time, *debounce_pointer, MAX_DEBOUNCE) >= DEBOUNCE) {
           *debounce_pointer = DEBOUNCE_ELAPSED;
+        } else {
+          counters_need_update = true;
         }
       }
       debounce_pointer++;
@@ -89,33 +87,22 @@ void update_debounce_counters(uint8_t num_rows, uint8_t current_time)
 }
 
 // upload from raw_matrix to final matrix;
-void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, uint8_t current_time)
-{
+void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, uint8_t current_time) {
   debounce_counter_t *debounce_pointer = debounce_counters;
-  for (uint8_t row = 0; row < num_rows; row++)
-  {
-    matrix_row_t existing_row = cooked[row]; 
-    matrix_row_t raw_row = raw[row];
-
-    for (uint8_t col = 0; col < MATRIX_COLS; col++)
-    {
+  for (uint8_t row = 0; row < num_rows; row++) {
+    matrix_row_t delta        = raw[row] ^ cooked[row];
+    matrix_row_t existing_row = cooked[row];
+    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
       matrix_row_t col_mask = (ROW_SHIFTER << col);
-      bool final_value = raw_row & col_mask;
-      bool existing_value = existing_row & col_mask;
-      if (*debounce_pointer == DEBOUNCE_ELAPSED &&
-          (existing_value != final_value))
-      {
-        *debounce_pointer = current_time;
-        existing_row ^= col_mask; //flip the bit.
+      if ((delta & col_mask) && *debounce_pointer == DEBOUNCE_ELAPSED) {
+        *debounce_pointer    = current_time;
+        counters_need_update = true;
+        existing_row ^= col_mask;  // flip the bit.
       }
       debounce_pointer++;
     }
     cooked[row] = existing_row;
-  }  
-}
-
-bool debounce_active(void)
-{
-  return true;
+  }
 }
 
+bool debounce_active(void) { return true; }
diff --git a/quantum/debounce/eager_pr.c b/quantum/debounce/eager_pr.c
index 9eb9480a79..5b460f6630 100644
--- a/quantum/debounce/eager_pr.c
+++ b/quantum/debounce/eager_pr.c
@@ -24,13 +24,13 @@ No further inputs are accepted until DEBOUNCE milliseconds have occurred.
 #include <stdlib.h>
 
 #ifndef DEBOUNCE
-  #define DEBOUNCE 5
+#  define DEBOUNCE 5
 #endif
 
-
 #define debounce_counter_t uint8_t
 
 static debounce_counter_t *debounce_counters;
+static bool                counters_need_update;
 
 #define DEBOUNCE_ELAPSED 251
 #define MAX_DEBOUNCE (DEBOUNCE_ELAPSED - 1)
@@ -38,33 +38,35 @@ static debounce_counter_t *debounce_counters;
 void update_debounce_counters(uint8_t num_rows, uint8_t current_time);
 void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, uint8_t current_time);
 
-//we use num_rows rather than MATRIX_ROWS to support split keyboards
-void debounce_init(uint8_t num_rows)
-{
-  debounce_counters = (debounce_counter_t*)malloc(num_rows*sizeof(debounce_counter_t));  
-  for (uint8_t r = 0; r < num_rows; r++)
-  {    
+// we use num_rows rather than MATRIX_ROWS to support split keyboards
+void debounce_init(uint8_t num_rows) {
+  debounce_counters = (debounce_counter_t *)malloc(num_rows * sizeof(debounce_counter_t));
+  for (uint8_t r = 0; r < num_rows; r++) {
     debounce_counters[r] = DEBOUNCE_ELAPSED;
   }
 }
 
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed)
-{
+void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
   uint8_t current_time = timer_read() % MAX_DEBOUNCE;
-  update_debounce_counters(num_rows, current_time);
-  transfer_matrix_values(raw, cooked, num_rows, current_time);
+  if (counters_need_update) {
+    update_debounce_counters(num_rows, current_time);
+  }
+
+  if (changed) {
+    transfer_matrix_values(raw, cooked, num_rows, current_time);
+  }
 }
 
-//If the current time is > debounce counter, set the counter to enable input.
-void update_debounce_counters(uint8_t num_rows, uint8_t current_time)
-{
+// If the current time is > debounce counter, set the counter to enable input.
+void update_debounce_counters(uint8_t num_rows, uint8_t current_time) {
+  counters_need_update                 = false;
   debounce_counter_t *debounce_pointer = debounce_counters;
-  for (uint8_t row = 0; row < num_rows; row++)
-  {    
-    if (*debounce_pointer != DEBOUNCE_ELAPSED)
-    {
+  for (uint8_t row = 0; row < num_rows; row++) {
+    if (*debounce_pointer != DEBOUNCE_ELAPSED) {
       if (TIMER_DIFF(current_time, *debounce_pointer, MAX_DEBOUNCE) >= DEBOUNCE) {
         *debounce_pointer = DEBOUNCE_ELAPSED;
+      } else {
+        counters_need_update = true;
       }
     }
     debounce_pointer++;
@@ -72,29 +74,21 @@ void update_debounce_counters(uint8_t num_rows, uint8_t current_time)
 }
 
 // upload from raw_matrix to final matrix;
-void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, uint8_t current_time)
-{
+void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, uint8_t current_time) {
   debounce_counter_t *debounce_pointer = debounce_counters;
-  for (uint8_t row = 0; row < num_rows; row++)
-  {
-    matrix_row_t existing_row = cooked[row]; 
-    matrix_row_t raw_row = raw[row];
-    
-    //determine new value basd on debounce pointer + raw value
-    if (*debounce_pointer == DEBOUNCE_ELAPSED &&
-      (existing_row != raw_row))
-    {
-      *debounce_pointer = current_time;
-      existing_row = raw_row; 
+  for (uint8_t row = 0; row < num_rows; row++) {
+    matrix_row_t existing_row = cooked[row];
+    matrix_row_t raw_row      = raw[row];
+
+    // determine new value basd on debounce pointer + raw value
+    if (*debounce_pointer == DEBOUNCE_ELAPSED && (existing_row != raw_row)) {
+      *debounce_pointer    = current_time;
+      cooked[row]          = raw_row;
+      counters_need_update = true;
     }
-    cooked[row] = existing_row;
-    
-    debounce_pointer++;
-  }  
-}
 
-bool debounce_active(void)
-{
-  return true;
+    debounce_pointer++;
+  }
 }
 
+bool debounce_active(void) { return true; }
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index a157ed48be..2c6c9d0d5f 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -126,13 +126,13 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode,
 bool process_combo(uint16_t keycode, keyrecord_t *record) {
   bool is_combo_key = false;
   drop_buffer = false;
-  bool no_combo_keys_pressed = false;
+  bool no_combo_keys_pressed = true;
 
   for (current_combo_index = 0; current_combo_index < COMBO_COUNT;
        ++current_combo_index) {
     combo_t *combo = &key_combos[current_combo_index];
     is_combo_key |= process_single_combo(combo, keycode, record);
-    no_combo_keys_pressed |= NO_COMBO_KEYS_ARE_DOWN;
+    no_combo_keys_pressed = no_combo_keys_pressed && NO_COMBO_KEYS_ARE_DOWN;
   }
 
   if (drop_buffer) {