summaryrefslogtreecommitdiff
path: root/digital/beacon
diff options
context:
space:
mode:
Diffstat (limited to 'digital/beacon')
-rw-r--r--digital/beacon/src/Makefile34
-rw-r--r--digital/beacon/src/configuration.h33
2 files changed, 7 insertions, 60 deletions
diff --git a/digital/beacon/src/Makefile b/digital/beacon/src/Makefile
index e35b0b6b..2f091452 100644
--- a/digital/beacon/src/Makefile
+++ b/digital/beacon/src/Makefile
@@ -8,7 +8,7 @@ HOST_PROGS = beacon
beacon_SOURCES = main_simu.c position.c formula.c recovery.c update.c trust.c
MODULES = math/fixed utils
AVR_MCU = atmega1281
-OPTIMIZE = -O2 -lm -DSIMULATOR
+OPTIMIZE = -O2 -lm -DSIMULATOR -I$(APB_REPO_PATH)/digital/zigbit/common
include $(BASE)/make/Makefile.gen
@@ -26,40 +26,20 @@ CONFIG_NAME = All_ZigBit_Atmega1281_Rf230_8Mhz_Gcc
#CONFIG_NAME = Coordinator_Sec_ZigBit_Atmega1281_Rf230_8Mhz_Gcc
#CONFIG_NAME = Router_Sec_ZigBit_Atmega1281_Rf230_8Mhz_Gcc
-NUMBER:= 0 1 2 3
DEV2 := 0
simu:host
python simulator.py
avr:
- for count in $(NUMBER); do\
- $(MAKE) -C $(BITCLOUD_MAKEFILE) -f Makefile_$(CONFIG_NAME) clean BITCLOUD_PATH=$(BITCLOUD_STACK);\
- $(MAKE) -C $(BITCLOUD_MAKEFILE) -f Makefile_$(CONFIG_NAME) all APP_NAME=beacon_$$count BITCLOUD_PATH=$(BITCLOUD_STACK) APB_AVR_PATH=$(BASE) PROJECT_BASE=$(PROJECT_BASE) BITCLOUD_COMMON_SOURCES=$(BITCLOUD_COMMON_SOURCES) LOL_NUMBER=$$count;\
- done;\
+ $(MAKE) -C $(BITCLOUD_MAKEFILE) -f Makefile_$(CONFIG_NAME) clean BITCLOUD_PATH=$(BITCLOUD_STACK)
+ $(MAKE) -C $(BITCLOUD_MAKEFILE) -f Makefile_$(CONFIG_NAME) all APP_NAME=beacon BITCLOUD_PATH=$(BITCLOUD_STACK) APB_AVR_PATH=$(BASE) PROJECT_BASE=$(PROJECT_BASE) BITCLOUD_COMMON_SOURCES=$(BITCLOUD_COMMON_SOURCES)
-flash0:
- make NUMBER=0 avr
+flash:
+ make avr
$(APB_REPO_PATH)/digital/dev2/tools/dev2ctl.py -s 1
- avrdude -c stk500v2 -P /dev/ttyUSB1 -p atmega1281 -B3 -U flash:w:obj/beacon_0.hex
-
-flash1:
- make NUMBER=1 avr
- $(APB_REPO_PATH)/digital/dev2/tools/dev2ctl.py -s 1
- avrdude -c stk500v2 -P /dev/ttyUSB1 -p atmega1281 -B3 -U flash:w:obj/beacon_1.hex
-
-flash2:
- make NUMBER=2 avr
- $(APB_REPO_PATH)/digital/dev2/tools/dev2ctl.py -s 1
- avrdude -c stk500v2 -P /dev/ttyUSB1 -p atmega1281 -B3 -U flash:w:obj/beacon_2.hex
-
-flash3:
- make NUMBER=3 avr
- $(APB_REPO_PATH)/digital/dev2/tools/dev2ctl.py -s 1
- avrdude -c stk500v2 -P /dev/ttyUSB1 -p atmega1281 -B3 -U flash:w:obj/beacon_3.hex
+ avrdude -c stk500v2 -P /dev/ttyUSB1 -p atmega1281 -B3 -U flash:w:obj/beacon.hex
clean:
- for count in $(NUMBER); do\
- $(MAKE) -C $(BITCLOUD_MAKEFILE) -f Makefile_$(CONFIG_NAME) clean APP_NAME=beacon_$$count PROJECT_BASE=$(PROJECT_BASE) BITCLOUD_PATH=$(BITCLOUD_STACK);\
- done;\
+ $(MAKE) -C $(BITCLOUD_MAKEFILE) -f Makefile_$(CONFIG_NAME) clean APP_NAME=beacon PROJECT_BASE=$(PROJECT_BASE) BITCLOUD_PATH=$(BITCLOUD_STACK);\
diff --git a/digital/beacon/src/configuration.h b/digital/beacon/src/configuration.h
index 8112bd59..2dafd155 100644
--- a/digital/beacon/src/configuration.h
+++ b/digital/beacon/src/configuration.h
@@ -84,39 +84,6 @@
// first suitable network that they discover.
#define CS_EXT_PANID 0xAAAAAAAAAAAA1337LL
-// 64-bit Unique Identifier (UID) determining the device extended address. If this
-// value is 0 stack will try to read hardware UID from external UID or EEPROM chip.
-// at startup. Location of hardware UID is platform dependend and it may not be
-// available on all platforms. If the latter case then UID value must be provided
-// by user via this parameter. This parameter must be unique for each device in a
-// network.
-// Specifies short (network) address if CS_NWK_UNIQUE_ADDR equals 1
-//
-// If static addressing is applied the stack uses the value of the parameter as a
-// short address. Otherwise, the stack assigns the parameter to a randomly chosen
-// value unique within the network. In both cases after the network start the
-// parameter holds actual short address of the device. While the device is in the
-// network its value must not be changed.
-#ifdef LOL_NUMBER_0
- #define CS_UID 0x1LL
- #define CS_NWK_ADDR 0x0000
- #define TYPE_COOR
-#elif LOL_NUMBER_1
- #define CS_UID 0x1LL
- #define CS_NWK_ADDR 0x0001
- #define TYPE_END
-#elif LOL_NUMBER_2
- #define CS_UID 0x2LL
- #define CS_NWK_ADDR 0x0002
- #define TYPE_END
-#elif LOL_NUMBER_3
- #define CS_UID 0x3LL
- #define CS_NWK_ADDR 0x0003
- #define TYPE_END
-#else
- #error NO_ADDR_DEFINED
-#endif
-
// The maximum number of direct children that a given device (the coordinator or a
// router) can have.
//