Merge changes from Yue

[~andy/iBeaconNav] / src / edu / ucla / iBeaconNav / CMD.java

diff --git a/src/edu/ucla/iBeaconNav/CMD.java b/src/edu/ucla/iBeaconNav/CMD.java
index 2ea4201a27df6257dbbe465b9e6595dd13fe2572..172baa97c254150bef1f457809bdfbae7da8dba9 100644 (file)
--- a/src/edu/ucla/iBeaconNav/CMD.java
+++ b/src/edu/ucla/iBeaconNav/CMD.java
@@ -1,16 +1,34 @@
 package edu.ucla.iBeaconNav;
 
 public class CMD {
-       /* Main -> Task Messsages */
+       /* Task Commands */
        static enum Command {
                REGISTER,
                CONNECT,
                DISCONNECT,
-       };
+               RSTHEAD,
+               RSTDST,
+       }
 
-       /* Task -> Main messages */
+       /* Responses Commands */
        static enum Response {
-               POSITION,
+               REGISTER_TASK,
+               REGISTER_SENSORS,
                NOTIFY,
-       };
+               SHOWDATA,
+       }
+
+       /* Show Data Commands */
+       static enum Data {
+               ACC,
+               MAG,
+               GYR,
+               ORIENT,
+               WRDACC,
+               WRDGYR,
+               STPCNT,
+               POSITION,
+               HEADING,
+               STABLE,
+       }
 }