Skip to content

Replace the old Makerules form. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mirko-lelansky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace the old Makerules form. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/BluetoothMaster/Make.simple
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
COMPONENT=SimpleMasterTestAppC
include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

ifndef BT_SLAVE
$(error You need to provide a Bluetooth Slave Address to connect to so do make BT_SLAVE=0011f6057c35 shimmer2....where 0011f6057c35 is your Bluetooth device address.)
Expand Down
3 changes: 2 additions & 1 deletion apps/BluetoothMaster/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
COMPONENT=BluetoothMasterTestAppC
include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

ifndef BT_SLAVE
$(error You need to provide a Bluetooth Slave Address to connect to so do make BT_SLAVE=0011f6057c35 shimmer2....where 0011f6057c35 is your Bluetooth device address.)
Expand Down
4 changes: 2 additions & 2 deletions apps/BtStream/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
COMPONENT=BtStreamAppC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

#defines
CFLAGS += -DUSE_8MHZ_CRYSTAL
Expand All @@ -9,8 +11,6 @@ CFLAGS += -DUSE_8MHZ_CRYSTAL
# to the default if/when this flag is no longer
# being used

include $(MAKERULES)

#used to identify shimmer version
ifeq ($(PLATFORM),shimmer2r)
CFLAGS += -DPWRMUX_UTIL
Expand Down
3 changes: 2 additions & 1 deletion apps/GpsSleep/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
COMPONENT=GpsSleepAppC
include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

3 changes: 2 additions & 1 deletion apps/JustFATLogging/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
CURRENT_TIME=$(shell python ./timeSec.py) #Set the time on the clock to current time. no ntp means you need a good starting point

COMPONENT=JustFATLoggingC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

ifdef CURRENT_TIME
PFLAGS += -DCURRENT_TIME=$(CURRENT_TIME)
Expand All @@ -11,4 +13,3 @@ endif
# this tells the sd driver to use proper clock calibration for spi bus during card init
PFLAGS += -DSMCLK_4MHZ

include $(MAKERULES)
3 changes: 2 additions & 1 deletion apps/Legacy/AccelECG/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
COMPONENT=AccelECGAppC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

CFLAGS += -DUSE_AVCC_REF # approx 0.5 milliamps saving when using AVCC compared to 2.5V or 1.5V internal ref

#CFLAGS += -DLOW_BATTERY_INDICATION

CFLAGS += -DUSE_8MHZ_CRYSTAL

include $(MAKERULES)
3 changes: 2 additions & 1 deletion apps/Legacy/AccelGyro/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
COMPONENT=AccelGyroAppC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

#defines
CFLAGS += -DUSE_AVCC_REF # approx 0.5 milliamps saving when using AVCC compared to 2.5V or 1.5V internal ref
Expand All @@ -7,4 +9,3 @@ CFLAGS += -DUSE_AVCC_REF # approx 0.5 milliamps saving when using AVCC compared

CFLAGS += -DUSE_8MHZ_CRYSTAL

include $(MAKERULES)
3 changes: 2 additions & 1 deletion apps/Legacy/BoilerPlate/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# NB: As of May 2013 BoilerPlate is deprecated and replaced by the BtStream application

COMPONENT=BoilerPlateAppC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

#defines
CFLAGS += -DUSE_8MHZ_CRYSTAL

include $(MAKERULES)
ifeq ($(PLATFORM),shimmer2r)
CFLAGS += -DPWRMUX_UTIL
CFLAGS += -DSHIMMER_VER=2
Expand Down
3 changes: 2 additions & 1 deletion apps/Legacy/GyroMag/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
COMPONENT=GyroMagAppC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

#defines
CFLAGS += -DUSE_AVCC_REF # approx 0.5 milliamps saving when using AVCC compared to 2.5V or 1.5V internal ref
Expand All @@ -7,4 +9,3 @@ CFLAGS += -DUSE_AVCC_REF # approx 0.5 milliamps saving when using AVCC compared

