Skip to content

Resistance UI method #53

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: beta
Choose a base branch
from
Open

Resistance UI method #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2937d2
Update MooshimeterDevice.java
mirko12 Dec 11, 2016
45079a0
Update MeterReading.java
mirko12 Dec 11, 2016
e966fdb
Update MeterReading.java
mirko12 Dec 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion app/src/main/java/com/mooshim/mooshimeter/common/MeterReading.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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),
"Ω"
);
}
}
18 changes: 18 additions & 0 deletions app/src/main/java/com/mooshim/mooshimeter/devices/MooshimeterDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down