Skip to content

Add I2C slave support #3287

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

Closed
mrnerdhair wants to merge 7 commits into from
Closed

Add I2C slave support #3287

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f504b38
Added i2c-slave support
bjoham Feb 3, 2017
5eb0573
Cleanup
bjoham Feb 3, 2017
b854e0d
Minor refactoring
bjoham Feb 3, 2017
0e45214
Minor refactoring
bjoham Feb 3, 2017
d2fe78e
Removed debug pins
bjoham Feb 3, 2017
f429e9b
Merge branch 'i2c_slave'
mrnerdhair May 24, 2017
04f2c0e
Merge branch 'master' into master
devyte Feb 21, 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
Prev Previous commit
Next Next commit
Minor refactoring 
Renaming, adding static keyword
  • Loading branch information
@bjoham
bjoham committed Feb 3, 2017
commit 0e45214c316ab7c6e0dbb3c51f8c38f58bf09ca7
34 changes: 16 additions & 18 deletions cores/esp8266/core_esp8266_si2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,20 @@ static volatile uint8_t twi_rxBufferIndex;
static void (*twi_onSlaveTransmit)(void);
static void (*twi_onSlaveReceive)(uint8_t*, int);

void onSclChange(void);
void onSdaChange(void);
static void onSclChange(void);
static void onSdaChange(void);

#define TASK_QUEUE_SIZE 1
#define TASK_QUEUE_PRIO 2
#define EVENTTASK_QUEUE_SIZE 1
#define EVENTTASK_QUEUE_PRIO 2

#define TWI_SIG_RANGE 0x00000100
#define TWI_SIG_RX (TWI_SIG_RANGE + 0x01)
#define TWI_SIG_TX (TWI_SIG_RANGE + 0x02)

static ETSEvent task_queue[TASK_QUEUE_SIZE];
static void task(ETSEvent *e);
static ETSEvent eventTaskQueue[EVENTTASK_QUEUE_SIZE];
static void eventTask(ETSEvent *e);
static ETSTimer timer;
void onTimer(void *timer_arg);
static void onTimer(void *timer_arg);

#define SDA_LOW() (GPES = (1 << twi_sda)) //Enable SDA (becomes output and since GPO is 0 for the pin, it will pull the line low)
#define SDA_HIGH() (GPEC = (1 << twi_sda)) //Disable SDA (becomes input and since it has pullup it will go high)
Expand Down Expand Up @@ -141,15 +141,13 @@ void twi_setClockStretchLimit(uint32_t limit){
twi_clockStretchLimit = limit * TWI_CLOCK_STRETCH_MULTIPLIER;
}

void twi_init(unsigned char sda, unsigned char scl){


ets_timer_setfn(&timer, onTimer, NULL);

ets_task(task, TASK_QUEUE_PRIO, task_queue, TASK_QUEUE_SIZE);

ets_post(TASK_QUEUE_PRIO, 9, 42);

void twi_init(unsigned char sda, unsigned char scl)
{
// set timer function
ets_timer_setfn(&timer, onTimer, NULL);

// create event task
ets_task(eventTask, EVENTTASK_QUEUE_PRIO, eventTaskQueue, EVENTTASK_QUEUE_SIZE);
Copy link
Member

@igrr igrr Feb 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When using I2C in master mode, it should not be necessary to create this event task and the timer. Same applies to twi_txBuffer and twi_rxBuffer — these should be linked in if only master mode is used.


twi_sda = sda;
twi_scl = scl;
Expand Down Expand Up @@ -409,7 +407,7 @@ void ICACHE_RAM_ATTR onTimer(void *timer_arg)
digitalWrite(13, LOW);
}

static void task(ETSEvent *e)
static void eventTask(ETSEvent *e)
{
digitalWrite(14, HIGH);

Expand Down Expand Up @@ -555,7 +553,7 @@ void ICACHE_RAM_ATTR twi_onTwipEvent(uint8_t status)
// callback to user defined callback
//twi_onSlaveReceive(twi_rxBuffer, twi_rxBufferIndex);
//twi_rxBufferLock = true; // This may be necessary
ets_post(TASK_QUEUE_PRIO, TWI_SIG_RX, twi_rxBufferIndex);
ets_post(EVENTTASK_QUEUE_PRIO, TWI_SIG_RX, twi_rxBufferIndex);

// since we submit rx buffer to "wire" library, we can reset it
twi_rxBufferIndex = 0;
Expand Down