put all defines in a common include file.

src/prog/domod/builders/cmake/CMakeLists.txt

@@ -8,6 +8,7 @@ set (CMAKE_CXX_STANDARD 11)
 include (br)
 
 include_directories(${workspaceRoot}/src/prog/domod/src)
+include_directories(${workspaceRoot}/src/prog/domod/include)
 
 #set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror=strict-aliasing")
 

src/prog/domod/include/domo.h

@@ -0,0 +1,58 @@
+/*!
+ * domo.h
+ *
+ * Copyright (c) 2016-2018, NADAL Jean-Baptiste. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ * 
+ * @Author:  NADAL Jean-Baptiste
+ * @Date: 10/04/2018
+ *
+ */
+
+#ifndef _DOMO_H
+#define _DOMO_H
+
+/*------------------------------- DEFINES ----------------------------------*/
+
+/* Device */
+
+/* Device type. */
+#define kLightEntry "Lights"
+#define kShutterEntry "Shutters"
+#define kSprinklerEntry "Sprinklers"
+
+#define k_entry_data "data"
+
+/* common */
+#define k_entry_id "id"
+#define k_entry_name "name"
+#define k_entry_speach_name "speach_name"
+#define k_entry_zone "zone"
+#define k_entry_state "state"
+#define k_entry_sender "sender"
+#define k_entry_interruptor "interruptor"
+
+
+/* shutter */
+#define k_entry_speed_up "speed_up"
+#define k_entry_speed_down "speed_down"
+
+
+/* Timer */
+
+
+#endif /* _DOMO_H */

src/prog/domod/src/devices/device.cpp

@@ -29,6 +29,8 @@
 
 #include <json-c/json.h>
 
+#include "domo.h"
+
 #include "devices/device.h"
 
 /*!  ----------------------------------------------------------------------------

src/prog/domod/src/devices/device.h

@@ -34,10 +34,6 @@
 
 struct json_object;
 
-/*------------------------------- DEFINES ----------------------------------*/
-
-#define k_entry_speach_name "speach_name"
-#define k_entry_data "data"
 
 /*--------------------------------- CLASS ----------------------------------*/
 

src/prog/domod/src/devices/devices-manager.cpp

@@ -26,11 +26,12 @@
 /*------------------------------- INCLUDES ----------------------------------*/
 
 #include <cstdio>
-#include <fstream>
 
 #include <json-c/json.h>
 #include <json-c/json_util.h>
 
+#include "domo.h"
+
 #include "devices/devices-manager.h"
 
 /*!  ----------------------------------------------------------------------------

src/prog/domod/src/devices/devices-manager.h

@@ -36,12 +36,6 @@
 
 #include "devices/device.h"
 
-/*------------------------------- DEFINES ----------------------------------*/
-
-#define kLightEntry "Lights"
-#define kShutterEntry "Shutters"
-#define kSprinklerEntry "Sprinklers"
-
 /*---------------------------------- Deps -----------------------------------*/
 
 /*--------------------------------- CLASS ----------------------------------*/

src/prog/domod/src/devices/light-device.cpp

@@ -29,7 +29,7 @@
 
 #include <json-c/json.h>
 
-#include "devices/light.h"
+#include "domo.h"
 
 #include "devices/light-device.h"
 

src/prog/domod/src/devices/light-device.h

@@ -33,8 +33,6 @@
 #include "devices/light.h"
 #include "devices/device.h"
 
-/*---------------------------------- Deps -----------------------------------*/
-
 /*--------------------------------- CLASS ----------------------------------*/
 
 class LightDevice : public Device

src/prog/domod/src/devices/light.cpp

@@ -31,6 +31,8 @@
 
 #include <ubus-cpp/ubus-call.h>
 
+#include "domo.h"
+
 #include "devices/light.h"
 
 

src/prog/domod/src/devices/light.h

@@ -32,16 +32,6 @@
 
 #include <string>
 
