alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-01 01:11:10 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

spelling: correct many misspellings of celsius

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
This commit is contained in:
Jon Trulson
2016-07-12 16:50:39 -06:00
parent 0fb56356fb
commit baec9966f0
49 changed files with 144 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/t3311/t3311.cxx
View File

@ -34,7 +34,7 @@
using namespace upm;
using namespace std;
// conversion from fahrenheit to celcius and back
// conversion from fahrenheit to celsius and back
static float f2c(float f)
{
@ -133,9 +133,9 @@ T3311::T3311(std::string device, int address, int baud, int bits, char parity,
// our temperature data in.
tmp = readInputReg(REG_UNIT_SETTINGS);
if (tmp & 0x0001)
m_isCelcius = false;
m_isCelsius = false;
else
m_isCelcius = true;
m_isCelsius = true;
// read in the the FW_LO register (BCD encoded) and convert
tmp = readInputReg(REG_FW_LO);
@ -225,7 +225,7 @@ void T3311::update()
// temperature first, we always store as C
float tmpF = float((int16_t)data[0]) / 10.0;
if (m_isCelcius)
if (m_isCelsius)
m_temperature = tmpF;
else
m_temperature = f2c(tmpF);
@ -240,7 +240,7 @@ void T3311::update()
{
// we always store temps in C
tmpF = float((int16_t)data[4]) / 10.0;
if (m_isCelcius)
if (m_isCelsius)
m_dewPointTemperature = tmpF;
else
m_dewPointTemperature = f2c(tmpF);

16
src/t3311/t3311.hpp
View File

@ -90,7 +90,7 @@ namespace upm {
// Advantech-ADAM standard section) in the "Description of
// communications protocols of TXXXX series" document. We use
// it to simply detect whether the device is configured for
// Celcius or Fahrenheit data and compensate internally.
// Celsius or Fahrenheit data and compensate internally.
REG_UNIT_SETTINGS = 0x203F,
@ -144,9 +144,9 @@ namespace upm {
* prior to calling this method.
*
* @param fahrenheit true to return the temperature in degrees
* fahrenheit, false to return the temperature in degrees celcius.
* The default is false (degrees Celcius).
* @return The last temperature reading in Celcius or Fahrenheit
* fahrenheit, false to return the temperature in degrees celsius.
* The default is false (degrees Celsius).
* @return The last temperature reading in Celsius or Fahrenheit
*/
float getTemperature(bool fahrenheit=false);
@ -183,9 +183,9 @@ namespace upm {
* extendedDataAvailable() returns true).
*
* @param fahrenheit true to return the temperature in degrees
* fahrenheit, false to return the temperature in degrees celcius.
* The default is false (degrees Celcius).
* @return The last dew point temperature reading in Celcius or
* fahrenheit, false to return the temperature in degrees celsius.
* The default is false (degrees Celsius).
* @return The last dew point temperature reading in Celsius or
* Fahrenheit
*/
float getDewPointTemperature(bool fahrenheit=false);
@ -281,7 +281,7 @@ namespace upm {
modbus_t *m_mbContext;
// is the device reporting in C or F?
bool m_isCelcius;
bool m_isCelsius;
// Is the device FW > than 2.44?
bool m_isExtendedDataAvailable;