mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-07-27 16:29:13 +00:00
7f48057b9e
The leds API did not work in some cases. E.g. with the following sequence: leds_off(LEDS_ALL); leds_toggle(LEDS_GREEN); leds_off(LEDS_ALL); the green LED was remaining on after the last call. This was caused by the toggle feature made synonymous with the invert feature, although it is unrelated. leds_toggle() is indeed supposed to toggle an LED, while leds_invert() is supposed to change the active level of an LED. However, all users of leds_invert() actually meant leds_toggle(), and the invert feature does not make sense in this module because it is not handy due to successive calls to leds_invert() changing the intended behavior, and hardware active levels should be managed in leds_arch_set() (e.g. by XORing the passed value with a hardware-specific constant before setting the output levels of the pins). Consequently, this change: - removes the leds_invert() function, - makes leds_toggle() behave as expected relatively to leds_off() / leds_on(), - sanitizes the code in the leds module. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
114 lines
3.5 KiB
C
114 lines
3.5 KiB
C
/*
|
|
* Copyright (c) 2005, Swedish Institute of Computer Science
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the Institute nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* This file is part of the Contiki operating system.
|
|
*
|
|
*/
|
|
|
|
#include "dev/leds.h"
|
|
#include "sys/clock.h"
|
|
#include "sys/energest.h"
|
|
|
|
static unsigned char leds;
|
|
/*---------------------------------------------------------------------------*/
|
|
static void
|
|
show_leds(unsigned char new_leds)
|
|
{
|
|
unsigned char changed;
|
|
changed = leds ^ new_leds;
|
|
leds = new_leds;
|
|
|
|
if(changed & LEDS_GREEN) {
|
|
/* Green did change */
|
|
if(leds & LEDS_GREEN) {
|
|
ENERGEST_ON(ENERGEST_TYPE_LED_GREEN);
|
|
} else {
|
|
ENERGEST_OFF(ENERGEST_TYPE_LED_GREEN);
|
|
}
|
|
}
|
|
if(changed & LEDS_YELLOW) {
|
|
if(leds & LEDS_YELLOW) {
|
|
ENERGEST_ON(ENERGEST_TYPE_LED_YELLOW);
|
|
} else {
|
|
ENERGEST_OFF(ENERGEST_TYPE_LED_YELLOW);
|
|
}
|
|
}
|
|
if(changed & LEDS_RED) {
|
|
if(leds & LEDS_RED) {
|
|
ENERGEST_ON(ENERGEST_TYPE_LED_RED);
|
|
} else {
|
|
ENERGEST_OFF(ENERGEST_TYPE_LED_RED);
|
|
}
|
|
}
|
|
leds_arch_set(leds);
|
|
}
|
|
/*---------------------------------------------------------------------------*/
|
|
void
|
|
leds_init(void)
|
|
{
|
|
leds_arch_init();
|
|
leds = 0;
|
|
}
|
|
/*---------------------------------------------------------------------------*/
|
|
void
|
|
leds_blink(void)
|
|
{
|
|
/* Blink all leds that were initially off. */
|
|
unsigned char blink;
|
|
blink = ~leds;
|
|
leds_toggle(blink);
|
|
|
|
clock_delay(400);
|
|
|
|
leds_toggle(blink);
|
|
}
|
|
/*---------------------------------------------------------------------------*/
|
|
unsigned char
|
|
leds_get(void) {
|
|
return leds_arch_get();
|
|
}
|
|
/*---------------------------------------------------------------------------*/
|
|
void
|
|
leds_on(unsigned char ledv)
|
|
{
|
|
show_leds(leds | ledv);
|
|
}
|
|
/*---------------------------------------------------------------------------*/
|
|
void
|
|
leds_off(unsigned char ledv)
|
|
{
|
|
show_leds(leds & ~ledv);
|
|
}
|
|
/*---------------------------------------------------------------------------*/
|
|
void
|
|
leds_toggle(unsigned char ledv)
|
|
{
|
|
show_leds(leds ^ ledv);
|
|
}
|
|
/*---------------------------------------------------------------------------*/
|