JunMo Hong / EV-COG-AD3029LZ

센서보드 RF IRQ 테스트 중

Fork of stm-spirit1-rf-driver by ST

Files at this revision

API Documentation at this revision

Revision 52:053dbc4b570f, committed 2017-02-23

Comitter:
Wolfgang Betz
Date:
Thu Feb 23 13:29:35 2017 +0100
Parent:
51:d46b4cc970c5
Child:
53:b036a3a850e6
Commit message:
Simplify Spirit1 Mac address specification

Changed in this revision

mbed_lib.json Show annotated file Show diff for this revision Revisions of this file
source/NanostackRfPhySpirit1.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/mbed_lib.json	Wed Feb 22 09:55:13 2017 +0100
+++ b/mbed_lib.json	Thu Feb 23 13:29:35 2017 +0100
@@ -1,14 +1,7 @@
 {
     "name": "spirit1",
     "config": {
-    	"mac-address-0": "0x0",
-    	"mac-address-1": "0x0",
-    	"mac-address-2": "0x0",
-    	"mac-address-3": "0x0",
-    	"mac-address-4": "0x0",
-    	"mac-address-5": "0x0",
-    	"mac-address-6": "0x0",
-    	"mac-address-7": "0x0"
+	"mac-address": "{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}"
     },
     "macros": ["USE_STM32F4XX_NUCLEO", "X_NUCLEO_IDS01A4", "SPIRIT_USE_FULL_ASSERT"]
 }

--- a/source/NanostackRfPhySpirit1.cpp	Wed Feb 22 09:55:13 2017 +0100
+++ b/source/NanostackRfPhySpirit1.cpp	Thu Feb 23 13:29:35 2017 +0100
@@ -30,16 +30,7 @@
 
 static uint16_t stored_short_adr;
 static uint16_t stored_pan_id;
-static uint8_t stored_mac_address[8] = {
-		MBED_CONF_SPIRIT1_MAC_ADDRESS_0,
-		MBED_CONF_SPIRIT1_MAC_ADDRESS_1,
-		MBED_CONF_SPIRIT1_MAC_ADDRESS_2,
-		MBED_CONF_SPIRIT1_MAC_ADDRESS_3,
-		MBED_CONF_SPIRIT1_MAC_ADDRESS_4,
-		MBED_CONF_SPIRIT1_MAC_ADDRESS_5,
-		MBED_CONF_SPIRIT1_MAC_ADDRESS_6,
-		MBED_CONF_SPIRIT1_MAC_ADDRESS_7
-};
+static uint8_t stored_mac_address[8] = MBED_CONF_SPIRIT1_MAC_ADDRESS;
 
 #define RF_SIG_ACK_NEEDED (1<<0)
 static Thread rf_ack_sender(osPriorityRealtime);