diff --git a/README.md b/README.md index d26e022326d..9931eb79cf8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ It is currently able to do the following things: * Open a url in the default browser at the host machine * Simulate key presses on the host for Play/Pause, Next track, Prev track, Volume up, Volume Down * Support for remoting Home Assistant instances through a Python API - * Android Tasker project to control Home Assistant from your phone and report charging state. ![screenshot-states](https://raw.github.com/balloob/home-assistant/master/docs/states.png) @@ -34,12 +33,12 @@ Installation instructions / Quick-start guide --------------------------------------------- * The core depends on [PyEphem](http://rhodesmill.org/pyephem/) and [Requests](http://python-requests.org). Depending on the built-in components you would like to use you will need [PHue](https://github.com/studioimaginaire/phue) for Philips Hue support and [PyChromecast](https://github.com/balloob/pychromecast) for Chromecast support. Install these using `pip3 install pyephem requests phue pychromecast`. * Clone the repository and pull in the submodules `git clone --recursive https://github.com/balloob/home-assistant.git` -* In the config directory, copy home-assistant.conf.default to home-assistant.conf and adjust the config values to match your setup. +* In the config directory, copy `home-assistant.conf.default` to `home-assistant.conf` and adjust the config values to match your setup. * For routers running Tomato you will have to not only setup your host, username and password but also a http_id. The http_id can be retrieved by going to the admin console of your router, view the source of any of the pages and search for `http_id`. * If you want to use Hue, setup PHue by running `python -m phue --host HUE_BRIDGE_IP_ADDRESS --config-file-path phue.conf` from the commandline inside your config directory and follow the instructions. * While running the script it will create and maintain a file called `known_devices.csv` which will contain the detected devices. Adjust the track variable for the devices you want the script to act on and restart the script or call the service `device_tracker/reload_devices_csv`. -Done. Start it now by running `python3 start.py` +Done. Start it now by running `python3 start.py` and point your browser at http://localhost:8123 . Customizing Home Assistant ---------------------------- @@ -332,14 +331,8 @@ If your client does not support DELETE HTTP requests you can add an optional att } ``` -Android remote control ----------------------- - -An app has been built using [Tasker for Android](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm) that: - - * Provides buttons to control the lights and the chromecast - * Reports the charging state and battery level of the phone - -The [APK](https://raw.github.com/balloob/home-assistant/master/android-tasker/Home_Assistant.apk) and [Tasker project XML](https://raw.github.com/balloob/home-assistant/master/android-tasker/Home_Assistant.prj.xml) can be found in [/android-tasker/](https://github.com/balloob/home-assistant/tree/master/android-tasker) - -![screenshot-android-tasker.jpg](https://raw.github.com/balloob/home-assistant/master/docs/screenshot-android-tasker.png) +Related projects +---------------- +[HA API client in Ruby](https://github.com/balloob/home-assistant-ruby) +[HA API client for Tasker for Android](https://github.com/balloob/home-assistant-android-tasker) +[HA Docker image](https://github.com/balloob/docker-home-assistant) diff --git a/android-tasker/Home_Assistant.apk b/android-tasker/Home_Assistant.apk deleted file mode 100644 index eb1d70c03f7..00000000000 Binary files a/android-tasker/Home_Assistant.apk and /dev/null differ diff --git a/android-tasker/Home_Assistant.prj.xml b/android-tasker/Home_Assistant.prj.xml deleted file mode 100644 index 668111e1c9f..00000000000 --- a/android-tasker/Home_Assistant.prj.xml +++ /dev/null @@ -1,871 +0,0 @@ - - 1080.0,1776.0 - - 1380613730755 - true - 1382769497429 - 25 - 23 - 20 - HA Power USB - 10 - - 10 - - - - - 1380613730755 - true - 1383003483161 - 26 - 22 - 20 - HA Power Wireless - 10 - - 10 - - - - - 1380613730755 - true - 1383003498566 - 3 - 10 - 20 - HA Power AC - 10 - - 10 - - - - - 1380496514959 - 1500 - true - 1382769618501 - 5 - 19 - HA Battery Changed - - 203 - 0 - - - - 1381110247781 - Home Assistant - 3,25,26,5 - Variable Query,Home Assistant Start - 20,19,9,24,4,8,22,10,30,31,16,6,15,35,13,23,14,11,12,7,28,32,29 - - 12 - nl.paulus.homeassistant - 1.2 - 16 - - - cust_animal_penguin - - - - 1381113309678 - 1381162068611 - -1 - 688 - Home Assistant Start - -1 - 523 - - 4 - 0,17,523,107,-1,-1,-1,-1 - TextTitle - Home Assistant - - - #FFFFFFFF - - - - - - 4 - 23,136,477,514,-1,-1,-1,-1 - 13 - Menu1 - - - - - - 1381113396824 - 1381113396824 - -1 - 100 - Builtin Item Layout - -1 - 440 - - 5 - 340,10,90,80,-1,-1,-1,-1 - Icon - - hd_aaa_ext_tiles_small - - - - - 5 - 60,10,270,80,-1,-1,-1,-1 - Label - - - - #FFFFFFFF - - - - - - 1 - 10,10,40,80,-1,-1,-1,-1 - Index - 1. - - - #FFFFFFFF - - - - - - - - #00000000 - - Builtin Item Layout - - - - - - - - - - 4 - -1,-1,-1,-1,-1,-1,-1,-1 - - - #77333333 - #77333333 - - #FF000000 - - - - - - - 130 - Light On - - - - - - - - hd_aaa_ext_sun - - - - - - 130 - Light Off - - - - - - - - hd_device_access_bightness_low - - - - - - 130 - Start Fireplace - - - - - - - - hd_aaa_ext_coffee - - - - - - 130 - Start Epic Sax - - - - - - - - hd_aaa_ext_guitar - - - - - - 130 - Setup - - - - - - - - hd_action_settings - - - - - - - #DA000000 - - Home Assistant Start - - - - - - - 1381112175910 - 1381112254701 - -1 - 380 - Variable Query - -1 - 440 - - 4 - 8,0,432,96,8,0,432,96 - Title - Title - - - #FF0099CC - - - - - - 5 - 0,96,440,4,-1,-1,-1,-1 - Header - - #77333333 - #77333333 - - #FF000000 - - - - - 13 - 20,156,400,96,-1,-1,-1,-1 - TextEdit1 - - - - #FFFFFFFF - - - - - - 5 - 0,300,440,4,-1,-1,-1,-1 - Footer - - #77333333 - #77333333 - - #FF000000 - - - - - -936 - 4 - 70,300,80,80,-1,-1,-1,-1 - Accept - - hd_navigation_accept - - - - - -936 - 4 - 290,300,80,80,-1,-1,-1,-1 - Cancel - - hd_content_remove - - - - - - - #FF000000 - - Variable Query - - - - - - - 1380613530339 - 1383030846230 - 10 - Charging AC - - 130 - _Update Charging - - - ac - - - - - - 1381110672417 - 1384035370683 - 11 - Open Debug Interface - 10 - - 104 - http://%HA_HOST:%HA_PORT/?api_password=%HA_API_PASSWORD - - - - 1381113015963 - 1384219718372 - 12 - Start Screen - 10 - - 47 - Home Assistant Start - - - - - - - - - 49 - Home Assistant Start - - - cust_animal_penguin - - - - 1381114398467 - 1381114398467 - 13 - 11 - - 49 - %tap_label - 2 - Settings - Home Assistant Start - - - - 1381114829583 - 1385537340259 - 14 - API Fire Event - 10 - - 116 - %HA_HOST:%HA_PORT - /api/events/%par1 - api_password=%HA_API_PASSWORD - - - - - - - 548 - Fired event %par1 - - - - - 1380262442154 - 1386787405570 - 15 - Light On - 10 - - 130 - API Call Service - - - light/turn_on - - - - - hd_aaa_ext_sun - - - - 1380262442154 - 1385172575157 - 16 - Start Epic Sax - 10 - - 130 - API Call Service - - - chromecast/start_epic_sax - - - - - hd_aaa_ext_guitar - - - - 1380262442154 - 1386695312804 - 19 - Update Battery - 10 - - 547 - - %HA_CHARGING - 10 - - %HA_CHARGING - none - - - - - 116 - %HA_HOST:%HA_PORT - /api/states/devices.%HA_DEVICE_NAME.charging - api_password=%HA_API_PASSWORD -new_state=%HA_CHARGING -attributes={"battery":%BATT} - - - - - - - - 1380613530339 - 1386695398714 - 20 - Charging None - 10 - - 130 - _Update Charging - - - none - - - - - - 1380613530339 - 1383030909347 - 22 - Charging Wireless - - 130 - _Update Charging - - - wireless - - - - - - 1380613530339 - 1383030849758 - 23 - Charging USB - - 130 - _Update Charging - - - usb - - - - - - 1381114829583 - 1385537314797 - 24 - API Call Service - 10 - - 116 - %HA_HOST:%HA_PORT - /api/services/%par1 - api_password=%HA_API_PASSWORD - - - - - - - 548 - Called service %par1 - - - - - 1384035383644 - 1385172806993 - 28 - Volume Down - 10 - - 130 - API Call Service - - - keyboard/volume_down - - - - - hl_images_rotate_left - - - - 1384035383644 - 1385172552470 - 29 - Play Pause - 10 - - 130 - API Call Service - - - keyboard/media_play_pause - - - - - hl_av_pause - - - - 1384035383644 - 1385172803463 - 30 - Volume Mute Toggle - 10 - - 130 - API Call Service - - - keyboard/volume_mute - - - - - hl_device_access_volume_muted - - - - 1384035383644 - 1385172559562 - 31 - Next Track - 10 - - 130 - API Call Service - - - keyboard/media_next_track - - - - - hl_av_next - - - - 1384035383644 - 1385172567948 - 32 - Prev Track - 10 - - 130 - API Call Service - - - keyboard/media_prev_track - - - - - hl_av_previous - - - - 1381114829583 - 1385537324133 - 35 - API Call Service With Data - 10 - - 116 - %HA_HOST:%HA_PORT - /api/services/%par1 - api_password=%HA_API_PASSWORD -service_data=%par2 - - - - - - - 548 - Called service %par1 - - - - - 1380262442154 - 1386787393520 - 4 - Light Off - 10 - - 130 - API Call Service - - - light/turn_off - - - - - hl_device_access_bightness_low - - - - 1380522560890 - 1383958813434 - 6 - Setup - 10 - - 118 - %HA_HOST - 10 - - icanhazip.com - - - - - - %HA_HOST - - - 547 - %HA_HOST - 10 - - %HA_HOST - %HTTPD - - - - - 547 - %HA_PORT - 10 - - %HA_PORT - 8123 - - - - - 547 - %HA_API_PASSWORD - 10 - - %HA_API_PASSWORD - My password - - - - - 547 - %HA_DEVICE_NAME - 10 - - %HA_DEVICE_NAME - %DEVMOD - - - - - 595 - Host - %HA_HOST - - %HA_HOST - - Variable Query - - - - - 595 - Port - %HA_PORT - - %HA_PORT - %HA_PORT - Variable Query - - - - - 595 - API Password - %HA_API_PASSWORD - - %HA_API_PASSWORD - - Variable Query - - - - - 595 - - Device name - %HA_DEVICE_NAME - - %HA_DEVICE_NAME - - Variable Query - - - - - hd_ab_action_settings - - - - 1384035383644 - 1386787431769 - 7 - Volume Up - 10 - - 130 - API Call Service - - - keyboard/volume_up - - - - - hl_images_rotate_right - - - - 1380262442154 - 1386695263222 - 8 - _Update Charging - 10 - - 547 - %HA_CHARGING - %par1 - - - - - 130 - Update Battery - - - - - - - - - 1380262442154 - 1386787379497 - 9 - Start Fireplace - 10 - - 130 - API Call Service - - - chromecast/start_fireplace - - - - - hd_aaa_ext_coffee - - - diff --git a/docs/screenshot-android-tasker.png b/docs/screenshot-android-tasker.png deleted file mode 100644 index ebc81c9a2ac..00000000000 Binary files a/docs/screenshot-android-tasker.png and /dev/null differ