mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-18 00:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated to new BL api lib added debug and fixed device build for BL in

Browse Source 
app.js
This commit is contained in:
bsamuels
2018-03-07 11:07:44 -06:00
parent f17cea3c9d
commit b26a63bb7a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.bwssystems.HABridge</groupId> <groupId>com.bwssystems.HABridge</groupId>
<artifactId>ha-bridge</artifactId> <artifactId>ha-bridge</artifactId>
<version>5.2.0RC24</version> <version>5.2.0RC25</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HA Bridge</name> <name>HA Bridge</name>
@@ -129,7 +129,7 @@
<dependency> <dependency>
<groupId>com.github.bwssytems</groupId> <groupId>com.github.bwssytems</groupId>
<artifactId>broadlink-java-api</artifactId> <artifactId>broadlink-java-api</artifactId>
<version>7d1c637f09</version> <version>cbed334fa1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>

6
src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java
View File

@@ -67,10 +67,10 @@ public class BroadlinkHome implements Home {
@Override @Override
public Object getItems(String type) { public Object getItems(String type) {
if(!validBroadlink || broadlinkMap == null)
return null;
BroadlinkEntry theResponse = null;
List<BroadlinkEntry> deviceList = new ArrayList<BroadlinkEntry>(); List<BroadlinkEntry> deviceList = new ArrayList<BroadlinkEntry>();
if(!validBroadlink || broadlinkMap == null)
return deviceList;
BroadlinkEntry theResponse = null;
log.debug("consolidating devices for Broadlink"); log.debug("consolidating devices for Broadlink");
Iterator<String> keys = broadlinkMap.keySet().iterator(); Iterator<String> keys = broadlinkMap.keySet().iterator();
while(keys.hasNext()) { while(keys.hasNext()) {

2
src/main/resources/public/scripts/app.js
View File

@@ -4097,7 +4097,7 @@ app.controller('BroadlinkController', function ($scope, $location, bridgeService
$scope.buildDeviceUrls = function (broadlinkdevice, dim_control, ondata, dimdata, offdata, colordata, buildonly) { $scope.buildDeviceUrls = function (broadlinkdevice, dim_control, ondata, dimdata, offdata, colordata, buildonly) {
var preCmd = "{\"id\":\"" + broadlinkdevice.id + "\",\"name\":\"" + broadlinkdevice.name + "\",\"type\":\"" + broadlinkdevice.type + "\",\"ipAddr\":\"" + broadlinkdevice.ipAddr + "\",\"macAddr\":\"" + broadlinkdevice.macAddr + "\",\"command\":\""; var preCmd = "{\"id\":\"" + broadlinkdevice.id + "\",\"name\":\"" + broadlinkdevice.name + "\",\"type\":\"" + broadlinkdevice.type + "\",\"ipAddr\":\"" + broadlinkdevice.ipAddr + "\",\"macAddr\":\"" + broadlinkdevice.macAddr + "\",\"command\":\"";
if(broadlinkdevice.baseType === '0000' || broadlinkdevice.type === '2711') { if(broadlinkdevice.baseType === '0000' || broadlinkdevice.baseType === '2711') {
dimpayload = null; dimpayload = null;
colorpayload = null; colorpayload = null;
onpayload = preCmd + "on\"}"; onpayload = preCmd + "on\"}";