deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed ENERGEST_CONF_ON which is present in contiki-conf.h anyway

Browse source
This commit is contained in:
adamdunkels 2008-01-08 08:18:00 +00:00
parent bd9230b4b3
commit 959c4f3ee2
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/sky/Makefile.sky
View file

@ -1,11 +1,11 @@
# $Id: Makefile.sky,v 1.13 2007/11/28 23:31:53 adamdunkels Exp $ # $Id: Makefile.sky,v 1.14 2008/01/08 08:18:00 adamdunkels Exp $
ARCH=msp430.c leds.c watchdog.c light.c spi.c ds2411.c \ ARCH=msp430.c leds.c watchdog.c light.c spi.c ds2411.c \
xmem.c i2c.c sht11.c battery-sensor.c \ xmem.c i2c.c sht11.c battery-sensor.c \
simple-cc2420.c simple-cc2420-arch.c irq.c energest-arch.c \ simple-cc2420.c simple-cc2420-arch.c irq.c energest-arch.c \
node-id.c sensors.c button-sensor.c cfs-xmem.c \ node-id.c sensors.c button-sensor.c cfs-xmem.c \
radio-sensor.c uart1.c uip-ipchksum.c\ radio-sensor.c uart1.c uip-ipchksum.c \
#slip.c slip_uart1.c #slip.c slip_uart1.c
CONTIKI_TARGET_DIRS = . dev apps net CONTIKI_TARGET_DIRS = . dev apps net
@ -13,8 +13,6 @@ ifndef CONTIKI_TARGET_MAIN
CONTIKI_TARGET_MAIN = contiki-sky-main.c CONTIKI_TARGET_MAIN = contiki-sky-main.c
endif endif
CFLAGS += -DENERGEST_CONF_ON=1
CONTIKI_TARGET_SOURCEFILES += $(ARCH) $(UIPDRIVERS) $(CONTIKI_TARGET_MAIN) CONTIKI_TARGET_SOURCEFILES += $(ARCH) $(UIPDRIVERS) $(CONTIKI_TARGET_MAIN)
MCU=msp430x1611 MCU=msp430x1611