Skip to content

Commit

Permalink
Merge branch 'master' into dbadia-security-mmerge
Browse files Browse the repository at this point in the history
* master: (178 commits)
  Fix the generateDeviceId method. (openhab#4498)
  [modbus] Add support for int32_swap, uint32_swap and float32_swap data types (openhab#4251)
  Extend error logging on retry failure (openhab#4477)
  Changed timestamp of item insert from MySql server time to local Java… (openhab#4503)
  [mochadx10] Add binding to OH2 distro (openhab#4502)
  [mqtt] Add openhab-action-mqtt feature for OH2 install (openhab#4499)
  ZWave database update (openhab#4497)
  Fixes openhab#1003 (openhab#4162)
  [WeatherBinding] Add log messages for invalid configurations (openhab#4458)
  Network Health - Made log message more clear (openhab#4425)
  Update ZMNHSD (openhab#4490)
  Update clock command class and converter (openhab#4489)
  Updated modbus config template with serial example. Documented advanced connection parameters (openhab#4487)
  ZWave update WA105DBZ (openhab#4485)
  Zwave database 180616 (openhab#4483)
  Zwave database 180616 (openhab#4479)
  Add Aeon ZW112 - Door/Window Sensor 6 (openhab#4472)
  Include Aeon ZW112 - Door/Window Sensor 6 (openhab#4471)
  Z-Wave: Added support for CENTRAL_SCENE (openhab#4431)
  ZWave database update (openhab#4476)
  ...

# Conflicts:
#	bundles/binding/org.openhab.binding.zwave/database/products.xml
#	bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/converter/ZWaveConverterHandler.java
#	bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveCommandClass.java
  • Loading branch information
cdjackson committed Jul 2, 2016
2 parents a4f90e4 + dbc94f5 commit 9ac7eb5
Show file tree
Hide file tree
Showing 3,970 changed files with 33,312 additions and 50,065 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ distribution/openhabhome/etc/rrd4j/*.rrd
*~
features/*/src/main/history
itemDump.txt

# IntelliJ files
**/.idea
**/*.iml
37 changes: 37 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!--- Provide a general summary of the issue in the Title above -->
<!--- If the issue is related to a binding, please include it in the title. -->
<!--- For example, "[astro] My issue..." -->
<!--- For questions or requests for assistance please use community.openhab.org instead. -->
<!--- Feel free to delete any comment lines in the template (starting with &lt;!--) -->
## Expected Behavior
<!--- If you're describing a bug, tell us what should happen -->
<!--- If you're suggesting a change/improvement, tell us how it should work -->

## Current Behavior
<!--- If describing a bug, tell us what happens instead of the expected behavior -->
<!--- When possible, include related log information (preferably debug level) and related configs. -->
<!--- Use file attachment for log and config information longer than a few lines -->
<!--- If suggesting a change/improvement, explain the difference from current behavior -->
<!--- For improvements, discuss in at community.openhab.org first and include link to topic -->

## Possible Solution
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
<!--- or ideas how to implement the addition or change -->

## Steps to Reproduce (for bugs)
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
1.
2.
3.
4.

## Context
<!--- How has this issue affected you? What are you trying to accomplish? -->
<!--- Providing context helps us come up with a solution that is most useful in the real world -->

## Your Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Version used: (e.g., openhab and addon versions)
* Environment name and version (e.g. Chrome 39, node.js 5.4, Java 8, ...):
* Operating System and version (desktop or mobile, Windows 10, Raspbian Jessie, ...):
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ To see openHAB in action, you can directly access our demo server - choose one o

If you just want to watch for a start, you might also like our [YouTube channel](http://www.youtube.com/playlist?list=PLGlxCdrGUagz6lfgo9SlNLhdwI4la_VSv)!

[![HABDroid](https://developer.android.com/images/brand/en_app_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=org.openhab.habdroid) [![iOSApp](http://raw.github.com/wiki/openhab/openhab/images/app-store-badges.png)](http://itunes.apple.com/us/app/openhab/id492054521?mt=8)
<a href="https://play.google.com/store/apps/details?id=org.openhab.habdroid"><img src="https://play.google.com/intl/en_us/badges/images/apps/en-play-badge.png" height="45" alt="HABDroid"></a> [![iOSApp](http://raw.github.com/wiki/openhab/openhab/images/app-store-badges.png)](http://itunes.apple.com/us/app/openhab/id492054521?mt=8)


## Quick Start
Expand Down Expand Up @@ -50,7 +50,7 @@ If you are looking for support, please check out the [different support channels

As any good open source project, openHAB welcomes any participation in the project. Read more in the [how to contribute](https://github.com/openhab/openhab-distro/blob/master/CONTRIBUTING.md) guide.

If you are a developer and want to jump right into the sources and execute openHAB from within Eclipse, please have a look at the [IDE setup](https://github.com/openhab/openhab-distro/blob/master/docs/sources/development/ide.md) procedures.
If you are a developer and want to jump right into the sources and execute openHAB from within Eclipse, please have a look at the [IDE setup](http://docs.openhab.org/developers/development/ide.html) procedures.

[![](http://raw.github.com/wiki/openhab/openhab/images/twitter.png)](http://twitter.com/openHAB)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2010-2016, openHAB.org and others.
Copyright (c) 2010-2016 by the respective copyright holders.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2010-2016, openHAB.org and others.
Copyright (c) 2010-2016 by the respective copyright holders.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2010-2016, openHAB.org and others.
Copyright (c) 2010-2016 by the respective copyright holders.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand All @@ -10,6 +10,8 @@

import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

import org.openhab.binding.ecobee.EcobeeActionProvider;
import org.openhab.binding.ecobee.messages.AbstractFunction;
Expand All @@ -25,6 +27,8 @@
import org.openhab.binding.ecobee.messages.SetHoldFunction;
import org.openhab.binding.ecobee.messages.SetOccupiedFunction;
import org.openhab.binding.ecobee.messages.Temperature;
import org.openhab.binding.ecobee.messages.Thermostat.Event;
import org.openhab.binding.ecobee.messages.Thermostat.VentilatorMode;
import org.openhab.binding.ecobee.messages.UpdateSensorFunction;
import org.openhab.core.scriptengine.action.ActionDoc;
import org.openhab.core.scriptengine.action.ParamDoc;
Expand Down Expand Up @@ -199,13 +203,98 @@ public static boolean ecobeeSetHold(
@ParamDoc(name = "endDateTime", text = "(opt) The end date in thermostat time.") Date endDateTime,
@ParamDoc(name = "holdType", text = "(opt) The hold duration type. Valid values: dateTime, nextTransition, indefinite, holdHours.") String holdType,
@ParamDoc(name = "holdHours", text = "(opt) The number of hours to hold for, used and required if holdType='holdHours'.") Number holdHours) {
SetHoldFunction function = new SetHoldFunction(
(coolHoldTemp == null) ? null
: Temperature.fromLocalTemperature(new BigDecimal(coolHoldTemp.toString())),
(heatHoldTemp == null) ? null
: Temperature.fromLocalTemperature(new BigDecimal(heatHoldTemp.toString())),
holdClimateRef, startDateTime, endDateTime, (holdType == null) ? null : HoldType.forValue(holdType),
(holdHours == null) ? null : holdHours.intValue());
Map<String, Object> params = new HashMap<String, Object>();
if (coolHoldTemp != null) {
params.put("coolHoldTemp", coolHoldTemp);
}
if (heatHoldTemp != null) {
params.put("heatHoldTemp", heatHoldTemp);
}
if (holdClimateRef != null) {
params.put("holdClimateRef", holdClimateRef);
}
return ecobeeSetHold(selection, params, holdType, holdHours, startDateTime, endDateTime);
}

/**
* The set hold function sets the thermostat into a hold with the specified temperature. Creates a hold for the
* specified duration. Note that an event is created regardless of whether the program is in the same state as the
* requested state.
*
* There is also support for creating a hold by passing a holdClimateRef request parameter/value pair to this
* function (See Event). When an existing and valid Climate.climateRef value is passed to this function, the
* coolHoldTemp, heatHoldTemp and fan mode from that Climate are used in the creation of the hold event. The values
* from that Climate will take precedence over any coolHoldTemp, heatHoldTemp and fan mode parameters passed into
* this function separately.
*
* To resume from a hold and return to the program, use the ResumeProgram function.
*
* @see <a href="https://www.ecobee.com/home/developer/api/documentation/v1/functions/SetHold.shtml">Set Hold</a>
*/
@ActionDoc(text = "The set hold function sets the thermostat into a hold with the specified event parameters.")
public static boolean ecobeeSetHold(
@ParamDoc(name = "selection", text = "The thermostat selection to set hold.") String selection,
@ParamDoc(name = "params", text = "The map of hold parameters.") Map<String, Object> params,
@ParamDoc(name = "holdType", text = "(opt) The hold duration type. Valid values: dateTime, nextTransition, indefinite, holdHours.") String holdType,
@ParamDoc(name = "holdHours", text = "(opt) The number of hours to hold for, used and required if holdType='holdHours'.") Number holdHours,
@ParamDoc(name = "startDateTime", text = "(opt) The start date in thermostat time.") Date startDateTime,
@ParamDoc(name = "endDateTime", text = "(opt) The end date in thermostat time.") Date endDateTime) {
Event event = new Event();
for (String key : params.keySet()) {
Object value = params.get(key);
switch (key) {
case "isOccupied":
event.setOccupied((Boolean) value);
break;
case "isCoolOff":
event.setCoolOff((Boolean) value);
break;
case "isHeatOff":
event.setHeatOff((Boolean) value);
break;
case "coolHoldTemp":
event.setCoolHoldTemp(Temperature.fromLocalTemperature(new BigDecimal(value.toString())));
break;
case "heatHoldTemp":
event.setHeatHoldTemp(Temperature.fromLocalTemperature(new BigDecimal(value.toString())));
break;
case "fan":
event.setFan(FanMode.forValue((String) value));
break;
case "vent":
event.setVent(VentilatorMode.forValue((String) value));
break;
case "ventilatorMinOnTime":
event.setVentilatorMinOnTime((Integer) value);
break;
case "isOptional":
event.setOptional((Boolean) value);
break;
case "isTemperatureRelative":
event.setTemperatureRelative((Boolean) value);
break;
case "coolRelativeTemp":
event.setCoolRelativeTemp(Temperature.fromLocalTemperature(new BigDecimal(value.toString())));
break;
case "heatRelativeTemp":
event.setHeatRelativeTemp(Temperature.fromLocalTemperature(new BigDecimal(value.toString())));
break;
case "isTemperatureAbsolute":
event.setTemperatureAbsolute((Boolean) value);
break;
case "fanMinOnTime":
event.setFanMinOnTime((Integer) value);
break;
case "holdClimateRef":
event.setHoldClimateRef((String) value);
break;
default:
logger.warn("Unrecognized event field '{}' with value '{}' ignored.", key, value);
break;
}
}
SetHoldFunction function = new SetHoldFunction(event, (holdType == null) ? null : HoldType.forValue(holdType),
(holdHours == null) ? null : holdHours.intValue(), startDateTime, endDateTime);
return callEcobeeInternal(selection, function);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2010-2016, openHAB.org and others.
Copyright (c) 2010-2016 by the respective copyright holders.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2010-2016, openHAB.org and others.
Copyright (c) 2010-2016 by the respective copyright holders.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2010-2016, openHAB.org and others.
* Copyright (c) 2010-2016 by the respective copyright holders.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand Down
2 changes: 1 addition & 1 deletion bundles/action/org.openhab.action.mail/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/commons-email-1.2.jar"/>
<classpathentry kind="lib" path="lib/commons-email-1.4.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
10 changes: 3 additions & 7 deletions bundles/action/org.openhab.action.mail/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,10 @@ Bundle-Activator: org.openhab.action.mail.internal.MailActivator
Bundle-ManifestVersion: 2
Bundle-Description: This is the Mail action of the open Home Aut
omation Bus (openHAB)
Import-Package: javax.mail;version="1.4.0",
javax.mail.internet;version="1.4.0",
Import-Package: javax.mail,
javax.mail.internet,
org.apache.commons.lang,
org.openhab.core.items,
org.openhab.core.library.items,
org.openhab.core.library.types,
org.openhab.core.scriptengine.action,
org.openhab.core.types,
org.osgi.framework,
org.osgi.service.cm,
org.osgi.service.component,
Expand All @@ -26,5 +22,5 @@ Bundle-DocURL: http://www.openhab.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Service-Component: OSGI-INF/action.xml
Bundle-ClassPath: .,
lib/commons-email-1.2.jar
lib/commons-email-1.4.jar
Bundle-ActivationPolicy: lazy
2 changes: 1 addition & 1 deletion bundles/action/org.openhab.action.mail/OSGI-INF/action.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2010-2016, openHAB.org and others.
Copyright (c) 2010-2016 by the respective copyright holders.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
Expand Down
2 changes: 1 addition & 1 deletion bundles/action/org.openhab.action.mail/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ source.. = src/main/java/,\
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
lib/commons-email-1.2.jar
lib/commons-email-1.4.jar
output.. = target/classes/
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 9ac7eb5

Please sign in to comment.