Finished Nest implementation and default ip selection to not be

127.0.0.1

Fixes #12
Fixes #20
This commit is contained in:
Admin
2016-01-21 16:44:24 -06:00
parent ac59398aa0
commit 37d346f558
11 changed files with 70 additions and 39 deletions

File diff suppressed because one or more lines are too long

View File

@@ -5,7 +5,7 @@
<groupId>com.bwssystems.HABridge</groupId>
<artifactId>ha-bridge</artifactId>
<version>1.2.3f</version>
<version>1.3.0</version>
<packaging>jar</packaging>
<name>HA Bridge</name>

View File

@@ -2,7 +2,7 @@ package com.bwssystems.NestBridge;
public class NestItem {
private String name;
private String Id;
private String id;
private String type;
private String location;
public String getName() {
@@ -12,10 +12,10 @@ public class NestItem {
this.name = name;
}
public String getId() {
return Id;
return id;
}
public void setId(String id) {
Id = id;
public void setId(String anid) {
id = anid;
}
public String getType() {
return type;

View File

@@ -800,7 +800,7 @@ app.filter('availableNestItemId', function(bridgeService) {
if(input == null)
return out;
for (var i = 0; i < input.length; i++) {
if(!bridgeService.findNestItemByMapId(input[i].Id, "nestHomeAway")){
if(!bridgeService.findNestItemByMapId(input[i].id, "nestHomeAway")){
out.push(input[i]);
}
}

View File

@@ -13,6 +13,8 @@
<div class="panel-heading">
<h2 class="panel-title">Edit a device</h2>
</div>
<p class="text-muted">This screen allows the modification of many fields the bridge uses. Please use care when
updating these fields as you may break the settings used by the bridge to call a specific end point device.</p>
<ul class="list-group">
<li class="list-group-item">
<form class="form-horizontal" ng-submit="addDevice()">
@@ -25,7 +27,7 @@
ng-model="device.name" placeholder="Device Name">
</div>
<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
Update Device</button>
Update Bridge Device</button>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-2 control-label" for="device-target">Target

View File

@@ -74,6 +74,8 @@
<div class="panel-heading">
<h2 class="panel-title">Add a new device</h2>
</div>
<p class="text-muted">This area allows you to create any http or udp call to an endpoint. You can use the default GET or select
the http verb type below and configure a payload for either on or off methods. Currently, https is not supported.</p>
<ul class="list-group">
<li class="list-group-item">
<form class="form-horizontal" ng-submit="addDevice()">
@@ -87,7 +89,7 @@
ng-model="device.name" placeholder="Device Name">
</div>
<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
Add Device</button>
Add Bridge Device</button>
</div>
</div>
<div class="form-group">

View File

@@ -14,8 +14,9 @@
</div>
<ul class="list-group">
<li class="list-group-item">
<p class="text-muted">You can select a Harmony Activity and generate
the add activity box selections automatically.</p>
<p class="text-muted">For any Harmony Activity, use the action buttons to generate the device addition information below automatically.
Then you can modify the name to anything you want that will be the keyword for Alexa. Click the 'Add Bridge Device' to finish that selection setup.
The 'Already Configured Activities' list below will show what is already setup for your Harmony Hubs.</p>
<table class="table table-bordered table-striped table-hover">
<thead>
@@ -84,7 +85,7 @@
</div>
<div class="panel panel-default bridgeServer" ng-if="!bridge.error">
<div class="panel-heading">
<h2 class="panel-title">Add a Harmony Activity</h2>
<h2 class="panel-title">Add a Bridge Device for a Harmony Activity</h2>
</div>
<ul class="list-group">
<li class="list-group-item">
@@ -98,7 +99,7 @@
ng-model="device.name" placeholder="Device Name">
</div>
<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
Add Activity</button>
Add Bridge Device</button>
</div>
<div class="form-group">
<div class="row">

View File

@@ -15,8 +15,8 @@
<ul class="list-group">
<li class="list-group-item">
<p class="text-muted">For any Harmony Device and Buttons, use the action buttons to generate the device addition information below automatically.
Then you can modify the name to anything you want that will be the keyword for Alexa. Click Add device to finish that type selections.
The Already configured items list below will show what is already setup for this Nest.</p>
Then you can modify the name to anything you want that will be the keyword for Alexa. Click the 'Add Bridge Device' to finish that selection setup.
The 'Already Configured Harmony Buttons' list below will show what is already setup for your Harmony Hubs.</p>
<table class="table table-bordered table-striped table-hover">
<thead>
@@ -122,7 +122,7 @@
ng-model="device.name" placeholder="Device Name">
</div>
<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
Add Device</button>
Add Bridge Device</button>
</div>
<div class="form-group">
<div class="row">

View File

@@ -15,8 +15,8 @@
<ul class="list-group">
<li class="list-group-item">
<p class="text-muted">For any Nest Item, use the action buttons to generate the device addition information below automatically.
Then you can modify the name to anything you want that will be the keyword for Alexa. Click Add device to finish that type selections.
The Already configured items list below will show what is already setup for this Nest.</p>
Then you can modify the name to anything you want that will be the keyword for Alexa. Click the 'Add Bridge Device' to finish that selection setup.
The 'Already Configured Nest Items' list below will show what is already setup for your Nest.</p>
<table class="table table-bordered table-striped table-hover">
<thead>
@@ -120,7 +120,7 @@
ng-model="device.name" placeholder="Device Name">
</div>
<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
Add Nest Item</button>
Add Bridge Device</button>
</div>
<div class="form-group">
<div class="row">

View File

@@ -14,8 +14,9 @@
</div>
<ul class="list-group">
<li class="list-group-item">
<p class="text-muted">You can select a Vera device and generate
the add device box selections automatically.</p><p>Also, use this select menu for which type of dim
<p class="text-muted">For any Vera Device, use the action buttons to generate the device addition information below automatically.
Then you can modify the name to anything you want that will be the keyword for Alexa. Click the 'Add Bridge Device' to finish that selection setup.
The 'Already Configured Vera Devices' list below will show what is already setup for your Vera.</p><p>Also, use this select menu for which type of dim
control you would like to be generated:
<select name="device-dim-control" id="device-dim-control" ng-model="device_dim_control">
<option value="">none</option>
@@ -103,7 +104,7 @@
</div>
<div class="panel panel-default bridgeServer" ng-if="!bridge.error">
<div class="panel-heading">
<h2 class="panel-title">Add a Vera device</h2>
<h2 class="panel-title">Add Bridge Device for a Vera Device</h2>
</div>
<ul class="list-group">
<li class="list-group-item">
@@ -117,7 +118,7 @@
ng-model="device.name" placeholder="Device Name">
</div>
<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
Add Device</button>
Add Bridge Device</button>
</div>
<div class="form-group">
<div class="row">

View File

@@ -14,8 +14,9 @@
</div>
<ul class="list-group">
<li class="list-group-item">
<p class="text-muted">You can select a Vera scene and generate
the add scene box selections automatically.</p>
<p class="text-muted">For any Vera Scene, use the action buttons to generate the device addition information below automatically.
Then you can modify the name to anything you want that will be the keyword for Alexa. Click the 'Add Bridge Device' to finish that selection setup.
The 'Already Configured Vera Scenes' list below will show what is already setup for your Vera.</p>
<table class="table table-bordered table-striped table-hover">
<thead>
@@ -86,7 +87,7 @@
</div>
<div class="panel panel-default bridgeServer" ng-if="!bridge.error">
<div class="panel-heading">
<h2 class="panel-title">Add a Vera scene</h2>
<h2 class="panel-title">Add a Bridge Device for a Vera scene</h2>
</div>
<ul class="list-group">
<li class="list-group-item">
@@ -100,7 +101,7 @@
ng-model="device.name" placeholder="Device Name">
</div>
<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
Add Scene</button>
Add Bridge Device</button>
</div>
<div class="form-group">
<div class="row">