Skip to content

Commit d2fe78e

Browse files
committed
Removed debug pins
1 parent 0e45214 commit d2fe78e

File tree

1 file changed

+21
-32
lines changed

1 file changed

+21
-32
lines changed

Diff for: cores/esp8266/core_esp8266_si2c.c

+21-32
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ void twi_init(unsigned char sda, unsigned char scl)
153153
twi_scl = scl;
154154
pinMode(twi_sda, INPUT_PULLUP);
155155
pinMode(twi_scl, INPUT_PULLUP);
156-
pinMode(2, OUTPUT);
157-
pinMode(12, OUTPUT);
158-
pinMode(14, OUTPUT);
159-
pinMode(13, OUTPUT);
160-
digitalWrite(2, HIGH);
156+
//pinMode(2, OUTPUT);
157+
//pinMode(12, OUTPUT);
158+
//pinMode(14, OUTPUT);
159+
//pinMode(13, OUTPUT);
160+
//digitalWrite(2, HIGH);
161161
twi_setClock(100000);
162162
twi_setClockStretchLimit(230); // default value is 230 uS
163163

@@ -396,20 +396,20 @@ void ICACHE_RAM_ATTR twi_releaseBus(void)
396396

397397
void ICACHE_RAM_ATTR onTimer(void *timer_arg)
398398
{
399-
digitalWrite(13, HIGH);
399+
//digitalWrite(13, HIGH);
400400
twi_releaseBus();
401401
//ets_timer_disarm(&timer);
402402

403403
twip_status = TW_BUS_ERROR;
404404
twi_onTwipEvent(twip_status);
405405
twip_mode = TWIPM_WAIT;
406406
twip_state = TWIP_BUS_ERR;
407-
digitalWrite(13, LOW);
407+
//digitalWrite(13, LOW);
408408
}
409409

410410
static void eventTask(ETSEvent *e)
411411
{
412-
digitalWrite(14, HIGH);
412+
//digitalWrite(14, HIGH);
413413

414414
if (e == NULL) {
415415
return;
@@ -432,17 +432,18 @@ static void eventTask(ETSEvent *e)
432432
break;
433433

434434
case TWI_SIG_RX:
435+
// ack future responses and leave slave receiver state
435436
twi_releaseBus();
436437
twi_onSlaveReceive(twi_rxBuffer, e->par);
437438
break;
438439
}
439440

440-
digitalWrite(14, LOW);
441+
//digitalWrite(14, LOW);
441442
}
442443

443444
void ICACHE_RAM_ATTR twi_onTwipEvent(uint8_t status)
444445
{
445-
digitalWrite(13, HIGH);
446+
//digitalWrite(13, HIGH);
446447
//switch(TW_STATUS){
447448
switch(status) {
448449
#if 0
@@ -544,14 +545,11 @@ void ICACHE_RAM_ATTR twi_onTwipEvent(uint8_t status)
544545
}
545546
break;
546547
case TW_SR_STOP: // stop or repeated start condition received
547-
// ack future responses and leave slave receiver state
548-
//BH twi_releaseBus();
549548
// put a null char after data if there's room
550549
if(twi_rxBufferIndex < TWI_BUFFER_LENGTH){
551550
twi_rxBuffer[twi_rxBufferIndex] = '\0';
552551
}
553-
// callback to user defined callback
554-
//twi_onSlaveReceive(twi_rxBuffer, twi_rxBufferIndex);
552+
// callback to user-defined callback over event task to allow for non-RAM-residing code
555553
//twi_rxBufferLock = true; // This may be necessary
556554
ets_post(EVENTTASK_QUEUE_PRIO, TWI_SIG_RX, twi_rxBufferIndex);
557555

@@ -574,22 +572,13 @@ void ICACHE_RAM_ATTR twi_onTwipEvent(uint8_t status)
574572
twi_txBufferIndex = 0;
575573
// set tx buffer length to be zero, to verify if user changes it
576574
twi_txBufferLength = 0;
575+
// callback to user-defined callback over event task to allow for non-RAM-residing code
577576
// request for txBuffer to be filled and length to be set
578577
// note: user must call twi_transmit(bytes, length) to do this
579-
//twi_onSlaveTransmit();
580578
ets_post(EVENTTASK_QUEUE_PRIO, TWI_SIG_TX, 0);
581-
582-
// if they didn't change buffer & length, initialize it
583-
if(false) { //0 == twi_txBufferLength){
584-
twi_txBufferLength = 1;
585-
twi_txBuffer[0] = 0x00;
586-
}
587-
else
588-
{
589-
break;
590-
}
591-
// transmit first byte from buffer, fall
592-
case TW_ST_DATA_ACK: // byte sent, ack returned
579+
break;
580+
581+
case TW_ST_DATA_ACK: // byte sent, ack returned
593582
// copy data to output register
594583
TWDR = twi_txBuffer[twi_txBufferIndex++];
595584

@@ -619,7 +608,7 @@ void ICACHE_RAM_ATTR twi_onTwipEvent(uint8_t status)
619608
twi_stop();
620609
break;
621610
}
622-
digitalWrite(13, LOW);
611+
//digitalWrite(13, LOW);
623612
}
624613

625614
void ICACHE_RAM_ATTR onSclChange(void)
@@ -633,7 +622,7 @@ void ICACHE_RAM_ATTR onSclChange(void)
633622
sda = SDA_READ();
634623
scl = SCL_READ();
635624

636-
digitalWrite(12, scl);
625+
//digitalWrite(12, scl);
637626
//digitalWrite(14, LOW);
638627

639628
twip_status = 0xF8; // reset TWI status
@@ -793,7 +782,7 @@ void ICACHE_RAM_ATTR onSdaChange(void)
793782
sda = SDA_READ();
794783
scl = SCL_READ();
795784

796-
digitalWrite(2, sda);
785+
//digitalWrite(2, sda);
797786

798787
switch (twip_state)
799788
{
@@ -806,9 +795,9 @@ void ICACHE_RAM_ATTR onSdaChange(void)
806795
// START
807796
bitCount = 8;
808797
twip_state = TWIP_START;
809-
digitalWrite(14, HIGH);
798+
//digitalWrite(14, HIGH);
810799
ets_timer_arm_new(&timer, twi_timeout_ms, false, true); // Once, ms
811-
digitalWrite(14, LOW);
800+
//digitalWrite(14, LOW);
812801
}
813802
break;
814803

0 commit comments

Comments
 (0)