Merge pull request #511 from ADVANSEE/leds

leds: Fixes and enhancements
This commit is contained in:
Adam Dunkels 2014-06-11 22:37:34 +02:00
commit def57199b9
6 changed files with 31 additions and 43 deletions

View File

@ -34,54 +34,58 @@
#include "sys/clock.h" #include "sys/clock.h"
#include "sys/energest.h" #include "sys/energest.h"
static unsigned char leds, invert; static unsigned char leds;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
show_leds(unsigned char changed) show_leds(unsigned char new_leds)
{ {
unsigned char changed;
changed = leds ^ new_leds;
leds = new_leds;
if(changed & LEDS_GREEN) { if(changed & LEDS_GREEN) {
/* Green did change */ /* Green did change */
if((invert ^ leds) & LEDS_GREEN) { if(leds & LEDS_GREEN) {
ENERGEST_ON(ENERGEST_TYPE_LED_GREEN); ENERGEST_ON(ENERGEST_TYPE_LED_GREEN);
} else { } else {
ENERGEST_OFF(ENERGEST_TYPE_LED_GREEN); ENERGEST_OFF(ENERGEST_TYPE_LED_GREEN);
} }
} }
if(changed & LEDS_YELLOW) { if(changed & LEDS_YELLOW) {
if((invert ^ leds) & LEDS_YELLOW) { if(leds & LEDS_YELLOW) {
ENERGEST_ON(ENERGEST_TYPE_LED_YELLOW); ENERGEST_ON(ENERGEST_TYPE_LED_YELLOW);
} else { } else {
ENERGEST_OFF(ENERGEST_TYPE_LED_YELLOW); ENERGEST_OFF(ENERGEST_TYPE_LED_YELLOW);
} }
} }
if(changed & LEDS_RED) { if(changed & LEDS_RED) {
if((invert ^ leds) & LEDS_RED) { if(leds & LEDS_RED) {
ENERGEST_ON(ENERGEST_TYPE_LED_RED); ENERGEST_ON(ENERGEST_TYPE_LED_RED);
} else { } else {
ENERGEST_OFF(ENERGEST_TYPE_LED_RED); ENERGEST_OFF(ENERGEST_TYPE_LED_RED);
} }
} }
leds_arch_set(leds ^ invert); leds_arch_set(leds);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
leds_init(void) leds_init(void)
{ {
leds_arch_init(); leds_arch_init();
leds = invert = 0; leds = 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
leds_blink(void) leds_blink(void)
{ {
/* Blink all leds. */ /* Blink all leds that were initially off. */
unsigned char inv; unsigned char blink;
inv = ~(leds ^ invert); blink = ~leds;
leds_invert(inv); leds_toggle(blink);
clock_delay(400); clock_delay(400);
leds_invert(inv); leds_toggle(blink);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
unsigned char unsigned char
@ -90,33 +94,26 @@ leds_get(void) {
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
leds_set(unsigned char ledv)
{
show_leds(ledv);
}
/*---------------------------------------------------------------------------*/
void
leds_on(unsigned char ledv) leds_on(unsigned char ledv)
{ {
unsigned char changed; show_leds(leds | ledv);
changed = (~leds) & ledv;
leds |= ledv;
show_leds(changed);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
leds_off(unsigned char ledv) leds_off(unsigned char ledv)
{ {
unsigned char changed; show_leds(leds & ~ledv);
changed = leds & ledv;
leds &= ~ledv;
show_leds(changed);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
leds_toggle(unsigned char ledv) leds_toggle(unsigned char ledv)
{ {
leds_invert(ledv); show_leds(leds ^ ledv);
}
/*---------------------------------------------------------------------------*/
/* invert the invert register using the leds parameter */
void
leds_invert(unsigned char ledv) {
invert = invert ^ ledv;
show_leds(ledv);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

View File

@ -77,13 +77,13 @@ void leds_blink(void);
#endif /* LEDS_CONF_ALL */ #endif /* LEDS_CONF_ALL */
/** /**
* Returns the current status of all leds (respects invert) * Returns the current status of all leds
*/ */
unsigned char leds_get(void); unsigned char leds_get(void);
void leds_set(unsigned char leds);
void leds_on(unsigned char leds); void leds_on(unsigned char leds);
void leds_off(unsigned char leds); void leds_off(unsigned char leds);
void leds_toggle(unsigned char leds); void leds_toggle(unsigned char leds);
void leds_invert(unsigned char leds);
/** /**
* Leds implementation * Leds implementation

View File

@ -58,8 +58,4 @@ leds_off(unsigned char leds)
void void
leds_toggle(unsigned char leds) leds_toggle(unsigned char leds)
{ {
/*
* Synonym: void leds_invert(unsigned char leds);
*/
asm(".global leds_invert\nleds_invert:\n");
} }

View File

@ -74,10 +74,5 @@ leds_off(unsigned char leds)
void void
leds_toggle(unsigned char leds) leds_toggle(unsigned char leds)
{ {
/*
* Synonym: void leds_invert(unsigned char leds);
*/
asm(".global leds_invert\nleds_invert:\n");
LEDS_PxOUT ^= l2p[leds & LEDS_ALL]; LEDS_PxOUT ^= l2p[leds & LEDS_ALL];
} }

View File

@ -64,7 +64,7 @@ tcpip_output(const uip_lladdr_t *a)
/* printf("pppp o %u tx %u rx %u\n", UIP_IP_BUF->proto, /* printf("pppp o %u tx %u rx %u\n", UIP_IP_BUF->proto,
packetbuf_attr(PACKETBUF_ATTR_TRANSMIT_TIME), packetbuf_attr(PACKETBUF_ATTR_TRANSMIT_TIME),
packetbuf_attr(PACKETBUF_ATTR_LISTEN_TIME));*/ packetbuf_attr(PACKETBUF_ATTR_LISTEN_TIME));*/
leds_invert(LEDS_GREEN); leds_toggle(LEDS_GREEN);
} }
return 0; return 0;
} }
@ -94,7 +94,7 @@ tcpip_input(void)
packetbuf_attr(PACKETBUF_ATTR_TRANSMIT_TIME), packetbuf_attr(PACKETBUF_ATTR_TRANSMIT_TIME),
packetbuf_attr(PACKETBUF_ATTR_LISTEN_TIME));*/ packetbuf_attr(PACKETBUF_ATTR_LISTEN_TIME));*/
slip_write(uip_buf, uip_len); slip_write(uip_buf, uip_len);
leds_invert(LEDS_RED); leds_toggle(LEDS_RED);
uip_len = 0; uip_len = 0;
} }
} }
@ -112,7 +112,7 @@ slip_tcpip_input(void)
static void static void
slip_activity(void) slip_activity(void)
{ {
leds_invert(LEDS_BLUE); leds_toggle(LEDS_BLUE);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS_THREAD(uip6_bridge, ev, data) PROCESS_THREAD(uip6_bridge, ev, data)

View File

@ -968,7 +968,7 @@ void mac_802154raw(const struct radio_driver *radio)
#endif #endif
slip_write(uip_buf, len); slip_write(uip_buf, len);
leds_invert(LEDS_RED); leds_toggle(LEDS_RED);
//rndis_send(raw_buf, sendlen, 1); //rndis_send(raw_buf, sendlen, 1);
//rndis_stat.rxok++; //rndis_stat.rxok++;