[Tinyos-2-commits] [tinyos-main] r5943 committed - use 3 sensors instead of 4

tinyos-main at googlecode.com tinyos-main at googlecode.com
Thu Apr 12 22:16:03 PDT 2012


Revision: 5943
Author:   sallai.janos
Date:     Thu Apr 12 22:15:51 2012
Log:      use 3 sensors instead of 4

http://code.google.com/p/tinyos-main/source/detail?r=5943

Modified:
  /trunk/apps/tosthreads/capps/SenseStoreAndForward/README
  /trunk/apps/tosthreads/capps/SenseStoreAndForward/SenseStoreAndForward.c

=======================================
--- /trunk/apps/tosthreads/capps/SenseStoreAndForward/README	Tue Jun 24  
19:47:04 2008
+++ /trunk/apps/tosthreads/capps/SenseStoreAndForward/README	Thu Apr 12  
22:15:51 2012
@@ -18,7 +18,7 @@

  Valid platforms are currently: tmote, telosb with onboard sensors

-Readings are taken from each of the 4 oboard sensors and logged to flash  
as one
+Readings are taken from three  oboard sensors and logged to flash as one
  record in an infinite loop. Records are then read out of flash and and  
sent out
  over the radio interface in separate infinite loop. Before the application
  starts running, the entire contents of the flash drive are erased.
=======================================
---  
/trunk/apps/tosthreads/capps/SenseStoreAndForward/SenseStoreAndForward.c	 
Wed Dec 23 10:08:47 2009
+++  
/trunk/apps/tosthreads/capps/SenseStoreAndForward/SenseStoreAndForward.c	 
Thu Apr 12 22:15:51 2012
@@ -69,7 +69,7 @@
  #include "tmote_onboard_sensors.h"
  #include "StorageVolumes.h"

-#define NUM_SENSORS              4
+#define NUM_SENSORS              3
  #define SAMPLING_PERIOD       3000
  #define SENDING_PERIOD       10000
  #define AM_SENSOR_DATA_MSG    0x25
@@ -80,14 +80,14 @@
    nx_uint16_t hum;
    nx_uint16_t temp;
    nx_uint16_t tsr;
-  nx_uint16_t par;
+//  nx_uint16_t par;
  } sensor_data_t;

  //Initialize variables associated with each thread
  tosthread_t humidity;
  tosthread_t temperature;
  tosthread_t total_solar;
-tosthread_t photo_active;
+//tosthread_t photo_active;
  tosthread_t store_handler;
  tosthread_t send_handler;

@@ -102,7 +102,7 @@
  void humidity_thread(void* arg);
  void temperature_thread(void* arg);
  void total_solar_thread(void* arg);
-void photo_active_thread(void* arg);
+//void photo_active_thread(void* arg);
  void store_thread(void* arg);
  void send_thread(void* arg);

@@ -121,7 +121,7 @@
    tosthread_create(&humidity, humidity_thread, NULL, 200);
    tosthread_create(&temperature, temperature_thread, NULL, 200);
    tosthread_create(&total_solar, total_solar_thread, NULL, 200);
-  tosthread_create(&photo_active, photo_active_thread, NULL, 200);
+//  tosthread_create(&photo_active, photo_active_thread, NULL, 200);
    tosthread_create(&store_handler, store_thread, NULL, 200);
    tosthread_create(&send_handler, send_thread, NULL, 200);
  }
@@ -147,9 +147,9 @@
  void total_solar_thread(void* arg) {
    read_sensor(hamamatsuS10871_tsr_read, &(storing_sensor_data.tsr));
  }
-void photo_active_thread(void* arg) {
-  read_sensor(hamamatsuS1087_par_read, &(storing_sensor_data.par));
-}
+//void photo_active_thread(void* arg) {
+//  read_sensor(hamamatsuS1087_par_read, &(storing_sensor_data.par));
+//}
  void store_thread(void* arg) {
    storage_len_t sensor_data_len;
    bool sensor_records_lost;


More information about the Tinyos-2-commits mailing list