From 19fd20261b895a6848c8b15fd7365d5b87b7fd72 Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sat, 18 Mar 2017 16:19:10 -0700
Subject: sketch out frosty flake matrix using custom matrix.c based on kitten
 paw

---
 keyboards/frosty_flake/matrix.c | 167 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100644 keyboards/frosty_flake/matrix.c

(limited to 'keyboards/frosty_flake/matrix.c')

diff --git a/keyboards/frosty_flake/matrix.c b/keyboards/frosty_flake/matrix.c
new file mode 100644
index 0000000000..21b0d90885
--- /dev/null
+++ b/keyboards/frosty_flake/matrix.c
@@ -0,0 +1,167 @@
+//TODO(gabe): customize for frosty flake
+
+/*
+  Copyright 2014 Ralf Schmitt <ralf@bunkertor.net>
+
+  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 <stdint.h>
+#include <stdbool.h>
+#include <avr/io.h>
+#include <util/delay.h>
+#include "print.h"
+#include "debug.h"
+#include "util.h"
+#include "matrix.h"
+
+#ifndef DEBOUNCING_DELAY
+#   define DEBOUNCING_DELAY 5
+#endif
+static uint8_t debouncing = DEBOUNCING_DELAY;
+
+static matrix_row_t matrix[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
+
+static uint8_t read_rows(void);
+static void select_col(uint8_t col);
+
+inline uint8_t matrix_rows(void) {
+  return MATRIX_ROWS;
+}
+
+inline uint8_t matrix_cols(void) {
+  return MATRIX_COLS;
+}
+
+/* Column pin configuration
+ *
+ * col: 0    1    2    3    4    5    6    7
+ * pin: PC7  PD5  PD3  PD1  PC2  PD6  PD4  PD2
+ *
+ * Rrr pin configuration 
+ *
+ * These rrrs uses one 74HC154 4 to 16 bit demultiplexer (low
+ * active), together with 2 rrrs driven directly from the micro
+ * controller, to control the 18 rrrs. The rrrs are driven from
+ * pins B6,5,4,3,2,1,0.
+ */
+void matrix_init(void) {
+  DDRC  &= ~0b10000100;  // Row input pins
+  DDRD  &= ~0b01111110;
+  PORTC |=  0b10000100;
+  PORTD |=  0b01111110;
+
+  DDRB  |=  0b01111111;  // Column output pins
+
+  for (uint8_t i=0; i < MATRIX_ROWS; i++)  {
+    matrix[i] = 0;
+    matrix_debouncing[i] = 0;
+  }
+  matrix_init_quantum();
+}
+
+uint8_t matrix_scan(void) {
+  for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+    select_col(col);
+    _delay_us(3);
+    uint8_t rows = read_rows();
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+      bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col);
+      bool curr_bit = rows & (1<<row);
+      if (prev_bit != curr_bit) {
+        matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
+        debouncing = DEBOUNCING_DELAY;
+      }
+    }
+  }
+  
+  if (debouncing) {
+    if (--debouncing) {
+      _delay_ms(1);
+    }
+    else {
+      for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        matrix[i] = matrix_debouncing[i];
+      }
+    }
+  }
+  matrix_scan_quantum();
+  return 1;
+}
+
+bool matrix_is_modified(void) {
+  if (debouncing)
+    return false;
+  else
+    return true;
+}
+
+inline bool matrix_is_on(uint8_t row, uint8_t col) {
+  return (matrix[row] & ((matrix_row_t)1<<col));
+}
+
+inline matrix_row_t matrix_get_row(uint8_t row) {
+  return matrix[row];
+}
+
+void matrix_print(void) {
+  print("\nr/c 0123456789ABCDEF\n");
+  for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+    xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row)));
+  }
+}
+
+uint8_t matrix_key_count(void) {
+  uint8_t count = 0;
+  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+    count += bitpop32(matrix[i]);
+  }
+  return count;
+}
+
+static uint8_t read_rows(void) {
+  return
+    (PINC&(1<<7) ? 0 : (1<<0)) |
+    (PIND&(1<<5) ? 0 : (1<<1)) |
+    (PIND&(1<<3) ? 0 : (1<<2)) |
+    (PIND&(1<<1) ? 0 : (1<<3)) |
+    (PINC&(1<<2) ? 0 : (1<<4)) |
+    (PIND&(1<<2) ? 0 : (1<<5)) |
+    (PIND&(1<<4) ? 0 : (1<<6)) |
+    (PIND&(1<<6) ? 0 : (1<<7));
+}
+
+static void select_col(uint8_t col) {
+  switch (col) {
+  case  0: PORTB = (PORTB & ~0b01111111) | 0b01100100; break;
+  case  1: PORTB = (PORTB & ~0b01111111) | 0b01101100; break;
+  case  2: PORTB = (PORTB & ~0b01111111) | 0b01100010; break;
+  case  3: PORTB = (PORTB & ~0b01111111) | 0b01111010; break;
+  case  4: PORTB = (PORTB & ~0b01111111) | 0b01100110; break;
+  case  5: PORTB = (PORTB & ~0b01111111) | 0b01110110; break;
+  case  6: PORTB = (PORTB & ~0b01111111) | 0b01101110; break;
+  case  7: PORTB = (PORTB & ~0b01111111) | 0b01111110; break;
+  case  8: PORTB = (PORTB & ~0b01111111) | 0b01000001; break;
+  case  9: PORTB = (PORTB & ~0b01111111) | 0b00100001; break;
+  case 10: PORTB = (PORTB & ~0b01111111) | 0b01101010; break;
+  case 11: PORTB = (PORTB & ~0b01111111) | 0b01110010; break;
+  case 12: PORTB = (PORTB & ~0b01111111) | 0b01111100; break;
+  case 13: PORTB = (PORTB & ~0b01111111) | 0b01110100; break;
+  case 14: PORTB = (PORTB & ~0b01111111) | 0b01111000; break;
+  case 15: PORTB = (PORTB & ~0b01111111) | 0b01110000; break;
+  case 16: PORTB = (PORTB & ~0b01111111) | 0b01100000; break;
+  case 17: PORTB = (PORTB & ~0b01111111) | 0b01101000; break;
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From d7fc2365402069a6149c9593dad82c4b4e31b78a Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sun, 19 Mar 2017 15:59:21 -0700
Subject: successfully read data from the matrix

---
 keyboards/frosty_flake/matrix.c | 150 ++++++++++++++++++++++------------------
 1 file changed, 83 insertions(+), 67 deletions(-)

(limited to 'keyboards/frosty_flake/matrix.c')

diff --git a/keyboards/frosty_flake/matrix.c b/keyboards/frosty_flake/matrix.c
index 21b0d90885..70456ada32 100644
--- a/keyboards/frosty_flake/matrix.c
+++ b/keyboards/frosty_flake/matrix.c
@@ -1,5 +1,3 @@
-//TODO(gabe): customize for frosty flake
-
 /*
   Copyright 2014 Ralf Schmitt <ralf@bunkertor.net>
 
@@ -26,16 +24,71 @@
 #include "util.h"
 #include "matrix.h"
 
+#ifndef CONFIG_SPECIFIC_H
+#define CONFIG_SPECIFIC_H
+
+#define CONFIG_LED_IO \
+  DDRB |= (1<<7); \
+  DDRC |= (1<<5) | (1<<6);
+
+#define USB_LED_CAPS_LOCK_ON    PORTC &= ~(1<<5)
+#define USB_LED_CAPS_LOCK_OFF   PORTC |=  (1<<5)
+#define USB_LED_NUM_LOCK_ON     PORTB &= ~(1<<7)
+#define USB_LED_NUM_LOCK_OFF    PORTB |=  (1<<7)
+#define USB_LED_SCROLL_LOCK_ON  PORTC &= ~(1<<6)
+#define USB_LED_SCROLL_LOCK_OFF PORTC |=  (1<<6)
+
+#define CONFIG_MATRIX_IO   \
+  /* Column output pins */ \
+  DDRD  |=  0b01111011;    \
+  /* Row input pins */     \
+  DDRC  &= ~0b10000000;    \
+  DDRB  &= ~0b01111111;    \
+  PORTC |=  0b10000000;    \
+  PORTB |=  0b01111111;
+
+#define MATRIX_ROW_SCAN                      \
+  (PINC&(1<<7) ? 0 : ((matrix_row_t)1<<0)) | \
+  (PINB&(1<<5) ? 0 : ((matrix_row_t)1<<1)) | \
+  (PINB&(1<<4) ? 0 : ((matrix_row_t)1<<2)) | \
+  (PINB&(1<<6) ? 0 : ((matrix_row_t)1<<3)) | \
+  (PINB&(1<<1) ? 0 : ((matrix_row_t)1<<4)) | \
+  (PINB&(1<<2) ? 0 : ((matrix_row_t)1<<5)) | \
+  (PINB&(1<<3) ? 0 : ((matrix_row_t)1<<6)) | \
+  (PINB&(1<<0) ? 0 : ((matrix_row_t)1<<7))
+
+#define MATRIX_ROW_SELECT                                     \
+  case  0: PORTD = (PORTD & ~0b01111011) | 0b00011011; break; \
+  case  1: PORTD = (PORTD & ~0b01111011) | 0b01000011; break; \
+  case  2: PORTD = (PORTD & ~0b01111011) | 0b01101010; break; \
+  case  3: PORTD = (PORTD & ~0b01111011) | 0b01111001; break; \
+  case  4: PORTD = (PORTD & ~0b01111011) | 0b01100010; break; \
+  case  5: PORTD = (PORTD & ~0b01111011) | 0b01110001; break; \
+  case  6: PORTD = (PORTD & ~0b01111011) | 0b01100001; break; \
+  case  7: PORTD = (PORTD & ~0b01111011) | 0b01110000; break; \
+  case  8: PORTD = (PORTD & ~0b01111011) | 0b01100000; break; \
+  case  9: PORTD = (PORTD & ~0b01111011) | 0b01101000; break; \
+  case 10: PORTD = (PORTD & ~0b01111011) | 0b00101011; break; \
+  case 11: PORTD = (PORTD & ~0b01111011) | 0b00110011; break; \
+  case 12: PORTD = (PORTD & ~0b01111011) | 0b00100011; break; \
+  case 13: PORTD = (PORTD & ~0b01111011) | 0b01111000; break; \
+  case 14: PORTD = (PORTD & ~0b01111011) | 0b00010011; break; \
+  case 15: PORTD = (PORTD & ~0b01111011) | 0b01101001; break; \
+  case 16: PORTD = (PORTD & ~0b01111011) | 0b00001011; break; \
+  case 17: PORTD = (PORTD & ~0b01111011) | 0b00111011; break;
+
+#endif
+
 #ifndef DEBOUNCING_DELAY
-#   define DEBOUNCING_DELAY 5
+#   define DEBOUNCING_DELAY 0
 #endif
 static uint8_t debouncing = DEBOUNCING_DELAY;
 
 static matrix_row_t matrix[MATRIX_ROWS];
 static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
-static uint8_t read_rows(void);
-static void select_col(uint8_t col);
+static matrix_row_t scan_row(void);
+static void select_row(uint8_t row);
 
 inline uint8_t matrix_rows(void) {
   return MATRIX_ROWS;
@@ -45,58 +98,40 @@ inline uint8_t matrix_cols(void) {
   return MATRIX_COLS;
 }
 
-/* Column pin configuration
- *
- * col: 0    1    2    3    4    5    6    7
- * pin: PC7  PD5  PD3  PD1  PC2  PD6  PD4  PD2
- *
- * Rrr pin configuration 
- *
- * These rrrs uses one 74HC154 4 to 16 bit demultiplexer (low
- * active), together with 2 rrrs driven directly from the micro
- * controller, to control the 18 rrrs. The rrrs are driven from
- * pins B6,5,4,3,2,1,0.
- */
 void matrix_init(void) {
-  DDRC  &= ~0b10000100;  // Row input pins
-  DDRD  &= ~0b01111110;
-  PORTC |=  0b10000100;
-  PORTD |=  0b01111110;
-
-  DDRB  |=  0b01111111;  // Column output pins
+  CONFIG_MATRIX_IO;
 
   for (uint8_t i=0; i < MATRIX_ROWS; i++)  {
     matrix[i] = 0;
     matrix_debouncing[i] = 0;
   }
+
   matrix_init_quantum();
 }
 
 uint8_t matrix_scan(void) {
-  for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-    select_col(col);
+  for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+    select_row(row);
     _delay_us(3);
-    uint8_t rows = read_rows();
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+    matrix_row_t row_scan = scan_row();
+    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
       bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col);
-      bool curr_bit = rows & (1<<row);
+      bool curr_bit = row_scan & (1<<col);
       if (prev_bit != curr_bit) {
         matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
         debouncing = DEBOUNCING_DELAY;
       }
     }
   }
-  
+
   if (debouncing) {
-    if (--debouncing) {
+    if (--debouncing)
       _delay_ms(1);
-    }
-    else {
-      for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+    else
+      for (uint8_t i = 0; i < MATRIX_ROWS; i++)
         matrix[i] = matrix_debouncing[i];
-      }
-    }
   }
