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

Added Service::TelevisionSpeaker 

Also updated Television Example.  Volume buttons on remote now function as expected, though there does not seems to be a mute button
This commit is contained in:
Gregg 2022-12-23 16:51:55 -06:00
parent ea07da5ab0
commit 7939624bf7
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Other Examples/Television/Television.ino
View File

@ -189,6 +189,11 @@ void setup() {
new Characteristic::CurrentVisibilityState(0); // ...and included in the Selection List... new Characteristic::CurrentVisibilityState(0); // ...and included in the Selection List...
new Characteristic::TargetVisibilityState(0); // ...and a "checked" checkbox is provided on the Settings Screen that can be used to toggle CurrentVisibilityState() new Characteristic::TargetVisibilityState(0); // ...and a "checked" checkbox is provided on the Settings Screen that can be used to toggle CurrentVisibilityState()
SpanService *speaker = new Service::TelevisionSpeaker();
new Characteristic::Mute();
new Characteristic::VolumeSelector();
new Characteristic::VolumeControlType(3);
(new HomeSpanTV("Test TV")) // Define a Television Service. Must link in InputSources! (new HomeSpanTV("Test TV")) // Define a Television Service. Must link in InputSources!
->addLink(hdmi1) ->addLink(hdmi1)
->addLink(hdmi2) ->addLink(hdmi2)
@ -200,6 +205,7 @@ void setup() {
->addLink(hdmi8) ->addLink(hdmi8)
->addLink(hdmi9) ->addLink(hdmi9)
->addLink(hdmi10) ->addLink(hdmi10)
->addLink(speaker)
; ;
} }

2
src/Characteristics.h
View File

@ -192,7 +192,7 @@ struct HapCharacteristics {
HAPCHAR( VOCDensity, C8, PR+EV, FLOAT, false ); HAPCHAR( VOCDensity, C8, PR+EV, FLOAT, false );
HAPCHAR( Volume, 119, PW+PR+EV, UINT8, false ); HAPCHAR( Volume, 119, PW+PR+EV, UINT8, false );
HAPCHAR( VolumeControlType, E9, PR+EV, UINT8, true ); HAPCHAR( VolumeControlType, E9, PR+EV, UINT8, true );
HAPCHAR( VolumeSelector, EA, PR+EV, UINT8, true ); HAPCHAR( VolumeSelector, EA, PW, UINT8, true );
HAPCHAR( WaterLevel, B5, PR+EV, FLOAT, false ); HAPCHAR( WaterLevel, B5, PR+EV, FLOAT, false );
}; };

2
src/HomeSpan.cpp
View File

@ -911,7 +911,7 @@ void Span::processSerialCommand(const char *c){
aidValues.insert((*acc)->aid); aidValues.insert((*acc)->aid);
for(auto svc=(*acc)->Services.begin(); svc!=(*acc)->Services.end(); svc++){ for(auto svc=(*acc)->Services.begin(); svc!=(*acc)->Services.end(); svc++){
Serial.printf(" \u279f Service %s: IID=%d, %sUUIS=\"%s\"",(*svc)->hapName,(*svc)->iid,(*svc)->isCustom?"Custom-":"",(*svc)->type); Serial.printf(" \u279f Service %s: IID=%d, %sUUID=\"%s\"",(*svc)->hapName,(*svc)->iid,(*svc)->isCustom?"Custom-":"",(*svc)->type);
Serial.printf("\n"); Serial.printf("\n");
if(!strcmp((*svc)->type,"3E")){ if(!strcmp((*svc)->type,"3E")){

8
src/Span.h
View File

@ -335,6 +335,14 @@ namespace Service {
OPT(PowerModeSelection); OPT(PowerModeSelection);
}}; }};
struct TelevisionSpeaker : SpanService { TelevisionSpeaker() : SpanService{"113","TelevisionSpeaker"}{
REQ(Mute);
OPT(Active);
OPT(Volume);
OPT(VolumeControlType);
OPT(VolumeSelector);
}};
struct TemperatureSensor : SpanService { TemperatureSensor() : SpanService{"8A","TemperatureSensor"}{ struct TemperatureSensor : SpanService { TemperatureSensor() : SpanService{"8A","TemperatureSensor"}{
REQ(CurrentTemperature); REQ(CurrentTemperature);
OPT(Name); OPT(Name);