diff --git a/blockly.json b/blockly.json index 289f230..159a148 100644 --- a/blockly.json +++ b/blockly.json @@ -1,6 +1,6 @@ { "types": ["gps_new","gps_read","gps_get_number"], - "category": "catMenu2", + "category": "catMenu4", "scripts": [ "blockly/blocks.js", "blockly/javascript.js" diff --git a/blockly/blocks.js b/blockly/blocks.js index 593699c..926aca6 100644 --- a/blockly/blocks.js +++ b/blockly/blocks.js @@ -1,7 +1,10 @@ +var mainUrl = 'https://tutorials.webduino.io/zh-tw/docs/'; +var utmUrl = '?utm_source=cloud-blockly&utm_medium=contextMenu&utm_campaign=tutorials'; + Blockly.Blocks['gps_new'] = { init: function () { this.appendDummyInput() - .appendField(Blockly.Msg.WEBDUINO_GPS_RX, "GPS定位,rx") + .appendField(Blockly.Msg.WEBDUINO_GPS_RX) .appendField(new Blockly.FieldDropdown([ ["2", "2"], ["3", "3"], @@ -16,7 +19,7 @@ Blockly.Blocks['gps_new'] = { ["12", "12"], ["13", "13"] ]), "rx_") - .appendField(Blockly.Msg.WEBDUINO_GPS_TX, " tx") + .appendField(Blockly.Msg.WEBDUINO_GPS_TX) .appendField(new Blockly.FieldDropdown([ ["2", "2"], ["3", "3"], @@ -34,7 +37,7 @@ Blockly.Blocks['gps_new'] = { this.setOutput(true); this.setColour(230); this.setTooltip(''); - this.setHelpUrl('https://webduino.io'); + this.setHelpUrl(''); } }; @@ -44,31 +47,36 @@ Blockly.Blocks['gps_read'] = { this.appendValueInput("qryTime") .setCheck(null) .appendField(new Blockly.FieldVariable("gps"), "gps") - .appendField("取得經緯度和時間,每"); + .appendField(Blockly.Msg.WEBDUINO_GPS_GET_CORD) + .appendField(Blockly.Msg.WEBDUINO_GPS_EVERY); this.appendDummyInput() - .appendField("毫秒執行一次"); + .appendField(Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS); this.appendStatementInput("callback") .setCheck(null) - .appendField("執行"); + .appendField(Blockly.Msg.WEBDUINO_GPS_DO); this.setInputsInline(true); this.setPreviousStatement(true, null); this.setNextStatement(true, null); this.setColour(65); this.setTooltip(''); - this.setHelpUrl('https://webduino.io'); + this.setHelpUrl(''); } }; - Blockly.Blocks['gps_get_data'] = { init: function() { this.appendDummyInput() .appendField(new Blockly.FieldVariable("gps"), "gps") - .appendField("所測得目前的") - .appendField(new Blockly.FieldDropdown([["經度", "longitude"], ["緯度", "latitude"], ["日期", "date"], ["時間", "time"]]), "dataType"); + .appendField(Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE) + .appendField(new Blockly.FieldDropdown([ + [Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE, "longitude"], + [Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE, "latitude"], + [Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE, "date"], + [Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME, "time"] + ]), "dataType"); this.setOutput(true, null); - this.setColour(20); + this.setColour(35); this.setTooltip(''); - this.setHelpUrl('https://webduino.io'); + this.setHelpUrl(''); } }; \ No newline at end of file diff --git a/blockly/msg/blocks/en.js b/blockly/msg/blocks/en.js index b5bc72b..7934cd4 100644 --- a/blockly/msg/blocks/en.js +++ b/blockly/msg/blocks/en.js @@ -1,6 +1,15 @@ // GPS -Blockly.Msg.WEBDUINO_GPS_RX = "GPS (TinyGPS),RX "; +Blockly.Msg.WEBDUINO_GPS_RX = "GPS (TinyGPS), RX "; Blockly.Msg.WEBDUINO_GPS_TX = " TX"; Blockly.Msg.WEBDUINO_GPS_LOCATE = "Location:"; Blockly.Msg.WEBDUINO_GPS_TIME = "Time:"; -Blockly.Msg.WEBDUINO_GPS_GET_NOW = "read Info:"; +Blockly.Msg.WEBDUINO_GPS_GET_NOW = "Read Info:"; +Blockly.Msg.WEBDUINO_GPS_GET_CORD = "Get Coordinate with Time"; +Blockly.Msg.WEBDUINO_GPS_EVERY = "run every"; +Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS = "Millisecond"; +Blockly.Msg.WEBDUINO_GPS_DO = "Do"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "Current Value of"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE = "Latitude"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE = "Longtitude"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE = "Date"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME = "Time"; \ No newline at end of file diff --git a/blockly/msg/blocks/zh-hans.js b/blockly/msg/blocks/zh-hans.js index b5bc72b..e28d3c0 100644 --- a/blockly/msg/blocks/zh-hans.js +++ b/blockly/msg/blocks/zh-hans.js @@ -1,6 +1,15 @@ // GPS -Blockly.Msg.WEBDUINO_GPS_RX = "GPS (TinyGPS),RX "; +Blockly.Msg.WEBDUINO_GPS_RX = "GPS 定位(TinyGPS),RX "; Blockly.Msg.WEBDUINO_GPS_TX = " TX"; -Blockly.Msg.WEBDUINO_GPS_LOCATE = "Location:"; -Blockly.Msg.WEBDUINO_GPS_TIME = "Time:"; -Blockly.Msg.WEBDUINO_GPS_GET_NOW = "read Info:"; +Blockly.Msg.WEBDUINO_GPS_LOCATE = "经纬度:"; +Blockly.Msg.WEBDUINO_GPS_TIME = "目前时间:"; +Blockly.Msg.WEBDUINO_GPS_GET_NOW = "取得资讯:"; +Blockly.Msg.WEBDUINO_GPS_GET_CORD = "取得经纬度和时间"; +Blockly.Msg.WEBDUINO_GPS_EVERY = ",每"; +Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS = "毫秒执行一次"; +Blockly.Msg.WEBDUINO_GPS_DO = "执行"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "所测得目前的"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE = "纬度"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE = "经度"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE = "日期"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME = "时间"; \ No newline at end of file diff --git a/blockly/msg/blocks/zh-hant.js b/blockly/msg/blocks/zh-hant.js index 4c61641..ac755ef 100644 --- a/blockly/msg/blocks/zh-hant.js +++ b/blockly/msg/blocks/zh-hant.js @@ -1,6 +1,15 @@ // GPS -Blockly.Msg.WEBDUINO_GPS_RX = "GPS 定位(TinyGPS),RX "; -Blockly.Msg.WEBDUINO_GPS_TX = " TX"; +Blockly.Msg.WEBDUINO_GPS_RX = "GPS 定位 ( TinyGPS ),RX "; +Blockly.Msg.WEBDUINO_GPS_TX = " TX"; Blockly.Msg.WEBDUINO_GPS_LOCATE = "經緯度:"; Blockly.Msg.WEBDUINO_GPS_TIME = "目前時間:"; Blockly.Msg.WEBDUINO_GPS_GET_NOW = "取得資訊:"; +Blockly.Msg.WEBDUINO_GPS_GET_CORD = "取得經緯度和時間"; +Blockly.Msg.WEBDUINO_GPS_EVERY = ",每"; +Blockly.Msg.WEBDUINO_GPS_RUN_EVERY_MS = "毫秒執行一次"; +Blockly.Msg.WEBDUINO_GPS_DO = "執行"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_VALUE = "所測得目前的"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LATITUDE = "緯度"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_LONGITUDE = "經度"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_DATE = "日期"; +Blockly.Msg.WEBDUINO_GPS_CURRENT_TIME = "時間"; \ No newline at end of file diff --git a/blockly/toolbox.xml b/blockly/toolbox.xml index 137d4c1..32f8340 100644 --- a/blockly/toolbox.xml +++ b/blockly/toolbox.xml @@ -1,4 +1,4 @@ - + gps