ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

fixed arduino timer issue

Browse source
This commit is contained in:
Ziver Koc 2018-12-03 22:28:05 +01:00
parent c1c923a2fc
commit 8526e5157d
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
arduino/HalMultiSensor/HalConfiguration.h
View file

@ -6,24 +6,25 @@
#define TIMER_MILLISECOND 60000 // poling in minutes #define TIMER_MILLISECOND 60000 // poling in minutes
#define INDICATOR_PIN 13 // diode #define INDICATOR_PIN 13 // diode
#define DEVICE_BASE_ID 98 #define TX_PIN 11
#define DEVICE_BASE_ID 99
// POWER CONSUMPTION SENSOR // POWER CONSUMPTION SENSOR
//#define POWERCON_ENABLED // comment out to disable sensor //#define POWERCON_ENABLED // comment out to disable sensor
#define POWERCON_SENSOR SensorPhotocell() #define POWERCON_SENSOR SensorPhotocell()
#define POWERCON_PROTOCOL ProtocolOregon(11, DEVICE_BASE_ID + 1) #define POWERCON_PROTOCOL ProtocolOregon(TX_PIN, DEVICE_BASE_ID + 0)
#define POWER_TIMER_MULTIPLIER 1 #define POWER_TIMER_MULTIPLIER 1
// TEMPERATURE SENSOR // TEMPERATURE SENSOR
#define TEMPERATURE_ENABLED // comment out to disable sensor #define TEMPERATURE_ENABLED // comment out to disable sensor
#define TEMPERATURE_SENSOR SensorDHT(DHT22, 10) #define TEMPERATURE_SENSOR SensorDHT(DHT11, 10)
#define TEMPERATURE_PROTOCOL ProtocolOregon(11, DEVICE_BASE_ID + 2) #define TEMPERATURE_PROTOCOL ProtocolOregon(TX_PIN, DEVICE_BASE_ID + 1)
#define TEMPERATURE_TIMER_MULTIPLIER 10 #define TEMPERATURE_TIMER_MULTIPLIER 10
// LIGHT SENSOR // LIGHT SENSOR
//#define LIGHT_ENABLED // comment out to disable sensor //#define LIGHT_ENABLED // comment out to disable sensor
#define LIGHT_SENSOR SensorBH1750() #define LIGHT_SENSOR SensorBH1750()
#define LIGHT_PROTOCOL ProtocolOregon(11, DEVICE_BASE_ID + 3) #define LIGHT_PROTOCOL ProtocolOregon(TX_PIN, DEVICE_BASE_ID + 2)
#define LIGHT_TIMER_MULTIPLIER 10 #define LIGHT_TIMER_MULTIPLIER 10

9
arduino/HalMultiSensor/HalMultiSensor.ino
View file

@ -10,6 +10,15 @@ the data to a central location.
#include "Interrupt.h" #include "Interrupt.h"
#ifndef POWERCON_ENABLED
#define POWER_TIMER_MULTIPLIER 1
#endif
#ifndef TEMPERATURE_ENABLED
#define TEMPERATURE_TIMER_MULTIPLIER 1
#endif
#ifndef LIGHT_ENABLED
#define LIGHT_TIMER_MULTIPLIER 1
#endif
#define TIMER_MULTIPLIER_MAX \ #define TIMER_MULTIPLIER_MAX \
POWER_TIMER_MULTIPLIER * TEMPERATURE_TIMER_MULTIPLIER * LIGHT_TIMER_MULTIPLIER POWER_TIMER_MULTIPLIER * TEMPERATURE_TIMER_MULTIPLIER * LIGHT_TIMER_MULTIPLIER
unsigned int timerMultiplier = 0; unsigned int timerMultiplier = 0;