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

ConfiguredName is writeable, allow writes to string characteristics when they have write perms

This commit is contained in:
Raal Goff 2021-08-09 19:41:31 +08:00
parent 86f99f696b
commit fc9714ed95
3 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/HomeSpan.cpp
View File

@ -1701,6 +1701,13 @@ StatusCode SpanCharacteristic::loadUpdate(char *val, char *ev){
return(StatusCode::InvalidValue);
break;
case STRING:
newValue.STRING = (char *)realloc(newValue.STRING, strlen(val) + 1);
strncpy(newValue.STRING, val, strlen(val));
newValue.STRING[strlen(val)] = '\0';
break;
default:
break;

31
src/HomeSpan.h
View File

@ -243,7 +243,7 @@ struct SpanCharacteristic{
uint64_t UINT64;
int32_t INT;
double FLOAT;
const char *STRING;
char *STRING = NULL;
};
int iid=0; // Instance ID (HAP Table 6-3)
@ -301,7 +301,23 @@ struct SpanCharacteristic{
} // str()
void uvSet(UVal &u, const char *val){
u.STRING=val;
u.STRING = (char *)realloc(u.STRING, strlen(val) + 1);
strncpy(u.STRING, val, strlen(val));
u.STRING[strlen(val)] = '\0';
}
char *getString(){
if(format == FORMAT::STRING)
return value.STRING;
return NULL;
}
char *getNewString(){
if(format == FORMAT::STRING)
return newValue.STRING;
return NULL;
}
template <typename T> void uvSet(UVal &u, T val){
@ -389,9 +405,12 @@ struct SpanCharacteristic{
uvSet(value,val);
uvSet(newValue,val);
if(format != FORMAT::STRING) {
uvSet(minValue,min);
uvSet(maxValue,max);
uvSet(stepValue,0);
}
if(nvsStore){
nvsKey=(char *)malloc(16);
@ -413,7 +432,7 @@ struct SpanCharacteristic{
}
homeSpan.configLog+="(" + uvPrint(value) + ")" + ": IID=" + String(iid) + ", UUID=0x" + String(type);
if(format!=STRING && format!=BOOL)
if(format!=FORMAT::STRING && format!=FORMAT::BOOL)
homeSpan.configLog+= " Range=[" + String(uvPrint(minValue)) + "," + String(uvPrint(maxValue)) + "]";
if(nvsFlag==2)
@ -460,12 +479,12 @@ struct SpanCharacteristic{
template <typename T> void setVal(T val){
if(format==STRING){
Serial.printf("\n*** WARNING: Attempt to update Characteristic::%s(\"%s\") with setVal() ignored. Can't update STRING Characteristics once they are initialized!\n\n",hapName,value.STRING);
if(format==FORMAT::STRING && perms & PW == 0){
Serial.printf("\n*** WARNING: Attempt to update Characteristic::%s(\"%s\") with setVal() ignored. No WRITE permission on this characteristic\n\n",hapName,value.STRING);
return;
}
if(val < uvGet<T>(minValue) || val > uvGet<T>(maxValue)){
if(format!=FORMAT::STRING && ( val < uvGet<T>(minValue) || val > uvGet<T>(maxValue))){
Serial.printf("\n*** WARNING: Attempt to update Characteristic::%s with setVal(%llg) is out of range [%llg,%llg]. This may cause device to become non-reponsive!\n\n",
hapName,(double)val,uvGet<double>(minValue),uvGet<double>(maxValue));
}

2
src/Span.h
View File

@ -427,7 +427,7 @@ namespace Service {
namespace Characteristic {
CREATE_CHAR(uint8_t,Active,0,0,1);
CREATE_CHAR(uint32_t,ActiveIdentifier,0,0,100);
CREATE_CHAR(uint32_t,ActiveIdentifier,0,0,255);
CREATE_CHAR(uint8_t,AirQuality,0,0,5);
CREATE_CHAR(uint8_t,BatteryLevel,0,0,100);
CREATE_CHAR(int,Brightness,0,0,100);