Show sizes and commands as hex in chip DB

Author: bbogush

qt/chip_db.cpp

@@ -44,13 +44,31 @@ int ChipDb::getParamFromString(const QString &value, uint32_t &param)
     return 0;
 }
 
+int ChipDb::getParamFromHexString(const QString &value, uint32_t &param)
+{
+    bool ok;
+
+    param = value.toUInt(&ok, 16);
+    if (!ok)
+        return -1;
+
+    return 0;
+}
+
 int ChipDb::getStringFromParam(const uint32_t &param, QString &value)
 {
     value = QString("%1").arg(param);
 
     return 0;
 }
 
+int ChipDb::getHexStringFromParam(const uint32_t &param, QString &value)
+{
+    value = QString("0x%1").arg(param, 0, 16, QLatin1Char('0'));
+
+    return 0;
+}
+
 int ChipDb::getOptParamFromString(const QString &value, uint32_t &param)
 {
     if (value.trimmed() == CHIP_PARAM_NOT_DEFINED_SYMBOL)
@@ -62,6 +80,17 @@ int ChipDb::getOptParamFromString(const QString &value, uint32_t &param)
     return getParamFromString(value, param);
 }
 
+int ChipDb::getOptParamFromHexString(const QString &value, uint32_t &param)
+{
+    if (value.trimmed() == CHIP_PARAM_NOT_DEFINED_SYMBOL)
+    {
+        param = CHIP_PARAM_NOT_DEFINED_VALUE;
+        return 0;
+    }
+
+    return getParamFromHexString(value, param);
+}
+
 int ChipDb::getStringFromOptParam(const uint32_t &param, QString &value)
 {
     if (param == CHIP_PARAM_NOT_DEFINED_VALUE)
@@ -73,6 +102,17 @@ int ChipDb::getStringFromOptParam(const uint32_t &param, QString &value)
     return getStringFromParam(param, value);
 }
 
+int ChipDb::getHexStringFromOptParam(const uint32_t &param, QString &value)
+{
+    if (param == CHIP_PARAM_NOT_DEFINED_VALUE)
+    {
+        value = CHIP_PARAM_NOT_DEFINED_SYMBOL;
+        return 0;
+    }
+
+    return getHexStringFromParam(param, value);
+}
+
 bool ChipDb::isParamValid(uint32_t param, uint32_t min, uint32_t max)
 {
     return param >= min && param <= max;

qt/chip_db.h

@@ -89,9 +89,13 @@ class ChipDb : public QObject
     void commit();
     void reset();
     int getParamFromString(const QString &value, uint32_t &param);
+    int getParamFromHexString(const QString &value, uint32_t &param);
     int getStringFromParam(const uint32_t &param, QString &value);
+    int getHexStringFromParam(const uint32_t &param, QString &value);
     int getOptParamFromString(const QString &value, uint32_t &param);
+    int getOptParamFromHexString(const QString &value, uint32_t &param);
     int getStringFromOptParam(const uint32_t &param, QString &value);
+    int getHexStringFromOptParam(const uint32_t &param, QString &value);
     bool isParamValid(uint32_t param, uint32_t min, uint32_t max);
     bool isOptParamValid(uint32_t param, uint32_t min, uint32_t max);
     ChipInfo *operator[](int index) { return &chipInfoVector[index]; }

qt/chip_db_table_model.cpp

@@ -37,6 +37,9 @@ QVariant ChipDbTableModel::data(const QModelIndex &index, int role) const
     case CHIP_PARAM_BLOCK_SIZE:
     case CHIP_PARAM_TOTAL_SIZE:
     case CHIP_PARAM_SPARE_SIZE:
+        chipDb->getHexStringFromParam((*chipDb)[index.row()]->params[column],
+            paramStr);
+        return paramStr;
     case CHIP_PARAM_T_CS:
     case CHIP_PARAM_T_CLS:
     case CHIP_PARAM_T_ALS:
@@ -61,13 +64,13 @@ QVariant ChipDbTableModel::data(const QModelIndex &index, int role) const
     case CHIP_PARAM_WRITE1_CMD:
     case CHIP_PARAM_ERASE1_CMD:
     case CHIP_PARAM_STATUS_CMD:
-        chipDb->getStringFromParam((*chipDb)[index.row()]->params[column],
+        chipDb->getHexStringFromParam((*chipDb)[index.row()]->params[column],
             paramStr);
         return paramStr;
     case CHIP_PARAM_READ2_CMD:
     case CHIP_PARAM_WRITE2_CMD:
     case CHIP_PARAM_ERASE2_CMD:
-        chipDb->getStringFromOptParam((*chipDb)[index.row()]->params[column],
+        chipDb->getHexStringFromOptParam((*chipDb)[index.row()]->params[column],
             paramStr);
         return paramStr;
     }
@@ -212,6 +215,10 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
     case CHIP_PARAM_BLOCK_SIZE:
     case CHIP_PARAM_TOTAL_SIZE:
     case CHIP_PARAM_SPARE_SIZE:
+        if (chipDb->getParamFromHexString(value.toString(), paramVal))
+            return false;
+        (*chipDb)[index.row()]->params[index.column()] = paramVal;
+        return true;
     case CHIP_PARAM_T_CS:
     case CHIP_PARAM_T_CLS:
     case CHIP_PARAM_T_ALS:
@@ -248,7 +255,7 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
     case CHIP_PARAM_WRITE1_CMD:
     case CHIP_PARAM_ERASE1_CMD:
     case CHIP_PARAM_STATUS_CMD:
-        if (chipDb->getParamFromString(value.toString(), paramVal))
+        if (chipDb->getParamFromHexString(value.toString(), paramVal))
             return false;
         if (!chipDb->isParamValid(paramVal, 0x00, 0xFF))
             return false;
@@ -257,7 +264,7 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
     case CHIP_PARAM_READ2_CMD:
     case CHIP_PARAM_WRITE2_CMD:
     case CHIP_PARAM_ERASE2_CMD:
-        if (chipDb->getOptParamFromString(value.toString(), paramVal))
+        if (chipDb->getOptParamFromHexString(value.toString(), paramVal))
             return false;
         if (!chipDb->isOptParamValid(paramVal, 0x00, 0xFF))
             return false;