diff --git a/package-lock.json b/package-lock.json index bb1803b..65f572c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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" diff --git a/package.json b/package.json index db36513..6b07167 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/components/Blockly/blocks/index.js b/src/components/Blockly/blocks/index.js index c1ea173..b4bf8fa 100644 --- a/src/components/Blockly/blocks/index.js +++ b/src/components/Blockly/blocks/index.js @@ -8,6 +8,7 @@ import "./sensebox-web"; import "./sensebox-display"; import "./sensebox-lora"; import "./sensebox-led"; +import "./sensebox-rtc"; import "./sensebox-ble"; import "./sensebox-sd"; import "./mqtt"; diff --git a/src/components/Blockly/blocks/sensebox-rtc.js b/src/components/Blockly/blocks/sensebox-rtc.js new file mode 100644 index 0000000..96ea2c6 --- /dev/null +++ b/src/components/Blockly/blocks/sensebox-rtc.js @@ -0,0 +1,78 @@ +import * as Blockly from "blockly"; +import { getColour } from "../helpers/colour"; +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([ + [Blockly.Msg.sensebox_rtc_hour, "hour"], + [Blockly.Msg.sensebox_rtc_minutes, "minutes"], + [Blockly.Msg.sensebox_rtc_second, "seconds"], + [Blockly.Msg.sensebox_rtc_day, "day"], + [Blockly.Msg.sensebox_rtc_month, "month"], + [Blockly.Msg.sensebox_rtc_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); + }, +}; diff --git a/src/components/Blockly/generator/generator.js b/src/components/Blockly/generator/generator.js index 841f7dc..9d5e838 100644 --- a/src/components/Blockly/generator/generator.js +++ b/src/components/Blockly/generator/generator.js @@ -238,6 +238,8 @@ Blockly["Arduino"].finish = function (code) { loraSetupCode += Blockly["Arduino"].loraSetupCode_[key] + "\n" || ""; } + setupCode = + "\nvoid setup() { \n" + preSetupCode + "\n" + loraSetupCode + "\n}\n"; for (const key in Blockly["Arduino"].phyphoxSetupCode_) { phyphoxSetupCode += Blockly["Arduino"].phyphoxSetupCode_[key] + "\n" || ""; } diff --git a/src/components/Blockly/generator/index.js b/src/components/Blockly/generator/index.js index 7d1f088..29d1970 100644 --- a/src/components/Blockly/generator/index.js +++ b/src/components/Blockly/generator/index.js @@ -7,6 +7,7 @@ import "./sensebox-web"; import "./sensebox-display"; import "./sensebox-lora"; import "./sensebox-led"; +import "./sensebox-rtc"; import "./sensebox-ble"; import "./sensebox-sd"; import "./mqtt"; diff --git a/src/components/Blockly/generator/sensebox-rtc.js b/src/components/Blockly/generator/sensebox-rtc.js new file mode 100644 index 0000000..66bf2de --- /dev/null +++ b/src/components/Blockly/generator/sensebox-rtc.js @@ -0,0 +1,96 @@ +import Blockly from "blockly"; + +Blockly.Arduino.sensebox_rtc_init = function () { + Blockly.Arduino.libraries_["RV8523"] = `#include `; + Blockly.Arduino.definitions_["RTC"] = `RV8523 rtc;`; + Blockly.Arduino.libraries_["library_senseBoxMCU"] = + '#include "SenseBoxMCU.h"'; + Blockly.Arduino.setupCode_["rtc.begin"] = `rtc.begin();`; + 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 `; + 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 `; + 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 `; + Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`; + Blockly.Arduino.setupCode_[ + "rtc.batterySwitchOver" + ] = `rtc.batterySwitchOver(1);`; + Blockly.Arduino.loopCodeOnce_[ + "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.ORDER_ATOMIC]; +}; + +Blockly.Arduino.sensebox_rtc_get_timestamp = function () { + Blockly.Arduino.libraries_["RV8523"] = `#include `; + Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`; + Blockly.Arduino.setupCode_[ + "rtc.batterySwitchOver" + ] = `rtc.batterySwitchOver(1);`; + Blockly.Arduino.loopCodeOnce_[ + "rtc_variables" + ] = `uint8_t sec, min, hour, day, month;\nuint16_t year;`; + Blockly.Arduino.variables_["rtc_timestamp"] = `char timestamp[20];`; + Blockly.Arduino.loopCodeOnce_[ + "rtc_get" + ] = `rtc.get(&sec, &min, &hour, &day, &month, &year);`; + + Blockly.Arduino.loopCodeOnce_[ + "" + ] = `sprintf(timestamp, "%02d-%02d-%02dT%02d:%02d:%02dZ", year, month, day, hour, min, sec);`; + + var code = `timestamp`; + return [code, Blockly.Arduino.ORDER_ATOMIC]; +}; diff --git a/src/components/Blockly/msg/de.js b/src/components/Blockly/msg/de.js index 82d80e8..e2df956 100644 --- a/src/components/Blockly/msg/de.js +++ b/src/components/Blockly/msg/de.js @@ -10,6 +10,7 @@ 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"; @@ -35,6 +36,7 @@ export const De = { ...LED, ...LORA, ...OSEM, + ...RTC, ...SD, ...SENSORS, ...TELEGRAM, diff --git a/src/components/Blockly/msg/de/sensebox-rtc.js b/src/components/Blockly/msg/de/sensebox-rtc.js new file mode 100644 index 0000000..a662220 --- /dev/null +++ b/src/components/Blockly/msg/de/sensebox-rtc.js @@ -0,0 +1,19 @@ +export const RTC = { + sensebox_rtc_init: "Initialisiere RTC", + sensebox_rtc_init_tooltip: + "Initialisiere die RTC. Schließe diese an einen der 5 I2C/Wire Anschlüsse an und lege die Batterie ein. Bevor du die Uhrzeit auslesen kannst muss diese zunächst einmal gesetzt werden. Dieser Schritt muss normalerweise nur einmalig durchgeführt werden.", + sensebox_rtc_set: "Setze Uhrzeit/Datum der RTC", + sensebox_rtc_set_tooltip: + "Stellt die Uhrzeit der RTC ein. Beachte, dass du diesen Block im Setup ausführst.", + sensebox_rtc_get_timestamp: "Zeitstempel", + sensebox_rtc_get_timestamp_tooltip: + "Gibt dir einen in ISO 8601 formatierten Zeitstempel zurück. Bsp: 2021-12-24T18:21Z", + sensebox_rtc_get: "Wert: ", + sensebox_rtc_get_tooltip: "Gibt dir den ausgewählten Wert zurück.", + sensebox_rtc_second: "Sekunden", + sensebox_rtc_minutes: "Minuten", + sensebox_rtc_hour: "Stunden", + sensebox_rtc_day: "Tag", + sensebox_rtc_month: "Monat", + sensebox_rtc_year: "Jahr", +}; diff --git a/src/components/Blockly/msg/en.js b/src/components/Blockly/msg/en.js index 41eddea..038ccb7 100644 --- a/src/components/Blockly/msg/en.js +++ b/src/components/Blockly/msg/en.js @@ -10,6 +10,7 @@ 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"; @@ -35,6 +36,7 @@ export const En = { ...LED, ...LORA, ...OSEM, + ...RTC, ...SD, ...SENSORS, ...TELEGRAM, diff --git a/src/components/Blockly/msg/en/sensebox-rtc.js b/src/components/Blockly/msg/en/sensebox-rtc.js new file mode 100644 index 0000000..22dc105 --- /dev/null +++ b/src/components/Blockly/msg/en/sensebox-rtc.js @@ -0,0 +1,20 @@ +export const RTC = { + sensebox_rtc_init: "Initialise RTC", + sensebox_rtc_init_tooltip: + "Initialise the RTC. Connect it to one of the 5 I2C/Wire connections and insert the battery. Before you can read out the time, it must first be set. This step usually only needs to be done once.", + sensebox_rtc_set: "Set RTC time/date:", + sensebox_rtc_set_tooltip: + "Sets the time of the RTC. Note that you execute this block in the setup.", + sensebox_rtc_get_timestamp: "Get timestamp", + sensebox_rtc_get_timestamp_tooltip: + "Returns a timestamp formatted in ISO 8601. Ex: 2021-12-24T18:21Z", + sensebox_rtc_get_tooltip: "Returns the selected value", + sensebox_rtc_set_ntp: "Set time via NTP-Server", + 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", +}; diff --git a/src/components/Blockly/toolbox/Toolbox.js b/src/components/Blockly/toolbox/Toolbox.js index 3fa673a..eb1fe4d 100644 --- a/src/components/Blockly/toolbox/Toolbox.js +++ b/src/components/Blockly/toolbox/Toolbox.js @@ -469,6 +469,42 @@ class Toolbox extends React.Component { + + + + + 00 + + + + + 00 + + + + + 00 + + + + + 01 + + + + + 01 + + + + + 1970 + + + + {/* */} + + =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"