RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Ludwig Ortmann 2013-03-12 15:50:04 +01:00
commit 7bf1dd72f8
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
msb-430-common/drivers/include/sht11-board.h
View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved. Copyright 2013, Freie Universitaet Berlin (FUB). All rights reserved.
These sources were developed at the Freie Universitaet Berlin, Computer Systems These sources were developed at the Freie Universitaet Berlin, Computer Systems
and Telematics group (http://cst.mi.fu-berlin.de). and Telematics group (http://cst.mi.fu-berlin.de).
@ -36,10 +36,8 @@ and the mailinglist (subscription via web site)
* @file * @file
* @brief SHT11 Device Driver Configuration For MSB-430 Platform * @brief SHT11 Device Driver Configuration For MSB-430 Platform
* *
* @author Freie Universität Berlin, Computer Systems & Telematics, µkleos * @author Freie Universität Berlin, Computer Systems & Telematics, RIOT
* @version $Revision$
* *
* @note $Id$
*/ */
#include <msp430x16x.h> #include <msp430x16x.h>
#include <bitarithm.h> #include <bitarithm.h>

4
msb-430-common/makefile
View File

@ -1,7 +1,6 @@
SRC = $(wildcard *.c) SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/ BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
DEP = $(SRC:%.c=$(BINDIR)%.d) DEP = $(SRC:%.c=$(BINDIR)%.d)
INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/ INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
@ -9,10 +8,13 @@ INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/
INCLUDES += -I$(RIOTBASE)/cpu/mspx16x/include/ INCLUDES += -I$(RIOTBASE)/cpu/mspx16x/include/
INCLUDES += -I$(RIOTBASE)/drivers/include/ INCLUDES += -I$(RIOTBASE)/drivers/include/
.PHONY: $(BINDIR)$(ARCH)
all: $(BINDIR)$(ARCH) all: $(BINDIR)$(ARCH)
$(MAKE) -C drivers $(MAKE) -C drivers
$(BINDIR)$(ARCH): $(OBJ) $(BINDIR)$(ARCH): $(OBJ)
echo $(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
$(AR) rcs $(BINDIR)$(ARCH) $(OBJ) $(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
# pull in dependency info for *existing* .o files # pull in dependency info for *existing* .o files

5
msba2-common/makefile
View File

@ -1,7 +1,6 @@
SRC = $(wildcard *.c) SRC = $(wildcard *.c)
BINDIR = $(RIOTBOARD)/$(BOARD)/bin/ BINDIR = $(RIOTBOARD)/$(BOARD)/bin/
OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
DEP = $(SRC:%.c=$(BINDIR)%.d) DEP = $(SRC:%.c=$(BINDIR)%.d)
INCLUDES += -I$(RIOTBOARD)/msba2-common/include/ INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
@ -9,6 +8,8 @@ INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/ INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/
INCLUDES += -I$(RIOTBASE)/drivers/include/ INCLUDES += -I$(RIOTBASE)/drivers/include/
.PHONY: $(BINDIR)msba2_common_base.a
all: $(BINDIR)msba2_common_base.a all: $(BINDIR)msba2_common_base.a
$(MAKE) -C drivers $(MAKE) -C drivers
@ -26,6 +27,6 @@ $(BINDIR)%.o: %.c
# remove compilation products # remove compilation products
clean: clean:
make -C drivers clean ${MAKE} -C drivers clean
rm -f $(OBJ) $(DEP) rm -f $(OBJ) $(DEP)