From f2937d249675057f0ae404170eab1fff071f12ad Mon Sep 17 00:00:00 2001 From: mirko12 Date: Sun, 11 Dec 2016 17:14:42 +0100 Subject: [PATCH 1/3] Update MooshimeterDevice.java --- .../mooshimeter/devices/MooshimeterDevice.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/src/main/java/com/mooshim/mooshimeter/devices/MooshimeterDevice.java b/app/src/main/java/com/mooshim/mooshimeter/devices/MooshimeterDevice.java index b6fe3a5..fa97afc 100644 --- a/app/src/main/java/com/mooshim/mooshimeter/devices/MooshimeterDevice.java +++ b/app/src/main/java/com/mooshim/mooshimeter/devices/MooshimeterDevice.java @@ -384,6 +384,24 @@ public MeterReading calculate() { } }; l.add(mid); + mid = new MathInputDescriptor("RESISTANCE (UI METHOD)","Ω") { + @Override + public void onChosen() {} + @Override + public boolean meterSettingsAreValid() { + InputDescriptor id0 = (InputDescriptor)getSelectedDescriptor(Channel.CH1); + InputDescriptor id1 = (InputDescriptor)getSelectedDescriptor(Channel.CH2); + boolean valid = true; + valid &= id0.units.equals("A"); + valid &= id1.units.equals("V"); + return valid; + } + @Override + public MeterReading calculate() { + return MeterReading.ohmUI(getValue(Channel.CH1),getValue(Channel.CH2)); + } + }; + l.add(mid); mid = new MathInputDescriptor("THERMOCOUPLE K","C") { @Override public void onChosen() { From 45079a0fd23f1cd8395797469eae39f5cb89c3db Mon Sep 17 00:00:00 2001 From: mirko12 Date: Sun, 11 Dec 2016 17:15:49 +0100 Subject: [PATCH 2/3] Update MeterReading.java --- .../com/mooshim/mooshimeter/common/MeterReading.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/src/main/java/com/mooshim/mooshimeter/common/MeterReading.java b/app/src/main/java/com/mooshim/mooshimeter/common/MeterReading.java index 1d5da2e..ee157e0 100644 --- a/app/src/main/java/com/mooshim/mooshimeter/common/MeterReading.java +++ b/app/src/main/java/com/mooshim/mooshimeter/common/MeterReading.java @@ -110,4 +110,14 @@ public static MeterReading mult(MeterReading m0, MeterReading m1) { } return rval; } + public static MeterReading ohmUI(MeterReading m0, MeterReading m1) {//for Ω UI method + float res=1e9f; + if (m0.value!=0) {res=(m1.value-m0.value*.09029f)//shunt + fuse + wire + /m0.value;} + return new MeterReading(res , + (m0.n_digits+m1.n_digits)/2, + Math.abs(res*2), + "Ω" + ); + } } From e966fdb10b285928fb016a9e355a25f361643cdb Mon Sep 17 00:00:00 2001 From: mirko12 Date: Sun, 11 Dec 2016 18:22:36 +0100 Subject: [PATCH 3/3] Update MeterReading.java --- .../main/java/com/mooshim/mooshimeter/common/MeterReading.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/mooshim/mooshimeter/common/MeterReading.java b/app/src/main/java/com/mooshim/mooshimeter/common/MeterReading.java index ee157e0..52223a3 100644 --- a/app/src/main/java/com/mooshim/mooshimeter/common/MeterReading.java +++ b/app/src/main/java/com/mooshim/mooshimeter/common/MeterReading.java @@ -83,7 +83,7 @@ public String toString() { final String[] prefixes = new String[]{"n","\u03bc","m","","k","M","G"}; float lval = value; - if(Math.abs(lval) > 1.2*max) { + if(Math.abs(lval) > 1.1*max) { return "OUT OF RANGE"; } StringBuilder retval = new StringBuilder();