Skip to content

Expose methods to create new temperature and humidity services #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
judepereira wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Expose methods to create new temperature and humidity services #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f123a0
Merge pull request #1 from Yurik72/master
judepereira Feb 28, 2021
b3eeb6f
Merge remote-tracking branch 'upstream/master'
judepereira Mar 2, 2021
5ae4b05
Bump up max accessories to 45 for the ESP 32.
judepereira Mar 2, 2021
915ba26
Expose methods to create new temperature and humidity services.
judepereira Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions homeintegration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,13 @@ homekit_server_config_t config = {
.password = "111-11-111"
};
*/

#ifdef ESP8266
#define MAX_HAP_SERVICES 7
#define MAX_HAP_ACCESSORIES 7
#else // ESP32.
#define MAX_HAP_SERVICES 45
#define MAX_HAP_ACCESSORIES 45
#endif
homekit_accessory_t *hap_accessories[MAX_HAP_ACCESSORIES + 1] = { 0 };
homekit_service_t* hap_services[MAX_HAP_SERVICES + 1] = { 0 };
homekit_server_config_t hap_config = {
Expand Down Expand Up @@ -539,14 +543,17 @@ homekit_service_t* hap_add_relaydim_service_as_accessory(int acctype,const char
// INFO("added light bulb as accessory , next accessory %d",hap_mainaccesories_current);
return lbservice;
}
homekit_service_t* hap_add_temperature_service(const char* szname){

homekit_service_t*service=NEW_HOMEKIT_SERVICE(TEMPERATURE_SENSOR, .characteristics=(homekit_characteristic_t*[]) {
NEW_HOMEKIT_CHARACTERISTIC(NAME, szname),
NEW_HOMEKIT_CHARACTERISTIC(CURRENT_TEMPERATURE, 0),
NULL
});
return hap_add_service(service);
homekit_service_t *hap_new_temperature_service(const char *szname) {
return NEW_HOMEKIT_SERVICE(
TEMPERATURE_SENSOR,
.characteristics=(homekit_characteristic_t*[]) { NEW_HOMEKIT_CHARACTERISTIC(NAME, szname),
NEW_HOMEKIT_CHARACTERISTIC(CURRENT_TEMPERATURE, 0), NULL
});
}

homekit_service_t* hap_add_temperature_service(const char* szname){
return hap_add_service(hap_new_temperature_service(szname));
}
homekit_service_t* hap_add_thermostat_service(const char* szname, hap_callback cb, void* context) {

Expand Down Expand Up @@ -604,15 +611,19 @@ homekit_service_t* hap_new_thermostat_service(const char* szname, hap_callback c
});

}
homekit_service_t* hap_add_humidity_service(const char* szname){

homekit_service_t*service=NEW_HOMEKIT_SERVICE(HUMIDITY_SENSOR, .characteristics=(homekit_characteristic_t*[]) {
NEW_HOMEKIT_CHARACTERISTIC(NAME, szname),
NEW_HOMEKIT_CHARACTERISTIC(CURRENT_RELATIVE_HUMIDITY, 0),
NULL
});
return hap_add_service(service);
homekit_service_t *hap_new_humidity_service(const char *szname) {
return NEW_HOMEKIT_SERVICE(
HUMIDITY_SENSOR,
.characteristics=(homekit_characteristic_t*[]) { NEW_HOMEKIT_CHARACTERISTIC(NAME, szname),
NEW_HOMEKIT_CHARACTERISTIC(CURRENT_RELATIVE_HUMIDITY, 0), NULL
});
}

homekit_service_t *hap_add_humidity_service(const char *szname) {
return hap_add_service(hap_new_humidity_service(szname));
}

homekit_service_t* hap_add_temp_hum_as_accessory(int acctype,const char* szname,homekit_service_t** pp_temp,homekit_service_t** pp_hum){

homekit_service_t* baseservice=hap_new_homekit_accessory_service(szname,"0");
Expand Down
5 changes: 3 additions & 2 deletions homeintegration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,14 @@ type name() { \
homekit_service_t* hap_add_rgbstrip_service_as_accessory_ex(int acctype, const char* szname, hap_callback cb, void* context);
homekit_service_t* hap_new_rgbstrip_service_ex(const char* szname, hap_callback cb, void* context);
//Thermo


homekit_service_t* hap_new_temperature_service(const char *szname);
homekit_service_t* hap_add_temperature_service(const char* szname);

homekit_service_t* hap_add_thermostat_service(const char* szname, hap_callback cb, void* context);
homekit_service_t* hap_add_thermostat_service_as_accessory(int acctype, const char* szname, hap_callback cb, void* context);
homekit_service_t* hap_new_thermostat_service(const char* szname, hap_callback cb, void* context);

homekit_service_t* hap_new_humidity_service(const char *szname);
homekit_service_t* hap_add_humidity_service(const char* szname);
homekit_service_t* hap_add_temp_hum_as_accessory(int acctype, const char* szname, homekit_service_t** pp_temp, homekit_service_t** pp_hum);
homekit_service_t* hap_add_hum_as_accessory(int acctype, const char* szname);
Expand Down