Skip to content
This repository has been archived by the owner on May 17, 2021. It is now read-only.

Add Aeon ZW112 - Door/Window Sensor 6 #4472

Merged
merged 1 commit into from Jun 18, 2016
Merged

Conversation

mattnl
Copy link
Contributor

@mattnl mattnl commented Jun 16, 2016

No description provided.

@cdjackson
Copy link
Contributor

Please can you combine the changes into a single PR since they both address the same thing

@cdjackson cdjackson closed this Jun 16, 2016
@mattnl
Copy link
Contributor Author

mattnl commented Jun 16, 2016

Sorry for creating 2 pull requests Chris. Stupid me, but I don't really
know how to combine the two...
Op 16 jun. 2016 7:42 p.m. schreef "Chris Jackson" <notifications@github.com

:

Please can you combine the changes into a single PR since they both
address the same thing


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#4472 (comment), or mute
the thread
https://github.com/notifications/unsubscribe/AGUc0fcwWvewoH5R70YR-q4T-ex7QrlDks5qMYr5gaJpZM4I3oHC
.

@cdjackson
Copy link
Contributor

You should just be able to put the two new files into the same PR - or are you editing directly on Github?

@cdjackson cdjackson self-assigned this Jun 18, 2016
@cdjackson cdjackson reopened this Jun 18, 2016
@cdjackson cdjackson merged commit 2afcac7 into openhab:master Jun 18, 2016
cdjackson added a commit to cdjackson/openhab1-addons that referenced this pull request Jun 20, 2016
* master:
  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)
  ZWave addition of clock command class (openhab#4468)

Signed-off-by: Chris Jackson <chris@cd-jackson.com>

# Conflicts:
#	bundles/binding/org.openhab.binding.zwave/database/linear/wa105dbz.xml
cdjackson added a commit to cdjackson/openhab1-addons that referenced this pull request Aug 12, 2016
* 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
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants