Renaming ArduinoCloudProperty.h/.cpp to Property.h/.cpp and moving all property related code to subfolder property

Author: aentinger

extras/test/CMakeLists.txt

@@ -52,9 +52,9 @@ set(TEST_DUT_SRCS
   ../../src/utility/ota/crc.cpp
   ../../src/utility/ota/OTALogic.cpp
 
+  ../../src/property/Property.cpp
   ../../src/property/PropertyContainer.cpp
   ../../src/cbor/ArduinoCloudThing.cpp
-  ../../src/cbor/ArduinoCloudProperty.cpp
   ../../src/cbor/lib/tinycbor/src/cborencoder.c
   ../../src/cbor/lib/tinycbor/src/cborencoder_close_container_checked.c
   ../../src/cbor/lib/tinycbor/src/cborerrorstrings.c

src/ArduinoIoTCloud.h

@@ -28,12 +28,12 @@
 #include <Arduino_DebugUtils.h>
 
 #include "cbor/ArduinoCloudThing.h"
-#include "property/PropertyContainer.h"
 
-#include "cbor/types/CloudWrapperBool.h"
-#include "cbor/types/CloudWrapperFloat.h"
-#include "cbor/types/CloudWrapperInt.h"
-#include "cbor/types/CloudWrapperString.h"
+#include "property/PropertyContainer.h"
+#include "property/types/CloudWrapperBool.h"
+#include "property/types/CloudWrapperFloat.h"
+#include "property/types/CloudWrapperInt.h"
+#include "property/types/CloudWrapperString.h"
 
 #include "CloudSerial.h"
 

src/cbor/ArduinoCloudThing.h

@@ -28,24 +28,23 @@
 
 #include "../property/PropertyContainer.h"
 
-#include "types/CloudBool.h"
-#include "types/CloudFloat.h"
-#include "types/CloudInt.h"
-#include "types/CloudString.h"
-#include "types/CloudLocation.h"
-#include "types/CloudColor.h"
-#include "types/CloudWrapperBase.h"
-
-#include "types/automation/CloudColoredLight.h"
-#include "types/automation/CloudContactSensor.h"
-#include "types/automation/CloudDimmedLight.h"
-#include "types/automation/CloudLight.h"
-#include "types/automation/CloudMotionSensor.h"
-#include "types/automation/CloudSmartPlug.h"
-#include "types/automation/CloudSwitch.h"
-#include "types/automation/CloudTemperature.h"
-#include "types/automation/CloudTelevision.h"
-
+#include "../property/types/CloudBool.h"
+#include "../property/types/CloudFloat.h"
+#include "../property/types/CloudInt.h"
+#include "../property/types/CloudString.h"
+#include "../property/types/CloudLocation.h"
+#include "../property/types/CloudColor.h"
+#include "../property/types/CloudWrapperBase.h"
+
+#include "../property/types/automation/CloudColoredLight.h"
+#include "../property/types/automation/CloudContactSensor.h"
+#include "../property/types/automation/CloudDimmedLight.h"
+#include "../property/types/automation/CloudLight.h"
+#include "../property/types/automation/CloudMotionSensor.h"
+#include "../property/types/automation/CloudSmartPlug.h"
+#include "../property/types/automation/CloudSwitch.h"
+#include "../property/types/automation/CloudTemperature.h"
+#include "../property/types/automation/CloudTelevision.h"
 
 /******************************************************************************
    CONSTANTS

src/cbor/ArduinoCloudProperty.cpp renamed to src/property/Property.cpp

@@ -15,7 +15,7 @@
 // a commercial license, send an email to [email protected].
 //
 
-#include "ArduinoCloudProperty.h"
+#include "Property.h"
 
 #undef max
 #undef min

src/cbor/ArduinoCloudProperty.h renamed to src/property/Property.h

@@ -34,7 +34,7 @@
 #include <list>
 #include <functional>
 
-#include "lib/tinycbor/cbor-lib.h"
+#include "../cbor/lib/tinycbor/cbor-lib.h"
 
 #define appendAttributesToCloud() appendAttributesToCloudReal(CborEncoder *encoder)
 #define appendAttribute(x) appendAttributeReal(x, getAttributeName(#x, '.'), encoder)

src/property/PropertyContainer.cpp

@@ -23,7 +23,7 @@
 
 #include <algorithm>
 
-#include "../cbor/types/CloudWrapperBase.h"
+#include "types/CloudWrapperBase.h"
 
 /******************************************************************************
    CTOR/DTOR
@@ -148,4 +148,4 @@ void PropertyContainer::addProperty(ArduinoCloudProperty * property_obj, int pro
     property_obj->setIdentifier(_numProperties);
   }
   _property_list.push_back(property_obj);
-}
+}

src/property/PropertyContainer.h

@@ -22,7 +22,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "../cbor/ArduinoCloudProperty.h"
+#include "Property.h"
 
 #undef max
 #undef min

src/cbor/types/CloudBool.h renamed to src/property/types/CloudBool.h

@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <Arduino.h>
-#include "../ArduinoCloudProperty.h"
+#include "../Property.h"
 
 /******************************************************************************
    CLASS DECLARATION

src/cbor/types/CloudColor.h renamed to src/property/types/CloudColor.h

@@ -24,7 +24,7 @@
 
 #include <math.h>
 #include <Arduino.h>
-#include "../ArduinoCloudProperty.h"
+#include "../Property.h"
 
 /******************************************************************************
    CLASS DECLARATION

src/cbor/types/CloudFloat.h renamed to src/property/types/CloudFloat.h

@@ -25,7 +25,7 @@
  ******************************************************************************/
 
 #include <Arduino.h>
-#include "../ArduinoCloudProperty.h"
+#include "../Property.h"
 
 /******************************************************************************
    CLASS DECLARATION

src/cbor/types/CloudInt.h renamed to src/property/types/CloudInt.h

@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <Arduino.h>
-#include "../ArduinoCloudProperty.h"
+#include "../Property.h"
 
 /******************************************************************************
    CLASS DECLARATION

src/cbor/types/CloudLocation.h renamed to src/property/types/CloudLocation.h

@@ -24,7 +24,7 @@
 
 #include <math.h>
 #include <Arduino.h>
-#include "../ArduinoCloudProperty.h"
+#include "../Property.h"
 
 /******************************************************************************
    CLASS DECLARATION

src/cbor/types/CloudString.h renamed to src/property/types/CloudString.h

@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <Arduino.h>
-#include "../ArduinoCloudProperty.h"
+#include "../Property.h"
 
 /******************************************************************************
    CLASS DECLARATION

src/cbor/types/CloudWrapperBase.h renamed to src/property/types/CloudWrapperBase.h

@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <Arduino.h>
-#include "../ArduinoCloudProperty.h"
+#include "../Property.h"
 
 /******************************************************************************
    CLASS DECLARATION

src/cbor/types/CloudWrapperBool.h renamed to src/property/types/CloudWrapperBool.h

@@ -24,7 +24,7 @@
 
 #include <math.h>
 #include <Arduino.h>
-#include "../../ArduinoCloudProperty.h"
+#include "../../Property.h"
 
 /******************************************************************************
    CLASS DECLARATION

src/cbor/types/CloudWrapperFloat.h renamed to src/property/types/CloudWrapperFloat.h

@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include <Arduino.h>
-#include "../../ArduinoCloudProperty.h"
+#include "../../Property.h"
 
 /******************************************************************************
    ENUM