diff --git a/README.md b/README.md
index e98d1705..7e442ae2 100644
--- a/README.md
+++ b/README.md
@@ -15,87 +15,110 @@ Custom component to support Automower.
- [Configuration](#configuration)
- [Husqvarna API-Key](#husqvarna-api-key)
- [Home Assistant](#home-assistant)
+ - [Camera Sensor](#Camera-sensor)
- [Usage](#usage)
+- [Debugging](#Debugging)
+- [Troubleshooting](#Troubleshooting)
## About
-This integration is based on the offical
-[API](https://developer.husqvarnagroup.cloud/). The integration is using the
-Husqvarna websocket API for pushed updates, so no polling is performed. You
-need a API key to use this integration, refer to [this
-guide](https://developer.husqvarnagroup.cloud/docs/get-started) on how to
-get one.
+This Home Assistant integration provides status and control of supported Husqvarna Automowers. The official Husqvarna [API](https://developer.husqvarnagroup.cloud/) uses websocket connection for pushed updates, so no polling is performed. Park and Start commands including schedule overrides are supported by the integration allowing for robust automations to be implemented in Home Assistant. Diagnostic and statics provided by the API are included with the integration for monitoring mower usage and performance.
-
+
## Supported devices
-Only mowers with built-in Automower® Connect or with the Automower® Connect Module are supported. e.g.
-
-- AUTOMOWER® 315X
-- AUTOMOWER® 405X
-- AUTOMOWER® 415X
-- AUTOMOWER® 430X
-- AUTOMOWER® 435X AWD
-- AUTOMOWER® 450X
+Husqvarna Automowers with built-in *Automower® Connect* or with the *Automower® Connect Module* are supported.
## Installation
-Requires Home Assistant 2022.5.0 or newer.
+Home Assistant 2022.5.0 or newer is required.
### Installation through HACS
-If you have not yet installed HACS, go get it at https://hacs.xyz/ and walk through the installation and configuration.
+Installation using Home Assistant Community Store (HACS) is recommended.
-Then find the Husqvarna Automower integration in HACS and install it.
+1. If HACS is not installed, follow HACS installation and configuration at https://hacs.xyz/.
-Restart Home Assistant!
+2. In HACS, search under integrations for Husqvarna Automower and install.
-Install the new integration through Configuration -> Integrations in HA (see below).
+3. Restart Home Assistant!
### Manual installation
-Download the `husqvarna_automower.zip` file from the [release section](https://github.com/Thomas55555/husqvarna_automower/releases). Extract it and copy the content into the path `/config/custom_components/husqvarna_automower` of your HA installation. Do **not** download directly from the `main` branch.
+1. Download the `husqvarna_automower.zip` file from the repository [release section](https://github.com/Thomas55555/husqvarna_automower/releases).
+
+2. Extract and copy the content into the path `/config/custom_components/husqvarna_automower` of your HA installation.
+
+ Do **not** download directly from the `main` branch.
+
+3. Restart Home Assistant!
## Configuration
### Husqvarna API-Key
-In order to use this integration you must get a API-Key from Husqvarna.
+In order to use this integration you must properly configure OAuth2 credentials using your Husqvarna account. Refer to [this guide](https://developer.husqvarnagroup.cloud/docs/get-started) for general overview of the process. Username/password authentication for this integration is no longer supported as of version 2022.7.0.
+
+Your Husqvarna account username/password used for the *Automower® Connect* phone app is required. Most users probably created a Husqvarna account during initial mower setup.
+
+1. Go to and sign in with Husqvarna account. Sign in page has password recovery/reset using registered email address if needed. Authorize *Developer Porthole* to access Husqvarna account when prompted.
+
+2. After signing in you will be automatically redirected to "Your applications". (Otherwise go to: )
+
+3. Create a new application:
-1. Go to
+ * Name is required but can be anything, for example "My Home Assistant"
-2. Create an account if needed, otherwise sign in with your Husqvarna account.
+ * Description is optional
-3. After signing in you will be automatically redirected to "Your applications". (Otherwise go to: )
+ * Redirect URL:
-4. Create an new application, name it for example "My Home Assistant" (doesn't matter), leave the other fields empty.
+ ```
+ https://my.home-assistant.io/redirect/oauth
+ ```
-5. Click on "**+ Connect new API**" and connect the **Authentication API** and the **Husqvarna Automower API**.
+ Confirm no extra spaces were appended at end of URL from copy and paste.
-6. Copy your Application Key, this is what you need when you add the integration in Home Assistant.
+ * Click **CREATE**. *Application Key* and *Application Secret* will be generated and shown. Protect these like a username and password.
+
+4. Click on **CONNECT NEW API** and connect the **Authentication API**
+
+5. Click on **CONNECT NEW API** again and connect the **Husqvarna Automower API**.
+
+6. Leave this tab open in browser and continue with Home Assistant configuration.
### Home Assistant
-Setup under Integrations in Home Assistant, search for "husqvarna_automower" and click on it, or use the My button:
-[](https://my.home-assistant.io/redirect/config_flow_start/?domain=husqvarna_automower)
+The My Home Assistant redirect feature needs to be setup to redirect to your home assistant installation. See https://my.home-assistant.io/faq/ for additional information.
-If the integration is not shown, try to refresh your browser (F5) or (Shift+F5). Maybe you need to reopen your browser.
+1. Add the integration to your home assistant installation and test the redirect feature by following below link:
+ [](https://my.home-assistant.io/redirect/config_flow_start/?domain=husqvarna_automower)
+2. Acknowledge prompts to open link, install Husqvarna Automower integration
-Login with API-Key and Application Secret. You can find them on the Husqvarna site
-[
-On the Husqvrana site edit your Application and add your Home Assistant instance as redirect URL. Use My HomeAssistant
-```
-https://my.home-assistant.io/redirect/oauth
-```
-You will be re-directed to the Husqvarna site and have to login there with username and password to authorize Home Assistant.
+3. Acknowledge prompt to setup application credentials.
+
+4. Enter the following from the Husqvrana developer tab:
+
+ * The name of the application assigned in Step 3 above
-### Configuring the camera sensor
+ * Copy and paste the *Application Key* into the *OAuth Client ID* field
+ * Copy and paste the *Application Secret* into the *OAuth Client Secret* field
-The optional camera entity is disabled by default. The camera entity will plot the current coordinates and location history of the mower on a user provided image. To configure the entity you need to upload your desired map image and determine the coordinates of the top left corner and the bottom right corner of your selected image.
+5. Click **Create**
+
+6. Browser will be redirected to Husqvarna Developer site. Sign in and Authorize the integration to connect with your Husqvarna account
+
+7. After authorizing the integration the browser will show the my Home Assistant redirect link to link this account. Click on **Link Account**.
+
+8. Confirm successful connection of mower and assign to an HA area if desired.
+
+### Camera Sensor
+
+The camera entity is disabled by default. The camera entity will plot the current coordinates and location history of the mower on a user provided image. To configure the entity you need to upload your desired map image and determine the coordinates of the top left corner and the bottom right corner of your selected image.
The camera entity is configured via the configure option on the integration. To enter the coordinates, ensure that they are in Signed Degree format and separated by a comma for example (40.689209, -74.044661)
@@ -103,54 +126,85 @@ You can then provide the path to the image you would like to use for the map and
## Usage
-`vacuum.start`
-The mower continues to mow, within the specified schedule
+* `vacuum.start`
+ The mower continues to mow, within the specified schedule
-`vacuum.pause`
-Pauses the mower until a new command
+* `vacuum.pause`
+ Pauses the mower until a new command
-`vacuum.stop`
-The mower returns to the base and parks there until the next schedule starts
+* `vacuum.stop`
+ The mower returns to the base and parks there until the next schedule starts
-`vacuum.return_to_base`
-The mower returns to the base and parks there until it gets a new start command
+* `vacuum.return_to_base`
+ The mower returns to the base and parks there until it gets a new start command
-`husqvarna_automower.park_and_start`
-With the this command you can override the current schedule for a specific time. For more details see the [Services](https://github.com/Thomas55555/husqvarna_automower#services) chapter
+* `number.automower_park_for`
+ Override schedule to park mower for specified number of minutes.
-### Services
+* `number.automower_mow_for`
+ Override schedule to mow for specified number of minutes.
-| Name | Type | Possible values | Description
-| ------------- | ------------- | ------------- | -------------
-| command | string | `Start` \| `Park` | Start or park the mower
-| duration | int | `1...60480` | Duration for this command in minutes
-| target | string | | The `entity_id` of your mower
+* `number.automower_cutting_height`
+ Set mower cutting height.
-Example for starting without the schedule for 120 minutes:
-```
-service: husqvarna_automower.park_and_start
-data:
- command: Start
- duration: 120
-target:
- entity_id: vacuum.automower_r_315x_haffi
-```
+* `select.automower_headlight_mode`
+ Set the mower headlight operating mode
-Example for parking independent from the schedule for 5 minutes:
-```
-service: husqvarna_automower.park_and_start
-data:
- command: Park
- duration: 5
-target:
- entity_id: vacuum.automower_r_315x_haffi
-```
-
-## Debugging
+### Services
-To enable debug logging for this integration and related libraries you
-can control this in your Home Assistant `configuration.yaml`
-file. Example:
+* `husqvarna_automower.park_and_start`
+ Deprecated as of version 2022.7.0. Use number .set_value service to set the number overrides.
+
+ ```
+ service: number.set_value
+ data:
+ value: '60'
+ target:
+ entity_id: number.automower_mow_for
+ ```
+
+* `husqvarna_automower.calendar`
+ Allows mower schedule to be revised. Supports single schedule per day, this will override existing schedule.
+
+ ```
+ service: husqvarna_automower.calendar
+ data:
+ start: '11:45:00'
+ end: '21:30:00'
+ monday: true
+ tuesday: true
+ wednesday: true
+ thursday: true
+ friday: true
+ saturday: false
+ sunday: false
+ target:
+ entity_id: vacuum.automower
+ ```
+ `start` must be less than `end`. Seconds are ignored.
+
+* `husqvarna_automower.custom_command`
+ Allows custom JSON formatted commands to be sent.
+
+ Example equivalent to `vacuum.start`
+ ```
+ service: husqvarna_automower.custom_command
+ data:
+ command_type: actions
+ json_string: >-
+ {
+ "data": {"type": "ResumeSchedule"}
+ }
+ target:
+ entity_id: vacuum.automower
+ ```
+ See Husqvarna [API reference](https://developer.husqvarnagroup.cloud/apis/Automower+Connect+API#/swagger) for additional details.
+
+## Debugging
+
+To enable debug logging for this integration and related libraries you can control this in your Home Assistant `configuration.yaml` file.
+
+Example:
```
logger:
@@ -161,3 +215,9 @@ logger:
```
After a restart detailed log entries will appear in `/config/home-assistant.log`.
+
+## Troubleshooting
+
+### Remove Credentials
+
+The OAuth2 credentials can be removed from the home assistant user interface. Navigate to the Integrations tab under settings. Access the *Application Credentials* menu by clicking on the Kebab (3 vertical dot menu icon) . Direct link: https://my.home-assistant.io/redirect/application_credentials/
diff --git a/screenshot_husqvarna_automower.PNG b/screenshot_husqvarna_automower.PNG
index 0a36fe5a..ee083c7e 100644
Binary files a/screenshot_husqvarna_automower.PNG and b/screenshot_husqvarna_automower.PNG differ