Merge branch 'master' into taamas

1 files changed, 26 insertions, 0 deletions

diff --git a/keyboards/gboards/butterstick/butterstick.c b/keyboards/gboards/butterstick/butterstick.c
new file mode 100644
index 0000000000..3bcbcbe8b4
--- /dev/null
+++ b/keyboards/gboards/butterstick/butterstick.c
@@ -0,0 +1,26 @@
+/* Copyright 2019 Jane Bernhardt
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "butterstick.h"
+
+void matrix_scan_kb(void) {
+#ifdef DEBUG_MATRIX
+    for (uint8_t c = 0; c < MATRIX_COLS; c++)
+		for (uint8_t r = 0; r < MATRIX_ROWS; r++)
+		  if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c);
+#endif
+
+  matrix_scan_user();
+}