Popravki nekih pinov in podobno ter preimenovanje

master
Jure Podgoršek 2018-04-13 21:33:18 +02:00 committed by Jurij Podgoršek
parent de69ea5a98
commit 6783b4c82b
5 changed files with 15 additions and 11 deletions

View File

@ -6,8 +6,12 @@ bool i2c_initialized = 0;
uint8_t mcp23018_status = 0x20; uint8_t mcp23018_status = 0x20;
void matrix_init_kb(void) { void matrix_init_kb(void) {
// DDRB &= ~(1<<4); // set B(4) as input /*
// PORTB &= ~(1<<4); // set B(4) internal pull-up disabled DDRB &= ~(1<<4); // set B(4) as input <- wtf to sploh ne gre z naso tipkovnico
PORTB &= ~(1<<4); // set B(4) internal pull-up disabled
*/
DDRF &= ~(1<<4); // <- tak pa ze ja!
PORTF &= ~(1<<4);
// unused pins - C7, D4, D5, D7, E6 // unused pins - C7, D4, D5, D7, E6
// set as input with internal pull-up enabled // set as input with internal pull-up enabled

View File

@ -1,5 +1,5 @@
#ifndef DACTYL_H #ifndef DAKTIL_H
#define DACTYL_H #define DAKTIL_H
#include "quantum.h" #include "quantum.h"
#include <stdint.h> #include <stdint.h>

View File

@ -1,4 +1,4 @@
#include "dactyl.h" #include "daktil.h"
#include "debug.h" #include "debug.h"
#include "action_layer.h" #include "action_layer.h"
#include "version.h" #include "version.h"

View File

@ -1,4 +1,4 @@
#include "dactyl.h" #include "daktil.h"
#include "debug.h" #include "debug.h"
#include "action_layer.h" #include "action_layer.h"
#include "version.h" #include "version.h"

View File

@ -316,12 +316,12 @@ static matrix_row_t read_cols(uint8_t row)
(PINF&(1<<6) ? 0 : (1<<4)) | (PINF&(1<<6) ? 0 : (1<<4)) |
(PINF&(1<<7) ? 0 : (1<<5)) ; (PINF&(1<<7) ? 0 : (1<<5)) ;
*/ */
(PINB&(1<<4) ? 0 : (1<<0)) | (PINB&(1<<5) ? 0 : (1<<0)) |
(PINB&(1<<5) ? 0 : (1<<1)) | (PINB&(1<<4) ? 0 : (1<<1)) |
(PINE&(1<<6) ? 0 : (1<<2)) | (PINE&(1<<6) ? 0 : (1<<2)) |
(PIND&(1<<4) ? 0 : (1<<3)) | (PIND&(1<<7) ? 0 : (1<<3)) |
(PIND&(1<<7) ? 0 : (1<<4)) | (PINC&(1<<6) ? 0 : (1<<4)) |
(PINC&(1<<6) ? 0 : (1<<5)) ; (PIND&(1<<4) ? 0 : (1<<5)) ;
} }
} }