summaryrefslogtreecommitdiff
path: root/n/avr/modules/twi/twi.avr.c
diff options
context:
space:
mode:
Diffstat (limited to 'n/avr/modules/twi/twi.avr.c')
-rw-r--r--n/avr/modules/twi/twi.avr.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/n/avr/modules/twi/twi.avr.c b/n/avr/modules/twi/twi.avr.c
index cf70c6d..3b2a8e6 100644
--- a/n/avr/modules/twi/twi.avr.c
+++ b/n/avr/modules/twi/twi.avr.c
@@ -27,7 +27,7 @@
#include <io.h>
#include <compat/twi.h>
-#include "modules/uart/uart.h"
+// #include "modules/uart/uart.h"
// TODO mettre l'etat partout
// quand on fait les demandes, et les liberations qui vont bien dans
@@ -135,10 +135,10 @@ twi_ms_is_finished ()
int8_t
twi_ms_send (uint8_t addr, uint8_t *data, uint8_t len)
{
- uart0_putc ('a');
+ //uart0_putc ('a');
if (state_ms != TWI_BUSY)
{
- uart0_putc ('b');
+ //uart0_putc ('b');
state_ms = TWI_BUSY;
nb_retry_ms = 0;
dest_addr_ms = addr & 0xfe;
@@ -150,7 +150,7 @@ twi_ms_send (uint8_t addr, uint8_t *data, uint8_t len)
}
else
{
- uart0_putc ('c');
+ //uart0_putc ('c');
return -1;
}
}
@@ -161,10 +161,10 @@ int8_t
twi_ms_read (uint8_t addr, uint8_t *data, uint8_t len)
{
- uart0_putc ('z');
+ //uart0_putc ('z');
if (state_ms != TWI_BUSY)
{
- uart0_putc ('y');
+ //uart0_putc ('y');
state_ms = TWI_BUSY;
nb_retry_ms = 0;
dest_addr_ms = addr | 0x01;
@@ -175,7 +175,7 @@ twi_ms_read (uint8_t addr, uint8_t *data, uint8_t len)
}
else
{
- uart0_putc ('x');
+ //uart0_putc ('x');
return -1;
}
}
@@ -213,7 +213,7 @@ SIGNAL (SIG_2WIRE_SERIAL)
/* NO BREAK */
/* Recu un ack apres l'envoie d'un bit */
case TW_ST_DATA_ACK:
- uart0_putc ('p');
+ //uart0_putc ('p');
TWDR = send_sys_sl[send_idx_sl++];
if (send_idx_sl == TWI_SL_SEND_SIZE)
TWCR &= ~_BV(TWEA);
@@ -221,7 +221,7 @@ SIGNAL (SIG_2WIRE_SERIAL)
break;
case TW_ST_DATA_NACK:
case TW_ST_LAST_DATA:
- uart0_putc ('q');
+ //uart0_putc ('q');
TWCR |= _BV (TWEA);
TWCR |= _BV(TWINT);
break;
@@ -231,7 +231,7 @@ SIGNAL (SIG_2WIRE_SERIAL)
case TW_SR_ARB_LOST_SLA_ACK:
case TW_SR_GCALL_ACK:
case TW_SR_ARB_LOST_GCALL_ACK:
- uart0_putc ('u');
+ //uart0_putc ('u');
data_ready_sl = 0;
rcpt_idx_sl = 0;
if (TWI_SL_RCPT_SIZE == 1)
@@ -241,7 +241,7 @@ SIGNAL (SIG_2WIRE_SERIAL)
/* DATA + ACK */
case TW_SR_DATA_ACK:
case TW_SR_GCALL_DATA_ACK:
- uart0_putc ('s');
+ //uart0_putc ('s');
rcpt_buf_sl[rcpt_idx_sl++] = TWDR;
if (TWI_SL_RCPT_SIZE - rcpt_idx_sl == 1)
TWCR &= ~_BV(TWEA);
@@ -250,12 +250,12 @@ SIGNAL (SIG_2WIRE_SERIAL)
/* DATA + NACK */
case TW_SR_DATA_NACK:
case TW_SR_GCALL_DATA_NACK:
- uart0_putc ('o');
+ //uart0_putc ('o');
rcpt_buf_sl[rcpt_idx_sl++] = TWDR;
/* NO BREAK */
/* STOP */
case TW_SR_STOP:
- uart0_putc ('q');
+ //uart0_putc ('q');
data_ready_sl = 1;
TWCR |= _BV(TWINT);
break;
@@ -264,7 +264,7 @@ SIGNAL (SIG_2WIRE_SERIAL)
/* Master */
case TW_START:
case TW_REP_START:
- uart0_putc ('d');
+ //uart0_putc ('d');
/* start transmis, on envoie l'adresse */
TWCR &= ~ (_BV (TWSTA) | _BV (TWSTO) | _BV (TWINT));
TWDR = dest_addr_ms;
@@ -277,7 +277,7 @@ SIGNAL (SIG_2WIRE_SERIAL)
/* Master Transmitter */
case TW_MT_DATA_ACK:
case TW_MT_SLA_ACK:
- uart0_putc ('e');
+ //uart0_putc ('e');
/* start transmis, on envoie l'adresse */
/* slave ok
* On envoi des données si il en reste
@@ -294,7 +294,7 @@ SIGNAL (SIG_2WIRE_SERIAL)
TWCR |= _BV (TWINT);
break;
case TW_MT_SLA_NACK:
- uart0_putc ('f');
+ //uart0_putc ('f');
/* start transmis, on envoie l'adresse */
/* le slave ne repond plus
* on essaye NB_RETRY avant d'arreter
@@ -312,7 +312,7 @@ SIGNAL (SIG_2WIRE_SERIAL)
TWCR |= _BV (TWINT);
break;
case TW_MT_DATA_NACK:
- uart0_putc ('g');
+ //uart0_putc ('g');
/* start transmis, on envoie l'adresse */
/* le slave ne veut plus de donnée */
TWCR |= _BV (TWSTO);
@@ -321,7 +321,7 @@ SIGNAL (SIG_2WIRE_SERIAL)
break;
/* Master Receiver */
case TW_MR_SLA_ACK:
- uart0_putc ('h');
+ //uart0_putc ('h');
/* start transmis, on envoie l'adresse */
if (len_buf_ms > 1) /* on recoit plusieurs octet */
{
@@ -333,26 +333,26 @@ SIGNAL (SIG_2WIRE_SERIAL)
/* start transmis, on envoie l'adresse */
if (nb_retry_ms < NB_RETRY)
{
- uart0_putc ('i');
+ //uart0_putc ('i');
TWCR |= _BV (TWEA);
}
else
{
- uart0_putc ('j');
+ //uart0_putc ('j');
TWCR |= _BV (TWSTO);
state_ms = TWI_FAILURE;
}
TWCR |= _BV (TWINT);
break;
case TW_MR_DATA_ACK:
- uart0_putc ('k');
+ //uart0_putc ('k');
send_buf_ms[idx_ms ++] = TWDR;
if (idx_ms == (len_buf_ms - 1))
TWCR &= ~ _BV (TWEA);
TWCR |= _BV (TWINT);
break;
case TW_MR_DATA_NACK: /* dernier byte */
- uart0_putc ('l');
+ //uart0_putc ('l');
state_ms = TWI_SUCCESS;
send_buf_ms[idx_ms ++] = TWDR;
TWCR |= _BV (TWSTO);