Switch Deluge T2 to the AM IDs indicated by TEP 135.

diff --git a/tools/tinyos/misc/tos-deluge b/tools/tinyos/misc/tos-deluge
index b8e79ce4759217f3865b56ab42a21deffd5b4b1d..c1c7777fb86b7c87d483232be7184371f3c19434 100755 (executable)
--- a/tools/tinyos/misc/tos-deluge
+++ b/tools/tinyos/misc/tos-deluge
@@ -36,8 +36,8 @@ from datetime import datetime
 PATH_PY_BUILD_IMAGE  = os.path.join(os.path.dirname(sys.argv[0]), 'tos-build-deluge-image')
 
 # TinyOS serial communication parameters
-FM_AMID = 0xAB
-DM_AMID = 0xAC
+FM_AMID = 0x53
+DM_AMID = 0x54
 SERIAL_DATA_LENGTH = 28 - 1 - 1 - 2 - 2
 BAUDRATES = {'micaz': 57600,
              'telosb': 115200,

diff --git a/tos/lib/net/Deluge/Deluge.h b/tos/lib/net/Deluge/Deluge.h
index fc2cfc504640f490dabe16803a04e6d7e033bba2..26eeadb70ac7918498b7dc9d1fffebbc3284eedd 100644 (file)
--- a/tos/lib/net/Deluge/Deluge.h
+++ b/tos/lib/net/Deluge/Deluge.h
@@ -45,8 +45,8 @@ enum {
   DELUGE_INVALID_UID = 0xffffffff,
   DELUGE_NUM_VOLUMES = 4, 
   DELUGE_KEY = 0xDE00,
-  DELUGE_AM_FLASH_VOL_MANAGER = 0xAB,
-  DELUGE_AM_DELUGE_MANAGER = 0xAC,
+  DELUGE_AM_FLASH_VOL_MANAGER = 0x53,
+  DELUGE_AM_DELUGE_MANAGER = 0x54,
 };
 
 enum {

diff --git a/tos/lib/net/Deluge/DelugePageTransfer.h b/tos/lib/net/Deluge/DelugePageTransfer.h
index 1edc880a204476238537da55543c50017d9a0996..c491dffb0a460387c71f65cb76d3a62b74b6a155 100644 (file)
--- a/tos/lib/net/Deluge/DelugePageTransfer.h
+++ b/tos/lib/net/Deluge/DelugePageTransfer.h
@@ -41,9 +41,9 @@
 
 #include <message.h>
 
-#define AM_DELUGEADVMSG  161
-#define AM_DELUGEREQMSG  162
-#define AM_DELUGEDATAMSG 163
+#define AM_DELUGEADVMSG  0x50
+#define AM_DELUGEREQMSG  0x51
+#define AM_DELUGEDATAMSG 0x52
 
 typedef int32_t object_id_t;
 typedef nx_int32_t nx_object_id_t;