Bug Fixes. and Build script changes #46
Conversation
…error Fixed issue where Manager and Options instance was not cleared after calling destroy Added functions: - requestNodeNeighborUpdate - deleteAllReturnRoutes - assignReturnRoute - addNode - removeNode - removeFailedNode - hasNodeFailed - replaceFailedNode
|
@zgmnkv when will this PR be integrated? |
|
@zgmnkv any news? |
|
@zgmnkv any news on getting this merged?? |
| *.iml | ||
| *.ipr | ||
| *.iws | ||
| /.nb-gradle/ |
There was a problem hiding this comment.
need a new line at the end of file
| @@ -133,6 +133,14 @@ model { | |||
| } | |||
| } | |||
| clang(Clang) { | |||
| } | |||
|
|
|||
| visualCpp(VisualCpp) | |||
There was a problem hiding this comment.
4 spaced should be used instead of tabs here and in other places
| @@ -200,9 +208,11 @@ model { | |||
| } | |||
| cpp(CppSourceSet) { | |||
| lib library: "hidApi", linkage: "api" | |||
|
|
|||
| source { | ||
| if (targetPlatform.operatingSystem.windows) { | ||
| if (targetPlatform.operatingSystem.windows) | ||
| { |
There was a problem hiding this comment.
curly brace should be on the same line as if
| @@ -253,7 +263,7 @@ model { | |||
| srcDir "$openZWaveDir/cpp/src" | |||
| srcDir "$openZWaveDir/cpp/src/command_classes" | |||
| srcDir "$openZWaveDir/cpp/src/value_classes" | |||
| srcDir "$openZWaveDir/cpp/src/platform" | |||
| srcDir "$openZWaveDir/cpp/src/platform/" | |||
There was a problem hiding this comment.
don't think that trailing slash is necessary
| @@ -338,6 +351,13 @@ model { | |||
| if (toolChain in Gcc) { | |||
| linker.args "-static", "-lsetupapi" | |||
| } | |||
| else | |||
There was a problem hiding this comment.
please, format code like
if () {
} else if () {
} else {
}
| @@ -1,17 +0,0 @@ | |||
| #build time properties | |||
There was a problem hiding this comment.
it was an example of gradle.properties file, I don't think that we should remove it
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip | ||
| #Sun Sep 25 16:18:33 PDT 2016 | ||
| distributionBase=GRADLE_USER_HOME |
There was a problem hiding this comment.
please, use autocrlf https://help.github.com/en/articles/configuring-git-to-handle-line-endings
| } | ||
| else | ||
| { | ||
| cCompiler.args "/DWIN32", "/D_WINDOWS", "/IC:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/INCLUDE", "/IC:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/ATLMFC/INCLUDE", "/IC:/Program Files (x86)/Windows Kits/10/include/10.0.10586.0/ucrt", "/IC:/Program Files (x86)/Windows Kits/NETFXSDK/4.6.1/include/um", "/IC:/Program Files (x86)/Windows Kits/10/include/10.0.10586.0/shared", "/IC:/Program Files (x86)/Windows Kits/10/include/10.0.10586.0/um", "/IC:/Program Files (x86)/Windows Kits/10/include/10.0.10586.0/winrt" |
There was a problem hiding this comment.
there are many common parts of paths here, it would be nice if it can be moved to reused variables/properties
| @@ -9,96 +9,96 @@ jobject getNotificationType(JNIEnv * env, OpenZWave::Notification::NotificationT | |||
| const char * name; | |||
| switch(ozwNotificationType) | |||
| { | |||
| case OpenZWave::Notification::Type_ValueAdded: | |||
There was a problem hiding this comment.
please, use spaces insead of tabs
| @@ -2125,7 +2165,12 @@ JNIEXPORT void JNICALL Java_org_zwave4j_Manager_addWatcher | |||
| env->NewGlobalRef(notificationWatcher), | |||
| env->NewGlobalRef(context) | |||
| ); | |||
| notificationWatchers[std::pair<jobject, jobject>(notificationWatcher, context)] = pair; | |||
|
|
|||
| // This key is deallocated after this scope closes causing numerous issues. | |||
There was a problem hiding this comment.
I'm quite poor at c++, but I thought that key is copied into a map as it is a value-type. Can you please give an example of issue?
There was a problem hiding this comment.
This was so long ago. I believe what was occurring was it was throwing an exception when removing the watcher because the key was garbage collected. By de-referencing the pointer to the actual structure into that table, it is never garbage collected until' "delete" or "free" is explicitly called on the pointer.
Fixed several crashes
Added new methods from the latest openzwave
Modified build script to build with Visual Studio
there are still some issues with the build script where it doesn't include the dlls in the jar file when building under windows. I wasn't going to create the pull request for that file until' it was complete but github wouldn't allow me to cherry pick commits.