node-red-zelecproto 0.0.4 → 0.0.6

package/645.js

@@ -219,7 +219,7 @@ function reverseHexBytes(hex) {
 }
 
 /******************** 解码：batchMsg（返回统一对象，含 exec_addr/di/value 等） ********************/
-function batchMsg(_msg) {
+function decode645(_msg) {
     // ===== 工具 =====
     function calc645Checksum(u8) {
         let s = 0;
@@ -1014,9 +1014,7 @@ function parseCoverOpenLast645(arrPush) {
 
 
 
-
-
-function batchMsg(msg) {
+function batchMsgMain(msg) {
     /******************** 入口：根据 msg.mode / msg.action 选择 encode / decode ********************/
     const MODE = String(msg.mode || msg.action || 'decode').toLowerCase();
 
@@ -1041,15 +1039,14 @@ function batchMsg(msg) {
     /******************** decode：解码 645 响应（统一返回对象，含 exec_addr 等） ********************/
     const dataIn = msg.payload;
 
-
     if (Array.isArray(dataIn)) {
-        msg.payload = dataIn.map(_msg => batchMsg(_msg));
+        msg.payload = dataIn.map(_msg => decode645(_msg));
     } else {
-        msg.payload = batchMsg(msg);
+        msg.payload = decode645(msg);
     }
     return msg;
 }
 
 
-module.exports = batchMsg;
-module.exports.batchMsg645 = batchMsg;
+module.exports = batchMsgMain;
+module.exports.batchMsg645 = decode645;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-zelecproto",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "node-red zelecproto node",
   "main": "index.js",
   "scripts": {

package/test.js

@@ -3,10 +3,18 @@ var proto645 = require("./645");
 var proto698 = require("./698");
 
 let msg = {};
-msg.payload = '68 39 00 C3 05 94 18 05 08 37 00 11 97 E1 90 01 20 A0 85 A9 10 C3 33 0D 19 30 D4 EA 61 05 39 C8 41 7F A8 07 63 5C D4 56 A4 D9 C6 F2 2F 98 2A D9 F0 01 00 04 05 78 AC 43 73 01 16 '
-msg.proto = 698
+// msg.payload = 'FE FE FE FE 68 30 00 C3 05 60 80 63 00 15 19 11 38 1D 90 00 17 85 01 01 30 1B 07 00 01 01 01 02 02 00 02 02 06 00 00 00 00 00 00 00 01 00 04 4C 3E EE F6 B3 CA 16'
+// msg.payload = 'FE FE FE FE 68 30 00 C3 05 77 59 63 00 15 19 11 59 0F 90 00 17 85 01 01 30 1B 07 00 01 01 01 02 02 00 02 02 06 00 00 00 00 00 00 00 01 00 04 B2 F3 8B 23 F2 7C 16'
+// msg.payload = 'FE FE FE FE 68 33 00 C3 05 60 80 63 00 15 19 11 8B E3 90 00 1A 85 01 01 30 13 0A 00 01 01 01 02 02 00 02 02 1C 07 E3 07 17 0B 06 1B 00 00 00 01 00 04 2C 96 C6 41 EF 15 16'
+// msg.payload = 'FE FE FE FE 68 2C 00 C3 05 16 01 00 00 00 00 11 54 84 90 00 13 85 01 01 30 13 0A 00 01 01 01 02 02 00 02 02 00 00 00 00 01 00 04 EE E6 E8 86 13 64 16'
+msg.payload = 'FEFEFEFE68797038300000689306ACA36B6333333D16'
+msg.proto = 645
 msg.mode = 'decode'
 
 
 
-console.log(proto698(msg));
+// console.log(JSON.stringify(proto698(msg)));
+// console.log(proto698(msg));
+
+// console.log(JSON.stringify(proto645(msg)));
+console.log(proto645(msg));

package/zeleble.js

@@ -2,7 +2,7 @@ module.exports = function (RED) {
     "use strict";
     var protoBle = require("./ble");
 
-    function zelecproto(n) {
+    function zeleble(n) {
         RED.nodes.createNode(this, n);
         var node = this;