MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added centralized sensor network configuration file to control channel, power level and data rate.

Browse Source
This commit is contained in:
Bruce Lacey
2014-03-09 15:30:33 -07:00
parent f1fe7062c6
commit 2195a8c952
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/Config.h
+17
View File
@@ -0,0 +1,17 @@
#ifndef Config_h
#define Config_h
/***
* Configure Sensor Network
*/
#define RF24_CHANNEL 76 //RF channel for the sensor net, 0-127
#define RF24_DATARATE RF24_2MBPS //RF24_250KBPS for 250kbs, RF24_1MBPS for 1Mbps, or RF24_2MBPS for 2Mbps
#define RF24_PA_LEVEL RF24_PA_MAX //Senor PA Level == RF24_PA_MIN=-18dBm, RF24_PA_LOW=-12dBm, RF24_PA_HIGH=-6dBM, and RF24_PA_HIGH=0dBm
#define RF24_PA_LEVEL_GW RF24_PA_LEVEL //Gateway PA Level, defaults to Sensor net PA Level. Tune here if using an amplified nRF2401+ in your gateway.
/***
* Enable/Disable debug logging
*/
//#define DEBUG
#endif
libraries/MySensors/Gateway.h
+1 -1
View File
@@ -40,7 +40,7 @@ class Gateway : public Relay
Gateway(uint8_t _cepin, uint8_t _cspin, uint8_t _inclusion_time, uint8_t _inclusion_pin, uint8_t _rx, uint8_t _tx, uint8_t _er);
/* Use this and pass a function that should be called when you want to process commands that arrive from radio network */
void begin(rf24_pa_dbm_e paLevel=RF24_PA_MAX, uint8_t channel=76, rf24_datarate_e dataRate=RF24_2MBPS, void (*dataCallback)(char *)=NULL);
void begin(rf24_pa_dbm_e paLevel=RF24_PA_LEVEL_GW, uint8_t channel=RF24_CHANNEL, rf24_datarate_e dataRate=RF24_DATARATE, void (*dataCallback)(char *)=NULL);
void processRadioMessage();
void parseAndSend(char *inputString);
libraries/MySensors/Relay.h
+1 -1
View File
@@ -39,7 +39,7 @@ class Relay : public Sensor
*/
Relay(uint8_t _cepin = 9, uint8_t _cspin = 10);
void begin(uint8_t radioId=AUTO, rf24_pa_dbm_e paLevel=RF24_PA_MAX, uint8_t channel=76, rf24_datarate_e dataRate=RF24_2MBPS);
void begin(uint8_t radioId=AUTO, rf24_pa_dbm_e paLevel=RF24_PA_LEVEL, uint8_t channel=RF24_CHANNEL, rf24_datarate_e dataRate=RF24_DATARATE);
boolean messageAvailable();
boolean send(message_s message, int length);
libraries/MySensors/Sensor.h
+2 -3
View File
@@ -12,6 +12,7 @@
#ifndef Sensor_h
#define Sensor_h
#include "Config.h"
#include <nRF24L01.h>
#include <RF24.h>
#include <RF24_config.h>
@@ -22,8 +23,6 @@
#include <avr/pgmspace.h>
#include <stdarg.h>
#define DEBUG
#ifdef DEBUG
#define debug(x,...) debugPrint(x, ##__VA_ARGS__)
#else
@@ -137,7 +136,7 @@ class Sensor : public RF24
* @param channel Radio channel. Default is channel 76
* @param dataRate Radio transmission speed. Default RF24_2MBPS
*/
void begin(uint8_t radioId=AUTO, rf24_pa_dbm_e paLevel=RF24_PA_MAX, uint8_t channel=76, rf24_datarate_e dataRate=RF24_2MBPS);
void begin(uint8_t radioId=AUTO, rf24_pa_dbm_e paLevel=RF24_PA_LEVEL, uint8_t channel=RF24_CHANNEL, rf24_datarate_e dataRate=RF24_DATARATE);
uint8_t getRadioId();