From 97752f48378bdd5330a01bda5ddd80798db69213 Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Sat, 22 Oct 2022 12:56:23 +0300 Subject: [PATCH] hmp60: format and optimize --- HMP60Sensor/inc/HMP60.h | 20 +++++++++++--------- HMP60Sensor/src/HMP60.cpp | 27 +++++++++++++++------------ 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/HMP60Sensor/inc/HMP60.h b/HMP60Sensor/inc/HMP60.h index d1e3815..27f07b0 100644 --- a/HMP60Sensor/inc/HMP60.h +++ b/HMP60Sensor/inc/HMP60.h @@ -11,17 +11,19 @@ #include "ModbusMaster.h" #include "ModbusRegister.h" -class HMP60 { +class HMP60 +{ public: - HMP60(); - int readRH(); - int readT(); - virtual ~HMP60(); + HMP60 (); + int readRH (); + int readT (); + virtual ~HMP60 (); + private: - ModbusMaster sens; - ModbusRegister regRHint; - ModbusRegister regRHfloat; - ModbusRegister regTint; + ModbusMaster sens; + ModbusRegister regRHint; + ModbusRegister regRHfloat; + ModbusRegister regTint; }; #endif /* HMP60_H_ */ diff --git a/HMP60Sensor/src/HMP60.cpp b/HMP60Sensor/src/HMP60.cpp index 602d039..bb7c76a 100644 --- a/HMP60Sensor/src/HMP60.cpp +++ b/HMP60Sensor/src/HMP60.cpp @@ -7,23 +7,26 @@ #include -HMP60::HMP60() : sens{241}, regRHint{&sens, 0x0100}, - regTint{&sens, 0x0101}, regRHfloat{&sens, 0x0000} +HMP60::HMP60 () + : sens{ 241 }, regRHint{ &sens, 0x0100 }, regTint{ &sens, 0x0101 }, + regRHfloat{ &sens, 0x0000 } { - sens.begin(9600); + sens.begin (9600); } -int HMP60::readRH() { - int result = regRHint.read(); - return result/10; +inline int +HMP60::readRH () +{ + return (regRHint.read ()) / 10; } -int HMP60::readT() { - int result = regTint.read(); - return result/10; +inline int +HMP60::readT () +{ + return (regTint.read ()) / 10; } -HMP60::~HMP60() { - // TODO Auto-generated destructor stub +HMP60::~HMP60 () +{ + // TODO Auto-generated destructor stub } -