Skip to content

Commit

Permalink
Merge pull request #715 from FloFoer/FeaturesfFor5.0
Browse files Browse the repository at this point in the history 
Light type detection and filter for device list
  • Loading branch information
@bwssytems
bwssytems authored Aug 3, 2017
2 parents 98ce4e2 + ce79fb4 commit 5ea14f9
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 44 deletions.
23 changes: 8 additions & 15 deletions src/main/java/com/bwssystems/HABridge/api/hue/DeviceResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,26 +105,19 @@ public static DeviceResponse createResponse(DeviceDescriptor device){

response.setName(device.getName());
response.setUniqueid(device.getUniqueid());
//if (device.getColorUrl() == null || device.getColorUrl().trim().equals("")) {
// if (device.getDimUrl() == null || device.getDimUrl().trim().equals("")) {
// response.setType("On/Off light");
// response.setModelid("Plug - LIGHTIFY");
// response.setManufacturername("OSRAM");
// response.setSwversion("V1.04.12");
// } else {
// response.setManufacturername("Philips");
// response.setType("Dimmable light");
// response.setModelid("LWB007");
// response.setSwversion("66012040");
// }
//} else {
response.setManufacturername("Philips");
response.setManufacturername("Philips");

if (device.isColorDevice()) {
response.setType("Extended color light");
response.setModelid("LCT010");
response.setSwversion("1.15.2_r19181");
response.setSwconfigid("F921C859");
response.setProductid("Philips-LCT010-1-A19ECLv4");
//}
} else {
response.setType("Dimmable light");
response.setModelid("LWB007");
response.setSwversion("66012040");
}

response.setLuminaireuniqueid(null);

Expand Down
41 changes: 23 additions & 18 deletions src/main/java/com/bwssystems/HABridge/api/hue/DeviceState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
public class DeviceState {
private boolean on;
private int bri;
private int hue;
private int sat;
private Integer hue;
private Integer sat;
private String effect;
private List<Double> xy;
private int ct;
private Integer ct;
private String alert;
private String colormode;
private boolean reachable;
Expand All @@ -37,7 +37,7 @@ public void setBri(int bri) {
}

public int getHue() {
return hue;
return hue != null ? hue.intValue() : 0;
}

public void setHue(int hue) {
Expand All @@ -46,7 +46,7 @@ public void setHue(int hue) {
}

public int getSat() {
return sat;
return sat != null ? sat.intValue() : 0;
}

public void setSat(int sat) {
Expand All @@ -63,7 +63,7 @@ public void setEffect(String effect) {
}

public int getCt() {
return ct;
return ct != null ? ct.intValue() : 0;
}

public void setCt(int ct) {
Expand Down Expand Up @@ -111,23 +111,28 @@ public void setXy(List<Double> xy) {
// this.transitiontime = transitiontime;
// }

public static DeviceState createDeviceState() {
public static DeviceState createDeviceState(boolean color) {
DeviceState newDeviceState = new DeviceState();
newDeviceState.fillIn();
newDeviceState.setColormode("ct");
newDeviceState.setCt(200);
ArrayList<Double> doubleArray = new ArrayList<Double>();
doubleArray.add(new Double(0));
doubleArray.add(new Double(0));
newDeviceState.setXy(doubleArray);

newDeviceState.fillIn(color);
if (color) {
newDeviceState.setColormode("xy");
newDeviceState.setHue(0);
newDeviceState.setSat(0);
newDeviceState.setCt(153);
ArrayList<Double> doubleArray = new ArrayList<Double>();
doubleArray.add(0.3146);
doubleArray.add(0.3303);
newDeviceState.setXy(doubleArray);
}
return newDeviceState;
}
public void fillIn() {
public void fillIn(boolean color) {
if(this.getAlert() == null)
this.setAlert("none");
if(this.getEffect() == null)
this.setEffect("none");
if (color) {
if(this.getEffect() == null)
this.setEffect("none");
}
this.setReachable(true);
}
@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bwssystems/HABridge/api/hue/GroupResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static GroupResponse createDefaultGroupResponse(Map<String, DeviceRespons
i++;
}
GroupResponse theResponse = new GroupResponse();
theResponse.setAction(DeviceState.createDeviceState());
theResponse.setAction(DeviceState.createDeviceState(true));
theResponse.setState(new GroupState(all_on, any_on));
theResponse.setName("Group 0");
theResponse.setLights(theList);
Expand Down
14 changes: 13 additions & 1 deletion src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public void setContentBodyDim(String contentBodyDim) {

public DeviceState getDeviceState() {
if(deviceState == null)
deviceState = DeviceState.createDeviceState();
deviceState = DeviceState.createDeviceState(this.isColorDevice());
return deviceState;
}

Expand Down Expand Up @@ -299,4 +299,16 @@ public boolean containsType(String aType) {

return false;
}

public boolean isColorDevice() {
boolean color = true;
if ((deviceType == null || !deviceType.trim().equals("passthru")) && (colorUrl == null || colorUrl.trim().equals(""))) {
color = false;
} else if (deviceType != null && deviceType.trim().equals("passthru")) {
if (deviceState != null && (deviceState.getColormode() == null || deviceState.getColormode().equals(""))) {
color = false;
}
}
return color;
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/bwssystems/HABridge/dao/GroupDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void setGroupState(GroupState groupState) {

public DeviceState getAction() {
if(action == null)
action = DeviceState.createDeviceState();
action = DeviceState.createDeviceState(true);
return action;
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ else if (body.contains("\"bri\"")) {

state = device.getDeviceState();
if (state == null)
state = DeviceState.createDeviceState();
state = DeviceState.createDeviceState(device.isColorDevice());

responseString = this.formatSuccessHueResponse(theStateChanges, body, lightId, state, targetBri, targetBriInc, device.isOffState());
device.setDeviceState(state);
Expand Down Expand Up @@ -1127,7 +1127,7 @@ else if (body.contains("\"bri\"")) {

state = device.getDeviceState();
if (state == null) {
state = DeviceState.createDeviceState();
state = DeviceState.createDeviceState(device.isColorDevice());
device.setDeviceState(state);
}

Expand Down Expand Up @@ -1248,7 +1248,7 @@ else if(validMapTypes.validateType(device.getDeviceType()))
responseString = this.formatSuccessHueResponse(theStateChanges, body, lightId, state, targetBri, targetBriInc, device.isOffState());
device.setDeviceState(state);
} else {
DeviceState dummyState = DeviceState.createDeviceState();
DeviceState dummyState = DeviceState.createDeviceState(device.isColorDevice());
responseString = this.formatSuccessHueResponse(theStateChanges, body, lightId, dummyState, targetBri, targetBriInc, device.isOffState());
}
}
Expand Down Expand Up @@ -1309,7 +1309,7 @@ else if (body.contains("\"bri\"")) {

state = group.getAction();
if (state == null) {
state = DeviceState.createDeviceState();
state = DeviceState.createDeviceState(true);
group.setAction(state);
}
}
Expand Down
33 changes: 30 additions & 3 deletions src/main/resources/public/scripts/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ app.service ('bridgeService', function ($rootScope, $http, $base64, $location, n
this.state = {base: "./api/devices", bridgelocation: ".", systemsbase: "./system", huebase: "./api", configs: [], backups: [], devices: [], device: {},
mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false,
isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false,
showDomoticz: false, showSomfy: false, showLifx: false, habridgeversion: {}, viewDevId: "", queueDevId: "", securityInfo: {}, filterDevicesByIpAddress: null};
showDomoticz: false, showSomfy: false, showLifx: false, habridgeversion: {}, viewDevId: "", queueDevId: "", securityInfo: {}, filterDevicesByIpAddress: null,
filterDevicesOnlyFiltered: false, filterDeviceType: null};

this.displayWarn = function(errorTitle, error) {
var toastContent = errorTitle;
Expand Down Expand Up @@ -3463,13 +3464,39 @@ app.filter('configuredSomfyDevices', function (bridgeService) {
});

app.filter('filterDevicesByRequester', function () {
return function(input,search) {
return function(input,search,mustContain,deviceType) {
var out = [];
if(input === undefined || input === null || input.length === undefined)
return out;
var pattern = new RegExp(search);
var patternType = new RegExp(deviceType);
for (var i = 0; i < input.length; i++) {
if(pattern.test(input[i].requesterAddress) || !input[i].requesterAddress || input[i].requesterAddress.length === 0){
var pushRequester = false;
var pushType = false;

// Check filter by requester
if (!search || search.trim().length === 0) { // if search is empty and mustContain == true push only unfiltered devices
if (mustContain) {
if (!input[i].requesterAddress || input[i].requesterAddress.length === 0) {
pushRequester = true;
}
} else {
pushRequester = true;
}
} else {
if(pattern.test(input[i].requesterAddress) || !mustContain && (!input[i].requesterAddress || input[i].requesterAddress.length === 0)){
pushRequester = true;
}
}

// Check filter by deviceType
if (deviceType) {
pushType = patternType.test(input[i].deviceType);
} else {
pushType = true;
}

if (pushRequester && pushType) {
out.push(input[i]);
}
}
Expand Down
21 changes: 20 additions & 1 deletion src/main/resources/public/views/configuration.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,25 @@ <h1 class="panel-title">Current devices ({{bridge.devices.length}})</h1>
<label for="device-ip-filter">Show devices visible to: </label>
<input type="text" id="device-ip-filter" style="width:150px"
ng-model="bridge.state.filterDevicesByIpAddress" placeholder="">
<input type="checkbox" id="device-ip-filter-mode" ng-model="bridge.state.filterDevicesOnlyFiltered" ng-true-value=true ng-false-value=false style="margin-right: 3px">Must contain filter
<label for="device-type-filter" style="margin-left:50px">Filter device type: </label>
<select name="device-type" id="device-type-filter"
ng-model="bridge.state.filterDeviceType">
<option value="">---No Filter---</option>
<!-- not selected / blank option -->
<option value="custom">Custom</option>
<option value="UDP">UDP</option>
<option value="TCP">TCP</option>
<option value="exec">Execute Script/Program</option>
<option value="switch">Switch</option>
<option value="scene">Scene</option>
<option value="macro">Macro</option>
<option value="group">Group</option>
<option value="activity">Activity</option>
<option value="button">Button</option>
<option value="thermo">Thermo</option>
<option value="passthru">Pass Thru</option>
</select>
</div>

<scrollable-table watch="bridge.devices">
Expand All @@ -55,7 +74,7 @@ <h1 class="panel-title">Current devices ({{bridge.devices.length}})</h1>
<th>Actions</th>
</tr>
</thead>
<tr ng-repeat="device in bridge.devices | orderBy:'name' | filterDevicesByRequester:bridge.state.filterDevicesByIpAddress" row-id="{{device.id}}" ng-class="{info: bridge.viewDevId == device.id}" >
<tr ng-repeat="device in bridge.devices | orderBy:'name' | filterDevicesByRequester:bridge.state.filterDevicesByIpAddress:bridge.state.filterDevicesOnlyFiltered:bridge.state.filterDeviceType" row-id="{{device.id}}" ng-class="{info: bridge.viewDevId == device.id}" >
<td>{{$index+1}}</td>
<td>{{device.id}}</td>
<td>{{device.name}}</td>
Expand Down

0 comments on commit 5ea14f9

Please sign in to comment.