Skip to content

Update core_esp8266_si2c.c #3389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 24, 2018
Merged

Update core_esp8266_si2c.c #3389

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3b70bc
Update core_esp8266_si2c.c
cgommel Jun 30, 2017
82f6ab5
Merge branch 'master' into master
devyte Mar 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions cores/esp8266/core_esp8266_si2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "pins_arduino.h"
#include "wiring_private.h"

unsigned int preferred_si2c_clock = 100000;
unsigned char twi_dcount = 18;
static unsigned char twi_sda, twi_scl;
static uint32_t twi_clockStretchLimit;
Expand All @@ -44,6 +45,7 @@ static uint32_t twi_clockStretchLimit;
#endif

void twi_setClock(unsigned int freq){
preferred_si2c_clock = freq;
#if F_CPU == FCPU80
if(freq <= 50000) twi_dcount = 38;//about 50KHz
else if(freq <= 100000) twi_dcount = 19;//about 100KHz
Expand Down Expand Up @@ -72,7 +74,7 @@ void twi_init(unsigned char sda, unsigned char scl){
twi_scl = scl;
pinMode(twi_sda, INPUT_PULLUP);
pinMode(twi_scl, INPUT_PULLUP);
twi_setClock(100000);
twi_setClock(preferred_si2c_clock);
twi_setClockStretchLimit(230); // default value is 230 uS
}

Expand Down Expand Up @@ -231,5 +233,6 @@ uint8_t twi_status() {
if(!twi_write_start())
return I2C_SDA_HELD_LOW_AFTER_INIT; //line busy. SDA again held low by another device. 2nd master?

return I2C_OK; //all ok
return I2C_OK; //all ok

}