change model name

Author: SwitchBot-Wonderlabs

lib/switchbot-advertising.js

@@ -85,15 +85,15 @@ class SwitchbotAdvertising {
 
     if (model === 'H') { // WoHand
       sd = this._parseServiceDataForWoHand(buf);
-    } else if (model === 'h') { // WoHumi
+    } else if (model === 'e') { // WoHumi
       sd = this._parseServiceDataForWoHumi(buf);
     } else if (model === 'T') { // WoSensorTH
       sd = this._parseServiceDataForWoSensorTH(buf);
     } else if (model === 'c') { // WoCurtain
       sd = this._parseServiceDataForWoCurtain(buf);
-    } else if (model === 'P') { // WoPresence
+    } else if (model === 's') { // WoPresence
       sd = this._parseServiceDataForWoPresence(buf);
-    } else if (model === 'C') { // WoContact
+    } else if (model === 'd') { // WoContact
       sd = this._parseServiceDataForWoContact(buf);
     } else {
       return null;

lib/switchbot.js

@@ -57,12 +57,13 @@ class Switchbot {
   *   - duration | Integer | Optional | Duration for discovery process (msec).
   *              |         |          | The value must be in the range of 1 to 60000.
   *              |         |          | The default value is 5000 (msec).
-  *   - model    | String  | Optional | "H", "T", "M", "CS", or "c".
+  *   - model    | String  | Optional | "H", "T", "e", "s", "d", or "c".
   *              |         |          | If "H" is specified, this method will discover only Bots.
   *              |         |          | If "T" is specified, this method will discover only Meters.
-  *              |         |          | If "M" is specified, this method will discover only Motion Sensors.
-  *              |         |          | If "CS" is specified, this method will discover only Contact Sensors.
-  *              |         |          | If "C" is specified, this method will discover only Curtains.
+  *              |         |          | If "e" is specified, this method will discover only Humidifiers.
+  *              |         |          | If "s" is specified, this method will discover only Motion Sensors.
+  *              |         |          | If "d" is specified, this method will discover only Contact Sensors.
+  *              |         |          | If "c" is specified, this method will discover only Curtains.
   *   - id       | String  | Optional | If this value is set, this method willl discover
   *              |         |          | only a device whose ID is as same as this value.
   *              |         |          | The ID is identical to the MAC address.
@@ -84,7 +85,7 @@ class Switchbot {
       // Check the parameters
       let valid = parameterChecker.check(params, {
         duration: { required: false, type: 'integer', min: 1, max: 60000 },
-        model: { required: false, type: 'string', enum: ['H', 'h','T', 'P', 'C', 'c'] },
+        model: { required: false, type: 'string', enum: ['H', 'T', 'e', 's', 'd', 'c'] },
         id: { required: false, type: 'string', min: 12, max: 17 },
         quick: { required: false, type: 'boolean' }
       }, false);
@@ -191,16 +192,16 @@ class Switchbot {
         case 'H':
           device = new SwitchbotDeviceWoHand(peripheral, this.noble);
           break;
-        case 'Hu':
+        case 'e':
           device = new SwitchbotDeviceWoHumi(peripheral, this.noble);
           break;
         case 'T':
           device = new SwitchbotDeviceWoSensorTH(peripheral, this.noble);
           break;
-        case 'M':
+        case 's':
           device = new SwitchbotDeviceWoPresence(peripheral, this.noble);
           break;
-        case 'CS':
+        case 'd':
           device = new SwitchbotDeviceWoContact(peripheral, this.noble);
           break;
         case 'c':
@@ -240,20 +241,23 @@ class Switchbot {
   *
   * [Arguments]
   *   - params   | Object  | Optional |
-  *   - model    | String  | Optional | "H", "T", "M", "CS", or "C".
+  *   - model    | String  | Optional | "H", "T", "e", "s", "d", or "c".
   *              |         |          | If "H" is specified, the `onadvertisement`
   *              |         |          | event hander will be called only when advertising
   *              |         |          | packets comes from Bots.
   *              |         |          | If "T" is specified, the `onadvertisement`
   *              |         |          | event hander will be called only when advertising
   *              |         |          | packets comes from Meters.
-  *              |         |          | If "M" is specified, the `onadvertisement`
+  *              |         |          | If "e" is specified, the `onadvertisement`
+  *              |         |          | event hander will be called only when advertising
+  *              |         |          | packets comes from Humidifiers.
+  *              |         |          | If "s" is specified, the `onadvertisement`
   *              |         |          | event hander will be called only when advertising
   *              |         |          | packets comes from Motion Sensor.
-  *              |         |          | If "CS" is specified, the `onadvertisement`
+  *              |         |          | If "d" is specified, the `onadvertisement`
   *              |         |          | event hander will be called only when advertising
   *              |         |          | packets comes from Contact Sensor.
-  *              |         |          | If "C" is specified, the `onadvertisement`
+  *              |         |          | If "c" is specified, the `onadvertisement`
   *              |         |          | event hander will be called only when advertising
   *              |         |          | packets comes from Curtains.
   *   - id       | String  | Optional | If this value is set, the `onadvertisement`
@@ -272,7 +276,7 @@ class Switchbot {
     let promise = new Promise((resolve, reject) => {
       // Check the parameters
       let valid = parameterChecker.check(params, {
-        model: { required: false, type: 'string', enum: ['H', 'h', 'T', 'P', 'C', 'c'] },
+        model: { required: false, type: 'string', enum: ['H', 'T', 'e', 's', 'd', 'c'] },
         id: { required: false, type: 'string', min: 12, max: 17 },
       }, false);