Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	kodi/__init__.py
#	kodi/plugin.yaml
#	kodi/user_doc.rst
#	stateengine/StateEngineItem.py
  • Loading branch information
msinn committed Jan 28, 2024
2 parents 5c96886 + df3e12f commit 7e00e4e
Show file tree
Hide file tree
Showing 855 changed files with 90,531 additions and 30,625 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/builddevdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
- run: sudo apt-get install libudev-dev
- run: sudo apt-get install librrd-dev libpython3-dev
- run: sudo apt-get install gcc --only-upgrade
- run: sudo locale-gen de_DE.UTF-8
- run: locale -a
- uses: actions/checkout@v2
- name: Checkout SmartHomeNG DEVELOP Branch
uses: actions/checkout@v2
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/buildreleasedoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ '3.8' ]
python-version: [ '3.9' ]
name: Python ${{ matrix.python-version }}
steps:
- name: update OS (Ubuntu)
run: sudo apt-get update
- run: sudo apt-get install libudev-dev
- run: sudo apt-get install librrd-dev libpython3-dev
- run: sudo apt-get install gcc --only-upgrade
- run: sudo locale-gen de_DE.UTF-8
- run: locale -a
- uses: actions/checkout@v2
- name: Checkout SmartHomeNG DEVELOP Branch
uses: actions/checkout@v2
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12' ]
name: Python ${{ matrix.python-version }}
steps:
- name: Setup OS (Ubuntu)
Expand All @@ -42,15 +42,19 @@ jobs:
echo github.pull_request.base.ref '${{ github.pull_request.base.ref }}'
echo steps.extract_branch.outputs.branch '${{ steps.extract_branch.outputs.branch }}'
- name: Checkout core from branch '${{ steps.extract_branch.outputs.branch }}' (for push)
if: github.event_name != 'pull_request'
- name: Check if branch '${{ steps.extract_branch.outputs.branch }}' exists in smarthomeNG/smarthome
run: echo "code=$(git ls-remote --exit-code --heads https://github.com/smarthomeNG/smarthome ${{ steps.extract_branch.outputs.branch }} > /dev/null; echo $? )" >>$GITHUB_OUTPUT
id: shng_branch_check

- name: Checkout core from branch '${{ steps.extract_branch.outputs.branch }}' (for push on known smarthomeNG/smarthome branch)
if: github.event_name != 'pull_request' && steps.shng_branch_check.outputs.code == '0'
uses: actions/checkout@v3
with:
repository: smarthomeNG/smarthome
ref: ${{ steps.extract_branch.outputs.branch }}

- name: Checkout core from branch 'develop' (for pull request)
if: github.event_name == 'pull_request'
- name: Checkout core from branch 'develop' (for pull request or push on unknown smarthomeNG/smarthome branch)
if: github.event_name == 'pull_request' || steps.shng_branch_check.outputs.code == '2'
uses: actions/checkout@v3
with:
repository: smarthomeNG/smarthome
Expand All @@ -59,7 +63,7 @@ jobs:
- name: Checkout plugins from branch '${{steps.extract_branch.outputs.branch}}'
uses: actions/checkout@v3
with:
repository: smarthomeNG/plugins
repository: ${{ github.repository_owner }}/plugins
ref: ${{steps.extract_branch.outputs.branch}}
path: plugins

Expand All @@ -70,6 +74,8 @@ jobs:
architecture: x64
- run: python3 -m pip install --upgrade pip

- name: Install setuptools (needed for Python 3.12)
run: pip install setuptools
- name: Install requirements for unit testing
run: pip install -r tests/requirements.txt
- name: Build Requirements for SmartHomeNG
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ ehthumbs.db
Thumbs.db

# don't upload private plugins
/priv_*
/priv_*/

