Feat/marge upstream

src/lib/libraries/extensions/index.jsx

@@ -12,6 +12,8 @@ import microcom1 from './smt/microcom1.png';
 import microcom2 from './smt/microcom2.png';
 import microcom3 from './smt/microcom3.png';
 import menu3InsetIconURL from './smt/microcom-small.png';
+import rboard from './smt/rboard.png'
+import menu4InsetIconURL from './smt/rboard-small.png';
 
 const extensions = [
 /*
@@ -215,6 +217,26 @@ const extensions = [
             />
         ),
         featured: true
+    },
+    {
+        name: (
+            <FormattedMessage
+                defaultMessage="RBoard"
+                description="Name for the 'RBoard' extension"
+                id="gui.rboard.name"
+            />
+        ),
+        extensionId: 'rboard',
+        iconURL: rboard,
+        insetIconURL: menu4InsetIconURL,
+        description: (
+            <FormattedMessage
+                defaultMessage="RBoard Blocks"
+                description="Description for the 'RBoard' extension"
+                id="gui.rboard.description"
+            />
+        ),
+        featured: true
     }
 ];
 

src/lib/ruby-generator/index.js

@@ -40,6 +40,7 @@ import Kanirobo2Blocks from './kanirobo2.js';
 import ToolsBlocks from './tools.js';
 import M5stackBlocks from './m5stack.js';
 import SensorBlocks from './sensor.js';
+import RboardBlocks from './rboard.js';
 
 const SCALAR_TYPE = '';
 const LIST_TYPE = 'list';
@@ -482,5 +483,6 @@ Kanirobo2Blocks(RubyGenerator);
 ToolsBlocks(RubyGenerator);
 M5stackBlocks(RubyGenerator);
 SensorBlocks(RubyGenerator);
+RboardBlocks(RubyGenerator);
 
 export default RubyGenerator;

src/lib/ruby-generator/kanirobo1v2.js

@@ -7,54 +7,43 @@ export default function (Generator) {
 
     Generator.kanirobo1v2_motor_init = function (block) {
         return `motor1 = GPIO.new(25, GPIO::OUT)\n` +
-	       `motor1_pwm = PWM.new(26, ch=0)\n` +
+	       `motor1_pwm = PWM.new(26, timer:1, channel:1)\n` +
 	       `motor2 = GPIO.new(32, GPIO::OUT)\n` +
-	       `motor2_pwm = PWM.new(33, ch=1)\n`;
+ 	       `motor2_pwm = PWM.new(33, timer:1, channel:2)\n`;
     };
 
     Generator.kanirobo1v2_lux_init = function (block) {
-	return `lux36 = ADC.new(36, ADC::ATTEN_11DB, ADC::WIDTH_12BIT)\n` +
-	       `lux34 = ADC.new(34, ADC::ATTEN_11DB, ADC::WIDTH_12BIT)\n` + 
-	       `lux35 = ADC.new(35, ADC::ATTEN_11DB, ADC::WIDTH_12BIT)\n` + 
-  	       `lux2  = ADC.new(2,  ADC::ATTEN_11DB, ADC::WIDTH_12BIT)\n`;
+	return `lux36 = ADC.new(36)\n` +
+	       `lux34 = ADC.new(34)\n` + 
+	       `lux35 = ADC.new(35)\n` + 
+  	       `lux2  = ADC.new(2)\n`;
     };
 
     Generator.kanirobo1v2_servo_init = function (block) {
-	return `servo27 = PWM.new(27, ch=3)\n` +
-	    `servo14 = PWM.new(14, ch=2)\n` +
-	    `servo27.freq( 80 )\n` +
-	    `servo14.freq( 80 )\n` +
-	    `deg = 50 \n` +
-            `servo27.duty( deg )\n` +
-            `servo14.duty( deg )\n` +
-	    `sleep 0.1\n` +
-            `servo27.deinit\n` +
-            `servo14.deinit\n` ;
+	return `servo27 = PWM.new(27, timer:2, channel:3, frequency:50)\n` +
+  	       `servo14 = PWM.new(14, timer:2, channel:4, frequency:50)\n`;
     };
 
     Generator.kanirobo1v2_motor = function (block) {
 	Generator.prepares_[`motor`] = Generator.kanirobo1v2_motor_init(null);
         const text1 = Generator.valueToCode(block, 'TEXT1', Generator.ORDER_NONE) || null;
         const text2 = Generator.valueToCode(block, 'TEXT2', Generator.ORDER_NONE) || null;
         const text3 = Generator.valueToCode(block, 'TEXT3', Generator.ORDER_NONE) || null;
-        return `motor${text1}_pwm.duty( 1000 + ${text3} - 2 * ${text2} * ${text3} ) \n` +
+        return `motor${text1}_pwm.duty( ( 100 - 2 * ${text3} ) * ${text2} + ${text3} ) \n` +
                `motor${text1}.write(${text2})\n` +
                `sleep( 0.01 )\n`;
     };
     Generator.kanirobo1v2_value0 = function (block) {
 	Generator.prepares_[`lux`] = Generator.kanirobo1v2_lux_init(null);
         const text = Generator.valueToCode(block, 'TEXT', Generator.ORDER_NONE) || null;
-	return [`lux${text}.rawread`, Generator.ORDER_ATOMIC];
+	return [`lux${text}.read_raw`, Generator.ORDER_ATOMIC];
     };
 
     Generator.kanirobo1v2_command9 = function (block) {
 	Generator.prepares_[`servo`] = Generator.kanirobo1v2_servo_init(null);
         const text = Generator.valueToCode(block, 'TEXT', Generator.ORDER_NONE) || null;
         const num  = Generator.valueToCode(block, 'NUM', Generator.ORDER_NONE)  || 0;
-	return `deg = ( ( ${num}.to_f * (150 - 50) / 90.0 + 50).to_i ) \n`+
-               `servo${text}.duty( ( deg % 1024 ).to_i )\n` +
-	       `sleep 0.1\n` +
-	       `servo${text}.deinit\n`;
+	return `servo${text}.pulse_width_us( ${num} )\n`;
     };
 
     // メニューについては Ruby 側でも定義が必要のようだ
@@ -92,5 +81,10 @@ export default function (Generator) {
         return [menu7, Generator.ORDER_ATOMIC];
     };
 
+    Generator.kanirobo1v2_menu_menu8 = function (block){
+        const menu8 = Generator.getFieldValue(block, 'menu8') || null;
+        return [menu8, Generator.ORDER_ATOMIC];
+    };
+
     return Generator;
 }

src/lib/ruby-generator/rboard.js

@@ -0,0 +1,119 @@
+/**
+ * Define Ruby code generator for I2C_UART Blocks
+ * @param {RubyGenerator} Generator The RubyGenerator
+ * @return {RubyGenerator} same as param.
+ */
+export default function (Generator) {
+    Generator.rboard_gpio_output_init = function (block){
+        const num1 = Generator.getFieldValue(block, 'NUM1', Generator.ORDER_NONE);
+        return `led${num1} = GPIO.new( ${num1} )\n`;
+    };
+
+    Generator.rboard_gpio_output = function (block) {
+        const num1  = Generator.getFieldValue(block, 'NUM1', Generator.ORDER_NONE);
+        const value = Generator.getFieldValue(block, 'VALUE', Generator.ORDER_NONE);
+        return `led${num1}.write(${value})\n`;
+    };
+
+    Generator.rboard_gpio_input_init = function (block){
+        const num1 = Generator.getFieldValue(block, 'NUM1', Generator.ORDER_NONE);
+        return `sw${num1} = GPIO.new( ${num1} ) \nsw${num1}.setmode(1)\n`;
+    };
+
+    Generator.rboard_gpio_input = function (block) {
+        const num1 = Generator.getFieldValue(block, 'NUM1', Generator.ORDER_NONE);
+        return [`sw${num1}.read`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.rboard_pwm_init = function (block){
+        const num1 = Generator.getFieldValue(block, 'NUM1', Generator.ORDER_NONE);
+        return `pwm${num1} = PWM.new( ${num1} )\n`;
+    };
+
+    Generator.rboard_pwm_duty = function (block) {
+        const num1  = Generator.getFieldValue(block, 'NUM1', Generator.ORDER_NONE);
+        const value = Generator.valueToCode(block, 'VALUE', Generator.ORDER_NONE) || null;
+        return `pwm${num1}.duty( ( ${value} % 1024 ).to_i )\n`;
+    };
+
+    Generator.rboard_pwm_frequency = function (block) {
+        const num1  = Generator.getFieldValue(block, 'NUM1', Generator.ORDER_NONE);
+        const value = Generator.valueToCode(block, 'VALUE', Generator.ORDER_NONE) || null;
+        return `pwm${num1}.freq( ${value}.to_i )\n`;
+    };
+
+    Generator.rboard_adc_init = function (block) {
+        const num1 = Generator.getFieldValue(block, 'NUM1', Generator.ORDER_NONE);
+        return `adc${num1} = ADC.new( ${num1} )\n`;
+    };
+
+    Generator.rboard_adc_volt = function (block) {
+        const value = Generator.getFieldValue(block, 'VALUE', Generator.ORDER_NONE);
+        return [`adc${value}.read`, Generator.ORDER_ATOMIC];
+    };
+/*
+    Generator.rboard_i2c_init = function (block) {
+        return `i2c = I2C.new()\n`;
+    };
+*/
+    Generator.rboard_i2c_write = function (block) {
+        const num1 = Generator.valueToCode(block, 'NUM1', Generator.ORDER_NONE) || null;
+        const num2 = Generator.valueToCode(block, 'NUM2', Generator.ORDER_NONE) || null;
+        const num3 = Generator.valueToCode(block, 'NUM3', Generator.ORDER_NONE) || null;
+        return `i2c.write( 0x${num1}, 0x${num2}, ${num3} )\n`;
+    };
+
+    Generator.rboard_i2c_read = function (block) {
+        const num1 = Generator.valueToCode(block, 'NUM1', Generator.ORDER_NONE) || null;
+        const num2 = Generator.valueToCode(block, 'NUM2', Generator.ORDER_NONE) || 1;
+	const num3 = Generator.valueToCode(block, 'NUM3', Generator.ORDER_NONE) || null;
+        return [`i2c.read( 0x${num1}, ${num2}, 0x${num3} )`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.rboard_uart_init = function (block) {
+        const num = Generator.valueToCode(block, 'NUM', Generator.ORDER_NONE) || null;
+        return `uart = UART.new( 2, ${num} )\n`;
+    };
+
+    Generator.rboard_uart_write = function (block) {
+        const text2 = Generator.valueToCode(block, 'TEXT2', Generator.ORDER_NONE) || null;
+        return `uart.puts( ${text2} )\n`;
+    };
+
+    Generator.rboard_uart_read = function (block) {
+        return [`uart.gets()`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.rboard_puts = function (block) {
+        const text = Generator.valueToCode(block, 'TEXT', Generator.ORDER_NONE) || null;
+        return `puts( ${text} )\n`;
+    };
+
+    // メニューについては Ruby 側でも定義が必要のようだ
+    Generator.rboard_menu_menu1 = function (block) {
+        const menu1 = Generator.getFieldValue(block, 'menu1') || null;
+        return [menu1, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.rboard_menu_menu2 = function (block) {
+        const menu2 = Generator.getFieldValue(block, 'menu2') || null;
+        return [menu2, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.rboard_menu_menu3 = function (block) {
+        const menu3 = Generator.getFieldValue(block, 'menu3') || null;
+        return [menu3, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.rboard_menu_menu4 = function (block) {
+        const menu4 = Generator.getFieldValue(block, 'menu4') || null;
+        return [menu4, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.rboard_menu_menu5 = function (block) {
+        const menu5 = Generator.getFieldValue(block, 'menu5') || null;
+        return [menu5, Generator.ORDER_ATOMIC];
+    };
+
+    return Generator;
+}

src/locales/ja-Hira.js

@@ -45,6 +45,8 @@ export default {
     "gui.sensor.description": "センサーようブロック．SCD30, など",
     "gui.menuBar.uploadToServer": "マイコンへかく",
     "gui.menuBar.uploadToServerOld": "マイコンへかく (きゅうばん)",
+    "gui.rboard.name": "RBoard",
+    "gui.rboard.description": "RBoard (GPIO, PWM, ADC, ...)",
     // MBoard共通
     "mboard.sound_C": "ド",
     "mboard.sound_D": "レ",
@@ -135,16 +137,16 @@ export default {
     "kanirobo1v2.command9": "さーぼもーたー[TEXT]を[NUM]どにする",
     //
     "kanirobo2.name": "かにろぼ(ふつう)",
-    "kanirobo2.Menu1.forward": "まえ",
-    "kanirobo2.Menu1.backward": "うしろ",
+    "kanirobo2.Menu1.forward": "1",
+    "kanirobo2.Menu1.backward": "2",
     "kanirobo2.Menu3.enable": "ゆうこう",
     "kanirobo2.Menu3.disable": "むこう",
     "kanirobo2.command0": "もーたーゆうこうかぴんをしょきか",
     "kanirobo2.command1": "もーたーゆうこうかぴんを[TEXT]か",
-    "kanirobo2.command2": "もーたー[TEXT]をしょきか",
+    "kanirobo2.command2": "もーたー[TEXT]のGPIOをしょきか",
     "kanirobo2.command3": "もーたー[TEXT]のPWMをしょきか",
-    "kanirobo2.command4": "もーたー[TEXT1]を[TEXT2]ほうこうにせっと",
-    "kanirobo2.command5": "もーたー[TEXT]のでゅーてぃーひを[NUM](0~1023)にする",
+    "kanirobo2.command4": "もーたー[TEXT1]のGPIOを[TEXT2](1:まえ，0:うしろ)にせっと",
+    "kanirobo2.command5": "もーたー[TEXT]のPWMのでゅーてぃーひを[NUM](0~1023)にセット",
     "kanirobo2.command6": "らいとせんさー[TEXT]をしょきか",
     "kanirobo2.value0": "らいとせんさー[TEXT]のあたい",
     "kanirobo2.command7": "さーぼもーたー[TEXT]をしょきか",
@@ -174,5 +176,23 @@ export default {
     "sensor.scd30": 'SCD30 [TYPE]',
     //
     "tools.name": "デバッグ",
-    "tools.puts": "ひょうじ [TEXT]"
+    "tools.puts": "ひょうじ [TEXT]",
+    // RBoard2
+    "rboard.name": "RBoard",
+    "rboard.gpio_output_init": "GPIO しゅつりょく: [NUM1] をつかう",
+    "rboard.gpio_output": "GPIO しゅつりょく: [NUM1] のあたいを [VALUE] にする",
+    "rboard.gpio_input_init": "GPIO にゅうりょく: [NUM1] をつかう",
+    "rboard.gpio_input": "GPIO にゅうりょく: [NUM1] のあたい",
+    "rboard.pwm_init": "PWM: [NUM1] をつかう",
+    "rboard.pwm_duty": "PWM: [NUM1] のデューティーひを [VALUE] (0~1023)にする",
+    "rboard.pwm_frequency": "PWM: [NUM1] のしゅうはすうを [VALUE] にする",
+    "rboard.adc_init": "ADC: [NUM1] をつかう",
+    "rboard.adc_volt": "ADC: [VALUE] のあたい",
+    "rboard.i2c_init": "I2C をつかう",
+    "rboard.i2c_write": "I2C しゅつりょく: あどれす 0x[NUM1], こまんど 0x[NUM2], あたい 0x[NUM3]",
+    "rboard.i2c_read": "I2C にゅうりょく: あどれす 0x[NUM1], ばいとすう [NUM2], こまんど 0x[NUM3]",
+    "rboard.uart_init": "UART をつかう. つうしんそくど [NUM]",
+    "rboard.uart_write": "UART しゅつりょく: [TEXT2]",
+    "rboard.uart_read": "UART にゅうりょく",
+    "rboard.puts": "ひょうじ [TEXT]"
 };

src/locales/ja.js

@@ -45,6 +45,8 @@ export default {
     "gui.sensor.description": "センサー用ブロック．SCD30, etc.",
     "gui.menuBar.uploadToServer": "マイコンへ書き出し",
     "gui.menuBar.uploadToServerOld": "マイコンへ書き出し (旧版)",
+    "gui.rboard.name": "RBoard",
+    "gui.rboard.description": "RBoard (GPIO, PWM, ADC, ...)",    
     // MBoard共通
     "mboard.sound_C": "ド",
     "mboard.sound_D": "レ",
@@ -135,16 +137,16 @@ export default {
     "kanirobo1v2.command9": "サーボモーター[TEXT]を[NUM]度にする",
 //
     "kanirobo2.name": "蟹ロボ",
-    "kanirobo2.Menu1.forward": "前",
-    "kanirobo2.Menu1.backward": "後ろ",
+    "kanirobo2.Menu1.forward": "1",
+    "kanirobo2.Menu1.backward": "0",
     "kanirobo2.Menu3.enable": "有効",
     "kanirobo2.Menu3.disable": "無効",
     "kanirobo2.command0": "モーター有効化ピンを初期化",
     "kanirobo2.command1": "モーター有効化ピンを[TEXT]化",
-    "kanirobo2.command2": "モーター[TEXT]を初期化",
-    "kanirobo2.command3": "モーター[TEXT]の PWM を初期化",
-    "kanirobo2.command4": "モーター[TEXT1]を[TEXT2]方向にセット",
-    "kanirobo2.command5": "モーター[TEXT]のデューティー比を[NUM](0~1023)にする",
+    "kanirobo2.command2": "モーター[TEXT]のGPIOを初期化",
+    "kanirobo2.command3": "モーター[TEXT]のPWMを初期化",
+    "kanirobo2.command4": "モーター[TEXT1]のGPIOを[TEXT2](1:前,0:後)にセット",
+    "kanirobo2.command5": "モーター[TEXT]のPWMのデューティー比を[NUM](0~1023)にセット",
     "kanirobo2.command6": "ライトセンサー[TEXT]を初期化",
     "kanirobo2.value0": "ライトセンサー[TEXT]の値",
     "kanirobo2.command7": "サーボモーター[TEXT]を初期化",
@@ -174,5 +176,23 @@ export default {
     "sensor.scd30": 'SCD30 [TYPE]',
     //
     "tools.name": "デバッグ",
-    "tools.puts": "デバッグ出力 [TEXT]"
+    "tools.puts": "デバッグ出力 [TEXT]",
+    // RBoard
+    "rboard.name": "RBoard",
+    "rboard.gpio_output_init": "GPIO 出力: [NUM1] を使う",
+    "rboard.gpio_output": "GPIO 出力: [NUM1] の値を [VALUE] にする",
+    "rboard.gpio_input_init": "GPIO 入力: [NUM1] を使う",
+    "rboard.gpio_input": "GPIO 入力: [NUM1] の値",
+    "rboard.pwm_init": "PWM: [NUM1] を使う",
+    "rboard.pwm_duty": "PWM: [NUM1] のデューティー比を [VALUE] (0~1023)にする",
+    "rboard.pwm_frequency": "PWM: [NUM1] の周波数を [VALUE] にする",
+    "rboard.adc_init": "ADC: [NUM1] を使う",
+    "rboard.adc_volt": "ADC: [VALUE] の値",
+    "rboard.i2c_init": "I2C を使う",
+    "rboard.i2c_write": "I2C 出力: アドレス 0x[NUM1], コマンド 0x[NUM2], 値 [NUM3]",
+    "rboard.i2c_read":  "I2C 入力: アドレス 0x[NUM1], バイト数 [NUM2], コマンド 0x[NUM3]",
+    "rboard.uart_init": "UART を使う．通信速度 [NUM]",
+    "rboard.uart_write": "出力: UART 出力: [TEXT2]",
+    "rboard.uart_read": "入力: UART 入力",
+    "rboard.puts": "デバッグ出力: [TEXT]"
 };