Skip to content

Commit b5b5745

Browse files
committed
openzwave using label 'Alarm Type' type now
1 parent 74b7cd4 commit b5b5745

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

hardware/OpenZWave.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ static const _tAlarmNameToIndexMapping AlarmToIndexMapping[] = {
6161
{ "Heat", 0x2C },
6262
{ "Flood", 0x2D },
6363
{ "Alarm Level", 0x32 },
64+
{ "Alarm Type", 0x33 },
6465
{ "", 0 }
6566
};
6667

hardware/RFXComSerial.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,12 @@ bool RFXComSerial::onInternalMessage(const unsigned char *pBuffer, const size_t
172172
const tRBUF *pResponse = (tRBUF *)&m_rxbuffer;
173173
if (pResponse->IRESPONSE.subtype == cmdStartRec)
174174
{
175-
m_bReceiverStarted = true;// strstr((char*)&pResponse->IRESPONSE.msg1, "Copyright RFXCOM") != NULL;
175+
m_bReceiverStarted = strstr((char*)&pResponse->IRESPONSE.msg1, "Copyright RFXCOM") != NULL;
176176
}
177177
else
178178
{
179179
_log.Log(LOG_STATUS, "RFXCOM: Please upgrade your RFXTrx Firmware!...");
180+
m_bReceiverStarted = true;
180181
}
181182
}
182183
}

hardware/RFXComTCP.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,12 @@ bool RFXComTCP::onInternalMessage(const unsigned char *pBuffer, const size_t Len
136136
const tRBUF *pResponse = (tRBUF *)&m_rxbuffer;
137137
if (pResponse->IRESPONSE.subtype == cmdStartRec)
138138
{
139-
m_bReceiverStarted = true;// strstr((char*)&pResponse->IRESPONSE.msg1, "Copyright RFXCOM") != NULL;
139+
m_bReceiverStarted = strstr((char*)&pResponse->IRESPONSE.msg1, "Copyright RFXCOM") != NULL;
140140
}
141141
else
142142
{
143143
_log.Log(LOG_STATUS, "RFXCOM: Please upgrade your RFXTrx Firmware!...");
144+
m_bReceiverStarted = true;
144145
}
145146
}
146147
}

0 commit comments

Comments
 (0)