diff --git a/apptool.js b/apptool.js
index 0959678..a3d4d33 100644
--- a/apptool.js
+++ b/apptool.js
@@ -9,9 +9,9 @@ const ugj_const = {
mascot_defname: 'tamachee.png',
library_dirname: 'lib',
document_root: 'Documents',
- tmp_dir: '.ocogeclub/tmp',
- executable_path: '.ocogeclub/apps/',
- blocks_sensors_dir: 'blocks/sensors/',
+ tmp_dir: '.ocogeclub/tmp', //ホームディレクトリからのパス
+ executable_path: '.ocogeclub/apps/', //ホームディレクトリからのパス
+ blocks_dir: './blocks', // 動作するコードを web demo で生成するためには「./」をつける
localStorage_fname: 'ocoge.json',
error_ja_all: 'エラーが発生しました。\n『おこげ倶楽部』までお問い合わせください。',
pig: 'pigpio',
@@ -38,7 +38,7 @@ class appTool {
this.doc_root = this.path.join(process.env["HOME"], ugj_const.document_root);
this.doc_current = this.path.join(process.env["HOME"], ugj_const.document_root);
this.executable_path = this.path.join(process.env["HOME"], ugj_const.executable_path);
- // this.blocks_sensors_dir = this.path.join(process.env["HOME"], ugj_const.blocks_sensors_dir);
+ // this.blocks_dir = this.path.join(process.env["HOME"], ugj_const.blocks_dir);
this.tmp_dir = this.path.join(process.env["HOME"], ugj_const.tmp_dir);
const EventEmitter = require('events');
this.ugjEmitter = new EventEmitter();
@@ -51,44 +51,44 @@ class appTool {
this.app_path = await this.ipcRenderer.invoke('get_app_path');
this.mascotFilePath = this.path.join(this.app_path, ugj_const.mascot_dirname, ugj_const.mascot_defname);
this.library_path = this.path.join(this.app_path, ugj_const.library_dirname);
- this.blocks_sensors_dir = this.path.join(this.app_path, ugj_const.blocks_sensors_dir);
- this.loadSensorblocks();
+ this.blocks_dir = this.path.join(this.app_path, ugj_const.blocks_dir);
+ // this.loadSensorblocks();
}
// センサーブロックのロード
- loadSensorblocks() {
- // ディレクトリの有無
- if (!this.fs.existsSync(this.blocks_sensors_dir)) return;
- // ブロックデータ格納ディレクトリのリスト
- const allDirents = this.fs.readdirSync(this.blocks_sensors_dir, { withFileTypes: true });
- const blocks_list = allDirents.filter(dirent => dirent.isDirectory()).map(({ name }) => name);
- // センサーカテゴリのインスタンス
- let category_sensors = workspace.getToolbox().getToolboxItemById('category_sensors');
- let flyout_contents = []; // フライアウトのjsonのリスト
- for (let sensor_dir of blocks_list) { //ディレクトリ巡り
- if (sensor_dir.charAt(0) == '.') continue; //隠しディレクトリをスキップ
- // フライアウトのjsonを取得してパース、リストに追加
- let fname = this.path.join(this.blocks_sensors_dir, sensor_dir, 'index.json');
- let json_text = this.fs.readFileSync(fname);
- let obj = JSON.parse(json_text);
- flyout_contents = flyout_contents.concat(obj);
- // ブロック定義のスクリプト要素をbody要素の最後に追加
- fname = this.path.join(this.blocks_sensors_dir, sensor_dir, 'index.js');
- let script = document.createElement('script');
- script.type = 'text/javascript';
- script.src = fname;
- document.body.appendChild(script);
- }
- let lastline = [{
- "kind": "label",
- "text": " ",
- "web-line": "4.0",
- "web-line-width": "200"
- }];
- flyout_contents = flyout_contents.concat(lastline);
- // センサーカテゴリのフライアウトをアップデート
- category_sensors.updateFlyoutContents(flyout_contents);
- }
+ // loadSensorblocks() {
+ // // ディレクトリの有無
+ // if (!this.fs.existsSync(this.blocks_dir)) return;
+ // // ブロックデータ格納ディレクトリのリスト
+ // const allDirents = this.fs.readdirSync(this.blocks_dir, { withFileTypes: true });
+ // const blocks_list = allDirents.filter(dirent => dirent.isDirectory()).map(({ name }) => name);
+ // // センサーカテゴリのインスタンス
+ // let category_sensors = workspace.getToolbox().getToolboxItemById('category_sensors');
+ // let flyout_contents = []; // フライアウトのjsonのリスト
+ // for (let sensor_dir of blocks_list) { //ディレクトリ巡り
+ // if (sensor_dir.charAt(0) == '.') continue; //隠しディレクトリをスキップ
+ // // フライアウトのjsonを取得してパース、リストに追加
+ // let fname = this.path.join(this.blocks_dir, sensor_dir, 'index.json');
+ // let json_text = this.fs.readFileSync(fname);
+ // let obj = JSON.parse(json_text);
+ // flyout_contents = flyout_contents.concat(obj);
+ // // ブロック定義のスクリプト要素をbody要素の最後に追加
+ // fname = this.path.join(this.blocks_dir, sensor_dir, 'index.js');
+ // let script = document.createElement('script');
+ // script.type = 'text/javascript';
+ // script.src = fname;
+ // document.body.appendChild(script);
+ // }
+ // let lastline = [{
+ // "kind": "label",
+ // "text": " ",
+ // "web-line": "4.0",
+ // "web-line-width": "200"
+ // }];
+ // flyout_contents = flyout_contents.concat(lastline);
+ // // センサーカテゴリのフライアウトをアップデート
+ // category_sensors.updateFlyoutContents(flyout_contents);
+ // }
// 0で数値の桁合わせ : NUM=値 LEN=桁数
@@ -332,6 +332,7 @@ class webTool {
// GPIOブロックは使えません
this.gpio_backend = ugj_const.pig;
this.lang = 'js';
+ this.blocks_dir = ugj_const.blocks_dir;
}
// マスコット
@@ -378,7 +379,12 @@ class webTool {
cleanupGPIO() { ; }
path = {
join: function (a = '', b = '', c = '', d = '', e = '') {
- return a + b + c + d + e;
+ const removeTrailingSlash = path => path.endsWith('/') ? path.substr(0, path.length - 1) : path;
+ return removeTrailingSlash(a) +
+ (b ? '/' + removeTrailingSlash(b) : '') +
+ (c ? '/' + removeTrailingSlash(c) : '') +
+ (d ? '/' + removeTrailingSlash(d) : '') +
+ (e ? '/' + removeTrailingSlash(e) : '')
}
}
}
diff --git a/blocks/index.js b/blocks/index.js
new file mode 100644
index 0000000..8a7d5d0
--- /dev/null
+++ b/blocks/index.js
@@ -0,0 +1,20 @@
+var flyout_contents = [];
+const registerCategory = (category_dir, subcategories) => {
+ for (let sbctgr of subcategories) {
+ let fname = ugj_const.blocks_dir + '/' + category_dir + "/" + sbctgr + "/index.js";
+ let script = document.createElement('script');
+ script.type = 'text/javascript';
+ script.src = fname;
+ script.async = false;
+ document.body.appendChild(script);
+ }
+}
+
+// センサーカテゴリ
+registerCategory('sensors', [ // カテゴリディレクトリ名
+ "amg8833",
+ "paj7620",
+ "bme280",
+ "dht11",
+ "z-line" // フライアウト下端の不可視ライン。スクリプトにカテゴリ名を含むので注意
+]);
diff --git a/blocks/sensors/amg8833/index.js b/blocks/sensors/amg8833/index.js
index 1db0928..14d4541 100644
--- a/blocks/sensors/amg8833/index.js
+++ b/blocks/sensors/amg8833/index.js
@@ -25,7 +25,7 @@ Blockly.Msg["UGJ_TENSORSET_PARSE_TOOLTIP"] = "JSONテキストをパースして
/******************* */
/** Init Grid-Eye ** */
/******************* */
-var ugjGridEyeInitDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_grideye_init",
"message0": "%{BKY_UGJ_GRIDEYE_INIT_TITLE}",
"args0": [
@@ -50,18 +50,13 @@ var ugjGridEyeInitDefinition = {
"tooltip": "%{BKY_UGJ_GRIDEYE_INIT_TOOLTIP}",
"helpUrl": "",
"style": "sensor_blocks"
-};
-Blockly.Blocks['ugj_grideye_init'] = {
- init: function () {
- this.jsonInit(ugjGridEyeInitDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_grideye_init'] = function (block) {
var dropdown_addr = block.getFieldValue('addr');
Blockly.JavaScript.provideFunction_(
'require_gpio', [`const _pi = require('@ocoge.club/` + apptool.gpio_backend + `');`]
);
- let modpath = apptool.path.join(apptool.blocks_sensors_dir, 'amg8833', 'AMG8833x.js');
+ let modpath = apptool.path.join(apptool.blocks_dir, 'sensors', 'amg8833', 'AMG8833x.js');
Blockly.JavaScript.provideFunction_(
'require_amg8833', [`const _amg8833 = require('${modpath}');`]
);
@@ -71,19 +66,14 @@ Blockly.JavaScript['ugj_grideye_init'] = function (block) {
/********************** */
/** Grid-Eye 本体温度 ** */
/********************** */
-var ugjGridEyeThermistorDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_grideye_thermistor",
"message0": "%{BKY_UGJ_GRIDEYE_THERMISTOR_TITLE}",
"output": "Number",
"tooltip": "%{BKY_UGJ_GRIDEYE_THERMISTOR_TOOLTIP}",
"helpUrl": "",
"style": "sensor_blocks"
-};
-Blockly.Blocks['ugj_grideye_thermistor'] = {
- init: function () {
- this.jsonInit(ugjGridEyeThermistorDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_grideye_thermistor'] = function (block) {
var code = `await _amg8833.read_thermistor()`;
return [code, Blockly.JavaScript.ORDER_NONE];
@@ -92,7 +82,7 @@ Blockly.JavaScript['ugj_grideye_thermistor'] = function (block) {
/**************************** */
/** Read Temperature Array ** */
/**************************** */
-var ugjGridEyeReadDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_grideye_read",
"message0": "%{BKY_UGJ_GRIDEYE_READ_TITLE}",
"inputsInline": true,
@@ -100,12 +90,7 @@ var ugjGridEyeReadDefinition = {
"tooltip": "%{BKY_UGJ_GRIDEYE_READ_TOOLTIP}",
"helpUrl": "",
"style": "sensor_blocks"
-};
-Blockly.Blocks['ugj_grideye_read'] = {
- init: function () {
- this.jsonInit(ugjGridEyeReadDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_grideye_read'] = function (block) {
var code = 'await _amg8833.read_temp_array()';
return [code, Blockly.JavaScript.ORDER_ATOMIC];
@@ -113,7 +98,7 @@ Blockly.JavaScript['ugj_grideye_read'] = function (block) {
/******************* */
/** Stop Grid-Eye ** */
/******************* */
-var ugjGridEyeStopDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_grideye_stop",
"message0": "%{BKY_UGJ_GRIDEYE_STOP_TITLE}",
"inputsInline": true,
@@ -122,12 +107,7 @@ var ugjGridEyeStopDefinition = {
"tooltip": "%{BKY_UGJ_GRIDEYE_STOP_TOOLTIP}",
"helpUrl": "",
"style": "sensor_blocks"
-};
-Blockly.Blocks['ugj_grideye_stop'] = {
- init: function () {
- this.jsonInit(ugjGridEyeStopDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_grideye_stop'] = function (block) {
var code = 'await _amg8833.stop();\n';
return code;
@@ -137,7 +117,7 @@ Blockly.JavaScript['ugj_grideye_stop'] = function (block) {
/***************************** */
/** GridEye 表示キャンバス作成 ** */
/***************************** */
-var ugjGridEyeCanvasCreateDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_grideye_canvas_create",
"message0": "%{BKY_UGJ_GRIDEYE_CANVAS_CREATE_TITLE}",
"inputsInline": true,
@@ -146,12 +126,7 @@ var ugjGridEyeCanvasCreateDefinition = {
"tooltip": "%{BKY_UGJ_GRIDEYE_CANVAS_CREATE_TOOLTIP}",
"helpUrl": "",
"style": "multimedia_blocks"
-};
-Blockly.Blocks['ugj_grideye_canvas_create'] = {
- init: function () {
- this.jsonInit(ugjGridEyeCanvasCreateDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_grideye_canvas_create'] = function (block) {
var code = `let _grideye_canvas = document.createElement('canvas');
_grideye_canvas.setAttribute('width', 8);
@@ -169,7 +144,8 @@ Blockly.JavaScript['ugj_grideye_canvas_create'] = function (block) {
/********************************************** */
/** Draw IR Array Data to Image Data ** */
/********************************************** */
-var ugjDrawGrideyedataDefinition = {
+
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_draw_grideyedata",
"message0": "%{BKY_UGJ_DRAW_GRIDEYEDATA_TITLE}",
"args0": [
@@ -211,12 +187,7 @@ var ugjDrawGrideyedataDefinition = {
"tooltip": "%{BKY_UGJ_DRAW_GRIDEYEDATA_TOOLTIP}",
"helpUrl": "",
"style": "multimedia_blocks"
-};
-Blockly.Blocks['ugj_draw_grideyedata'] = {
- init: function () {
- this.jsonInit(ugjDrawGrideyedataDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_draw_grideyedata'] = function (block) {
var value_amg8833data = Blockly.JavaScript.valueToCode(block, 'amg8833data', Blockly.JavaScript.ORDER_ATOMIC);
var colour_color_high = block.getFieldValue('color_high');
@@ -258,7 +229,7 @@ Blockly.JavaScript['ugj_draw_grideyedata'] = function (block) {
/**************************** */
/** Teachable Machine を開始** */
/**************************** */
-var ugjTeachableMachineDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_teachable_machine",
"message0": "%{BKY_UGJ_TEACHABLE_MACHINE_TITLE}",
"inputsInline": true,
@@ -267,12 +238,7 @@ var ugjTeachableMachineDefinition = {
"tooltip": "%{BKY_UGJ_TEACHABLE_MACHINE_TOOLTIP}",
"helpUrl": "",
"style": "multimedia_blocks"
-};
-Blockly.Blocks['ugj_teachable_machine'] = {
- init: function () {
- this.jsonInit(ugjTeachableMachineDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_teachable_machine'] = function (block) {
Blockly.JavaScript.provideFunction_(
'require_ts', [`const _tf = require('@tensorflow/tfjs-node');`]
@@ -292,7 +258,7 @@ Blockly.JavaScript['ugj_teachable_machine'] = function (block) {
/************************* */
/** GridEye で推論を行う ** */
/************************* */
-var ugjGridEyePredictClassDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_grideye_predict_class",
"message0": "%{BKY_UGJ_GRIDEYE_PREDICT_CLASS_TITLE}",
"inputsInline": true,
@@ -300,12 +266,7 @@ var ugjGridEyePredictClassDefinition = {
"tooltip": "%{BKY_UGJ_GRIDEYE_PREDICT_CLASS_TOOLTIP}",
"helpUrl": "",
"style": "multimedia_blocks"
-};
-Blockly.Blocks['ugj_grideye_predict_class'] = {
- init: function () {
- this.jsonInit(ugjGridEyePredictClassDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_grideye_predict_class'] = function (block) {
var functionName = Blockly.JavaScript.provideFunction_( // left output にするための関数化
'_predictClass',
@@ -327,7 +288,7 @@ Blockly.JavaScript['ugj_grideye_predict_class'] = function (block) {
/******************************************** */
/** ラベルをつけて Example をデータセットに追加 ** */
/******************************************** */
-var ugjGridEyeAddExampleDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_grideye_add_example",
"message0": "%{BKY_UGJ_GRIDEYE_ADD_EXAMPLE_TITLE}",
"args0": [
@@ -343,12 +304,7 @@ var ugjGridEyeAddExampleDefinition = {
"tooltip": "%{BKY_UGJ_GRIDEYE_ADD_EXAMPLE_TOOLTIP}",
"helpUrl": "",
"style": "multimedia_blocks"
-};
-Blockly.Blocks['ugj_grideye_add_example'] = {
- init: function () {
- this.jsonInit(ugjGridEyeAddExampleDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_grideye_add_example'] = function (block) {
var value_class_id = Blockly.JavaScript.valueToCode(block, 'class_id', Blockly.JavaScript.ORDER_ATOMIC);
var code = `_classifier.addExample (_net.infer(_grideye_canvas, true), ${value_class_id});`;
@@ -357,19 +313,14 @@ Blockly.JavaScript['ugj_grideye_add_example'] = function (block) {
/*************************** */
/** 学習したクラスを文字列化 ** */
/*************************** */
-var ugjTensorsetStringifyDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_tensorset_stringify",
"message0": "%{BKY_UGJ_TENSORSET_STRINGIFY_TITLE}",
"output": null,
"tooltip": "%{BKY_UGJ_TENSORSET_STRINGIFY_TOOLTIP}",
"helpUrl": "",
"style": "multimedia_blocks"
-};
-Blockly.Blocks['ugj_tensorset_stringify'] = {
- init: function () {
- this.jsonInit(ugjTensorsetStringifyDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_tensorset_stringify'] = function (block) {
var code = `JSON.stringify( Object.entries(_classifier.getClassifierDataset()).map(([label, data])=>[label, Array.from(data.dataSync()), data.shape]) )`;
return [code, Blockly.JavaScript.ORDER_NONE];
@@ -377,7 +328,7 @@ Blockly.JavaScript['ugj_tensorset_stringify'] = function (block) {
/***************************************** */
/** jsonをデータセットに戻して分類器にセット ** */
/***************************************** */
-var ugjTensorsetParseDefinition = {
+Blockly.defineBlocksWithJsonArray([{
"type": "ugj_tensorset_parse",
"message0": "%{BKY_UGJ_TENSORSET_PARSE_TITLE}",
"args0": [
@@ -392,17 +343,124 @@ var ugjTensorsetParseDefinition = {
"tooltip": "%{BKY_UGJ_TENSORSET_PARSE_TOOLTIP}",
"helpUrl": "",
"style": "multimedia_blocks"
-};
-Blockly.Blocks['ugj_tensorset_parse'] = {
- init: function () {
- this.jsonInit(ugjTensorsetParseDefinition);
- }
-};
+}]);
Blockly.JavaScript['ugj_tensorset_parse'] = function (block) {
var value_class_data_json = Blockly.JavaScript.valueToCode(block, 'class_data_json', Blockly.JavaScript.ORDER_ATOMIC);
var code = `_classifier.setClassifierDataset( Object.fromEntries( JSON.parse(${value_class_data_json}).map(([label, data, shape])=>[label, _tf.tensor(data, shape)]) ) );`;
return code;
};
+// 温度ブロック（ツールボックス上非表示）
+Blockly.defineBlocksWithJsonArray([{
+ "type": "ugj_temp",
+ "message0": "%1",
+ "args0": [
+ {
+ "type": "field_slider",
+ "name": "temp",
+ "value": 15,
+ "min": 0,
+ "max": 40,
+ "precision": 1
+ }
+ ],
+ "inputsInline": true,
+ "output": "Number",
+ "tooltip": "",
+ "helpUrl": "",
+ "style": "math_blocks"
+}]);
+Blockly.JavaScript['ugj_temp'] = function (block) {
+ var number_temp = block.getFieldValue('temp');
+ var code = `${number_temp}`;
+ return [code, Blockly.JavaScript.ORDER_NONE];
+};
+flyout_contents = flyout_contents.concat([
+ {
+ "kind": "label",
+ "text": "赤外線アレイセンサー（サーマルカメラ）AMG8833",
+ "web-line": "4.0",
+ "web-line-width": "200"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_grideye_init",
+ "fields": {
+ "addr": "0x69"
+ }
+ },
+ {
+ "kind": "block",
+ "type": "ugj_grideye_thermistor"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_grideye_read"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_grideye_stop"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_grideye_canvas_create"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_draw_grideyedata",
+ "fields": {
+ "color_high": "#ff0000",
+ "color_low": "#3333ff"
+ },
+ "inputs": {
+ "temp_high": {
+ "shadow": {
+ "type": "ugj_temp",
+ "fields": {
+ "temp": "28"
+ }
+ }
+ },
+ "temp_low": {
+ "shadow": {
+ "type": "ugj_temp",
+ "fields": {
+ "temp": "15"
+ }
+ }
+ }
+ }
+ },
+ {
+ "kind": "block",
+ "type": "ugj_teachable_machine"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_grideye_predict_class"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_grideye_add_example",
+ "inputs": {
+ "class_id": {
+ "shadow": {
+ "type": "math_number",
+ "fields": {
+ "NUM": "0"
+ }
+ }
+ }
+ }
+ },
+ {
+ "kind": "block",
+ "type": "ugj_tensorset_stringify"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_tensorset_parse"
+ }
+]);
\ No newline at end of file
diff --git a/blocks/sensors/amg8833/index.json b/blocks/sensors/amg8833/index.json
deleted file mode 100644
index d8842da..0000000
--- a/blocks/sensors/amg8833/index.json
+++ /dev/null
@@ -1,87 +0,0 @@
-[
- {
- "kind": "label",
- "text": "赤外線アレイセンサー（サーマルカメラ）AMG8833",
- "web-line": "4.0",
- "web-line-width": "200"
- },
- {
- "kind": "block",
- "type": "ugj_grideye_init",
- "fields": {
- "addr": "0x69"
- }
- },
- {
- "kind": "block",
- "type": "ugj_grideye_thermistor"
- },
- {
- "kind": "block",
- "type": "ugj_grideye_read"
- },
- {
- "kind": "block",
- "type": "ugj_grideye_stop"
- },
- {
- "kind": "block",
- "type": "ugj_grideye_canvas_create"
- },
- {
- "kind": "block",
- "type": "ugj_draw_grideyedata",
- "fields": {
- "color_high": "#ff0000",
- "color_low": "#3333ff"
- },
- "inputs": {
- "temp_high": {
- "shadow": {
- "type": "math_number",
- "fields": {
- "NUM": "28"
- }
- }
- },
- "temp_low": {
- "shadow": {
- "type": "math_number",
- "fields": {
- "NUM": "15"
- }
- }
- }
- }
- },
- {
- "kind": "block",
- "type": "ugj_teachable_machine"
- },
- {
- "kind": "block",
- "type": "ugj_grideye_predict_class"
- },
- {
- "kind": "block",
- "type": "ugj_grideye_add_example",
- "inputs": {
- "class_id": {
- "shadow": {
- "type": "math_number",
- "fields": {
- "NUM": "0"
- }
- }
- }
- }
- },
- {
- "kind": "block",
- "type": "ugj_tensorset_stringify"
- },
- {
- "kind": "block",
- "type": "ugj_tensorset_parse"
- }
-]
\ No newline at end of file
diff --git a/blocks/sensors/bme280/index.js b/blocks/sensors/bme280/index.js
index d920a9e..2430263 100644
--- a/blocks/sensors/bme280/index.js
+++ b/blocks/sensors/bme280/index.js
@@ -20,7 +20,7 @@ Blockly.JavaScript['ugj_bme280'] = function (block) {
Blockly.JavaScript.provideFunction_(
'require_gpio', [`const _pi = require('@ocoge.club/` + apptool.gpio_backend + `');`]
);
- let modpath = apptool.path.join(apptool.blocks_sensors_dir, 'bme280', 'BME280x.js');
+ let modpath = apptool.path.join(ugj_const.blocks_dir, 'sensors', 'bme280', 'BME280x.js');
Blockly.JavaScript.provideFunction_(
'require_bme280', [`const _bme280 = require('${modpath}');`]
);
@@ -53,4 +53,28 @@ Blockly.JavaScript['ugj_bme280_data'] = function (block) {
var dropdown_thp = block.getFieldValue('thp');
var code = `_bmedata[${dropdown_thp}]`;
return [code, Blockly.JavaScript.ORDER_ATOMIC];
-};
\ No newline at end of file
+};
+
+flyout_contents = flyout_contents.concat([
+ {
+ "kind": "label",
+ "text": "温湿度気圧センサー BME280",
+ "web-line": "4.0",
+ "web-line-width": "200"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_bme280",
+ "fields": {
+ "addr": "0x76"
+ }
+ },
+ {
+ "kind": "block",
+ "type": "ugj_bme280_data",
+ "fields": {
+ "thp": "0"
+ }
+ }
+]);
+
diff --git a/blocks/sensors/bme280/index.json b/blocks/sensors/bme280/index.json
deleted file mode 100644
index 7a4e319..0000000
--- a/blocks/sensors/bme280/index.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
- "kind": "label",
- "text": "温湿度気圧センサー BME280",
- "web-line": "4.0",
- "web-line-width": "200"
- },
- {
- "kind": "block",
- "type": "ugj_bme280",
- "fields": {
- "addr": "0x76"
- }
- },
- {
- "kind": "block",
- "type": "ugj_bme280_data",
- "fields": {
- "thp": "0"
- }
- }
-]
\ No newline at end of file
diff --git a/blocks/sensors/dht11/index.js b/blocks/sensors/dht11/index.js
index a465784..edc67e1 100644
--- a/blocks/sensors/dht11/index.js
+++ b/blocks/sensors/dht11/index.js
@@ -15,7 +15,7 @@ Blockly.Blocks['ugj_dht11'] = {
};
Blockly.JavaScript['ugj_dht11'] = function (block) {
var value_pin = Blockly.JavaScript.valueToCode(block, 'pin', Blockly.JavaScript.ORDER_ATOMIC);
- let pypath = apptool.path.join(apptool.blocks_sensors_dir, 'dht11', 'dht11.py');
+ let pypath = apptool.path.join(ugj_const.blocks_dir, 'sensors', 'dht11', 'dht11.py');
var code = `let _th = require('child_process').spawnSync('python3', ['${pypath}', '${value_pin}'], {timeout: 5000}).stdout.toString();
let _dhtdata = JSON.parse(_th);`;
// let _dht11data[0] =
@@ -38,4 +38,34 @@ Blockly.JavaScript['ugj_dht11_data'] = function (block) {
var dropdown_th = block.getFieldValue('th');
var code = `_dhtdata.${dropdown_th}`;
return [code, Blockly.JavaScript.ORDER_ATOMIC];
-};
\ No newline at end of file
+};
+
+flyout_contents = flyout_contents.concat([
+ {
+ "kind": "label",
+ "text": "温湿度センサー DHT11",
+ "web-line": "4.0",
+ "web-line-width": "200"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_dht11",
+ "inputs": {
+ "pin": {
+ "shadow": {
+ "type": "math_number",
+ "fields": {
+ "NUM": "8"
+ }
+ }
+ }
+ }
+ },
+ {
+ "kind": "block",
+ "type": "ugj_dht11_data",
+ "fields": {
+ "th": "temperature"
+ }
+ }
+]);
\ No newline at end of file
diff --git a/blocks/sensors/dht11/index.json b/blocks/sensors/dht11/index.json
deleted file mode 100644
index 7e4b061..0000000
--- a/blocks/sensors/dht11/index.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
- "kind": "label",
- "text": "温湿度センサー DHT11",
- "web-line": "4.0",
- "web-line-width": "200"
- },
- {
- "kind": "block",
- "type": "ugj_dht11",
- "inputs": {
- "pin": {
- "shadow": {
- "type": "math_number",
- "fields": {
- "NUM": "8"
- }
- }
- }
- }
- },
- {
- "kind": "block",
- "type": "ugj_dht11_data",
- "fields": {
- "th": "temperature"
- }
- }
-]
\ No newline at end of file
diff --git a/blocks/sensors/paj7620/index.js b/blocks/sensors/paj7620/index.js
index 720cd6b..90ef2f0 100644
--- a/blocks/sensors/paj7620/index.js
+++ b/blocks/sensors/paj7620/index.js
@@ -35,7 +35,7 @@ Blockly.JavaScript['ugj_gesture_init'] = function (block) {
Blockly.JavaScript.provideFunction_(
'require_gpio', [`const _pi = require('@ocoge.club/` + apptool.gpio_backend + `');`]
);
- let modpath = apptool.path.join(apptool.blocks_sensors_dir, 'paj7620', 'PAJ7620x.js');
+ let modpath = apptool.path.join(ugj_const.blocks_dir, 'sensors', 'paj7620', 'PAJ7620x.js');
Blockly.JavaScript.provideFunction_(
'require_paj7620', [`const _paj7620 = require('${modpath}');`]
);
@@ -87,3 +87,41 @@ Blockly.JavaScript['ugj_gesture_stop'] = function (block) {
var code = 'await _paj7620.stop();\n';
return code;
};
+
+flyout_contents = flyout_contents.concat([
+ {
+ "kind": "label",
+ "text": "ジェスチャーセンサー PAJ7620",
+ "web-line": "4.0",
+ "web-line-width": "200"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_gesture_init",
+ "inputs": {
+ "i2c_addr": {
+ "shadow": {
+ "type": "ugj_hextodec",
+ "inputs": {
+ "hex": {
+ "shadow": {
+ "type": "text",
+ "fields": {
+ "TEXT": "73"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ {
+ "kind": "block",
+ "type": "ugj_gesture_read"
+ },
+ {
+ "kind": "block",
+ "type": "ugj_gesture_stop"
+ }
+]);
\ No newline at end of file
diff --git a/blocks/sensors/paj7620/index.json b/blocks/sensors/paj7620/index.json
deleted file mode 100644
index fdf9602..0000000
--- a/blocks/sensors/paj7620/index.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
- {
- "kind": "label",
- "text": "ジェスチャーセンサー PAJ7620",
- "web-line": "4.0",
- "web-line-width": "200"
- },
- {
- "kind": "block",
- "type": "ugj_gesture_init",
- "inputs": {
- "i2c_addr": {
- "shadow": {
- "type": "ugj_hextodec",
- "inputs": {
- "hex": {
- "shadow": {
- "type": "text",
- "fields": {
- "TEXT": "73"
- }
- }
- }
- }
- }
- }
- }
- },
- {
- "kind": "block",
- "type": "ugj_gesture_read"
- },
- {
- "kind": "block",
- "type": "ugj_gesture_stop"
- }
-]
\ No newline at end of file
diff --git a/blocks/sensors/z-line/index.js b/blocks/sensors/z-line/index.js
new file mode 100644
index 0000000..e9ccea6
--- /dev/null
+++ b/blocks/sensors/z-line/index.js
@@ -0,0 +1,10 @@
+(() => {
+ let category = workspace.getToolbox().getToolboxItemById('category_sensors');
+ category.updateFlyoutContents(flyout_contents.concat([{
+ "kind": "label",
+ "text": " ",
+ "web-line": "4.0",
+ "web-line-width": "200"
+ }]));
+ flyout_contents = [];
+})();
\ No newline at end of file
diff --git a/index.html b/index.html
index 968b64a..a89a69d 100644
--- a/index.html
+++ b/index.html
@@ -12,7 +12,12 @@
-
+
+
+
+
+
+
@@ -1046,11 +1051,13 @@
+
-
-
-
+
+
+
+