di0ib
/
tmk_keyboard
Watch 1
Star 0
Fork 0
Code Releases 4 Activity
Browse Source

some fixes. LED flush for debug.

tags/v1.9
tmk 13 years ago
parent
1bcebc2848
commit
e7c6839d2d
5 changed files with 48 additions and 21 deletions
Unified View Show Diff Stats
  1. 1
    1
      jump_bootloader.c
  2. 1
    1
      keymap.c
  3. 1
    1
      keymap.h
  4. 0
    1
      matrix.c
  5. 45
    17
      mykey.c

+ 1
- 1
jump_bootloader.c View File

#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <util/delay.h> #include <util/delay.h>


void jump_bootloader() {
void jump_bootloader(void) {
cli(); cli();
// disable watchdog, if enabled // disable watchdog, if enabled
// disable all peripherals // disable all peripherals

+ 1
- 1
keymap.c View File

}; };




uint8_t get_keycode(int layer, uint8_t row, uint8_t col)
uint8_t get_keycode(int layer, int row, int col)
{ {
if (row >= MATRIX_ROWS) if (row >= MATRIX_ROWS)
return KB_NO; return KB_NO;

+ 1
- 1
keymap.h View File

#include "usbkeycodes.h" #include "usbkeycodes.h"


int get_layer(void); int get_layer(void);
uint8_t get_keycode(int layer, uint8_t row, uint8_t col);
uint8_t get_keycode(int layer, int row, int col);


#define MATRIX_ROWS 9 #define MATRIX_ROWS 9
#define MATRIX_COLS 8 #define MATRIX_COLS 8

+ 0
- 1
matrix.c View File

#include <util/delay.h> #include <util/delay.h>
#include "keymap.h" #include "keymap.h"
#include "matrix.h" #include "matrix.h"
#include "print.h"


// matrix is active low. (key on: 0/key off: 1) // matrix is active low. (key on: 0/key off: 1)
// row: Hi-Z(unselected)/low output(selected) // row: Hi-Z(unselected)/low output(selected)

+ 45
- 17
mykey.c View File

#define LED_OFF (PORTD |= (1<<6)) #define LED_OFF (PORTD |= (1<<6))
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) #define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))


static void print_matrix(void);



uint16_t idle_count=0; uint16_t idle_count=0;




print("firmware 0.2 for t.m.k.\n"); print("firmware 0.2 for t.m.k.\n");


int loop_count = 0;
while (1) { while (1) {
int layer = 0; int layer = 0;
uint8_t row, col, code;


matrix_scan(); matrix_scan();
layer = get_layer(); layer = get_layer();
keyboard_modifier_keys = 0; keyboard_modifier_keys = 0;
for (int i = 0; i < 6; i++) keyboard_keys[i] = KB_NO; for (int i = 0; i < 6; i++) keyboard_keys[i] = KB_NO;


for (row = 0; row < MATRIX_ROWS; row++) {
for (col = 0; col < MATRIX_COLS; col++) {
for (int row = 0; row < MATRIX_ROWS; row++) {
for (int col = 0; col < MATRIX_COLS; col++) {
if (matrix[row] & 1<<col) continue; if (matrix[row] & 1<<col) continue;


code = get_keycode(layer, row, col);
uint8_t code = get_keycode(layer, row, col);
if (code == KB_NO) { if (code == KB_NO) {
continue; continue;
} else if (KB_LCTRL <= code && code <= KB_RGUI) { } else if (KB_LCTRL <= code && code <= KB_RGUI) {


// run bootloader when 4 left modifier keys down // run bootloader when 4 left modifier keys down
if (keyboard_modifier_keys == (MOD_LCTRL | MOD_LSHIFT | MOD_LALT | MOD_LGUI)) { if (keyboard_modifier_keys == (MOD_LCTRL | MOD_LSHIFT | MOD_LALT | MOD_LGUI)) {
// cancel all keys
keyboard_modifier_keys = 0;
for (int i = 0; i < 6; i++) keyboard_keys[i] = KB_NO;
usb_keyboard_send();

print("jump to bootloader...\n"); print("jump to bootloader...\n");
_delay_ms(1000); _delay_ms(1000);
jump_bootloader(); jump_bootloader();
// accessed carefully so the interrupt routine doesn't // accessed carefully so the interrupt routine doesn't
// try to use the variable in the middle of our access // try to use the variable in the middle of our access
cli(); cli();
idle_count = 0;
//idle_count = 0;
sei(); sei();
} }


// print matrix state for debug // print matrix state for debug
if (modified) { if (modified) {
print_matrix();

// LED flush
DDRD |= 1<<PD6;
PORTD |= 1<<PD6;
}

/*
// print counts for debug
if ((loop_count % 0x1000) == 0) {
//print(".");
print("idle_count: "); phex((idle_count & 0xFF00) >> 8); phex(idle_count & 0xFF); print("\n");
print("loop_count: "); phex((loop_count & 0xFF00) >> 8); phex(loop_count & 0xFF); print("\n");
print_matrix();
}

// teensy LED flush for debug
if ((loop_count & 0x100) == 0) {
DDRD |= 1<<PD6;
PORTD |= 1<<PD6;
}
*/

// now the current pins will be the previous, and
// wait a short delay so we're not highly sensitive
// to mechanical "bounce".
_delay_ms(2);
loop_count++;
}
}

static void print_matrix(void) {
print("\nr/c 01234567\n"); print("\nr/c 01234567\n");
for (row = 0; row < MATRIX_ROWS; row++) {
for (int row = 0; row < MATRIX_ROWS; row++) {
phex(row); print(": "); phex(row); print(": ");
pbin_reverse(matrix[row]); pbin_reverse(matrix[row]);
if (matrix_has_ghost_in_row(row)) { if (matrix_has_ghost_in_row(row)) {
for (int i = 0; i < 6; i++) { phex(keyboard_keys[i]); print(" "); } for (int i = 0; i < 6; i++) { phex(keyboard_keys[i]); print(" "); }
print("\n"); print("\n");
print("mod: "); phex(keyboard_modifier_keys); print("\n"); print("mod: "); phex(keyboard_modifier_keys); print("\n");
}

// now the current pins will be the previous, and
// wait a short delay so we're not highly sensitive
// to mechanical "bounce".
_delay_ms(2);
}
} }


// This interrupt routine is run approx 61 times per second. // This interrupt routine is run approx 61 times per second.
ISR(TIMER0_OVF_vect) ISR(TIMER0_OVF_vect)
{ {
idle_count++; idle_count++;
if (idle_count > 61 * 8) {
idle_count = 0;
print(".");
}
} }

Write Preview
Loading…
Cancel
Save