OpenWebNet: change wait time between energy totalizer request (#2104)

* OpenWebNet: bug fix and burglar alarm battery, network and maintenance status and fix warnings

Fix wrong automatic creation of auxiliary device and update status of
dry contact, introduced with the development of CEN PLUS commands.

'Unit' must be left free for the interface, so the alarm zone is used as
the 'where' and not as 'interface' in UpdateAlarm function.
After this update, the alarm device will have a different ID.
Adding devices to battery status, network status and alarm maintenance.

* OpenWebNet: fix close socket command problem

* OpenWebNet: GEN, AREA and GROUP devices

Author: Spugna85

hardware/OpenWebNetTCP.cpp

@@ -36,6 +36,9 @@ License: Public domain
 #define OPENWEBNET_BUFFER_SIZE          1024
 #define OPENWEBNET_SOCKET_SUCCESS       0
 
+#define	SCAN_TIME_REQ_AUTO_UPDATE_POWER	(14400) // 4hour = 240min = 14400sec
+#define SCAN_TIME_REQ_ENERGY_TOTALIZER	(900)	// 15min = 900sec
+
 #define OPENWEBNET_GROUP_ID				0x00008000
 
 #define OPENWEBNET_AUTOMATION					"AUTOMATION"
@@ -50,7 +53,7 @@ License: Public domain
 #define OPENWEBNET_AUXILIARY					"AUXILIARY"
 #define OPENWEBNET_DRY_CONTACT					"DRYCONTACT"
 #define OPENWEBNET_ENERGY_MANAGEMENT			"ENERGY MANAGEMENT"
-
+#define OPENWEBNET_SOUND_DIFFUSION				"SOUND DIFFUSION"
 
 /**
     Create new hardware OpenWebNet instance
@@ -85,6 +88,7 @@ bool COpenWebNetTCP::StartHardware()
 	m_stoprequested = false;
 	m_bIsStarted = true;
 	mask_request_status = 0x1; // Set scan all devices
+	LastScanTimeEnergy = LastScanTimeEnergyTot = 0;	// Force first request command
 
 	//Start monitor thread
 	m_monitorThread = boost::shared_ptr<boost::thread>(new boost::thread(boost::bind(&COpenWebNetTCP::MonitorFrames, this)));
@@ -1075,11 +1079,13 @@ void COpenWebNetTCP::UpdateDeviceValue(vector<bt_openwebnet>::iterator iter)
 		case WHO_SCENARIO_SCHEDULER_SWITCH:             // 15
 		case WHO_AUDIO:                                 // 16
 		case WHO_SCENARIO_PROGRAMMING:                  // 17
+		case WHO_SOUND_DIFFUSION:						// 22
 		case WHO_LIHGTING_MANAGEMENT:                   // 24
 		case WHO_ZIGBEE_DIAGNOSTIC:                     // 1000
 		case WHO_AUTOMATIC_DIAGNOSTIC:                  // 1001
 		case WHO_THERMOREGULATION_DIAGNOSTIC_FAILURES:  // 1004
 		case WHO_DEVICE_DIAGNOSTIC:                     // 1013
+		case WHO_ENERGY_MANAGEMENT_DIAGNOSTIC:			// 1018
 			_log.Log(LOG_ERROR, "COpenWebNetTCP: Who=%s not yet supported!", who.c_str());
 			return;
 		default:
@@ -1564,14 +1570,13 @@ void COpenWebNetTCP::Do_Work()
 
 		sleep_seconds(OPENWEBNET_HEARTBEAT_DELAY);
 
-		if ((mytime(NULL) - LastScanTimeEnergy) > 300)
+		if ((mytime(NULL) - LastScanTimeEnergy) > SCAN_TIME_REQ_AUTO_UPDATE_POWER)
 		{
-			
-			requestAutomaticUpdatePower(300 / 60);
+			requestAutomaticUpdatePower(255); // automatic update for 255 minutes
 			LastScanTimeEnergy = mytime(NULL);
 		}
 
-		if ((mytime(NULL) - LastScanTimeEnergyTot) > 30)
+		if ((mytime(NULL) - LastScanTimeEnergyTot) > SCAN_TIME_REQ_ENERGY_TOTALIZER)
 		{
 			requestEnergyTotalizer();
 			LastScanTimeEnergyTot = mytime(NULL);

hardware/openwebnet/bt_openwebnet.h

@@ -16,19 +16,8 @@
 #define OPENWEBNET_COMMAND_SOCKET_DURATION 30
 
 
-typedef enum {
-	TEMPERATURE_CONTROL_DIMENSION_TEMPERATURE = 0,
-	TEMPERATURE_CONTROL_DIMENSION_FAN_COIL_SPEED = 11,
-	TEMPERATURE_CONTROL_DIMENSION_COMPLETE_PROBE_STATUS = 12,
-	TEMPERATURE_CONTROL_DIMENSION_LOCAL_SET_OFFSET = 13,
-	TEMPERATURE_CONTROL_DIMENSION_SET_POINT_TEMPERATURE = 14,
-	TEMPERATURE_CONTROL_DIMENSION_VALVES_STATUS = 19,
-	TEMPERATURE_CONTROL_DIMENSION_ACTUATOR_STATUS = 20,
-	TEMPERATURE_CONTROL_DIMENSION_SPLIT_CONTROL = 22,
-	TEMPERATURE_CONTROL_DIMENSION_END_DATE_HOLIDAY_SCENARIO = 30
-}_eTemperatureControlDimension;
-
-typedef enum {
+// OpenWebNet Who
+enum {
 	WHO_SCENARIO = 0,
 	WHO_LIGHTING = 1,
 	WHO_AUTOMATION = 2,
@@ -52,11 +41,12 @@ typedef enum {
 	WHO_THERMOREGULATION_DIAGNOSTIC_FAILURES = 1004,
 	WHO_DEVICE_DIAGNOSTIC = 1013,
 	WHO_ENERGY_MANAGEMENT_DIAGNOSTIC = 1018
-}_eWho;
+};
 
 //"What" enumerations
 
-typedef enum  {
+// Scenario what
+enum  {
 	SCENARIO_WHAT_SCENARIO1 = 1,
 	SCENARIO_WHAT_SCENARIO2 = 2,
 	SCENARIO_WHAT_SCENARIO3 = 3,
@@ -84,9 +74,10 @@ typedef enum  {
 	SCENARIO_WHAT_UNLOCK_SCENARIO_CENTRAL_UNIT = 44,
 	SCENARIO_WHAT_UNAVAILABLE_SCENARIOS_CENTRAL_UNIT = 45,
 	SCENARIO_WHAT_ERASE_SCENARIOS_CENTRAL_UNIT = 46
-}_eScenarioWhat;
+};
 
-typedef enum  {
+// Lighting what
+enum  {
 	LIGHTING_WHAT_OFF = 0,
 	LIGHTING_WHAT_ON = 1,
 	LIGHTING_WHAT_20 = 2,
@@ -119,31 +110,34 @@ typedef enum  {
 	LIGHTING_WHAT_UP_ONE_LEVEL = 30,
 	LIGHTING_WHAT_DOWN_ONE_LEVEL = 31,
 	LIGHTING_WHAT_COMMAND_TRANSLATION = 1000
-}_eLightingWhat;
-
+};
 
-typedef enum {
+// Auxiliary what
+enum {
 	AUXILIARY_WHAT_OFF = 0,
 	AUXILIARY_WHAT_ON = 1
-}_eAuxiliaryWhat;
+};
 
-typedef enum {
+// Automation what
+enum {
 	AUTOMATION_WHAT_STOP = 0,
 	AUTOMATION_WHAT_UP = 1,
 	AUTOMATION_WHAT_DOWN = 2,
 	AUTOMATION_WHAT_STOP_ADVANCED = 10,
 	AUTOMATION_WHAT_UP_ADVANCED = 11,
 	AUTOMATION_WHAT_DOWN_ADVANCED = 12
-}_eAutomationWhat;
+};
 
-typedef enum {
+// Load control what
+enum {
 	LOAD_CONTROL_WHAT_DISABLED = 0,
 	LOAD_CONTROL_WHAT_ENABLED = 1,
 	LOAD_CONTROL_WHAT_FORCED = 2,
 	LOAD_CONTROL_WHAT_REMOVE_FORCED = 3
-}_eLoadControlWhat;
+};
 
-typedef enum {
+// Sound Diffusion what
+enum {
 	SOUND_DIFFUSION_WHAT_TURN_OFF = 0,
 	SOUND_DIFFUSION_WHAT_TURN_ON = 1,
 	SOUND_DIFFUSION_WHAT_SOURCE_TURNED_ON = 2,
@@ -169,57 +163,99 @@ typedef enum {
 	SOUND_DIFFUSION_WHAT_BALANCE_RIGHT_TO_LEFT = 43,
 	SOUND_DIFFUSION_WHAT_NEXT_PRESET = 55,
 	SOUND_DIFFUSION_WHAT_PREVIOUS_PRESET = 56
-}_eSoundDiffusionWhat;
+};
 
-typedef enum {
+// Dry Contact IR Detection what
+enum {
 	DRY_CONTACT_IR_DETECTION_WHAT_ON = 31,
 	DRY_CONTACT_IR_DETECTION_WHAT_OFF = 32
-}_eDryContactIrDetectionWhat;
+};
 
-typedef enum {
+// Dry Contact IR Detection parameters
+enum {
 	DRY_CONTACT_IR_DETECTION_WHAT_PARAM_STATUS_REQUESTED = 0,
 	DRY_CONTACT_IR_DETECTION_WHAT_PARAM_EVENT_OCCURRED = 1
-}_eDryContactIrDetectionWhatParameters;
+};
 
-typedef enum {
+// Scenarion Programmin what
+enum {
 	SCENARIO_PROGRAMMING_WHAT_START_SCENE = 1,
 	SCENARIO_PROGRAMMING_WHAT_STOP_SCENE = 2,
 	SCENARIO_PROGRAMMING_WHAT_ENABLE_SCENE = 3,
 	SCENARIO_PROGRAMMING_WHAT_DISABLE_SCENE = 4
-}_eScenarioProgrammingWhat;
+};
 
 //"Where" enumerations
 
-typedef enum {
+// Load Control where
+enum {
 	LOAD_CONTROL_WHERE_GENERAL = 0,
 	LOAD_CONTROL_WHERE_CONTRL_UNIT = 10
-}_eLoadControlWhere;
+};
+
+/* sound diffusion Where (WHO=22) */
+/*
+|Description	|	Value
+--------------------------------------
+|Source			|	2#sourceID		  |
+|Speaker		|	3#area#point	  |
+|Speaker Area	|	4#area			  |
+|General		|	5#sender_address  |
+|All Source		|	6				  |
+--------------------------------------
+*/
+enum {
+	WHERE_SOUND_DIFFUSION_SOURCE = 2,
+	WHERE_SOUND_DIFFUSION_SPEAKER = 3,
+	WHERE_SOUND_DIFFUSION_SPEAKER_AREA = 4,
+	WHERE_SOUND_DIFFUSION_GENERAL = 5,
+	WHERE_SOUND_DIFFUSION_ALL_SOURCE = 6,
+	MAX_WHERE_SOUND = 7
+};
+
 
 //"Dimensions" enumerations
 
-typedef enum {
+// Lighting dimension
+enum {
 	LIGHTING_DIMENSION_SET_UP_LEVEL_WITH_GIVEN_SPEED = 1,
 	LIGHTING_DIMENSION_TEMPORISATION = 2,
 	LIGHTING_DIMENSION_REQUIRED_ONLY_ON_LIGHT = 3,
 	LIGHTING_DIMENSION_STATUS_DIMMER_100_LEVELS_WITH_GIVEN_SPEED = 4,
 	LIGHTING_DIMENSION_WORKING_TIME_LAMP = 8,
 	LIGHTING_DIMENSION_MAX_WORKING_TIME_LAMP = 9
-}_eLightingDimension;
+};
 
-typedef enum  {
+// Automation dimension
+enum  {
 	AUTOMATION_DIMENSION_SHUTTER_STATUS = 10,
 	AUTOMATION_DIMENSION_GOTO_LEVEL = 11
-}_eAutomationDimension;
+};
 
-typedef enum{
+// temperature Control dimension
+enum {
+	TEMPERATURE_CONTROL_DIMENSION_TEMPERATURE = 0,
+	TEMPERATURE_CONTROL_DIMENSION_FAN_COIL_SPEED = 11,
+	TEMPERATURE_CONTROL_DIMENSION_COMPLETE_PROBE_STATUS = 12,
+	TEMPERATURE_CONTROL_DIMENSION_LOCAL_SET_OFFSET = 13,
+	TEMPERATURE_CONTROL_DIMENSION_SET_POINT_TEMPERATURE = 14,
+	TEMPERATURE_CONTROL_DIMENSION_VALVES_STATUS = 19,
+	TEMPERATURE_CONTROL_DIMENSION_ACTUATOR_STATUS = 20,
+	TEMPERATURE_CONTROL_DIMENSION_SPLIT_CONTROL = 22,
+	TEMPERATURE_CONTROL_DIMENSION_END_DATE_HOLIDAY_SCENARIO = 30
+};
+
+// Load Control dimension
+enum{
 	LOAD_CONTROL_WHAT_ALL_DIMENSIONS = 0,
 	LOAD_CONTROL_WHAT_VOLTAGE = 1,
 	LOAD_CONTROL_WHAT_CURRENT = 2,
 	LOAD_CONTROL_WHAT_POWER = 3,
 	LOAD_CONTROL_WHAT_ENERGY = 4
-}_eLoadControlDimension;
+};
 
-typedef enum {
+// Energy Management dimension
+enum {
 	ENERGY_MANAGEMENT_DIMENSION_ACTIVE_POWER = 113,
 	ENERGY_MANAGEMENT_DIMENSION_END_AUTOMATIC_UPDATE = 1200,
 	ENERGY_MANAGEMENT_DIMENSION_ENERGY_TOTALIZER = 51,
@@ -247,7 +283,24 @@ typedef enum {
 	ENERGY_MANAGEMENT_DIMENSION_STATUS_STOPGO_MONTHLY_AVERAGE_HOURLY_BASIS_FOR_16BIT_MEDIA_DAILY_GRAPHICS = 512,
 	ENERGY_MANAGEMENT_DIMENSION_STATUS_STOPGO_MONTHLY_TOTALIZERS_CURRENT_YEAR_DAILY_BASIS_FOR_32BIT_MONTHLY_GRAPHICS = 513,
 	ENERGY_MANAGEMENT_DIMENSION_STATUS_STOPGO_MONTHLY_TOTALIZERS_DAILY_BASIS_LAST_YEAR_COMPARED_TO_32BIT_GRAPHICS_TOUCHX_PREVIUS_YEAR = 514
-}eEnergyManagementDimension;
+};
+
+// Sound Diffusion dimension
+enum {
+	SOUND_DIFFUSION_DIMENSION_VOLUME = 1,
+	SOUND_DIFFUSION_DIMENSION_HIGH_TONES = 2,
+	SOUND_DIFFUSION_DIMENSION_MEDIUM_TONES = 3,
+	SOUND_DIFFUSION_DIMENSION_LOW_TONES = 4,
+	SOUND_DIFFUSION_DIMENSION_FREQUENCY = 5,
+	SOUND_DIFFUSION_DIMENSION_TRACK_STATION = 6,
+	SOUND_DIFFUSION_DIMENSION_PLAY_STATUS = 7,
+	SOUND_DIFFUSION_DIMENSION_FREQUENCY_AND_STATION = 11,
+	SOUND_DIFFUSION_DIMENSION_DEVICE_STATE = 12,
+	SOUND_DIFFUSION_DIMENSION_BALANCE = 17,
+	SOUND_DIFFUSION_DIMENSION_3D = 18,
+	SOUND_DIFFUSION_DIMENSION_PRESET = 19,
+	SOUND_DIFFUSION_DIMENSION_LOUDNESS = 20
+};
 
 class bt_openwebnet {