Skip to content

Commit

Permalink
Merge branch 'denysdovhan:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
augustas2 authored Dec 14, 2023
2 parents bb909c4 + 533e1c3 commit 4b707d2
Show file tree
Hide file tree
Showing 13 changed files with 226 additions and 127 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
github: denysdovhan
patreon: denysdovhan
custom: [buymeacoffee.com/denysdovhan]
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ updates:
directory: '/'
schedule:
interval: 'monthly'
open-pull-requests-limit: 10
open-pull-requests-limit: 25
78 changes: 78 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: Main
on:
push:
pull_request:

permissions:
contents: write
pull-requests: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
validate:
name: Validate
runs-on: ubuntu-latest
steps:
- name: ⬇️ Checkout Repo
uses: actions/checkout@v4

- name: ⬢ Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '*'
cache: npm

- name: 📦 Install Packages
run: npm ci

- name: 🧪 Test
run: npm test

release:
name: Release
runs-on: ubuntu-latest
needs: [validate]
if: github.actor == 'denysdovhan' && github.event_name == 'push' && github.ref_name == 'main'
steps:
- name: ⬇️ Checkout Repo
uses: actions/checkout@v4

- name: ⬢ Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '*'
cache: npm

- name: 📦 Install Packages
run: npm ci

- name: 🏗 Build
run: npm run build

- name: 🚀 Release
run: npx semantic-release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

dependabot:
name: Dependabot Auto-merge
runs-on: ubuntu-latest
needs: [validate]
if: github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'
steps:
- name: 💿 Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: ↔️ Enable Auto-merge for minor and patch Dependabot PRs
run: gh pr merge --auto --squash "$PR_URL"
if: steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35 changes: 0 additions & 35 deletions .github/workflows/release.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/validate.yml

This file was deleted.

