Seich
/
HomeSpan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More updates to Accessory ID 

* if Accessory ID is NOT specified, the default is aid=1+aid of last Accessory, with aid of very first Accessory always set to 1.
* aid of first Accessory must ALWAYS be set to 1 - if user over-rides with another value, error will be thrown
* validation now includes checking for duplicate aids, as well as ensuring the first Accessory is always aid=1
This commit is contained in:
Gregg 2020-12-05 13:50:24 -06:00
parent 1847478252
commit d849595bfe
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/HomeSpan.cpp
View File

@ -1053,21 +1053,39 @@ int Span::sprintfAttributes(char **ids, int numIDs, int flags, char *cBuf){
SpanAccessory::SpanAccessory(uint32_t aid){ SpanAccessory::SpanAccessory(uint32_t aid){
if(!homeSpan.Accessories.empty()){ if(!homeSpan.Accessories.empty()){
this->aid=homeSpan.Accessories.back()->aid+1;
if(!homeSpan.Accessories.back()->Services.empty()) if(!homeSpan.Accessories.back()->Services.empty())
homeSpan.Accessories.back()->Services.back()->validate(); homeSpan.Accessories.back()->Services.back()->validate();
homeSpan.Accessories.back()->validate(); homeSpan.Accessories.back()->validate();
} else {
this->aid=1;
} }
homeSpan.Accessories.push_back(this); homeSpan.Accessories.push_back(this);
if(aid==0)
this->aid=homeSpan.Accessories.size();
else
this->aid=aid;
homeSpan.configLog+="+Accessory-" + String(this->aid) + "\n"; if(aid>0){ // override with user-specified aid
this->aid=aid;
}
homeSpan.configLog+="+Accessory-" + String(this->aid);
for(int i=0;i<homeSpan.Accessories.size()-1;i++){
if(this->aid==homeSpan.Accessories[i]->aid){
homeSpan.configLog+=" *** ERROR! ID already in use for another Accessory. ***";
homeSpan.nFatalErrors++;
break;
}
}
if(homeSpan.Accessories.size()==1 && this->aid!=1){
homeSpan.configLog+=" *** ERROR! ID of first Accessory must always be 1. ***";
homeSpan.nFatalErrors++;
}
homeSpan.configLog+="\n";
} }
/////////////////////////////// ///////////////////////////////
@ -1082,8 +1100,8 @@ void SpanAccessory::validate(){
foundInfo=true; foundInfo=true;
else if(!strcmp(Services[i]->type,"A2")) else if(!strcmp(Services[i]->type,"A2"))
foundProtocol=true; foundProtocol=true;
else if(aid==1) // this is the first Accessory and it has more than just AccessoryInfo and HAPProtocolInformation else if(aid==1) // this is an Accessory with aid=1, but it has more than just AccessoryInfo and HAPProtocolInformation. So...
homeSpan.isBridge=false; // this is not a bridge device homeSpan.isBridge=false; // ...this is not a bridge device
} }
if(!foundInfo){ if(!foundInfo){
@ -1092,7 +1110,7 @@ void SpanAccessory::validate(){
homeSpan.nFatalErrors++; homeSpan.nFatalErrors++;
} }
if(!foundProtocol && (aid==1 || !homeSpan.isBridge)){ // HAPProtocolInformation must always be present in first Accessory, and any other Accessory is the device is not a bridge) if(!foundProtocol && (aid==1 || !homeSpan.isBridge)){ // HAPProtocolInformation must always be present in Accessory if aid=1, and any other Accessory if the device is not a bridge)
homeSpan.configLog+=" !Service HAPProtocolInformation"; homeSpan.configLog+=" !Service HAPProtocolInformation";
homeSpan.configLog+=" *** ERROR! Required Service for this Accessory not found. ***\n"; homeSpan.configLog+=" *** ERROR! Required Service for this Accessory not found. ***\n";
homeSpan.nFatalErrors++; homeSpan.nFatalErrors++;