Browse Source

Fix Helix i2c wrong bit rate (#3207)

pull/3212/head
MakotoKurauchi 5 years ago
committed by Drashna Jaelre
parent
commit
0f3a73025c
7 changed files with 3 additions and 10 deletions
  1. +1
    -1
      keyboards/helix/i2c.c
  2. +1
    -1
      keyboards/helix/i2c.h
  3. +0
    -2
      keyboards/helix/rev2/keymaps/default/keymap.c
  4. +0
    -2
      keyboards/helix/rev2/keymaps/five_rows/keymap.c
  5. +0
    -2
      keyboards/helix/rev2/keymaps/froggy/keymap.c
  6. +0
    -2
      keyboards/helix/rev2/keymaps/led_test/keymap.c
  7. +1
    -0
      keyboards/helix/ssd1306.c

+ 1
- 1
keyboards/helix/i2c.c View File

@ -34,7 +34,7 @@ void i2c_delay(void) {
// _delay_us(100);
}
// Setup twi to run at 100kHz
// Setup twi to run at 100kHz or 400kHz (see ./i2c.h SCL_CLOCK)
void i2c_master_init(void) {
// no prescaler
TWSR = 0;


+ 1
- 1
keyboards/helix/i2c.h View File

@ -15,7 +15,7 @@
#define SLAVE_BUFFER_SIZE 0x10
// i2c SCL clock frequency
// i2c SCL clock frequency 400kHz
#define SCL_CLOCK 400000L
extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];


+ 0
- 2
keyboards/helix/rev2/keymaps/default/keymap.c View File

@ -6,7 +6,6 @@
#include "lufa.h"
#include "split_util.h"
#endif
#include "LUFA/Drivers/Peripheral/TWI.h"
#ifdef AUDIO_ENABLE
#include "audio.h"
#endif
@ -479,7 +478,6 @@ void matrix_init_user(void) {
#endif
//SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
#ifdef SSD1306OLED
TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
iota_gfx_init(!has_usb()); // turns on the display
#endif
}


+ 0
- 2
keyboards/helix/rev2/keymaps/five_rows/keymap.c View File

@ -6,7 +6,6 @@
#include "lufa.h"
#include "split_util.h"
#endif
#include "LUFA/Drivers/Peripheral/TWI.h"
#ifdef AUDIO_ENABLE
#include "audio.h"
#endif
@ -413,7 +412,6 @@ void matrix_init_user(void) {
#endif
//SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
#ifdef SSD1306OLED
TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
iota_gfx_init(!has_usb()); // turns on the display
#endif
}


+ 0
- 2
keyboards/helix/rev2/keymaps/froggy/keymap.c View File

@ -6,7 +6,6 @@
#include "lufa.h"
#include "split_util.h"
#endif
#include "LUFA/Drivers/Peripheral/TWI.h"
#ifdef AUDIO_ENABLE
#include "audio.h"
#endif
@ -435,7 +434,6 @@ void matrix_init_user(void) {
#endif
//SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
#ifdef SSD1306OLED
TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
iota_gfx_init(!has_usb()); // turns on the display
#endif
}


+ 0
- 2
keyboards/helix/rev2/keymaps/led_test/keymap.c View File

@ -6,7 +6,6 @@
#include "lufa.h"
#include "split_util.h"
#endif
#include "LUFA/Drivers/Peripheral/TWI.h"
#ifdef AUDIO_ENABLE
#include "audio.h"
#endif
@ -477,7 +476,6 @@ void matrix_init_user(void) {
#endif
//SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
#ifdef SSD1306OLED
TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
iota_gfx_init(!has_usb()); // turns on the display
#endif
}


+ 1
- 0
keyboards/helix/ssd1306.c View File

@ -127,6 +127,7 @@ static int8_t capture_sendchar(uint8_t c) {
bool iota_gfx_init(bool rotate) {
bool success = false;
i2c_master_init();
send_cmd1(DisplayOff);
send_cmd2(SetDisplayClockDiv, 0x80);
send_cmd2(SetMultiPlex, DisplayHeight - 1);


Loading…
Cancel
Save