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

Added lock status variable, removed some compiler warnings.

Browse Source
This commit is contained in:
Henrik Ekblad
2014-02-17 17:36:06 +01:00
parent 6af26e664c
commit d563bf3a1a
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/Relay.cpp
+2 -3
View File
@@ -18,9 +18,8 @@ Relay::Relay(uint8_t _cepin, uint8_t _cspin) : Sensor(_cepin, _cspin) {
void Relay::begin(uint8_t _radioId) { void Relay::begin(uint8_t _radioId) {
Sensor::begin(_radioId); Sensor::begin(_radioId);
// Read routing table from EEPROM // Read routing table from EEPROM
for (int i=0;i<sizeof(childNodeTable);i++) { for (unsigned int i=0;i<sizeof(childNodeTable);i++) {
childNodeTable[i] = EEPROM.read(EEPROM_ROUTES_ADDRESS+i); childNodeTable[i] = EEPROM.read(EEPROM_ROUTES_ADDRESS+i);
} }
} }
@@ -235,7 +234,7 @@ uint8_t Relay::getChildRoute(uint8_t childId) {
void Relay::clearChildRoutes() { void Relay::clearChildRoutes() {
debug(PSTR("Clear child routing data\n")); debug(PSTR("Clear child routing data\n"));
for (int i=0;i< sizeof(childNodeTable); i++) { for (unsigned int i=0;i< sizeof(childNodeTable); i++) {
removeChildRoute(i); removeChildRoute(i);
} }
sendInternal(I_CHILDREN, ""); sendInternal(I_CHILDREN, "");
libraries/MySensors/Sensor.cpp
+1 -3
View File
@@ -432,7 +432,7 @@ message_s Sensor::getMessage() {
boolean Sensor::readMessage() { boolean Sensor::readMessage() {
uint8_t len = RF24::getDynamicPayloadSize(); uint8_t len = RF24::getDynamicPayloadSize();
boolean done = RF24::read(&msg, len); RF24::read(&msg, len);
if (!(msg.header.messageType==M_INTERNAL && msg.header.type == I_PING_ACK)) { if (!(msg.header.messageType==M_INTERNAL && msg.header.type == I_PING_ACK)) {
RF24::stopListening(); RF24::stopListening();
@@ -441,11 +441,9 @@ boolean Sensor::readMessage() {
RF24::startListening(); RF24::startListening();
RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit RF24::closeReadingPipe(WRITE_PIPE); // Stop listening to write-pipe after transmit
} }
uint8_t cb = msg.header.crc;
uint8_t valid = validate(len-sizeof(header_s)); uint8_t valid = validate(len-sizeof(header_s));
boolean ok = valid == VALIDATE_OK; boolean ok = valid == VALIDATE_OK;
// Make sure string gets terminated ok for full sized messages. // Make sure string gets terminated ok for full sized messages.
msg.data[len - sizeof(header_s) ] = '\0'; msg.data[len - sizeof(header_s) ] = '\0';
debug(PSTR("Rx: fr=%d,to=%d,la=%d,ci=%d,mt=%d,t=%d,cr=%d(%s): %s\n"), debug(PSTR("Rx: fr=%d,to=%d,la=%d,ci=%d,mt=%d,t=%d,cr=%d(%s): %s\n"),
libraries/MySensors/Sensor.h
+1 -1
View File
@@ -73,7 +73,7 @@ typedef enum {
V_RAINRATE, V_WIND, V_GUST, V_DIRECTION, V_UV, V_WEIGHT, V_DISTANCE, V_RAINRATE, V_WIND, V_GUST, V_DIRECTION, V_UV, V_WEIGHT, V_DISTANCE,
V_IMPEDANCE, V_ARMED, V_TRIPPED, V_WATT, V_KWH, V_SCENE_ON, V_SCENE_OFF, V_IMPEDANCE, V_ARMED, V_TRIPPED, V_WATT, V_KWH, V_SCENE_ON, V_SCENE_OFF,
V_HEATER, V_HEATER_SW, V_LIGHT_LEVEL, V_VAR1, V_VAR2, V_VAR3, V_VAR4, V_VAR5, V_HEATER, V_HEATER_SW, V_LIGHT_LEVEL, V_VAR1, V_VAR2, V_VAR3, V_VAR4, V_VAR5,
V_UP, V_DOWN, V_STOP, V_IR_SEND, V_IR_RECEIVE, V_FLOW, V_VOLUME V_UP, V_DOWN, V_STOP, V_IR_SEND, V_IR_RECEIVE, V_FLOW, V_VOLUME, V_LOCK_STATUS
} variableType; } variableType;
// Internal messages // Internal messages