Enable float/double typed attributes. (#12439)

* Enable float and double attributes on the server. * Enable float/double attribute support in clients. * Add tests for float/double attributes.
project-chip · Dec 6, 2021 · 2299232 · 2299232
1 parent 2ae2cac
commit 2299232
Show file tree

Hide file tree

Showing 38 changed files with 8,105 additions and 3,317 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -15785,7 +15785,7 @@
               "code": 23,
               "mfgCode": null,
               "side": "server",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -15800,7 +15800,7 @@
               "code": 24,
               "mfgCode": null,
               "side": "server",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -16445,7 +16445,7 @@
               "code": 32791,
               "mfgCode": null,
               "side": "server",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -16460,7 +16460,7 @@
               "code": 32792,
               "mfgCode": null,
               "side": "server",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,

diff --git a/examples/chip-tool/commands/common/Command.cpp b/examples/chip-tool/commands/common/Command.cpp
@@ -357,6 +357,28 @@ bool Command::InitArgument(size_t argIndex, char * argValue)
         break;
     }
 
+    case ArgumentType::Float: {
+        if (arg.optional)
+            arg.value = &(static_cast<chip::Optional<float> *>(arg.value))->Emplace();
+        float * value = static_cast<float *>(arg.value);
+        std::stringstream ss;
+        ss << argValue;
+        ss >> *value;
+        isValidArgument = (!ss.fail() && ss.eof());
+        break;
+    }
+
+    case ArgumentType::Double: {
+        if (arg.optional)
+            arg.value = &(static_cast<chip::Optional<double> *>(arg.value))->Emplace();
+        double * value = static_cast<double *>(arg.value);
+        std::stringstream ss;
+        ss << argValue;
+        ss >> *value;
+        isValidArgument = (!ss.fail() && ss.eof());
+        break;
+    }
+
     case ArgumentType::Address: {
         if (arg.optional)
             arg.value = &(reinterpret_cast<chip::Optional<AddressWithInterface> *>(arg.value))->Emplace();
@@ -429,6 +451,30 @@ size_t Command::AddArgument(const char * name, AddressWithInterface * out, bool
     return AddArgumentToList(std::move(arg));
 }
 
+size_t Command::AddArgument(const char * name, float min, float max, float * out, bool optional)
+{
+    Argument arg;
+    arg.type     = ArgumentType::Float;
+    arg.name     = name;
+    arg.value    = reinterpret_cast<void *>(out);
+    arg.optional = optional;
+    // Ignore min/max for now; they're always +-Infinity anyway.
+
+    return AddArgumentToList(std::move(arg));
+}
+
+size_t Command::AddArgument(const char * name, double min, double max, double * out, bool optional)
+{
+    Argument arg;
+    arg.type     = ArgumentType::Double;
+    arg.name     = name;
+    arg.value    = reinterpret_cast<void *>(out);
+    arg.optional = optional;
+    // Ignore min/max for now; they're always +-Infinity anyway.
+
+    return AddArgumentToList(std::move(arg));
+}
+
 size_t Command::AddArgument(const char * name, int64_t min, uint64_t max, void * out, ArgumentType type, bool optional)
 {
     Argument arg;

diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h
@@ -63,6 +63,8 @@ enum ArgumentType
     Number_int16,
     Number_int32,
     Number_int64,
+    Float,
+    Double,
     Boolean,
     String,
     CharString,
@@ -153,6 +155,9 @@ class Command
         return AddArgument(name, min, max, reinterpret_cast<void *>(out), Number_uint64, optional);
     }
 
+    size_t AddArgument(const char * name, float min, float max, float * out, bool optional = false);
+    size_t AddArgument(const char * name, double min, double max, double * out, bool optional = false);
+
     template <typename T, typename = std::enable_if_t<std::is_enum<T>::value>>
     size_t AddArgument(const char * name, int64_t min, uint64_t max, T * out, bool optional = false)
     {

diff --git a/examples/chip-tool/templates/commands.zapt b/examples/chip-tool/templates/commands.zapt
@@ -309,6 +309,32 @@ static void OnInt64sAttributeResponse(void * context, int64_t value)
     command->SetCommandExitStatus(CHIP_NO_ERROR);
 }
 
+static void OnFloatAttributeReport(void * context, float value)
+{
+    ChipLogProgress(chipTool, "Float attribute Response: %f", value);
+}
+
+static void OnFloatAttributeResponse(void * context, float value)
+{
+    OnFloatAttributeReport(context, value);
+
+    ModelCommand * command = static_cast<ModelCommand *>(context);
+    command->SetCommandExitStatus(CHIP_NO_ERROR);
+}
+
+static void OnDoubleAttributeReport(void * context, double value)
+{
+    ChipLogProgress(chipTool, "Double attribute Response: %f", value);
+}
+
+static void OnDoubleAttributeResponse(void * context, double value)
+{
+    OnDoubleAttributeReport(context, value);
+
+    ModelCommand * command = static_cast<ModelCommand *>(context);
+    command->SetCommandExitStatus(CHIP_NO_ERROR);
+}
+
 static void OnOctetStringAttributeReport(void * context, const chip::ByteSpan value)
 {
     char buffer[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];

diff --git a/examples/chip-tool/templates/helper.js b/examples/chip-tool/templates/helper.js
@@ -50,7 +50,7 @@ function asTypeMinValue(type)
         return '0';
       case 'float':
       case 'double':
-        return `-std::numeric_limits<${basicType}>::infinity`;
+        return `-std::numeric_limits<${basicType}>::infinity()`;
       default:
         error = 'asTypeMinValue: Unhandled underlying type ' + zclType + ' for original type ' + type;
         throw error;
@@ -87,7 +87,7 @@ function asTypeMaxValue(type)
         return 'UINT' + parseInt(basicType.slice(4)) + '_MAX';
       case 'float':
       case 'double':
-        return `std::numeric_limits<${basicType}>::infinity`;
+        return `std::numeric_limits<${basicType}>::infinity()`;
       default:
         return 'err';
         error = 'asTypeMaxValue: Unhandled underlying type ' + zclType + ' for original type ' + type;

diff --git a/examples/chip-tool/templates/tests-commands.zapt b/examples/chip-tool/templates/tests-commands.zapt
@@ -4,6 +4,7 @@
 
 #include <commands/tests/TestCommand.h>
 #include <commands/common/CommandInvoker.h>
+#include <math.h> // For INFINITY
 
 class TestList : public Command
 {