From 4944808843447cbd5a337e2dc35c26e9ec1fe422 Mon Sep 17 00:00:00 2001 From: janhauer Date: Tue, 5 Jan 2010 17:12:56 +0000 Subject: [PATCH] - polished READMEs - simplified some test apps --- apps/tests/tkn154/README.txt | 4 +- .../beacon-enabled/TestAssociate/README.txt | 15 ++--- .../TestAssociate/coordinator/TestCoordC.nc | 6 +- .../TestAssociate/device/TestDeviceC.nc | 38 +++++------ .../tkn154/beacon-enabled/TestData/README.txt | 9 +-- .../beacon-enabled/TestData/app_profile.h | 2 +- .../coordinator/TestCoordReceiverC.nc | 1 + .../TestData/device/TestDeviceSenderC.nc | 65 ++++++++++--------- .../beacon-enabled/TestIndirect/README.txt | 6 +- .../coordinator/TestCoordSenderC.nc | 42 ++++++------ .../device/TestDeviceReceiverC.nc | 16 ++--- .../beacon-enabled/TestStartSync/README.txt | 5 +- .../TestActiveScan/README.txt | 8 +-- .../device/TestActiveScanDeviceC.nc | 4 +- .../TestAssociate/README.txt | 6 +- .../TestIndirectData/README.txt | 6 +- .../TestPromiscuous/README.txt | 11 ++-- 17 files changed, 116 insertions(+), 128 deletions(-) diff --git a/apps/tests/tkn154/README.txt b/apps/tests/tkn154/README.txt index d2940a05..8aa63d9e 100644 --- a/apps/tests/tkn154/README.txt +++ b/apps/tests/tkn154/README.txt @@ -1,5 +1,5 @@ README for tkn154 test applications -Author/Contact: tinyos-help@millennium.berkeley.edu +Author/Contact: Jan Hauer Description: @@ -8,7 +8,7 @@ IEEE 802.15.4-2006 MAC implementation. Applications that use the beacon-enabled mode are located in the "beacon-enabled" folder, applications that use the nonbeacon-enabled mode are in the "nonbeacon-enabled" folder. Every test application resides in a separate subdirectory which includes a README.txt -describing what it does and how it can be installed, respectively. +describing what it does and how it can be installed. The TKN15.4 implementation can be found in tinyos-2.x/tos/lib/mac/tkn154. Note: TEP3 recommends that interface names "should be mixed case, starting diff --git a/apps/tests/tkn154/beacon-enabled/TestAssociate/README.txt b/apps/tests/tkn154/beacon-enabled/TestAssociate/README.txt index 83cb0e68..f8623dd9 100644 --- a/apps/tests/tkn154/beacon-enabled/TestAssociate/README.txt +++ b/apps/tests/tkn154/beacon-enabled/TestAssociate/README.txt @@ -1,5 +1,5 @@ README for TestAssociate -Author/Contact: tinyos-help@millennium.berkeley.edu +Author/Contact: Jan Hauer Description: @@ -7,17 +7,16 @@ In this application one node takes the role of a PAN coordinator in a beacon-enabled 802.15.4 PAN, it transmits periodic beacons and waits for devices to request association to its PAN. Whenever a device tries to associate, the PAN coordinator accepts the association and assigns to the -device a unique short address (starting from zero, incremented for every device -new association). A second node acts as a device, it first scans the +device a unique short address (starting from zero, incremented for every new +association request). A second node acts as a device, it first scans the pre-defined channel for beacons from the coordinator and once it finds a beacon -it tries to associate to the PAN and synchronize to and track all future -beacons. A short time after association the device then disassociates from the -PAN. +it tries to associate to the PAN. A short time after association the device +then disassociates from the PAN. Criteria for a successful test: -Assuming one coordinator and one device has been installed, both should -simultaneously toggle (only) the second LED, about once every 5 seconds. +Both, coordinator and device, should toggle LED1 in unison about once every 5 +seconds. The coordinator should also toggle LED2 every second. Tools: NONE diff --git a/apps/tests/tkn154/beacon-enabled/TestAssociate/coordinator/TestCoordC.nc b/apps/tests/tkn154/beacon-enabled/TestAssociate/coordinator/TestCoordC.nc index b0d8ca9a..43c788ae 100644 --- a/apps/tests/tkn154/beacon-enabled/TestAssociate/coordinator/TestCoordC.nc +++ b/apps/tests/tkn154/beacon-enabled/TestAssociate/coordinator/TestCoordC.nc @@ -52,8 +52,7 @@ module TestCoordC } } implementation { - ieee154_address_t m_lastDevice; - uint16_t m_shortAddress; + uint16_t m_assignedShortAddress; event void Boot.booted() { call MLME_RESET.request(TRUE); @@ -88,7 +87,7 @@ module TestCoordC ieee154_security_t *security ) { - call MLME_ASSOCIATE.response(DeviceAddress, m_shortAddress++, IEEE154_ASSOCIATION_SUCCESSFUL, 0); + call MLME_ASSOCIATE.response(DeviceAddress, m_assignedShortAddress++, IEEE154_ASSOCIATION_SUCCESSFUL, 0); } event void MLME_DISASSOCIATE.indication ( @@ -114,7 +113,6 @@ module TestCoordC if (status == IEEE154_SUCCESS){ // association was successful call Leds.led1On(); - m_lastDevice.extendedAddress = DstAddr.extendedAddress; } else { call Leds.led1Off(); } diff --git a/apps/tests/tkn154/beacon-enabled/TestAssociate/device/TestDeviceC.nc b/apps/tests/tkn154/beacon-enabled/TestAssociate/device/TestDeviceC.nc index 55a07084..acd74d6a 100644 --- a/apps/tests/tkn154/beacon-enabled/TestAssociate/device/TestDeviceC.nc +++ b/apps/tests/tkn154/beacon-enabled/TestAssociate/device/TestDeviceC.nc @@ -56,7 +56,7 @@ module TestDeviceC ieee154_CapabilityInformation_t m_capabilityInformation; ieee154_PANDescriptor_t m_PANDescriptor; - bool m_isPANDescriptorValid; + bool m_wasScanSuccessful; void startApp(); event void Boot.booted() { @@ -81,16 +81,14 @@ module TestDeviceC ieee154_phyChannelsSupported_t channel; uint8_t scanDuration = BEACON_ORDER; - m_isPANDescriptorValid = FALSE; - - // scan only one channel + // scan only one channel (to save time) channel = ((uint32_t) 1) << RADIO_CHANNEL; // we want all received beacons to be signalled // through the MLME_BEACON_NOTIFY interface, i.e. // we set the macAutoRequest attribute to FALSE call MLME_SET.macAutoRequest(FALSE); - m_isPANDescriptorValid = FALSE; + m_wasScanSuccessful = FALSE; call MLME_SCAN.request ( PASSIVE_SCAN, // ScanType channel, // ScanChannels @@ -108,22 +106,20 @@ module TestDeviceC { // received a beacon frame ieee154_phyCurrentPage_t page = call MLME_GET.phyCurrentPage(); - ieee154_macBSN_t beaconSequenceNumber = call BeaconFrame.getBSN(frame); - - if (beaconSequenceNumber & 1) - call Leds.led2On(); - else - call Leds.led2Off(); - if (!m_isPANDescriptorValid && call BeaconFrame.parsePANDescriptor( - frame, RADIO_CHANNEL, page, &m_PANDescriptor) == SUCCESS){ - // let's see if the beacon is from the coordinator we expect... - if (m_PANDescriptor.CoordAddrMode == ADDR_MODE_SHORT_ADDRESS && - m_PANDescriptor.CoordPANId == PAN_ID && - m_PANDescriptor.CoordAddress.shortAddress == COORDINATOR_ADDRESS){ - // yes - wait until SCAN is finished, then syncronize to beacons - m_isPANDescriptorValid = TRUE; + + if (!m_wasScanSuccessful) { + if (call BeaconFrame.parsePANDescriptor( + frame, RADIO_CHANNEL, page, &m_PANDescriptor) == SUCCESS){ + // let's see if the beacon is from the coordinator we expect... + if (m_PANDescriptor.CoordAddrMode == ADDR_MODE_SHORT_ADDRESS && + m_PANDescriptor.CoordPANId == PAN_ID && + m_PANDescriptor.CoordAddress.shortAddress == COORDINATOR_ADDRESS){ + // yes - wait until SCAN is finished, then syncronize to beacons + m_wasScanSuccessful = TRUE; + } } } + return frame; } @@ -138,7 +134,7 @@ module TestDeviceC ieee154_PANDescriptor_t* PANDescriptorList ) { - if (m_isPANDescriptorValid){ + if (m_wasScanSuccessful) { call MLME_SET.macPANId(m_PANDescriptor.CoordPANId); call MLME_SET.macCoordShortAddress(m_PANDescriptor.CoordAddress.shortAddress); call MLME_SYNC.request(m_PANDescriptor.LogicalChannel, m_PANDescriptor.ChannelPage, TRUE); @@ -161,7 +157,7 @@ module TestDeviceC ieee154_security_t *security ) { - if ( status == IEEE154_SUCCESS ){ + if ( status == IEEE154_SUCCESS ) { // we are now associated - set a timer for disassociation call Leds.led1On(); call DisassociateTimer.startOneShot(312500U); diff --git a/apps/tests/tkn154/beacon-enabled/TestData/README.txt b/apps/tests/tkn154/beacon-enabled/TestData/README.txt index 50818c82..c241ac5b 100644 --- a/apps/tests/tkn154/beacon-enabled/TestData/README.txt +++ b/apps/tests/tkn154/beacon-enabled/TestData/README.txt @@ -1,5 +1,5 @@ README for TestData -Author/Contact: tinyos-help@millennium.berkeley.edu +Author/Contact: Jan Hauer Description: @@ -13,9 +13,10 @@ transmission in the contention access period, CAP). Criteria for a successful test: -Assuming a clear channel and one coordinator and one device has been installed, -both should toggle (only) the second LED fast, about 5 times per second. They -don't have to toggle the LED simultaneously. +Coordinator and device should both toggle LED2 about twice per second in +unison. They should also each toggle LED1 about 5 times per second (but +not necessarily in unison). Note: the nodes should be close to each other, +because the transmission power is reduced to -20 dBm. Tools: NONE diff --git a/apps/tests/tkn154/beacon-enabled/TestData/app_profile.h b/apps/tests/tkn154/beacon-enabled/TestData/app_profile.h index 5a331de9..ef3cc433 100644 --- a/apps/tests/tkn154/beacon-enabled/TestData/app_profile.h +++ b/apps/tests/tkn154/beacon-enabled/TestData/app_profile.h @@ -42,7 +42,7 @@ enum { COORDINATOR_ADDRESS = 0x4331, BEACON_ORDER = 5, SUPERFRAME_ORDER = 5, + TX_POWER = -20, // in dBm }; -//#define IEEE154_DEFAULT_TRANSMITPOWER_dBm -25 #endif diff --git a/apps/tests/tkn154/beacon-enabled/TestData/coordinator/TestCoordReceiverC.nc b/apps/tests/tkn154/beacon-enabled/TestData/coordinator/TestCoordReceiverC.nc index 8ae7d636..23123d57 100644 --- a/apps/tests/tkn154/beacon-enabled/TestData/coordinator/TestCoordReceiverC.nc +++ b/apps/tests/tkn154/beacon-enabled/TestData/coordinator/TestCoordReceiverC.nc @@ -60,6 +60,7 @@ module TestCoordReceiverC { if (status != IEEE154_SUCCESS) return; + call MLME_SET.phyTransmitPower(TX_POWER); call MLME_SET.macShortAddress(COORDINATOR_ADDRESS); call MLME_SET.macAssociationPermit(FALSE); call MLME_START.request( diff --git a/apps/tests/tkn154/beacon-enabled/TestData/device/TestDeviceSenderC.nc b/apps/tests/tkn154/beacon-enabled/TestData/device/TestDeviceSenderC.nc index 279e43e2..e4a1ab2f 100644 --- a/apps/tests/tkn154/beacon-enabled/TestData/device/TestDeviceSenderC.nc +++ b/apps/tests/tkn154/beacon-enabled/TestData/device/TestDeviceSenderC.nc @@ -58,8 +58,7 @@ module TestDeviceSenderC uint8_t m_payloadLen; ieee154_PANDescriptor_t m_PANDescriptor; bool m_ledCount; - bool m_isPANDescriptorValid; - bool m_sending; + bool m_wasScanSuccessful; void startApp(); task void packetSendTask(); @@ -88,16 +87,17 @@ module TestDeviceSenderC ieee154_phyChannelsSupported_t channelMask; uint8_t scanDuration = BEACON_ORDER; - m_isPANDescriptorValid = FALSE; + call MLME_SET.phyTransmitPower(TX_POWER); call MLME_SET.macShortAddress(TOS_NODE_ID); - // scan only one channel + // scan only the channel where we expect the coordinator channelMask = ((uint32_t) 1) << RADIO_CHANNEL; // we want all received beacons to be signalled // through the MLME_BEACON_NOTIFY interface, i.e. // we set the macAutoRequest attribute to FALSE call MLME_SET.macAutoRequest(FALSE); + m_wasScanSuccessful = FALSE; call MLME_SCAN.request ( PASSIVE_SCAN, // ScanType channelMask, // ScanChannels @@ -110,7 +110,6 @@ module TestDeviceSenderC 0 // security ); } - bool m_ready; event message_t* MLME_BEACON_NOTIFY.indication (message_t* frame) { @@ -118,22 +117,26 @@ module TestDeviceSenderC ieee154_phyCurrentPage_t page = call MLME_GET.phyCurrentPage(); ieee154_macBSN_t beaconSequenceNumber = call BeaconFrame.getBSN(frame); - if (m_ready) - post packetSendTask(); - if (beaconSequenceNumber & 1) - call Leds.led2On(); - else - call Leds.led2Off(); - if (!m_isPANDescriptorValid && call BeaconFrame.parsePANDescriptor( - frame, RADIO_CHANNEL, page, &m_PANDescriptor) == SUCCESS){ - // let's see if the beacon is from our coordinator... - if (m_PANDescriptor.CoordAddrMode == ADDR_MODE_SHORT_ADDRESS && - m_PANDescriptor.CoordPANId == PAN_ID && - m_PANDescriptor.CoordAddress.shortAddress == COORDINATOR_ADDRESS){ - // yes! wait until SCAN is finished, then syncronize to the beacons - m_isPANDescriptorValid = TRUE; + if (!m_wasScanSuccessful) { + // received a beacon during channel scanning + if (call BeaconFrame.parsePANDescriptor( + frame, RADIO_CHANNEL, page, &m_PANDescriptor) == SUCCESS) { + // let's see if the beacon is from our coordinator... + if (m_PANDescriptor.CoordAddrMode == ADDR_MODE_SHORT_ADDRESS && + m_PANDescriptor.CoordPANId == PAN_ID && + m_PANDescriptor.CoordAddress.shortAddress == COORDINATOR_ADDRESS){ + // yes! wait until SCAN is finished, then syncronize to the beacons + m_wasScanSuccessful = TRUE; + } } + } else { + // received a beacon during synchronization, toggle LED2 + if (beaconSequenceNumber & 1) + call Leds.led2On(); + else + call Leds.led2Off(); } + return frame; } @@ -148,7 +151,8 @@ module TestDeviceSenderC ieee154_PANDescriptor_t* PANDescriptorList ) { - if (m_isPANDescriptorValid){ + if (m_wasScanSuccessful) { + // we received a beacon from the coordinator before call MLME_SET.macCoordShortAddress(m_PANDescriptor.CoordAddress.shortAddress); call MLME_SET.macPANId(m_PANDescriptor.CoordPANId); call MLME_SYNC.request(m_PANDescriptor.LogicalChannel, m_PANDescriptor.ChannelPage, TRUE); @@ -161,24 +165,23 @@ module TestDeviceSenderC NULL // security ); post packetSendTask(); - m_ready = TRUE; } else startApp(); } task void packetSendTask() { - if (!m_sending && m_isPANDescriptorValid && - call MCPS_DATA.request ( + if (!m_wasScanSuccessful) + return; + else if (call MCPS_DATA.request ( &m_frame, // frame, m_payloadLen, // payloadLength, 0, // msduHandle, TX_OPTIONS_ACK // TxOptions, - ) == IEEE154_SUCCESS) - m_sending = TRUE; + ) != IEEE154_SUCCESS) + call Leds.led0On(); } - uint8_t m_useLeds = TRUE; event void MCPS_DATA.confirm ( message_t *msg, uint8_t msduHandle, @@ -186,11 +189,9 @@ module TestDeviceSenderC uint32_t timestamp ) { - m_sending = FALSE; - if (status == IEEE154_SUCCESS && m_ledCount++ == 20){ + if (status == IEEE154_SUCCESS && m_ledCount++ >= 20) { m_ledCount = 0; - if (m_useLeds) - call Leds.led1Toggle(); + call Leds.led1Toggle(); } post packetSendTask(); } @@ -202,9 +203,9 @@ module TestDeviceSenderC uint8_t ChannelPage, ieee154_security_t *security) { - m_useLeds = FALSE; + m_wasScanSuccessful = FALSE; call Leds.led1Off(); - //startApp(); + call Leds.led2Off(); } event message_t* MCPS_DATA.indication (message_t* frame) diff --git a/apps/tests/tkn154/beacon-enabled/TestIndirect/README.txt b/apps/tests/tkn154/beacon-enabled/TestIndirect/README.txt index 68122e6b..f963b801 100644 --- a/apps/tests/tkn154/beacon-enabled/TestIndirect/README.txt +++ b/apps/tests/tkn154/beacon-enabled/TestIndirect/README.txt @@ -1,5 +1,5 @@ README for TestIndirect -Author/Contact: tinyos-help@millennium.berkeley.edu +Author/Contact: Jan Hauer Description: @@ -14,8 +14,8 @@ DATA frame from the coordinator. Criteria for a successful test: -Both nodes should simultaneously toggle (only) the second LED, about once every -half second. +Both nodes should toggle the LED1 in unison, about once every half second. +The coordinator should also toggle LED2 with the same frequency. Tools: NONE diff --git a/apps/tests/tkn154/beacon-enabled/TestIndirect/coordinator/TestCoordSenderC.nc b/apps/tests/tkn154/beacon-enabled/TestIndirect/coordinator/TestCoordSenderC.nc index 381aba9f..e270937f 100644 --- a/apps/tests/tkn154/beacon-enabled/TestIndirect/coordinator/TestCoordSenderC.nc +++ b/apps/tests/tkn154/beacon-enabled/TestIndirect/coordinator/TestCoordSenderC.nc @@ -55,32 +55,14 @@ module TestCoordSenderC uint8_t m_payloadLen; event void Boot.booted() { - char payload[] = "Hello Device!"; - uint8_t *payloadRegion; - ieee154_address_t deviceShortAddress; - - // construct the frame - m_payloadLen = strlen(payload); - payloadRegion = call Packet.getPayload(&m_frame, m_payloadLen); - deviceShortAddress.shortAddress = DEVICE_ADDRESS; // destination - if (m_payloadLen <= call Packet.maxPayloadLength()){ - memcpy(payloadRegion, payload, m_payloadLen); - call Frame.setAddressingFields( - &m_frame, - ADDR_MODE_SHORT_ADDRESS, // SrcAddrMode, - ADDR_MODE_SHORT_ADDRESS, // DstAddrMode, - PAN_ID, // DstPANId, - &deviceShortAddress, // DstAddr, - NULL // security - ); - call MLME_RESET.request(TRUE); - } + call MLME_RESET.request(TRUE); } event void MLME_RESET.confirm(ieee154_status_t status) { if (status != IEEE154_SUCCESS) return; + call MLME_SET.macShortAddress(COORDINATOR_ADDRESS); call MLME_SET.macAssociationPermit(FALSE); call MLME_START.request( @@ -110,8 +92,26 @@ module TestCoordSenderC event void MLME_START.confirm(ieee154_status_t status) { - if (status == IEEE154_SUCCESS) + char payload[] = "Hello Device!"; + uint8_t *payloadRegion; + ieee154_address_t deviceShortAddress; + + // construct the frame + m_payloadLen = strlen(payload); + payloadRegion = call Packet.getPayload(&m_frame, m_payloadLen); + deviceShortAddress.shortAddress = DEVICE_ADDRESS; // destination + if (status == IEEE154_SUCCESS && m_payloadLen <= call Packet.maxPayloadLength()) { + memcpy(payloadRegion, payload, m_payloadLen); + call Frame.setAddressingFields( + &m_frame, + ADDR_MODE_SHORT_ADDRESS, // SrcAddrMode, + ADDR_MODE_SHORT_ADDRESS, // DstAddrMode, + PAN_ID, // DstPANId, + &deviceShortAddress, // DstAddr, + NULL // security + ); dataRequest(); + } } event void MCPS_DATA.confirm( diff --git a/apps/tests/tkn154/beacon-enabled/TestIndirect/device/TestDeviceReceiverC.nc b/apps/tests/tkn154/beacon-enabled/TestIndirect/device/TestDeviceReceiverC.nc index 197a0430..dc2482d3 100644 --- a/apps/tests/tkn154/beacon-enabled/TestIndirect/device/TestDeviceReceiverC.nc +++ b/apps/tests/tkn154/beacon-enabled/TestIndirect/device/TestDeviceReceiverC.nc @@ -55,7 +55,7 @@ module TestDeviceReceiverC uint8_t m_coordAddressMode; ieee154_macPANId_t m_coordPANID; ieee154_PANDescriptor_t m_PANDescriptor; - bool m_isPANDescriptorValid; + bool m_wasScanSuccessful; void startApp(); event void Boot.booted() { @@ -82,6 +82,7 @@ module TestDeviceReceiverC // through the MLME_BEACON_NOTIFY interface, i.e. // we set the macAutoRequest attribute to FALSE call MLME_SET.macAutoRequest(FALSE); + m_wasScanSuccessful = FALSE; call MLME_SCAN.request ( PASSIVE_SCAN, // ScanType channel, // ScanChannels @@ -99,21 +100,15 @@ module TestDeviceReceiverC { // received a beacon frame during SCAN ieee154_phyCurrentPage_t page = call MLME_GET.phyCurrentPage(); - ieee154_macBSN_t beaconSequenceNumber = call BeaconFrame.getBSN(frame); - if (beaconSequenceNumber & 1) - call Leds.led2On(); - else - call Leds.led2Off(); - - if (!m_isPANDescriptorValid && call BeaconFrame.parsePANDescriptor( + if (!m_wasScanSuccessful && call BeaconFrame.parsePANDescriptor( frame, RADIO_CHANNEL, page, &m_PANDescriptor) == SUCCESS){ // let's see if the beacon is from our coordinator... if (m_PANDescriptor.CoordAddrMode == ADDR_MODE_SHORT_ADDRESS && m_PANDescriptor.CoordPANId == PAN_ID && m_PANDescriptor.CoordAddress.shortAddress == COORDINATOR_ADDRESS){ // wait until SCAN is finished, then syncronize to beacons - m_isPANDescriptorValid = TRUE; + m_wasScanSuccessful = TRUE; } } return frame; @@ -130,7 +125,7 @@ module TestDeviceReceiverC ieee154_PANDescriptor_t* PANDescriptorList ) { - if (m_isPANDescriptorValid){ + if (m_wasScanSuccessful){ // set the macAutoRequest attribute to TRUE, so indirect // transmissions are automatically carried through call MLME_SET.macAutoRequest(TRUE); @@ -158,7 +153,6 @@ module TestDeviceReceiverC ieee154_security_t *security) { call Leds.led1Off(); - startApp(); } event message_t* MCPS_DATA.indication (message_t* frame) diff --git a/apps/tests/tkn154/beacon-enabled/TestStartSync/README.txt b/apps/tests/tkn154/beacon-enabled/TestStartSync/README.txt index 3706469c..0f4b39c0 100644 --- a/apps/tests/tkn154/beacon-enabled/TestStartSync/README.txt +++ b/apps/tests/tkn154/beacon-enabled/TestStartSync/README.txt @@ -1,5 +1,5 @@ README for TestStartSync -Author/Contact: tinyos-help@millennium.berkeley.edu +Author/Contact: Jan Hauer Description: @@ -11,7 +11,8 @@ a beacon it tries to synchronize to and track all future beacons. Criteria for a successful test: -After a few seconds all nodes should have (only) their second LED turned on. +After a few seconds all nodes should have the LED1 turned on and LED2 +toggling in unison every second. Tools: NONE diff --git a/apps/tests/tkn154/nonbeacon-enabled/TestActiveScan/README.txt b/apps/tests/tkn154/nonbeacon-enabled/TestActiveScan/README.txt index 5990eae2..4de87f23 100644 --- a/apps/tests/tkn154/nonbeacon-enabled/TestActiveScan/README.txt +++ b/apps/tests/tkn154/nonbeacon-enabled/TestActiveScan/README.txt @@ -1,5 +1,5 @@ README for TestActiveScan -Author/Contact: tinyos-help@millennium.berkeley.edu +Author/Contact: Jan Hauer Description: @@ -11,10 +11,8 @@ the predefined channel and expects beacon frames in return. Criteria for a successful test: -On the coordinator node (only) the second LED should toggle once every 2 -seconds. On the device the second and third LED should toggle once every 2 -seconds, but with a small offset of half a second. On the device the first -LED may toggle, but this should happen very rarely. +The coordinator should toggle LED1 once every 2 seconds. The device should +toggle LED1 and LED2 every 2 seconds (not necessarily simultaneously). Tools: NONE diff --git a/apps/tests/tkn154/nonbeacon-enabled/TestActiveScan/device/TestActiveScanDeviceC.nc b/apps/tests/tkn154/nonbeacon-enabled/TestActiveScan/device/TestActiveScanDeviceC.nc index e1534edb..8bd067be 100644 --- a/apps/tests/tkn154/nonbeacon-enabled/TestActiveScan/device/TestActiveScanDeviceC.nc +++ b/apps/tests/tkn154/nonbeacon-enabled/TestActiveScan/device/TestActiveScanDeviceC.nc @@ -105,8 +105,8 @@ module TestActiveScanDeviceC } } if(rightCoordFound == FALSE) { - call Leds.led0On(); - call Led0Timer.startOneShot(62500U); + // call Leds.led0On(); + // call Led0Timer.startOneShot(62500U); } } diff --git a/apps/tests/tkn154/nonbeacon-enabled/TestAssociate/README.txt b/apps/tests/tkn154/nonbeacon-enabled/TestAssociate/README.txt index 211fcf75..194911fb 100644 --- a/apps/tests/tkn154/nonbeacon-enabled/TestAssociate/README.txt +++ b/apps/tests/tkn154/nonbeacon-enabled/TestAssociate/README.txt @@ -1,5 +1,5 @@ README for TestAssociate -Author/Contact: tinyos-help@millennium.berkeley.edu +Author/Contact: Jan Hauer Description: @@ -15,8 +15,8 @@ association the device then disassociates from the PAN. Criteria for a successful test: Assuming one coordinator and one device has been installed, both should -simultaneously switch on (only) the second LED. About 5 seconds later -both should switch off the second LED. +simultaneously switch on LED1. About 5 seconds later both should switch LED1 +off. That's all. Tools: NONE diff --git a/apps/tests/tkn154/nonbeacon-enabled/TestIndirectData/README.txt b/apps/tests/tkn154/nonbeacon-enabled/TestIndirectData/README.txt index b91a5808..7334f3da 100644 --- a/apps/tests/tkn154/nonbeacon-enabled/TestIndirectData/README.txt +++ b/apps/tests/tkn154/nonbeacon-enabled/TestIndirectData/README.txt @@ -1,5 +1,5 @@ README for TestIndirectData -Author/Contact: tinyos-help@millennium.berkeley.edu +Author/Contact: Jan Hauer Description: @@ -13,8 +13,8 @@ transmissions. Criteria for a successful test: Assuming one coordinator and one device has been installed, the coordinator -should briefly flash the second LED every 3 seconds. The device should briefly -flash its third LED every 1 second. +should briefly flash LED1 every 3 seconds. The device should briefly flash +LED2 every 1 second. Tools: NONE diff --git a/apps/tests/tkn154/nonbeacon-enabled/TestPromiscuous/README.txt b/apps/tests/tkn154/nonbeacon-enabled/TestPromiscuous/README.txt index 9377938d..743fa3a0 100644 --- a/apps/tests/tkn154/nonbeacon-enabled/TestPromiscuous/README.txt +++ b/apps/tests/tkn154/nonbeacon-enabled/TestPromiscuous/README.txt @@ -1,5 +1,5 @@ README for TestPromiscuous -Author/Contact: tinyos-help@millennium.berkeley.edu +Author/Contact: Jan Hauer Description: @@ -12,13 +12,12 @@ toggled whenever a frame is received. Criteria for a successful test: -A successful test means that for every received frame the second LED is toggled +A successful test means that for every received frame LED1 is toggled and the java application outputs some text. To see this effect you need a -second node sending a packet. The TestPromiscuous application does not send -packets, but you can, for example, use the +second node sending a packet, for example, use the ../../beacon-enabled/TestStartSync/coordinator application to send periodic -beacon packets. In this case you should see some new text and the second LED -should toggle every half second. +beacon packets. In this case LED1 should toggle every half second and +printf java client should output some text on the frame content. Tools: The printf java client in $TOSDIR/../apps/tests/TestPrintf -- 2.39.2