初步增加educore

boards/default_src/python/blocks/control.js

@@ -1044,4 +1044,14 @@ export const datetime_fromtimestamp = {
         this.setInputsInline(true);
         this.setOutput(true, Number);
     }
+};
+
+
+export const gene_unique_identifier = {
+    init: function () {
+        this.setColour(LOOPS_HUE);
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.MIXLY_GET_UNIQUE_IDEN);
+        this.setOutput(true)
+    }
 };

boards/default_src/python/blocks/dicts.js

@@ -759,4 +759,15 @@ export const dicts_to_to ={
         this.setTooltip(Blockly.Msg.MIXLY_CONVERT_TO_JSON_TOOLTIP);
         this.setOutput(true);
     }
-}
+}
+
+export const dicts_to_json2 = {
+    init: function () {
+        this.setColour(DICTS_HUE);
+        this.appendValueInput('DICT');
+        this.appendDummyInput("")
+            .appendField(Blockly.Msg.MIXLY_TO_JSON);
+        this.setTooltip(Blockly.Msg.MIXLY_TO_JSON_TOOLTIP);
+        this.setOutput(true);
+    }
+};

boards/default_src/python/blocks/lists.js

@@ -823,4 +823,18 @@ export const enumerate = {
         this.setOutput(true);
         this.setTooltip(Blockly.Msg.MIXLY_TOTO_INDEX_SEQUENC_TOOLTIP);
     }
-};
+};
+
+export const content_in_lists = {
+    init: function () {
+        this.setColour(LISTS_HUE);
+        this.appendValueInput("CON")
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.MIXLY_ESP32_MIXGO_MUSIC_SHOW_IN);
+        this.appendValueInput("LIST")
+        this.appendDummyInput()
+            .appendField(Blockly.Msg.MIXLY_MID);
+        this.setInputsInline(true);
+        this.setOutput(true);
+    }
+}

boards/default_src/python/generators/control.js

@@ -1,4 +1,5 @@
 import * as Blockly from 'blockly/core';
+import { Boards } from 'mixly';
 
 export const controls_main = function (a, generator) {
     var d = generator.statementToCode(a, "DO"),
@@ -285,4 +286,11 @@ export const datetime_fromtimestamp = function(_,generator){
     var ts = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
     var code = 'datatime.datatime.fromtimestamp(' + ts + ')';
     return [code, generator.ORDER_ATOMIC];
+}
+
+export const gene_unique_identifier = function (_, generator) {
+    var version = Boards.getSelectedBoardKey().split(':')[2]
+    generator.definitions_['import_' + version + 'uuid'] = 'from ' + version + ' import uuid';
+    var code = 'uuid()';
+    return [code, generator.ORDER_ATOMIC]
 }

boards/default_src/python/generators/dicts.js

@@ -23,6 +23,7 @@
  * @author acbart@vt.edu (Austin Cory Bart)
  */
 import * as Blockly from 'blockly/core';
+import { Boards } from 'mixly';
 
 export const dicts_create_with = function (_, generator) {
     // Create a list with any number of elements of any type.
@@ -49,11 +50,16 @@ export const dicts_keys = function (_, generator) {
 }
 
 export const dicts_get = function (_, generator) {
+    var version = Boards.getSelectedBoardKey().split(':')[2]
     var varName = generator.valueToCode(this, 'DICT', generator.ORDER_ASSIGNMENT) || '0';
     //var size=window.parseFloat(this.getFieldValue('SIZE'));
     var text = generator.valueToCode(this, 'KEY', generator.ORDER_ASSIGNMENT);
     // var text=this.getFieldValue('KEY');
-    var code = varName + "[" + text + "]";
+    if (version=='educore'){
+        var code = varName+'.get('+text+')';
+    }else{
+        var code = varName + "[" + text + "]";
+    }
     return [code, generator.ORDER_ATOMIC];
 }
 
@@ -213,4 +219,12 @@ export const dicts_to_to = function (_, generator) {
     var N = generator.valueToCode(this, 'VAR4', generator.ORDER_ASSIGNMENT) || 'null';
     var code = varName + '['+R+']'+'['+I+']'+'['+L+']'+'['+N+']';
     return [code, generator.ORDER_ATOMIC];
+}
+
+export const dicts_to_json2 = function (_, generator) {
+    generator.definitions_['import_json'] = 'import json';
+    generator.definitions_['import_ujson'] = 'import ujson';
+    var varName = generator.valueToCode(this, 'DICT', generator.ORDER_ASSIGNMENT) || '0';
+    var code = 'ujson.loads(' + varName + ')';
+    return [code, generator.ORDER_ATOMIC];
 }

boards/default_src/python/generators/lists.js

@@ -260,4 +260,11 @@ export const enumerate = function (_, generator) {
     var argument = generator.valueToCode(this, 'VALUE', generator.ORDER_ASSIGNMENT) || '0';
     var code = 'enumerate(' +varName+',start='+ argument + ')';
     return [code, generator.ORDER_ATOMIC];
+}
+
+export const content_in_lists = function (_, generator) {
+    var varName = generator.valueToCode(this, 'LIST', generator.ORDER_ADDITIVE) || 'mylist';
+    var con = generator.valueToCode(this, 'CON', generator.ORDER_ASSIGNMENT) || '0';
+    var code = con +' in '+varName;
+    return [code, generator.ORDER_ATOMIC];
 }