-/*------------------------------- DEFINES ----------------------------------*/
-
-#define k_entry_id "id"
-#define k_entry_name "name"
-#define k_entry_speach_name "speach_name"
-#define k_entry_zone "zone"
-#define k_entry_state "state"
-#define k_entry_sender "sender"
-#define k_entry_interruptor "interruptor"
-
 /*---------------------------------- Deps -----------------------------------*/
 
 struct json_object;

src/prog/domod/src/devices/shutter-device.cpp

@@ -29,6 +29,8 @@
 
 #include <json-c/json.h>
 
+#include "domo.h"
+
 #include "devices/shutter-device.h"
 
 /*!  ----------------------------------------------------------------------------

src/prog/domod/src/devices/shutter-device.h

@@ -33,8 +33,6 @@
 #include "devices/shutter.h"
 #include "devices/device.h"
 
-/*---------------------------------- Deps -----------------------------------*/
-
 /*--------------------------------- CLASS ----------------------------------*/
 
 class ShutterDevice : public Device

src/prog/domod/src/devices/shutter.cpp

@@ -31,6 +31,8 @@
 
 #include <ubus-cpp/ubus-call.h>
 
+#include "domo.h"
+
 #include "devices/shutter.h"
 
 

src/prog/domod/src/devices/shutter.h

@@ -32,18 +32,6 @@
 
 #include <string>
 
-/*------------------------------- DEFINES ----------------------------------*/
-
-#define k_entry_id "id"
-#define k_entry_name "name"
-#define k_entry_speach_name "speach_name"
-#define k_entry_zone "zone"
-#define k_entry_state "state"
-#define k_entry_sender "sender"
-#define k_entry_interruptor "interruptor"
-#define k_entry_speed_up "speed_up"
-#define k_entry_speed_down "speed_down"
-
 /*---------------------------------- Deps -----------------------------------*/
 
 struct json_object;

src/prog/domod/src/devices/sprinkler-device.cpp

@@ -29,6 +29,8 @@
 
 #include <json-c/json.h>
 
+#include "domo.h"
+
 #include "devices/sprinkler-device.h"
 
 /*!  ----------------------------------------------------------------------------

src/prog/domod/src/devices/sprinkler-device.h

@@ -33,8 +33,6 @@
 #include "devices/sprinkler.h"
 #include "devices/device.h"
 
-/*---------------------------------- Deps -----------------------------------*/
-
 /*--------------------------------- CLASS ----------------------------------*/
 
 class SprinklerDevice : public Device

src/prog/domod/src/devices/sprinkler.cpp

@@ -31,8 +31,11 @@
 
 #include <ubus-cpp/ubus-call.h>
 
+#include "domo.h"
+
 #include "devices/sprinkler.h"
 
+/*------------------------------- DEFINES ----------------------------------*/
 
 #define k_entry_station "station"
 

src/prog/domod/src/devices/sprinkler.h

@@ -32,13 +32,6 @@
 
 #include <string>
 
-/*------------------------------- DEFINES ----------------------------------*/
-
-#define k_entry_id "id"
-#define k_entry_name "name"
-#define k_entry_speach_name "speach_name"
-#define k_entry_state "state"
-
 /*---------------------------------- Deps -----------------------------------*/
 
 struct json_object;

src/prog/domod/src/timers/event.cpp

@@ -29,6 +29,8 @@
 
 #include "devices/devices-manager.h"
 
+#include "domo.h"
+
 #include "timers/event.h"
 
 /*------------------------------- DEFINES ----------------------------------*/

src/prog/domod/src/ubus/capabilities_lights.cpp

@@ -33,6 +33,8 @@ extern "C" {
 
 #include "devices/devices-manager.h"
 
+#include "domo.h"
+
 #include "capabilities_lights.h"
 
 namespace

src/prog/domod/src/ubus/capabilities_shutters.cpp

@@ -33,6 +33,8 @@ extern "C" {
 
 #include "devices/devices-manager.h"
 
+#include "domo.h"
+
 #include "capabilities_shutters.h"
 
 namespace

src/prog/domod/src/ubus/capabilities_sprinklers.cpp

@@ -35,6 +35,8 @@ extern "C" {
 
 #include "devices/devices-manager.h"
 
+#include "domo.h"
+
 #include "capabilities_sprinklers.h"
 
 namespace