arduino/rc-gateway
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

use common libraries and add voltage

Browse Source
This commit is contained in:
Nicu Hodos 2017-01-29 14:00:08 +01:00
parent c5860fdc9a
commit 72842a4b60
2 changed files with 30 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
window1/window1.ino
View File

@ -1,21 +1,13 @@
#include <RCSwitch.h> #include <TinyPower.h>
#include <avr/sleep.h> #include <TinySensor.h>
#include <avr/power.h>
#include <avr/wdt.h>
// Utility macros
#define adc_disable() (ADCSRA &= ~_BV(ADEN)) // disable ADC (before power-off)
#define adc_enable() (ADCSRA |= _BV(ADEN)) // re-enable ADC
#define enable_pin_interrupts() (GIMSK |= _BV(PCIE)) // Enable Pin Change Interrupts
// Pins // Pins
#define SWITCH 0 #define SWITCH 0
#define SENDER 2 #define SENDER 2
#define CONTROLLER 4 #define CONTROLLER 4
#define SENSOR_ID 1
RCSwitch mySwitch = RCSwitch(); TinySensor sensor = TinySensor(SENSOR_ID, SENDER);
char* WND_OPEN = "00000000000000000000000001000001";
char* WND_CLOSED = "00000000000000000000000001100001";
int counter = 0; int counter = 0;
bool currentState; bool currentState;
@ -26,75 +18,40 @@ void setup() {
pinMode(CONTROLLER, OUTPUT); pinMode(CONTROLLER, OUTPUT);
digitalWrite(CONTROLLER, LOW); digitalWrite(CONTROLLER, LOW);
mySwitch.enableTransmit(SENDER); sensor.setup();
mySwitch.setProtocol(2);
updateState(); updateState();
sendWindowState(); sensor.sendWindowState(readState());
set_sleep_mode(SLEEP_MODE_PWR_DOWN);
enable_pin_interrupts();
enableWdt();
TinyPower::setup();
} }
void loop() { void loop() {
sleep(); TinyPower::sleep();
} }
void updateState() { void updateState() {
currentState = digitalRead(SWITCH); currentState = readState();
} }
void sendWindowState() { byte readState() {
byte state = digitalRead(SWITCH); return digitalRead(SWITCH);
if (state == HIGH) {
mySwitch.send(WND_OPEN);
} else {
mySwitch.send(WND_CLOSED);
}
}
void sleep() {
PCMSK |= _BV(PCINT0); // Use PB0 as interrupt pin
adc_disable();
sleep_enable(); // Sets the Sleep Enable bit in the MCUCR Register (SE BIT)
sei(); // Enable interrupts
sleep_cpu(); // sleep
cli(); // Disable interrupts
PCMSK &= ~_BV(PCINT0); // Turn off PB0 as interrupt pin
sleep_disable(); // Clear SE bit
adc_enable();
sei(); // Enable interrupts
} }
ISR(PCINT0_vect) { ISR(PCINT0_vect) {
sendWindowState(); sensor.sendWindowState(readState());
} }
ISR(WDT_vect) { ISR(WDT_vect) {
bool state = digitalRead(SWITCH); bool state = readState();
if (state != currentState) { if (state != currentState) {
sendWindowState(); sensor.sendWindowState(readState());
updateState(); updateState();
return; return;
} }
counter++; counter++;
if (counter % 76 == 0) { if (counter % 76 == 0) {
sendWindowState(); sensor.sendWindowState(readState());
counter = 0; counter = 0;
} }
} }
//enable the wdt for 8sec interrupt
void enableWdt()
{
MCUSR = 0x00;
WDTCR |= _BV(WDCE) | _BV(WDE);
WDTCR = _BV(WDIE) | _BV(WDP3) | _BV(WDP0); //8192ms
}

73
window2/window2.ino
View File

@ -1,20 +1,12 @@
#include <RCSwitch.h> #include <TinyPower.h>
#include <avr/sleep.h> #include <TinySensor.h>
#include <avr/power.h>
#include <avr/wdt.h>
// Utility macros
#define adc_disable() (ADCSRA &= ~_BV(ADEN)) // disable ADC (before power-off)
#define adc_enable() (ADCSRA |= _BV(ADEN)) // re-enable ADC
#define enable_pin_interrupts() (GIMSK |= _BV(PCIE)) // Enable Pin Change Interrupts
// Pins // Pins
#define SWITCH 0 #define SWITCH 0
#define SENDER 2 #define SENDER 2
#define SENSOR_ID 2
RCSwitch mySwitch = RCSwitch(); TinySensor sensor = TinySensor(SENSOR_ID, SENDER);
char* WND_OPEN = "00000000000000000000000001000010";
char* WND_CLOSED = "00000000000000000000000001100010";
int counter = 0; int counter = 0;
bool currentState; bool currentState;
@ -23,75 +15,40 @@ void setup() {
pinMode(SWITCH, INPUT_PULLUP); pinMode(SWITCH, INPUT_PULLUP);
mySwitch.enableTransmit(SENDER); sensor.setup();
mySwitch.setProtocol(2);
updateState(); updateState();
sendWindowState(); sensor.sendWindowState(readState());
set_sleep_mode(SLEEP_MODE_PWR_DOWN);
enable_pin_interrupts();
enableWdt();
TinyPower::setup();
} }
void loop() { void loop() {
sleep(); TinyPower::sleep();
} }
void updateState() { void updateState() {
currentState = digitalRead(SWITCH); currentState = readState();
} }
void sendWindowState() { byte readState() {
byte state = digitalRead(SWITCH); return digitalRead(SWITCH);
if (state == HIGH) {
mySwitch.send(WND_OPEN);
} else {
mySwitch.send(WND_CLOSED);
}
}
void sleep() {
PCMSK |= _BV(PCINT0); // Use PB0 as interrupt pin
adc_disable();
sleep_enable(); // Sets the Sleep Enable bit in the MCUCR Register (SE BIT)
sei(); // Enable interrupts
sleep_cpu(); // sleep
cli(); // Disable interrupts
PCMSK &= ~_BV(PCINT0); // Turn off PB0 as interrupt pin
sleep_disable(); // Clear SE bit
adc_enable();
sei(); // Enable interrupts
} }
ISR(PCINT0_vect) { ISR(PCINT0_vect) {
sendWindowState(); sensor.sendWindowState(readState());
} }
ISR(WDT_vect) { ISR(WDT_vect) {
bool state = digitalRead(SWITCH); bool state = readState();
if (state != currentState) { if (state != currentState) {
sendWindowState(); sensor.sendWindowState(readState());
updateState(); updateState();
return; return;
} }
counter++; counter++;
if (counter % 76 == 0) { if (counter % 76 == 0) {
sendWindowState(); sensor.sendWindowState(readState());
counter = 0; counter = 0;
} }
} }
//enable the wdt for 8sec interrupt
void enableWdt()
{
MCUSR = 0x00;
WDTCR |= _BV(WDCE) | _BV(WDE);
WDTCR = _BV(WDIE) | _BV(WDP3) | _BV(WDP0); //8192ms
}