Merge remote-tracking branch 'remotes/jackhumbert/master'

1 files changed, 0 insertions, 274 deletions

diff --git a/keyboard/phantom/matrix.c b/keyboard/phantom/matrix.c
deleted file mode 100644
index 6c3ae49c3..000000000
--- a/keyboard/phantom/matrix.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* Copyright 2012 Jun Wako <wakojun@gmail.com>
- *
- * This is heavily based on phantom/board.{c|h}.
- * https://github.com/BathroomEpiphanies/AVR-Keyboard
- *
- * Copyright (c) 2012 Fredrik Atmer, Bathroom Epiphanies Inc
- * http://bathroomepiphanies.com
- *
- * As for liscensing consult with the original files or its author.
- */
-#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 DEBOUNCE
-#   define DEBOUNCE	0
-#endif
-static uint8_t debouncing = DEBOUNCE;
-
-// bit array of key state(1:on, 0:off)
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-static uint8_t read_rows(void);
-static void init_rows(void);
-static void unselect_cols(void);
-static void select_col(uint8_t col);
-
-#ifndef SLEEP_LED_ENABLE
-/* LEDs are on output compare pins OC1B OC1C
-   This activates fast PWM mode on them.
-   Prescaler 256 and 8-bit counter results in
-   16000000/256/256 = 244 Hz blink frequency.
-   LED_A: Caps Lock
-   LED_B: Scroll Lock  */
-/* Output on PWM pins are turned off when the timer 
-   reaches the value in the output compare register,
-   and are turned on when it reaches TOP (=256). */
-static
-void setup_leds(void)
-{
-    TCCR1A |=      // Timer control register 1A
-        (1<<WGM10) | // Fast PWM 8-bit
-        (1<<COM1B1)| // Clear OC1B on match, set at TOP
-        (1<<COM1C1); // Clear OC1C on match, set at TOP
-    TCCR1B |=      // Timer control register 1B
-        (1<<WGM12) | // Fast PWM 8-bit
-        (1<<CS12);   // Prescaler 256
-    OCR1B = LED_BRIGHTNESS;    // Output compare register 1B
-    OCR1C = LED_BRIGHTNESS;    // Output compare register 1C
-    // LEDs: LED_A -> PORTB6, LED_B -> PORTB7
-    DDRB  |= (1<<6) | (1<<7);
-    PORTB  &= ~((1<<6) | (1<<7));
-}
-#endif
-
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
-void matrix_init(void)
-{
-    // To use PORTF disable JTAG with writing JTD bit twice within four cycles.
-    MCUCR |= (1<<JTD);
-    MCUCR |= (1<<JTD);
-	
-    // initialize row and col
-    unselect_cols();
-    init_rows();
-#ifndef SLEEP_LED_ENABLE
-    setup_leds();
-#endif
-
-    // initialize matrix state: all keys off
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++)  {
-        matrix[i] = 0;
-        matrix_debouncing[i] = 0;
-    }
-}
-
-uint8_t matrix_scan(void)
-{
-    for (uint8_t col = 0; col < MATRIX_COLS; col++) {  // 0-16
-        select_col(col);
-        _delay_us(3);       // without this wait it won't read stable value.
-        uint8_t rows = read_rows();
-        for (uint8_t row = 0; row < MATRIX_ROWS; row++) {  // 0-5
-            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);
-                if (debouncing) {
-                    dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
-                }
-                debouncing = DEBOUNCE;
-            }
-        }
-        unselect_cols();
-    }
-
-    if (debouncing) {
-        if (--debouncing) {
-            _delay_ms(1);
-        } else {
-            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-                matrix[i] = matrix_debouncing[i];
-            }
-        }
-    }
-
-    return 1;
-}
-
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    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;
-}
-
-/* Row pin configuration
- * row: 0   1   2   3   4   5
- * pin: B5  B4  B3  B2  B1  B0
- */
-static void init_rows(void)
-{
-    // Input with pull-up(DDR:0, PORT:1)
-    DDRB  &= ~0b00111111;
-    PORTB |= 0b00111111;
-}
-
-static uint8_t read_rows(void)
-{
-    return (PINB&(1<<5) ? 0 : (1<<0)) |
-           (PINB&(1<<4) ? 0 : (1<<1)) |
-           (PINB&(1<<3) ? 0 : (1<<2)) |
-           (PINB&(1<<2) ? 0 : (1<<3)) |
-           (PINB&(1<<1) ? 0 : (1<<4)) |
-           (PINB&(1<<0) ? 0 : (1<<5));
-}
-
-/* Column pin configuration
- * col: 0   1   2   3   4   5   6   7   8   9   10  11  12  13  14  15  16
- * pin: D5  C7  C6  D4  D0  E6  F0  F1  F4  F5  F6  F7  D7  D6  D1  D2  D3
- */
-static void unselect_cols(void)
-{
-    // Hi-Z(DDR:0, PORT:0) to unselect
-    DDRC  |= 0b11000000; // PC: 7 6
-    PORTC |= 0b11000000;
-    DDRD  |= 0b11111111; // PD: 7 6 5 4 3 2 1 0
-    PORTD |= 0b11111111;
-    DDRE  |= 0b01000000; // PE: 6
-    PORTE |= 0b01000000;
-    DDRF  |= 0b11110011; // PF: 7 6 5 4 1 0
-    PORTF |= 0b11110011;
-}
-
-static void select_col(uint8_t col)
-{
-    // Output low(DDR:1, PORT:0) to select
-    switch (col) {
-        case 0:
-            DDRD  |= (1<<5);
-            PORTD &= ~(1<<5);
-            break;
-        case 1:
-            DDRC  |= (1<<7);
-            PORTC &= ~(1<<7);
-            break;
-        case 2:
-            DDRC  |= (1<<6);
-            PORTC &= ~(1<<6);
-            break;
-        case 3:
-            DDRD  |= (1<<4);
-            PORTD &= ~(1<<4);
-            break;
-        case 4:
-            DDRD  |= (1<<0);
-            PORTD &= ~(1<<0);
-            break;
-        case 5:
-            DDRE  |= (1<<6);
-            PORTE &= ~(1<<6);
-            break;
-        case 6:
-            DDRF  |= (1<<0);
-            PORTF &= ~(1<<0);
-            break;
-        case 7:
-            DDRF  |= (1<<1);
-            PORTF &= ~(1<<1);
-            break;
-        case 8:
-            DDRF  |= (1<<4);
-            PORTF &= ~(1<<4);
-            break;
-        case 9:
-            DDRF  |= (1<<5);
-            PORTF &= ~(1<<5);
-            break;
-        case 10:
-            DDRF  |= (1<<6);
-            PORTF &= ~(1<<6);
-            break;
-        case 11:
-            DDRF  |= (1<<7);
-            PORTF &= ~(1<<7);
-            break;
-        case 12:
-            DDRD  |= (1<<7);
-            PORTD &= ~(1<<7);
-            break;
-        case 13:
-            DDRD  |= (1<<6);
-            PORTD &= ~(1<<6);
-            break;
-        case 14:
-            DDRD  |= (1<<1);
-            PORTD &= ~(1<<1);
-            break;
-        case 15:
-            DDRD  |= (1<<2);
-            PORTD &= ~(1<<2);
-            break;
-        case 16:
-            DDRD  |= (1<<3);
-            PORTD &= ~(1<<3);
-            break;
-    }
-}