mirror of https://github.com/ARMmbed/mbed-os.git
Revised doxygen comments and fixed code style inconsistencies
parent
aeb91c2598
commit
7f19f8226e
|
@ -72,6 +72,9 @@ public:
|
|||
/** Create an AnalogIn, connected to the specified pin
|
||||
*
|
||||
* @param pinmap reference to structure which holds static pinmap.
|
||||
* @param vref (optional) Reference voltage of this AnalogIn instance (defaults to target.default-adc-vref).
|
||||
*
|
||||
* @note An input voltage at or above the given vref value will produce a 1.0 result when `read` is called
|
||||
*/
|
||||
AnalogIn(const PinMap &pinmap, float vref = MBED_CONF_TARGET_DEFAULT_ADC_VREF);
|
||||
AnalogIn(const PinMap &&, float vref = MBED_CONF_TARGET_DEFAULT_ADC_VREF) = delete; // prevent passing of temporary objects
|
||||
|
@ -79,6 +82,9 @@ public:
|
|||
/** Create an AnalogIn, connected to the specified pin
|
||||
*
|
||||
* @param pin AnalogIn pin to connect to
|
||||
* @param vref (optional) Reference voltage of this AnalogIn instance (defaults to target.default-adc-vref).
|
||||
*
|
||||
* @note An input voltage at or above the given vref value will produce a 1.0 result when `read` is called
|
||||
*/
|
||||
AnalogIn(PinName pin, float vref = MBED_CONF_TARGET_DEFAULT_ADC_VREF);
|
||||
|
||||
|
@ -98,9 +104,11 @@ public:
|
|||
/**
|
||||
* Read the input voltage in volts. The output depends on the target board's
|
||||
* ADC reference voltage (typically equal to supply voltage). The ADC reference voltage
|
||||
* sets the maximum voltage the ADC can quantify (ie: Vin == Vref when ADC output == ADC_MAX_VALUE)
|
||||
* sets the maximum voltage the ADC can quantify (ie: ADC output == ADC_MAX_VALUE when Vin == Vref)
|
||||
*
|
||||
* The target's ADC reference voltage can be configured by overriding "target.adc_vref"
|
||||
* The target's default ADC reference voltage is determined by the configuration
|
||||
* option target.default-adc_vref. The reference voltage for a particular input
|
||||
* can be manually specified by either the constructor or `AnalogIn::set_reference_voltage`.
|
||||
*
|
||||
* @returns A floating-point value representing the current input voltage, measured in volts.
|
||||
*/
|
||||
|
@ -109,8 +117,6 @@ public:
|
|||
/**
|
||||
* Sets this AnalogIn instance's reference voltage.
|
||||
*
|
||||
* Defaults to the configurable MBED_CONF_TARGET_DEFAULT_ADC_VREF setting.
|
||||
*
|
||||
* The AnalogIn's reference voltage is used to scale the output when calling AnalogIn::read_volts
|
||||
*
|
||||
* @param[in] vref New ADC reference voltage for this AnalogIn instance.
|
||||
|
@ -122,7 +128,7 @@ public:
|
|||
*
|
||||
* @returns A floating-point value representing this AnalogIn's reference voltage, measured in volts.
|
||||
*/
|
||||
float get_reference_voltage(void);
|
||||
float get_reference_voltage() const;
|
||||
|
||||
/** An operator shorthand for read()
|
||||
*
|
||||
|
|
|
@ -56,17 +56,17 @@ unsigned short AnalogIn::read_u16()
|
|||
|
||||
float AnalogIn::read_voltage()
|
||||
{
|
||||
return (this->read() * this->_vref);
|
||||
return read() * _vref;
|
||||
}
|
||||
|
||||
void AnalogIn::set_reference_voltage(float vref)
|
||||
{
|
||||
this->_vref = vref;
|
||||
_vref = vref;
|
||||
}
|
||||
|
||||
float AnalogIn::get_reference_voltage(void)
|
||||
float AnalogIn::get_reference_voltage(void) const
|
||||
{
|
||||
return this->_vref;
|
||||
return _vref;
|
||||
}
|
||||
|
||||
} // namespace mbed
|
||||
|
|
Loading…
Reference in New Issue