Skip to content

Commit e4ac86f

Browse files
SciFiDryerSciFiDryer
committed
Fixed "hide zero registers" filter to exclude negative values from being filtered.
1 parent 869e71b commit e4ac86f

File tree

3 files changed

+100
-101
lines changed

3 files changed

+100
-101
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
/release/
44
/bookmarks.csv
55
.nextupdatetime
6+
/nbproject/private/
7+
/build/

‎nbproject/project.properties‎

Lines changed: 96 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,96 @@
1-
annotation.processing.enabled=true
2-
annotation.processing.enabled.in.editor=false
3-
annotation.processing.processors.list=
4-
annotation.processing.run.all.processors=true
5-
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
6-
application.title=ModbusMechanic
7-
application.vendor=jamesma
8-
build.classes.dir=${build.dir}/classes
9-
build.classes.excludes=**/*.java,**/*.form
10-
# This directory is removed when the project is cleaned:
11-
build.dir=build
12-
build.generated.dir=${build.dir}/generated
13-
build.generated.sources.dir=${build.dir}/generated-sources
14-
# Only compile against the classpath explicitly listed here:
15-
build.sysclasspath=ignore
16-
build.test.classes.dir=${build.dir}/test/classes
17-
build.test.results.dir=${build.dir}/test/results
18-
# Uncomment to specify the preferred debugger connection transport:
19-
#debug.transport=dt_socket
20-
debug.classpath=\
21-
${run.classpath}
22-
debug.modulepath=\
23-
${run.modulepath}
24-
debug.test.classpath=\
25-
${run.test.classpath}
26-
debug.test.modulepath=\
27-
${run.test.modulepath}
28-
# Files in build.classes.dir which should be excluded from distribution jar
29-
dist.archive.excludes=
30-
# This directory is removed when the project is cleaned:
31-
dist.dir=dist
32-
dist.jar=${dist.dir}/ModbusMechanic.jar
33-
dist.javadoc.dir=${dist.dir}/javadoc
34-
endorsed.classpath=
35-
excludes=
36-
file.reference.etherip.jar=/Users/matthew/Downloads/ModbusMechanic/lib/etherip.jar
37-
file.reference.etherip.jar-1=C:\\Users\\JAMESMA\\Downloads\\etherip-master\\etherip-master\\dist\\etherip.jar
38-
file.reference.jlibmodbus-1.2.9.7.jar=C:\\Users\\JAMESMA\\Downloads\\ModbusMechanic.v2.2.1\\ModbusMechanic\\lib\\jlibmodbus-1.2.9.7.jar
39-
file.reference.jlibmodbus-1.2.9.7.jar-1=C:\\Users\\JAMESMA\\Downloads\\jlibmodbus-1.2.9.7.jar
40-
file.reference.jna-5.12.1.jar-1=C:\\Users\\JAMESMA\\Downloads\\ModbusMechanic.v2.2.1\\ModbusMechanic\\lib\\jna-5.12.1.jar
41-
file.reference.purejavacomm.jar=/Users/matthew/Downloads/purejavacomm.jar
42-
file.reference.purejavacomm.jar-1=C:\\Users\\JAMESMA\\Downloads\\ModbusMechanic.v2.2.1\\ModbusMechanic\\lib\\purejavacomm.jar
43-
includes=**
44-
jar.compress=false
45-
javac.classpath=\
46-
${file.reference.etherip.jar-1}:\
47-
${file.reference.purejavacomm.jar-1}:\
48-
${file.reference.jna-5.12.1.jar-1}:\
49-
${file.reference.jlibmodbus-1.2.9.7.jar}
50-
# Space-separated list of extra javac options
51-
javac.compilerargs=
52-
javac.deprecation=false
53-
javac.external.vm=true
54-
javac.modulepath=
55-
javac.processormodulepath=
56-
javac.processorpath=\
57-
${javac.classpath}
58-
javac.source=1.8
59-
javac.target=1.8
60-
javac.test.classpath=\
61-
${javac.classpath}:\
62-
${build.classes.dir}
63-
javac.test.modulepath=\
64-
${javac.modulepath}
65-
javac.test.processorpath=\
66-
${javac.test.classpath}
67-
javadoc.additionalparam=
68-
javadoc.author=false
69-
javadoc.encoding=${source.encoding}
70-
javadoc.html5=false
71-
javadoc.noindex=false
72-
javadoc.nonavbar=false
73-
javadoc.notree=false
74-
javadoc.private=false
75-
javadoc.splitindex=true
76-
javadoc.use=true
77-
javadoc.version=false
78-
javadoc.windowtitle=
79-
jlink.launcher=false
80-
jlink.launcher.name=ModbusMechanic
81-
main.class=modbusmechanic.ModbusMechanic
82-
manifest.file=manifest.mf
83-
meta.inf.dir=${src.dir}/META-INF
84-
mkdist.disabled=false
85-
platform.active=default_platform
86-
project.license=apache20
87-
run.classpath=\
88-
${javac.classpath}:\
89-
${build.classes.dir}
90-
run.modulepath=\
91-
${javac.modulepath}
92-
run.test.classpath=\
93-
${javac.test.classpath}:\
94-
${build.test.classes.dir}
95-
run.test.modulepath=\
96-
${javac.test.modulepath}
97-
source.encoding=UTF-8
98-
src.dir=src
99-
test.src.dir=test
1+
annotation.processing.enabled=true
2+
annotation.processing.enabled.in.editor=false
3+
annotation.processing.processors.list=
4+
annotation.processing.run.all.processors=true
5+
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
6+
application.title=ModbusMechanic
7+
application.vendor=jamesma
8+
build.classes.dir=${build.dir}/classes
9+
build.classes.excludes=**/*.java,**/*.form
10+
# This directory is removed when the project is cleaned:
11+
build.dir=build
12+
build.generated.dir=${build.dir}/generated
13+
build.generated.sources.dir=${build.dir}/generated-sources
14+
# Only compile against the classpath explicitly listed here:
15+
build.sysclasspath=ignore
16+
build.test.classes.dir=${build.dir}/test/classes
17+
build.test.results.dir=${build.dir}/test/results
18+
# Uncomment to specify the preferred debugger connection transport:
19+
#debug.transport=dt_socket
20+
debug.classpath=\
21+
${run.classpath}
22+
debug.modulepath=\
23+
${run.modulepath}
24+
debug.test.classpath=\
25+
${run.test.classpath}
26+
debug.test.modulepath=\
27+
${run.test.modulepath}
28+
# Files in build.classes.dir which should be excluded from distribution jar
29+
dist.archive.excludes=
30+
# This directory is removed when the project is cleaned:
31+
dist.dir=dist
32+
dist.jar=${dist.dir}/ModbusMechanic.jar
33+
dist.javadoc.dir=${dist.dir}/javadoc
34+
endorsed.classpath=
35+
excludes=
36+
file.reference.etherip.jar=lib/etherip.jar
37+
file.reference.jlibmodbus-1.2.9.7.jar=lib/jlibmodbus-1.2.9.7.jar
38+
file.reference.jna-5.12.1.jar=lib/jna-5.12.1.jar
39+
file.reference.purejavacomm.jar=lib/purejavacomm.jar
40+
includes=**
41+
jar.compress=false
42+
javac.classpath=\
43+
${file.reference.purejavacomm.jar}:\
44+
${file.reference.jna-5.12.1.jar}:\
45+
${file.reference.etherip.jar}:\
46+
${file.reference.jlibmodbus-1.2.9.7.jar}
47+
# Space-separated list of extra javac options
48+
javac.compilerargs=
49+
javac.deprecation=false
50+
javac.external.vm=true
51+
javac.modulepath=
52+
javac.processormodulepath=
53+
javac.processorpath=\
54+
${javac.classpath}
55+
javac.source=1.8
56+
javac.target=1.8
57+
javac.test.classpath=\
58+
${javac.classpath}:\
59+
${build.classes.dir}
60+
javac.test.modulepath=\
61+
${javac.modulepath}
62+
javac.test.processorpath=\
63+
${javac.test.classpath}
64+
javadoc.additionalparam=
65+
javadoc.author=false
66+
javadoc.encoding=${source.encoding}
67+
javadoc.html5=false
68+
javadoc.noindex=false
69+
javadoc.nonavbar=false
70+
javadoc.notree=false
71+
javadoc.private=false
72+
javadoc.splitindex=true
73+
javadoc.use=true
74+
javadoc.version=false
75+
javadoc.windowtitle=
76+
jlink.launcher=false
77+
jlink.launcher.name=ModbusMechanic
78+
main.class=modbusmechanic.ModbusMechanic
79+
manifest.file=manifest.mf
80+
meta.inf.dir=${src.dir}/META-INF
81+
mkdist.disabled=false
82+
platform.active=default_platform
83+
project.license=apache20
84+
run.classpath=\
85+
${javac.classpath}:\
86+
${build.classes.dir}
87+
run.modulepath=\
88+
${javac.modulepath}
89+
run.test.classpath=\
90+
${javac.test.classpath}:\
91+
${build.test.classes.dir}
92+
run.test.modulepath=\
93+
${javac.test.modulepath}
94+
source.encoding=UTF-8
95+
src.dir=src
96+
test.src.dir=test

‎src/modbusmechanic/RegisterScannerFrame.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ public void updateTable()
547547
{
548548
currentElement = ModbusMechanic.byteSwap(currentElement);
549549
}
550-
if (currentElement[0] > 0 || currentElement[1] > 0)
550+
if (currentElement[0] != 0 || currentElement[1] != 0)
551551
{
552552
bothZeros = false;
553553
}
@@ -558,7 +558,7 @@ public void updateTable()
558558
if (i+1 < 65536 && registers[i+1] != null)
559559
{
560560
byte[] nextElement = (byte[])registers[i+1];
561-
if (nextElement[0] > 0 || nextElement[1] > 0)
561+
if (nextElement[0] != 0 || nextElement[1] != 0)
562562
{
563563
bothZeros = false;
564564
}

0 commit comments

Comments
 (0)