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

Added new (optional) arguments to begin where you can set PA level and radio channel in sketches and gateway. Default values for constructor and begin arguments also made it possible to simplify all sketches when using defualt ce/cs pins (9,10) for radio and AUTO radion Id mode.

Browse Source
This commit is contained in:
Henrik Ekblad
2014-03-04 00:24:26 +01:00
parent f5215c9db3
commit 546ed1d4ae
24 changed files with 100 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/Sensor.cpp
+7 -5
View File
@@ -17,7 +17,7 @@ Sensor::Sensor(uint8_t _cepin, uint8_t _cspin) : RF24(_cepin, _cspin) {
}
void Sensor::setupRadio() {
void Sensor::setupRadio(rf24_pa_dbm_e paLevel, uint8_t channel) {
failedTransmissions = 0;
// Start up the radio library
@@ -25,8 +25,8 @@ void Sensor::setupRadio() {
RF24::enableDynamicPayloads();
RF24::setAutoAck(false);
RF24::setRetries(15, 15);
RF24::setPALevel(RF24_PA_MAX);
//RF24::setChannel(70); // Default 70
RF24::setPALevel(paLevel);
RF24::setChannel(channel);
RF24::setDataRate(RF24_2MBPS);
RF24::setCRCLength(RF24_CRC_16);
@@ -36,12 +36,14 @@ void Sensor::setupRadio() {
}
}
void Sensor::begin(uint8_t _radioId) {
void Sensor::begin(uint8_t _radioId, rf24_pa_dbm_e paLevel, uint8_t channel) {
Serial.begin(BAUD_RATE);
radioId = _radioId;
debug(PSTR("Started %s.\n"), isRelay?"relay":"sensor");
setupRadio();
setupRadio(paLevel, channel);
// Fetch relay from EEPROM
relayId = EEPROM.read(EEPROM_RELAY_ID_ADDRESS);