mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11369 from gemu2015/homekit 

Homekit update
This commit is contained in:
Theo Arends 2021-03-17 14:25:13 +01:00 committed by GitHub
parent ca865ee591 1d38a6465d
commit 50948545d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 284 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32_div/ESP32-HomeKit/src/_esp_hap_config.h Normal file → Executable file
View File

@ -14,7 +14,7 @@
#define CONFIG_HAP_HTTP_STACK_SIZE 12288
#define CONFIG_HAP_HTTP_SERVER_PORT 5556 // 80 for normal webserver
#define CONFIG_HAP_HTTP_CONTROL_PORT 32859
#define CONFIG_HAP_HTTP_MAX_OPEN_SOCKETS 6
#define CONFIG_HAP_HTTP_MAX_OPEN_SOCKETS 5 // 6
#define CONFIG_HAP_HTTP_MAX_URI_HANDLERS 16
#endif /* ESP_HAP_CONFIG_H_ */

0
lib/libesp32_div/ESP32-HomeKit/src/hap.h Normal file → Executable file
View File

17
lib/libesp32_div/ESP32-HomeKit/src/hap_apple_chars.c Normal file → Executable file
View File

@ -39,6 +39,21 @@ hap_char_t *hap_char_brightness_create(int brightness)
return hc;
}
/* Char: Brightness */
hap_char_t *hap_char_wattage_create(float watts)
{
hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL,
HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, watts);
if (!hc) {
return NULL;
}
hap_char_float_set_constraints(hc, -10000.0, 10000.0, 1);
hap_char_add_unit(hc, HAP_CHAR_UNIT_LUX);
return hc;
}
/* Char: Cooling Threshold Temperature */
hap_char_t *hap_char_cooling_threshold_temperature_create(float cooling_threshold_temp)
{
@ -1284,7 +1299,7 @@ hap_char_t *hap_char_relative_humidity_humidifier_threshold_create(float rel_hum
}
hap_char_float_set_constraints(hc, 0.0, 100.0, 1.0);
hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
hap_char_add_unit(hc, HAP_CHAR_UNIT_LUX);
return hc;
}

3
lib/libesp32_div/ESP32-HomeKit/src/hap_apple_chars.h Normal file → Executable file
View File

@ -142,6 +142,7 @@ extern "C" {
#define HAP_CHAR_UUID_REMAINING_DURATION "D4"
#define HAP_CHAR_UUID_VALVE_TYPE "D5"
#define HAP_CHAR_UUID_IS_CONFIGURED "D6"
#define HAP_CHAR_UUID_WATTAGE "DC"
#define HAP_CHAR_UUID_PRODUCT_DATA "220"
/** Create Brightness Characteristic
@ -1415,6 +1416,8 @@ hap_char_t *hap_char_air_particulate_density_create(float air_particulate_densit
*/
hap_char_t *hap_char_air_particulate_size_create(uint8_t air_particulate_size);
hap_char_t *hap_char_wattage_create(float watts);
#ifdef __cplusplus
}
#endif

17
lib/libesp32_div/ESP32-HomeKit/src/hap_apple_servs.c Normal file → Executable file
View File

@ -419,6 +419,22 @@ err:
return NULL;
}
hap_serv_t *hap_serv_wattage_create(float curr_watts)
{
hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_LIGHT_SENSOR);
if (!hs) {
return NULL;
}
if (hap_serv_add_char(hs, hap_char_wattage_create(curr_watts)) != HAP_SUCCESS) {
goto err;
}
return hs;
err:
hap_serv_delete(hs);
return NULL;
}
hap_serv_t *hap_serv_temperature_sensor_create(float curr_temp)
{
hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_TEMPERATURE_SENSOR);
@ -703,4 +719,3 @@ err:
hap_serv_delete(hs);
return NULL;
}

4
lib/libesp32_div/ESP32-HomeKit/src/hap_apple_servs.h Normal file → Executable file
View File

