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

Updated modbus config template #4487

Merged
merged 1 commit into from
Jun 21, 2016
Merged

Updated modbus config template #4487

merged 1 commit into from
Jun 21, 2016

Conversation

ssalonen
Copy link
Contributor

@ssalonen ssalonen commented Jun 20, 2016 •
edited
Loading

  • advanced connection parameters documented as comments
  • added serial slave example as comments

Fixes #4486

@ssalonen ssalonen mentioned this pull request Jun 20, 2016
Closed
@watou watou added this to the 1.9.0 milestone Jun 20, 2016
@watou
Copy link
Contributor

watou commented Jun 20, 2016

Great! Could you do similar to modbus.cfg?

@ssalonen
Copy link
Contributor Author

ssalonen commented Jun 21, 2016 •
edited
Loading

Done & squashed the commits. I guess that file is used for the openhab2?

@watou
Copy link
Contributor

watou commented Jun 21, 2016

Done & squashed the commits.

Thanks! Kai changed this repo so you don't need to squash commits in PRs any more, but it doesn't hurt either.

I guess that file is used for the openhab2?

Yes.

@watou watou merged commit 8309168 into openhab:master Jun 21, 2016
cdjackson added a commit to cdjackson/openhab1-addons that referenced this pull request Aug 12, 2016
@cdjackson
Merge branch 'master' into dbadia-security-mmerge
9ac7eb5 
* 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.
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
1.9.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ssalonen @watou