Skip to content

Commit 5bdc209

Browse files
authored
Merge pull request #186 from arduino-libraries/add-cloud-type-alias
Add alias names for various server side used "property types"
2 parents 1f1934c + 0a8fc5b commit 5bdc209

File tree

3 files changed

+42
-13
lines changed

3 files changed

+42
-13
lines changed

extras/test/src/test_decode.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "types/automation/CloudMotionSensor.h"
2525
#include "types/automation/CloudSmartPlug.h"
2626
#include "types/automation/CloudSwitch.h"
27-
#include "types/automation/CloudTemperature.h"
27+
#include "types/automation/CloudTemperatureSensor.h"
2828
#include "types/automation/CloudTelevision.h"
2929

3030
/**************************************************************************************
@@ -368,7 +368,7 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]")
368368
{
369369
PropertyContainer property_container;
370370

371-
CloudTemperature test;
371+
CloudTemperatureSensor test;
372372
test = 0.0f;
373373
addPropertyToContainer(property_container, test, "test", Permission::ReadWrite);
374374

src/property/PropertyContainer.h

+32-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include "types/automation/CloudMotionSensor.h"
4444
#include "types/automation/CloudSmartPlug.h"
4545
#include "types/automation/CloudSwitch.h"
46-
#include "types/automation/CloudTemperature.h"
46+
#include "types/automation/CloudTemperatureSensor.h"
4747
#include "types/automation/CloudTelevision.h"
4848

4949
/******************************************************************************
@@ -58,6 +58,37 @@ extern "C" unsigned long getTime();
5858

5959
typedef std::list<Property *> PropertyContainer;
6060

61+
typedef CloudFloat CloudEnergy;
62+
typedef CloudFloat CloudForce;
63+
typedef CloudFloat CloudTemperature;
64+
typedef CloudFloat CloudPower;
65+
typedef CloudFloat CloudElectricCurrent;
66+
typedef CloudFloat CloudElectricPotention;
67+
typedef CloudFloat CloudElectricResistance;
68+
typedef CloudFloat CloudCapacitance;
69+
typedef CloudFloat CloudTime;
70+
typedef CloudFloat CloudFrequency;
71+
typedef CloudFloat CloudDataRate;
72+
typedef CloudFloat CloudHeartRate;
73+
typedef CloudInt CloudCounter;
74+
typedef CloudFloat CloudAcceleration;
75+
typedef CloudFloat CloudArea;
76+
typedef CloudFloat CloudLenght;
77+
typedef CloudFloat CloudVelocity;
78+
typedef CloudFloat CloudMass;
79+
typedef CloudFloat CloudVolume;
80+
typedef CloudFloat CloudFlowRate;
81+
typedef CloudFloat CloudAngle;
82+
typedef CloudFloat CloudIlluminance;
83+
typedef CloudFloat CloudLuminousFlux;
84+
typedef CloudFloat CloudLuminance;
85+
typedef CloudFloat CloudLuminousIntensity;
86+
typedef CloudFloat CloudLogarithmicQuantity;
87+
typedef CloudFloat CloudPressure;
88+
typedef CloudInt CloudInformationContent;
89+
typedef CloudFloat CloudPercentage;
90+
typedef CloudFloat CloudRelativeHumidity;
91+
6192
/******************************************************************************
6293
FUNCTION DECLARATION
6394
******************************************************************************/

src/property/types/automation/CloudTemperature.h renamed to src/property/types/automation/CloudTemperatureSensor.h

+8-10
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,28 @@
1515
// a commercial license, send an email to [email protected].
1616
//
1717

18-
#ifndef CLOUDTEMPERATURE_H_
19-
#define CLOUDTEMPERATURE_H_
18+
#ifndef CLOUD_TEMPERATURE_SENSOR_H_
19+
#define CLOUD_TEMPERATURE_SENSOR_H_
2020

2121
/******************************************************************************
2222
INCLUDE
2323
******************************************************************************/
2424

25-
#include <Arduino.h>
2625
#include "../CloudFloat.h"
2726

2827
/******************************************************************************
2928
CLASS DECLARATION
3029
******************************************************************************/
3130

32-
33-
34-
class CloudTemperature : public CloudFloat {
35-
private:
31+
class CloudTemperatureSensor : public CloudFloat
32+
{
3633
public:
37-
CloudTemperature& operator=(float v) {
34+
35+
CloudTemperatureSensor & operator = (float v)
36+
{
3837
CloudFloat::operator=(v);
3938
return *this;
4039
}
4140
};
4241

43-
44-
#endif /* CLOUDTEMPERATURE_H_ */
42+
#endif /* CLOUD_TEMPERATURE_SENSOR_H_ */

0 commit comments

Comments
 (0)