giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Migrate to the new LED HAL (CC26xx/CC13xx)

Browse Source
This commit is contained in:
George Oikonomou 2018-02-28 23:03:26 +00:00
parent ab710a8ed0
commit b1537374fb
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx
View File

@ -14,8 +14,7 @@ CONTIKI_TARGET_DIRS += .
PLATFORM_ROOT_DIR = $(CONTIKI)/arch/platform/$(TARGET) PLATFORM_ROOT_DIR = $(CONTIKI)/arch/platform/$(TARGET)
-include $(PLATFORM_ROOT_DIR)/$(BOARD)/Makefile.$(notdir $(BOARD)) -include $(PLATFORM_ROOT_DIR)/$(BOARD)/Makefile.$(notdir $(BOARD))
CONTIKI_TARGET_SOURCEFILES += platform.c CONTIKI_TARGET_SOURCEFILES += platform.c leds-arch.c
CONTIKI_TARGET_SOURCEFILES += sensors.c leds.c
CONTIKI_TARGET_SOURCEFILES += $(BOARD_SOURCEFILES) CONTIKI_TARGET_SOURCEFILES += $(BOARD_SOURCEFILES)
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES) CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)

4
arch/platform/srf06-cc26xx/platform.c
View File

@ -47,8 +47,8 @@
#include "ti-lib.h" #include "ti-lib.h"
#include "contiki.h" #include "contiki.h"
#include "contiki-net.h" #include "contiki-net.h"
#include "leds.h"
#include "lpm.h" #include "lpm.h"
#include "dev/leds.h"
#include "dev/gpio-hal.h" #include "dev/gpio-hal.h"
#include "dev/oscillators.h" #include "dev/oscillators.h"
#include "ieee-addr.h" #include "ieee-addr.h"
@ -84,7 +84,7 @@ unsigned short node_id = 0;
void board_init(void); void board_init(void);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
fade(unsigned char l) fade(leds_mask_t l)
{ {
volatile int i; volatile int i;
int k, j; int k, j;

4
arch/platform/srf06-cc26xx/srf06/leds-arch.c
View File

@ -30,12 +30,12 @@
*/ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#include "contiki.h" #include "contiki.h"
#include "dev/led.h" #include "dev/leds.h"
#include "dev/gpio-hal.h" #include "dev/gpio-hal.h"
#include <stdbool.h> #include <stdbool.h>
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const led_t led_arch_leds[] = { const leds_t leds_arch_leds[] = {
{ .pin = BOARD_IOID_LED_1, .negative_logic = false }, { .pin = BOARD_IOID_LED_1, .negative_logic = false },
{ .pin = BOARD_IOID_LED_2, .negative_logic = false }, { .pin = BOARD_IOID_LED_2, .negative_logic = false },
{ .pin = BOARD_IOID_LED_3, .negative_logic = false }, { .pin = BOARD_IOID_LED_3, .negative_logic = false },