Merge branch 'nano-revision-2.1' into nano-revision-2.2
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
#include <SoftRS485.h>
|
||||
#include <AM2302-Sensor.h>
|
||||
|
||||
#define PROGRAM "RS485-Nano 2.2 / TempSender 1.2"
|
||||
#define VERSION "1.2"
|
||||
|
||||
#define BTN_INT 3 // button interrupt pin
|
||||
#define Max485_RO 2 // read-output of Max485
|
||||
@@ -39,7 +39,7 @@ boolean raw_states[8];
|
||||
boolean states[8];
|
||||
unsigned long capacitor[8];
|
||||
unsigned long times[8];
|
||||
unsigned long sensor_time = PERIOD;
|
||||
unsigned long sensor_time = 0;
|
||||
|
||||
|
||||
void setup(){
|
||||
@@ -63,7 +63,9 @@ void setup(){
|
||||
|
||||
attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
|
||||
// Print a message to the LCD.
|
||||
Serial.println(PROGRAM);
|
||||
String s = "{nano:"+String(ID)+",revision:2.2,TempSender:"+VERSION+"}";
|
||||
Serial.println(s);
|
||||
send485(s.c_str());
|
||||
#ifdef LOG_TO_SERIAL
|
||||
Serial.println("14 15 16 17 18 19 20 21");
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user