+
   matrix_scan_quantum();
   return 1;
 }
@@ -117,9 +152,15 @@ inline matrix_row_t matrix_get_row(uint8_t row) {
 }
 
 void matrix_print(void) {
-  print("\nr/c 0123456789ABCDEF\n");
+  print("\nr/c 01234567\n");
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    xprintf("%02X: %032lb\n", row, bitrev32(matrix_get_row(row)));
+    matrix_row_t row_scan = matrix_get_row(row);
+    xprintf("%02X: ", row);
+    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+      bool curr_bit = row_scan & (1<<col);
+      xprintf("%c", curr_bit ? '*' : '.');
+    }
+    print("\n");
   }
 }
 
@@ -131,37 +172,12 @@ uint8_t matrix_key_count(void) {
   return count;
 }
 
-static uint8_t read_rows(void) {
-  return
-    (PINC&(1<<7) ? 0 : (1<<0)) |
-    (PIND&(1<<5) ? 0 : (1<<1)) |
-    (PIND&(1<<3) ? 0 : (1<<2)) |
-    (PIND&(1<<1) ? 0 : (1<<3)) |
-    (PINC&(1<<2) ? 0 : (1<<4)) |
-    (PIND&(1<<2) ? 0 : (1<<5)) |
-    (PIND&(1<<4) ? 0 : (1<<6)) |
-    (PIND&(1<<6) ? 0 : (1<<7));
+static matrix_row_t scan_row(void) {
+  return MATRIX_ROW_SCAN;
 }
 
-static void select_col(uint8_t col) {
-  switch (col) {
-  case  0: PORTB = (PORTB & ~0b01111111) | 0b01100100; break;
-  case  1: PORTB = (PORTB & ~0b01111111) | 0b01101100; break;
-  case  2: PORTB = (PORTB & ~0b01111111) | 0b01100010; break;
-  case  3: PORTB = (PORTB & ~0b01111111) | 0b01111010; break;
-  case  4: PORTB = (PORTB & ~0b01111111) | 0b01100110; break;
-  case  5: PORTB = (PORTB & ~0b01111111) | 0b01110110; break;
-  case  6: PORTB = (PORTB & ~0b01111111) | 0b01101110; break;
-  case  7: PORTB = (PORTB & ~0b01111111) | 0b01111110; break;
-  case  8: PORTB = (PORTB & ~0b01111111) | 0b01000001; break;
-  case  9: PORTB = (PORTB & ~0b01111111) | 0b00100001; break;
-  case 10: PORTB = (PORTB & ~0b01111111) | 0b01101010; break;
-  case 11: PORTB = (PORTB & ~0b01111111) | 0b01110010; break;
-  case 12: PORTB = (PORTB & ~0b01111111) | 0b01111100; break;
-  case 13: PORTB = (PORTB & ~0b01111111) | 0b01110100; break;
-  case 14: PORTB = (PORTB & ~0b01111111) | 0b01111000; break;
-  case 15: PORTB = (PORTB & ~0b01111111) | 0b01110000; break;
-  case 16: PORTB = (PORTB & ~0b01111111) | 0b01100000; break;
-  case 17: PORTB = (PORTB & ~0b01111111) | 0b01101000; break;
+static void select_row(uint8_t row) {
+  switch (row) {
+    MATRIX_ROW_SELECT;
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 4a97ef6c48ce7fee2b58c6a175c1c8003267a428 Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sun, 19 Mar 2017 19:55:55 -0700
Subject: start to define keymap; annoying because rows and columns are swapped
 from schematic

---
 keyboards/frosty_flake/matrix.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'keyboards/frosty_flake/matrix.c')

diff --git a/keyboards/frosty_flake/matrix.c b/keyboards/frosty_flake/matrix.c
index 70456ada32..07b9f6dd68 100644
--- a/keyboards/frosty_flake/matrix.c
+++ b/keyboards/frosty_flake/matrix.c
@@ -151,11 +151,13 @@ inline matrix_row_t matrix_get_row(uint8_t row) {
   return matrix[row];
 }
 
+static const char ROW_NAMES[] = "ABCDEFGHIJKLMNOPQR";
+
 void matrix_print(void) {
   print("\nr/c 01234567\n");
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
     matrix_row_t row_scan = matrix_get_row(row);
-    xprintf("%02X: ", row);
+    xprintf("%c:  ", ROW_NAMES[row]);
     for (uint8_t col = 0; col < MATRIX_COLS; col++) {
       bool curr_bit = row_scan & (1<<col);
       xprintf("%c", curr_bit ? '*' : '.');
-- 
cgit v1.2.3


From a43ae7c92fd2c41b283d03a8543677638a7c61f1 Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sun, 19 Mar 2017 20:33:41 -0700
Subject: Swap rows and columns to match the schematic

---
 keyboards/frosty_flake/matrix.c | 154 +++++++++++++++-------------------------
 1 file changed, 59 insertions(+), 95 deletions(-)

(limited to 'keyboards/frosty_flake/matrix.c')

diff --git a/keyboards/frosty_flake/matrix.c b/keyboards/frosty_flake/matrix.c
index 07b9f6dd68..f289f506ad 100644
--- a/keyboards/frosty_flake/matrix.c
+++ b/keyboards/frosty_flake/matrix.c
@@ -1,5 +1,5 @@
 /*
-  Copyright 2014 Ralf Schmitt <ralf@bunkertor.net>
+  Copyright 2017 Gabriel Young <gabeplaysdrums@live.com>
 
   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
@@ -24,9 +24,6 @@
 #include "util.h"
 #include "matrix.h"
 
-#ifndef CONFIG_SPECIFIC_H
-#define CONFIG_SPECIFIC_H
-
 #define CONFIG_LED_IO \
   DDRB |= (1<<7); \
   DDRC |= (1<<5) | (1<<6);
@@ -38,85 +35,40 @@
 #define USB_LED_SCROLL_LOCK_ON  PORTC &= ~(1<<6)
 #define USB_LED_SCROLL_LOCK_OFF PORTC |=  (1<<6)
 
-#define CONFIG_MATRIX_IO   \
-  /* Column output pins */ \
-  DDRD  |=  0b01111011;    \
-  /* Row input pins */     \
-  DDRC  &= ~0b10000000;    \
-  DDRB  &= ~0b01111111;    \
-  PORTC |=  0b10000000;    \
-  PORTB |=  0b01111111;
-
-#define MATRIX_ROW_SCAN                      \
-  (PINC&(1<<7) ? 0 : ((matrix_row_t)1<<0)) | \
-  (PINB&(1<<5) ? 0 : ((matrix_row_t)1<<1)) | \
-  (PINB&(1<<4) ? 0 : ((matrix_row_t)1<<2)) | \
-  (PINB&(1<<6) ? 0 : ((matrix_row_t)1<<3)) | \
-  (PINB&(1<<1) ? 0 : ((matrix_row_t)1<<4)) | \
-  (PINB&(1<<2) ? 0 : ((matrix_row_t)1<<5)) | \
-  (PINB&(1<<3) ? 0 : ((matrix_row_t)1<<6)) | \
-  (PINB&(1<<0) ? 0 : ((matrix_row_t)1<<7))
-
-#define MATRIX_ROW_SELECT                                     \
-  case  0: PORTD = (PORTD & ~0b01111011) | 0b00011011; break; \
-  case  1: PORTD = (PORTD & ~0b01111011) | 0b01000011; break; \
-  case  2: PORTD = (PORTD & ~0b01111011) | 0b01101010; break; \
-  case  3: PORTD = (PORTD & ~0b01111011) | 0b01111001; break; \
-  case  4: PORTD = (PORTD & ~0b01111011) | 0b01100010; break; \
-  case  5: PORTD = (PORTD & ~0b01111011) | 0b01110001; break; \
-  case  6: PORTD = (PORTD & ~0b01111011) | 0b01100001; break; \
-  case  7: PORTD = (PORTD & ~0b01111011) | 0b01110000; break; \
-  case  8: PORTD = (PORTD & ~0b01111011) | 0b01100000; break; \
-  case  9: PORTD = (PORTD & ~0b01111011) | 0b01101000; break; \
-  case 10: PORTD = (PORTD & ~0b01111011) | 0b00101011; break; \
-  case 11: PORTD = (PORTD & ~0b01111011) | 0b00110011; break; \
-  case 12: PORTD = (PORTD & ~0b01111011) | 0b00100011; break; \
-  case 13: PORTD = (PORTD & ~0b01111011) | 0b01111000; break; \
-  case 14: PORTD = (PORTD & ~0b01111011) | 0b00010011; break; \
-  case 15: PORTD = (PORTD & ~0b01111011) | 0b01101001; break; \
-  case 16: PORTD = (PORTD & ~0b01111011) | 0b00001011; break; \
-  case 17: PORTD = (PORTD & ~0b01111011) | 0b00111011; break;
-
-#endif
-
 #ifndef DEBOUNCING_DELAY
-#   define DEBOUNCING_DELAY 0
+#   define DEBOUNCING_DELAY 5
 #endif
 static uint8_t debouncing = DEBOUNCING_DELAY;
 
 static matrix_row_t matrix[MATRIX_ROWS];
 static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
-static matrix_row_t scan_row(void);
-static void select_row(uint8_t row);
-
-inline uint8_t matrix_rows(void) {
-  return MATRIX_ROWS;
-}
-
-inline uint8_t matrix_cols(void) {
-  return MATRIX_COLS;
-}
+static matrix_row_t scan_col(void);
+static void select_col(uint8_t row);
 
 void matrix_init(void) {
-  CONFIG_MATRIX_IO;
-
-  for (uint8_t i=0; i < MATRIX_ROWS; i++)  {
-    matrix[i] = 0;
-    matrix_debouncing[i] = 0;
-  }
-
-  matrix_init_quantum();
+    /* Row output pins */
+    DDRD  |=  0b01111011;
+    /* Column input pins */
+    DDRC  &= ~0b10000000;
+    DDRB  &= ~0b01111111;
+    PORTC |=  0b10000000;
+    PORTB |=  0b01111111;
+
+    for (uint8_t i=0; i < MATRIX_ROWS; i++)
+        matrix[i] = matrix_debouncing[i] = 0;
+
+    matrix_init_quantum();
 }
 
 uint8_t matrix_scan(void) {
-  for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    select_row(row);
+  for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+    select_col(col);
     _delay_us(3);
-    matrix_row_t row_scan = scan_row();
-    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+    matrix_row_t col_scan = scan_col();
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
       bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col);
-      bool curr_bit = row_scan & (1<<col);
+      bool curr_bit = col_scan & (1<<row);
       if (prev_bit != curr_bit) {
         matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
         debouncing = DEBOUNCING_DELAY;
@@ -136,30 +88,17 @@ uint8_t matrix_scan(void) {
   return 1;
 }
 
-bool matrix_is_modified(void) {
-  if (debouncing)
-    return false;
-  else
-    return true;
-}
-
-inline bool matrix_is_on(uint8_t row, uint8_t col) {
-  return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
 inline matrix_row_t matrix_get_row(uint8_t row) {
   return matrix[row];
 }
 
-static const char ROW_NAMES[] = "ABCDEFGHIJKLMNOPQR";
-
 void matrix_print(void) {
-  print("\nr/c 01234567\n");
+  print("\nr\\c ABCDEFGHIJKLMNOPQR\n");
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    matrix_row_t row_scan = matrix_get_row(row);
-    xprintf("%c:  ", ROW_NAMES[row]);
+    matrix_row_t matrix_row = matrix_get_row(row);
+    xprintf("%02X: ", row);
     for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-      bool curr_bit = row_scan & (1<<col);
+      bool curr_bit = matrix_row & (1<<col);
       xprintf("%c", curr_bit ? '*' : '.');
     }
     print("\n");
@@ -168,18 +107,43 @@ void matrix_print(void) {
 
 uint8_t matrix_key_count(void) {
   uint8_t count = 0;
-  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-    count += bitpop32(matrix[i]);
-  }
+  for (uint8_t row = 0; row < MATRIX_ROWS; row++)
+    count += bitpop32(matrix[row]);
   return count;
 }
 
-static matrix_row_t scan_row(void) {
-  return MATRIX_ROW_SCAN;
+static matrix_row_t scan_col(void) {
+    return (
+        (PINC&(1<<7) ? 0 : ((matrix_row_t)1<<0)) |
+        (PINB&(1<<5) ? 0 : ((matrix_row_t)1<<1)) |
+        (PINB&(1<<4) ? 0 : ((matrix_row_t)1<<2)) |
+        (PINB&(1<<6) ? 0 : ((matrix_row_t)1<<3)) |
+        (PINB&(1<<1) ? 0 : ((matrix_row_t)1<<4)) |
+        (PINB&(1<<2) ? 0 : ((matrix_row_t)1<<5)) |
+        (PINB&(1<<3) ? 0 : ((matrix_row_t)1<<6)) |
+        (PINB&(1<<0) ? 0 : ((matrix_row_t)1<<7))
+    );
 }
 
-static void select_row(uint8_t row) {
-  switch (row) {
-    MATRIX_ROW_SELECT;
-  }
+static void select_col(uint8_t col) {
+    switch (col) {
+        case  0: PORTD = (PORTD & ~0b01111011) | 0b00011011; break;
+        case  1: PORTD = (PORTD & ~0b01111011) | 0b01000011; break;
+        case  2: PORTD = (PORTD & ~0b01111011) | 0b01101010; break;
+        case  3: PORTD = (PORTD & ~0b01111011) | 0b01111001; break;
+        case  4: PORTD = (PORTD & ~0b01111011) | 0b01100010; break;
+        case  5: PORTD = (PORTD & ~0b01111011) | 0b01110001; break;
+        case  6: PORTD = (PORTD & ~0b01111011) | 0b01100001; break;
+        case  7: PORTD = (PORTD & ~0b01111011) | 0b01110000; break;
+        case  8: PORTD = (PORTD & ~0b01111011) | 0b01100000; break;
+        case  9: PORTD = (PORTD & ~0b01111011) | 0b01101000; break;
+        case 10: PORTD = (PORTD & ~0b01111011) | 0b00101011; break;
+        case 11: PORTD = (PORTD & ~0b01111011) | 0b00110011; break;
+        case 12: PORTD = (PORTD & ~0b01111011) | 0b00100011; break;
+        case 13: PORTD = (PORTD & ~0b01111011) | 0b01111000; break;
+        case 14: PORTD = (PORTD & ~0b01111011) | 0b00010011; break;
+        case 15: PORTD = (PORTD & ~0b01111011) | 0b01101001; break;
+        case 16: PORTD = (PORTD & ~0b01111011) | 0b00001011; break;
+        case 17: PORTD = (PORTD & ~0b01111011) | 0b00111011; break;
+    }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 7e9ca9a97612a5df11b4a2e466f34df0fd62564e Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sun, 19 Mar 2017 20:45:10 -0700
Subject: support LEDs

---
 keyboards/frosty_flake/matrix.c | 55 +++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 33 deletions(-)

(limited to 'keyboards/frosty_flake/matrix.c')

diff --git a/keyboards/frosty_flake/matrix.c b/keyboards/frosty_flake/matrix.c
index f289f506ad..5d711a660f 100644
--- a/keyboards/frosty_flake/matrix.c
+++ b/keyboards/frosty_flake/matrix.c
@@ -24,17 +24,6 @@
 #include "util.h"
 #include "matrix.h"
 
-#define CONFIG_LED_IO \
-  DDRB |= (1<<7); \
-  DDRC |= (1<<5) | (1<<6);
-
-#define USB_LED_CAPS_LOCK_ON    PORTC &= ~(1<<5)
-#define USB_LED_CAPS_LOCK_OFF   PORTC |=  (1<<5)
-#define USB_LED_NUM_LOCK_ON     PORTB &= ~(1<<7)
-#define USB_LED_NUM_LOCK_OFF    PORTB |=  (1<<7)
-#define USB_LED_SCROLL_LOCK_ON  PORTC &= ~(1<<6)
-#define USB_LED_SCROLL_LOCK_OFF PORTC |=  (1<<6)
-
 #ifndef DEBOUNCING_DELAY
 #   define DEBOUNCING_DELAY 5
 #endif
@@ -62,34 +51,34 @@ void matrix_init(void) {
 }
 
 uint8_t matrix_scan(void) {
-  for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-    select_col(col);
-    _delay_us(3);
-    matrix_row_t col_scan = scan_col();
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-      bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col);
-      bool curr_bit = col_scan & (1<<row);
-      if (prev_bit != curr_bit) {
-        matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
-        debouncing = DEBOUNCING_DELAY;
-      }
+    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+        select_col(col);
+        _delay_us(3);
+        matrix_row_t col_scan = scan_col();
+        for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+            bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col);
+            bool curr_bit = col_scan & (1<<row);
+            if (prev_bit != curr_bit) {
+                matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
+                debouncing = DEBOUNCING_DELAY;
+            }
+        }
     }
-  }
 
-  if (debouncing) {
-    if (--debouncing)
-      _delay_ms(1);
-    else
-      for (uint8_t i = 0; i < MATRIX_ROWS; i++)
-        matrix[i] = matrix_debouncing[i];
-  }
+    if (debouncing) {
+        if (--debouncing)
+            _delay_ms(1);
+        else
+            for (uint8_t i = 0; i < MATRIX_ROWS; i++)
+                matrix[i] = matrix_debouncing[i];
+    }
 
-  matrix_scan_quantum();
-  return 1;
+    matrix_scan_quantum();
+    return 1;
 }
 
 inline matrix_row_t matrix_get_row(uint8_t row) {
-  return matrix[row];
+    return matrix[row];
 }
 
 void matrix_print(void) {
-- 
cgit v1.2.3


From df874a228af52294c731348dbf271fd76bbdea68 Mon Sep 17 00:00:00 2001
From: Gabriel Young <gabeplaysdrums@live.com>
Date: Sun, 19 Mar 2017 20:46:56 -0700
Subject: fix whitespace

---
 keyboards/frosty_flake/matrix.c | 99 ++++++++++++++++++++---------------------
 1 file changed, 48 insertions(+), 51 deletions(-)

(limited to 'keyboards/frosty_flake/matrix.c')

diff --git a/keyboards/frosty_flake/matrix.c b/keyboards/frosty_flake/matrix.c
index 5d711a660f..05dffdb643 100644
--- a/keyboards/frosty_flake/matrix.c
+++ b/keyboards/frosty_flake/matrix.c
@@ -32,8 +32,41 @@ static uint8_t debouncing = DEBOUNCING_DELAY;
 static matrix_row_t matrix[MATRIX_ROWS];
 static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
-static matrix_row_t scan_col(void);
-static void select_col(uint8_t row);
+static matrix_row_t scan_col(void) {
+    return (
+        (PINC&(1<<7) ? 0 : ((matrix_row_t)1<<0)) |
+        (PINB&(1<<5) ? 0 : ((matrix_row_t)1<<1)) |
+        (PINB&(1<<4) ? 0 : ((matrix_row_t)1<<2)) |
+        (PINB&(1<<6) ? 0 : ((matrix_row_t)1<<3)) |
+        (PINB&(1<<1) ? 0 : ((matrix_row_t)1<<4)) |
+        (PINB&(1<<2) ? 0 : ((matrix_row_t)1<<5)) |
+        (PINB&(1<<3) ? 0 : ((matrix_row_t)1<<6)) |
+        (PINB&(1<<0) ? 0 : ((matrix_row_t)1<<7))
+    );
+}
+
+static void select_col(uint8_t col) {
+    switch (col) {
+        case  0: PORTD = (PORTD & ~0b01111011) | 0b00011011; break;
+        case  1: PORTD = (PORTD & ~0b01111011) | 0b01000011; break;
+        case  2: PORTD = (PORTD & ~0b01111011) | 0b01101010; break;
+        case  3: PORTD = (PORTD & ~0b01111011) | 0b01111001; break;
+        case  4: PORTD = (PORTD & ~0b01111011) | 0b01100010; break;
+        case  5: PORTD = (PORTD & ~0b01111011) | 0b01110001; break;
+        case  6: PORTD = (PORTD & ~0b01111011) | 0b01100001; break;
+        case  7: PORTD = (PORTD & ~0b01111011) | 0b01110000; break;
+        case  8: PORTD = (PORTD & ~0b01111011) | 0b01100000; break;
+        case  9: PORTD = (PORTD & ~0b01111011) | 0b01101000; break;
+        case 10: PORTD = (PORTD & ~0b01111011) | 0b00101011; break;
+        case 11: PORTD = (PORTD & ~0b01111011) | 0b00110011; break;
+        case 12: PORTD = (PORTD & ~0b01111011) | 0b00100011; break;
+        case 13: PORTD = (PORTD & ~0b01111011) | 0b01111000; break;
+        case 14: PORTD = (PORTD & ~0b01111011) | 0b00010011; break;
+        case 15: PORTD = (PORTD & ~0b01111011) | 0b01101001; break;
+        case 16: PORTD = (PORTD & ~0b01111011) | 0b00001011; break;
+        case 17: PORTD = (PORTD & ~0b01111011) | 0b00111011; break;
+    }
+}
 
 void matrix_init(void) {
     /* Row output pins */
@@ -82,57 +115,21 @@ inline matrix_row_t matrix_get_row(uint8_t row) {
 }
 
 void matrix_print(void) {
-  print("\nr\\c ABCDEFGHIJKLMNOPQR\n");
-  for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    matrix_row_t matrix_row = matrix_get_row(row);
-    xprintf("%02X: ", row);
-    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-      bool curr_bit = matrix_row & (1<<col);
-      xprintf("%c", curr_bit ? '*' : '.');
+    print("\nr\\c ABCDEFGHIJKLMNOPQR\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        matrix_row_t matrix_row = matrix_get_row(row);
+        xprintf("%02X: ", row);
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            bool curr_bit = matrix_row & (1<<col);
+            xprintf("%c", curr_bit ? '*' : '.');
+        }
+        print("\n");
     }
-    print("\n");
-  }
 }
 
 uint8_t matrix_key_count(void) {
-  uint8_t count = 0;
-  for (uint8_t row = 0; row < MATRIX_ROWS; row++)
-    count += bitpop32(matrix[row]);
-  return count;
-}
-
-static matrix_row_t scan_col(void) {
-    return (
-        (PINC&(1<<7) ? 0 : ((matrix_row_t)1<<0)) |
-        (PINB&(1<<5) ? 0 : ((matrix_row_t)1<<1)) |
-        (PINB&(1<<4) ? 0 : ((matrix_row_t)1<<2)) |
-        (PINB&(1<<6) ? 0 : ((matrix_row_t)1<<3)) |
-        (PINB&(1<<1) ? 0 : ((matrix_row_t)1<<4)) |
-        (PINB&(1<<2) ? 0 : ((matrix_row_t)1<<5)) |
-        (PINB&(1<<3) ? 0 : ((matrix_row_t)1<<6)) |
-        (PINB&(1<<0) ? 0 : ((matrix_row_t)1<<7))
-    );
-}
-
-static void select_col(uint8_t col) {
-    switch (col) {
-        case  0: PORTD = (PORTD & ~0b01111011) | 0b00011011; break;
-        case  1: PORTD = (PORTD & ~0b01111011) | 0b01000011; break;
-        case  2: PORTD = (PORTD & ~0b01111011) | 0b01101010; break;
-        case  3: PORTD = (PORTD & ~0b01111011) | 0b01111001; break;
-        case  4: PORTD = (PORTD & ~0b01111011) | 0b01100010; break;
-        case  5: PORTD = (PORTD & ~0b01111011) | 0b01110001; break;
-        case  6: PORTD = (PORTD & ~0b01111011) | 0b01100001; break;
-        case  7: PORTD = (PORTD & ~0b01111011) | 0b01110000; break;
-        case  8: PORTD = (PORTD & ~0b01111011) | 0b01100000; break;
-        case  9: PORTD = (PORTD & ~0b01111011) | 0b01101000; break;
-        case 10: PORTD = (PORTD & ~0b01111011) | 0b00101011; break;
-        case 11: PORTD = (PORTD & ~0b01111011) | 0b00110011; break;
-        case 12: PORTD = (PORTD & ~0b01111011) | 0b00100011; break;
-        case 13: PORTD = (PORTD & ~0b01111011) | 0b01111000; break;
-        case 14: PORTD = (PORTD & ~0b01111011) | 0b00010011; break;
-        case 15: PORTD = (PORTD & ~0b01111011) | 0b01101001; break;
-        case 16: PORTD = (PORTD & ~0b01111011) | 0b00001011; break;
-        case 17: PORTD = (PORTD & ~0b01111011) | 0b00111011; break;
-    }
+    uint8_t count = 0;
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++)
+        count += bitpop32(matrix[row]);
+    return count;
 }
\ No newline at end of file
-- 
cgit v1.2.3