Merge pull request #909 from chille/multimeter

Multimeter: Added modes for resistance, capacitance, continuity and diode test

Author: azonenberg

scopehal/Multimeter.cpp

@@ -57,6 +57,14 @@ Unit Multimeter::GetMeterUnit()
 		case Multimeter::AC_CURRENT:
 			return Unit(Unit::UNIT_AMPS);
 
+		case Multimeter::RESISTANCE:
+		case Multimeter::CONTINUITY:
+			return Unit(Unit::UNIT_OHMS);
+
+		case Multimeter::CAPACITANCE:
+			return Unit(Unit::UNIT_FARADS);
+
+		case Multimeter::DIODE:
 		case Multimeter::DC_VOLTAGE:
 		case Multimeter::DC_RMS_AMPLITUDE:
 		case Multimeter::AC_RMS_AMPLITUDE:
@@ -79,6 +87,14 @@ Unit Multimeter::GetSecondaryMeterUnit()
 		case Multimeter::AC_CURRENT:
 			return Unit(Unit::UNIT_AMPS);
 
+		case Multimeter::RESISTANCE:
+		case Multimeter::CONTINUITY:
+			return Unit(Unit::UNIT_OHMS);
+
+		case Multimeter::CAPACITANCE:
+			return Unit(Unit::UNIT_FARADS);
+
+		case Multimeter::DIODE:
 		case Multimeter::DC_VOLTAGE:
 		case Multimeter::DC_RMS_AMPLITUDE:
 		case Multimeter::AC_RMS_AMPLITUDE:
@@ -108,6 +124,14 @@ string Multimeter::ModeToText(MeasurementTypes type)
 			return "DC RMS Amplitude";
 		case Multimeter::AC_RMS_AMPLITUDE:
 			return "AC RMS Amplitude";
+		case Multimeter::RESISTANCE:
+			return "Resistance";
+		case Multimeter::CAPACITANCE:
+			return "Capacitance";
+		case Multimeter::CONTINUITY:
+			return "Continuity";
+		case Multimeter::DIODE:
+			return "Diode";
 
 		default:
 			return "";
@@ -133,6 +157,14 @@ Multimeter::MeasurementTypes Multimeter::TextToMode(const string& mode)
 		return Multimeter::DC_RMS_AMPLITUDE;
 	else if(mode == "AC RMS Amplitude")
 		return Multimeter::AC_RMS_AMPLITUDE;
+	else if(mode == "Resistance")
+		return Multimeter::RESISTANCE;
+	else if(mode == "Capacitance")
+		return Multimeter::CAPACITANCE;
+	else if(mode == "Continuity")
+		return Multimeter::CONTINUITY;
+	else if(mode == "Diode")
+		return Multimeter::DIODE;
 
 	//invalid / unknown
 	return Multimeter::DC_VOLTAGE;

scopehal/Multimeter.h

@@ -45,15 +45,20 @@ class Multimeter : public virtual Instrument
 
 	enum MeasurementTypes
 	{
-		NONE				= 0x00,
-
-		DC_VOLTAGE			= 0x01,
-		DC_RMS_AMPLITUDE	= 0x02,
-		AC_RMS_AMPLITUDE	= 0x04,
-		FREQUENCY			= 0x08,
-		DC_CURRENT			= 0x10,
-		AC_CURRENT			= 0x20,
-		TEMPERATURE			= 0x40
+		NONE				= 0x000,
+
+		DC_VOLTAGE			= 0x001,
+		DC_RMS_AMPLITUDE	= 0x002,
+		AC_RMS_AMPLITUDE	= 0x004,
+		FREQUENCY			= 0x008,
+		DC_CURRENT			= 0x010,
+		AC_CURRENT			= 0x020,
+		TEMPERATURE			= 0x040,
+		RESISTANCE			= 0x080,
+		CAPACITANCE			= 0x100,
+		CONTINUITY			= 0x200,
+		DIODE				= 0x400
+
 
 		//TODO: other types
 	};

scopehal/Unit.cpp

@@ -112,6 +112,8 @@ Unit::Unit(const string& rhs)
 		m_type = UNIT_W_M2;
 	else if(rhs == "μA")
 		m_type = UNIT_MICROAMPS;
+	else if(rhs == "F")
+		m_type = UNIT_FARADS;
 	else
 		LogWarning("Unrecognized unit \"%s\"\n", rhs.c_str());
 }
@@ -213,6 +215,9 @@ string Unit::ToString() const
 		case UNIT_W_M2:
 			return "W/m²";
 
+		case UNIT_FARADS:
+			return "F";
+
 		default:
 			return "unknown";
 	}
@@ -491,6 +496,10 @@ void Unit::GetUnitSuffix(UnitType type, double num, double& scaleFactor, string&
 			suffix = "RPM";
 			break;
 
+		case UNIT_FARADS:
+			suffix = "F";
+			break;
+
 		//Angular degrees do not use SI prefixes
 		case UNIT_DEGREES:
 			suffix = "°";

scopehal/Unit.h

@@ -102,6 +102,8 @@ class Unit
 
 		UNIT_MICROAMPS,		//Another hack for current in the X axis
 
+		UNIT_FARADS,		//Capacitance in farads
+
 		//TODO: more here
 	};