Skip to content

Commit 181c2a1

Browse files
aentingeraentinger
committed
Renaming ArduinoCloudProperty.h/.cpp to Property.h/.cpp and moving all property related code to subfolder property
1 parent 08cde49 commit 181c2a1

27 files changed

+37
-38
lines changed

Diff for: ‎extras/test/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ set(TEST_DUT_SRCS
5252
../../src/utility/ota/crc.cpp
5353
../../src/utility/ota/OTALogic.cpp
5454

55+
../../src/property/Property.cpp
5556
../../src/property/PropertyContainer.cpp
5657
../../src/cbor/ArduinoCloudThing.cpp
57-
../../src/cbor/ArduinoCloudProperty.cpp
5858
../../src/cbor/lib/tinycbor/src/cborencoder.c
5959
../../src/cbor/lib/tinycbor/src/cborencoder_close_container_checked.c
6060
../../src/cbor/lib/tinycbor/src/cborerrorstrings.c

Diff for: ‎src/ArduinoIoTCloud.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
#include <Arduino_DebugUtils.h>
2929

3030
#include "cbor/ArduinoCloudThing.h"
31-
#include "property/PropertyContainer.h"
3231

33-
#include "cbor/types/CloudWrapperBool.h"
34-
#include "cbor/types/CloudWrapperFloat.h"
35-
#include "cbor/types/CloudWrapperInt.h"
36-
#include "cbor/types/CloudWrapperString.h"
32+
#include "property/PropertyContainer.h"
33+
#include "property/types/CloudWrapperBool.h"
34+
#include "property/types/CloudWrapperFloat.h"
35+
#include "property/types/CloudWrapperInt.h"
36+
#include "property/types/CloudWrapperString.h"
3737

3838
#include "CloudSerial.h"
3939

Diff for: ‎src/cbor/ArduinoCloudThing.h

+17-18
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,23 @@
2828

2929
#include "../property/PropertyContainer.h"
3030

31-
#include "types/CloudBool.h"
32-
#include "types/CloudFloat.h"
33-
#include "types/CloudInt.h"
34-
#include "types/CloudString.h"
35-
#include "types/CloudLocation.h"
36-
#include "types/CloudColor.h"
37-
#include "types/CloudWrapperBase.h"
38-
39-
#include "types/automation/CloudColoredLight.h"
40-
#include "types/automation/CloudContactSensor.h"
41-
#include "types/automation/CloudDimmedLight.h"
42-
#include "types/automation/CloudLight.h"
43-
#include "types/automation/CloudMotionSensor.h"
44-
#include "types/automation/CloudSmartPlug.h"
45-
#include "types/automation/CloudSwitch.h"
46-
#include "types/automation/CloudTemperature.h"
47-
#include "types/automation/CloudTelevision.h"
48-
31+
#include "../property/types/CloudBool.h"
32+
#include "../property/types/CloudFloat.h"
33+
#include "../property/types/CloudInt.h"
34+
#include "../property/types/CloudString.h"
35+
#include "../property/types/CloudLocation.h"
36+
#include "../property/types/CloudColor.h"
37+
#include "../property/types/CloudWrapperBase.h"
38+
39+
#include "../property/types/automation/CloudColoredLight.h"
40+
#include "../property/types/automation/CloudContactSensor.h"
41+
#include "../property/types/automation/CloudDimmedLight.h"
42+
#include "../property/types/automation/CloudLight.h"
43+
#include "../property/types/automation/CloudMotionSensor.h"
44+
#include "../property/types/automation/CloudSmartPlug.h"
45+
#include "../property/types/automation/CloudSwitch.h"
46+
#include "../property/types/automation/CloudTemperature.h"
47+
#include "../property/types/automation/CloudTelevision.h"
4948

5049
/******************************************************************************
5150
CONSTANTS

Diff for: ‎src/cbor/ArduinoCloudProperty.cpp renamed to ‎src/property/Property.cpp

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

18-
#include "ArduinoCloudProperty.h"
18+
#include "Property.h"
1919

2020
#undef max
2121
#undef min

Diff for: ‎src/cbor/ArduinoCloudProperty.h renamed to ‎src/property/Property.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <list>
3535
#include <functional>
3636

37-
#include "lib/tinycbor/cbor-lib.h"
37+
#include "../cbor/lib/tinycbor/cbor-lib.h"
3838

3939
#define appendAttributesToCloud() appendAttributesToCloudReal(CborEncoder *encoder)
4040
#define appendAttribute(x) appendAttributeReal(x, getAttributeName(#x, '.'), encoder)

Diff for: ‎src/property/PropertyContainer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <algorithm>
2525

26-
#include "../cbor/types/CloudWrapperBase.h"
26+
#include "types/CloudWrapperBase.h"
2727

2828
/******************************************************************************
2929
CTOR/DTOR
@@ -148,4 +148,4 @@ void PropertyContainer::addProperty(ArduinoCloudProperty * property_obj, int pro
148148
property_obj->setIdentifier(_numProperties);
149149
}
150150
_property_list.push_back(property_obj);
151-
}
151+
}

Diff for: ‎src/property/PropertyContainer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
INCLUDE
2323
******************************************************************************/
2424

25-
#include "../cbor/ArduinoCloudProperty.h"
25+
#include "Property.h"
2626

2727
#undef max
2828
#undef min

Diff for: ‎src/cbor/types/CloudBool.h renamed to ‎src/property/types/CloudBool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
******************************************************************************/
2424

2525
#include <Arduino.h>
26-
#include "../ArduinoCloudProperty.h"
26+
#include "../Property.h"
2727

2828
/******************************************************************************
2929
CLASS DECLARATION

Diff for: ‎src/cbor/types/CloudColor.h renamed to ‎src/property/types/CloudColor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <math.h>
2626
#include <Arduino.h>
27-
#include "../ArduinoCloudProperty.h"
27+
#include "../Property.h"
2828

2929
/******************************************************************************
3030
CLASS DECLARATION

Diff for: ‎src/cbor/types/CloudFloat.h renamed to ‎src/property/types/CloudFloat.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
******************************************************************************/
2626

2727
#include <Arduino.h>
28-
#include "../ArduinoCloudProperty.h"
28+
#include "../Property.h"
2929

3030
/******************************************************************************
3131
CLASS DECLARATION

Diff for: ‎src/cbor/types/CloudInt.h renamed to ‎src/property/types/CloudInt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
******************************************************************************/
2424

2525
#include <Arduino.h>
26-
#include "../ArduinoCloudProperty.h"
26+
#include "../Property.h"
2727

2828
/******************************************************************************
2929
CLASS DECLARATION

Diff for: ‎src/cbor/types/CloudLocation.h renamed to ‎src/property/types/CloudLocation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <math.h>
2626
#include <Arduino.h>
27-
#include "../ArduinoCloudProperty.h"
27+
#include "../Property.h"
2828

2929
/******************************************************************************
3030
CLASS DECLARATION

Diff for: ‎src/cbor/types/CloudString.h renamed to ‎src/property/types/CloudString.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
******************************************************************************/
2424

2525
#include <Arduino.h>
26-
#include "../ArduinoCloudProperty.h"
26+
#include "../Property.h"
2727

2828
/******************************************************************************
2929
CLASS DECLARATION

Diff for: ‎src/cbor/types/CloudWrapperBase.h renamed to ‎src/property/types/CloudWrapperBase.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
******************************************************************************/
2424

2525
#include <Arduino.h>
26-
#include "../ArduinoCloudProperty.h"
26+
#include "../Property.h"
2727

2828
/******************************************************************************
2929
CLASS DECLARATION

Diff for: ‎src/cbor/types/CloudWrapperBool.h renamed to ‎src/property/types/CloudWrapperBool.h

File renamed without changes.

Diff for: ‎src/cbor/types/CloudWrapperFloat.h renamed to ‎src/property/types/CloudWrapperFloat.h

File renamed without changes.

Diff for: ‎src/cbor/types/CloudWrapperInt.h renamed to ‎src/property/types/CloudWrapperInt.h

File renamed without changes.

Diff for: ‎src/cbor/types/CloudWrapperString.h renamed to ‎src/property/types/CloudWrapperString.h

File renamed without changes.

Diff for: ‎src/cbor/types/automation/CloudColoredLight.h renamed to ‎src/property/types/automation/CloudColoredLight.h

File renamed without changes.

Diff for: ‎src/cbor/types/automation/CloudContactSensor.h renamed to ‎src/property/types/automation/CloudContactSensor.h

File renamed without changes.

Diff for: ‎src/cbor/types/automation/CloudDimmedLight.h renamed to ‎src/property/types/automation/CloudDimmedLight.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <math.h>
2626
#include <Arduino.h>
27-
#include "../../ArduinoCloudProperty.h"
27+
#include "../../Property.h"
2828

2929
/******************************************************************************
3030
CLASS DECLARATION

Diff for: ‎src/cbor/types/automation/CloudLight.h renamed to ‎src/property/types/automation/CloudLight.h

File renamed without changes.

Diff for: ‎src/cbor/types/automation/CloudMotionSensor.h renamed to ‎src/property/types/automation/CloudMotionSensor.h

File renamed without changes.

Diff for: ‎src/cbor/types/automation/CloudSmartPlug.h renamed to ‎src/property/types/automation/CloudSmartPlug.h

File renamed without changes.

Diff for: ‎src/cbor/types/automation/CloudSwitch.h renamed to ‎src/property/types/automation/CloudSwitch.h

File renamed without changes.

Diff for: ‎src/cbor/types/automation/CloudTelevision.h renamed to ‎src/property/types/automation/CloudTelevision.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
******************************************************************************/
2424

2525
#include <Arduino.h>
26-
#include "../../ArduinoCloudProperty.h"
26+
#include "../../Property.h"
2727

2828
/******************************************************************************
2929
ENUM

Diff for: ‎src/cbor/types/automation/CloudTemperature.h renamed to ‎src/property/types/automation/CloudTemperature.h

File renamed without changes.

0 commit comments

Comments
 (0)