|
14 | 14 | BATTERY_SOURCE, BATTERY, BATTERY_STATUS, BATTERY_UPDATE_TIME,
|
15 | 15 | DISTANCE, ZONE_DISTANCE, ZONE_DISTANCE_M, ZONE_DISTANCE_M_EDGE, HOME_DISTANCE,
|
16 | 16 | MAX_DISTANCE,CALC_DISTANCE, WAZE_DISTANCE, WAZE_METHOD,
|
17 |
| - TRAVEL_TIME, TRAVEL_TIME_MIN, DIR_OF_TRAVEL, |
| 17 | + TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME, DIR_OF_TRAVEL, |
18 | 18 | MOVED_DISTANCE, MOVED_TIME_FROM, MOVED_TIME_TO,
|
19 | 19 | DEVICE_STATUS,
|
20 | 20 | LAST_UPDATE, LAST_UPDATE_DATETIME,
|
21 | 21 | NEXT_UPDATE, NEXT_UPDATE_DATETIME,
|
22 | 22 | LAST_LOCATED, LAST_LOCATED_DATETIME,
|
23 | 23 | INFO, GPS_ACCURACY, ALTITUDE, VERTICAL_ACCURACY,
|
24 |
| - TFZ_ZONE_INFO, TFZ_DISTANCE, TFZ_ZONE_DISTANCE, TFZ_TRAVEL_TIME, |
25 |
| - TFZ_TRAVEL_TIME_MIN, TFZ_DIR_OF_TRAVEL, |
| 24 | + TFZ_ZONE_INFO, TFZ_DISTANCE, TFZ_ZONE_DISTANCE, TFZ_DIR_OF_TRAVEL, |
| 25 | + TFZ_TRAVEL_TIME,TFZ_TRAVEL_TIME_MIN, TFZ_TRAVEL_TIME_HHMM, TFZ_ARRIVAL_TIME, |
26 | 26 | TOWARDS, AWAY_FROM, TOWARDS_HOME, AWAY_FROM_HOME, INZONE, INZONE_HOME, INZONE_STATIONARY,
|
27 | 27 | SENSOR_EVENT_LOG_NAME, SENSOR_WAZEHIST_TRACK_NAME,
|
28 | 28 | )
|
|
38 | 38 | GPS_ACCURACY, ALTITUDE, VERTICAL_ACCURACY,
|
39 | 39 | ]
|
40 | 40 | SENSOR_LIST_TRACKING = [NEXT_UPDATE, LAST_UPDATE, LAST_LOCATED,
|
41 |
| - TRAVEL_TIME, TRAVEL_TIME_MIN, MOVED_DISTANCE, DIR_OF_TRAVEL, |
| 41 | + TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME, |
| 42 | + MOVED_DISTANCE, DIR_OF_TRAVEL, |
42 | 43 | WAZE_DISTANCE, CALC_DISTANCE,
|
43 | 44 | ZONE_DISTANCE, ZONE_DISTANCE_M, ZONE_DISTANCE_M_EDGE, HOME_DISTANCE,
|
44 | 45 | ZONE, ZONE_FNAME, ZONE_NAME, ZONE_DATETIME,
|
45 | 46 | LAST_ZONE, LAST_ZONE_FNAME, LAST_ZONE_NAME,
|
46 | 47 | ]
|
47 | 48 | SENSOR_LIST_TRACK_FROM_ZONE = [INFO, LAST_UPDATE, NEXT_UPDATE,
|
48 |
| - TRAVEL_TIME, TRAVEL_TIME_MIN, DIR_OF_TRAVEL, |
| 49 | + TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME, DIR_OF_TRAVEL, |
49 | 50 | ]
|
50 | 51 | SENSOR_LIST_LOC_UPDATE =[TRIGGER, INTERVAL,
|
51 | 52 | NEXT_UPDATE, LAST_UPDATE, LAST_LOCATED,
|
52 |
| - TRAVEL_TIME, TRAVEL_TIME_MIN, |
| 53 | + TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME, |
53 | 54 | ]
|
54 | 55 | SENSOR_LIST_ZONE_NAME =[ZONE, ZONE_DISPLAY_AS, ZONE_FNAME, ZONE_NAME, ZONE_NAME, ZONE_FNAME,
|
55 | 56 | LAST_ZONE_NAME, LAST_ZONE_DISPLAY_AS, LAST_ZONE_FNAME, LAST_ZONE,
|
|
65 | 66 | NAME,
|
66 | 67 | ZONE, ZONE_FNAME, ZONE_NAME, ZONE_DATETIME,
|
67 | 68 | HOME_DISTANCE,
|
68 |
| - TRAVEL_TIME, TRAVEL_TIME_MIN, |
| 69 | + TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME, |
69 | 70 | LAST_LOCATED,
|
70 |
| - LAST_UPDATE, |
71 |
| - ], |
| 71 | + LAST_UPDATE,], |
| 72 | + 'track_from_zone': [ |
| 73 | + TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME, |
| 74 | + ZONE_DISTANCE, DISTANCE, DIR_OF_TRAVEL, 'zone_info', ] |
72 | 75 | }
|
73 | 76 | SENSOR_ICONS = {
|
74 | 77 | TOWARDS_HOME: 'mdi:home-import-outline',
|
|
200 | 203 | 'TravelTime',
|
201 | 204 | 'timer, min',
|
202 | 205 | 'mdi:clock-outline',
|
203 |
| - [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN], |
| 206 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME], |
204 | 207 | 0],
|
205 | 208 | TRAVEL_TIME_MIN: [
|
206 | 209 | 'TravelTimeMin',
|
207 | 210 | 'timer',
|
208 | 211 | 'mdi:clock-outline',
|
209 |
| - [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN], |
| 212 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME], |
210 | 213 | 0],
|
| 214 | + TRAVEL_TIME_HHMM: [ |
| 215 | + 'TravelTime (hh:mm)', |
| 216 | + 'text', |
| 217 | + 'mdi:clock-outline', |
| 218 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME], |
| 219 | + BLANK_SENSOR_FIELD], |
| 220 | + ARRIVAL_TIME: [ |
| 221 | + 'ArrivalTime', |
| 222 | + 'text', |
| 223 | + 'mdi:clock-outline', |
| 224 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME], |
| 225 | + BLANK_SENSOR_FIELD], |
211 | 226 |
|
212 | 227 | # CONF_SENSORS_TRACKING_DISTANCE
|
213 | 228 | ZONE_DISTANCE: [
|
|
235 | 250 | 'Direction',
|
236 | 251 | 'text, title',
|
237 | 252 | 'mdi:compass-outline',
|
238 |
| - [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN], |
| 253 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME], |
239 | 254 | BLANK_SENSOR_FIELD],
|
240 | 255 | MOVED_DISTANCE: [
|
241 | 256 | 'MovedDistance',
|
|
247 | 262 | 'ZoneInfo',
|
248 | 263 | 'zone_info',
|
249 | 264 | 'mdi:map-marker-radius-outline',
|
250 |
| - [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, |
| 265 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME, |
251 | 266 | DISTANCE, MAX_DISTANCE, CALC_DISTANCE, WAZE_DISTANCE, WAZE_METHOD, DIR_OF_TRAVEL],
|
252 | 267 | BLANK_SENSOR_FIELD],
|
253 | 268 |
|
|
256 | 271 | 'ZoneInfo',
|
257 | 272 | 'zone_info',
|
258 | 273 | 'mdi:map-marker-radius-outline',
|
259 |
| - [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, |
| 274 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME, |
260 | 275 | DISTANCE, MAX_DISTANCE, CALC_DISTANCE, WAZE_DISTANCE, WAZE_METHOD, DIR_OF_TRAVEL],
|
261 | 276 | BLANK_SENSOR_FIELD],
|
262 | 277 | TFZ_TRAVEL_TIME: [
|
263 | 278 | 'TravelTime',
|
264 | 279 | 'timer, mins',
|
265 | 280 | 'mdi:clock-outline',
|
266 |
| - [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN], |
| 281 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME], |
267 | 282 | BLANK_SENSOR_FIELD],
|
268 | 283 | TFZ_TRAVEL_TIME_MIN: [
|
269 | 284 | 'TravelTimeMin',
|
270 | 285 | 'timer',
|
271 | 286 | 'mdi:clock-outline',
|
272 |
| - [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN], |
| 287 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME], |
| 288 | + BLANK_SENSOR_FIELD], |
| 289 | + TFZ_TRAVEL_TIME_HHMM: [ |
| 290 | + 'TravelTime (hh:mm)', |
| 291 | + 'text', |
| 292 | + 'mdi:clock-outline', |
| 293 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME], |
| 294 | + BLANK_SENSOR_FIELD], |
| 295 | + TFZ_ARRIVAL_TIME: [ |
| 296 | + 'ArrivalTime', |
| 297 | + 'text', |
| 298 | + 'mdi:clock-outline', |
| 299 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME], |
273 | 300 | BLANK_SENSOR_FIELD],
|
274 | 301 | TFZ_DISTANCE: [
|
275 | 302 | 'ZoneDistance',
|
|
289 | 316 | 'Direction',
|
290 | 317 | 'text, title',
|
291 | 318 | 'mdi:compass-outline',
|
292 |
| - [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, DISTANCE, MAX_DISTANCE], |
| 319 | + [FROM_ZONE, TRAVEL_TIME, TRAVEL_TIME_MIN, TRAVEL_TIME_HHMM, ARRIVAL_TIME, |
| 320 | + DISTANCE, MAX_DISTANCE], |
293 | 321 | BLANK_SENSOR_FIELD],
|
294 | 322 |
|
295 | 323 | # CONF_SENSORS_TRACKING_OTHER
|
|
0 commit comments