# don't upload plugins loaded from develop to a release installation
/*_dev/

# Pycharm settings
/.idea
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "roombapysh/roombapy"]
path = roombapysh/roombapy
url = https://github.com/Pacifica15/roombapy.git
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,18 @@
![Github Tag](https://img.shields.io/github/tag/smarthomeNG/smarthome.svg)
![Made with Python](https://img.shields.io/badge/made%20with-python-blue.svg)
[![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)
[![Build Status on TravisCI](https://travis-ci.com/smarthomeNG/plugins.svg?branch=master)](https://travis-ci.com/smarthomeNG/plugins)


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

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

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

## Aktueller Status der Entwicklung

[![Aktuelle Entwicklung](https://travis-ci.com/smarthomeNG/plugins.svg?branch=develop)](https://travis-ci.com/smarthomeNG/plugins)


Es gibt eine stetig aktualisierte [Dokumentation für Entwickler](https://smarthomeng.github.io/dev_doc/).

## Other languages

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.
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.
2 changes: 1 addition & 1 deletion __init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def plugin_release():
return '1.9.5'
return '1.10.0'

def plugin_branch():
return 'master'
Expand Down
58 changes: 29 additions & 29 deletions alexa4p3/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@ Alexa4PayloadV3

## Table of Content

1. [Generell](#generell)
2. [Change Log](#changelog)
3. [Requrirements](#requirements)<br>
[Einrichtung Amazon-Skill / Lambda-Funktion](#Skill)<sup><span style="color:red"> **Neu**</sup></span>
4. [Icon / Display Categories](#Icons)<sup><span style="color:blue"> **Update**</sup></span>
5. [Entwicklung / Einbau von neuen Skills](#Entwicklung)
6. [Alexa-ThermostatController](#ThermostatController) + [Thermosensor](#Thermostatsensor)
7. [Alexa-PowerController](#PowerController)
8. [Alexa-BrightnessController](#BrightnessController)
9. [Alexa-PowerLevelController](#PowerLevelController)
10. [Alexa-PercentageController](#PercentageController)
11. [Alexa-LockController](#LockController)
12. [Alexa-CameraStreamController](#CameraStreamController) <sup><span style="color:blue"> **Update**</sup></span>
13. [Alexa-SceneController](#SceneController)
14. [Alexa-ContactSensor](#ContactSensor)
15. [Alexa-ColorController](#ColorController)
16. [Alexa-RangeController](#RangeController) <sup><span style="color:red"> **Neu**</sup></span>
17. [Alexa-ColorTemperaturController](#ColorTemperaturController) <sup><span style="color:red"> **Neu**</sup></span>
18. [Alexa-PlaybackController](#PlaybackController) <sup><span style="color:red"> **Neu**</sup></span>
19. [Web-Interface](#webinterface) <sup><span style="color:red"> **Neu**</sup></span>



## [Beispiel-Konfigurationen](#Beispiel) <sup><span style="color:red"> **Neu**</sup></span>


- [der fast perfekte Rolladen](#perfect_blind) <sup><span style="color:red"> **Neu**</sup></span>
- [Items in Abhängikeit des letzten benutzten Echos-Devices schalten](#get_last_alexa)<sup><span style="color:red"> **Neu**</sup></span>
1. Generell
2. Change Log
3. Requrirements<br>
Einrichtung Amazon-Skill / Lambda-Funktion<sup><span style="color:red"> **Neu**</sup></span>
4. Icon / Display Categories<sup><span style="color:blue"> **Update**</sup></span>
5. Entwicklung / Einbau von neuen Skills
6. Alexa-ThermostatController + Thermosensor
7. Alexa-PowerController
8. Alexa-BrightnessController
9. Alexa-PowerLevelController
10. Alexa-PercentageController
11. Alexa-LockController
12. Alexa-CameraStreamController <sup><span style="color:blue"> **Update**</sup></span>
13. Alexa-SceneController
14. Alexa-ContactSensor
15. Alexa-ColorController
16. Alexa-RangeController <sup><span style="color:red"> **Neu**</sup></span>
17. Alexa-ColorTemperaturController <sup><span style="color:red"> **Neu**</sup></span>
18. Alexa-PlaybackController <sup><span style="color:red"> **Neu**</sup></span>
19. Web-Interface <sup><span style="color:red"> **Neu**</sup></span>



## Beispiel-Konfigurationen <sup><span style="color:red"> **Neu**</sup></span>


- der fast perfekte Rolladen <sup><span style="color:red"> **Neu**</sup></span>
- Items in Abhängikeit des letzten benutzten Echos-Devices schalten<sup><span style="color:red"> **Neu**</sup></span>
# --------------------------------------

## Generell <a name="generell"/></a>
Expand Down Expand Up @@ -1030,7 +1030,7 @@ Default-Wert ist : RGB
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.

Zum Wechseln der Helligkeit einen BrightnessController hinzufügen
Details siehe [BrightnessController](#BrightnessController)
Details siehe BrightnessController
Beispiel Konfiguration (wobei R_Wert, G_Wert, B_Wert für die Gruppenadressen stehen :
<pre><code>
%YAML 1.1
Expand Down
Loading

0 comments on commit 7e00e4e

Please sign in to comment.