add rtc blocks
This commit is contained in:
parent
bc5cbb6b33
commit
b6c90772ed
150
package-lock.json
generated
150
package-lock.json
generated
@ -26,11 +26,12 @@
|
||||
"mnemonic-id": "^3.2.7",
|
||||
"moment": "^2.28.0",
|
||||
"prismjs": "^1.23.0",
|
||||
"react": "^16.13.1",
|
||||
"react": "^17.0.2",
|
||||
"react-cookie-consent": "^5.2.0",
|
||||
"react-dom": "^16.13.1",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-markdown": "^5.0.2",
|
||||
"react-redux": "^7.2.0",
|
||||
"react-mde": "^11.5.0",
|
||||
"react-redux": "^7.2.4",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "^4.0.3",
|
||||
"reactour": "^1.18.0",
|
||||
@ -3951,6 +3952,15 @@
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/hoist-non-react-statics": {
|
||||
"version": "3.3.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
|
||||
"integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
|
||||
"dependencies": {
|
||||
"@types/react": "*",
|
||||
"hoist-non-react-statics": "^3.3.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/html-minifier-terser": {
|
||||
"version": "5.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
|
||||
@ -4048,6 +4058,17 @@
|
||||
"@types/react": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/react-redux": {
|
||||
"version": "7.1.16",
|
||||
"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.16.tgz",
|
||||
"integrity": "sha512-f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw==",
|
||||
"dependencies": {
|
||||
"@types/hoist-non-react-statics": "^3.3.0",
|
||||
"@types/react": "*",
|
||||
"hoist-non-react-statics": "^3.3.0",
|
||||
"redux": "^4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/react-transition-group": {
|
||||
"version": "4.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz",
|
||||
@ -19140,13 +19161,12 @@
|
||||
}
|
||||
},
|
||||
"node_modules/react": {
|
||||
"version": "16.13.1",
|
||||
"resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
|
||||
"integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
|
||||
"version": "17.0.2",
|
||||
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
|
||||
"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
|
||||
"dependencies": {
|
||||
"loose-envify": "^1.1.0",
|
||||
"object-assign": "^4.1.1",
|
||||
"prop-types": "^15.6.2"
|
||||
"object-assign": "^4.1.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
@ -19309,14 +19329,16 @@
|
||||
}
|
||||
},
|
||||
"node_modules/react-dom": {
|
||||
"version": "16.13.1",
|
||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
|
||||
"integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==",
|
||||
"version": "17.0.2",
|
||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
|
||||
"integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
|
||||
"dependencies": {
|
||||
"loose-envify": "^1.1.0",
|
||||
"object-assign": "^4.1.1",
|
||||
"prop-types": "^15.6.2",
|
||||
"scheduler": "^0.19.1"
|
||||
"scheduler": "^0.20.2"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "17.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/react-error-overlay": {
|
||||
@ -19359,16 +19381,37 @@
|
||||
"xtend": "^4.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/react-mde": {
|
||||
"version": "11.5.0",
|
||||
"resolved": "https://registry.npmjs.org/react-mde/-/react-mde-11.5.0.tgz",
|
||||
"integrity": "sha512-CH/VK6d+tpVjJ8rTXfh1dDt6GWedTgCU0668p8toqhAc3vy0Lu872O2RKYDSpkUrlbHI08fjUPTl++nExp6gag==",
|
||||
"peerDependencies": {
|
||||
"react": "^17.0.0",
|
||||
"react-dom": "^17.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/react-redux": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.0.tgz",
|
||||
"integrity": "sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==",
|
||||
"version": "7.2.4",
|
||||
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.4.tgz",
|
||||
"integrity": "sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA==",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.5.5",
|
||||
"hoist-non-react-statics": "^3.3.0",
|
||||
"@babel/runtime": "^7.12.1",
|
||||
"@types/react-redux": "^7.1.16",
|
||||
"hoist-non-react-statics": "^3.3.2",
|
||||
"loose-envify": "^1.4.0",
|
||||
"prop-types": "^15.7.2",
|
||||
"react-is": "^16.9.0"
|
||||
"react-is": "^16.13.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "^16.8.3 || ^17"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"react-dom": {
|
||||
"optional": true
|
||||
},
|
||||
"react-native": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/react-refresh": {
|
||||
@ -20694,9 +20737,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/scheduler": {
|
||||
"version": "0.19.1",
|
||||
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
|
||||
"integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
|
||||
"version": "0.20.2",
|
||||
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
|
||||
"integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
|
||||
"dependencies": {
|
||||
"loose-envify": "^1.1.0",
|
||||
"object-assign": "^4.1.1"
|
||||
@ -28075,6 +28118,15 @@
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"@types/hoist-non-react-statics": {
|
||||
"version": "3.3.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
|
||||
"integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
|
||||
"requires": {
|
||||
"@types/react": "*",
|
||||
"hoist-non-react-statics": "^3.3.0"
|
||||
}
|
||||
},
|
||||
"@types/html-minifier-terser": {
|
||||
"version": "5.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
|
||||
@ -28172,6 +28224,17 @@
|
||||
"@types/react": "*"
|
||||
}
|
||||
},
|
||||
"@types/react-redux": {
|
||||
"version": "7.1.16",
|
||||
"resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.16.tgz",
|
||||
"integrity": "sha512-f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw==",
|
||||
"requires": {
|
||||
"@types/hoist-non-react-statics": "^3.3.0",
|
||||
"@types/react": "*",
|
||||
"hoist-non-react-statics": "^3.3.0",
|
||||
"redux": "^4.0.0"
|
||||
}
|
||||
},
|
||||
"@types/react-transition-group": {
|
||||
"version": "4.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz",
|
||||
@ -40150,13 +40213,12 @@
|
||||
}
|
||||
},
|
||||
"react": {
|
||||
"version": "16.13.1",
|
||||
"resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
|
||||
"integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
|
||||
"version": "17.0.2",
|
||||
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
|
||||
"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
|
||||
"requires": {
|
||||
"loose-envify": "^1.1.0",
|
||||
"object-assign": "^4.1.1",
|
||||
"prop-types": "^15.6.2"
|
||||
"object-assign": "^4.1.1"
|
||||
}
|
||||
},
|
||||
"react-app-polyfill": {
|
||||
@ -40285,14 +40347,13 @@
|
||||
}
|
||||
},
|
||||
"react-dom": {
|
||||
"version": "16.13.1",
|
||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
|
||||
"integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==",
|
||||
"version": "17.0.2",
|
||||
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
|
||||
"integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
|
||||
"requires": {
|
||||
"loose-envify": "^1.1.0",
|
||||
"object-assign": "^4.1.1",
|
||||
"prop-types": "^15.6.2",
|
||||
"scheduler": "^0.19.1"
|
||||
"scheduler": "^0.20.2"
|
||||
}
|
||||
},
|
||||
"react-error-overlay": {
|
||||
@ -40335,16 +40396,23 @@
|
||||
"xtend": "^4.0.1"
|
||||
}
|
||||
},
|
||||
"react-mde": {
|
||||
"version": "11.5.0",
|
||||
"resolved": "https://registry.npmjs.org/react-mde/-/react-mde-11.5.0.tgz",
|
||||
"integrity": "sha512-CH/VK6d+tpVjJ8rTXfh1dDt6GWedTgCU0668p8toqhAc3vy0Lu872O2RKYDSpkUrlbHI08fjUPTl++nExp6gag==",
|
||||
"requires": {}
|
||||
},
|
||||
"react-redux": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.0.tgz",
|
||||
"integrity": "sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==",
|
||||
"version": "7.2.4",
|
||||
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.4.tgz",
|
||||
"integrity": "sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA==",
|
||||
"requires": {
|
||||
"@babel/runtime": "^7.5.5",
|
||||
"hoist-non-react-statics": "^3.3.0",
|
||||
"@babel/runtime": "^7.12.1",
|
||||
"@types/react-redux": "^7.1.16",
|
||||
"hoist-non-react-statics": "^3.3.2",
|
||||
"loose-envify": "^1.4.0",
|
||||
"prop-types": "^15.7.2",
|
||||
"react-is": "^16.9.0"
|
||||
"react-is": "^16.13.1"
|
||||
}
|
||||
},
|
||||
"react-refresh": {
|
||||
@ -41384,9 +41452,9 @@
|
||||
}
|
||||
},
|
||||
"scheduler": {
|
||||
"version": "0.19.1",
|
||||
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
|
||||
"integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
|
||||
"version": "0.20.2",
|
||||
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
|
||||
"integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
|
||||
"requires": {
|
||||
"loose-envify": "^1.1.0",
|
||||
"object-assign": "^4.1.1"
|
||||
|
@ -21,11 +21,12 @@
|
||||
"mnemonic-id": "^3.2.7",
|
||||
"moment": "^2.28.0",
|
||||
"prismjs": "^1.23.0",
|
||||
"react": "^16.13.1",
|
||||
"react": "^17.0.2",
|
||||
"react-cookie-consent": "^5.2.0",
|
||||
"react-dom": "^16.13.1",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-markdown": "^5.0.2",
|
||||
"react-redux": "^7.2.0",
|
||||
"react-mde": "^11.5.0",
|
||||
"react-redux": "^7.2.4",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "^4.0.3",
|
||||
"reactour": "^1.18.0",
|
||||
|
@ -1,24 +1,25 @@
|
||||
import './loops';
|
||||
import './sensebox';
|
||||
import './logic';
|
||||
import './sensebox-sensors';
|
||||
import './sensebox-telegram';
|
||||
import './sensebox-osem';
|
||||
import './sensebox-web';
|
||||
import './sensebox-display';
|
||||
import './sensebox-lora';
|
||||
import './sensebox-led';
|
||||
import './sensebox-sd';
|
||||
import './mqtt';
|
||||
import './text';
|
||||
import './io';
|
||||
import './audio';
|
||||
import './math';
|
||||
import './map';
|
||||
import './procedures';
|
||||
import './time';
|
||||
import './variables';
|
||||
import './lists';
|
||||
import './webserver';
|
||||
import "./loops";
|
||||
import "./sensebox";
|
||||
import "./logic";
|
||||
import "./sensebox-sensors";
|
||||
import "./sensebox-telegram";
|
||||
import "./sensebox-osem";
|
||||
import "./sensebox-web";
|
||||
import "./sensebox-display";
|
||||
import "./sensebox-lora";
|
||||
import "./sensebox-led";
|
||||
import "./sensebox-rtc";
|
||||
import "./sensebox-sd";
|
||||
import "./mqtt";
|
||||
import "./text";
|
||||
import "./io";
|
||||
import "./audio";
|
||||
import "./math";
|
||||
import "./map";
|
||||
import "./procedures";
|
||||
import "./time";
|
||||
import "./variables";
|
||||
import "./lists";
|
||||
import "./webserver";
|
||||
|
||||
import '../helpers/types'
|
||||
import "../helpers/types";
|
||||
|
79
src/components/Blockly/blocks/sensebox-rtc.js
Normal file
79
src/components/Blockly/blocks/sensebox-rtc.js
Normal file
@ -0,0 +1,79 @@
|
||||
import * as Blockly from "blockly";
|
||||
import { getColour } from "../helpers/colour";
|
||||
import { selectedBoard } from "../helpers/board";
|
||||
import * as Types from "../helpers/types";
|
||||
|
||||
Blockly.Blocks["sensebox_rtc_init"] = {
|
||||
init: function () {
|
||||
this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
|
||||
this.setColour(getColour().time);
|
||||
this.appendDummyInput().appendField(Blockly.Msg.sensebox_rtc_init);
|
||||
this.setPreviousStatement(true);
|
||||
this.setNextStatement(true);
|
||||
this.setTooltip(Blockly.Msg.sensebox_rtc_init_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_rtc_set"] = {
|
||||
init: function () {
|
||||
this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
|
||||
this.setColour(getColour().time);
|
||||
this.appendDummyInput().appendField(Blockly.Msg.sensebox_rtc_set);
|
||||
this.appendValueInput("second").appendField(
|
||||
Blockly.Msg.sensebox_rtc_second
|
||||
);
|
||||
this.appendValueInput("minutes").appendField(
|
||||
Blockly.Msg.sensebox_rtc_minutes
|
||||
);
|
||||
this.appendValueInput("hour").appendField(Blockly.Msg.sensebox_rtc_hour);
|
||||
this.appendValueInput("day").appendField(Blockly.Msg.sensebox_rtc_day);
|
||||
this.appendValueInput("month").appendField(Blockly.Msg.sensebox_rtc_month);
|
||||
this.appendValueInput("year").appendField(Blockly.Msg.sensebox_rtc_year);
|
||||
this.setPreviousStatement(true);
|
||||
this.setNextStatement(true);
|
||||
this.setTooltip(Blockly.Msg.sensebox_rtc_set_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_rtc_set_ntp"] = {
|
||||
init: function () {
|
||||
this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
|
||||
this.setColour(getColour().time);
|
||||
this.appendValueInput("time").appendField(Blockly.Msg.sensebox_rtc_set_ntp);
|
||||
this.setPreviousStatement(true);
|
||||
this.setNextStatement(true);
|
||||
this.setTooltip(Blockly.Msg.sensebox_rtc_set_ntp_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_rtc_get"] = {
|
||||
init: function () {
|
||||
this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
|
||||
this.setColour(getColour().time);
|
||||
this.appendDummyInput()
|
||||
.appendField(Blockly.Msg.sensebox_rtc_get)
|
||||
.appendField(
|
||||
new Blockly.FieldDropdown([
|
||||
["hour", "hour"],
|
||||
["min", "minutes"],
|
||||
["sec", "seconds"],
|
||||
["day", "day"],
|
||||
["month", "month"],
|
||||
["year", "year"],
|
||||
]),
|
||||
"dropdown"
|
||||
);
|
||||
this.setOutput(true, Types.LARGE_NUMBER.typeId);
|
||||
this.setTooltip(Blockly.Msg.sensebox_rtc_get_tooltip);
|
||||
},
|
||||
};
|
||||
|
||||
Blockly.Blocks["sensebox_rtc_get_timestamp"] = {
|
||||
init: function () {
|
||||
this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
|
||||
this.setColour(getColour().time);
|
||||
this.appendDummyInput().appendField(Blockly.Msg.sensebox_rtc_get_timestamp);
|
||||
this.setOutput(true);
|
||||
this.setTooltip(Blockly.Msg.sensebox_rtc_get_timestamp_tooltip);
|
||||
},
|
||||
};
|
@ -1,6 +1,6 @@
|
||||
/**
|
||||
* @license
|
||||
*
|
||||
*
|
||||
* Copyright 2019 Google LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@ -24,13 +24,13 @@
|
||||
// More on generating code:
|
||||
// https://developers.google.com/blockly/guides/create-custom-blocks/generating-code
|
||||
|
||||
import * as Blockly from 'blockly/core';
|
||||
import * as Blockly from "blockly/core";
|
||||
|
||||
/**
|
||||
* Arduino code generator.
|
||||
* @type !Blockly.Generator
|
||||
*/
|
||||
Blockly['Arduino'] = new Blockly.Generator('Arduino');
|
||||
Blockly["Arduino"] = new Blockly.Generator("Arduino");
|
||||
|
||||
/**
|
||||
* List of illegal variable names.
|
||||
@ -39,156 +39,150 @@ Blockly['Arduino'] = new Blockly.Generator('Arduino');
|
||||
* accidentally clobbering a built-in object or function.
|
||||
* @private
|
||||
*/
|
||||
Blockly['Arduino'].addReservedWords(
|
||||
// http://arduino.cc/en/Reference/HomePage
|
||||
'setup,loop,if,else,for,switch,case,while,' +
|
||||
'do,break,continue,return,goto,define,include,' +
|
||||
'HIGH,LOW,INPUT,OUTPUT,INPUT_PULLUP,true,false,' +
|
||||
'interger, constants,floating,point,void,boolean,char,' +
|
||||
'unsigned,byte,int,word,long,float,double,string,String,array,' +
|
||||
'static, volatile,const,sizeof,pinMode,digitalWrite,digitalRead,' +
|
||||
'analogReference,analogRead,analogWrite,tone,noTone,shiftOut,shitIn,' +
|
||||
'pulseIn,millis,micros,delay,delayMicroseconds,min,max,abs,constrain,' +
|
||||
'map,pow,sqrt,sin,cos,tan,randomSeed,random,lowByte,highByte,bitRead,' +
|
||||
'bitWrite,bitSet,bitClear,ultraSonicDistance,parseDouble,setNeoPixelColor,' +
|
||||
'bit,attachInterrupt,detachInterrupt,interrupts,noInterrupts',
|
||||
'short',
|
||||
'isBtnPressed'
|
||||
Blockly["Arduino"].addReservedWords(
|
||||
// http://arduino.cc/en/Reference/HomePage
|
||||
"setup,loop,if,else,for,switch,case,while," +
|
||||
"do,break,continue,return,goto,define,include," +
|
||||
"HIGH,LOW,INPUT,OUTPUT,INPUT_PULLUP,true,false," +
|
||||
"interger, constants,floating,point,void,boolean,char," +
|
||||
"unsigned,byte,int,word,long,float,double,string,String,array," +
|
||||
"static, volatile,const,sizeof,pinMode,digitalWrite,digitalRead," +
|
||||
"analogReference,analogRead,analogWrite,tone,noTone,shiftOut,shitIn," +
|
||||
"pulseIn,millis,micros,delay,delayMicroseconds,min,max,abs,constrain," +
|
||||
"map,pow,sqrt,sin,cos,tan,randomSeed,random,lowByte,highByte,bitRead," +
|
||||
"bitWrite,bitSet,bitClear,ultraSonicDistance,parseDouble,setNeoPixelColor," +
|
||||
"bit,attachInterrupt,detachInterrupt,interrupts,noInterrupts",
|
||||
"short",
|
||||
"isBtnPressed"
|
||||
);
|
||||
|
||||
/**
|
||||
* Order of operation ENUMs.
|
||||
*
|
||||
*/
|
||||
Blockly['Arduino'].ORDER_ATOMIC = 0; // 0 "" ...
|
||||
Blockly['Arduino'].ORDER_UNARY_POSTFIX = 1; // expr++ expr-- () [] .
|
||||
Blockly['Arduino'].ORDER_UNARY_PREFIX = 2; // -expr !expr ~expr ++expr --expr
|
||||
Blockly['Arduino'].ORDER_MULTIPLICATIVE = 3; // * / % ~/
|
||||
Blockly['Arduino'].ORDER_ADDITIVE = 4; // + -
|
||||
Blockly['Arduino'].ORDER_LOGICAL_NOT = 4.4; // !
|
||||
Blockly['Arduino'].ORDER_SHIFT = 5; // << >>
|
||||
Blockly['Arduino'].ORDER_MODULUS = 5.3; // %
|
||||
Blockly['Arduino'].ORDER_RELATIONAL = 6; // is is! >= > <= <
|
||||
Blockly['Arduino'].ORDER_EQUALITY = 7; // === !== === !==
|
||||
Blockly['Arduino'].ORDER_BITWISE_AND = 8; // &
|
||||
Blockly['Arduino'].ORDER_BITWISE_XOR = 9; // ^
|
||||
Blockly['Arduino'].ORDER_BITWISE_OR = 10; // |
|
||||
Blockly['Arduino'].ORDER_LOGICAL_AND = 11; // &&
|
||||
Blockly['Arduino'].ORDER_LOGICAL_OR = 12; // ||
|
||||
Blockly['Arduino'].ORDER_CONDITIONAL = 13; // expr ? expr : expr
|
||||
Blockly['Arduino'].ORDER_ASSIGNMENT = 14; // = *= /= ~/= %= += -= <<= >>= &= ^= |=
|
||||
Blockly['Arduino'].ORDER_COMMA = 18; // ,
|
||||
Blockly['Arduino'].ORDER_NONE = 99; // (...)
|
||||
|
||||
|
||||
|
||||
Blockly["Arduino"].ORDER_ATOMIC = 0; // 0 "" ...
|
||||
Blockly["Arduino"].ORDER_UNARY_POSTFIX = 1; // expr++ expr-- () [] .
|
||||
Blockly["Arduino"].ORDER_UNARY_PREFIX = 2; // -expr !expr ~expr ++expr --expr
|
||||
Blockly["Arduino"].ORDER_MULTIPLICATIVE = 3; // * / % ~/
|
||||
Blockly["Arduino"].ORDER_ADDITIVE = 4; // + -
|
||||
Blockly["Arduino"].ORDER_LOGICAL_NOT = 4.4; // !
|
||||
Blockly["Arduino"].ORDER_SHIFT = 5; // << >>
|
||||
Blockly["Arduino"].ORDER_MODULUS = 5.3; // %
|
||||
Blockly["Arduino"].ORDER_RELATIONAL = 6; // is is! >= > <= <
|
||||
Blockly["Arduino"].ORDER_EQUALITY = 7; // === !== === !==
|
||||
Blockly["Arduino"].ORDER_BITWISE_AND = 8; // &
|
||||
Blockly["Arduino"].ORDER_BITWISE_XOR = 9; // ^
|
||||
Blockly["Arduino"].ORDER_BITWISE_OR = 10; // |
|
||||
Blockly["Arduino"].ORDER_LOGICAL_AND = 11; // &&
|
||||
Blockly["Arduino"].ORDER_LOGICAL_OR = 12; // ||
|
||||
Blockly["Arduino"].ORDER_CONDITIONAL = 13; // expr ? expr : expr
|
||||
Blockly["Arduino"].ORDER_ASSIGNMENT = 14; // = *= /= ~/= %= += -= <<= >>= &= ^= |=
|
||||
Blockly["Arduino"].ORDER_COMMA = 18; // ,
|
||||
Blockly["Arduino"].ORDER_NONE = 99; // (...)
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {} workspace
|
||||
*
|
||||
*
|
||||
* @param {} workspace
|
||||
*
|
||||
* Blockly Types
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Initialise the database of variable names.
|
||||
* @param {!Blockly.Workspace} workspace Workspace to generate code from.
|
||||
*/
|
||||
Blockly['Arduino'].init = function (workspace) {
|
||||
// Create a dictionary of definitions to be printed before the code.
|
||||
Blockly['Arduino'].libraries_ = Object.create(null);
|
||||
Blockly["Arduino"].init = function (workspace) {
|
||||
// Create a dictionary of definitions to be printed before the code.
|
||||
Blockly["Arduino"].libraries_ = Object.create(null);
|
||||
|
||||
Blockly['Arduino'].definitions_ = Object.create(null);
|
||||
Blockly["Arduino"].definitions_ = Object.create(null);
|
||||
|
||||
// creates a list of code to be setup before the setup block
|
||||
Blockly['Arduino'].setupCode_ = Object.create(null);
|
||||
// creates a list of code to be setup before the setup block
|
||||
Blockly["Arduino"].setupCode_ = Object.create(null);
|
||||
|
||||
// creates a list of code to be setup before the setup block
|
||||
Blockly['Arduino'].loraSetupCode_ = Object.create(null);
|
||||
// creates a list of code to be setup before the setup block
|
||||
Blockly["Arduino"].loraSetupCode_ = Object.create(null);
|
||||
|
||||
// creates a list of code for the loop to be runned once
|
||||
Blockly['Arduino'].loopCodeOnce_ = Object.create(null)
|
||||
// creates a list of code for the loop to be runned once
|
||||
Blockly["Arduino"].loopCodeOnce_ = Object.create(null);
|
||||
|
||||
// creates a list of code for the loop to be runned once
|
||||
Blockly['Arduino'].codeFunctions_ = Object.create(null)
|
||||
// creates a list of code for the loop to be runned once
|
||||
Blockly["Arduino"].codeFunctions_ = Object.create(null);
|
||||
|
||||
// creates a list of code variables
|
||||
Blockly['Arduino'].variables_ = Object.create(null)
|
||||
// creates a list of code variables
|
||||
Blockly["Arduino"].variables_ = Object.create(null);
|
||||
|
||||
// Create a dictionary mapping desired function names in definitions_
|
||||
// to actual function names (to avoid collisions with user functions).
|
||||
Blockly['Arduino'].functionNames_ = Object.create(null);
|
||||
// Create a dictionary mapping desired function names in definitions_
|
||||
// to actual function names (to avoid collisions with user functions).
|
||||
Blockly["Arduino"].functionNames_ = Object.create(null);
|
||||
|
||||
Blockly['Arduino'].variablesInitCode_ = '';
|
||||
Blockly["Arduino"].variablesInitCode_ = "";
|
||||
|
||||
if (!Blockly['Arduino'].variableDB_) {
|
||||
Blockly['Arduino'].variableDB_ = new Blockly.Names(
|
||||
Blockly['Arduino'].RESERVED_WORDS_
|
||||
);
|
||||
} else {
|
||||
Blockly['Arduino'].variableDB_.reset();
|
||||
}
|
||||
if (!Blockly["Arduino"].variableDB_) {
|
||||
Blockly["Arduino"].variableDB_ = new Blockly.Names(
|
||||
Blockly["Arduino"].RESERVED_WORDS_
|
||||
);
|
||||
} else {
|
||||
Blockly["Arduino"].variableDB_.reset();
|
||||
}
|
||||
|
||||
Blockly['Arduino'].variableDB_.setVariableMap(workspace.getVariableMap());
|
||||
Blockly["Arduino"].variableDB_.setVariableMap(workspace.getVariableMap());
|
||||
|
||||
// We don't have developer variables for now
|
||||
// // Add developer variables (not created or named by the user).
|
||||
// var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
|
||||
// for (var i = 0; i < devVarList.length; i++) {
|
||||
// defvars.push(Blockly['Arduino'].variableDB_.getName(devVarList[i],
|
||||
// Blockly.Names.DEVELOPER_VARIABLE_TYPE));
|
||||
// }
|
||||
// We don't have developer variables for now
|
||||
// // Add developer variables (not created or named by the user).
|
||||
// var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
|
||||
// for (var i = 0; i < devVarList.length; i++) {
|
||||
// defvars.push(Blockly['Arduino'].variableDB_.getName(devVarList[i],
|
||||
// Blockly.Names.DEVELOPER_VARIABLE_TYPE));
|
||||
// }
|
||||
|
||||
const doubleVariables = workspace.getVariablesOfType('Number');
|
||||
let i = 0;
|
||||
let variableCode = '';
|
||||
for (i = 0; i < doubleVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
'double ' +
|
||||
Blockly['Arduino'].variableDB_.getName(
|
||||
doubleVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
' = 0; \n\n';
|
||||
}
|
||||
const doubleVariables = workspace.getVariablesOfType("Number");
|
||||
let i = 0;
|
||||
let variableCode = "";
|
||||
for (i = 0; i < doubleVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
"double " +
|
||||
Blockly["Arduino"].variableDB_.getName(
|
||||
doubleVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
" = 0; \n\n";
|
||||
}
|
||||
|
||||
const stringVariables = workspace.getVariablesOfType('String');
|
||||
for (i = 0; i < stringVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
'String ' +
|
||||
Blockly['Arduino'].variableDB_.getName(
|
||||
stringVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
' = ""; \n\n';
|
||||
}
|
||||
const stringVariables = workspace.getVariablesOfType("String");
|
||||
for (i = 0; i < stringVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
"String " +
|
||||
Blockly["Arduino"].variableDB_.getName(
|
||||
stringVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
' = ""; \n\n';
|
||||
}
|
||||
|
||||
const booleanVariables = workspace.getVariablesOfType('Boolean');
|
||||
for (i = 0; i < booleanVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
'boolean ' +
|
||||
Blockly['Arduino'].variableDB_.getDistinctName(
|
||||
booleanVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
' = false; \n\n';
|
||||
}
|
||||
const booleanVariables = workspace.getVariablesOfType("Boolean");
|
||||
for (i = 0; i < booleanVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
"boolean " +
|
||||
Blockly["Arduino"].variableDB_.getDistinctName(
|
||||
booleanVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
" = false; \n\n";
|
||||
}
|
||||
|
||||
const colourVariables = workspace.getVariablesOfType('Colour');
|
||||
for (i = 0; i < colourVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
'RGB ' +
|
||||
Blockly['Arduino'].variableDB_.getName(
|
||||
colourVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
' = {0, 0, 0}; \n\n';
|
||||
}
|
||||
const colourVariables = workspace.getVariablesOfType("Colour");
|
||||
for (i = 0; i < colourVariables.length; i += 1) {
|
||||
variableCode +=
|
||||
"RGB " +
|
||||
Blockly["Arduino"].variableDB_.getName(
|
||||
colourVariables[i].getId(),
|
||||
Blockly.Variables.NAME_TYPE
|
||||
) +
|
||||
" = {0, 0, 0}; \n\n";
|
||||
}
|
||||
|
||||
Blockly['Arduino'].variablesInitCode_ = variableCode;
|
||||
Blockly["Arduino"].variablesInitCode_ = variableCode;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -196,88 +190,84 @@ Blockly['Arduino'].init = function (workspace) {
|
||||
* @param {string} code Generated code.
|
||||
* @return {string} Completed code.
|
||||
*/
|
||||
Blockly['Arduino'].finish = function (code) {
|
||||
let libraryCode = '';
|
||||
let variablesCode = '';
|
||||
let codeFunctions = '';
|
||||
let functionsCode = '';
|
||||
let definitionsCode = '';
|
||||
let loopCodeOnce = '';
|
||||
let setupCode = '';
|
||||
let preSetupCode = '';
|
||||
let loraSetupCode = '';
|
||||
let devVariables = '\n';
|
||||
Blockly["Arduino"].finish = function (code) {
|
||||
let libraryCode = "";
|
||||
let variablesCode = "";
|
||||
let codeFunctions = "";
|
||||
let functionsCode = "";
|
||||
let definitionsCode = "";
|
||||
let loopCodeOnce = "";
|
||||
let setupCode = "";
|
||||
let preSetupCode = "";
|
||||
let loraSetupCode = "";
|
||||
let devVariables = "\n";
|
||||
|
||||
for (const key in Blockly['Arduino'].libraries_) {
|
||||
libraryCode += Blockly['Arduino'].libraries_[key] + '\n';
|
||||
}
|
||||
for (const key in Blockly["Arduino"].libraries_) {
|
||||
libraryCode += Blockly["Arduino"].libraries_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].variables_) {
|
||||
variablesCode += Blockly['Arduino'].variables_[key] + '\n';
|
||||
}
|
||||
for (const key in Blockly["Arduino"].variables_) {
|
||||
variablesCode += Blockly["Arduino"].variables_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].definitions_) {
|
||||
definitionsCode += Blockly['Arduino'].definitions_[key] + '\n';
|
||||
}
|
||||
for (const key in Blockly["Arduino"].definitions_) {
|
||||
definitionsCode += Blockly["Arduino"].definitions_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].loopCodeOnce_) {
|
||||
loopCodeOnce += Blockly['Arduino'].loopCodeOnce_[key] + '\n';
|
||||
}
|
||||
for (const key in Blockly["Arduino"].loopCodeOnce_) {
|
||||
loopCodeOnce += Blockly["Arduino"].loopCodeOnce_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].codeFunctions_) {
|
||||
codeFunctions += Blockly['Arduino'].codeFunctions_[key] + '\n';
|
||||
}
|
||||
for (const key in Blockly["Arduino"].codeFunctions_) {
|
||||
codeFunctions += Blockly["Arduino"].codeFunctions_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].functionNames_) {
|
||||
functionsCode += Blockly['Arduino'].functionNames_[key] + '\n';
|
||||
}
|
||||
for (const key in Blockly["Arduino"].functionNames_) {
|
||||
functionsCode += Blockly["Arduino"].functionNames_[key] + "\n";
|
||||
}
|
||||
|
||||
for (const key in Blockly["Arduino"].setupCode_) {
|
||||
preSetupCode += Blockly["Arduino"].setupCode_[key] + "\n" || "";
|
||||
}
|
||||
|
||||
for (const key in Blockly["Arduino"].loraSetupCode_) {
|
||||
loraSetupCode += Blockly["Arduino"].loraSetupCode_[key] + "\n" || "";
|
||||
}
|
||||
|
||||
for (const key in Blockly['Arduino'].setupCode_) {
|
||||
preSetupCode += Blockly['Arduino'].setupCode_[key] || '';
|
||||
}
|
||||
setupCode =
|
||||
"\nvoid setup() { \n" + preSetupCode + "\n" + loraSetupCode + "\n}\n";
|
||||
|
||||
for (const key in Blockly['Arduino'].loraSetupCode_) {
|
||||
loraSetupCode += Blockly['Arduino'].loraSetupCode_[key] || '';
|
||||
}
|
||||
let loopCode = "\nvoid loop() { \n" + loopCodeOnce + code + "\n}\n";
|
||||
|
||||
// Convert the definitions dictionary into a list.
|
||||
code =
|
||||
devVariables +
|
||||
"\n" +
|
||||
libraryCode +
|
||||
"\n" +
|
||||
variablesCode +
|
||||
"\n" +
|
||||
definitionsCode +
|
||||
"\n" +
|
||||
codeFunctions +
|
||||
"\n" +
|
||||
Blockly["Arduino"].variablesInitCode_ +
|
||||
"\n" +
|
||||
functionsCode +
|
||||
"\n" +
|
||||
setupCode +
|
||||
"\n" +
|
||||
loopCode;
|
||||
|
||||
setupCode = '\nvoid setup() { \n' + preSetupCode + '\n' + loraSetupCode + '\n}\n';
|
||||
// Clean up temporary data.
|
||||
delete Blockly["Arduino"].definitions_;
|
||||
delete Blockly["Arduino"].functionNames_;
|
||||
delete Blockly["Arduino"].loopCodeOnce_;
|
||||
delete Blockly["Arduino"].variablesInitCode_;
|
||||
delete Blockly["Arduino"].libraries_;
|
||||
Blockly["Arduino"].variableDB_.reset();
|
||||
|
||||
let loopCode = '\nvoid loop() { \n' + loopCodeOnce + code + '\n}\n';
|
||||
|
||||
|
||||
// Convert the definitions dictionary into a list.
|
||||
code =
|
||||
devVariables +
|
||||
'\n' +
|
||||
libraryCode +
|
||||
'\n' +
|
||||
variablesCode +
|
||||
'\n' +
|
||||
definitionsCode +
|
||||
'\n' +
|
||||
codeFunctions +
|
||||
'\n' +
|
||||
Blockly['Arduino'].variablesInitCode_ +
|
||||
'\n' +
|
||||
functionsCode +
|
||||
'\n' +
|
||||
setupCode +
|
||||
'\n' +
|
||||
loopCode
|
||||
;
|
||||
|
||||
// Clean up temporary data.
|
||||
delete Blockly['Arduino'].definitions_;
|
||||
delete Blockly['Arduino'].functionNames_;
|
||||
delete Blockly['Arduino'].loopCodeOnce_;
|
||||
delete Blockly['Arduino'].variablesInitCode_;
|
||||
delete Blockly['Arduino'].libraries_;
|
||||
Blockly['Arduino'].variableDB_.reset();
|
||||
|
||||
return code;
|
||||
return code;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -286,8 +276,8 @@ Blockly['Arduino'].finish = function (code) {
|
||||
* @param {string} line Line of generated code.
|
||||
* @return {string} Legal line of code.
|
||||
*/
|
||||
Blockly['Arduino'].scrubNakedValue = function (line) {
|
||||
return line + ';\n';
|
||||
Blockly["Arduino"].scrubNakedValue = function (line) {
|
||||
return line + ";\n";
|
||||
};
|
||||
|
||||
/**
|
||||
@ -297,14 +287,14 @@ Blockly['Arduino'].scrubNakedValue = function (line) {
|
||||
* @return {string} Arduino string.
|
||||
* @private
|
||||
*/
|
||||
Blockly['Arduino'].quote_ = function (string) {
|
||||
// Can't use goog.string.quote since Google's style guide recommends
|
||||
// JS string literals use single quotes.
|
||||
string = string
|
||||
.replace(/\\/g, '\\\\')
|
||||
.replace(/\n/g, '\\\n')
|
||||
.replace(/'/g, "\\'");
|
||||
return '"' + string + '"';
|
||||
Blockly["Arduino"].quote_ = function (string) {
|
||||
// Can't use goog.string.quote since Google's style guide recommends
|
||||
// JS string literals use single quotes.
|
||||
string = string
|
||||
.replace(/\\/g, "\\\\")
|
||||
.replace(/\n/g, "\\\n")
|
||||
.replace(/'/g, "\\'");
|
||||
return '"' + string + '"';
|
||||
};
|
||||
|
||||
/**
|
||||
@ -317,43 +307,42 @@ Blockly['Arduino'].quote_ = function (string) {
|
||||
* @return {string} Arduino code with comments and subsequent blocks added.
|
||||
* @private
|
||||
*/
|
||||
Blockly['Arduino'].scrub_ = function (block, code) {
|
||||
let commentCode = '';
|
||||
// Only collect comments for blocks that aren't inline.
|
||||
if (!block.outputConnection || !block.outputConnection.targetConnection) {
|
||||
// Collect comment for this block.
|
||||
let comment = block.getCommentText();
|
||||
//@ts-ignore
|
||||
comment = comment ? Blockly.utils.string.wrap(
|
||||
comment,
|
||||
Blockly['Arduino'].COMMENT_WRAP - 3
|
||||
) : null;
|
||||
if (comment) {
|
||||
if (block.getProcedureDef) {
|
||||
// Use a comment block for function comments.
|
||||
commentCode +=
|
||||
'/**\n' +
|
||||
Blockly['Arduino'].prefixLines(comment + '\n', ' * ') +
|
||||
' */\n';
|
||||
} else {
|
||||
commentCode += Blockly['Arduino'].prefixLines(comment + '\n', '// ');
|
||||
}
|
||||
}
|
||||
// Collect comments for all value arguments.
|
||||
// Don't collect comments for nested statements.
|
||||
for (let i = 0; i < block.inputList.length; i++) {
|
||||
if (block.inputList[i].type === Blockly.INPUT_VALUE) {
|
||||
const childBlock = block.inputList[i].connection.targetBlock();
|
||||
if (childBlock) {
|
||||
const comment = Blockly['Arduino'].allNestedComments(childBlock);
|
||||
if (comment) {
|
||||
commentCode += Blockly['Arduino'].prefixLines(comment, '// ');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Blockly["Arduino"].scrub_ = function (block, code) {
|
||||
let commentCode = "";
|
||||
// Only collect comments for blocks that aren't inline.
|
||||
if (!block.outputConnection || !block.outputConnection.targetConnection) {
|
||||
// Collect comment for this block.
|
||||
let comment = block.getCommentText();
|
||||
//@ts-ignore
|
||||
comment = comment
|
||||
? Blockly.utils.string.wrap(comment, Blockly["Arduino"].COMMENT_WRAP - 3)
|
||||
: null;
|
||||
if (comment) {
|
||||
if (block.getProcedureDef) {
|
||||
// Use a comment block for function comments.
|
||||
commentCode +=
|
||||
"/**\n" +
|
||||
Blockly["Arduino"].prefixLines(comment + "\n", " * ") +
|
||||
" */\n";
|
||||
} else {
|
||||
commentCode += Blockly["Arduino"].prefixLines(comment + "\n", "// ");
|
||||
}
|
||||
}
|
||||
const nextBlock = block.nextConnection && block.nextConnection.targetBlock();
|
||||
const nextCode = Blockly['Arduino'].blockToCode(nextBlock);
|
||||
return commentCode + code + nextCode;
|
||||
};
|
||||
// Collect comments for all value arguments.
|
||||
// Don't collect comments for nested statements.
|
||||
for (let i = 0; i < block.inputList.length; i++) {
|
||||
if (block.inputList[i].type === Blockly.INPUT_VALUE) {
|
||||
const childBlock = block.inputList[i].connection.targetBlock();
|
||||
if (childBlock) {
|
||||
const comment = Blockly["Arduino"].allNestedComments(childBlock);
|
||||
if (comment) {
|
||||
commentCode += Blockly["Arduino"].prefixLines(comment, "// ");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const nextBlock = block.nextConnection && block.nextConnection.targetBlock();
|
||||
const nextCode = Blockly["Arduino"].blockToCode(nextBlock);
|
||||
return commentCode + code + nextCode;
|
||||
};
|
||||
|
@ -1,24 +1,23 @@
|
||||
import './generator';
|
||||
import './loops';
|
||||
import './sensebox-sensors';
|
||||
import './sensebox-telegram';
|
||||
import './sensebox-osem';
|
||||
import './sensebox-web';
|
||||
import './sensebox-display';
|
||||
import './sensebox-lora';
|
||||
import './sensebox-led';
|
||||
import './sensebox-sd';
|
||||
import './mqtt';
|
||||
import './logic';
|
||||
import './text';
|
||||
import './math';
|
||||
import './map';
|
||||
import './io';
|
||||
import './audio';
|
||||
import './procedures';
|
||||
import './time';
|
||||
import './variables';
|
||||
import './lists';
|
||||
import './webserver';
|
||||
|
||||
|
||||
import "./generator";
|
||||
import "./loops";
|
||||
import "./sensebox-sensors";
|
||||
import "./sensebox-telegram";
|
||||
import "./sensebox-osem";
|
||||
import "./sensebox-web";
|
||||
import "./sensebox-display";
|
||||
import "./sensebox-lora";
|
||||
import "./sensebox-led";
|
||||
import "./sensebox-rtc";
|
||||
import "./sensebox-sd";
|
||||
import "./mqtt";
|
||||
import "./logic";
|
||||
import "./text";
|
||||
import "./math";
|
||||
import "./map";
|
||||
import "./io";
|
||||
import "./audio";
|
||||
import "./procedures";
|
||||
import "./time";
|
||||
import "./variables";
|
||||
import "./lists";
|
||||
import "./webserver";
|
||||
|
94
src/components/Blockly/generator/sensebox-rtc.js
Normal file
94
src/components/Blockly/generator/sensebox-rtc.js
Normal file
@ -0,0 +1,94 @@
|
||||
import Blockly from "blockly";
|
||||
|
||||
Blockly.Arduino.sensebox_rtc_init = function () {
|
||||
Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
|
||||
|
||||
var code = ``;
|
||||
return code;
|
||||
};
|
||||
|
||||
Blockly.Arduino.sensebox_rtc_set = function () {
|
||||
var second =
|
||||
Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
|
||||
"0";
|
||||
var minutes =
|
||||
Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
|
||||
"0";
|
||||
var hour =
|
||||
Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
|
||||
"0";
|
||||
var day =
|
||||
Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
|
||||
"0";
|
||||
var month =
|
||||
Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
|
||||
"0";
|
||||
var year =
|
||||
Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
|
||||
"0";
|
||||
Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
|
||||
Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
|
||||
Blockly.Arduino.setupCode_[
|
||||
"rtc.batterySwitchOver"
|
||||
] = `rtc.batterySwitchOver(1);`;
|
||||
Blockly.Arduino.setupCode_[
|
||||
"rtc.set"
|
||||
] = `rtc.set(${second}, ${minutes}, ${hour}, ${day}, ${month}, ${year});`;
|
||||
var code = ``;
|
||||
return code;
|
||||
};
|
||||
|
||||
Blockly.Arduino.sensebox_rtc_ntp = function () {
|
||||
Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
|
||||
Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
|
||||
Blockly.Arduino.setupCode_[
|
||||
"rtc.batterySwitchOver"
|
||||
] = `rtc.batterySwitchOver(1);`;
|
||||
Blockly.Arduino.setupCode_[
|
||||
"rtc.set"
|
||||
] = `rtc.set(SECOND, MINUTE, HOUR, DAY, MONTH, YEAR);`;
|
||||
var code = ``;
|
||||
return code;
|
||||
};
|
||||
|
||||
Blockly.Arduino.sensebox_rtc_get = function () {
|
||||
var dropdown = this.getFieldValue("dropdown");
|
||||
|
||||
Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
|
||||
Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
|
||||
Blockly.Arduino.setupCode_[
|
||||
"rtc.batterySwitchOver"
|
||||
] = `rtc.batterySwitchOver(1);`;
|
||||
Blockly.Arduino.variables_[
|
||||
"rtc_variables"
|
||||
] = `uint8_t sec, min, hour, day, month;\nuint16_t year;`;
|
||||
|
||||
Blockly.Arduino.loopCodeOnce_[
|
||||
"rtc_get"
|
||||
] = `rtc.get(&sec, &min, &hour, &day, &month, &year);`;
|
||||
|
||||
var code = `${dropdown}`;
|
||||
return code;
|
||||
};
|
||||
|
||||
Blockly.Arduino.sensebox_rtc_get_timestamp = function () {
|
||||
Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
|
||||
Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
|
||||
Blockly.Arduino.setupCode_[
|
||||
"rtc.batterySwitchOver"
|
||||
] = `rtc.batterySwitchOver(1);`;
|
||||
Blockly.Arduino.variables_[
|
||||
"rtc_variables"
|
||||
] = `uint8_t sec, min, hour, day, month;\nuint16_t year;`;
|
||||
Blockly.Arduino.variables_["rtc_timestamp"] = `String timestamp`;
|
||||
Blockly.Arduino.loopCodeOnce_[
|
||||
"rtc_get"
|
||||
] = `rtc.get(&sec, &min, &hour, &day, &month, &year);`;
|
||||
|
||||
Blockly.Arduino.loopCodeOnce_[
|
||||
""
|
||||
] = `sprintf(timestamp, "20%02d-%02d-%02dT%02d:%02d:%02dZ", year, month, day, hour, min, sec);`;
|
||||
|
||||
var code = `timestamp`;
|
||||
return code;
|
||||
};
|
@ -1,48 +1,49 @@
|
||||
|
||||
import { AUDIO } from './de/audio';
|
||||
import { FAQ } from './de/faq';
|
||||
import { IO } from './de/io';
|
||||
import { LOGIC } from './de/logic';
|
||||
import { LOOPS } from './de/loops';
|
||||
import { MATH } from './de/math';
|
||||
import { MQTT } from './de/mqtt';
|
||||
import { DISPLAY } from './de/sensebox-display';
|
||||
import { LED } from './de/sensebox-led';
|
||||
import { LORA } from './de/sensebox-lora';
|
||||
import { OSEM } from './de/sensebox-osem';
|
||||
import { SD } from './de/sensebox-sd';
|
||||
import { SENSORS } from './de/sensebox-sensors';
|
||||
import { TELEGRAM } from './de/sensebox-telegram';
|
||||
import { WEB } from './de/sensebox-web';
|
||||
import { TEXT } from './de/text';
|
||||
import { TIME } from './de/time';
|
||||
import { TOURS } from './de/tours';
|
||||
import { TRANSLATIONS } from './de/translations';
|
||||
import { UI } from './de/ui';
|
||||
import { VARIABLES } from './de/variables';
|
||||
import { WEBSERVER } from './de/webserver';
|
||||
import { AUDIO } from "./de/audio";
|
||||
import { FAQ } from "./de/faq";
|
||||
import { IO } from "./de/io";
|
||||
import { LOGIC } from "./de/logic";
|
||||
import { LOOPS } from "./de/loops";
|
||||
import { MATH } from "./de/math";
|
||||
import { MQTT } from "./de/mqtt";
|
||||
import { DISPLAY } from "./de/sensebox-display";
|
||||
import { LED } from "./de/sensebox-led";
|
||||
import { LORA } from "./de/sensebox-lora";
|
||||
import { OSEM } from "./de/sensebox-osem";
|
||||
import { RTC } from "./de/sensebox-rtc";
|
||||
import { SD } from "./de/sensebox-sd";
|
||||
import { SENSORS } from "./de/sensebox-sensors";
|
||||
import { TELEGRAM } from "./de/sensebox-telegram";
|
||||
import { WEB } from "./de/sensebox-web";
|
||||
import { TEXT } from "./de/text";
|
||||
import { TIME } from "./de/time";
|
||||
import { TOURS } from "./de/tours";
|
||||
import { TRANSLATIONS } from "./de/translations";
|
||||
import { UI } from "./de/ui";
|
||||
import { VARIABLES } from "./de/variables";
|
||||
import { WEBSERVER } from "./de/webserver";
|
||||
|
||||
export const De = {
|
||||
...AUDIO,
|
||||
...FAQ,
|
||||
...IO,
|
||||
...LOGIC,
|
||||
...LOOPS,
|
||||
...MATH,
|
||||
...MQTT,
|
||||
...DISPLAY,
|
||||
...LED,
|
||||
...LORA,
|
||||
...OSEM,
|
||||
...SD,
|
||||
...SENSORS,
|
||||
...TELEGRAM,
|
||||
...WEB,
|
||||
...TEXT,
|
||||
...TIME,
|
||||
...TOURS,
|
||||
...TRANSLATIONS,
|
||||
...UI,
|
||||
...VARIABLES,
|
||||
...WEBSERVER
|
||||
}
|
||||
...AUDIO,
|
||||
...FAQ,
|
||||
...IO,
|
||||
...LOGIC,
|
||||
...LOOPS,
|
||||
...MATH,
|
||||
...MQTT,
|
||||
...DISPLAY,
|
||||
...LED,
|
||||
...LORA,
|
||||
...OSEM,
|
||||
...RTC,
|
||||
...SD,
|
||||
...SENSORS,
|
||||
...TELEGRAM,
|
||||
...WEB,
|
||||
...TEXT,
|
||||
...TIME,
|
||||
...TOURS,
|
||||
...TRANSLATIONS,
|
||||
...UI,
|
||||
...VARIABLES,
|
||||
...WEBSERVER,
|
||||
};
|
||||
|
6
src/components/Blockly/msg/de/sensebox-rtc.js
Normal file
6
src/components/Blockly/msg/de/sensebox-rtc.js
Normal file
@ -0,0 +1,6 @@
|
||||
export const RTC = {
|
||||
sensebox_rtc_init: "Initialisiere RTC",
|
||||
sensebox_rtc_set: "Set Time",
|
||||
sensebox_rtc_get_timestamp: "Get Timestamp",
|
||||
sensebox_rtc_get: "Get: ",
|
||||
};
|
@ -1,47 +1,49 @@
|
||||
import { AUDIO } from './en/audio';
|
||||
import { FAQ } from './en/faq';
|
||||
import { IO } from './en/io';
|
||||
import { LOGIC } from './en/logic';
|
||||
import { LOOPS } from './en/loops';
|
||||
import { MATH } from './en/math';
|
||||
import { MQTT } from './en/mqtt';
|
||||
import { DISPLAY } from './en/sensebox-display';
|
||||
import { LED } from './en/sensebox-led';
|
||||
import { LORA } from './en/sensebox-lora';
|
||||
import { OSEM } from './en/sensebox-osem';
|
||||
import { SD } from './en/sensebox-sd';
|
||||
import { SENSORS } from './en/sensebox-sensors';
|
||||
import { TELEGRAM } from './en/sensebox-telegram';
|
||||
import { WEB } from './en/sensebox-web';
|
||||
import { TEXT } from './en/text';
|
||||
import { TIME } from './en/time';
|
||||
import { TOURS } from './en/tours';
|
||||
import { TRANSLATIONS } from './en/translations';
|
||||
import { UI } from './en/ui';
|
||||
import { VARIABLES } from './en/variables';
|
||||
import { WEBSERVER } from './en/webserver';
|
||||
import { AUDIO } from "./en/audio";
|
||||
import { FAQ } from "./en/faq";
|
||||
import { IO } from "./en/io";
|
||||
import { LOGIC } from "./en/logic";
|
||||
import { LOOPS } from "./en/loops";
|
||||
import { MATH } from "./en/math";
|
||||
import { MQTT } from "./en/mqtt";
|
||||
import { DISPLAY } from "./en/sensebox-display";
|
||||
import { LED } from "./en/sensebox-led";
|
||||
import { LORA } from "./en/sensebox-lora";
|
||||
import { OSEM } from "./en/sensebox-osem";
|
||||
import { RTC } from "./en/sensebox-rtc";
|
||||
import { SD } from "./en/sensebox-sd";
|
||||
import { SENSORS } from "./en/sensebox-sensors";
|
||||
import { TELEGRAM } from "./en/sensebox-telegram";
|
||||
import { WEB } from "./en/sensebox-web";
|
||||
import { TEXT } from "./en/text";
|
||||
import { TIME } from "./en/time";
|
||||
import { TOURS } from "./en/tours";
|
||||
import { TRANSLATIONS } from "./en/translations";
|
||||
import { UI } from "./en/ui";
|
||||
import { VARIABLES } from "./en/variables";
|
||||
import { WEBSERVER } from "./en/webserver";
|
||||
|
||||
export const En = {
|
||||
...AUDIO,
|
||||
...FAQ,
|
||||
...IO,
|
||||
...LOGIC,
|
||||
...LOOPS,
|
||||
...MATH,
|
||||
...MQTT,
|
||||
...DISPLAY,
|
||||
...LED,
|
||||
...LORA,
|
||||
...OSEM,
|
||||
...SD,
|
||||
...SENSORS,
|
||||
...TELEGRAM,
|
||||
...WEB,
|
||||
...TEXT,
|
||||
...TIME,
|
||||
...TOURS,
|
||||
...TRANSLATIONS,
|
||||
...UI,
|
||||
...VARIABLES,
|
||||
...WEBSERVER
|
||||
}
|
||||
...AUDIO,
|
||||
...FAQ,
|
||||
...IO,
|
||||
...LOGIC,
|
||||
...LOOPS,
|
||||
...MATH,
|
||||
...MQTT,
|
||||
...DISPLAY,
|
||||
...LED,
|
||||
...LORA,
|
||||
...OSEM,
|
||||
...RTC,
|
||||
...SD,
|
||||
...SENSORS,
|
||||
...TELEGRAM,
|
||||
...WEB,
|
||||
...TEXT,
|
||||
...TIME,
|
||||
...TOURS,
|
||||
...TRANSLATIONS,
|
||||
...UI,
|
||||
...VARIABLES,
|
||||
...WEBSERVER,
|
||||
};
|
||||
|
13
src/components/Blockly/msg/en/sensebox-rtc.js
Normal file
13
src/components/Blockly/msg/en/sensebox-rtc.js
Normal file
@ -0,0 +1,13 @@
|
||||
export const RTC = {
|
||||
sensebox_rtc_init: "Initialisiere RTC",
|
||||
sensebox_rtc_set: "Set Time manually",
|
||||
sensebox_rtc_set_ntp: "Set time via NTP-Server",
|
||||
sensebox_rtc_get_timestamp: "Get Timestamp",
|
||||
sensebox_rtc_get: "Get: ",
|
||||
sensebox_rtc_second: "seconds",
|
||||
sensebox_rtc_minutes: "minutes",
|
||||
sensebox_rtc_hour: "hour",
|
||||
sensebox_rtc_day: "day",
|
||||
sensebox_rtc_month: "month",
|
||||
sensebox_rtc_year: "year",
|
||||
};
|
File diff suppressed because it is too large
Load Diff
72
yarn.lock
72
yarn.lock
@ -1082,7 +1082,7 @@
|
||||
"core-js-pure" "^3.0.0"
|
||||
"regenerator-runtime" "^0.13.4"
|
||||
|
||||
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@7.12.1":
|
||||
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@7.12.1":
|
||||
"integrity" "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="
|
||||
"resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"
|
||||
"version" "7.12.1"
|
||||
@ -1929,6 +1929,14 @@
|
||||
dependencies:
|
||||
"@types/node" "*"
|
||||
|
||||
"@types/hoist-non-react-statics@^3.3.0":
|
||||
"integrity" "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA=="
|
||||
"resolved" "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz"
|
||||
"version" "3.3.1"
|
||||
dependencies:
|
||||
"@types/react" "*"
|
||||
"hoist-non-react-statics" "^3.3.0"
|
||||
|
||||
"@types/html-minifier-terser@^5.0.0":
|
||||
"integrity" "sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA=="
|
||||
"resolved" "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"
|
||||
@ -2020,6 +2028,16 @@
|
||||
dependencies:
|
||||
"@types/react" "*"
|
||||
|
||||
"@types/react-redux@^7.1.16":
|
||||
"integrity" "sha512-f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw=="
|
||||
"resolved" "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.16.tgz"
|
||||
"version" "7.1.16"
|
||||
dependencies:
|
||||
"@types/hoist-non-react-statics" "^3.3.0"
|
||||
"@types/react" "*"
|
||||
"hoist-non-react-statics" "^3.3.0"
|
||||
"redux" "^4.0.0"
|
||||
|
||||
"@types/react-transition-group@^4.2.0":
|
||||
"integrity" "sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w=="
|
||||
"resolved" "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz"
|
||||
@ -10027,15 +10045,14 @@
|
||||
"strip-ansi" "6.0.0"
|
||||
"text-table" "0.2.0"
|
||||
|
||||
"react-dom@^16.13.1":
|
||||
"integrity" "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag=="
|
||||
"resolved" "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz"
|
||||
"version" "16.13.1"
|
||||
"react-dom@^17.0.0", "react-dom@^17.0.2":
|
||||
"integrity" "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="
|
||||
"resolved" "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz"
|
||||
"version" "17.0.2"
|
||||
dependencies:
|
||||
"loose-envify" "^1.1.0"
|
||||
"object-assign" "^4.1.1"
|
||||
"prop-types" "^15.6.2"
|
||||
"scheduler" "^0.19.1"
|
||||
"scheduler" "^0.20.2"
|
||||
|
||||
"react-error-overlay@^6.0.9":
|
||||
"integrity" "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="
|
||||
@ -10054,7 +10071,7 @@
|
||||
"use-callback-ref" "^1.2.1"
|
||||
"use-sidecar" "^1.0.1"
|
||||
|
||||
"react-is@^16.12.0", "react-is@^16.6.0", "react-is@^16.7.0", "react-is@^16.8.0", "react-is@^16.8.1", "react-is@^16.8.4", "react-is@^16.8.6", "react-is@^16.9.0":
|
||||
"react-is@^16.12.0", "react-is@^16.13.1", "react-is@^16.6.0", "react-is@^16.7.0", "react-is@^16.8.0", "react-is@^16.8.1", "react-is@^16.8.4", "react-is@^16.8.6":
|
||||
"integrity" "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
|
||||
"resolved" "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
|
||||
"version" "16.13.1"
|
||||
@ -10080,16 +10097,22 @@
|
||||
"unist-util-visit" "^2.0.0"
|
||||
"xtend" "^4.0.1"
|
||||
|
||||
"react-redux@^7.2.0":
|
||||
"integrity" "sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA=="
|
||||
"resolved" "https://registry.npmjs.org/react-redux/-/react-redux-7.2.0.tgz"
|
||||
"version" "7.2.0"
|
||||
"react-mde@^11.5.0":
|
||||
"integrity" "sha512-CH/VK6d+tpVjJ8rTXfh1dDt6GWedTgCU0668p8toqhAc3vy0Lu872O2RKYDSpkUrlbHI08fjUPTl++nExp6gag=="
|
||||
"resolved" "https://registry.npmjs.org/react-mde/-/react-mde-11.5.0.tgz"
|
||||
"version" "11.5.0"
|
||||
|
||||
"react-redux@^7.2.4":
|
||||
"integrity" "sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA=="
|
||||
"resolved" "https://registry.npmjs.org/react-redux/-/react-redux-7.2.4.tgz"
|
||||
"version" "7.2.4"
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.5.5"
|
||||
"hoist-non-react-statics" "^3.3.0"
|
||||
"@babel/runtime" "^7.12.1"
|
||||
"@types/react-redux" "^7.1.16"
|
||||
"hoist-non-react-statics" "^3.3.2"
|
||||
"loose-envify" "^1.4.0"
|
||||
"prop-types" "^15.7.2"
|
||||
"react-is" "^16.9.0"
|
||||
"react-is" "^16.13.1"
|
||||
|
||||
"react-refresh@^0.8.3", "react-refresh@>=0.8.3 <0.10.0":
|
||||
"integrity" "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="
|
||||
@ -10201,14 +10224,13 @@
|
||||
"loose-envify" "^1.4.0"
|
||||
"prop-types" "^15.6.2"
|
||||
|
||||
"react@^16.13.1", "react@>= 16":
|
||||
"integrity" "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w=="
|
||||
"resolved" "https://registry.npmjs.org/react/-/react-16.13.1.tgz"
|
||||
"version" "16.13.1"
|
||||
"react@^16.8.3 || ^17", "react@^17.0.0", "react@^17.0.2", "react@>= 16", "react@17.0.2":
|
||||
"integrity" "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="
|
||||
"resolved" "https://registry.npmjs.org/react/-/react-17.0.2.tgz"
|
||||
"version" "17.0.2"
|
||||
dependencies:
|
||||
"loose-envify" "^1.1.0"
|
||||
"object-assign" "^4.1.1"
|
||||
"prop-types" "^15.6.2"
|
||||
|
||||
"reactour@^1.18.0":
|
||||
"integrity" "sha512-de0Pa5NkDU6I8IyGl+7+rWdDcx3AskmJYK/yIKU11D9EPIN79qzn852gjJgvH/jXZqeEfa+rmMWg72vA0UkmgA=="
|
||||
@ -10423,7 +10445,7 @@
|
||||
"resolved" "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz"
|
||||
"version" "2.3.0"
|
||||
|
||||
"redux@^4.0.5":
|
||||
"redux@^4.0.0", "redux@^4.0.5":
|
||||
"integrity" "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w=="
|
||||
"resolved" "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz"
|
||||
"version" "4.0.5"
|
||||
@ -10876,10 +10898,10 @@
|
||||
dependencies:
|
||||
"xmlchars" "^2.2.0"
|
||||
|
||||
"scheduler@^0.19.1":
|
||||
"integrity" "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="
|
||||
"resolved" "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz"
|
||||
"version" "0.19.1"
|
||||
"scheduler@^0.20.2":
|
||||
"integrity" "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="
|
||||
"resolved" "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz"
|
||||
"version" "0.20.2"
|
||||
dependencies:
|
||||
"loose-envify" "^1.1.0"
|
||||
"object-assign" "^4.1.1"
|
||||
|
Loading…
x
Reference in New Issue
Block a user