Skip to content

Commit 7e00e4e

Browse files
committed
Merge branch 'develop'
# Conflicts: # kodi/__init__.py # kodi/plugin.yaml # kodi/user_doc.rst # stateengine/StateEngineItem.py
2 parents 5c96886 + df3e12f commit 7e00e4e

File tree

855 files changed

+90531
-30625
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

855 files changed

+90531
-30625
lines changed

.github/workflows/builddevdoc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
- run: sudo apt-get install libudev-dev
2121
- run: sudo apt-get install librrd-dev libpython3-dev
2222
- run: sudo apt-get install gcc --only-upgrade
23+
- run: sudo locale-gen de_DE.UTF-8
24+
- run: locale -a
2325
- uses: actions/checkout@v2
2426
- name: Checkout SmartHomeNG DEVELOP Branch
2527
uses: actions/checkout@v2

.github/workflows/buildreleasedoc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
python-version: [ '3.8' ]
16+
python-version: [ '3.9' ]
1717
name: Python ${{ matrix.python-version }}
1818
steps:
1919
- name: update OS (Ubuntu)
2020
run: sudo apt-get update
2121
- run: sudo apt-get install libudev-dev
2222
- run: sudo apt-get install librrd-dev libpython3-dev
2323
- run: sudo apt-get install gcc --only-upgrade
24+
- run: sudo locale-gen de_DE.UTF-8
25+
- run: locale -a
2426
- uses: actions/checkout@v2
2527
- name: Checkout SmartHomeNG DEVELOP Branch
2628
uses: actions/checkout@v2

.github/workflows/unittests.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
18+
python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12' ]
1919
name: Python ${{ matrix.python-version }}
2020
steps:
2121
- name: Setup OS (Ubuntu)
@@ -42,15 +42,19 @@ jobs:
4242
echo github.pull_request.base.ref '${{ github.pull_request.base.ref }}'
4343
echo steps.extract_branch.outputs.branch '${{ steps.extract_branch.outputs.branch }}'
4444
45-
- name: Checkout core from branch '${{ steps.extract_branch.outputs.branch }}' (for push)
46-
if: github.event_name != 'pull_request'
45+
- name: Check if branch '${{ steps.extract_branch.outputs.branch }}' exists in smarthomeNG/smarthome
46+
run: echo "code=$(git ls-remote --exit-code --heads https://github.com/smarthomeNG/smarthome ${{ steps.extract_branch.outputs.branch }} > /dev/null; echo $? )" >>$GITHUB_OUTPUT
47+
id: shng_branch_check
48+
49+
- name: Checkout core from branch '${{ steps.extract_branch.outputs.branch }}' (for push on known smarthomeNG/smarthome branch)
50+
if: github.event_name != 'pull_request' && steps.shng_branch_check.outputs.code == '0'
4751
uses: actions/checkout@v3
4852
with:
4953
repository: smarthomeNG/smarthome
5054
ref: ${{ steps.extract_branch.outputs.branch }}
5155

52-
- name: Checkout core from branch 'develop' (for pull request)
53-
if: github.event_name == 'pull_request'
56+
- name: Checkout core from branch 'develop' (for pull request or push on unknown smarthomeNG/smarthome branch)
57+
if: github.event_name == 'pull_request' || steps.shng_branch_check.outputs.code == '2'
5458
uses: actions/checkout@v3
5559
with:
5660
repository: smarthomeNG/smarthome
@@ -59,7 +63,7 @@ jobs:
5963
- name: Checkout plugins from branch '${{steps.extract_branch.outputs.branch}}'
6064
uses: actions/checkout@v3
6165
with:
62-
repository: smarthomeNG/plugins
66+
repository: ${{ github.repository_owner }}/plugins
6367
ref: ${{steps.extract_branch.outputs.branch}}
6468
path: plugins
6569

@@ -70,6 +74,8 @@ jobs:
7074
architecture: x64
7175
- run: python3 -m pip install --upgrade pip
7276

