Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenZWave support for Domoticz #1612

Closed
wants to merge 1 commit into from
Closed

OpenZWave support for Domoticz #1612

wants to merge 1 commit into from

Conversation

Decipher
Copy link
Contributor

As per #1488

@Decipher
Copy link
Contributor Author

Possible something went wrong, this may not be ready for Pull yet. Tried compiling but patch fails. Should have tested more before I re-did the PR against Master.

Will look more at it ASAP.

@Decipher
Copy link
Contributor Author

So the only issue is the line endings in the patch (cross/domoticz/patches/CMakeLists.txt.patch). It could be related to me squashing the commits on my local OS X environment rather than my SPKSRC Vagrant box.

Git doesn't want to deal with the issue, just wants to convert it to the non-working version. Thoughts?

@Diaoul
Copy link
Member

Diaoul commented Mar 27, 2015

What should be the line ending or the patch?

@Decipher
Copy link
Contributor Author

Decipher commented Apr 8, 2015

Honestly I don't know. I don't really live in a world where I need to worry about line endings very often. Is there an easy way to find out?

@gkroone
Copy link

gkroone commented May 5, 2015

Domoticz uses crlf (msdos) line endings. If i have issues with it i run unix2dos to correct them.

In linux, the line endings appear with an additional ^M at the end. Not sure how mac shows it.

In one of the Domoticz versions i noticed that it accidentally switched to unix line endings, which was then corrected again in a later version.

@KaraokeStu
Copy link
Contributor

Hi, please could you rebase and confirm this all still works ok - I'm trying to clean up old pull requests.

If I don't hear anything by 31st July 2017, I will close the PR.

Thanks,

Stuart

@Safihre Safihre closed this Feb 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants