StephanRichter
/
Nano-485
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'nano-revision-2.1' into nano-revision-2.2 

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
nano-revision-2.2
Stephan Richter 2 months ago
parent
67313e26a5 b6723b92fc
commit
73304368b3
2 changed files with 13 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      Software/Sender/Sender.ino
  2. 13
      Software/TempSender/TempSender.ino

11
Software/Sender/Sender.ino
Unescape View File

@ -10,15 +10,16 @@
#include <SoftRS485.h> #include <SoftRS485.h>
// 0=Test // 0=Test
// 1=Arbeitszimmer // 1=Flur
// 2=Küche // 2=Wohnzimmer
// 3=Bad // 3=Bad
// 4=Treppenhaus // 4=Treppenhaus
// 5=Arbeitszimmer
#define ID 4 #define ID 4
#define PROGRAM "Sender" #define PROGRAM "Sender"
#define VERSION "1.3" #define SW_VERSION "1.3"
#define REVISION "2.2" #define HW_VERSION "2.2"
#define BTN_INT 3 // button interrupt pin #define BTN_INT 3 // button interrupt pin
#define Max485_RO 2 // read-output of Max485 #define Max485_RO 2 // read-output of Max485
@ -59,7 +60,7 @@ void setup(){
pinMode(21,INPUT_PULLUP); pinMode(21,INPUT_PULLUP);
attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE); attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
String s = "{nano:"+String(ID)+",hw:"+REVISION+","+PROGRAM+":"+VERSION+"}"; String s = "{nano:"+String(ID)+",hw:"+HW_VERSION+","+PROGRAM+":"+SW_VERSION+"}";
Serial.println(s); Serial.println(s);
send485(s.c_str()); send485(s.c_str());
#ifdef LOG_TO_SERIAL #ifdef LOG_TO_SERIAL

13
Software/TempSender/TempSender.ino
Unescape View File

@ -13,15 +13,16 @@
#include <AM2302-Sensor.h> #include <AM2302-Sensor.h>
// 0=Test // 0=Test
// 1=Arbeitszimmer // 1=Flur
// 2=Küche // 2=Wohnzimmer
// 3=Bad // 3=Bad
// 4=Treppenhaus // 4=Treppenhaus
// 5=Arbeitszimmer
#define ID 1 #define ID 5
#define PROGRAM "TempSender" #define PROGRAM "TempSender"
#define VERSION "1.3" #define SW_VERSION "1.3"
#define REVISION "2.2" #define HW_VERSION "2.2"
#define BTN_INT 3 // button interrupt pin #define BTN_INT 3 // button interrupt pin
#define Max485_RO 2 // read-output of Max485 #define Max485_RO 2 // read-output of Max485
@ -68,7 +69,7 @@ void setup(){
pinMode(21,INPUT_PULLUP); pinMode(21,INPUT_PULLUP);
attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE); attachInterrupt(digitalPinToInterrupt(BTN_INT),isr,CHANGE);
String s = "{nano:"+String(ID)+",hw:"+REVISION+","+PROGRAM+":"+VERSION+"}"; String s = "{nano:"+String(ID)+",hw:"+HW_VERSION+","+PROGRAM+":"+SW_VERSION+"}";
Serial.println(s); Serial.println(s);
send485(s.c_str()); send485(s.c_str());
#ifdef LOG_TO_SERIAL #ifdef LOG_TO_SERIAL

Write Preview
Loading…
Cancel
Save