update

src/renderer/cocoblockly-x/blockly/blocks/python/esp32.js

@@ -89,11 +89,14 @@ Blockly.Python['serial_comm_print'] = function (block) {
 
 Blockly.Blocks['serial_send_data_to_control_panel'] = {
     init: function () {
-        console.log(Blockly.Msg.serial_send_data_on_send_data_control_panel)
         this.appendDummyInput()
             .appendField(new Blockly.FieldImage("blockly/media/control.png", 90, 70, { alt: "*", flipRtl: "FALSE" }));
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.serialcomm_write_data_bps_title)
+            .appendField("9600")
+            .appendField(Blockly.Msg.serialcomm_write_data_bps_attrib);
         this.appendValueInput("NAME")
-                .appendField(Blockly.Msg.serial_send_data_on)
+                // .appendField(Blockly.Msg.serial_send_data_on)
                 .appendField(Blockly.Msg.serial_send_data_on_send_data_control_panel);
         this.setInputsInline(false);
         this.setColour("#22b845");
@@ -108,8 +111,8 @@ Blockly.Python['serial_send_data_to_control_panel'] = function (block) {
     var value_name = Blockly.Python.valueToCode(block, 'NAME', Blockly.Python.ORDER_ATOMIC) || "";
     // TODO: Assemble Python into code variable.
     Blockly.Python.definitions_["831_import_serial"] = `import serial
-SERIAL = serial.Serial("/dev/ttyS1",115200)`
-    var code = `uart_data = bytes(${value_name}+"|\\n","utf-8")
+SERIAL = serial.Serial("/dev/ttyS1",9600)`
+    var code = `uart_data = bytes(${value_name}+"\\n","utf-8")
 SERIAL.write(uart_data)
 `;
     

src/renderer/cocoblockly-x/blockly/blocks/python/extension_module.js

@@ -153,7 +153,7 @@ Blockly.Python['serial_write_data'] = function (block) {
 SERIAL = serial.Serial("/dev/ttyS1",${number_uart_bps})
     `
 
-    var code = `uart_data = bytes(${ai_uart_data_final.slice(0, -8)}+"|\\n","utf-8")
+    var code = `uart_data = bytes(${ai_uart_data_final.slice(0, -8)}+"\\n","utf-8")
 SERIAL.write(uart_data)
 `
     return code;
@@ -192,15 +192,15 @@ Blockly.Python['serial_read_data_setup'] = function (block) {
     Blockly.Python.definitions_['v831_import_serial'] = `import serial
 SERIAL = serial.Serial("/dev/ttyS1",${number_uart_bps})
 `;
-    Blockly.Python.definitions_['_read_serial_data']= `def _read_serial_data(read_data,split, index):
-    if read_data != None:
-        read_str = ""
-        try:
-            read_str = str(read_data.decode("utf-8")).split(split)[index]
-        except:
-            read_str = str(read_data).split(split)[index]
-        return read_str
-`
+//     Blockly.Python.definitions_['_read_serial_data']= `def _read_serial_data(read_data,split, index):
+//     if read_data != None:
+//         read_str = ""
+//         try:
+//             read_str = str(read_data.decode("utf-8")).split(split)[index]
+//         except:
+//             read_str = str(read_data).split(split)[index]
+//         return read_str
+// `
     var code = "";
     
     return code;
@@ -211,21 +211,20 @@ Blockly.Blocks['serial_read_data_all'] = {
     init: function () {
         this.appendDummyInput()
             .appendField(Blockly.Msg.Serial_Read_Data_all)
-            .appendField(new Blockly.FieldDropdown([
-                ["serial_data", "serial_data"]
-            ]), "TYPE");
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
+            // .appendField(new Blockly.FieldDropdown([
+            //     ["serial_data", "serial_data"]
+            // ]), "TYPE");
+        this.setOutput(true, null);
         this.setColour("#22b845");
-        this.setTooltip(Blockly.Msg.Serial_Read_Data_all_TOOLTIP);
+        this.setTooltip(Blockly.Msg.Serial_Read_Data_all);
         this.setHelpUrl("");
     }
 }
 
 Blockly.Python['serial_read_data_all'] = function (block) {
     var type = block.getFieldValue("TYPE")
-    var code = type + ' = SERIAL.readline()\n';
-    return code;
+    var code = `SERIAL.readline().decode('UTF-8','ignore')`;
+    return [code, Blockly.Python.ORDER_NONE];
 };
 
 Blockly.Blocks['serial_read_data'] = {
@@ -276,9 +275,12 @@ Blockly.Blocks['serial_send_data_to_microbit'] = {
     init: function () {
         this.appendDummyInput()
             .appendField(new Blockly.FieldImage("blockly/media/microbit_data_send_header.png", 90, 70, { alt: "*", flipRtl: "FALSE" }));
-        
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.serialcomm_write_data_bps_title)
+            .appendField("115200")
+            .appendField(Blockly.Msg.serialcomm_write_data_bps_attrib);
         this.appendValueInput("NAME")
-                .appendField(Blockly.Msg.serial_send_data_on)
+                // .appendField(Blockly.Msg.serial_send_data_on)
                 .appendField(Blockly.Msg.serial_send_data_on_send_data);
         this.setInputsInline(false);
         this.setColour("#22b845");
@@ -286,14 +288,7 @@ Blockly.Blocks['serial_send_data_to_microbit'] = {
         this.setNextStatement(true, null);
         this.setHelpUrl("");
         var thisBlock = this;
-        this.setTooltip(function () {
-            var mode = thisBlock.getFieldValue('module_type_microbit');
-            var TOOLTIPS = {
-                'iot': Blockly.Msg.Serial_Send_Data_To_Microbit_TOOLTIP.replace('%1', "IoT"),
-                'ai': Blockly.Msg.Serial_Send_Data_To_Microbit_TOOLTIP.replace('%1', "A.I.")
-            };
-            return TOOLTIPS[mode];
-        });
+        this.setTooltip(Blockly.Msg.serial_send_data_on_send_data);
     }
 };
 
@@ -303,7 +298,7 @@ Blockly.Python['serial_send_data_to_microbit'] = function (block) {
     
     Blockly.Python.definitions_["831_import_serial"] = `import serial
 SERIAL = serial.Serial("/dev/ttyS1",115200)`
-    var code = `uart_data = bytes("|"+${value_name}+"|\\n","utf-8")
+    var code = `uart_data = bytes(${value_name}+"\\n","utf-8")
 SERIAL.write(uart_data)
 `;
     return code

src/renderer/cocoblockly-x/blockly/msg/js/en.js

@@ -3606,7 +3606,7 @@ Blockly.Msg.serialcomm_write_title_text = "Send Data to other devices through th
 Blockly.Msg.serialcomm_read_setup_title_text = "Obtain data through the serial port";
 Blockly.Msg.serialcomm_read_setup_title_text_1 = " to initialize";
 Blockly.Msg.serial_read_data = "From ";
-Blockly.Msg.Serial_Read_Data_all = "Get the data of the serial port and save it to";
+Blockly.Msg.Serial_Read_Data_all = "Obtained serial port data";
 Blockly.Msg.ARD_SERIAL_RECEIVE_DATASET_GET_TEXT = "Get Serial (UART) Data at ";
 Blockly.Msg.ARD_SERIAL_RECEIVE_DATASET_TYPE_TEXT = "as";
 Blockly.Msg.ARD_SERIAL_RECEIVE_DATASET_TYPE_FLOAT = "Float";
@@ -3622,8 +3622,8 @@ Blockly.Msg.serialcomm_write_on = "On";
 Blockly.Msg.serialcomm_write_on_ai = "AI Module ";
 Blockly.Msg.serialcomm_write_on_iot = "IoT Module";
 Blockly.Msg.serial_send_data_on = "On";
-Blockly.Msg.serial_send_data_on_send_data = "Module Send Data to Microbit"
-Blockly.Msg.serial_send_data_on_send_data_control_panel = "Module Send Data to Control panel"
+Blockly.Msg.serial_send_data_on_send_data = "CocoPi Send Data to Micro:bit"
+Blockly.Msg.serial_send_data_on_send_data_control_panel = "CocoPi Send Data to Control panel"
 
 
 /*

src/renderer/cocoblockly-x/blockly/msg/js/zh-hans.js

@@ -3596,7 +3596,7 @@ Blockly.Msg.serialcomm_write_title_text = "通过串口发送数据至其他设
 Blockly.Msg.serialcomm_read_setup_title_text = "通过串口获取数据";
 Blockly.Msg.serialcomm_read_setup_title_text_1 = "初始化";
 Blockly.Msg.serial_read_data = "从";
-Blockly.Msg.Serial_Read_Data_all = "获取串口的数据,并将其存到";
+Blockly.Msg.Serial_Read_Data_all = "获取到的串口数据";
 Blockly.Msg.ARD_SERIAL_RECEIVE_DATASET_GET_TEXT = "获取接收到串口数据中第";
 Blockly.Msg.ARD_SERIAL_RECEIVE_DATASET_TYPE_TEXT = "位的数据";
 Blockly.Msg.ARD_SERIAL_RECEIVE_DATASET_TYPE_FLOAT = "浮点数";
@@ -3612,8 +3612,8 @@ Blockly.Msg.serialcomm_write_on = "使用";
 Blockly.Msg.serialcomm_write_on_ai = "AI 模块 ";
 Blockly.Msg.serialcomm_write_on_iot = "IoT 模块";
 Blockly.Msg.serial_send_data_on = "在";
-Blockly.Msg.serial_send_data_on_send_data = "模块上发送数据至 Microbit"
-Blockly.Msg.serial_send_data_on_send_data_control_panel = "模块上发送数据至掌控板"
+Blockly.Msg.serial_send_data_on_send_data = "CocoPi 发送数据至 Micro:bit"
+Blockly.Msg.serial_send_data_on_send_data_control_panel = "CocoPi 发送数据至掌控板"
 
 
 

src/renderer/cocoblockly-x/blockly/msg/js/zh-hant.js

@@ -4068,7 +4068,7 @@ Blockly.Msg.serialcomm_write_title_text = "透過序列埠傳送數據至其他
 Blockly.Msg.serialcomm_read_setup_title_text = "透過序列埠獲取數據";
 Blockly.Msg.serialcomm_read_setup_title_text_1 = "初始化";
 Blockly.Msg.serial_read_data = "從";
-Blockly.Msg.Serial_Read_Data_all = "獲取串口的數據,並將其存到";
+Blockly.Msg.Serial_Read_Data_all = "獲取到的串口數據";
 Blockly.Msg.ARD_SERIAL_RECEIVE_DATASET_GET_TEXT = "獲取接收到串列埠數據中第";
 Blockly.Msg.ARD_SERIAL_RECEIVE_DATASET_TYPE_TEXT = "位的數據";
 Blockly.Msg.ARD_SERIAL_RECEIVE_DATASET_TYPE_FLOAT = "浮點數";
@@ -4084,8 +4084,8 @@ Blockly.Msg.serialcomm_write_on = "使用";
 Blockly.Msg.serialcomm_write_on_ai = "AI 模組 ";
 Blockly.Msg.serialcomm_write_on_iot = "IoT 模組";
 Blockly.Msg.serial_send_data_on = "在";
-Blockly.Msg.serial_send_data_on_send_data = "模組上載送數據至 Microbit"
-Blockly.Msg.serial_send_data_on_send_data_control_panel = "模块上发送数据至掌控板"
+Blockly.Msg.serial_send_data_on_send_data = "CocoPi 上載數據至 Micro:bit"
+Blockly.Msg.serial_send_data_on_send_data_control_panel = "CocoPi 发送数据至掌控板"
 
 
 /*

src/renderer/cocoblockly-x/index.html

@@ -1298,13 +1298,14 @@
                         <i class="material-icons sketch_name_icon"
                             style="margin-left:5px;cursor: pointer;position: relative;top: 7px;">message</i>
                     </span>
-                    <!-- <span>
-                        <a id="help" target="_blank" href="//x-help.cocorobo.cn" style="position:relative">
-                            
+                    <span>
+                        <a id="help" target="_blank" href="./CocoPi.docx" style="position:relative"
+                            download="CocoPi 帮助文档">
+
                             <span class="translatable_help_board" style="color: #fff;">Help</span>
-                            <img class="left nav-icon" src="./icons/nav_help.png" style="height: 20px;margin-top: 3px;">
+                            <!-- <img class="left nav-icon" src="./icons/nav_help.png" style="height: 20px;margin-top: 3px;"> -->
                         </a>
-                    </span> -->
+                    </span>
                     <span class="vertical-separator" style="padding: 4px 6px 4px 6px;"></span>
                     <span>CocoBlockly Pi</span>
                 </div>

src/renderer/cocoblockly-x/src/editor.js

@@ -1575,7 +1575,7 @@ BlockPyEditor.CATEGORY_MAP = {
         '</block>' +
         '<block type="serial_read_data_setup"></block>' +
         '<block type="serial_read_data_all"></block>' +
-        '<block type="serial_read_data"></block>' +
+        // '<block type="serial_read_data"></block>' +
         '<block type="serial_send_data_to_microbit">' +
         '          <value name="NAME">' +
         '            <shadow type="text">' +