Merge branch 'master' into boards

This commit is contained in:
王立帮
2024-10-26 13:51:35 +08:00
10 changed files with 11810 additions and 9 deletions

View File

@@ -0,0 +1,204 @@
{
"name": "@mixly/arduino-avr",
"version": "1.6.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@mixly/arduino-avr",
"version": "1.6.0",
"license": "Apache 2.0",
"dependencies": {
"@codingame/monaco-vscode-cpp-default-extension": "^7.1.0"
}
},
"node_modules/@codingame/monaco-vscode-base-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-base-service-override/-/monaco-vscode-base-service-override-7.1.0.tgz",
"integrity": "sha512-WWSNhTU1dazIP/Up2Y9LoWoxcPe0c9oP/G2jpnHaYUXn8Il85nFSNAse5IVEri7HJaZakqlKYx3VnJXFo6dTSg==",
"dependencies": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"node_modules/@codingame/monaco-vscode-cpp-default-extension": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-cpp-default-extension/-/monaco-vscode-cpp-default-extension-7.1.0.tgz",
"integrity": "sha512-m23xIjwe5gYVgK/WAwxRmTXk0kHr9+aEU4cmdbSqF1cBozsUf59MIeDx8+DTP9fIxVMNiMV3dz506K8T4vZ00w==",
"dependencies": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"node_modules/@codingame/monaco-vscode-environment-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-environment-service-override/-/monaco-vscode-environment-service-override-7.1.0.tgz",
"integrity": "sha512-jOmWhBJx4cUetDQopLsTQvKvlqeMjrCw0Wjcql+/13zJ5zPDEfNZZ8p1kKVPaaxpsoO85L7RudygaszVBe/iEA==",
"dependencies": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"node_modules/@codingame/monaco-vscode-extensions-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-extensions-service-override/-/monaco-vscode-extensions-service-override-7.1.0.tgz",
"integrity": "sha512-k4CHFLW8GBPQ2uH/by7yo8eYh5j/MIL3E1HNt6CcQRu9BcWI5xgUmLeKD1aDnsv8mKZLZNXUdR7rLd6KmcISnA==",
"dependencies": {
"@codingame/monaco-vscode-files-service-override": "7.1.0",
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"node_modules/@codingame/monaco-vscode-files-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-7.1.0.tgz",
"integrity": "sha512-Kdc000uf0Su3osF4lIMG6WHIQNVflgdztqVXvyXjCKG4clbZYMyMrX8aWFiv16u8lYtxmhJ24TMKfUuYhY6nag==",
"dependencies": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"node_modules/@codingame/monaco-vscode-host-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-host-service-override/-/monaco-vscode-host-service-override-7.1.0.tgz",
"integrity": "sha512-oAtauvOZlWbF3+gW36v7Aq6BmYJSyEz62F+boKFCVn9Z5WZ2akAQ6Z/A0KTql6R/fV7MDXFuP5Txr2nr1TB/Jw==",
"dependencies": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"node_modules/@codingame/monaco-vscode-layout-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-layout-service-override/-/monaco-vscode-layout-service-override-7.1.0.tgz",
"integrity": "sha512-4TSeGY3Bk5Z5O+KAg47t7r6bypV4YWDbP9wzN5jh90Wfkobz8mPX7O/WCDgMrXV4DprpRsBaoHsPqIB7ibwJbw==",
"dependencies": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"node_modules/@codingame/monaco-vscode-quickaccess-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-quickaccess-service-override/-/monaco-vscode-quickaccess-service-override-7.1.0.tgz",
"integrity": "sha512-3UIwUzdIk62aAFOvwAZkaqRvWxSlhFeurRjquypk7BcUf9JnMDa5oYJnM256VHL9gJW7Enb//M0CE6d9FNP62A==",
"dependencies": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"node_modules/@vscode/iconv-lite-umd": {
"version": "0.7.0",
"resolved": "https://registry.npmmirror.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
"integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
},
"node_modules/jschardet": {
"version": "3.1.2",
"resolved": "https://registry.npmmirror.com/jschardet/-/jschardet-3.1.2.tgz",
"integrity": "sha512-mw3CBZGzW8nUBPYhFU2ztZ/kJ6NClQUQVpyzvFMfznZsoC///ZQ30J2RCUanNsr5yF22LqhgYr/lj807/ZleWA==",
"engines": {
"node": ">=0.1.90"
}
},
"node_modules/vscode": {
"name": "@codingame/monaco-vscode-api",
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-api/-/monaco-vscode-api-7.1.0.tgz",
"integrity": "sha512-DtxTLs4jRbJbI5KKkIMt+dY4L26YHnN2OFdCXLU/VHnwdTJKD++aJL1nsvUNbPoTteRnHh6StRIuKY9z61376Q==",
"dependencies": {
"@codingame/monaco-vscode-base-service-override": "7.1.0",
"@codingame/monaco-vscode-environment-service-override": "7.1.0",
"@codingame/monaco-vscode-extensions-service-override": "7.1.0",
"@codingame/monaco-vscode-files-service-override": "7.1.0",
"@codingame/monaco-vscode-host-service-override": "7.1.0",
"@codingame/monaco-vscode-layout-service-override": "7.1.0",
"@codingame/monaco-vscode-quickaccess-service-override": "7.1.0",
"@vscode/iconv-lite-umd": "0.7.0",
"jschardet": "3.1.2"
}
}
},
"dependencies": {
"@codingame/monaco-vscode-base-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-base-service-override/-/monaco-vscode-base-service-override-7.1.0.tgz",
"integrity": "sha512-WWSNhTU1dazIP/Up2Y9LoWoxcPe0c9oP/G2jpnHaYUXn8Il85nFSNAse5IVEri7HJaZakqlKYx3VnJXFo6dTSg==",
"requires": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"@codingame/monaco-vscode-cpp-default-extension": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-cpp-default-extension/-/monaco-vscode-cpp-default-extension-7.1.0.tgz",
"integrity": "sha512-m23xIjwe5gYVgK/WAwxRmTXk0kHr9+aEU4cmdbSqF1cBozsUf59MIeDx8+DTP9fIxVMNiMV3dz506K8T4vZ00w==",
"requires": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"@codingame/monaco-vscode-environment-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-environment-service-override/-/monaco-vscode-environment-service-override-7.1.0.tgz",
"integrity": "sha512-jOmWhBJx4cUetDQopLsTQvKvlqeMjrCw0Wjcql+/13zJ5zPDEfNZZ8p1kKVPaaxpsoO85L7RudygaszVBe/iEA==",
"requires": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"@codingame/monaco-vscode-extensions-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-extensions-service-override/-/monaco-vscode-extensions-service-override-7.1.0.tgz",
"integrity": "sha512-k4CHFLW8GBPQ2uH/by7yo8eYh5j/MIL3E1HNt6CcQRu9BcWI5xgUmLeKD1aDnsv8mKZLZNXUdR7rLd6KmcISnA==",
"requires": {
"@codingame/monaco-vscode-files-service-override": "7.1.0",
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"@codingame/monaco-vscode-files-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-7.1.0.tgz",
"integrity": "sha512-Kdc000uf0Su3osF4lIMG6WHIQNVflgdztqVXvyXjCKG4clbZYMyMrX8aWFiv16u8lYtxmhJ24TMKfUuYhY6nag==",
"requires": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"@codingame/monaco-vscode-host-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-host-service-override/-/monaco-vscode-host-service-override-7.1.0.tgz",
"integrity": "sha512-oAtauvOZlWbF3+gW36v7Aq6BmYJSyEz62F+boKFCVn9Z5WZ2akAQ6Z/A0KTql6R/fV7MDXFuP5Txr2nr1TB/Jw==",
"requires": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"@codingame/monaco-vscode-layout-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-layout-service-override/-/monaco-vscode-layout-service-override-7.1.0.tgz",
"integrity": "sha512-4TSeGY3Bk5Z5O+KAg47t7r6bypV4YWDbP9wzN5jh90Wfkobz8mPX7O/WCDgMrXV4DprpRsBaoHsPqIB7ibwJbw==",
"requires": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"@codingame/monaco-vscode-quickaccess-service-override": {
"version": "7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-quickaccess-service-override/-/monaco-vscode-quickaccess-service-override-7.1.0.tgz",
"integrity": "sha512-3UIwUzdIk62aAFOvwAZkaqRvWxSlhFeurRjquypk7BcUf9JnMDa5oYJnM256VHL9gJW7Enb//M0CE6d9FNP62A==",
"requires": {
"vscode": "npm:@codingame/monaco-vscode-api@7.1.0"
}
},
"@vscode/iconv-lite-umd": {
"version": "0.7.0",
"resolved": "https://registry.npmmirror.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
"integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
},
"jschardet": {
"version": "3.1.2",
"resolved": "https://registry.npmmirror.com/jschardet/-/jschardet-3.1.2.tgz",
"integrity": "sha512-mw3CBZGzW8nUBPYhFU2ztZ/kJ6NClQUQVpyzvFMfznZsoC///ZQ30J2RCUanNsr5yF22LqhgYr/lj807/ZleWA=="
},
"vscode": {
"version": "npm:@codingame/monaco-vscode-api@7.1.0",
"resolved": "https://registry.npmmirror.com/@codingame/monaco-vscode-api/-/monaco-vscode-api-7.1.0.tgz",
"integrity": "sha512-DtxTLs4jRbJbI5KKkIMt+dY4L26YHnN2OFdCXLU/VHnwdTJKD++aJL1nsvUNbPoTteRnHh6StRIuKY9z61376Q==",
"requires": {
"@codingame/monaco-vscode-base-service-override": "7.1.0",
"@codingame/monaco-vscode-environment-service-override": "7.1.0",
"@codingame/monaco-vscode-extensions-service-override": "7.1.0",
"@codingame/monaco-vscode-files-service-override": "7.1.0",
"@codingame/monaco-vscode-host-service-override": "7.1.0",
"@codingame/monaco-vscode-layout-service-override": "7.1.0",
"@codingame/monaco-vscode-quickaccess-service-override": "7.1.0",
"@vscode/iconv-lite-umd": "0.7.0",
"jschardet": "3.1.2"
}
}
}
}

View File

@@ -748,13 +748,13 @@ export const dicts_to_to ={
this.appendValueInput('DICT')
.setCheck('Dict');
this.appendValueInput('VAR1')
.appendField('r');
.appendField('key1');
this.appendValueInput('VAR2')
.appendField('index');
this.appendValueInput('VAR3')
.appendField('l');
.appendField('key2');
this.appendValueInput('VAR4')
.appendField('n');
.appendField('key3');
this.setInputsInline(true)
this.setTooltip(Blockly.Msg.MIXLY_CONVERT_TO_JSON_TOOLTIP);
this.setOutput(true);

File diff suppressed because it is too large Load Diff