deac
/
osd-contiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup code

master
Harald Pichler 2017-10-19 15:44:11 +02:00
parent e93083073c
commit 15039f6b5d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/osd/arduino-dht/DHT.h
View File

@ -8,6 +8,7 @@ written by Adafruit Industries
#include "Arduino.h" #include "Arduino.h"
// Uncomment to enable printing out nice debug messages. // Uncomment to enable printing out nice debug messages.
//#define DHT_DEBUG //#define DHT_DEBUG

2
examples/osd/arduino-dht/project-conf.h
View File

@ -38,7 +38,7 @@
#define SICSLOWPAN_CONF_FRAG 1 #define SICSLOWPAN_CONF_FRAG 1
#define LOOP_INTERVAL (30 * CLOCK_SECOND) #define LOOP_INTERVAL (10 * CLOCK_SECOND)
/* Save energy */ /* Save energy */
//#define RDC_CONF_PT_YIELD_OFF //#define RDC_CONF_PT_YIELD_OFF

14
examples/osd/arduino-dht/sketch.pde
View File

@ -32,13 +32,13 @@ extern resource_t res_dhtctemp, res_dhtchum;
// Connect pin 2 of the sensor to whatever your DHTPIN is // Connect pin 2 of the sensor to whatever your DHTPIN is
// Connect pin 4 (on the right) of the sensor to GROUND // Connect pin 4 (on the right) of the sensor to GROUND
// Connect a 10K resistor from pin 2 (data) to pin 1 (power) o // Connect a 10K resistor from pin 2 (data) to pin 1 (power) o
#define DHTPINA 9 // what digital pin we're connected to #define DHTPINA 7 // what digital pin we're connected to
DHT dhta(DHTPINA, DHTTYPE); DHT dhta(DHTPINA, DHTTYPE);
#define DHTPINB 8 // what digital pin we're connected to #define DHTPINB 8 // what digital pin we're connected to
DHT dhtb(DHTPINB, DHTTYPE); DHT dhtb(DHTPINB, DHTTYPE);
#define DHTPINC 7 // what digital pin we're connected to #define DHTPINC 9 // what digital pin we're connected to
DHT dhtc(DHTPINC, DHTTYPE); DHT dhtc(DHTPINC, DHTTYPE);
float dhta_hum; float dhta_hum;
@ -86,6 +86,7 @@ void setup (void)
// LOOP_INTERVAL (30 * CLOCK_SECOND) // LOOP_INTERVAL (30 * CLOCK_SECOND)
void loop (void) void loop (void)
{ {
int errdht=0;
// Reading temperature or humidity takes about 250 milliseconds! // Reading temperature or humidity takes about 250 milliseconds!
// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor) // Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
dhta_hum = dhta.readHumidity(); dhta_hum = dhta.readHumidity();
@ -99,16 +100,19 @@ void loop (void)
// Check if any reads failed and exit early (to try again). // Check if any reads failed and exit early (to try again).
if (isnan(dhta_hum) || isnan(dhta_temp)) { if (isnan(dhta_hum) || isnan(dhta_temp)) {
printf("Failed to read from DHTa sensor!\n"); printf("Failed to read from DHTa sensor!\n");
return; errdht=1;
} }
if (isnan(dhtb_hum) || isnan(dhtb_temp)) { if (isnan(dhtb_hum) || isnan(dhtb_temp)) {
printf("Failed to read from DHTb sensor!\n"); printf("Failed to read from DHTb sensor!\n");
return; errdht=1;
} }
if (isnan(dhtc_hum) || isnan(dhtc_temp)) { if (isnan(dhtc_hum) || isnan(dhtc_temp)) {
printf("Failed to read from DHTc sensor!\n"); printf("Failed to read from DHTc sensor!\n");
return; errdht=1;
} }
if (errdht){
return;
}
dtostrf(dhta_temp , 0, 2, dhta_temp_s ); dtostrf(dhta_temp , 0, 2, dhta_temp_s );
dtostrf(dhta_hum , 0, 2, dhta_hum_s ); dtostrf(dhta_hum , 0, 2, dhta_hum_s );