[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/components ResetMgrC.nc, 1.10, 1.11 ResetMgrM.nc, 1.8, 1.9 VarUtilM.nc, 1.2, 1.3

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29615/contrib/wustl/apps/Agilla/components

Modified Files:
	ResetMgrC.nc ResetMgrM.nc VarUtilM.nc 
Log Message:
Removed clustering components.

Index: ResetMgrC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ResetMgrC.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ResetMgrC.nc	18 May 2006 19:58:40 -0000	1.10
--- ResetMgrC.nc	26 May 2006 02:58:20 -0000	1.11
***************
*** 57,65 ****
    components MessageBufferM, LedsC;
  
-   #if ENABLE_CLUSTERING
-   components ClusterheadDirectoryM;
-   #endif
- 
- 
    #if ENABLE_EXP_LOGGING
      components ExpLoggerC;
--- 57,60 ----
***************
*** 85,90 ****
    #endif
    ResetMgrM.Leds -> LedsC;
-   #if ENABLE_CLUSTERING
-   ResetMgrM.CHDir -> ClusterheadDirectoryM;
-   #endif
  }
--- 80,82 ----

Index: ResetMgrM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ResetMgrM.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ResetMgrM.nc	18 May 2006 19:58:40 -0000	1.8
--- ResetMgrM.nc	26 May 2006 02:58:20 -0000	1.9
***************
*** 63,70 ****
  
      interface Leds;
-     #if ENABLE_CLUSTERING
-     interface ClusterheadDirectoryI as CHDir;
-     #endif
- 
  
      #if ENABLE_EXP_LOGGING
--- 63,66 ----
***************
*** 187,193 ****
  
        resetting = FALSE;
-       #if ENABLE_CLUSTERING
-       call CHDir.reset();
-       #endif
      }
      return SUCCESS;
--- 183,186 ----

Index: VarUtilM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/VarUtilM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VarUtilM.nc	18 May 2006 19:58:40 -0000	1.2
--- VarUtilM.nc	26 May 2006 02:58:20 -0000	1.3
***************
*** 79,81 ****
--- 79,105 ----
      return varSize;    
    }
+   
+   command char* VarUtilI.typeToString(uint8_t type) {
+     switch(type) {
+       case AGILLA_TYPE_INVALID:
+         return "AGILLA_TYPE_INVALID";
+       case AGILLA_TYPE_VALUE:
+         return "AGILLA_TYPE_VALUE";
+       case AGILLA_TYPE_READING:
+         return "AGILLA_TYPE_READING";
+       case AGILLA_TYPE_STRING:
+         return "AGILLA_TYPE_STRING";
+       case AGILLA_TYPE_TYPE:
+         return "AGILLA_TYPE_TYPE";
+       case AGILLA_TYPE_STYPE:
+         return "AGILLA_TYPE_STYPE";
+       case AGILLA_TYPE_AGENTID:
+         return "AGILLA_TYPE_AGENTID";
+       case AGILLA_TYPE_LOCATION:
+         return "AGILLA_TYPE_LOCATION";
+       case AGILLA_TYPE_ANY:
+         return "AGILLA_TYPE_ANY";
+     }
+     return "UNKNOWN";
+   }
  }