From 8050ce6bfd13665c9c7d7353b11b9e61d12eb3e4 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Tue, 2 Feb 2016 14:33:32 +0100 Subject: LCD status --- sketch_receiver/sketch_receiver.ino | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/sketch_receiver/sketch_receiver.ino b/sketch_receiver/sketch_receiver.ino index adada18..e7ef85a 100644 --- a/sketch_receiver/sketch_receiver.ino +++ b/sketch_receiver/sketch_receiver.ino @@ -1,14 +1,8 @@ - #include #include -RCSwitch mySwitch = RCSwitch( ); RCSwitch sender = RCSwitch( ); LiquidCrystal lcd = LiquidCrystal(8 ,9 ,4 ,5 ,6 ,7); -#define OnCode1 1381717 -#define OffCode1 1381716 -#define OnCode2 1394005 -#define OffCode2 1394004 #define CodeLength 24 #define SendPin A5 @@ -17,6 +11,9 @@ LiquidCrystal lcd = LiquidCrystal(8 ,9 ,4 ,5 ,6 ,7); int keyLimits [KEY_COUNT+1] = {100, 330, 580, 900, 1023}; int keyNames [KEY_COUNT+1] = {0, 1, 2, 3, 4}; +const unsigned long OnCode[2] = {1381717, 1394005}; +const unsigned long OffCode[2] = {1381716, 1394004}; + void setup() { lcd.begin(16,2); Serial.begin(9600); @@ -29,30 +26,36 @@ void setup() { pinMode(13, OUTPUT); } +void setSocket(int id, bool on) { + sender.send((on ? OnCode : OffCode)[id], CodeLength); + lcd.setCursor(0, id); + lcd.print("Socket "); + lcd.print(id); + lcd.print(on ? " on" : " off"); +} + void button_left(){ - sender.send(OffCode1, CodeLength); - sender.send(OnCode2, CodeLength); + setSocket(0, true); + setSocket(1, false); } void button_right(){ - sender.send(OnCode1, CodeLength); - sender.send(OffCode2, CodeLength); + setSocket(0, false); + setSocket(1, true); } void button_up(){ - sender.send(OnCode1, CodeLength); - sender.send(OnCode2, CodeLength); + setSocket(0, true); + setSocket(1, true); } void button_down(){ - sender.send(OffCode1, CodeLength); - sender.send(OffCode2, CodeLength); + setSocket(0, false); + setSocket(1, false); } int check_button(){ int val = analogRead(A0); - lcd.setCursor(0,0); - lcd.print(val); for (int i = 0; i <= KEY_COUNT; i++) if (val < keyLimits[i]) return keyNames[i]; -- cgit v1.2.3 From 5a6cd4d3954908c22783b5c8d9b048a10085b301 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Tue, 2 Feb 2016 14:37:44 +0100 Subject: RCSwitch library --- .gitmodules | 3 +++ libraries/RCSwitch | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 libraries/RCSwitch diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d9eac3f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libraries/RCSwitch"] + path = libraries/RCSwitch + url = https://github.com/sui77/rc-switch.git diff --git a/libraries/RCSwitch b/libraries/RCSwitch new file mode 160000 index 0000000..c4ac566 --- /dev/null +++ b/libraries/RCSwitch @@ -0,0 +1 @@ +Subproject commit c4ac56633a3b0c8f16f13f5acdfed9e284c554ea -- cgit v1.2.3