Implement the new LED HAL (SmartRF06 CC26xx/CC13xx)

This commit is contained in:
George Oikonomou 2018-02-25 18:57:58 +00:00
parent ce4caf2c7c
commit f932e51128
4 changed files with 24 additions and 88 deletions

View File

@ -2,7 +2,7 @@ CFLAGS += -DBOARD_SMARTRF06EB=1
CONTIKI_TARGET_DIRS += srf06 CONTIKI_TARGET_DIRS += srf06
BOARD_SOURCEFILES += leds-arch.c srf06-sensors.c button-sensor.c board.c BOARD_SOURCEFILES += srf06-sensors.c button-sensor.c board.c
BOARD_SOURCEFILES += als-sensor.c BOARD_SOURCEFILES += als-sensor.c
### Signal that we can be programmed with cc2538-bsl ### Signal that we can be programmed with cc2538-bsl

View File

@ -58,20 +58,16 @@
#include "ioc.h" #include "ioc.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**
* \name LED configurations * \name LED HAL configuration
* *
* Those values are not meant to be modified by the user * Those values are not meant to be modified by the user
* @{ * @{
*/ */
#define LEDS_RED 1 /**< LED1 (Red) */ #define LEDS_CONF_COUNT 4
#define LEDS_YELLOW 2 /**< LED2 (Yellow) */ #define LEDS_CONF_RED 1
#define LEDS_GREEN 4 /**< LED3 (Green) */ #define LEDS_CONF_YELLOW 2
#define LEDS_ORANGE 8 /**< LED4 (Orange) */ #define LEDS_CONF_GREEN 4
#define LEDS_CONF_ORANGE 8
#define LEDS_CONF_ALL 15
/* Notify various examples that we have LEDs */
#define PLATFORM_HAS_LEDS 1
/** @} */ /** @} */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**
@ -84,12 +80,6 @@
#define BOARD_IOID_LED_2 IOID_27 #define BOARD_IOID_LED_2 IOID_27
#define BOARD_IOID_LED_3 IOID_7 #define BOARD_IOID_LED_3 IOID_7
#define BOARD_IOID_LED_4 IOID_6 #define BOARD_IOID_LED_4 IOID_6
#define BOARD_LED_1 (1 << BOARD_IOID_LED_1)
#define BOARD_LED_2 (1 << BOARD_IOID_LED_2)
#define BOARD_LED_3 (1 << BOARD_IOID_LED_3)
#define BOARD_LED_4 (1 << BOARD_IOID_LED_4)
#define BOARD_LED_ALL (BOARD_LED_1 | BOARD_LED_2 | BOARD_LED_3 | \
BOARD_LED_4)
/** @} */ /** @} */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**

View File

@ -58,20 +58,16 @@
#include "ioc.h" #include "ioc.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**
* \name LED configurations * \name LED HAL configuration
* *
* Those values are not meant to be modified by the user * Those values are not meant to be modified by the user
* @{ * @{
*/ */
#define LEDS_RED 1 /**< LED1 (Red) */ #define LEDS_CONF_COUNT 4
#define LEDS_YELLOW 2 /**< LED2 (Yellow) */ #define LEDS_CONF_RED 1
#define LEDS_GREEN 4 /**< LED3 (Green) */ #define LEDS_CONF_YELLOW 2
#define LEDS_ORANGE 8 /**< LED4 (Orange) */ #define LEDS_CONF_GREEN 4
#define LEDS_CONF_ORANGE 8
#define LEDS_CONF_ALL 15
/* Notify various examples that we have LEDs */
#define PLATFORM_HAS_LEDS 1
/** @} */ /** @} */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**
@ -84,12 +80,6 @@
#define BOARD_IOID_LED_2 IOID_27 #define BOARD_IOID_LED_2 IOID_27
#define BOARD_IOID_LED_3 IOID_7 #define BOARD_IOID_LED_3 IOID_7
#define BOARD_IOID_LED_4 IOID_6 #define BOARD_IOID_LED_4 IOID_6
#define BOARD_LED_1 (1 << BOARD_IOID_LED_1)
#define BOARD_LED_2 (1 << BOARD_IOID_LED_2)
#define BOARD_LED_3 (1 << BOARD_IOID_LED_3)
#define BOARD_LED_4 (1 << BOARD_IOID_LED_4)
#define BOARD_LED_ALL (BOARD_LED_1 | BOARD_LED_2 | BOARD_LED_3 | \
BOARD_LED_4)
/** @} */ /** @} */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**

View File

@ -1,10 +1,11 @@
/* /*
* Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/ * Copyright (c) 2018, George Oikonomou - http://www.spd.gr
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
*
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
@ -28,63 +29,18 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/**
* \addtogroup srf06-common-peripherals
* @{
*
* \file
* Driver for the SmartRF06EB LEDs when a CC13xx/CC26xx EM is mounted on it
*/
/*---------------------------------------------------------------------------*/
#include "contiki.h" #include "contiki.h"
#include "dev/leds.h" #include "dev/led.h"
#include "ti-lib.h" #include "dev/gpio-hal.h"
/*---------------------------------------------------------------------------*/
static unsigned char c;
static int inited = 0;
/*---------------------------------------------------------------------------*/
void
leds_arch_init(void)
{
if(inited) {
return;
}
inited = 1;
ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_LED_1); #include <stdbool.h>
ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_LED_2);
ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_LED_3);
ti_lib_ioc_pin_type_gpio_output(BOARD_IOID_LED_4);
ti_lib_gpio_clear_multi_dio(BOARD_LED_ALL);
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
unsigned char const led_t led_arch_leds[] = {
leds_arch_get(void) { .pin = BOARD_IOID_LED_1, .negative_logic = false },
{ { .pin = BOARD_IOID_LED_2, .negative_logic = false },
return c; { .pin = BOARD_IOID_LED_3, .negative_logic = false },
} { .pin = BOARD_IOID_LED_4, .negative_logic = false },
};
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void
leds_arch_set(unsigned char leds)
{
c = leds;
/* Clear everything */
ti_lib_gpio_clear_multi_dio(BOARD_LED_ALL);
if((leds & LEDS_RED) == LEDS_RED) {
ti_lib_gpio_set_dio(BOARD_IOID_LED_1);
}
if((leds & LEDS_YELLOW) == LEDS_YELLOW) {
ti_lib_gpio_set_dio(BOARD_IOID_LED_2);
}
if((leds & LEDS_GREEN) == LEDS_GREEN) {
ti_lib_gpio_set_dio(BOARD_IOID_LED_3);
}
if((leds & LEDS_ORANGE) == LEDS_ORANGE) {
ti_lib_gpio_set_dio(BOARD_IOID_LED_4);
}
}
/*---------------------------------------------------------------------------*/
/** @} */