77+
- name: Install setuptools (needed for Python 3.12)
78+
run: pip install setuptools
7379
- name: Install requirements for unit testing
7480
run: pip install -r tests/requirements.txt
7581
- name: Build Requirements for SmartHomeNG

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ ehthumbs.db
2525
Thumbs.db
2626

2727
# don't upload private plugins
28-
/priv_*
28+
/priv_*/
29+
30+
# don't upload plugins loaded from develop to a release installation
31+
/*_dev/
2932

3033
# Pycharm settings
3134
/.idea

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "roombapysh/roombapy"]
2+
path = roombapysh/roombapy
3+
url = https://github.com/Pacifica15/roombapy.git

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33
![Github Tag](https://img.shields.io/github/tag/smarthomeNG/smarthome.svg)
44
![Made with Python](https://img.shields.io/badge/made%20with-python-blue.svg)
55
[![Join the chat at https://gitter.im/smarthomeNG/smarthome](https://badges.gitter.im/smarthomeNG/smarthome.svg)](https://gitter.im/smarthomeNG/smarthome?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
6-
[![Build Status on TravisCI](https://travis-ci.com/smarthomeNG/plugins.svg?branch=master)](https://travis-ci.com/smarthomeNG/plugins)
6+
77

88
Die Plugins für SmartHomeNG erweitern die Möglichkeiten des Gesamtsystems in dem sie Zugriff auf verschiedene Schnittstellen bereitstellen.
99

10-
Auf der ([Webseite des Projektes](https://www.smarthomeNG.de)) kann eine [Benutzerdokumentation](https://www.smarthomeNG.de) eingesehen werden.
10+
Es existiert eine [Benutzerdokumentation](https://smarthomeng.github.io/smarthome/) in der Kern und Plugins dokumentiert sind.
1111

12-
Ein [Wiki](https://github.com/smarthomeNG/smarthome/wiki) existiert zumeist in deutscher Sprache.
12+
Ein [Wiki](https://github.com/smarthomeNG/smarthome/wiki) existiert zumeist in deutscher Sprache, wird aber sehr selten erweitert oder aktualisiert.
1313

1414
## Aktueller Status der Entwicklung
1515

16-
[![Aktuelle Entwicklung](https://travis-ci.com/smarthomeNG/plugins.svg?branch=develop)](https://travis-ci.com/smarthomeNG/plugins)
17-
18-
16+
Es gibt eine stetig aktualisierte [Dokumentation für Entwickler](https://smarthomeng.github.io/dev_doc/).
1917

2018
## Other languages
2119

22-
It is possible to read the documentation with [Google's translation service](https://translate.google.com/translate?hl=&sl=de&tl=en&u=https://www.smarthomeng.de/dev/user/) in other languages as well.
20+
It is possible to read the documentation with [Google's translation service](https://translate.google.com/translate?hl=&sl=de&tl=en&u=https://smarthomeng.github.io/smarthome/) in other languages as well.

__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
def plugin_release():
2-
return '1.9.5'
2+
return '1.10.0'
33

44
def plugin_branch():
55
return 'master'

alexa4p3/README.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,34 @@ Alexa4PayloadV3
44

55
## Table of Content
66

7-
1. [Generell](#generell)
8-
2. [Change Log](#changelog)
9-
3. [Requrirements](#requirements)<br>
10-
[Einrichtung Amazon-Skill / Lambda-Funktion](#Skill)<sup><span style="color:red"> **Neu**</sup></span>
11-
4. [Icon / Display Categories](#Icons)<sup><span style="color:blue"> **Update**</sup></span>
12-
5. [Entwicklung / Einbau von neuen Skills](#Entwicklung)
13-
6. [Alexa-ThermostatController](#ThermostatController) + [Thermosensor](#Thermostatsensor)
14-
7. [Alexa-PowerController](#PowerController)
15-
8. [Alexa-BrightnessController](#BrightnessController)
16-
9. [Alexa-PowerLevelController](#PowerLevelController)
17-
10. [Alexa-PercentageController](#PercentageController)
18-
11. [Alexa-LockController](#LockController)
19-
12. [Alexa-CameraStreamController](#CameraStreamController) <sup><span style="color:blue"> **Update**</sup></span>
20-
13. [Alexa-SceneController](#SceneController)
21-
14. [Alexa-ContactSensor](#ContactSensor)
22-
15. [Alexa-ColorController](#ColorController)
23-
16. [Alexa-RangeController](#RangeController) <sup><span style="color:red"> **Neu**</sup></span>
24-
17. [Alexa-ColorTemperaturController](#ColorTemperaturController) <sup><span style="color:red"> **Neu**</sup></span>
25-
18. [Alexa-PlaybackController](#PlaybackController) <sup><span style="color:red"> **Neu**</sup></span>
26-
19. [Web-Interface](#webinterface) <sup><span style="color:red"> **Neu**</sup></span>
27-
28-
29-
30-
## [Beispiel-Konfigurationen](#Beispiel) <sup><span style="color:red"> **Neu**</sup></span>
31-
32-
33-
- [der fast perfekte Rolladen](#perfect_blind) <sup><span style="color:red"> **Neu**</sup></span>
34-
- [Items in Abhängikeit des letzten benutzten Echos-Devices schalten](#get_last_alexa)<sup><span style="color:red"> **Neu**</sup></span>
7+
1. Generell
8+
2. Change Log
9+
3. Requrirements<br>
10+
Einrichtung Amazon-Skill / Lambda-Funktion<sup><span style="color:red"> **Neu**</sup></span>
11+
4. Icon / Display Categories<sup><span style="color:blue"> **Update**</sup></span>
12+
5. Entwicklung / Einbau von neuen Skills
13+
6. Alexa-ThermostatController + Thermosensor
14+
7. Alexa-PowerController
15+
8. Alexa-BrightnessController
16+
9. Alexa-PowerLevelController
17+
10. Alexa-PercentageController
18+
11. Alexa-LockController
19+
12. Alexa-CameraStreamController <sup><span style="color:blue"> **Update**</sup></span>
20+
13. Alexa-SceneController
21+
14. Alexa-ContactSensor
22+
15. Alexa-ColorController
23+
16. Alexa-RangeController <sup><span style="color:red"> **Neu**</sup></span>
24+
17. Alexa-ColorTemperaturController <sup><span style="color:red"> **Neu**</sup></span>
25+
18. Alexa-PlaybackController <sup><span style="color:red"> **Neu**</sup></span>
26+
19. Web-Interface <sup><span style="color:red"> **Neu**</sup></span>
27+
28+
29+
30+
## Beispiel-Konfigurationen <sup><span style="color:red"> **Neu**</sup></span>
31+
32+
33+
- der fast perfekte Rolladen <sup><span style="color:red"> **Neu**</sup></span>
34+
- Items in Abhängikeit des letzten benutzten Echos-Devices schalten<sup><span style="color:red"> **Neu**</sup></span>
3535
# --------------------------------------
3636

3737
## Generell <a name="generell"/></a>
@@ -1030,7 +1030,7 @@ Default-Wert ist : RGB
10301030
Die Helligkeit wird bei Farbwechsel unverändert beibehalten. Bei HSB-Werten wird der ursprüngliche Wert gepuffert und als aktueller Wert wieder an das Item übergeben.
10311031

10321032
Zum Wechseln der Helligkeit einen BrightnessController hinzufügen
1033-
Details siehe [BrightnessController](#BrightnessController)
1033+
Details siehe BrightnessController
10341034
Beispiel Konfiguration (wobei R_Wert, G_Wert, B_Wert für die Gruppenadressen stehen :
10351035
<pre><code>
10361036
%YAML 1.1

0 commit comments

Comments
 (0)