adjust command

Author: o4c

IrRaw-blockly.js

@@ -3,15 +3,15 @@
   'use strict';
 
   /* this function for old version */
-  window.getIrRaw = function (board, pinMapping) {
+  window.getIrRaw = (board, pinMapping) => {
     return new webduino.module.IrRaw(board, pinMapping);
   };
 
-  window.getIrRawSend = function (board, pinSendIR) {
+  window.getIrRawSend = (board, pinSendIR) => {
     return new webduino.module.IrRawSend(board, pinSendIR);
   };
 
-  window.getIrRawRecv = function (board, pinRecvIR) {
+  window.getIrRawRecv = (board, pinRecvIR) => {
     return new webduino.module.IrRawRecv(board, pinRecvIR);
   };
 

IrRaw.js

@@ -1,3 +1,6 @@
+/**
+ * For old version
+ */
 +(function (factory) {
   if (typeof exports === 'undefined') {
     factory(webduino || {});

IrRawSend.js

@@ -7,35 +7,38 @@
 }(function (scope) {
   'use strict';
 
-  var Module = scope.Module;
-  var proto;
-  var sendLen = 32;
-  var self;
-  var lastSendIR = false;
+  let Module = scope.Module;
+  let WEBDUINO_COMMAND = 0x04;
+  let SENSOR_IRRSEND = 0x09;
+  let START_POS = 0x0A;
+  let SEND_RAW_DATA = 0x0B;
+  let TRIGGER_IR = 0x0C;
+  let proto;
+  let sendLen = 32;
+  let self;
+  // let lastSendIR = false;
 
   function IrRawSend(board, pinSendIR) {
-    console.log("debug IrRawSend");
     self = this;
     Module.call(self);
     self._board = board;
     self._pinSendIR = pinSendIR;
-
     onMessage();
   }
 
   function onMessage() {
     self._board.on(webduino.BoardEvent.SYSEX_MESSAGE, function (event) {
-      var m = event.message;
+      let m = event.message;
 
-      if (m[0] == 0x04 && m[1] == 0x09 && m[2] == 0x0B) {
+      /*if (m[0] == WEBDUINO_COMMAND && m[1] == SENSOR_IRRSEND && m[2] == 0x0B) {
         if (lastSendIR) {
           //store OK
           lastSendIR = false;
-          self._board.send([0xf0, 0x04, 0x09, 0x0C, self._pinSendIR, 0xF7]);
+          self._board.send([0xf0, WEBDUINO_COMMAND, SENSOR_IRRSEND, 0x0C, self._pinSendIR, 0xF7]);
         }
-      }
-      //trigger IR send
-      else if (m[0] == 0x04 && m[1] == 0x09 && m[2] == 0x0C) {
+      }*/
+
+      if (m[0] == WEBDUINO_COMMAND && m[1] == SENSOR_IRRSEND && m[2] == TRIGGER_IR) {
         self.irSendCallback();
       }
     });
@@ -44,17 +47,18 @@
 
   function send(startPos, data) {
 
-    var CMD = [0xf0, 0x04, 0x09, 0x0A];
-    var raw = [];
+    let CMD = [0xf0, WEBDUINO_COMMAND, SENSOR_IRRSEND, START_POS];
+    let raw = [];
     raw = raw.concat(CMD);
-    var n = '0000' + startPos.toString(16);
+    let n = '0000' + startPos.toString(16);
     n = n.substring(n.length - 4);
-    for (var i = 0; i < 4; i++) {
+    for (let i = 0; i < 4; i++) {
       raw.push(n.charCodeAt(i));
     }
     raw.push(0xf7);
-    // send Data //  
-    CMD = [0xf0, 0x04, 0x09, 0x0B];
+
+    // send raw data 
+    CMD = [0xf0, WEBDUINO_COMMAND, SENSOR_IRRSEND, SEND_RAW_DATA];
     raw = raw.concat(CMD);
     for (i = 0; i < data.length; i++) {
       raw.push(data.charCodeAt(i));
@@ -64,11 +68,12 @@
   }
 
   function sendIRCmd(cmd, len) {
-    for (var i = 0; i < cmd.length; i = i + len) {
-      var data = cmd.substring(i, i + len);
+    for (let i = 0; i < cmd.length; i = i + len) {
+      let data = cmd.substring(i, i + len);
       send(i / 4, data);
     }
-    lastSendIR = true;
+    // lastSendIR = true;
+    self._board.send([0xf0, WEBDUINO_COMMAND, SENSOR_IRRSEND, TRIGGER_IR, self._pinSendIR, 0xF7]);
   }
 
   IrRawSend.prototype = proto = Object.create(Module.prototype, {
@@ -77,7 +82,7 @@
     }
   });
 
-  proto.send = function (data, callback) {
+  proto.send = (data, callback) => {
     sendIRCmd(data, sendLen);
     self.irSendCallback = callback;
   }

blockly.json

@@ -6,6 +6,7 @@
     "blockly/javascript.js"
   ],
   "dependencies": [
+    "IrRaw.js",
     "IrRawSend.js",
     "irRawRecv.js",
     "IrRaw-blockly.js"

irRawRecv.js

@@ -7,10 +7,16 @@
 }(function (scope) {
   'use strict';
 
-  var Module = scope.Module;
-  var proto;
-  var self;
-
+  let Module = scope.Module;
+  let proto;
+  let self;
+  let WEBDUINO_COMMAND = 0x04;
+  let SENSOR_RECV = 0x0A;
+  let INIT_RECV = 0x00;
+  let STOP_RECV = 0x01;
+  let RECORD_RAW_DATA = 0x02;
+  let RECORD_FINISH = 0x03;
+  
   function IrRawRecv(board, pinRecvIR) {
     self = this;
     Module.call(self);
@@ -23,18 +29,19 @@
 
   function onMessage() {
     self._board.on(webduino.BoardEvent.SYSEX_MESSAGE, function (event) {
-      var m = event.message;
+      let m = event.message;
 
-      //record IR data
-      if (m[0] == 0x04 && m[1] == 0x09 && m[2] == 0x0D) {
-        var strData = "";
-        for (var i = 3; i < m.length; i++) {
+      // record raw data
+      if (m[0] == WEBDUINO_COMMAND && m[1] == SENSOR_RECV && m[2] == RECORD_RAW_DATA) {
+        let strData = "";
+        for (let i = 3; i < m.length; i++) {
           strData += String.fromCharCode(m[i]);
         }
         self._irInfo += strData;
-
       }
-      else if (m[0] == 0x04 && m[1] == 0x09 && m[2] == 0x0E) {
+
+      // record finish
+      else if (m[0] == WEBDUINO_COMMAND && m[1] == SENSOR_RECV && m[2] == RECORD_FINISH) {
         self.irRecvCallback(self._irInfo);
         self._irInfo = "";
       }
@@ -47,15 +54,15 @@
     }
   });
 
-  proto.receive = function (callback) {
+  proto.receive = (callback) => {
     self.irRecvCallback = callback;
     if (self._pinRecvIR > 0) {
-      self._board.send([0xF0, 0x04, 0x0A, 0x00, self._pinRecvIR, 0xF7]);
+      self._board.send([0xF0, WEBDUINO_COMMAND, SENSOR_RECV, INIT_RECV, self._pinRecvIR, 0xF7]);
     }
   };
 
-  proto.stopRecv = function () {
-    self._board.send([0xF0, 0x04, 0x0A, 0x01, 0xF7]);
+  proto.stopRecv = () => {
+    self._board.send([0xF0, WEBDUINO_COMMAND, SENSOR_RECV, STOP_RECV, 0xF7]);
   }
 
   scope.module.IrRawRecv = IrRawRecv;