Skip to content

Commit

Permalink
Adopt openhab-android repo name, fixes openhab#613
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Dietrich <[email protected]>
  • Loading branch information
Thomas Dietrich authored and Thomas Dietrich committed Jan 7, 2018
1 parent 5c7229b commit c4db6d7
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

$script = <<SCRIPT
sudo apt-get update
sudo apt-get install -y build-essential nodejs python-software-properties zlib1g-dev
sudo apt-get install -y build-essential nodejs python-software-properties zlib1g-dev dos2unix
sudo add-apt-repository -y ppa:git-core/ppa
sudo apt-add-repository -y ppa:brightbox/ruby-ng
sudo apt-get update
Expand Down
4 changes: 2 additions & 2 deletions addons/uis/apps/android.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: documentation
title: Android openHAB App
source: https://github.com/openhab/openhab.android/blob/master/docs/USAGE.md
source: https://github.com/openhab/openhab-android/blob/master/docs/USAGE.md
---

{% include base.html %}
Expand Down Expand Up @@ -54,7 +54,7 @@ If you want to use openHAB Android on a wall mounted tablet, go to settings and

## Help and Technical Details

Please refer to the [openhab.android project on GitHub](https://github.com/openhab/openhab.android) for more details.
Please refer to the [openhab-android project on GitHub](https://github.com/openhab/openhab-android) for more details.

## Trademark Disclaimer

Expand Down
2 changes: 1 addition & 1 deletion configuration/multimedia.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ If no voice or no audio sink is provided, the default voice and default audio si
Although there are already interfaces defined in openHAB for speech-to-text, up to now there is no add-on available for this functionality.
So the only choice that is available right now is to use the Android voice recognition feature that is built into the openHAB Android app.

The Android app is [not yet adapted to the openHAB 2 voice features](https://github.com/openhab/openhab.android/issues/242).
The Android app is [not yet adapted to the openHAB 2 voice features](https://github.com/openhab/openhab-android/issues/242).
To still use the voice feature you will need to have a String item with the name "VoiceCommand" defined, to which the app sends any recognized text as a string command.

### Human Language Interpreter
Expand Down
8 changes: 4 additions & 4 deletions invalidlinks.html
Original file line number Diff line number Diff line change
Expand Up @@ -767,10 +767,10 @@
summary="checked link" bgcolor="#fff7e5">
<tr>
<td bgcolor="#dcd5cf">URL</td>
<td bgcolor="#dcd5cf">`https://github.com/openhab/openhab.android/issues/242'</td></tr>
<td bgcolor="#dcd5cf">`https://github.com/openhab/openhab-android/issues/242'</td></tr>
<tr><td>Name</td><td>`not yet adapted to the openHAB 2 voice features'</td></tr>
<tr><td>Parent&nbsp;URL</td><td><a target="top" href="http://docs.openhab.org/configuration/multimedia.html">http://docs.openhab.org/configuration/multimedia.html</a>, line 1292, col 23</td></tr>
<tr><td>Real&nbsp;URL</td><td><a target="top" href="https://github.com/openhab/openhab.android/issues/242">https://github.com/openhab/openhab.android/issues/242</a></td></tr>
<tr><td>Real&nbsp;URL</td><td><a target="top" href="https://github.com/openhab/openhab-android/issues/242">https://github.com/openhab/openhab-android/issues/242</a></td></tr>
<tr><td>Check&nbsp;time</td><td>1.213 seconds</td></tr>
<tr><td bgcolor="#e0954e" valign="top">Warning</td><td bgcolor="#e0954e">Access denied by robots.txt, skipping content checks.</td></tr>
<tr><td bgcolor="#3ba557">Result</td><td bgcolor="#3ba557">Valid: 200 OK</td></tr>
Expand Down Expand Up @@ -4155,10 +4155,10 @@
summary="checked link" bgcolor="#fff7e5">
<tr>
<td bgcolor="#dcd5cf">URL</td>
<td bgcolor="#dcd5cf">`https://github.com/openhab/openhab.android'</td></tr>
<td bgcolor="#dcd5cf">`https://github.com/openhab/openhab-android'</td></tr>
<tr><td>Name</td><td>`openhab/android project on GitHub'</td></tr>
<tr><td>Parent&nbsp;URL</td><td><a target="top" href="http://docs.openhab.org/addons/uis/apps/android.html">http://docs.openhab.org/addons/uis/apps/android.html</a>, line 1247, col 24</td></tr>
<tr><td>Real&nbsp;URL</td><td><a target="top" href="https://github.com/openhab/openhab.android">https://github.com/openhab/openhab.android</a></td></tr>
<tr><td>Real&nbsp;URL</td><td><a target="top" href="https://github.com/openhab/openhab-android">https://github.com/openhab/openhab-android</a></td></tr>
<tr><td>Check&nbsp;time</td><td>0.715 seconds</td></tr>
<tr><td bgcolor="#e0954e" valign="top">Warning</td><td bgcolor="#e0954e">Access denied by robots.txt, skipping content checks.</td></tr>
<tr><td bgcolor="#3ba557">Result</td><td bgcolor="#3ba557">Valid: 200 OK</td></tr>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@
<outputDirectory>${basedir}/addons/uis/apps</outputDirectory>
<resources>
<resource>
<directory>${basedir}/${basedir}/.external-resources/openhab.android/docs</directory>
<directory>${basedir}/${basedir}/.external-resources/openhab-android/docs</directory>
<includes>
<include>images/*.png</include>
</includes>
Expand Down Expand Up @@ -445,7 +445,7 @@
<goal>copy</goal>
</goals>
<configuration>
<sourceFile>${basedir}/.external-resources/openhab.android/docs/USAGE.md</sourceFile>
<sourceFile>${basedir}/.external-resources/openhab-android/docs/USAGE.md</sourceFile>
<destinationFile>${basedir}/addons/uis/apps/android.md</destinationFile>
</configuration>
</execution>
Expand Down
2 changes: 1 addition & 1 deletion update-external-resources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pull_or_clone_repo "openhab-bundles" "openhab/openhab-bundles.git"
pull_or_clone_repo "openhabian" "openhab/openhabian.git"
pull_or_clone_repo "openhab-alexa" "openhab/openhab-alexa.git"
pull_or_clone_repo "openhab-mycroft" "openhab/openhab-mycroft.git"
pull_or_clone_repo "openhab.android" "openhab/openhab.android.git"
pull_or_clone_repo "openhab-android" "openhab/openhab-android.git"

echo_process "Updating submodules of the 'openhab-bundles' repo... "
git -C "$resourcefolder/openhab-bundles" submodule update --recursive --remote --init
Expand Down
2 changes: 1 addition & 1 deletion v2.1.0/addons/uis/apps/android.html
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ <h1 id="android-openhab-app">Android openHAB App</h1>

<p><strong>Help and technical details:</strong></p>

<p>Please refer to the <a href="https://github.com/openhab/openhab.android">openhab/android project on GitHub</a> for more details.</p>
<p>Please refer to the <a href="https://github.com/openhab/openhab-android">openhab/android project on GitHub</a> for more details.</p>

</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion v2.1.0/configuration/multimedia.html
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ <h3 id="speech-to-text">Speech-to-Text</h3>

<p>Although there are already interfaces defined in openHAB for speech-to-text, up to now there is no add-on available for this functionality.
So the only choice that is available right now is to use the Android voice recognition feature that is built into the openHAB Android app.
Currently, the Android app is <a href="https://github.com/openhab/openhab.android/issues/242">not yet adapted to the openHAB 2 voice features</a>, though - to use it, you will need to have a String item with the name “VoiceCommand” defined, to which the app sends any recognized text as a string command.</p>
Currently, the Android app is <a href="https://github.com/openhab/openhab-android/issues/242">not yet adapted to the openHAB 2 voice features</a>, though - to use it, you will need to have a String item with the name “VoiceCommand” defined, to which the app sends any recognized text as a string command.</p>

<h3 id="human-language-interpreter">Human Language Interpreter</h3>

Expand Down

0 comments on commit c4db6d7

Please sign in to comment.