S0 meter, option to configure meter 1,2 and 3

Updated openzwave config files

Author: gizmocuz

CMakeLists.txt

@@ -374,7 +374,7 @@ IF(RaspberryPi)
 	find_path(WiringPi wiringPi.h)
 	IF(WiringPi)
 		message(STATUS "WiringPi include was found in ${WiringPi}...")
-		find_library(WIRINGPI_LIBRARY wiringPi)
+		find_library(WIRINGPI_LIBRARY NAMES libwiringPi.a)
 		IF(WIRINGPI_LIBRARY)
 			message(STATUS "WiringPi library was found in ${WIRINGPI_LIBRARY}...")
 			add_definitions(-DWITH_GPIO)

Config/fibaro/fgd211.xml

@@ -75,7 +75,7 @@
       <Item label="Enable" value="1"/>
     </Value>
     <Value type="byte" genre="config" instance="1" index="20" label="ADVANCED Impulse length" min="100" max="170" value="110">
-      <Help>This function will enable decreasing the minimum level of the Dimmer by extending the control impulse.[100 - 170]. By changing the minimem level, the user may completely dim LED bulbs. Not all LED bulbs available on the market have the dimmming option. WARNING: Wrong setting of the function may cause incorrect operation of the Dimmer. INFO: THIS PARAMETER IS NOT AVAILABLE IN DEVICE FGD211 v2.1-2.3</Help>
+      <Help>This function will enable decreasing the minimum level of the Dimmer by extending the control impulse.[100 - 170]. By changing the minimum level, the user may completely dim LED bulbs. Not all LED bulbs available on the market have the dimmming option. WARNING: Wrong setting of the function may cause incorrect operation of the Dimmer. INFO: THIS PARAMETER IS NOT AVAILABLE IN DEVICE FGD211 v2.1-2.3</Help>
     </Value>
     <Value type="list" genre="config" instance="1" index="30" label="Alarm" size="1" value="3">
       <Help>Alarm of any type (general alarm, water flooding alarm, smoke alarm: CO, CO2, temperature alarm).

Config/manufacturer_specific.xml

@@ -442,6 +442,7 @@
 	</Manufacturer>
 	<Manufacturer id="0096" name="NorthQ">
 		<Product type="0001" id="0001" name="NQ-92021 Power Reader" config="northq/nq92021.xml"/>
+		<Product type="0001" id="0002" name="NQ-9021 Power Reader"/>
 		<Product type="0010" id="0001" name="NQ-9121 Gas Reader" config="northq/nq9121.xml"/>
 	</Manufacturer>
 	<Manufacturer id="0040" name="Novar EDS">

Config/popp/123580.xml

@@ -68,7 +68,7 @@
 			<Help>Maximal level should be greater than minimal. 0=Work as switch: use off and maximal level 10-99 Level limit (Default 99)</Help>
 		</Value>
 
-		<Value type="short" genre="config" instance="1" index="18" label="Dim Level on 'Switch On'" size="1" min="0" max="99" value="0">
+		<Value type="short" genre="config" instance="1" index="19" label="Dim Level on 'Switch On'" size="1" min="0" max="99" value="0">
 			<Help>Defines how the dimmer hall react on a simple ON Command. 0-99 0=Use previous light level (Default), 1 . 99 Define light level in %</Help>
 		</Value>
 

History.txt

@@ -93,6 +93,8 @@ Version 2.0.xxxx (January xxth 2015)
 - Implemented: Support for MySensors
 - Implemented: Raspberry Pi 2 Internal CPU Temperature
 - Fixed: I2C, possible crash when no device connected
+- Implemented: Option for Dummy device to create Usage (Electric) Sensor
+- Implemented: S0 Meter, settings for meter 3,4 and 5
 
 Version 2.0.2025 (September 28th 2014)
 - Implemented: Fibaro Link data pusher

hardware/DomoticzHardware.h

@@ -52,7 +52,6 @@ class CDomoticzHardwareBase
 	friend class CBMP085;
 	friend class CPiFace;
 	friend class S0MeterSerial;
