diff --git a/esphomeyaml-beta/config.json b/esphomeyaml-beta/config.json index c30ccc1f17..efa4da02f3 100644 --- a/esphomeyaml-beta/config.json +++ b/esphomeyaml-beta/config.json @@ -2,7 +2,7 @@ "name": "esphomeyaml-beta", "version": "1.9.0", "slug": "esphomeyaml-beta", - "description": "Beta version of esphomeyaml HassIO add-on.", + "description": "Beta version of esphomeyaml Hass.io add-on.", "url": "https://beta.esphomelib.com/esphomeyaml/index.html", "startup": "application", "webui": "http://[HOST]:[PORT:6052]", diff --git a/esphomeyaml-edge/README.md b/esphomeyaml-edge/README.md index f7301dcf70..5afe501732 100644 --- a/esphomeyaml-edge/README.md +++ b/esphomeyaml-edge/README.md @@ -1,4 +1,4 @@ -# Esphomeyaml HassIO Add-On +# Esphomeyaml Hass.io Add-On [![esphomeyaml logo](logo.png)](https://esphomelib.com/esphomeyaml/index.html) @@ -17,7 +17,7 @@ It is intended for: ## About This add-on allows you to manage and program your ESP8266 and ESP32 based microcontrollers -directly through HassIO **with no programming experience required**. All you need to do +directly through Hass.io **with no programming experience required**. All you need to do is write YAML configuration files; the rest (over-the-air updates, compiling) is all handled by esphomeyaml. @@ -42,15 +42,15 @@ Then just click UPLOAD and the sensor will magically appear in Home Assistant: ## Installation -To install this HassIO add-on you need to add the esphomeyaml add-on repository +To install this Hass.io add-on you need to add the esphomeyaml add-on repository first: -1. [Add esphomeyaml's HassIO add-ons repository](https://github.com/OttoWinter/esphomeyaml) to your HassIO instance. You can do this by navigating to the "Add-on Store" tab in the HassIO panel and then entering https://github.com/OttoWinter/esphomeyaml in the "Add new repository by URL" field. +1. Add esphomeyaml's Hass.io add-ons repository to your Hass.io instance. You can do this by navigating to the "Add-on Store" tab in the Hass.io panel and then entering https://github.com/OttoWinter/esphomeyaml in the "Add new repository by URL" field. 2. Now scroll down to the bottom of the page and select the "esphomeyaml-edge" add-on. 3. Press install to download the add-on and unpack it on your machine. This can take some time. 4. Optional: If you're using SSL certificates and want to encrypt your communication to this add-on, please enter `true` into the `ssl` field and set the `fullchain` and `certfile` options accordingly. 5. Start the add-on, check the logs of the add-on to see if everything went well. -6. Click "OPEN WEB UI" to open the esphomeyaml dashboard. You will be asked for your Home Assistant credentials - esphomeyaml uses HassIO's authentication system to log you in. +6. Click "OPEN WEB UI" to open the esphomeyaml dashboard. You will be asked for your Home Assistant credentials - esphomeyaml uses Hass.io's authentication system to log you in. **NOTE**: Installation on RPis running in 64-bit mode is currently not possible. Please use the 32-bit variant of HassOS instead. diff --git a/esphomeyaml-edge/rootfs/etc/cont-init.d/10-requirements.sh b/esphomeyaml-edge/rootfs/etc/cont-init.d/10-requirements.sh index 3461cc024c..046c55315d 100755 --- a/esphomeyaml-edge/rootfs/etc/cont-init.d/10-requirements.sh +++ b/esphomeyaml-edge/rootfs/etc/cont-init.d/10-requirements.sh @@ -21,7 +21,7 @@ if hass.config.true 'ssl'; then # Both files are missing, let's print a friendlier error message text = "You enabled encrypted connections using the \"ssl\": true option. However, the SSL files \"$(hass.config.get 'certfile')\" and \"$(hass.config.get 'keyfile')\" - were not found. If you're using HassIO on your local network and don't want + were not found. If you're using Hass.io on your local network and don't want to encrypt connections to the esphomeyaml dashboard, you can manually disable SSL by setting \"ssl\" to false." hass.die "${text}" diff --git a/esphomeyaml/__main__.py b/esphomeyaml/__main__.py index 69ea5a7e87..123b3e053d 100644 --- a/esphomeyaml/__main__.py +++ b/esphomeyaml/__main__.py @@ -455,7 +455,7 @@ def parse_args(argv): dashboard.add_argument("--open-ui", help="Open the dashboard UI in a browser.", action='store_true') dashboard.add_argument("--hassio", - help="Internal flag used to tell esphomeyaml is started as a HassIO " + help="Internal flag used to tell esphomeyaml is started as a Hass.io " "add-on.", action="store_true") diff --git a/esphomeyaml/config.json b/esphomeyaml/config.json index cfb1043e70..acd1b3c6ef 100644 --- a/esphomeyaml/config.json +++ b/esphomeyaml/config.json @@ -2,7 +2,7 @@ "name": "esphomeyaml", "version": "1.9.0", "slug": "esphomeyaml", - "description": "esphomeyaml HassIO add-on for intelligently managing all your ESP8266/ESP32 devices.", + "description": "esphomeyaml Hass.io add-on for intelligently managing all your ESP8266/ESP32 devices.", "url": "https://esphomelib.com/esphomeyaml/index.html", "startup": "application", "webui": "http://[HOST]:[PORT:6052]", diff --git a/esphomeyaml/dashboard/dashboard.py b/esphomeyaml/dashboard/dashboard.py index 213d203217..117701a2ae 100644 --- a/esphomeyaml/dashboard/dashboard.py +++ b/esphomeyaml/dashboard/dashboard.py @@ -420,7 +420,7 @@ class LoginHandler(BaseHandler): self.redirect('/') return except Exception as err: # pylint: disable=broad-except - _LOGGER.warn("Error during HassIO auth request: %s", err) + _LOGGER.warn("Error during Hass.io auth request: %s", err) self.set_status(500) self.render_hassio_login(error="Internal server error") return diff --git a/esphomeyaml/dashboard/static/esphomeyaml.js b/esphomeyaml/dashboard/static/esphomeyaml.js index 5a53bdef94..df498ba4fa 100644 --- a/esphomeyaml/dashboard/static/esphomeyaml.js +++ b/esphomeyaml/dashboard/static/esphomeyaml.js @@ -3,24 +3,24 @@ document.addEventListener('DOMContentLoaded', () => { }); const colorReplace = (input) => { -input = input.replace(/&/g, "&").replace(//g, ">").replace(/"/g, """).replace(/'/g, "'"); -input = input.replace(/\\033\[(?:0;)?31m/g, ''); -input = input.replace(/\\033\[(?:0?1;)?31m/g, ''); -input = input.replace(/\\033\[(?:0;)?32m/g, ''); -input = input.replace(/\\033\[(?:0?1;)?32m/g, ''); -input = input.replace(/\\033\[(?:0;)?33m/g, ''); -input = input.replace(/\\033\[(?:0?1;)?33m/g, ''); -input = input.replace(/\\033\[(?:0;)?35m/g, ''); -input = input.replace(/\\033\[(?:0?1;)?35m/g, ''); -input = input.replace(/\\033\[(?:0;)?36m/g, ''); -input = input.replace(/\\033\[(?:0?1;)?36m/g, ''); -input = input.replace(/\\033\[(?:0;)?37m/g, ''); -input = input.replace(/\\033\[(?:0?1;)?37m/g, ''); -input = input.replace(/\\033\[(?:0;)?38m/g, ''); -input = input.replace(/\\033\[(?:0?1;)?38m/g, ''); -input = input.replace(/\\033\[0m/g, ''); + input = input.replace(/&/g, "&").replace(//g, ">").replace(/"/g, """).replace(/'/g, "'"); + input = input.replace(/\\033\[(?:0;)?31m/g, ''); + input = input.replace(/\\033\[(?:0?1;)?31m/g, ''); + input = input.replace(/\\033\[(?:0;)?32m/g, ''); + input = input.replace(/\\033\[(?:0?1;)?32m/g, ''); + input = input.replace(/\\033\[(?:0;)?33m/g, ''); + input = input.replace(/\\033\[(?:0?1;)?33m/g, ''); + input = input.replace(/\\033\[(?:0;)?35m/g, ''); + input = input.replace(/\\033\[(?:0?1;)?35m/g, ''); + input = input.replace(/\\033\[(?:0;)?36m/g, ''); + input = input.replace(/\\033\[(?:0?1;)?36m/g, ''); + input = input.replace(/\\033\[(?:0;)?37m/g, ''); + input = input.replace(/\\033\[(?:0?1;)?37m/g, ''); + input = input.replace(/\\033\[(?:0;)?38m/g, ''); + input = input.replace(/\\033\[(?:0?1;)?38m/g, ''); + input = input.replace(/\\033\[0m/g, ''); -return input; + return input; }; let configuration = ""; diff --git a/esphomeyaml/dashboard/templates/index.html b/esphomeyaml/dashboard/templates/index.html index e88ece2434..c1bc54fbe3 100644 --- a/esphomeyaml/dashboard/templates/index.html +++ b/esphomeyaml/dashboard/templates/index.html @@ -34,7 +34,7 @@
Select Upload Port

Here you can select where esphomeyaml will attempt to show logs and upload firmwares to. - By default, this is "OTA", or Over-The-Air. Note that you might have to restart the HassIO add-on + By default, this is "OTA", or Over-The-Air. Note that you might have to restart the Hass.io add-on for new serial ports to be detected.

@@ -338,7 +338,7 @@

- It looks like you've already set up MQTT, the values below are taken from your HassIO MQTT add-on. + It looks like you've already set up MQTT, the values below are taken from your Hass.io MQTT add-on. Please confirm they are correct and press CONTINUE.

{% end %} diff --git a/repository.json b/repository.json index a4198c300a..dad4d0a431 100644 --- a/repository.json +++ b/repository.json @@ -1,5 +1,5 @@ { - "name": "esphomeyaml HassIO Add-On Repository", + "name": "esphomeyaml Hass.io Add-Ons", "url": "https://github.com/OttoWinter/esphomeyaml", "maintainer": "Otto Winter " }