7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,23 +240,24 @@ This card relies on basic vacuum services, like `pause`, `start`, `stop`, `retur

If this card works with your vacuum cleaner, please open a PR and your model to the list.

- **Roborock** S7, S6 (MaxV, Pure), S5 (Max), S50, S4 (Max), E25, E4
- **Roborock** S7 (MaxV), S6 (MaxV, Pure), S5 (Max), S50, S4 (Max), E25, E4, Q5 Pro
- **Mijia** Robot Vacuum Cleaner 1C (STYTJ01ZHM)
- **Xiaomi** Mi Robot (STYJ02YM), Mi Robot 1S, Mi Roborock V1 (SDJQR02RR), Mijia 1C, Mi Robot Vacuum-Mop P
- **Xiaomi** Mi Robot (STYJ02YM), Mi Robot 1S, Mi Roborock V1 (SDJQR02RR), Mijia 1C, Mi Robot Vacuum-Mop P, Robot Vacuum E10
- **Roomba** 670, 675, 676, 960980, 981, i3, i7+, e5, S9, s9+, j7
- **Braava** M6
- **Dyson** 360 Eye
- **Neato** D7, D6, D4
- **Shark** IQ
- **Ecova**cs Deebot 950, Deebot OZMO T8 AIVI, Deebot N79, Deebot N8, Deebot N8+, T9 AIVI
- **Eufy** Robovac 30c, Robovac 15C Max
- **Eufy** Robovac 30c, Robovac 15C Max, Robovac X8 Hybrid
- **EcoVacs** T9 AIVI
- **Dreame** Z10 Pro, L10 Pro, D9, F9
- 360 S7 Pro
- KaBum! Smart 500
- Honiture Q6 Lite
- Neabot NoMo N1 Plus
- Kyvol E31
- Setti+ RV800
- [_Your vacuum?_][edit-readme]

## Development
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vacuum-card",
"version": "2.7.6",
"version": "2.8.0",
"description": "Vacuum cleaner card for Home Assistant Lovelace UI",
"main": "dist/vacuum-card.js",
"scripts": {
Expand Down
5 changes: 4 additions & 1 deletion src/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ export class VacuumCardEditor extends LitElement implements LovelaceCardEditor {
}

const vacuumEntities = this.getEntitiesByType('vacuum');
const cameraEntities = this.getEntitiesByType('camera');
const cameraEntities = [
...this.getEntitiesByType('camera'),
...this.getEntitiesByType('image'),
];

return html`
<div class="card-config">
Expand Down
76 changes: 54 additions & 22 deletions src/translations/fi.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,80 @@
{
"status": {
"Cleaning": "Siivoaa",
"Paused": "Pysäytetty",
"Idle": "Toimeton",
"Charging": "Latauksessa",
"Returning home": "Palaa kotiin"
"cleaning": "Siivoaa",
"auto": "Automaattisiivous",
"spot": "Kohdesiivous",
"edge": "Reunasiivous",
"single_room": "Huonesiivous",
"paused": "Tauotettu",
"idle": "Toimeton",
"stop": "Pysäytetty",
"charging": "Lataa",
"returning": "Palaamassa",
"returning_home": "Palaamassa latausasemaan",
"docked": "Telakoitu",
"unknown": "Tuntematon",
"offline": "Poissa linjalta",
"error": "Virhe",
"charger_disconnected": "Laturi ei ole kytketty",
"remote_control_active": "Etäohjaus päällä",
"manual_mode": "Manuaalinen tila",
"shutting_down": "Sammutetaan",
"updating": "Päivitetään",
"going_to_target": "Menossa kohteeseen",
"zoned_cleaning": "Aluesiivous",
"segment_cleaning": "Lohkosiivous"
},
"source": {
"Gentle": "Hellävarainen",
"Silent": "Hiljainen",
"Standard": "Normaali",
"Medium": "Keskitaso",
"Turbo": "Turbo"
"gentle": "Hellävarainen",
"silent": "Hiljainen",
"standard": "Perustaso",
"medium": "Keskitaso",
"turbo": "Turbo",
"normal": "Normaali",
"max": "Max",
"max_plus": "Max+",
"high": "High",
"strong": "Voimakas",
"quiet": "Quiet",
"auto": "Automaattinen",
"balanced": "Tasapainoinen",
"custom": "Mukautettu",
"off": "Pois päältä"
},
"common": {
"name": "Pölynimurikortti",
"description": "Pölynimurikortti sallii robotti imurin ohjauksen.",
"start": "Siivoa",
"name": "Imurikortti",
"description": "Imurikortti mahdollistaa robotti-imurin ohjauksen.",
"start": "Käynnistä",
"continue": "Jatka",
"pause": "Tauko",
"stop": "Pysähdy",
"return_to_base": "Latausasemaan",
"locate": "Paikanna imuri",
"not_available": "Imuri ei saatavilla"
"not_available": "Ei saatavilla"
},
"error": {
"invalid_config": "Virheellinen konfiguraatio",
"missing_entity": "Entiteetti puuttuu!"
},
"warning": {
"actions_array": "VAROITUS: 'actions' on varattu oletustoimintojen ylikirjoittamiseen olemassaolevissa painikkeissa. Jos tarkoituksesi on lisätä toimintoja, käytä 'shortcuts' -toimintoa."
},
"editor": {
"entity": "Entiteetti (Vaaditaan)",
"map": "Kartan kamera (Valinnainen)",
"image": "Kuva (Valinnainen)",
"entity": "Entiteetti (vaaditaan)",
"map": "Karttakamera (valinnainen)",
"image": "Kuva (valinnainen)",
"compact_view": "Kompakti näkymä",
"compact_view_aria_label_on": "Kompakti näkymä päälle",
"compact_view_aria_label_off": "Kompakti näkymä pois",
"show_name": "Näytä Nimi",
"show_name": "Näytä nimi",
"show_name_aria_label_on": "Näyttönimi päälle",
"show_name_aria_label_off": "Näyttönimi pois",
"show_status": "Näytä Tila",
"show_status_aria_label_on": "Tilanäyttö päälle",
"show_status_aria_label_off": "Tilanäyttö pois",
"show_status": "Näytä tila",
"show_status_aria_label_on": "Näyttönimi päällä",
"show_status_aria_label_off": "Näyttönimi pois",
"show_toolbar": "Näytä työkalurivi",
"show_toolbar_aria_label_on": "Työkalurivi päälle",
"show_toolbar_aria_label_off": "Työkalurivi pois",
"code_only_note": "Huom: Toimintojen ja tilastojen optiot ovat saatavilla ainoastaan koodieditorissa"
"code_only_note": "Huomaa: toimintojen ja tilastojen asetukset saatavilla ainoastaan koodieditorissa."
}
}
Loading

0 comments on commit 4b707d2

Please sign in to comment.