andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i2c fix

master
Jack Humbert 2018-05-15 22:30:58 -04:00
parent 6dc215cd67
commit 682555faac
6 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/avr/i2c_master.c
View File

@ -13,20 +13,22 @@
void i2c_init(void) void i2c_init(void)
{ {
TWSR = 0; /* no prescaler */
TWBR = (uint8_t)TWBR_val; TWBR = (uint8_t)TWBR_val;
//TWBR = 10;
} }
uint8_t i2c_start(uint8_t address) uint8_t i2c_start(uint8_t address)
{ {
// reset TWI control register // reset TWI control register
TWCR = 0; //TWCR = 0;
// transmit START condition // transmit START condition
TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN); TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
// wait for end of transmission // wait for end of transmission
while( !(TWCR & (1<<TWINT)) ); while( !(TWCR & (1<<TWINT)) );
// check if the start condition was successfully transmitted // check if the start condition was successfully transmitted
if((TWSR & 0xF8) != TW_START){ return 1; } if(((TW_STATUS & 0xF8) != TW_START) && ((TW_STATUS & 0xF8) != TW_REP_START)){ return 1; }
// load slave address into data register // load slave address into data register
TWDR = address; TWDR = address;
@ -51,7 +53,7 @@ uint8_t i2c_write(uint8_t data)
// wait for end of transmission // wait for end of transmission
while( !(TWCR & (1<<TWINT)) ); while( !(TWCR & (1<<TWINT)) );
if( (TWSR & 0xF8) != TW_MT_DATA_ACK ){ return 1; } if( (TW_STATUS & 0xF8) != TW_MT_DATA_ACK ){ return 1; }
return 0; return 0;
} }
@ -146,4 +148,6 @@ void i2c_stop(void)
{ {
// transmit STOP condition // transmit STOP condition
TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO); TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
// wait until stop condition is executed and bus released
while(TWCR & (1<<TWSTO));
} }

7
drivers/avr/is31fl3731.c
View File

@ -84,7 +84,8 @@ void IS31FL3731_write_register( uint8_t addr, uint8_t reg, uint8_t data )
g_twi_transfer_buffer[1] = data; g_twi_transfer_buffer[1] = data;
//Transmit data until succesful //Transmit data until succesful
while(i2c_transmit(addr << 1, g_twi_transfer_buffer,2) != 0); //while(i2c_transmit(addr << 1, g_twi_transfer_buffer,2) != 0);
i2c_transmit(addr << 1, g_twi_transfer_buffer,2);
} }
void IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer ) void IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer )
@ -108,7 +109,9 @@ void IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer )
} }
//Transmit buffer until succesful //Transmit buffer until succesful
while(i2c_transmit(addr << 1, g_twi_transfer_buffer,17) != 0); //while(i2c_transmit(addr << 1, g_twi_transfer_buffer,17) != 0);
i2c_transmit(addr << 1, g_twi_transfer_buffer,17);
} }
} }

4
keyboards/ergodox_ez/ergodox_ez.c
View File

@ -1,6 +1,4 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "i2cmaster.h"
extern inline void ergodox_board_led_on(void); extern inline void ergodox_board_led_on(void);
extern inline void ergodox_right_led_1_on(void); extern inline void ergodox_right_led_1_on(void);
@ -329,7 +327,7 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{3|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 20 {{3|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 20
{{4|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 21 {{4|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 21
{{4|(7<<4)}, {24.9*3, 16*2}, 0}, // LED 22 {{4|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 22
{{4|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 23 {{4|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 23
{{4|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 24 {{4|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 24
}; };

2
keyboards/ergodox_ez/ergodox_ez.h
View File

@ -4,7 +4,7 @@
#include "quantum.h" #include "quantum.h"
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "i2cmaster.h" #include "i2c_master.h"
#include <util/delay.h> #include <util/delay.h>
#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) #define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))

3
keyboards/ergodox_ez/matrix.c
View File

@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h" #include "util.h"
#include "matrix.h" #include "matrix.h"
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "i2cmaster.h"
#ifdef DEBUG_MATRIX_SCAN_RATE #ifdef DEBUG_MATRIX_SCAN_RATE
#include "timer.h" #include "timer.h"
#endif #endif
@ -297,7 +296,7 @@ static matrix_row_t read_cols(uint8_t row)
mcp23018_status = i2c_start(I2C_ADDR_WRITE); if (mcp23018_status) goto out; mcp23018_status = i2c_start(I2C_ADDR_WRITE); if (mcp23018_status) goto out;
mcp23018_status = i2c_write(GPIOB); if (mcp23018_status) goto out; mcp23018_status = i2c_write(GPIOB); if (mcp23018_status) goto out;
mcp23018_status = i2c_start(I2C_ADDR_READ); if (mcp23018_status) goto out; mcp23018_status = i2c_start(I2C_ADDR_READ); if (mcp23018_status) goto out;
data = i2c_readNak(); data = i2c_read_nack();
data = ~data; data = ~data;
out: out:
i2c_stop(); i2c_stop();

4
keyboards/ergodox_ez/rules.mk
View File

@ -15,8 +15,8 @@
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# # project specific files # # project specific files
SRC = twimaster.c \ SRC = matrix.c \
matrix.c i2c_master.c
# MCU name # MCU name
MCU = atmega32u4 MCU = atmega32u4