From fb080425d02277b4812d987656ab9a7a3c98630e Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 3 Apr 2022 12:37:22 -0400 Subject: [PATCH 1/5] Minor wording and puncutation changes (#22236) --- source/_integrations/workday.markdown | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/_integrations/workday.markdown b/source/_integrations/workday.markdown index 365f58b4109..8cff8d544f7 100644 --- a/source/_integrations/workday.markdown +++ b/source/_integrations/workday.markdown @@ -14,12 +14,12 @@ ha_platforms: - binary_sensor --- -The `workday` binary sensor indicates, whether the current day is a workday or not. It allows specifying, which days of the week will count as workdays and also +The `workday` binary sensor indicates whether the current day is a workday or not. It allows specifying which days of the week will count as workdays and also uses the Python module [holidays](https://pypi.python.org/pypi/holidays) to incorporate information about region-specific public holidays. ## Setup -Check the [country list](https://github.com/dr-prodigy/python-holidays#available-countries) for available province. +Check the [country list](https://github.com/dr-prodigy/python-holidays#available-countries) for available provinces (and other subdivisions, like states and territories) for each country. ## Configuration To enable the `workday` sensor in your installation, add the following to your `configuration.yaml` file: @@ -81,13 +81,13 @@ Otherwise, the value is evaluated as `false`. If you use the sensor for Canada (`CA`) with Ontario (`ON`) as `province:` then you need to wrap `ON` in quotes. Otherwise, the value is evaluated as `true` (check the YAML documentation for further details) and the sensor will not work. -One other thing to watch is how the `holiday` keyword is used. Your first instinct might be to add it to the `exclude` configuration, thinking that it means to skip the holidays. Actually it means to exclude the days in the holidays’ list from the workdays. So when you exclude `holiday` and a workday falls on that day, then that workday is excluded. Meaning the sensor will be off. If you want the workday flagged without regarding holidays, make sure that there is something in your `Excludes` configuration other than `holiday`. +One other thing to watch is how the `holiday` keyword is used. Your first instinct might be to add it to the `exclude` configuration, thinking that it means to skip the holidays. Actually it means to exclude the days in the holidays list from the workdays. So, when you exclude `holiday` and a workday falls on that day, then that workday is excluded, and the sensor will be **off**. If you want every workday flagged with no regard to holidays, make sure that there is something in your `Excludes` configuration _other_ than `holiday`. ## Full examples -This example excludes Saturdays and Sundays but not holidays. Two custom holidays are added. +This example excludes Saturdays and Sundays but not pre-configured holidays. Two custom holidays are added. ```yaml # Example 1 configuration.yaml entry @@ -102,7 +102,7 @@ binary_sensor: ``` This example excludes Saturdays, Sundays and holidays. One custom holiday is added. -The date February 24th, 2020 is a Monday but will be excluded because it was added to the `add_holidays` configuration. +The date February 24th, 2020 is a Monday, but will be excluded (the sensor will be **off**) because it was added to the `add_holidays` configuration. ```yaml # Example 2 configuration.yaml entry From c79be027a3d2cf7f255ac27b2966da875e2fa754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20L=C3=B6vdahl?= Date: Sun, 3 Apr 2022 21:28:35 +0300 Subject: [PATCH 2/5] Update OctoPrint camera docs (#22231) --- source/_integrations/octoprint.markdown | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/source/_integrations/octoprint.markdown b/source/_integrations/octoprint.markdown index 6746134f01d..0e57e510e1f 100644 --- a/source/_integrations/octoprint.markdown +++ b/source/_integrations/octoprint.markdown @@ -77,15 +77,9 @@ Supported sensors: ## Camera -If the OctoPrint host is equipped with a web camera it is possible to add this as well. +If the OctoPrint host is equipped with a web camera it is possible to add this as well using the [`MJPEG IP Camera`](/integrations/mjpeg) integration. Use `http://YOUR_OCTOPRINT_HOST_IP/webcam/?action=stream` for the MJPEG URL and `http://YOUR_OCTOPRINT_HOST_IP/webcam/?action=snapshot` as the still image URL. -```yaml -camera: - - platform: mjpeg - name: OctoPrint - still_image_url: http://YOUR_OCTOPRINT_HOST_IP/webcam/?action=snapshot - mjpeg_url: http://YOUR_OCTOPRINT_HOST_IP/webcam/?action=stream -``` +{% my config_flow_start badge domain="mjpeg" %} ## Buttons From 10436b2809cf8a98fc4ebffa168cb3f4b3177b04 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 3 Apr 2022 16:26:05 -0400 Subject: [PATCH 3/5] Add terms "weekend" and "weekday" (#22237) Co-authored-by: Franck Nijhof --- source/_integrations/workday.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/_integrations/workday.markdown b/source/_integrations/workday.markdown index 8cff8d544f7..fc7d330ed26 100644 --- a/source/_integrations/workday.markdown +++ b/source/_integrations/workday.markdown @@ -17,6 +17,8 @@ ha_platforms: The `workday` binary sensor indicates whether the current day is a workday or not. It allows specifying which days of the week will count as workdays and also uses the Python module [holidays](https://pypi.python.org/pypi/holidays) to incorporate information about region-specific public holidays. +This can be used to make automations that act differently on weekdays vs weekends. For example, you could make your bedroom lights turn on (gently) at 7 in the morning if it is a weekday, but wait until 11 if it is a weekend day. + ## Setup Check the [country list](https://github.com/dr-prodigy/python-holidays#available-countries) for available provinces (and other subdivisions, like states and territories) for each country. From 88c8526131dea2f6e53131a14e0578fb06040fff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 09:31:00 +0200 Subject: [PATCH 4/5] Bump actions/setup-node from 3.0.0 to 3.1.0 (#22240) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3b442a1a38a..2ad207a3d84 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: - name: Check out files from GitHub uses: actions/checkout@v3.0.0 - name: Setting up Node.js - uses: actions/setup-node@v3.0.0 + uses: actions/setup-node@v3.1.0 with: node-version: 16.x cache: "npm" @@ -27,7 +27,7 @@ jobs: - name: Check out files from GitHub uses: actions/checkout@v3.0.0 - name: Setting up Node.js - uses: actions/setup-node@v3.0.0 + uses: actions/setup-node@v3.1.0 with: node-version: 16.x cache: "npm" From 54da489447a3a7d58e7311f6dcfaac9c93d56446 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 09:41:49 +0200 Subject: [PATCH 5/5] Bump minimist from 1.2.5 to 1.2.6 (#22241) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7eec7acd01b..3e770565c4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4205,9 +4205,9 @@ } }, "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "node_modules/misspellings": { @@ -8990,9 +8990,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "misspellings": {