From 9a7c7cd303894f512e5c40411a57e9f886daf3c6 Mon Sep 17 00:00:00 2001
From: elecpower <neilh713@tpg.com.au>
Date: Sat, 30 Jan 2021 09:14:02 +1100
Subject: [PATCH] Another ToString function

---
 companion/src/firmwares/sensordata.cpp | 23 +++++++++++++++++------
 companion/src/firmwares/sensordata.h   |  2 ++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/companion/src/firmwares/sensordata.cpp b/companion/src/firmwares/sensordata.cpp
index f9660f1db..a87dc6d21 100644
--- a/companion/src/firmwares/sensordata.cpp
+++ b/companion/src/firmwares/sensordata.cpp
@@ -57,6 +57,11 @@ bool SensorData::isEmpty() const
   return (!isAvailable() && type == 0 && id == 0 && subid == 0 && instance == 0 && rxIdx == 0 && moduleIdx == 0 && unit == 0 && ratio == 0 && prec == 0 && offset == 0 && autoOffset == 0 && filter == 0 && onlyPositive == 0 && logs == 0);
 }
 
+QString SensorData::idToString() const
+{
+  return idToString(id);
+}
+
 QString SensorData::typeToString() const
 {
   return typeToString(type);
@@ -126,16 +131,16 @@ QString SensorData::paramsToString(const ModelData * model) const
   int mask = getMask();
 
   if (type == TELEM_TYPE_CALCULATED) {
-    str.append(QString(FMT_LABEL_VALUE).arg(tr("Formula")).arg(formulaToString(formula)));
+    str.append(QString(FMT_LABEL_VALUE).arg(tr("Formula")).arg(formulaToString()));
   }
   else {
-    str.append(QString(FMT_LABEL_VALUE).arg(tr("Id")).arg(QString::number(id, 16).toUpper()));
+    str.append(QString(FMT_LABEL_VALUE).arg(tr("Id")).arg(idToString()));
     str.append(QString(FMT_LABEL_VALUE).arg(tr("Instance")).arg(instance));
   }
 
   if (mask & SENSOR_HAS_CELLS) {
     str.append(QString(FMT_LABEL_VALUE).arg(tr("Sensor")).arg(sourceToString(model, source)));
-    str.append(QString(FMT_VALUE).arg(cellIndexToString(index)));
+    str.append(QString(FMT_VALUE).arg(cellIndexToString()));
   }
 
   if (mask & SENSOR_HAS_SOURCES_12) {
@@ -156,10 +161,10 @@ QString SensorData::paramsToString(const ModelData * model) const
   }
 
   if (mask & SENSOR_ISCONFIGURABLE)
-    str.append(QString(FMT_LABEL_VALUE).arg(tr("Unit")).arg(unitToString(unit)));
+    str.append(QString(FMT_LABEL_VALUE).arg(tr("Unit")).arg(unitToString()));
 
   if (mask & SENSOR_HAS_PRECISION)
-    str.append(QString(FMT_LABEL_VALUE).arg(tr("Precision")).arg(precToString(prec)));
+    str.append(QString(FMT_LABEL_VALUE).arg(tr("Precision")).arg(precToString()));
 
   if (mask & SENSOR_HAS_RATIO) {
     if (unit != UNIT_RPMS) {
@@ -170,7 +175,7 @@ QString SensorData::paramsToString(const ModelData * model) const
     }
     else {
       str.append(QString(FMT_LABEL_VALUE).arg(tr("Blades")).arg(ratio)); //  TODO refactor to dedicated RPMS field
-      str.append(QString(FMT_LABEL_VALUE).arg(tr("Multi")).arg(offset)); //  TODO refactor to dedicated RPMS field
+      str.append(QString(FMT_LABEL_VALUE).arg(tr("Multiplier")).arg(offset)); //  TODO refactor to dedicated RPMS field
     }
   }
 
@@ -252,6 +257,12 @@ void SensorData::unitChanged()
     prec = 0;
 }
 
+//  static
+QString SensorData::idToString(const int value)
+{
+  return QString::number(value, 16).toUpper();
+}
+
 //  static
 QString SensorData::typeToString(const int value)
 {
diff --git a/companion/src/firmwares/sensordata.h b/companion/src/firmwares/sensordata.h
index 0a24cd301..5870d9649 100644
--- a/companion/src/firmwares/sensordata.h
+++ b/companion/src/firmwares/sensordata.h
@@ -185,6 +185,7 @@ class SensorData {
     QString getOrigin(const ModelData* model) const;
     void clear() { memset(this, 0, sizeof(SensorData)); }
     bool isEmpty() const;
+    QString idToString() const;
     QString typeToString() const;
     QString formulaToString() const;
     QString cellIndexToString() const;
@@ -199,6 +200,7 @@ class SensorData {
 
     static QString sourceToString(const ModelData * model, const int index, const bool sign = false);
     static bool isSourceAvailable(const ModelData * model, const int index);
+    static QString idToString(const int value);
     static QString typeToString(const int value);
     static QString formulaToString(const int value);
     static QString cellIndexToString(const int value);