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

Created typedef for HAP types - used to simplify CUSTOM_CHAR 

No need to specify both FORMAT and TYPE.   For example, specifying UINT16 automatically sets type to be uint16_t.

To do:  Explore if this can be used for standard Characteristics - revisit standard Characteristics definitions and structure to see if it can be simplified.
This commit is contained in:
Gregg 2021-10-25 21:57:29 -05:00
parent eeb3c334ac
commit eb9530800e
5 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Characteristics.h
View File

@ -53,6 +53,17 @@ enum FORMAT { // HAP Table 6-5
/////////////////////////////// ///////////////////////////////
typedef boolean BOOL_t;
typedef uint8_t UINT8_t;
typedef uint16_t UINT16_t;
typedef uint32_t UINT32_t;
typedef uint64_t UINT64_t;
typedef int32_t INT_t;
typedef double FLOAT_t;
typedef char * STRING_t;
///////////////////////////////
struct HapChar { struct HapChar {
const char *type; const char *type;
const char *hapName; const char *hapName;

2
src/HomeSpan.cpp
View File

@ -1479,7 +1479,7 @@ SpanService::SpanService(const char *type, const char *hapName){
homeSpan.Accessories.back()->Services.push_back(this); homeSpan.Accessories.back()->Services.push_back(this);
iid=++(homeSpan.Accessories.back()->iidCount); iid=++(homeSpan.Accessories.back()->iidCount);
homeSpan.configLog+=": IID=" + String(iid) + ", UUID=0x" + String(type); homeSpan.configLog+=": IID=" + String(iid) + ", UUID=\"" + String(type) + "\"";
if(!strcmp(this->type,"3E") && iid!=1){ if(!strcmp(this->type,"3E") && iid!=1){
homeSpan.configLog+=" *** ERROR! The AccessoryInformation Service must be defined before any other Services in an Accessory. ***"; homeSpan.configLog+=" *** ERROR! The AccessoryInformation Service must be defined before any other Services in an Accessory. ***";

26
src/HomeSpan.h
View File

@ -239,14 +239,14 @@ struct SpanCharacteristic{
union UVal { union UVal {
boolean BOOL; BOOL_t BOOL;
uint8_t UINT8; UINT8_t UINT8;
uint16_t UINT16; UINT16_t UINT16;
uint32_t UINT32; UINT32_t UINT32;
uint64_t UINT64; UINT64_t UINT64;
int32_t INT; INT_t INT;
double FLOAT; FLOAT_t FLOAT;
char *STRING = NULL; STRING_t STRING = NULL;
}; };
int iid=0; // Instance ID (HAP Table 6-3) int iid=0; // Instance ID (HAP Table 6-3)
@ -441,16 +441,18 @@ struct SpanCharacteristic{
uvSet(stepValue,0); uvSet(stepValue,0);
} }
homeSpan.configLog+="(" + uvPrint(value) + ")" + ": IID=" + String(iid) + ", UUID=" + String(type); boolean isCustom=strchr(type,'-');
homeSpan.configLog+="(" + uvPrint(value) + ")" + ": IID=" + String(iid) + ", UUID=\"" + String(type) + "\"";
if(format!=FORMAT::STRING && format!=FORMAT::BOOL) if(format!=FORMAT::STRING && format!=FORMAT::BOOL)
homeSpan.configLog+= " Range=[" + String(uvPrint(minValue)) + "," + String(uvPrint(maxValue)) + "]"; homeSpan.configLog+= ", Range=[" + String(uvPrint(minValue)) + "," + String(uvPrint(maxValue)) + "]";
if(nvsFlag==2) if(nvsFlag==2)
homeSpan.configLog+=" (restored)"; homeSpan.configLog+=" (restored)";
else if(nvsFlag==1) else if(nvsFlag==1)
homeSpan.configLog+=" (storing)"; homeSpan.configLog+=" (storing)";
boolean valid=false; boolean valid=isCustom;
for(int i=0; !valid && i<homeSpan.Accessories.back()->Services.back()->req.size(); i++) for(int i=0; !valid && i<homeSpan.Accessories.back()->Services.back()->req.size(); i++)
valid=!strcmp(type,homeSpan.Accessories.back()->Services.back()->req[i]->type); valid=!strcmp(type,homeSpan.Accessories.back()->Services.back()->req[i]->type);

13
src/Span.h
View File

@ -524,9 +524,16 @@ namespace Characteristic {
} }
////////////////////////////////////////// //////////////////////////////////////////
// MACROS TO ADD CUSTOM CHARACTERISTICS // // MACRO TO ADD CUSTOM CHARACTERISTICS //
////////////////////////////////////////// //////////////////////////////////////////
#define CUSTOM_CHAR(NAME,UUID,PERMISISONS,FORMAT,TYPE,DEFVAL,MINVAL,MAXVAL,STATIC_RANGE) \ //#define CUSTOM_CHAR(NAME,UUID,PERMISISONS,FORMAT,TYPE,DEFVAL,MINVAL,MAXVAL,STATIC_RANGE) \
// HapChar _CUSTOM_##NAME {#UUID,#NAME,(PERMS)(PERMISISONS),FORMAT,STATIC_RANGE}; \
// namespace Characteristic { struct NAME : SpanCharacteristic { NAME(TYPE val=DEFVAL, boolean nvsStore=false) : SpanCharacteristic {&_CUSTOM_##NAME} { init(val,nvsStore,(TYPE)MINVAL,(TYPE)MAXVAL); } }; }
#define CUSTOM_CHAR(NAME,UUID,PERMISISONS,FORMAT,DEFVAL,MINVAL,MAXVAL,STATIC_RANGE) \
HapChar _CUSTOM_##NAME {#UUID,#NAME,(PERMS)(PERMISISONS),FORMAT,STATIC_RANGE}; \ HapChar _CUSTOM_##NAME {#UUID,#NAME,(PERMS)(PERMISISONS),FORMAT,STATIC_RANGE}; \
namespace Characteristic { struct NAME : SpanCharacteristic { NAME(TYPE val=DEFVAL, boolean nvsStore=false) : SpanCharacteristic {&_CUSTOM_##NAME} { init(val,nvsStore,(TYPE)MINVAL,(TYPE)MAXVAL); } }; } namespace Characteristic { struct NAME : SpanCharacteristic { NAME(FORMAT##_t val=DEFVAL, boolean nvsStore=false) : SpanCharacteristic {&_CUSTOM_##NAME} { init(val,nvsStore,(FORMAT##_t)MINVAL,(FORMAT##_t)MAXVAL); } }; }

6
src/src.ino
View File

@ -4,7 +4,7 @@
#include "HomeSpan.h" #include "HomeSpan.h"
// CUSTOM_CHAR(CustomActive, AB-123-B0, PW+PR+EV, UINT8, uint8_t, 0, 0, 1, true); CUSTOM_CHAR(CustomActive, AB-123-B0, PW+PR+EV, UINT8, 0, 0, 1, false);
void setup() { void setup() {
@ -45,9 +45,11 @@ void setup() {
new Service::LightBulb(); new Service::LightBulb();
new Characteristic::On(0); new Characteristic::On(0);
new Characteristic::Brightness(); (new Characteristic::CustomActive(2))->setRange(0,10,3);
new Characteristic::Brightness(500);
new Characteristic::Name("Light 1"); new Characteristic::Name("Light 1");
new Characteristic::ColorTemperature(); new Characteristic::ColorTemperature();
new Characteristic::Active();
new Service::LightBulb(); new Service::LightBulb();
new Characteristic::On(0,true); new Characteristic::On(0,true);
(new Characteristic::Brightness(50,true))->setRange(10,100,5); (new Characteristic::Brightness(50,true))->setRange(10,100,5);