Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: DigiLogger
Dependents: WaterLogger XbeeGateway XBee_Cooker ProjetReceiver ... more
Revision 5:da2ea7a76243, committed 2016-03-31
- Comitter:
- hbujanda
- Date:
- Thu Mar 31 11:39:30 2016 +0200
- Parent:
- 4:629712865107
- Child:
- 6:06522f3a6642
- Commit message:
- Automatic upload
Changed in this revision
| XBee/XBee.cpp | Show annotated file Show diff for this revision Revisions of this file |
| XBee/XBee.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/XBee/XBee.cpp Mon Jun 01 18:59:43 2015 +0200
+++ b/XBee/XBee.cpp Thu Mar 31 11:39:30 2016 +0200
@@ -676,7 +676,8 @@
XB900HP_NZ = 0x2C,
XBP24C_TH_DIP = 0x2D,
XB24C_TH_DIP = 0x2E,
- XLR_BASEBOARD = 0x2F
+ XLR_BASEBOARD = 0x2F,
+ XBP24C_S2C_SMT = 0x30
#endif
};
const bool fw_4_bytes_len = _fw_version > 0x0FFF && _fw_version < 0xFFFF;
@@ -729,6 +730,9 @@
return XBeeWiFi;
#endif
} else if (hw_version_msb == XBP24C || hw_version_msb == XB24C) {
+ if (fw_4_bytes_len && fw_nibble_3 == 2) {
+ return Raw_802_15_4;
+ }
#ifdef EXTRA_XBEE_PROTOCOLS
if (fw_4_bytes_len && fw_nibble_3 == 5) {
return SmartEnergy;
@@ -755,6 +759,14 @@
return None;
} else if (hw_version_msb == XB900HP_NZ) {
return DigiPoint;
+ } else if (hw_version_msb == XBP24C_TH_DIP || hw_version_msb == XB24C_TH_DIP || hw_version_msb == XBP24C_S2C_SMT) {
+ if (fw_4_bytes_len && fw_nibble_3 == 5) {
+ return SmartEnergy;
+ }
+ if (fw_4_bytes_len && fw_nibble_3 == 2) {
+ return Raw_802_15_4;
+ }
+ return ZigBee;
}
#else
}
--- a/XBee/XBee.h Mon Jun 01 18:59:43 2015 +0200
+++ b/XBee/XBee.h Thu Mar 31 11:39:30 2016 +0200
@@ -492,6 +492,8 @@
protected:
+#define EXTRA_XBEE_PROTOCOLS
+
enum RadioProtocol {
None,
ZigBee,