reverted accidental commit
This commit is contained in:
parent
d2655eac7a
commit
467df8ad4c
2 changed files with 6 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile.sky,v 1.33 2010/01/14 20:16:52 adamdunkels Exp $
|
||||
# $Id: Makefile.sky,v 1.34 2010/01/14 22:26:38 nifi Exp $
|
||||
|
||||
|
||||
ARCH=msp430.c leds.c watchdog.c spi.c ds2411.c \
|
||||
|
@ -29,7 +29,7 @@ contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o}
|
|||
|
||||
|
||||
NUMPAR=20
|
||||
#IHEXFILE=tmpimage.ihex
|
||||
IHEXFILE=tmpimage.ihex
|
||||
|
||||
# Check if we are running under Windows
|
||||
ifdef OS
|
||||
|
@ -87,8 +87,8 @@ ifdef MOTE
|
|||
$(MAKE) sky-u.$(subst /,-,$(word $(MOTE), $(MOTES)))
|
||||
else # MOTE
|
||||
%.upload: %.ihex
|
||||
# cp $< $(IHEXFILE)
|
||||
$(MAKE) sky-reset sky-upload IHEXFILE=$<
|
||||
cp $< $(IHEXFILE)
|
||||
$(MAKE) sky-reset sky-upload
|
||||
endif # MOTE
|
||||
|
||||
sky-upload: sky-reset
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* -*- C -*- */
|
||||
/* @(#)$Id: contiki-conf.h,v 1.64 2010/01/14 20:01:18 nifi Exp $ */
|
||||
/* @(#)$Id: contiki-conf.h,v 1.65 2010/01/14 22:26:38 nifi Exp $ */
|
||||
|
||||
#ifndef CONTIKI_CONF_H
|
||||
#define CONTIKI_CONF_H
|
||||
|
@ -42,7 +42,7 @@
|
|||
#include "msp430def.h"
|
||||
|
||||
#ifndef RF_CHANNEL
|
||||
#define RF_CHANNEL 16
|
||||
#define RF_CHANNEL 26
|
||||
#endif /* RF_CHANNEL */
|
||||
|
||||
#define ELFLOADER_CONF_TEXT_IN_ROM 0
|
||||
|
|
Loading…
Reference in a new issue