@ -75,6 +75,7 @@ extern "C" {
#define HAP_SERV_UUID_VALVE "D0"
#define HAP_SERV_UUID_FAUCET "D7"
/** Create Accessory Information Service
*
* This API will create the Accessory Information Service with the mandatory
@ -553,6 +554,9 @@ hap_serv_t *hap_serv_valve_create(uint8_t active, uint8_t in_use, uint8_t valve_
*/
hap_serv_t *hap_serv_faucet_create(uint8_t active);
hap_serv_t *hap_serv_wattage_create(float curr_watts);
#ifdef __cplusplus
}
#endif

35
lib/libesp32_div/ESP32-HomeKit/src/hap_platform_keystore.cpp
View File

@ -144,12 +144,10 @@ int hap_platform_keystore_delete_namespace(const char *part_name, const char *na
while (true) {
File entry = fp.openNextFile();
if (!entry) break;
char fp[48];
strcpy(fp,path);
strcat(fp, "/");
strcat(fp, entry.name());
ffsp->remove(fp);
char p[48];
strcpy(p,entry.name());
entry.close();
ffsp->remove(p);
}
}
return 0;
@ -157,7 +155,6 @@ int hap_platform_keystore_delete_namespace(const char *part_name, const char *na
// last resort only
int hap_platfrom_keystore_erase_partition(const char *part_name) {
// LITTLEFS.format();
char path[48];
strcpy(path, "/");
strcat(path, part_name);
@ -166,17 +163,23 @@ if (fp.isDirectory()) {
while (true) {
File entry = fp.openNextFile();
if (!entry) break;
char fp[48];
strcpy(fp,path);
strcat(fp, "/");
strcat(fp, entry.name());
if (entry.isDirectory()) {
hap_platform_keystore_delete_namespace(part_name, entry.name());
ffsp->rmdir(fp);
} else {
ffsp->remove(fp);
const char *ep = entry.name();
if (*ep=='/') ep++;
char *lcp = strrchr(ep,'/');
if (lcp) {
ep = lcp + 1;
}
entry.close();
char p[48];
strcpy(p,entry.name());
if (entry.isDirectory()) {
hap_platform_keystore_delete_namespace(part_name, ep);
entry.close();
ffsp->rmdir(p);
} else {
entry.close();
ffsp->remove(p);
}
}
}
return 0;

347
tasmota/homekit.c
View File

@ -59,11 +59,11 @@ extern uint32_t Ext_UpdVar(char *vname, float *fvar, uint32_t mode);
#define MAX_HAP_DEFS 16
struct HAP_DESC {
char hap_name[16];
char var_name[16];
char var2_name[16];
char var3_name[16];
char var4_name[16];
char hap_name[24];
char var_name[12];
char var2_name[12];
char var3_name[12];
char var4_name[12];
uint8_t hap_cid;
uint8_t type;
hap_acc_t *accessory;
@ -148,45 +148,66 @@ static int accessory_identify(hap_acc_t *ha)
return HAP_SUCCESS;
}
const struct HAP_CHAR_TABLE {
char stype[4];
char ntype;
int8_t index;
} hap_rtab[] = {
{HAP_CHAR_UUID_CURRENT_TEMPERATURE,'f',0},
{HAP_CHAR_UUID_CURRENT_RELATIVE_HUMIDITY,'f',0},
{HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL,'f',0},
{HAP_CHAR_UUID_BATTERY_LEVEL,'u',0},
{HAP_CHAR_UUID_STATUS_LOW_BATTERY,'b',1},
{HAP_CHAR_UUID_CHARGING_STATE,'b',2},
{HAP_CHAR_UUID_ON,'b',0},
{HAP_CHAR_UUID_HUE,'f',1},
{HAP_CHAR_UUID_SATURATION,'f',2},
{HAP_CHAR_UUID_BRIGHTNESS,'u',3},
{HAP_CHAR_UUID_COLOR_TEMPERATURE,'u',0},
{HAP_CHAR_UUID_CONTACT_SENSOR_STATE,'u',0},
{HAP_CHAR_UUID_WATTAGE,'f',0}
};
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
/* A dummy callback for handling a write on the "On" characteristic of Outlet.
* In an actual accessory, this should control the hardware
*/
static int sensor_write(hap_write_data_t write_data[], int count, void *serv_priv, void *write_priv, uint32_t index) {
int i, ret = HAP_SUCCESS;
float fvar;
hap_write_data_t *write;
for (i = 0; i < count; i++) {
write = &write_data[i];
bool found = false;
const char *hcp = hap_char_get_type_uuid(write->hc);
if (!strcmp(hcp, HAP_CHAR_UUID_ON)) {
//ESP_LOGI(TAG, "Received Write. Outlet %s", write->val.b ? "On" : "Off");
ESP_LOG_LEVEL(ESP_LOG_INFO, TAG, "Received Write. Outlet %s", write->val.b ? "On" : "Off");
hap_char_update_val(write->hc, &(write->val));
float fvar = write->val.b;
Ext_UpdVar(hap_devs[index].var_name, &fvar, 1);
*(write->status) = HAP_STATUS_SUCCESS;
} else if (!strcmp(hcp, HAP_CHAR_UUID_HUE)) {
hap_char_update_val(write->hc, &(write->val));
float fvar = write->val.f;
Ext_UpdVar(hap_devs[index].var2_name, &fvar, 1);
*(write->status) = HAP_STATUS_SUCCESS;
} else if (!strcmp(hcp, HAP_CHAR_UUID_SATURATION)) {
hap_char_update_val(write->hc, &(write->val));
float fvar = write->val.f;
Ext_UpdVar(hap_devs[index].var3_name, &fvar, 1);
*(write->status) = HAP_STATUS_SUCCESS;
} else if (!strcmp(hcp, HAP_CHAR_UUID_BRIGHTNESS)) {
hap_char_update_val(write->hc, &(write->val));
float fvar = write->val.u;
Ext_UpdVar(hap_devs[index].var4_name, &fvar, 1);
*(write->status) = HAP_STATUS_SUCCESS;
} else {
for (uint32_t cnt = 0; cnt < ARRAY_SIZE(hap_rtab); cnt++ ) {
if (!strcmp(hcp, hap_rtab[cnt].stype)) {
hap_char_update_val(write->hc, &(write->val));
switch (hap_rtab[cnt].ntype) {
case 'f': fvar = write->val.f; break;
case 'u': fvar = write->val.u; break;
case 'b': fvar = write->val.b; break;
}
switch (hap_rtab[cnt].index) {
case 0: Ext_UpdVar(hap_devs[index].var_name, &fvar, 1);break;
case 1: Ext_UpdVar(hap_devs[index].var2_name, &fvar, 1);break;
case 2: Ext_UpdVar(hap_devs[index].var3_name, &fvar, 1);break;
case 3: Ext_UpdVar(hap_devs[index].var4_name, &fvar, 1);break;
}
*(write->status) = HAP_STATUS_SUCCESS;
found = true;
break;
}
}
if (!found) {
*(write->status) = HAP_STATUS_RES_ABSENT;
}
}
return ret;
}
// common read routine
static int sensor_read(hap_char_t *hc, hap_status_t *status_code, void *serv_priv, void *read_priv, uint32_t index) {
hap_val_t new_val;
@ -200,61 +221,123 @@ static int sensor_read(hap_char_t *hc, hap_status_t *status_code, void *serv_pri
printf("read values %s\n", hcp );
if (!strcmp(hcp, HAP_CHAR_UUID_CURRENT_TEMPERATURE)
|| !strcmp(hcp, HAP_CHAR_UUID_CURRENT_RELATIVE_HUMIDITY)
|| !strcmp(hcp, HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL)
) {
Ext_UpdVar(hap_devs[index].var_name, &fvar, 0);
new_val.f = fvar;
for (uint32_t cnt = 0; cnt < ARRAY_SIZE(hap_rtab); cnt++ ) {
if (!strcmp(hcp, hap_rtab[cnt].stype)) {
switch (hap_rtab[cnt].index) {
case 0: Ext_UpdVar(hap_devs[index].var_name, &fvar, 0);break;
case 1: Ext_UpdVar(hap_devs[index].var2_name, &fvar, 0);break;
case 2: Ext_UpdVar(hap_devs[index].var3_name, &fvar, 0);break;
case 3: Ext_UpdVar(hap_devs[index].var4_name, &fvar, 0);break;
}
switch (hap_rtab[cnt].ntype) {
case 'f': new_val.f = fvar; break;
case 'u': new_val.u = fvar; break;
case 'b': new_val.b = fvar; break;
}
hap_char_update_val(hc, &new_val);
*status_code = HAP_STATUS_SUCCESS;
}
if (!strcmp(hcp, HAP_CHAR_UUID_ON)) {
Ext_UpdVar(hap_devs[index].var_name, &fvar, 0);
new_val.b = fvar;
hap_char_update_val(hc, &new_val);
*status_code = HAP_STATUS_SUCCESS;
}
if (!strcmp(hcp, HAP_CHAR_UUID_HUE)) {
Ext_UpdVar(hap_devs[index].var2_name, &fvar, 0);
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
*status_code = HAP_STATUS_SUCCESS;
}
if (!strcmp(hcp, HAP_CHAR_UUID_SATURATION)) {
Ext_UpdVar(hap_devs[index].var3_name, &fvar, 0);
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
*status_code = HAP_STATUS_SUCCESS;
}
if (!strcmp(hcp, HAP_CHAR_UUID_BRIGHTNESS)) {
Ext_UpdVar(hap_devs[index].var4_name, &fvar, 0);
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
*status_code = HAP_STATUS_SUCCESS;
}
if (!strcmp(hcp, HAP_CHAR_UUID_BATTERY_LEVEL)) {
Ext_UpdVar(hap_devs[index].var_name, &fvar, 0);
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
*status_code = HAP_STATUS_SUCCESS;
}
if (!strcmp(hcp, HAP_CHAR_UUID_STATUS_LOW_BATTERY)) {
Ext_UpdVar(hap_devs[index].var2_name, &fvar, 0);
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
*status_code = HAP_STATUS_SUCCESS;
}
if (!strcmp(hcp, HAP_CHAR_UUID_CHARGING_STATE)) {
Ext_UpdVar(hap_devs[index].var3_name, &fvar, 0);
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
*status_code = HAP_STATUS_SUCCESS;
}
}
return HAP_SUCCESS;
}
// update values every 500 ms
void hap_update_from_vars(void) {
float fvar;
hap_char_t *hc;
hap_val_t new_val;
for (uint32_t cnt = 0; cnt < hk_services; cnt++) {
switch (hap_devs[cnt].hap_cid) {
case HAP_CID_SENSOR:
switch (hap_devs[cnt].type) {
case 0:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_CURRENT_TEMPERATURE);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case 1:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_CURRENT_RELATIVE_HUMIDITY);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case 2:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case 3:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_BATTERY_LEVEL);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_STATUS_LOW_BATTERY);
if (Ext_UpdVar(hap_devs[cnt].var2_name, &fvar, 0)) {
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_STATUS_LOW_BATTERY);
if (Ext_UpdVar(hap_devs[cnt].var3_name, &fvar, 0)) {
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case 4:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case 5:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_CONTACT_SENSOR_STATE);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
}
break;
}
break;
case HAP_CID_OUTLET:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_ON);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.b = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case HAP_CID_LIGHTING:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_ON);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.b = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_HUE);
if (Ext_UpdVar(hap_devs[cnt].var2_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_SATURATION);
if (Ext_UpdVar(hap_devs[cnt].var3_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_BRIGHTNESS);
if (Ext_UpdVar(hap_devs[cnt].var4_name, &fvar, 0)) {
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
}
break;
}
}
}
#define HAP_READ hap_char_t *hc, hap_status_t *status_code, void *serv_priv, void *read_priv) { return sensor_read(hc, status_code, serv_priv, read_priv
static int sensor_read1(HAP_READ, 0);}
@ -377,6 +460,8 @@ uint32_t str2c(char **sp, char *vp, uint32_t len) {
return 1;
}
extern char *GetFName();
/*The main thread for handling the Smart Outlet Accessory */
static void smart_outlet_thread_entry(void *p) {
/* Initialize the HAP core */
@ -385,7 +470,8 @@ static void smart_outlet_thread_entry(void *p) {
hap_acc_t *accessory;
hap_acc_cfg_t cfg = {
.name = "Tasmota-Bridge",
//.name = "Tasmota-Bridge",
.name = GetFName(),
.manufacturer = "Tasmota",
.model = "Bridge",
.serial_num = "001122334455",
@ -462,7 +548,6 @@ static void smart_outlet_thread_entry(void *p) {
/* Create accessory object */
hap_devs[index].accessory = hap_acc_create(&hap_cfg);
/* Add a dummy Product Data */
uint8_t product_data[] = {'E','S','P','3','2','H','A','P'};
hap_acc_add_product_data(hap_devs[index].accessory, product_data, sizeof(product_data));
int ret;
@ -500,6 +585,8 @@ static void smart_outlet_thread_entry(void *p) {
hap_devs[index].service = hap_serv_battery_service_create(fvar, fvar1, fvar2);
}
break;
case 4: hap_devs[index].service = hap_serv_wattage_create(fvar); break;
case 5: hap_devs[index].service = hap_serv_contact_sensor_create(fvar); break;
}
}
break;
@ -513,7 +600,7 @@ static void smart_outlet_thread_entry(void *p) {
hap_set_write(hap_devs[index].service, index);
/* Get pointer to the outlet in use characteristic which we need to monitor for state changes */
hap_char_t *outlet_in_use = hap_serv_get_char_by_uuid(hap_devs[index].service, HAP_CHAR_UUID_OUTLET_IN_USE);
outlet_in_use = hap_serv_get_char_by_uuid(hap_devs[index].service, HAP_CHAR_UUID_OUTLET_IN_USE);
/* Add the Outlet Service to the Accessory Object */
hap_acc_add_serv(hap_devs[index].accessory, hap_devs[index].service);
@ -565,13 +652,8 @@ nextline:
/* Enable Hardware MFi authentication (applicable only for MFi variant of SDK) */
hap_enable_mfi_auth(HAP_MFI_AUTH_HW);
/* Initialize Wi-Fi */
//app_wifi_init();
/* After all the initializations are done, start the HAP core */
hap_start();
/* Start Wi-Fi */
//app_wifi_start(portMAX_DELAY);
int32_t io_num = OUTLET_IN_USE_GPIO;
if (io_num >= 0) {
@ -597,93 +679,16 @@ nextline:
}
} else {
// vTaskDelete(NULL);
// update values every 100 ms
while (1) {
delay(100);
float fvar;
hap_char_t *hc;
hap_val_t new_val;
for (uint32_t cnt = 0; cnt < hk_services; cnt++) {
switch (hap_devs[cnt].hap_cid) {
case HAP_CID_SENSOR:
switch (hap_devs[cnt].type) {
case 0:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_CURRENT_TEMPERATURE);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case 1:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_CURRENT_RELATIVE_HUMIDITY);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case 2:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case 3:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_BATTERY_LEVEL);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_STATUS_LOW_BATTERY);
if (Ext_UpdVar(hap_devs[cnt].var2_name, &fvar, 0)) {
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_STATUS_LOW_BATTERY);
if (Ext_UpdVar(hap_devs[cnt].var3_name, &fvar, 0)) {
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
}
break;
}
break;
case HAP_CID_OUTLET:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_ON);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.b = fvar;
hap_char_update_val(hc, &new_val);
}
break;
case HAP_CID_LIGHTING:
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_ON);
if (Ext_UpdVar(hap_devs[cnt].var_name, &fvar, 0)) {
new_val.b = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_HUE);
if (Ext_UpdVar(hap_devs[cnt].var2_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_SATURATION);
if (Ext_UpdVar(hap_devs[cnt].var3_name, &fvar, 0)) {
new_val.f = fvar;
hap_char_update_val(hc, &new_val);
}
hc = hap_serv_get_char_by_uuid(hap_devs[cnt].service, HAP_CHAR_UUID_BRIGHTNESS);
if (Ext_UpdVar(hap_devs[cnt].var4_name, &fvar, 0)) {
new_val.u = fvar;
hap_char_update_val(hc, &new_val);
}
break;
}
}
delay(500);
// hap_update_from_vars();
}
}
}
#define HK_PASSCODE "111-11-111"
int hap_loop_stop(void);
extern void Ext_toLog(char *str);
void homekit_main(char *desc, uint32_t flag ) {
if (desc) {
@ -710,10 +715,14 @@ void homekit_main(char *desc, uint32_t flag ) {
hk_desc = cp;
} else {
if (flag == 99) {
hap_loop_stop();
hap_reset_to_factory();
} else if (flag == 98) {
hap_loop_stop();
// is just the folder in wrapper
hap_platfrom_keystore_erase_partition(hap_platform_keystore_get_nvs_partition_name());
} else {
// not yet implemented
hap_stop();
hap_loop_stop();
}
return;
}

51
tasmota/xdrv_10_scripter.ino
View File

@ -2515,9 +2515,12 @@ chknext:
if (!TasmotaGlobal.global_state.wifi_down) {
// erase nvs
lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
homekit_main(0, fvar);
// restart homekit
TasmotaGlobal.restart_flag = 2;
if (fvar >= 98) {
glob_script_mem.homekit_running == false;
}
}
lp++;
len = 0;
@ -3589,13 +3592,51 @@ extern "C" {
uint32_t Ext_UpdVar(char *vname, float *fvar, uint32_t mode) {
return UpdVar(vname, fvar, mode);
}
void Ext_toLog(char *str) {
toLog(str);
}
char *GetFName(void) {
return SettingsText(SET_FRIENDLYNAME1);
}
}
int32_t UpdVar(char *vname, float *fvar, uint32_t mode) {
uint8_t type;
uint8_t index;
if (*vname == '@') {
vname++;
type = *vname;
vname++;
index = (*vname & 0x0f);
if (index < 1) index = 1;
if (index > 9) index = 9;
switch (type) {
case 'p':
if (mode) {
// set power
ExecuteCommandPower(index, *fvar, SRC_BUTTON);
return 0;
} else {
// read power
*fvar = bitRead(TasmotaGlobal.power, index - 1);
return 1;
}
break;
case 's':
*fvar = SwitchLastState(index - 1);
return 1;
break;
case 'b':
*fvar = Button.last_state[index - 1];
return 1;
break;
}
return 0;
}
struct T_INDEX ind;
uint8_t vtype;
float res = *fvar;
uint8_t index;
isvar(vname, &vtype, &ind, fvar, 0, 0);
if (vtype != VAR_NV) {
// found variable as result
@ -3604,7 +3645,7 @@ int32_t UpdVar(char *vname, float *fvar, uint32_t mode) {
// set var
index = glob_script_mem.type[ind.index].index;
glob_script_mem.fvars[index] = res;
SetChanged(ind.index);
glob_script_mem.type[ind.index].bits.changed = 1;
return 0;
} else {
// get var
@ -3724,13 +3765,11 @@ void Replace_Cmd_Vars(char *srcbuf, uint32_t srcsize, char *dstbuf, uint32_t dst
dstbuf[count] = 0;
}
void toLog(const char *str) {
if (!str) return;
AddLog(LOG_LEVEL_INFO, str);
}
void toLogN(const char *cp, uint8_t len) {
if (!cp) return;
char str[32];