Merge branch 'nano-revision-2.0' into nano-revision-2.1
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
|
||||
#define ID 0
|
||||
#define PROGRAM "TempSender"
|
||||
#define SW_VERSION "1.4"
|
||||
define SW_VERSION "1.5"
|
||||
#define HW_VERSION "2.1"
|
||||
|
||||
#define BTN_INT 3 // button interrupt pin
|
||||
@@ -48,9 +48,9 @@ unsigned long times[8];
|
||||
unsigned long sensor_time = 0;
|
||||
|
||||
// these values are used for temperature processing
|
||||
SimpleDHT11 sensor(DHT_PIN);
|
||||
byte temperature = 0;
|
||||
byte humidity = 0;
|
||||
SimpleDHT22 sensor(DHT_PIN);
|
||||
float temperature = 0;
|
||||
float humidity = 0;
|
||||
int err = SimpleDHTErrSuccess;
|
||||
|
||||
void setup(){
|
||||
@@ -135,8 +135,8 @@ void loop(){
|
||||
|
||||
if (now - sensor_time > PERIOD){
|
||||
sensor_time = now;
|
||||
if ((err = sensor.read(&temperature, &humidity, NULL)) == SimpleDHTErrSuccess) {
|
||||
String s = "{nano:"+String(ID)+",temp:"+String((int)temperature)+",humi:"+String((int)humidity)+"}";
|
||||
if ((err = sensor.read2(&temperature, &humidity, NULL)) == SimpleDHTErrSuccess) {
|
||||
String s = "{nano:"+String(ID)+",temp:"+String(temperature,1)+",humi:"+String(humidity,1)+"}";
|
||||
send485(s.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user