mirror of
				https://github.com/esphome/esphome.git
				synced 2025-10-31 07:03:55 +00:00 
			
		
		
		
	Merge branch 'conf_max_connections' into integration
This commit is contained in:
		| @@ -14,6 +14,7 @@ from esphome.const import ( | |||||||
|     CONF_EVENT, |     CONF_EVENT, | ||||||
|     CONF_ID, |     CONF_ID, | ||||||
|     CONF_KEY, |     CONF_KEY, | ||||||
|  |     CONF_MAX_CONNECTIONS, | ||||||
|     CONF_ON_CLIENT_CONNECTED, |     CONF_ON_CLIENT_CONNECTED, | ||||||
|     CONF_ON_CLIENT_DISCONNECTED, |     CONF_ON_CLIENT_DISCONNECTED, | ||||||
|     CONF_PASSWORD, |     CONF_PASSWORD, | ||||||
| @@ -60,7 +61,6 @@ CONF_CUSTOM_SERVICES = "custom_services" | |||||||
| CONF_HOMEASSISTANT_SERVICES = "homeassistant_services" | CONF_HOMEASSISTANT_SERVICES = "homeassistant_services" | ||||||
| CONF_HOMEASSISTANT_STATES = "homeassistant_states" | CONF_HOMEASSISTANT_STATES = "homeassistant_states" | ||||||
| CONF_LISTEN_BACKLOG = "listen_backlog" | CONF_LISTEN_BACKLOG = "listen_backlog" | ||||||
| CONF_MAX_CONNECTIONS = "max_connections" |  | ||||||
| CONF_MAX_SEND_QUEUE = "max_send_queue" | CONF_MAX_SEND_QUEUE = "max_send_queue" | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -24,6 +24,7 @@ from esphome.const import ( | |||||||
|     CONF_INTERVAL, |     CONF_INTERVAL, | ||||||
|     CONF_MAC_ADDRESS, |     CONF_MAC_ADDRESS, | ||||||
|     CONF_MANUFACTURER_ID, |     CONF_MANUFACTURER_ID, | ||||||
|  |     CONF_MAX_CONNECTIONS, | ||||||
|     CONF_ON_BLE_ADVERTISE, |     CONF_ON_BLE_ADVERTISE, | ||||||
|     CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE, |     CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE, | ||||||
|     CONF_ON_BLE_SERVICE_DATA_ADVERTISE, |     CONF_ON_BLE_SERVICE_DATA_ADVERTISE, | ||||||
| @@ -41,7 +42,6 @@ CODEOWNERS = ["@bdraco"] | |||||||
| KEY_ESP32_BLE_TRACKER = "esp32_ble_tracker" | KEY_ESP32_BLE_TRACKER = "esp32_ble_tracker" | ||||||
| KEY_USED_CONNECTION_SLOTS = "used_connection_slots" | KEY_USED_CONNECTION_SLOTS = "used_connection_slots" | ||||||
|  |  | ||||||
| CONF_MAX_CONNECTIONS = "max_connections" |  | ||||||
| CONF_ESP32_BLE_ID = "esp32_ble_id" | CONF_ESP32_BLE_ID = "esp32_ble_id" | ||||||
| CONF_SCAN_PARAMETERS = "scan_parameters" | CONF_SCAN_PARAMETERS = "scan_parameters" | ||||||
| CONF_WINDOW = "window" | CONF_WINDOW = "window" | ||||||
|   | |||||||
| @@ -542,6 +542,7 @@ CONF_MANUAL_IP = "manual_ip" | |||||||
| CONF_MANUFACTURER_ID = "manufacturer_id" | CONF_MANUFACTURER_ID = "manufacturer_id" | ||||||
| CONF_MASK_DISTURBER = "mask_disturber" | CONF_MASK_DISTURBER = "mask_disturber" | ||||||
| CONF_MAX_BRIGHTNESS = "max_brightness" | CONF_MAX_BRIGHTNESS = "max_brightness" | ||||||
|  | CONF_MAX_CONNECTIONS = "max_connections" | ||||||
| CONF_MAX_COOLING_RUN_TIME = "max_cooling_run_time" | CONF_MAX_COOLING_RUN_TIME = "max_cooling_run_time" | ||||||
| CONF_MAX_CURRENT = "max_current" | CONF_MAX_CURRENT = "max_current" | ||||||
| CONF_MAX_DURATION = "max_duration" | CONF_MAX_DURATION = "max_duration" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user