-	friend class S0MeterTCP;
 	friend class OTGWSerial;
 	friend class OTGWTCP;
 	friend class Teleinfo;

hardware/S0MeterBase.h

@@ -11,7 +11,6 @@ class S0MeterBase : public CDomoticzHardwareBase
 		double m_volume_total;
 	};
 	friend class S0MeterSerial;
-	friend class S0MeterTCP;
 public:
 	S0MeterBase(void);
 	~S0MeterBase(void);

hardware/S0MeterSerial.cpp

@@ -25,34 +25,38 @@
 	};
 #endif
 
-S0MeterSerial::S0MeterSerial(const int ID, const std::string& devname, const unsigned int baud_rate, const int M1Type, const int M1PPH, const int M2Type, const int M2PPH)
+S0MeterSerial::S0MeterSerial(const int ID, const std::string& devname, const unsigned int baud_rate, const std::string& Settings)
 {
 	m_HwdID=ID;
 	m_szSerialPort=devname;
 	m_iBaudRate=baud_rate;
 
-	//Quick hack, meters 3 till 5 uses same parameter as 1 for now, till we can configure it
-	m_meters[0].m_type=M1Type;
-	m_meters[1].m_type=M2Type;
-	m_meters[2].m_type=M1Type;
-	m_meters[3].m_type=M1Type;
-	m_meters[4].m_type=M1Type;
+	m_meters[0].m_type=0;
+	m_meters[1].m_type=0;
+	m_meters[2].m_type=0;
+	m_meters[3].m_type=0;
+	m_meters[4].m_type=0;
 	m_meters[0].m_pulse_per_unit=1000.0;
 	m_meters[1].m_pulse_per_unit=1000.0;
 	m_meters[2].m_pulse_per_unit=1000.0;
 	m_meters[3].m_pulse_per_unit=1000.0;
 	m_meters[4].m_pulse_per_unit=1000.0;
 
-	if (M1PPH!=0)
+	std::vector<std::string> splitresults;
+	StringSplit(Settings, ";", splitresults);
+	if (splitresults.size() == 10)
 	{
-		m_meters[0].m_pulse_per_unit=float(M1PPH);
-		m_meters[1].m_pulse_per_unit=float(M1PPH);
-		m_meters[2].m_pulse_per_unit=float(M1PPH);
-		m_meters[3].m_pulse_per_unit=float(M1PPH);
-		m_meters[4].m_pulse_per_unit=float(M1PPH);
+		m_meters[0].m_type = atoi(splitresults[0].c_str());
+		m_meters[0].m_pulse_per_unit = atof(splitresults[1].c_str());
+		m_meters[1].m_type = atoi(splitresults[2].c_str());
+		m_meters[1].m_pulse_per_unit = atof(splitresults[3].c_str());
+		m_meters[2].m_type = atoi(splitresults[4].c_str());
+		m_meters[2].m_pulse_per_unit = atof(splitresults[5].c_str());
+		m_meters[3].m_type = atoi(splitresults[6].c_str());
+		m_meters[3].m_pulse_per_unit = atof(splitresults[7].c_str());
+		m_meters[4].m_type = atoi(splitresults[8].c_str());
+		m_meters[4].m_pulse_per_unit = atof(splitresults[9].c_str());
 	}
-	if (M2PPH!=0)
-		m_meters[1].m_pulse_per_unit=float(M2PPH);
 }
 
 S0MeterSerial::~S0MeterSerial()

hardware/S0MeterSerial.h

@@ -6,7 +6,7 @@
 class S0MeterSerial: public AsyncSerial, public S0MeterBase
 {
 public:
-	S0MeterSerial(const int ID, const std::string& devname, const unsigned int baud_rate, const int M1Type, const int M1PPH, const int M2Type, const int M2PPH);
+	S0MeterSerial(const int ID, const std::string& devname, const unsigned int baud_rate, const std::string& Settings);
     ~S0MeterSerial();
 
 	void WriteToHardware(const char *pdata, const unsigned char length);