Update to TestCollection apps for tosthreads to send correct payload for displaying...

[tinyos-2.x.git] / apps / tosthreads / apps / TestCollection / TestCollectionC.nc

diff --git a/apps/tosthreads/apps/TestCollection/TestCollectionC.nc b/apps/tosthreads/apps/TestCollection/TestCollectionC.nc
index e401fc0537d78c10426b9a84c54cae21db16ee01..e49640ba994a4c4acc64070cb96bce5bfebcbc13 100644 (file)
--- a/apps/tosthreads/apps/TestCollection/TestCollectionC.nc
+++ b/apps/tosthreads/apps/TestCollection/TestCollectionC.nc
@@ -73,7 +73,10 @@ implementation {
       call RootControl.setRoot();
       for (;;) {
         if (call BlockingReceive.receive(&recvbuf, 0) == SUCCESS) {
-          call SerialBlockingSend.send(AM_BROADCAST_ADDR, &recvbuf, sizeof(local));
+          oscilloscope_t *recv_o = (oscilloscope_t *) call BlockingReceive.getPayload(&recvbuf, sizeof(oscilloscope_t));
+          oscilloscope_t *send_o = (oscilloscope_t *) call SerialBlockingSend.getPayload(&sendbuf, sizeof(oscilloscope_t));
+          memcpy(send_o, recv_o, sizeof(oscilloscope_t));
+          call SerialBlockingSend.send(AM_BROADCAST_ADDR, &sendbuf, sizeof(oscilloscope_t));
           report_received();
         }
       }
@@ -82,14 +85,13 @@ implementation {
       
       for (;;) {
         if (reading == NREADINGS) {
-          oscilloscope_t *o = o;
-          o = (oscilloscope_t *)call BlockingSend.getPayload(&sendbuf, sizeof(oscilloscope_t));
+          oscilloscope_t *o = (oscilloscope_t *) call BlockingSend.getPayload(&sendbuf, sizeof(oscilloscope_t));
           if (o == NULL) {
             fatal_problem();
             return;
           }
-          memcpy(o, &local, sizeof(local));
-          if (call BlockingSend.send(&sendbuf, sizeof(local)) == SUCCESS) {
+          memcpy(o, &local, sizeof(oscilloscope_t));
+          if (call BlockingSend.send(&sendbuf, sizeof(oscilloscope_t)) == SUCCESS) {
             report_sent();
           } else {
             report_problem();