separate send & receive

Author: o4c

IrRaw-blockly.js

@@ -2,8 +2,12 @@
 
   'use strict';
 
-  window.getIrRaw = function (board, pinMapping) {
-    return new webduino.module.IrRaw(board, pinMapping);
+  window.getIrRawSend = function (board, pinSendIR) {
+    return new webduino.module.IrRawSend(board, pinSendIR);
+  };
+
+  window.getIrRawRecv = function (board, pinRecvIR) {
+    return new webduino.module.IrRawRecv(board, pinRecvIR);
   };
 
 }(window, window.webduino));

IrRaw.js

@@ -0,0 +1,86 @@
++(function (factory) {
+  if (typeof exports === 'undefined') {
+    factory(webduino || {});
+  } else {
+    module.exports = factory;
+  }
+}(function (scope) {
+  'use strict';
+
+  var Module = scope.Module;
+  var proto;
+  var sendLen = 32;
+  var self;
+  var 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;
+
+      if (m[0] == 0x04 && m[1] == 0x09 && m[2] == 0x0B) {
+        if (lastSendIR) {
+          //store OK
+          lastSendIR = false;
+          self._board.send([0xf0, 0x04, 0x09, 0x0C, self._pinSendIR, 0xF7]);
+        }
+      }
+      //trigger IR send
+      else if (m[0] == 0x04 && m[1] == 0x09 && m[2] == 0x0C) {
+        self.irSendCallback();
+      }
+    });
+  }
+
+
+  function send(startPos, data) {
+
+    var CMD = [0xf0, 0x04, 0x09, 0x0A];
+    var raw = [];
+    raw = raw.concat(CMD);
+    var n = '0000' + startPos.toString(16);
+    n = n.substring(n.length - 4);
+    for (var i = 0; i < 4; i++) {
+      raw.push(n.charCodeAt(i));
+    }
+    raw.push(0xf7);
+    // send Data //  
+    CMD = [0xf0, 0x04, 0x09, 0x0B];
+    raw = raw.concat(CMD);
+    for (i = 0; i < data.length; i++) {
+      raw.push(data.charCodeAt(i));
+    }
+    raw.push(0xf7);
+    self._board.send(raw);
+  }
+
+  function sendIRCmd(cmd, len) {
+    for (var i = 0; i < cmd.length; i = i + len) {
+      var data = cmd.substring(i, i + len);
+      send(i / 4, data);
+    }
+    lastSendIR = true;
+  }
+
+  IrRawSend.prototype = proto = Object.create(Module.prototype, {
+    constructor: {
+      value: IrRawSend
+    }
+  });
+
+  proto.send = function (data, callback) {
+    sendIRCmd(data, sendLen);
+    self.irSendCallback = callback;
+  }
+
+  scope.module.IrRawSend = IrRawSend;
+}));

IrRawSend.js

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

blockly.json

@@ -65,3 +65,16 @@ Blockly.Blocks['irraw_launch'] = {
     this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl); 
   }
 };
+
+Blockly.Blocks['irraw_stop_receive'] = {
+  init: function () {
+    this.appendDummyInput()
+      .appendField(new Blockly.FieldVariable("irraw"), "name_")
+      .appendField(Blockly.Msg.WEBDUINO_IRRAW_STOP_RECV, "停止偵測");
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+    this.setTooltip('');
+    this.setColour(65);
+    this.setHelpUrl(mainUrl + 'basic/index.html' + utmUrl); 
+  }
+};

blockly/blocks.js

@@ -1,12 +1,12 @@
 Blockly.JavaScript['irraw_new_send'] = function (block) {
   var dropdown_pin_ = block.getFieldValue('pin_');
-  var code = 'getIrRaw(board, {"send":' + dropdown_pin_ + '})';
+  var code = 'getIrRawSend(board, ' + dropdown_pin_ + ')';
   return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
 };
 
 Blockly.JavaScript['irraw_new_recv'] = function (block) {
   var dropdown_pin_ = block.getFieldValue('pin_');
-  var code = 'getIrRaw(board, {"recv":' + dropdown_pin_ + '})';
+  var code = 'getIrRawRecv(board, ' + dropdown_pin_ + ')';
   return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
 };
 
@@ -37,3 +37,9 @@ Blockly.JavaScript['irraw_val'] = function (block) {
   var code = variable_name_ + '.onVal';
   return [code, Blockly.JavaScript.ORDER_ATOMIC];
 };
+
+Blockly.JavaScript['irraw_stop_receive'] = function (block) {
+  var variable_name_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('name_'), Blockly.Variables.NAME_TYPE);
+  var code = variable_name_ + '.stopRecv();\n';
+  return code;
+};

blockly/javascript.js

@@ -4,3 +4,4 @@ Blockly.Msg.WEBDUINO_IRRAW_LAUNCHCODE = 'Launch Codes (m-16):';
 Blockly.Msg.WEBDUINO_IRRAW_ON = 'Start Receiving Raw IR';
 Blockly.Msg.WEBDUINO_IRRAW_CODE = 'Received code';
 Blockly.Msg.WEBDUINO_IRRAW_DO = 'Do';
+Blockly.Msg.WEBDUINO_IRRAW_STOP_RECV = 'Stop detection';

blockly/msg/blocks/en.js

@@ -4,3 +4,4 @@ Blockly.Msg.WEBDUINO_IRRAW_LAUNCHCODE = '发射代码 ( 十六进位 )';
 Blockly.Msg.WEBDUINO_IRRAW_ON = '开始接收冷气红外线';
 Blockly.Msg.WEBDUINO_IRRAW_CODE = '接收的代码';
 Blockly.Msg.WEBDUINO_IRRAW_DO = '执行';
+Blockly.Msg.WEBDUINO_IRRAW_STOP_RECV = '停止侦测';

blockly/msg/blocks/zh-hans.js

@@ -4,3 +4,4 @@ Blockly.Msg.WEBDUINO_IRRAW_LAUNCHCODE = '發射代碼 ( 十六進位 )';
 Blockly.Msg.WEBDUINO_IRRAW_ON = '開始接收冷氣紅外線';
 Blockly.Msg.WEBDUINO_IRRAW_CODE = '接收的代碼';
 Blockly.Msg.WEBDUINO_IRRAW_DO = '執行';
+Blockly.Msg.WEBDUINO_IRRAW_STOP_RECV = '停止偵測';

blockly/msg/blocks/zh-hant.js

@@ -1 +1 @@
-MSG.catIrRaw = '冷氣紅外線';
+MSG.catIrRawV2 = '冷氣V2';