Retain min temp field size for setpoint command and apply it there Op…

…enZWave#2435
Cyberwizzard · Nov 11, 2020 · 5deb6af · 5deb6af
1 parent b0afd4c
commit 5deb6af
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 115 deletions.
diff --git a/cpp/src/ValueIDIndexesDefines.def b/cpp/src/ValueIDIndexesDefines.def
@@ -3166,6 +3166,7 @@ ENUM(ValueID_Index_ThermostatSetpoint,
 		CoolingEcon,
 		AwayHeating,
 		CoolingHeating,
+		SetPointMinSize,
 		Unused_0_Minimum = 100,
 		Heating_Minimum,
 		Cooling_Minimum,

diff --git a/cpp/src/ValueIDIndexesDefines.h b/cpp/src/ValueIDIndexesDefines.h
diff --git a/cpp/src/command_classes/CommandClass.cpp b/cpp/src/command_classes/CommandClass.cpp
@@ -597,11 +597,12 @@ namespace OpenZWave
 // <CommandClass::AppendValue>
 // Add a value to a message as a sequence of bytes
 //-----------------------------------------------------------------------------
-			void CommandClass::AppendValue(Msg* _msg, std::string const& _value, uint8 const _scale) const
+			void CommandClass::AppendValue(Msg* _msg, std::string const& _value, uint8 const _scale, uint8 const _minsize) const
 			{
 				uint8 precision;
 				uint8 size;
 				int32 val = ValueToInteger(_value, &precision, &size);
+				if(size < _minsize) size = _minsize;
 
 				_msg->Append((precision << c_precisionShift) | (_scale << c_scaleShift) | size);
 

diff --git a/cpp/src/command_classes/CommandClass.h b/cpp/src/command_classes/CommandClass.h
@@ -210,9 +210,10 @@ namespace OpenZWave
 					 *  \param _msg The message to which the value should be appended.
 					 *  \param _value A string containing a decimal number to be appended.
 					 *  \param _scale A byte indicating the scale corresponding to this value (e.g., 1=F and 0=C for temperatures).
+					 *  \param _minsize Indicating the minimum size in bytes to pass the field value (default 0 to use the smallest size possible)
 					 *  \see Msg
 					 */
-					void AppendValue(Msg* _msg, string const& _value, uint8 const _scale) const;
+					void AppendValue(Msg* _msg, string const& _value, uint8 const _scale, uint8 const _minsize = 0) const;
 					uint8 const GetAppendValueSize(string const& _value) const;
 					int32 ValueToInteger(string const& _value, uint8* o_precision, uint8* o_size) const;
 

diff --git a/cpp/src/command_classes/ThermostatSetpoint.cpp b/cpp/src/command_classes/ThermostatSetpoint.cpp
@@ -34,6 +34,7 @@
 #include "platform/Log.h"
 
 #include "value_classes/ValueDecimal.h"
+#include "value_classes/ValueByte.h"
 
 #include "tinyxml.h"
 
@@ -241,14 +242,15 @@ namespace OpenZWave
 						string minValue = ExtractValue(&_data[2], &scale, &precision);
 						string maxValue = ExtractValue(&_data[2 + size + 1], &scale, &precision);
 
-						Log::Write(LogLevel_Info, GetNodeId(), "Received capabilities of thermostat setpoint type %d, min %s max %s", (int) _data[1], minValue.c_str(), maxValue.c_str());
+						Log::Write(LogLevel_Info, GetNodeId(), "Received capabilities of thermostat setpoint type %d, min %s (field size: %i) max %s", (int) _data[1], minValue.c_str(), size, maxValue.c_str());
 
 						uint8 index = _data[1];
 						// Add supported setpoint
 						if (index < ThermostatSetpoint_Count)
 						{
 							string setpointName = c_setpointName[index];
-
+							// Retain the size of the minimum temperature as the minimum field size for the temperature
+							node->CreateValueByte(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_ThermostatSetpoint::SetPointMinSize, setpointName + "_setpointminsize", "B", true, false, 0, 0);
 							node->CreateValueDecimal(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_ThermostatSetpoint::Unused_0_Minimum + index, setpointName + "_minimum", "C", false, false, minValue, 0);
 							node->CreateValueDecimal(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_ThermostatSetpoint::Unused_0_Maximum + index, setpointName + "_maximum", "C", false, false, maxValue, 0);
 							Log::Write(LogLevel_Info, GetNodeId(), "    Added setpoint: %s", setpointName.c_str());
@@ -270,6 +272,14 @@ namespace OpenZWave
 				{
 					Internal::VC::ValueDecimal const* value = static_cast<Internal::VC::ValueDecimal const*>(&_value);
 					uint8 scale = strcmp("C", value->GetUnits().c_str()) ? 1 : 0;
+					int8 setpointminsize = 0;
+					uint8 _instance = 1; // FIXME where is the instance ID supposed to come from?
+
+					if (Node* node = GetNodeUnsafe()) {
+						Internal::VC::Value const* _minsizeValue = node->GetValue(GetCommandClassId(), _instance, ValueID_Index_ThermostatSetpoint::SetPointMinSize);
+						Internal::VC::ValueByte const* minsizeValue = static_cast<Internal::VC::ValueByte const*>(_minsizeValue);
+						setpointminsize = minsizeValue->GetValue();
+					}
 
 					Msg* msg = new Msg("ThermostatSetpointCmd_Set", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true);
 					msg->SetInstance(this, _value.GetID().GetInstance());
@@ -278,7 +288,7 @@ namespace OpenZWave
 					msg->Append(GetCommandClassId());
 					msg->Append(ThermostatSetpointCmd_Set);
 					msg->Append((uint8_t) (value->GetID().GetIndex() & 0xFF));
-					AppendValue(msg, value->GetValue(), scale);
+					AppendValue(msg, value->GetValue(), scale, setpointminsize);
 					msg->Append(GetDriver()->GetTransmitOptions());
 					GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
 					return true;