jeans/home-assistant.io
jeans/home-assistant.io
1
0
Fork 0
mirror of https://github.com/home-assistant/home-assistant.io.git synced 2025-07-23 17:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Paulus Schoutsen 2017-11-02 09:34:32 -07:00
parent 2581fb1bcd
commit 005f777bda
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/_components/sensor.sytadin.markdown
View File

@ -27,15 +27,8 @@ Configuration variables:
- **name** (*Optional*): Additional name for the sensors. Default to platform name. - **name** (*Optional*): Additional name for the sensors. Default to platform name.
- **monitored_conditions** array (*Optional*): Conditions to display in the frontend. Defaults to `traffic_jam`. - **monitored_conditions** array (*Optional*): Conditions to display in the frontend. Defaults to `traffic_jam`.
<<<<<<< HEAD
- **traffic_jam**: Amount of kilometers in traffic jam (km). - **traffic_jam**: Amount of kilometers in traffic jam (km).
- **mean_velocity**: Mean velocity (km/h). - **mean_velocity**: Mean velocity (km/h).
- **congestion**: Index of congestion (n/a). - **congestion**: Index of congestion (n/a).
=======
- **traffic_jam**: A human-readable text summary.
- **mean_velocity**: The current temperature.
- **congestion**: The wind speed.
>>>>>>> current
The data is coming from the [Direction des routes Île-de-France (DiRIF)](http://www.sytadin.fr). The data is coming from the [Direction des routes Île-de-France (DiRIF)](http://www.sytadin.fr).