Migrate ZdoEndDeviceAnnceInd capabilities bitfield to structure.

shimmeringbee · Feb 16, 2020 · 9d1aa35 · 9d1aa35
1 parent bca63fa
commit 9d1aa35
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/device_state.go b/device_state.go
@@ -2,21 +2,31 @@ package zstack
 
 import "github.com/shimmeringbee/zigbee"
 
+type ZdoEndDeviceAnnceIndCapabilities struct {
+	AltPANController   bool  `bcfieldwidth:"1"`
+	Router             bool  `bcfieldwidth:"1"`
+	PowerSource        bool  `bcfieldwidth:"1"`
+	ReceiveOnIdle      bool  `bcfieldwidth:"1"`
+	Reserved           uint8 `bcfieldwidth:"2"`
+	SecurityCapability bool  `bcfieldwidth:"1"`
+	AddressAllocated   bool  `bcfieldwidth:"1"`
+}
+
 type ZdoEndDeviceAnnceInd struct {
 	SourceAddress  zigbee.NetworkAddress
 	NetworkAddress zigbee.NetworkAddress
 	IEEEAddress    zigbee.IEEEAddress
-	Capabilities   uint8
+	Capabilities   ZdoEndDeviceAnnceIndCapabilities
 }
 
 const ZdoEndDeviceAnnceIndID uint8 = 0xc1
 
 type ZdoLeaveInd struct {
 	SourceAddress zigbee.NetworkAddress
 	IEEEAddress   zigbee.IEEEAddress
-	Request       uint8
-	Remove        uint8
-	Rejoin        uint8
+	Request       bool
+	Remove        bool
+	Rejoin        bool
 }
 
 const ZdoLeaveIndID uint8 = 0xc9

diff --git a/network_manager.go b/network_manager.go
@@ -58,7 +58,7 @@ func (z *ZStack) networkManager() {
 			case ZdoEndDeviceAnnceInd:
 				logicalType := zigbee.EndDevice
 
-				if e.Capabilities&0x02 == 0x02 {
+				if e.Capabilities.Router {
 					logicalType = zigbee.Router
 				}
 

diff --git a/network_manager_test.go b/network_manager_test.go
@@ -162,7 +162,15 @@ func Test_NetworkManager(t *testing.T) {
 			SourceAddress:  zigbee.NetworkAddress(0x1000),
 			NetworkAddress: zigbee.NetworkAddress(0x2000),
 			IEEEAddress:    zigbee.IEEEAddress(0x0102030405060708),
-			Capabilities:   0b00000010,
+			Capabilities: ZdoEndDeviceAnnceIndCapabilities{
+				AltPANController:   false,
+				Router:             true,
+				PowerSource:        false,
+				ReceiveOnIdle:      false,
+				Reserved:           false,
+				SecurityCapability: false,
+				AddressAllocated:   false,
+			},
 		}
 
 		data, _ := bytecodec.Marshal(announce)
@@ -268,7 +276,15 @@ func Test_NetworkManager(t *testing.T) {
 			SourceAddress:  zigbee.NetworkAddress(0x1000),
 			NetworkAddress: zigbee.NetworkAddress(0x2000),
 			IEEEAddress:    zigbee.IEEEAddress(0x0102030405060708),
-			Capabilities:   0b00000010,
+			Capabilities:   ZdoEndDeviceAnnceIndCapabilities{
+				AltPANController:   false,
+				Router:             true,
+				PowerSource:        false,
+				ReceiveOnIdle:      false,
+				Reserved:           false,
+				SecurityCapability: false,
+				AddressAllocated:   false,
+			},
 		}
 
 		data, _ := bytecodec.Marshal(announce)