-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[amazonechocontrol] Initial contribution for the Amazon Echo Control Binding (#3083) #3087
Merged
kaikreuzer
merged 59 commits into
openhab:master
from
mgeramb:3083-AmazonControlBinding
May 24, 2018
Merged
Changes from 57 commits
Commits
Show all changes
59 commits
Select commit
Hold shift + click to select a range
7d97f67
[amazonechocontrol] Initial commit for the Amazon Control Binding (#3…
c73afb9
[amazonechocontrol] bugfixes, support of amzon.co.uk accounts
3812b09
[amazonechocontrol] package dependencies fixed, readme changed
92a04d7
[amazonechocontrol] fix duplicate line in manifest
7cc41ba
[amazonechocontrol] german translations and thing-types cleanup
a14859c
[amazonechocontrol] improve logging, correct copyrights, create speci…
6e1941e
[amazonechocontrol] fix spelling, fix wrong copyright header
dffe04c
[amazonechocontrol] fix null annotation, fix wrong licence in copyright
adec353
[amazonechocontrol] fix problems with redirects to insecure sites and…
7f5cfa1
[amazonechocontrol] code cleanup
5e5b913
[amazonechocontrol] bugfix configuration update, better error handlin…
3d2dfe2
[amazonechocontrol] new channels, new thing types, dynamic state pro…
7acb509
[amazonechocontrol] fix wrong readme item sample
d42b52e
[amazonechocontrol]
b3148a8
[amazonechocontrol]
a48e1fa
[amazonechocontrol]
9229be2
[amazonechocontrol]
0664c0e
[amazonechocontrol]
d31595b
[amazonechocontrol]
cbdcf76
[amazonechocontrol]
e83e845
Merge branch 'master' of https://github.com/openhab/openhab2-addons i…
6fbf8ea
[amazonechocontrol]
2ca24c8
[amazonechocontrol]
e90b9f4
[amazonechocontrol]
87bfddb
[amazonechocontrol]
011734a
[amazonechocontrol]
b0d7cc5
[amazonechocontrol]
52ca33e
[amazonechocontrol]
0752d68
[amazonechocontrol]
c7dd651
[amazonechocontrol]
6945fdd
[amazonechocontrol]
5cae50f
[amazonechocontrol]
edc38e3
[amazonechocontrol]
339b5e3
[amazonechocontrol]
563bdba
[amazonechocontrol]
e8d8f2f
[amazonechocontrol]
bf57fac
[amazonechocontrol]
0246673
[amazonechocontrol]
ae0346e
[amazonechocontrol]
05978c1
[amazonechocontrol]
53046c2
[amazonechocontrol]
6d590f0
[amazonechocontrol]
d0b21f3
[amazonechocontrol]
19c7d53
[amazonechocontrol]
cf8b5dc
[amazonechocontrol]
c2dfa61
[amazonechocontrol]
90fc5d3
[amazonechocontrol]
b7332a8
[amazonechocontrol]
5a95a10
[amazonechocontrol]
4d7c603
[amazonechocontrol]
e53330e
[amazonechocontrol]
8c3913c
[amazonechocontrol]
296dbf4
[amazonechocontrol]
7103e62
[amazonechocontrol]
19a430f
[amazonechocontrol]
c93df72
[amazonechocontrol]
22bdc27
[amazonechocontrol]
eede1de
[amazonechocontrol]
d03fdb8
[amazonechocontrol]
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
addons/binding/org.openhab.binding.amazonechocontrol/.classpath
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<classpath> | ||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> | ||
<attributes> | ||
<attribute name="module" value="true"/> | ||
</attributes> | ||
</classpathentry> | ||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | ||
<classpathentry kind="src" path="src/main/java"/> | ||
<classpathentry kind="output" path="target/classes"/> | ||
<classpathentry kind="lib" path="lib/jsoup-1.10.1.jar"/> | ||
</classpath> |
33 changes: 33 additions & 0 deletions
33
addons/binding/org.openhab.binding.amazonechocontrol/.project
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<projectDescription> | ||
<name>org.openhab.binding.amazonechocontrol</name> | ||
<comment></comment> | ||
<projects> | ||
</projects> | ||
<buildSpec> | ||
<buildCommand> | ||
<name>org.eclipse.jdt.core.javabuilder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
<buildCommand> | ||
<name>org.eclipse.pde.ManifestBuilder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
<buildCommand> | ||
<name>org.eclipse.pde.SchemaBuilder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
<buildCommand> | ||
<name>org.eclipse.pde.ds.core.builder</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
</buildSpec> | ||
<natures> | ||
<nature>org.eclipse.pde.PluginNature</nature> | ||
<nature>org.eclipse.jdt.core.javanature</nature> | ||
</natures> | ||
</projectDescription> |
9 changes: 9 additions & 0 deletions
9
addons/binding/org.openhab.binding.amazonechocontrol/ESH-INF/binding/binding.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<binding:binding xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
id="amazonechocontrol" xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd"> | ||
|
||
<name>Amazon Echo Control Binding</name> | ||
<description>Binding to control Amazon Echo devices (Alexa). This binding enables openHAB to control the volume, playing state, bluetooth connection of your amazon echo devices or allow to use it as TTS device.</description> | ||
<author>Michael Geramb</author> | ||
|
||
</binding:binding> |
135 changes: 135 additions & 0 deletions
135
...inding/org.openhab.binding.amazonechocontrol/ESH-INF/i18n/amazonechocontrol_de.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,135 @@ | ||
# binding | ||
binding.amazonechocontrol.name = Amazon Echo Steuerung Binding | ||
binding.amazonechocontrol.description = Binding zum Steuern von Amazon Echo (Alexa). Dieses Binding erm�glicht openHAB die Lautst�rke, den Wiedergabe Status und die Bluetooth-Verbindung des Amazon Echo Ger�tes zu steuern oder als TTS Ger�t zu benutzen. | ||
|
||
# thing types | ||
|
||
thing-type.amazonechocontrol.account.label = Amazon Konto | ||
thing-type.amazonechocontrol.account.description = Amazon Konto bei dem die Amazon Echo Ger�te registriert sind. Hinweis: 2 Faktor Authentifizierung ist nicht unterst�tzt. | ||
|
||
thing-type.config.amazonechocontrol.account.amazonSite.label = Amazon Seite | ||
thing-type.config.amazonechocontrol.account.amazonSite.description = Amazon Seite bei der das Amazon Konto erstellt wurde. Hinweis: 2 Faktor Authentifizierung ist nicht unterst�tzt. | ||
|
||
thing-type.config.amazonechocontrol.account.email.label = Amazon Konto E-Mail | ||
thing-type.config.amazonechocontrol.account.email.description = E-Mail des Amazon Konto welches f�r die Amazon Echo Ger�te verwendet wurde. | ||
|
||
thing-type.config.amazonechocontrol.account.password.label = Amazon Konto Kennwort | ||
thing-type.config.amazonechocontrol.account.password.description = Kennwort des Amazon Konto welches f�r die Amazon Echo Ger�te verwendet wurde. WICHTIG: Sollte das Account-Thing nicht Online gehen und einen Login-Fehler melden, die URL YOUR_OPENHAP/amazonechocontrol/ID_OF_THIS_THING im Browser (Z.B.: http://openhab:8080/amazonechocontrol/account) �ffnen und anmelden versuchen. | ||
|
||
thing-type.config.amazonechocontrol.account.pollingIntervalInSeconds.label = Status-Aktualisierungs-Intervall | ||
thing-type.config.amazonechocontrol.account.pollingIntervalInSeconds.description = Aktualtisierungs-Intervall f�r den Status in Sekunden. Kleinere Zeiten verursachen h�heren Netzwerkverkehr. | ||
|
||
thing-type.amazonechocontrol.echo.label = Amazon Echo | ||
thing-type.amazonechocontrol.echo.description = Amazon Echo Ger�t (Amazon Echo, Amazon Echo Dot, Amazon Echo Plus...) | ||
|
||
thing-type.config.amazonechocontrol.echo.serialNumber.label = Seriennummer | ||
thing-type.config.amazonechocontrol.echo.serialNumber.description = Die Seriennummer des Ger�ts aus der Alexa App | ||
|
||
thing-type.amazonechocontrol.echospot.label = Amazon Echo Spot | ||
thing-type.amazonechocontrol.echospot.description = Amazon Echo Spot Ger�t | ||
|
||
thing-type.config.amazonechocontrol.echospot.serialNumber.label = Seriennummer | ||
thing-type.config.amazonechocontrol.echospot.serialNumber.description = Die Seriennummer des Ger�ts aus der Alexa App | ||
|
||
thing-type.amazonechocontrol.echoshow.label = Amazon Echo Show | ||
thing-type.amazonechocontrol.echoshow.description = Amazon Echo Show Ger�t | ||
|
||
thing-type.config.amazonechocontrol.echoshow.serialNumber.label = Seriennummer | ||
thing-type.config.amazonechocontrol.echoshow.serialNumber.description = Die Seriennummer des Ger�ts aus der Alexa App | ||
|
||
thing-type.amazonechocontrol.wha.label = Amazon Multi-Raum Musik | ||
thing-type.amazonechocontrol.wha.description = Multi-Raum Musik Steuerung | ||
|
||
thing-type.config.wha.echoshow.serialNumber.label = Seriennummer | ||
thing-type.config.wha.echoshow.serialNumber.description = Die Seriennummer des Ger�ts aus der Alexa App | ||
|
||
thing-type.amazonechocontrol.flashbriefingprofile.label = T�gliche Zusammenfassungsprofile | ||
thing-type.amazonechocontrol.flashbriefingprofile.description = Speichert und l�d eine T�gliches Zusammenfassungskonfiguration | ||
|
||
# channel types | ||
channel-type.amazonechocontrol.bluetoothDeviceName.label = Bluetooth Ger�t | ||
channel-type.amazonechocontrol.bluetoothDeviceName.description = Verbundenes Bluetoothger�t | ||
|
||
channel-type.amazonechocontrol.radioStationId.label = TuneIn Radio Stations ID | ||
channel-type.amazonechocontrol.radioStationId.description = ID der Radio Station | ||
|
||
channel-type.amazonechocontrol.amazonMusicTrackId.label = Amazon Music Lied ID | ||
channel-type.amazonechocontrol.amazonMusicTrackId.description = ID des Liedes auf Amazon Music | ||
|
||
channel-type.amazonechocontrol.amazonMusic.label = Amazon Music | ||
channel-type.amazonechocontrol.amazonMusic.description = Amazon Music eingeschaltet | ||
|
||
channel-type.amazonechocontrol.amazonMusicPlayListId.label = Amazon Music Playlist ID | ||
channel-type.amazonechocontrol.amazonMusicPlayListId.description = ID der Playlist auf Amazon Music (Nur schreiben, kein aktueller Status). | ||
|
||
channel-type.amazonechocontrol.providerDisplayName.label = Anbieter Name | ||
channel-type.amazonechocontrol.providerDisplayName.description = Name des Musikanbieters | ||
|
||
channel-type.amazonechocontrol.bluetoothMAC.label = Bluetooth Verbindung | ||
channel-type.amazonechocontrol.bluetoothMAC.description = MAC-Adresse des verbundenen Bluetoothger�tes | ||
|
||
channel-type.amazonechocontrol.textToSpeech.label = Sprich | ||
channel-type.amazonechocontrol.textToSpeech.description = Spricht den Text (Nur schreiben) | ||
|
||
channel-type.amazonechocontrol.remind.label = Erinnere | ||
channel-type.amazonechocontrol.remind.description = Spricht die Erinnerung und sendet eine Benachrichtigung an die Alexa-APP (Nur schreiben) | ||
|
||
channel-type.amazonechocontrol.playAlarmSound.label = Spielt Alarm Sound | ||
channel-type.amazonechocontrol.playAlarmSound.description = Spielt Alarm Sound ab (Nur schreiben) | ||
|
||
channel-type.amazonechocontrol.startRoutine.label = Started eine Routine | ||
channel-type.amazonechocontrol.startRoutine.description = Befehl der zu Alexa gesprochen werden muss um eine Routine zu starten, ohne "Alexa" vorangestellt (Nur schreiben) | ||
|
||
channel-type.amazonechocontrol.musicProviderId.label = Musikanbieter | ||
channel-type.amazonechocontrol.musicProviderId.description = Musikanbieter | ||
|
||
channel-type.amazonechocontrol.playMusicVoiceCommand.label = Musik Sprachbefehl | ||
channel-type.amazonechocontrol.playMusicVoiceCommand.description = Sprachbefehl als Text. Z.B. Yesterday von Beatles (Nur schreiben) | ||
|
||
channel-type.amazonechocontrol.imageUrl.label = Bild URL | ||
channel-type.amazonechocontrol.imageUrl.description = URL des Album Covers oder des Radiostations Logos | ||
|
||
channel-type.amazonechocontrol.title.label = Titel | ||
channel-type.amazonechocontrol.title.description = Titel | ||
|
||
channel-type.amazonechocontrol.subtitle1.label = Untertitel 1 | ||
channel-type.amazonechocontrol.subtitle1.description = Untertitel 1 | ||
|
||
channel-type.amazonechocontrol.subtitle2.label = Untertitel 2 | ||
channel-type.amazonechocontrol.subtitle2.description = Untertitel 2 | ||
|
||
channel-type.amazonechocontrol.radio.label = TuneIn Radio | ||
channel-type.amazonechocontrol.radio.description = Radio eingeschaltet | ||
|
||
channel-type.amazonechocontrol.bluetooth.label = Bluetooth Verbindung | ||
channel-type.amazonechocontrol.bluetooth.description = Verbindet zum letzten benutzten Bluetooth Ger�tes | ||
|
||
channel-type.amazonechocontrol.loop.label = Wiederholung | ||
channel-type.amazonechocontrol.loop.description = Wiederholung | ||
|
||
channel-type.amazonechocontrol.shuffle.label = Zufall | ||
channel-type.amazonechocontrol.shuffle.description = Zufallswiedergabe | ||
|
||
channel-type.amazonechocontrol.player.label = Musikwiedergabe | ||
channel-type.amazonechocontrol.player.description = Musikwiedergabe | ||
|
||
channel-type.amazonechocontrol.volume.label = Lautst�rke | ||
channel-type.amazonechocontrol.volume.description = Wiedergabelautst�rke | ||
|
||
channel-type.amazonechocontrol.save.label = Speichern | ||
channel-type.amazonechocontrol.save.description = Speichert die aktuelle t�gliche Zusammenfassung Konfiguration (Nur schreiben) | ||
|
||
channel-type.amazonechocontrol.active.label = Aktiv | ||
channel-type.amazonechocontrol.active.description = Aktiviert diese t�gliche Zusammenfassung Konfiguration | ||
|
||
channel-type.amazonechocontrol.playOnDevice.label = Wiedergabe am Ger�t | ||
channel-type.amazonechocontrol.playOnDevice.description = Started die Wiedergabe am Ger�t (Seriennummer oder Name, nur schreiben) | ||
|
||
channel-type.amazonechocontrol.playCommand.label = Started | ||
channel-type.amazonechocontrol.playCommand.description = Started Information (Nur schreiben) | ||
channel-type.amazonechocontrol.playCommand.option.Weather = Wetter | ||
channel-type.amazonechocontrol.playCommand.option.Traffic = Verkehr | ||
channel-type.amazonechocontrol.playCommand.option.GoodMorning = Guten Morgen | ||
channel-type.amazonechocontrol.playCommand.option.SingASong = Lied | ||
channel-type.amazonechocontrol.playCommand.option.TellStory = Geschichte | ||
channel-type.amazonechocontrol.playCommand.option.TellStory = Zusammenfassung |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the translation for echoshow.serialNumber is missing