Sonoff: use device.model iso params

front/src/config/i18n/en.json

@@ -246,9 +246,9 @@
       "topicPlaceholder": "%topic% Sonoff MQTT value",
       "modelLabel": "Sonoff Model",
       "model": {
-        "basic": "Basic",
-        "pow": "Pow",
-        "s26": "S20/S26 Smart Plug"
+        "sonoff-basic": "Basic",
+        "sonoff-pow": "Pow",
+        "sonoff-s2x": "S20/S26 Smart Plug"
       },
       "saveButton": "Save",
       "alreadyCreatedButton": "Already created",

front/src/routes/integration/all/sonoff/device-page/SonoffBox.jsx

@@ -36,20 +36,8 @@ class SonoffBox extends Component {
 
   updateModel = e => {
     const selectedModel = e.target.value;
-    const params = (this.props.device.params || []).slice();
-    const model = params.find(p => p.name === 'model');
-
-    if (model) {
-      model.value = selectedModel;
-    } else {
-      params.push({
-        name: 'model',
-        value: selectedModel
-      });
-    }
 
     this.props.updateDeviceField(this.props.deviceIndex, 'model', selectedModel);
-    this.props.updateDeviceField(this.props.deviceIndex, 'params', params);
     this.props.updateDeviceField(
       this.props.deviceIndex,
       'features',

front/src/routes/integration/all/sonoff/device-page/actions.js

@@ -22,13 +22,6 @@ function createActions(store) {
         }
 
         const sonoffsReceived = await state.httpClient.get('/api/v1/service/sonoff/device', options);
-        sonoffsReceived.forEach(device => {
-          const model = device.params.find(p => p.name === 'model');
-          if (model) {
-            device.model = model.value;
-          }
-        });
-
         let sonoffDevices;
         if (skip === 0) {
           sonoffDevices = sonoffsReceived;

front/src/routes/integration/all/sonoff/device-page/models.js

@@ -2,14 +2,15 @@ import uuid from 'uuid';
 import models from '../../../../../../../server/services/sonoff/models';
 
 export const Models = {
-  basic: 1,
-  pow: 6,
-  s26: 8
+  'sonoff-basic': 1,
+  'sonoff-pow': 6,
+  'sonoff-s2x': 8
 };
 
 export const GetFeatures = (modelName, deviceName, deviceTopic) => {
-  if (models[modelName]) {
-    return models[modelName].getFeatures(uuid, deviceName, deviceTopic);
+  const modelKey = Models[modelName];
+  if (modelKey && models[modelKey]) {
+    return models[modelKey].getFeatures(uuid, deviceName, deviceTopic);
   }
 
   return [];

front/src/routes/integration/all/sonoff/discover-page/actions.js

@@ -11,13 +11,6 @@ function createActions(store) {
       });
       try {
         const discoveredDevices = await state.httpClient.get('/api/v1/service/sonoff/discover');
-        discoveredDevices.forEach(device => {
-          const model = device.params.find(p => p.name === 'model');
-          if (model) {
-            device.model = model.value;
-          }
-        });
-
         store.setState({
           discoveredDevices,
           loading: false,

server/services/sonoff/lib/handleMqttMessage.js

@@ -48,7 +48,7 @@ function handleMqttMessage(topic, message) {
           name: friendlyName,
           external_id: `sonoff:${deviceExternalId}`,
           features: model.getFeatures(uuid, friendlyName, deviceExternalId),
-          params: model.getParams(),
+          model: model.getModel(),
           service_id: this.serviceId,
           should_poll: false,
           id: uuid.v4(),

server/services/sonoff/models/index.js

@@ -1,9 +1,9 @@
 const basic = require('./switch_basic');
-const s26 = require('./plug_s26');
+const s2x = require('./plug_s2x');
 const pow = require('./switch_pow');
 
 module.exports = {
   1: basic,
   6: pow,
-  8: s26,
+  8: s2x,
 };

server/services/sonoff/models/plug_s26.js → server/services/sonoff/models/plug_s2x.js

@@ -1,12 +1,7 @@
 const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../utils/constants');
 
-const getParams = () => {
-  return [
-    {
-      name: 'model',
-      value: 's26',
-    },
-  ];
+const getModel = () => {
+  return 'sonoff-s2x';
 };
 
 const getFeatures = (uuid, deviceName, deviceTopic) => {
@@ -27,5 +22,5 @@ const getFeatures = (uuid, deviceName, deviceTopic) => {
 
 module.exports = {
   getFeatures,
-  getParams,
+  getModel,
 };

server/services/sonoff/models/switch_basic.js

@@ -1,12 +1,7 @@
 const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../utils/constants');
 
-const getParams = () => {
-  return [
-    {
-      name: 'model',
-      value: 'basic',
-    },
-  ];
+const getModel = () => {
+  return 'sonoff-basic';
 };
 
 const getFeatures = (uuid, deviceName, deviceTopic) => {
@@ -27,5 +22,5 @@ const getFeatures = (uuid, deviceName, deviceTopic) => {
 
 module.exports = {
   getFeatures,
-  getParams,
+  getModel,
 };

server/services/sonoff/models/switch_pow.js

@@ -1,12 +1,7 @@
 const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../utils/constants');
 
-const getParams = () => {
-  return [
-    {
-      name: 'model',
-      value: 'pow',
-    },
-  ];
+const getModel = () => {
+  return 'sonoff-pow';
 };
 
 const getFeatures = (uuid, deviceName, deviceTopic) => {
@@ -30,6 +25,7 @@ const getFeatures = (uuid, deviceName, deviceTopic) => {
       has_feedback: false,
       min: 0,
       max: 10000,
+      unit: 'A',
       name: `${deviceName} - ${DEVICE_FEATURE_TYPES.SWITCH.POWER}`,
       external_id: `sonoff:${deviceTopic}:${DEVICE_FEATURE_TYPES.SWITCH.POWER}`,
     },
@@ -38,5 +34,5 @@ const getFeatures = (uuid, deviceName, deviceTopic) => {
 
 module.exports = {
   getFeatures,
-  getParams,
+  getModel,
 };

server/test/services/sonoff/models/plug_s26.test.js

@@ -7,16 +7,10 @@ const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../..
 const modelId = 8;
 
 describe('SonoffService - Model - Plug S2x', () => {
-  it('get params for Sonoff Plug S2x', () => {
-    const params = models[modelId].getParams();
+  it('get model for Sonoff Plug S2x', () => {
+    const model = models[modelId].getModel();
 
-    expect(params).to.be.lengthOf(1);
-    expect(params).deep.eq([
-      {
-        name: 'model',
-        value: 's26',
-      },
-    ]);
+    expect(model).to.eq('sonoff-s2x');
   });
 
   it('get features for Sonoff Plug S2x', () => {

server/test/services/sonoff/models/switch_basic.test.js

@@ -7,16 +7,10 @@ const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../..
 const modelId = 1;
 
 describe('SonoffService - Model - Basic', () => {
-  it('get params for Sonoff Basic', () => {
-    const params = models[modelId].getParams();
+  it('get model for Sonoff Basic', () => {
+    const model = models[modelId].getModel();
 
-    expect(params).to.be.lengthOf(1);
-    expect(params).deep.eq([
-      {
-        name: 'model',
-        value: 'basic',
-      },
-    ]);
+    expect(model).to.eq('sonoff-basic');
   });
 
   it('get features for Sonoff Basic', () => {

server/test/services/sonoff/models/switch_pow.test.js

@@ -7,16 +7,10 @@ const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../..
 const modelId = 6;
 
 describe('SonoffService - Model - Pow', () => {
-  it('get params for Sonoff Pow', () => {
-    const params = models[modelId].getParams();
-
-    expect(params).to.be.lengthOf(1);
-    expect(params).deep.eq([
-      {
-        name: 'model',
-        value: 'pow',
-      },
-    ]);
+  it('get model for Sonoff Pow', () => {
+    const model = models[modelId].getModel();
+
+    expect(model).to.eq('sonoff-pow');
   });
 
   it('get features for Sonoff Pow', () => {