CFLAGS += -DUSE_8MHZ_CRYSTAL

include $(MAKERULES)
3 changes: 2 additions & 1 deletion apps/Legacy/HostTimeLogging/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
# CURRENT_TIME=`python ./timeSec.py' Set the time on the clock to current time. no ntp means you need a good starting point

COMPONENT=HostTimeLoggingC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

PFLAGS += -DHOST_TIME

# this tells the sd driver to use proper clock calibration for spi bus during card init
PFLAGS += -DSMCLK_4MHZ

include $(MAKERULES)
4 changes: 2 additions & 2 deletions apps/Legacy/ParamLogging/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# CURRENT_TIME=`python ./timeSec.py' Set the time on the clock to current time. no ntp means you need a good starting point

COMPONENT=ParamLoggingC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

ifdef CURRENT_TIME
PFLAGS += -DCURRENT_TIME=$(CURRENT_TIME)
Expand All @@ -11,5 +13,3 @@ endif
# this tells the sd driver to use proper clock calibration for spi bus during card init
PFLAGS += -DSMCLK_4MHZ


include $(MAKERULES)
3 changes: 2 additions & 1 deletion apps/Legacy/TestGyroBoard/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
CURRENT_TIME=$(shell python ./timeSec.py) #Set the time on the clock to current time. no ntp means you need a good starting point

COMPONENT=TestGyroBoardC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

ifdef CURRENT_TIME
PFLAGS += -DCURRENT_TIME=$(CURRENT_TIME)
endif

include $(MAKERULES)
4 changes: 2 additions & 2 deletions apps/SDLog/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
COMPONENT=SDLogAppC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

# this tells the sd driver to use proper clock calibration for spi bus during card init
PFLAGS += -DSMCLK_4MHZ


include $(MAKERULES)

CFLAGS += -DFATFS_REALTIME=0 # for lower ROM requirement

#used to identify shimmer version
Expand Down
3 changes: 2 additions & 1 deletion apps/SimpleAccel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
COMPONENT=SimpleAccelAppC
include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include
4 changes: 3 additions & 1 deletion apps/SimpleAccelGyro/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
COMPONENT=SimpleAccelGyroAppC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

CFLAGS+=-DTOSH_DATA_LENGTH=100 #max is 114

Expand All @@ -9,4 +11,4 @@ CFLAGS+=-DTOSH_DATA_LENGTH=100 #max is 114

#CFLAGS+=-DCC2420_DEF_CHANNEL=0x1A

include $(MAKERULES)

4 changes: 2 additions & 2 deletions apps/SimpleGSR/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
COMPONENT=SimpleGsrAppC

include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include
4 changes: 3 additions & 1 deletion apps/SyncedRadioTx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
COMPONENT=SyncedRadioTxAppC
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

CFLAGS+=-DTOSH_DATA_LENGTH=90 #max is 114
CFLAGS+=-DSEND_PERIOD=100
Expand All @@ -8,4 +10,4 @@ CFLAGS+=-DSEND_PERIOD=100

CFLAGS+=-DCC2420_DEF_CHANNEL=26

include $(MAKERULES)

3 changes: 2 additions & 1 deletion apps/TestBluetooth/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
COMPONENT=TestBluetoothAppC
include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

4 changes: 2 additions & 2 deletions apps/TestGPS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
COMPONENT=TestGPSAppC

include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include
3 changes: 2 additions & 1 deletion apps/TestSerialTime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
COMPONENT=TestSerialTimeAppC
include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

PFLAGS += -DHOST_TIME
3 changes: 2 additions & 1 deletion apps/TestTiltSwitch/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
COMPONENT=TestTiltSwitchAppC
include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include

3 changes: 2 additions & 1 deletion apps/TestUserButton/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
COMPONENT=TestUserButtonAppC
include $(MAKERULES)
TINYOS_ROOT_DIR?=../..
include $(TINYOS_ROOT_DIR)/Makefile.include