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

Updated 20-DynamicBridge to use std::array<> 

This allows the use of std::find(), std::remove, and iterator methods.  Code is more intuitive.
This commit is contained in:
Gregg 2022-05-21 17:05:23 -05:00
parent 7835665e60
commit 1f89673fb7
1 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
examples/20-DynamicBridge/20-DynamicBridge.ino
View File

@ -27,10 +27,10 @@
#include "HomeSpan.h"
#define MAX_LIGHTS 10
#include <array>
nvs_handle savedData;
int accNum[MAX_LIGHTS+1]={0};
std::array<int,10> lights;
//////////////////////////////////////
@ -40,21 +40,20 @@ void setup() {
size_t len;
nvs_open("SAVED_DATA",NVS_READWRITE,&savedData); // open SAVED DATA
if(!nvs_get_blob(savedData,"ACC_NUM",NULL,&len)) // if ACCESSORY NUMBER data found
nvs_get_blob(savedData,"ACC_NUM",&accNum,&len); // retrieve data
if(!nvs_get_blob(savedData,"LIGHTS",NULL,&len)) // if LIGHTS data found
nvs_get_blob(savedData,"LIGHTS",&lights,&len); // retrieve data
homeSpan.setLogLevel(1);
homeSpan.begin(Category::Bridges,"HomeSpan Bridge");
homeSpan.begin(Category::Lighting,"HomeSpan Lights");
new SpanAccessory();
new Service::AccessoryInformation();
new Characteristic::Identify();
new Characteristic::Model("HomeSpan Dynamic Bridge");
for(int i=0;i<MAX_LIGHTS;i++) // add previously-saved accessories
if(accNum[i]>0)
addLight(accNum[i]);
for(auto it=lights.begin(); it!=lights.end() && *it!=0; it++)
addLight(*it);
new SpanUserCommand('a',"<num> - add a new light accessory with id=<num>",addAccessory);
new SpanUserCommand('d',"<num> - delete a light accessory with id=<num>",deleteAccessory);
@ -102,24 +101,22 @@ void addAccessory(const char *buf){
return;
}
int i;
for(i=0;i<MAX_LIGHTS && accNum[i]>0 && accNum[i]!=n;i++);
if(i==MAX_LIGHTS){
Serial.printf("Can't add any more lights - max is %d!\n",MAX_LIGHTS);
return;
}
if(accNum[i]>0){
if(std::find(lights.begin(),lights.end(),n)!=lights.end()){
Serial.printf("Accessory Light-%d already implemented!\n",n);
return;
}
accNum[i]=n;
nvs_set_blob(savedData,"ACC_NUM",&accNum,sizeof(accNum)); // update data
nvs_commit(savedData);
auto it=std::find(lights.begin(),lights.end(),0);
addLight(n);
if(it==lights.end()){
Serial.printf("Can't add any more lights - max is %d!\n",lights.size());
return;
}
*it=n; // save light number
nvs_set_blob(savedData,"LIGHTS",&lights,sizeof(lights)); // update data
nvs_commit(savedData);
addLight(n); // add light accessory
}
///////////////////////////
@ -140,12 +137,9 @@ void deleteAccessory(const char *buf){
Serial.printf("Deleting Accessory: Light-%d\n",n);
int i; // find entry in accNum
for(i=0;accNum[i]!=n;i++);
for(;i<MAX_LIGHTS;i++) // shift entries - last one will always be zero since array stores MAX_LIGHTS+1 elements
accNum[i]=accNum[i+1];
nvs_set_blob(savedData,"ACC_NUM",&accNum,sizeof(accNum)); // update data
auto it=std::remove(lights.begin(),lights.end(),n);
*it=0; // overwrite end with a 0
nvs_set_blob(savedData,"LIGHTS",&lights,sizeof(lights)); // update data
nvs_commit(savedData);
}
@ -153,8 +147,19 @@ void deleteAccessory(const char *buf){
void deleteAllAccessories(const char *buf){
nvs_erase_all(savedData);
if(lights[0]==0){
Serial.printf("There are no Light Accessories to delete!\n");
return;
}
for(auto it=lights.begin(); it!=lights.end() && *it!=0; it++)
homeSpan.deleteAccessory(*it+1);
std::fill(lights.begin(),lights.end(),0);
nvs_set_blob(savedData,"LIGHTS",&lights,sizeof(lights)); // update data
nvs_commit(savedData);
Serial.printf("All Light Accessories deleted!\n");
}
///////////////////////////
@ -166,3 +171,5 @@ void updateAccessories(const char *buf){
else
Serial.printf("Nothing to update - no changes were made!\n");
}
///////////////////////////