sam/HA_on_off_light_zigbee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working Zigbee Sensor and LED

Browse Source
This commit is contained in:
Sam
2025-05-14 15:29:07 +10:00
parent 5d3a5422c4
commit 5585dc0222
47 changed files with 11516 additions and 10768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
main/esp_zb_light.c
View File

@@ -19,6 +19,21 @@
#include "freertos/task.h"
#include "ha/esp_zigbee_ha_standard.h"
#include "zcl/esp_zigbee_zcl_occupancy_sensing.h"
#include "driver/gpio.h" // Make sure this is included
#define PIR_GPIO 2
#define RADAR_GPIO 3
#define RELAY_GPIO 4
#define MY_OCCUPANCY_SENSOR_ENDPOINT 12
static bool current_device_presence = false;
#if !defined ZB_ED_ROLE
#error Define ZB_ED_ROLE in idf.py menuconfig to compile light (End Device) source code.
#endif
@@ -88,22 +103,69 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
}
}
void update_and_report_combined_presence(void) {
bool pir_active = gpio_get_level(PIR_GPIO);
bool radar_active = gpio_get_level(RADAR_GPIO);
bool new_presence_detected = pir_active || radar_active;
if (new_presence_detected != current_device_presence) {
current_device_presence = new_presence_detected;
ESP_LOGI(TAG, "Combined Presence Changed: %s (PIR: %d, Radar: %d)",
current_device_presence ? "DETECTED" : "CLEAR",
pir_active, radar_active);
// Update Zigbee Occupancy Attribute
uint8_t occupancy_report_value = current_device_presence ? 0x01 : 0x00; // 0x01 = occupied, 0x00 = unoccupied
esp_zb_lock_acquire(portMAX_DELAY);
esp_err_t set_attr_err = esp_zb_zcl_set_attribute_val(
MY_OCCUPANCY_SENSOR_ENDPOINT, // Endpoint ID of your occupancy sensor
ESP_ZB_ZCL_CLUSTER_ID_OCCUPANCY_SENSING, // Cluster ID
ESP_ZB_ZCL_CLUSTER_SERVER_ROLE, // Role
ESP_ZB_ZCL_ATTR_OCCUPANCY_SENSING_OCCUPANCY_ID, // Attribute ID
&occupancy_report_value, // Pointer to the value
false);
esp_zb_lock_release();
if (set_attr_err == ESP_OK) {
ESP_LOGI(TAG, "Reported Occupancy to Zigbee: %s", occupancy_report_value ? "Occupied" : "Unoccupied");
} else {
ESP_LOGE(TAG, "Failed to set Occupancy attribute, error: %s", esp_err_to_name(set_attr_err));
}
}
}
static void presence_polling_task(void *pvParameters) {
ESP_LOGI(TAG, "Presence Polling Task started");
while (1) {
update_and_report_combined_presence();
vTaskDelay(pdMS_TO_TICKS(200)); // Poll every 200ms
}
}
static esp_err_t zb_attribute_handler(const esp_zb_zcl_set_attr_value_message_t *message)
{
esp_err_t ret = ESP_OK;
bool light_state = 0;
// bool light_state = 0; // Original variable for light driver
ESP_RETURN_ON_FALSE(message, ESP_FAIL, TAG, "Empty message");
ESP_RETURN_ON_FALSE(message->info.status == ESP_ZB_ZCL_STATUS_SUCCESS, ESP_ERR_INVALID_ARG, TAG, "Received message: error status(%d)",
message->info.status);
ESP_LOGI(TAG, "Received message: endpoint(%d), cluster(0x%x), attribute(0x%x), data size(%d)", message->info.dst_endpoint, message->info.cluster,
message->attribute.id, message->attribute.data.size);
if (message->info.dst_endpoint == HA_ESP_LIGHT_ENDPOINT) {
// Assuming the On/Off functionality is on HA_ESP_LIGHT_ENDPOINT (or whatever the example uses)
// We will later rename this endpoint or make it more generic if needed.
if (message->info.dst_endpoint == HA_ESP_LIGHT_ENDPOINT) { // Use the endpoint ID defined in the example for its light
if (message->info.cluster == ESP_ZB_ZCL_CLUSTER_ID_ON_OFF) {
if (message->attribute.id == ESP_ZB_ZCL_ATTR_ON_OFF_ON_OFF_ID && message->attribute.data.type == ESP_ZB_ZCL_ATTR_TYPE_BOOL) {
light_state = message->attribute.data.value ? *(bool *)message->attribute.data.value : light_state;
ESP_LOGI(TAG, "Light sets to %s", light_state ? "On" : "Off");
light_driver_set_power(light_state);
bool relay_state = message->attribute.data.value ? *(bool *)message->attribute.data.value : false;
ESP_LOGI(TAG, "Relay (Zigbee command) set to %s", relay_state ? "ON" : "OFF");
// light_driver_set_power(light_state); // Comment out or delete original light driver call
gpio_set_level(RELAY_GPIO, relay_state ? 1 : 0); // Control your relay (1 for ON if HIGH triggered)
}
}
}
@@ -127,25 +189,168 @@ static esp_err_t zb_action_handler(esp_zb_core_action_callback_id_t callback_id,
static void esp_zb_task(void *pvParameters)
{
/* initialize Zigbee stack */
esp_zb_cfg_t zb_nwk_cfg = ESP_ZB_ZED_CONFIG();
esp_zb_cfg_t zb_nwk_cfg = ESP_ZB_ZED_CONFIG(); // Correct for End Device
esp_zb_init(&zb_nwk_cfg);
// --- Existing On/Off Light (Relay) Endpoint Setup ---
esp_zb_on_off_light_cfg_t light_cfg = ESP_ZB_DEFAULT_ON_OFF_LIGHT_CONFIG();
esp_zb_ep_list_t *esp_zb_on_off_light_ep = esp_zb_on_off_light_ep_create(HA_ESP_LIGHT_ENDPOINT, &light_cfg);
zcl_basic_manufacturer_info_t info = {
// The esp_zb_ep_list_t should be created ONCE and then have both endpoints added to it.
esp_zb_ep_list_t *multi_ep_list = esp_zb_ep_list_create(); // Create a new list for all endpoints
// esp_zb_ep_list_t *esp_zb_on_off_light_ep = esp_zb_on_off_light_ep_create(HA_ESP_LIGHT_ENDPOINT, &light_cfg);
// The esp_zb_on_off_light_ep_create likely returns an ep_list with one endpoint.
// We need to add its contents to our main multi_ep_list or adapt.
// For simplicity, let's assume esp_zb_on_off_light_ep_create gives us the cluster_list for the light.
// A more robust way is to manually create the clusters for the on/off light as well.
// Let's manually create the clusters for the On/Off Light endpoint for clarity
// This replaces esp_zb_on_off_light_ep_create for more control with multiple EPs
esp_zb_attribute_list_t *on_off_basic_cluster = esp_zb_basic_cluster_create(NULL);
esp_zb_attribute_list_t *on_off_identify_cluster = esp_zb_identify_cluster_create(NULL);
esp_zb_on_off_cluster_cfg_t on_off_cfg_for_relay;
on_off_cfg_for_relay.on_off = false; // Initial state OFF
esp_zb_attribute_list_t *on_off_server_cluster_for_relay = esp_zb_on_off_cluster_create(&on_off_cfg_for_relay);
esp_zb_cluster_list_t *relay_cluster_list = esp_zb_zcl_cluster_list_create();
esp_zb_cluster_list_add_basic_cluster(relay_cluster_list, on_off_basic_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
esp_zb_cluster_list_add_identify_cluster(relay_cluster_list, on_off_identify_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
esp_zb_cluster_list_add_on_off_cluster(relay_cluster_list, on_off_server_cluster_for_relay, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
zcl_basic_manufacturer_info_t mfg_info = { // Renamed from 'info' to avoid conflict if Occupancy also uses it
.manufacturer_name = ESP_MANUFACTURER_NAME,
.model_identifier = ESP_MODEL_IDENTIFIER,
};
// Add manufacturer info to the basic cluster of the relay endpoint
esp_zb_basic_cluster_add_attr(on_off_basic_cluster, ESP_ZB_ZCL_ATTR_BASIC_MANUFACTURER_NAME_ID, mfg_info.manufacturer_name);
esp_zb_basic_cluster_add_attr(on_off_basic_cluster, ESP_ZB_ZCL_ATTR_BASIC_MODEL_IDENTIFIER_ID, mfg_info.model_identifier);
esp_zb_endpoint_config_t relay_endpoint_config = {
.endpoint = HA_ESP_LIGHT_ENDPOINT, // Using the example's endpoint for the relay
.app_profile_id = ESP_ZB_AF_HA_PROFILE_ID,
.app_device_id = ESP_ZB_HA_ON_OFF_LIGHT_DEVICE_ID, // Keep as On/Off Light for this endpoint
.app_device_version = 0
};
esp_zb_ep_list_add_ep(multi_ep_list, relay_cluster_list, relay_endpoint_config);
ESP_LOGI(TAG, "On/Off Light (Relay) Endpoint created.");
// --- End of On/Off Light (Relay) Endpoint Setup ---
/* --- Create Occupancy Sensor Endpoint --- */
ESP_LOGI(TAG, "Creating Occupancy Sensor Endpoint (%d)...", MY_OCCUPANCY_SENSOR_ENDPOINT);
esp_zb_attribute_list_t *occupancy_basic_cluster = esp_zb_basic_cluster_create(NULL);
// Add manufacturer info to this endpoint's basic cluster too
esp_zb_basic_cluster_add_attr(occupancy_basic_cluster, ESP_ZB_ZCL_ATTR_BASIC_MANUFACTURER_NAME_ID, mfg_info.manufacturer_name);
esp_zb_basic_cluster_add_attr(occupancy_basic_cluster, ESP_ZB_ZCL_ATTR_BASIC_MODEL_IDENTIFIER_ID, mfg_info.model_identifier);
esp_zb_attribute_list_t *occupancy_identify_cluster = esp_zb_identify_cluster_create(NULL);
esp_zb_attribute_list_t *occupancy_sensing_cluster = esp_zb_zcl_attr_list_create(ESP_ZB_ZCL_CLUSTER_ID_OCCUPANCY_SENSING);
uint8_t initial_occupancy_value = 0x00; // Unoccupied
esp_zb_occupancy_sensing_cluster_add_attr(occupancy_sensing_cluster, ESP_ZB_ZCL_ATTR_OCCUPANCY_SENSING_OCCUPANCY_ID, &initial_occupancy_value);
// Optional: Add sensor type attribute
// uint8_t sensor_type = ESP_ZB_ZCL_OCCUPANCY_SENSOR_TYPE_PIR; // Or a combined type if available
// esp_zb_occupancy_sensing_cluster_add_attr(occupancy_sensing_cluster, ESP_ZB_ZCL_ATTR_OCCUPANCY_SENSING_TYPE_ID, &sensor_type);
esp_zb_cluster_list_t *occupancy_cluster_list_for_ep = esp_zb_zcl_cluster_list_create();
esp_zb_cluster_list_add_basic_cluster(occupancy_cluster_list_for_ep, occupancy_basic_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
esp_zb_cluster_list_add_identify_cluster(occupancy_cluster_list_for_ep, occupancy_identify_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
esp_zb_cluster_list_add_occupancy_sensing_cluster(occupancy_cluster_list_for_ep, occupancy_sensing_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
esp_zb_endpoint_config_t occupancy_endpoint_config = {
.endpoint = MY_OCCUPANCY_SENSOR_ENDPOINT,
.app_profile_id = ESP_ZB_AF_HA_PROFILE_ID,
.app_device_id = 0x0107,
.app_device_version = 0
};
esp_zb_ep_list_add_ep(multi_ep_list, occupancy_cluster_list_for_ep, occupancy_endpoint_config);
ESP_LOGI(TAG, "Occupancy Sensor Endpoint created.");
/* --- End of Occupancy Sensor Endpoint Creation --- */
// Register the device with ALL endpoints
esp_zb_device_register(multi_ep_list); // Use the list that contains both endpoints
ESP_LOGI(TAG, "Configuring reporting for Occupancy sensor...");
esp_zb_zcl_reporting_info_t occupancy_reporting_info = {
.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV, // Report from server (our device) to client (HA)
.ep = MY_OCCUPANCY_SENSOR_ENDPOINT, // Your occupancy sensor endpoint
.cluster_id = ESP_ZB_ZCL_CLUSTER_ID_OCCUPANCY_SENSING,
.cluster_role = ESP_ZB_ZCL_CLUSTER_SERVER_ROLE,
.attr_id = ESP_ZB_ZCL_ATTR_OCCUPANCY_SENSING_OCCUPANCY_ID,
.dst.profile_id = ESP_ZB_AF_HA_PROFILE_ID,
// .dst.addr_mode = ESP_ZB_APS_ADDR_MODE_DST_ADDR_ENDP_NOT_PRESENT, // Let stack fill this during binding
// .dst.dst_addr_u.addr_short = 0; // Coordinator address, usually set after binding
.u.send_info.min_interval = 1, // Minimum reporting interval (seconds) - report quickly
.u.send_info.max_interval = 300, // Maximum reporting interval (e.g., 5 minutes)
.u.send_info.def_min_interval = 1,
.u.send_info.def_max_interval = 300,
// For a binary attribute like occupancy, reportable_change is usually not critical,
// as any change (0 to 1 or 1 to 0) is significant.
// For analog values, delta is important.
// .u.send_info.delta.u8 = 1; // For boolean/bitmap, delta isn't typically used this way.
// The change itself is the report trigger.
.manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC,
};
// This function configures the local device to send reports.
// The actual sending of reports often relies on a binding being established
// between this device's occupancy cluster and the coordinator (HA).
esp_err_t report_cfg_err = esp_zb_zcl_update_reporting_info(&occupancy_reporting_info);
if (report_cfg_err == ESP_OK) {
ESP_LOGI(TAG, "Successfully configured reporting for Occupancy attribute.");
} else {
ESP_LOGE(TAG, "Failed to configure reporting for Occupancy attribute: %s", esp_err_to_name(report_cfg_err));
}
esp_zcl_utility_add_ep_basic_manufacturer_info(esp_zb_on_off_light_ep, HA_ESP_LIGHT_ENDPOINT, &info);
esp_zb_device_register(esp_zb_on_off_light_ep);
esp_zb_core_action_handler_register(zb_action_handler);
esp_zb_set_primary_network_channel_set(ESP_ZB_PRIMARY_CHANNEL_MASK);
ESP_LOGI(TAG, "Starting Zigbee stack to join a network (network steering)...");
ESP_ERROR_CHECK(esp_zb_start(false));
esp_zb_stack_main_loop();
}
void app_main(void)
{
ESP_LOGI(TAG, "Initializing GPIOs...");
// Configure PIR GPIO (Your tested config)
gpio_config_t pir_conf = {
.intr_type = GPIO_INTR_DISABLE, // For polling initially
.mode = GPIO_MODE_INPUT,
.pin_bit_mask = (1ULL << PIR_GPIO),
.pull_down_en = 0,
.pull_up_en = 1,
};
ESP_ERROR_CHECK(gpio_config(&pir_conf));
// Configure Radar GPIO (Your tested config - adjust if different)
gpio_config_t radar_conf = {
.intr_type = GPIO_INTR_DISABLE, // For polling initially
.mode = GPIO_MODE_INPUT,
.pin_bit_mask = (1ULL << RADAR_GPIO),
.pull_down_en = 0,
.pull_up_en = 1,
};
ESP_ERROR_CHECK(gpio_config(&radar_conf));
// Configure Relay GPIO (Your tested config)
gpio_config_t relay_conf = {
.intr_type = GPIO_INTR_DISABLE,
.mode = GPIO_MODE_OUTPUT,
.pin_bit_mask = (1ULL << RELAY_GPIO),
.pull_down_en = 0,
.pull_up_en = 0,
};
ESP_ERROR_CHECK(gpio_config(&relay_conf));
// Initial relay state (Relay ON if input is HIGH, so set to 0 for OFF)
gpio_set_level(RELAY_GPIO, 0);
ESP_LOGI(TAG, "GPIOs Initialized.");
esp_zb_platform_config_t config = {
.radio_config = ESP_ZB_DEFAULT_RADIO_CONFIG(),
.host_config = ESP_ZB_DEFAULT_HOST_CONFIG(),
@@ -153,4 +358,7 @@ void app_main(void)
ESP_ERROR_CHECK(nvs_flash_init());
ESP_ERROR_CHECK(esp_zb_platform_config(&config));
xTaskCreate(esp_zb_task, "Zigbee_main", 4096, NULL, 5, NULL);
xTaskCreate(presence_polling_task, "Presence_Poll_Task", 2048, NULL, 5, NULL);
ESP_LOGI(TAG, "Presence Polling Task created.");
}