X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=apps%2Ftosthreads%2Fcapps%2FTestCollection%2FTestCollection.c;h=f0b417fbf97b92fc6ee344a3aeab823bb8396fc4;hb=0e9650435759d038896419f3aabfb5805d81b22d;hp=889ffabe149ed56aed77afb9a45ac70eb6ff0fc4;hpb=f7dd4e1ad5aa5fcbb0d25240d41b05873b00acbe;p=tinyos-2.x.git

diff --git a/apps/tosthreads/capps/TestCollection/TestCollection.c b/apps/tosthreads/capps/TestCollection/TestCollection.c
index 889ffabe..f0b417fb 100644
--- a/apps/tosthreads/capps/TestCollection/TestCollection.c
+++ b/apps/tosthreads/capps/TestCollection/TestCollection.c
@@ -1,29 +1,110 @@
 /*
- * Copyright (c) 2008 Johns Hopkins University.
+ * Copyright (c) 2008 Stanford University.
  * All rights reserved.
  *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose, without fee, and without written
- * agreement is hereby granted, provided that the above copyright
- * notice, the (updated) modification history and the author appear in
- * all copies of this source code.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the
+ *   distribution.
+ * - Neither the name of the Stanford University nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF USE, DATA,
- * OR PROFITS) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL STANFORD
+ * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 /**
- * @author Chieh-Jan Mike Liang <cliang4@cs.jhu.edu>
+ * @author Kevin Klues <klueska@cs.stanford.edu>
  */
 
 #include "tosthread.h"
+#include "tosthread_amradio.h"
+#include "tosthread_amserial.h"
+#include "tosthread_leds.h"
+#include "tosthread_collection.h"
+#include "tosthread_sinesensor.h"
+#include "MultihopOscilloscope.h"
+
+void fatal_problem();
+void report_problem();
+void report_sent();
+void report_received();
+
+oscilloscope_t local;
+uint8_t reading = 0;   /* 0 to NREADINGS */
+message_t sendbuf;
+message_t recvbuf;
+
+void tosthread_main(void* arg) {
+  local.interval = DEFAULT_INTERVAL;
+  local.id = TOS_NODE_ID;
+  local.version = 0;
+  
+  while ( amRadioStart() != SUCCESS );
+  while ( collectionRoutingStart() != SUCCESS );
+ 
+  if (local.id % 500 == 0) {
+    while ( amSerialStart() != SUCCESS);
+    collectionSetRoot();
+    for (;;) {
+      if ( collectionReceive(&recvbuf, 0, AM_OSCILLOSCOPE) == SUCCESS) {
+        amSerialSend(AM_BROADCAST_ADDR, &recvbuf, sizeof(local), AM_OSCILLOSCOPE);
+        report_received();
+      }
+    }
+  } else {
+    uint16_t var;
+      
+    for (;;) {
+      if (reading == NREADINGS) {
+        oscilloscope_t *o = o;
+        o = (oscilloscope_t *) collectionGetPayload(&sendbuf, sizeof(oscilloscope_t));
+        if (o == NULL) {
+          fatal_problem();
+          return;
+        }
+        memcpy(o, &local, sizeof(local));
+        if (collectionSend(&sendbuf, sizeof(local), AM_OSCILLOSCOPE) == SUCCESS) {
+          report_sent();
+        } else {
+          report_problem();
+        }
+        
+        reading = 0;
+      }
+          
+      if (sinesensor_read(&var) == SUCCESS) {
+        local.readings[reading++] = var;
+      }
+        
+      tosthread_sleep(local.interval);
+    }
+  }
+}
+  
+// Use LEDs to report various status issues.
+void fatal_problem() { 
+  led0On(); 
+  led1On();
+  led2On();
+}
 
-void tosthread_main(void* arg) {}
+void report_problem() { led0Toggle(); }
+void report_sent() { led1Toggle(); }
+void report_received() { led2Toggle(); }