schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: schuelerlabor-cleverlab:master
Branches Tags
schuelerlabor-cleverlab:master
schuelerlabor-cleverlab:feature/sz/build-actions-runner
schuelerlabor-cleverlab:add-rainsensor
schuelerlabor-cleverlab:fix/saving-to-gallery
schuelerlabor-cleverlab:block/add-bn880-gps
schuelerlabor-cleverlab:development
schuelerlabor-cleverlab:dev/update-mini-ports
schuelerlabor-cleverlab:ratelimit-testing
schuelerlabor-cleverlab:development-finalTutorialPage
schuelerlabor-cleverlab:dev/add-more-board-features
schuelerlabor-cleverlab:dev/navbarSettings
schuelerlabor-cleverlab:dev/update-deviceSelector
schuelerlabor-cleverlab:feature/keep-workspace-code
schuelerlabor-cleverlab:feat/markdown-editor
schuelerlabor-cleverlab:block/update-sd-interval
schuelerlabor-cleverlab:backend-connection
schuelerlabor-cleverlab:bachelor
schuelerlabor-cleverlab:add-arduino-generator
..
compare: schuelerlabor-cleverlab:feat/markdown-editor
Branches Tags
schuelerlabor-cleverlab:master
schuelerlabor-cleverlab:feature/sz/build-actions-runner
schuelerlabor-cleverlab:add-rainsensor
schuelerlabor-cleverlab:fix/saving-to-gallery
schuelerlabor-cleverlab:block/add-bn880-gps
schuelerlabor-cleverlab:development
schuelerlabor-cleverlab:dev/update-mini-ports
schuelerlabor-cleverlab:ratelimit-testing
schuelerlabor-cleverlab:development-finalTutorialPage
schuelerlabor-cleverlab:dev/add-more-board-features
schuelerlabor-cleverlab:dev/navbarSettings
schuelerlabor-cleverlab:dev/update-deviceSelector
schuelerlabor-cleverlab:feature/keep-workspace-code
schuelerlabor-cleverlab:feat/markdown-editor
schuelerlabor-cleverlab:block/update-sd-interval
schuelerlabor-cleverlab:backend-connection
schuelerlabor-cleverlab:bachelor
schuelerlabor-cleverlab:add-arduino-generator

1 Commits
master ... feat/markd

Author SHA1 Message Date
Mario Pesch
431719f242 add markdown editor 2021-09-16 15:02:10 +02:00
209 changed files with 65095 additions and 13130 deletions
Show Stats Expand all files Collapse all files

2
.env
View File

@ -2,7 +2,5 @@ REACT_APP_COMPILER_URL=https://compiler.sensebox.de
REACT_APP_BOARD=sensebox-mcu REACT_APP_BOARD=sensebox-mcu
REACT_APP_BLOCKLY_API=https://api.blockly.sensebox.de REACT_APP_BLOCKLY_API=https://api.blockly.sensebox.de
GENERATE_SOURCEMAP=false
# in days # in days
REACT_APP_SHARE_LINK_EXPIRES=30 REACT_APP_SHARE_LINK_EXPIRES=30

41
.gitea/workflows/build.yaml
View File

@ -1,41 +0,0 @@
name: Build and push image
on:
push:
branches:
- master
jobs:
build:
runs-on: ubuntu-latest
container:
image: catthehacker/ubuntu:act-latest
#defaults:
# run:
# working-directory: /repo
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0 # all history for all branches and tags
- name: Login to gitea.simonzeyer.de Repo
uses: docker/login-action@v2
with:
registry: gitea.simonzeyer.de
username: ${{ secrets.DOCKER_REPO_USER }}
password: ${{ secrets.DOCKER_REPO_PASSWD }}
- name: Get Meta
id: meta
run: |
echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
echo REPO_VERSION=$(git describe --always | sed 's/^v//') >> $GITHUB_OUTPUT
- name: Build and push
uses: docker/build-push-action@v4
env:
ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
with:
context: .
file: ./Dockerfile
push: true
tags: |
gitea.simonzeyer.de/schuelerlabor-cleverlab/smarti:${{ steps.meta.outputs.REPO_VERSION }}

38
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@ -1,38 +0,0 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
**Additional context**
Add any other context about the problem here.

20
.github/ISSUE_TEMPLATE/feature_request.md vendored
View File

@ -1,20 +0,0 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

14
.github/ISSUE_TEMPLATE/short-issue.md vendored
View File

@ -1,14 +0,0 @@
---
name: Short Issue
about: Template for Short Issues
title: ''
labels: ''
assignees: ''
---
### Current behaviour
Describe the current behaviour
### Expected behaviour
Describe how it is supposed to work

2
.gitignore vendored
View File

@ -22,4 +22,4 @@ npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
package-lock.json package-lock.json
package-lock.json

26
CITATION.cff
View File

@ -1,26 +0,0 @@
# This CITATION.cff file was generated with cffinit.
# Visit https://bit.ly/cffinit to generate yours today!
cff-version: 1.2.0
title: senseBox Learn- and Programming Environment
message: Please cite this software using these metadata.
type: software
version: 1.0.0
date-released: 2021-09-30
url: "https://github.com/sensebox/React-Ardublockly"
authors:
- given-names: Mario
family-names: Pesch
email: mario.pesch@uni-muenster.de
affiliation: >-
Institute for geoinformatics University of
Muenster
- given-names: Luc
family-names: Niski
affiliation: >-
Institute for geoinformatics University of
Muenster
- given-names: Felix
family-names: Erdmann
email: f.erdmann@reedu.de
affiliation: Reedu GmbH & Co. KG

12
Dockerfile
View File

@ -1,12 +0,0 @@
# specify the node base image with your desired version node:<version>
FROM node:16 as build
WORKDIR /app
copy ./ /app
RUN npm install --verbose
RUN npm run build --verbose
FROM nginx:alpine
COPY --from=build /app/build/ /usr/share/nginx/html
RUN chmod 755 /usr/share/nginx/html/ -R
EXPOSE 80
ENTRYPOINT ["sh", "-c", "cd /usr/share/nginx/html/ && nginx -g 'daemon off;'"]

5
README.md
View File

@ -22,4 +22,7 @@ This project was created with [Create React App](https://github.com/facebook/cre
Ensure that line 14 in [store.js](https://github.com/sensebox/React-Ardublockly/blob/master/src/store.js#L14) is commented out or otherwise you have installed [Redux DevTools Extension](http://extension.remotedev.io/). Ensure that line 14 in [store.js](https://github.com/sensebox/React-Ardublockly/blob/master/src/store.js#L14) is commented out or otherwise you have installed [Redux DevTools Extension](http://extension.remotedev.io/).
## Demo ## Demo
A demo of the current status of the master branch can be accessed via [https://blockly-react.netlify.app/](https://blockly-react.netlify.app/) :rocket:. A demo of the current status of the master branch can be accessed via [sensebox-ardublockly.netlify.app](https://sensebox-ardublockly.netlify.app/) :rocket:.
* [Home](https://sensebox-ardublockly.netlify.app/)
* [Tutorial Overview](https://sensebox-ardublockly.netlify.app/tutorial)
* [Tutorial-Builder](https://sensebox-ardublockly.netlify.app/tutorial/builder)

11
docker-compose.yaml
View File

@ -1,11 +0,0 @@
# docker-compose.yml
services:
smarti:
mem_limit: 2048m
mem_reservation: 128M
cpus: 2
build:
dockerfile: Dockerfile
ports:
- "80"

45714
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

98
package.json
View File

@ -1,63 +1,45 @@
{ {
"name": "blockly-react", "name": "blockly-react",
"version": "1.0.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@blockly/block-plus-minus": "^4.0.4", "@blockly/block-plus-minus": "^2.0.10",
"@blockly/field-grid-dropdown": "^2.0.4", "@blockly/field-slider": "^2.1.1",
"@blockly/field-slider": "4.0.4", "@blockly/plugin-scroll-options": "^1.0.2",
"@blockly/plugin-scroll-options": "^3.0.5", "@blockly/plugin-typed-variable-modal": "^3.1.26",
"@blockly/plugin-typed-variable-modal": "^5.0.6", "@blockly/zoom-to-fit": "^2.0.7",
"@blockly/workspace-backpack": "^3.0.4", "@fortawesome/fontawesome-svg-core": "^1.2.30",
"@blockly/zoom-to-fit": "^3.0.4", "@fortawesome/free-solid-svg-icons": "^5.14.0",
"@emotion/react": "^11.10.5", "@fortawesome/react-fontawesome": "^0.1.11",
"@emotion/styled": "^11.10.5", "@material-ui/core": "^4.11.0",
"@fortawesome/fontawesome-svg-core": "^6.2.1", "@sentry/react": "^6.0.0",
"@fortawesome/free-solid-svg-icons": "^6.2.1", "@sentry/tracing": "^6.0.0",
"@fortawesome/react-fontawesome": "^0.2.0", "@testing-library/jest-dom": "^4.2.4",
"@monaco-editor/react": "^4.3.1", "@testing-library/react": "^9.5.0",
"@mui/lab": "^5.0.0-alpha.110",
"@mui/material": "^5.10.16",
"@mui/styles": "^5.10.16",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^7.2.1", "@testing-library/user-event": "^7.2.1",
"axios": "^0.22.0", "axios": "^0.21.0",
"blockly": "^9.2.0", "blockly": "^6.20210701.0",
"file-saver": "^2.0.5", "file-saver": "^2.0.2",
"markdown-it": "^12.3.2",
"mnemonic-id": "^3.2.7", "mnemonic-id": "^3.2.7",
"moment": "^2.29.4", "moment": "^2.28.0",
"prismjs": "^1.27.0", "prismjs": "^1.24.0",
"qrcode.react": "^3.1.0",
"react": "^17.0.2", "react": "^17.0.2",
"react-cookie-consent": "^7.2.1", "react-cookie-consent": "^5.2.0",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-markdown": "^8.0.0", "react-markdown": "^5.0.2",
"react-markdown-editor-lite": "^1.3.3",
"react-mde": "^11.5.0", "react-mde": "^11.5.0",
"react-rating-stars-component": "^2.2.0", "react-redux": "^7.2.4",
"react-redux": "^7.2.9", "react-router-dom": "^5.2.0",
"react-router-dom": "^5.3.3", "react-scripts": "^4.0.3",
"react-scripts": "^5.0.1", "reactour": "^1.18.0",
"react-share": "^4.4.0", "redux": "^4.0.5",
"react-spinners": "^0.13.3", "redux-thunk": "^2.3.0",
"reactour": "^1.18.7", "rich-markdown-editor": "^11.17.7",
"redux": "^4.2.0", "styled-components": "^5.0.0",
"redux-thunk": "^2.4.1", "uuid": "^8.3.1"
"rehype-raw": "^6.1.1",
"remark-gemoji": "^7.0.1",
"remark-gfm": "^3.0.1",
"styled-components": "^4.4.1",
"uuid": "^8.3.1",
"watchpack": "^2.3.1"
},
"resolutions": {
"//": "See https://github.com/facebook/create-react-app/issues/11773",
"react-error-overlay": "6.0.9"
}, },
"scripts": { "scripts": {
"start": "node_modules/react-scripts/bin/react-scripts.js start", "start": "react-scripts start",
"dev": "set \"REACT_APP_BLOCKLY_API=http://localhost:8080\" && npm start", "dev": "set \"REACT_APP_BLOCKLY_API=http://localhost:8080\" && npm start",
"build": "react-scripts build", "build": "react-scripts build",
"test": "react-scripts test", "test": "react-scripts test",
@ -66,12 +48,16 @@
"eslintConfig": { "eslintConfig": {
"extends": "react-app" "extends": "react-app"
}, },
"browserslist": [ "browserslist": {
">0.2%", "production": [
"not dead", ">0.2%",
"not op_mini all" "not dead",
], "not op_mini all"
"devDependencies": { ],
"@babel/plugin-proposal-private-property-in-object": "7.21.11" "development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
} }
} }

BIN
public/media/hardware/ble-bee.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 194 KiB

BIN
public/media/hardware/expander.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 122 KiB

BIN
public/media/hardware/jst-qwiic.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 777 KiB

BIN
public/media/hardware/qwiic-qwiic.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 728 KiB

BIN
public/media/hardware/senseboxmcumini.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 343 KiB

BIN
public/media/hardware/sps30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 77 KiB

BIN
public/media/hardware/wassertemp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 79 KiB

BIN
public/media/hardware/ws2818.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 472 KiB

83
src/App.css
View File

@ -1,74 +1,51 @@
.wrapper { .wrapper {
min-height: calc( min-height: calc(100vh - 60px); /* will cover the 100% of viewport - height of footer (padding-bottom) */
100vh - 60px
); /* will cover the 100% of viewport - height of footer (padding-bottom) */
overflow: hidden; overflow: hidden;
display: block; display: block;
position: relative; position: relative;
padding-bottom: 60px; /* height of your footer + 30px*/ padding-bottom: 60px; /* height of your footer + 30px*/
} }
.tutorial img {
.tutorial img{
display: flex; display: flex;
align-items: center; align-items: center;
max-height: 40vh; max-height: 40vH;
max-width: 100%; max-width: 100%;
margin: auto; margin: auto;
} }
.news img { .news img{
display: flex; display: flex;
align-items: center; align-items: center;
max-height: 40vh; max-height: 40vH;
max-width: 100%; max-width: 100%;
margin: auto; margin: auto;
} }
.tutorial blockquote { .tutorial blockquote{
background: #f9f9f9; background: #f9f9f9;
border-left: 10px solid#4EAF47; border-left: 10px solid#4EAF47;
margin: 1.5em 10px; margin: 1.5em 10px;
padding: 0.5em 10px; padding: 0.5em 10px;
quotes: "\201C""\201D""\2018""\2019"; quotes: "\201C""\201D""\2018""\2019";
} }
blockquote:before { blockquote:before {
color: #4eaf47; color:#4EAF47;
content: open-quote; content: open-quote;
font-size: 4em; font-size: 4em;
line-height: 0.1em; line-height: 0.1em;
margin-right: 0.25em; margin-right: 0.25em;
vertical-align: -0.4em; vertical-align: -0.4em;
} }
blockquote p { blockquote p {
display: inline; display: inline;
} }
.tutorial table,
th,
td {
border: 1px solid #ddd;
}
.tutorial th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
border-color: #4eaf47;
color: white;
}
.overlay { .overlay {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
:root {
--url: url('./data/mcu_opacity.png');
}
.blocklySvg {
background-image: var(--url);
background-position: center;
background-repeat: no-repeat;
}

47
src/App.js
View File

@ -1,34 +1,35 @@
import React, { Component } from "react"; import React, { Component } from 'react';
import { Router } from "react-router-dom"; import { BrowserRouter as Router } from 'react-router-dom';
import { createBrowserHistory } from "history"; import { createBrowserHistory } from "history";
import { Provider } from "react-redux"; import { Provider } from 'react-redux';
import store from "./store"; import store from './store';
import { loadUser } from "./actions/authActions"; import { loadUser } from './actions/authActions';
import "./App.css"; import './App.css';
import { ThemeProvider, StyledEngineProvider, createTheme } from "@mui/material/styles"; import { ThemeProvider, createMuiTheme } from '@material-ui/core/styles';
import Content from "./components/Content"; import Content from './components/Content';
const theme = createTheme({ const theme = createMuiTheme({
palette: { palette: {
primary: { primary: {
main: "#4EAF47", main: '#4EAF47',
contrastText: "#ffffff", contrastText: '#ffffff'
}, },
secondary: { secondary: {
main: "#DDDDDD", main: '#DDDDDD'
}, },
button: { button: {
compile: "#e27136", compile: '#e27136'
}, }
}, }
}); });
class App extends Component { class App extends Component {
componentDidMount() { componentDidMount() {
store.dispatch(loadUser()); store.dispatch(loadUser());
} }
@ -36,15 +37,13 @@ class App extends Component {
render() { render() {
const customHistory = createBrowserHistory(); const customHistory = createBrowserHistory();
return ( return (
<StyledEngineProvider injectFirst> <ThemeProvider theme={theme}>
<ThemeProvider theme={theme}> <Provider store={store}>
<Provider store={store}> <Router history={customHistory}>
<Router history={customHistory}> <Content />
<Content /> </Router>
</Router> </Provider>
</Provider> </ThemeProvider>
</ThemeProvider>
</StyledEngineProvider>
); );
} }
} }

105
src/actions/authActions.js
View File

@ -63,56 +63,63 @@ export const loadUser = () => (dispatch) => {
}); });
}; };
var logoutTimerId;
const timeToLogout = 14.9 * 60 * 1000; // nearly 15 minutes corresponding to the API
// Login user // Login user
export const login = export const login =
({ email, password }) => ({ email, password }) =>
(dispatch) => { (dispatch) => {
dispatch({ dispatch({
type: USER_LOADING, type: USER_LOADING,
}); });
// Headers // Headers
const config = { const config = {
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
};
// Request Body
const body = JSON.stringify({ email, password });
axios
.post(`${process.env.REACT_APP_BLOCKLY_API}/user`, body, config)
.then((res) => {
dispatch(setLanguage(res.data.user.language));
dispatch({
type: LOGIN_SUCCESS,
payload: res.data,
});
dispatch({
type: GET_STATUS,
payload: res.data.user.status,
});
dispatch(returnSuccess(res.data.message, res.status, "LOGIN_SUCCESS"));
})
.catch((err) => {
dispatch(
returnErrors(
err.response.data.message,
err.response.status,
"LOGIN_FAIL"
)
);
dispatch({
type: LOGIN_FAIL,
});
var status = [];
if (window.localStorage.getItem("status")) {
status = JSON.parse(window.localStorage.getItem("status"));
}
dispatch({
type: GET_STATUS,
payload: status,
});
});
}; };
// Request Body
const body = JSON.stringify({ email, password });
axios
.post(`${process.env.REACT_APP_BLOCKLY_API}/user`, body, config)
.then((res) => {
// Logout automatically if refreshToken "expired"
const logoutTimer = () =>
setTimeout(() => dispatch(logout()), timeToLogout);
logoutTimerId = logoutTimer();
dispatch(setLanguage(res.data.user.language));
dispatch({
type: LOGIN_SUCCESS,
payload: res.data,
});
dispatch({
type: GET_STATUS,
payload: res.data.user.status,
});
dispatch(returnSuccess(res.data.message, res.status, "LOGIN_SUCCESS"));
})
.catch((err) => {
dispatch(
returnErrors(
err.response.data.message,
err.response.status,
"LOGIN_FAIL"
)
);
dispatch({
type: LOGIN_FAIL,
});
var status = [];
if (window.localStorage.getItem("status")) {
status = JSON.parse(window.localStorage.getItem("status"));
}
dispatch({
type: GET_STATUS,
payload: status,
});
});
};
// Logout User // Logout User
export const logout = () => (dispatch) => { export const logout = () => (dispatch) => {
@ -137,6 +144,7 @@ export const logout = () => (dispatch) => {
} }
dispatch(setLanguage(locale)); dispatch(setLanguage(locale));
dispatch(returnSuccess(res.data.message, res.status, "LOGOUT_SUCCESS")); dispatch(returnSuccess(res.data.message, res.status, "LOGOUT_SUCCESS"));
clearTimeout(logoutTimerId);
}, },
error: (err) => { error: (err) => {
dispatch( dispatch(
@ -157,6 +165,7 @@ export const logout = () => (dispatch) => {
type: GET_STATUS, type: GET_STATUS,
payload: status, payload: status,
}); });
clearTimeout(logoutTimerId);
}, },
}; };
axios axios
@ -213,6 +222,10 @@ export const authInterceptor = () => (dispatch, getState) => {
}) })
.then((res) => { .then((res) => {
if (res.status === 200) { if (res.status === 200) {
clearTimeout(logoutTimerId);
const logoutTimer = () =>
setTimeout(() => dispatch(logout()), timeToLogout);
logoutTimerId = logoutTimer();
dispatch({ dispatch({
type: REFRESH_TOKEN_SUCCESS, type: REFRESH_TOKEN_SUCCESS,
payload: res.data, payload: res.data,

15
src/actions/boardAction.js
View File

@ -1,15 +0,0 @@
import {
BOARD,
} from "./types";
import mini_opacity from "../data/mini_opacity.png"
import mcu_opacity from "../data/mcu_opacity.png"
export const setBoard = (board) => (dispatch) => {
window.sessionStorage.setItem("board", board);
const root = document.querySelector(':root');
root.style.setProperty('--url', `url(${board === "mcu" ? mcu_opacity : mini_opacity})`);
dispatch({
type: BOARD,
payload: board,
});
};

36
src/actions/generalActions.js
View File

@ -1,52 +1,32 @@
import { import { VISIT, LANGUAGE, RENDERER, STATISTICS } from './types';
VISIT,
LANGUAGE,
RENDERER,
SOUNDS,
STATISTICS,
PLATFORM,
} from "./types";
export const visitPage = () => (dispatch) => { export const visitPage = () => (dispatch) => {
dispatch({ dispatch({
type: VISIT, type: VISIT
});
};
export const setPlatform = (platform) => (dispatch) => {
dispatch({
type: PLATFORM,
payload: platform,
}); });
}; };
export const setLanguage = (language) => (dispatch, getState) => { export const setLanguage = (language) => (dispatch, getState) => {
if (!getState().auth.progress && !getState().auth.isAuthenticated) { if(!getState().auth.progress && !getState().auth.isAuthenticated){
window.localStorage.setItem("locale", language); window.localStorage.setItem('locale', language);
} }
dispatch({ dispatch({
type: LANGUAGE, type: LANGUAGE,
payload: language, payload: language
}); });
}; };
export const setRenderer = (renderer) => (dispatch) => { export const setRenderer = (renderer) => (dispatch) => {
dispatch({ dispatch({
type: RENDERER, type: RENDERER,
payload: renderer, payload: renderer
});
};
export const setSounds = (sounds) => (dispatch) => {
dispatch({
type: SOUNDS,
payload: sounds,
}); });
}; };
export const setStatistics = (showStatistics) => (dispatch) => { export const setStatistics = (showStatistics) => (dispatch) => {
dispatch({ dispatch({
type: STATISTICS, type: STATISTICS,
payload: showStatistics, payload: showStatistics
}); });
}; };

18
src/actions/sensorwikiActions.js
View File

@ -1,18 +0,0 @@
import axios from 'axios'
const fetchSensorWikiSuccess = sensors => ({
type: 'FETCH_SENSORWIKI_SUCCESS',
payload: { sensors }
})
export const fetchSensors = () => {
return async dispatch => {
try {
let sensors = await axios.get('https://api.sensors.wiki/sensors/all')
dispatch(fetchSensorWikiSuccess(sensors.data))
}
catch(e){
console.log(e)
}
}
}

71
src/actions/tutorialActions.js
View File

@ -84,77 +84,6 @@ export const getTutorials = () => (dispatch, getState) => {
}); });
}; };
export const getAllTutorials = () => (dispatch, getState) => {
axios
.get(`${process.env.REACT_APP_BLOCKLY_API}/tutorial/getAllTutorials`)
.then((res) => {
var tutorials = res.data.tutorials;
existingTutorials(tutorials, getState().tutorial.status).then(
(status) => {
dispatch({
type: TUTORIAL_SUCCESS,
payload: status,
});
dispatch(updateStatus(status));
dispatch({
type: GET_TUTORIALS,
payload: tutorials,
});
dispatch({ type: TUTORIAL_PROGRESS });
dispatch(returnSuccess(res.data.message, res.status));
}
);
})
.catch((err) => {
if (err.response) {
dispatch(
returnErrors(
err.response.data.message,
err.response.status,
"GET_TUTORIALS_FAIL"
)
);
}
dispatch({ type: TUTORIAL_PROGRESS });
});
};
export const getUserTutorials = () => (dispatch, getState) => {
axios
.get(`${process.env.REACT_APP_BLOCKLY_API}/tutorial/getUserTutorials`)
.then((res) => {
var tutorials = res.data.tutorials;
existingTutorials(tutorials, getState().tutorial.status).then(
(status) => {
dispatch({
type: TUTORIAL_SUCCESS,
payload: status,
});
dispatch(updateStatus(status));
dispatch({
type: GET_TUTORIALS,
payload: tutorials,
});
dispatch({ type: TUTORIAL_PROGRESS });
dispatch(returnSuccess(res.data.message, res.status));
}
);
})
.catch((err) => {
console.log(err);
if (err.response) {
dispatch(
returnErrors(
err.response.data.message,
err.response.status,
"GET_TUTORIALS_FAIL"
)
);
}
dispatch({ type: TUTORIAL_PROGRESS });
});
};
export const updateStatus = (status) => (dispatch, getState) => { export const updateStatus = (status) => (dispatch, getState) => {
if (getState().auth.isAuthenticated) { if (getState().auth.isAuthenticated) {
// update user account in database - sync with redux store // update user account in database - sync with redux store

28
src/actions/tutorialBuilderActions.js
View File

@ -4,9 +4,6 @@ import {
BUILDER_CHANGE, BUILDER_CHANGE,
BUILDER_ERROR, BUILDER_ERROR,
BUILDER_TITLE, BUILDER_TITLE,
BUILDER_PUBLIC,
BUILDER_DIFFICULTY,
BUILDER_REVIEW,
BUILDER_ID, BUILDER_ID,
BUILDER_ADD_STEP, BUILDER_ADD_STEP,
BUILDER_DELETE_STEP, BUILDER_DELETE_STEP,
@ -38,30 +35,6 @@ export const tutorialTitle = (title) => (dispatch) => {
dispatch(changeTutorialBuilder()); dispatch(changeTutorialBuilder());
}; };
export const tutorialPublic = (pub) => (dispatch) => {
dispatch({
type: BUILDER_PUBLIC,
payload: pub,
});
dispatch(changeTutorialBuilder());
};
export const tutorialDifficulty = (difficulty) => (dispatch) => {
dispatch({
type: BUILDER_DIFFICULTY,
payload: difficulty,
});
dispatch(changeTutorialBuilder());
};
export const tutorialReview = (review) => (dispatch) => {
dispatch({
type: BUILDER_REVIEW,
payload: review,
});
dispatch(changeTutorialBuilder());
};
export const tutorialSteps = (steps) => (dispatch) => { export const tutorialSteps = (steps) => (dispatch) => {
dispatch({ dispatch({
type: BUILDER_ADD_STEP, type: BUILDER_ADD_STEP,
@ -347,7 +320,6 @@ export const readJSON = (json) => (dispatch, getState) => {
return object; return object;
}); });
dispatch(tutorialTitle(json.title)); dispatch(tutorialTitle(json.title));
dispatch(tutorialDifficulty(json.difficulty));
dispatch(tutorialSteps(steps)); dispatch(tutorialSteps(steps));
dispatch(setSubmitError()); dispatch(setSubmitError());
dispatch(progress(false)); dispatch(progress(false));

9
src/actions/types.js
View File

@ -21,7 +21,6 @@ export const NAME = "NAME";
export const TUTORIAL_PROGRESS = "TUTORIAL_PROGRESS"; export const TUTORIAL_PROGRESS = "TUTORIAL_PROGRESS";
export const GET_TUTORIAL = "GET_TUTORIAL"; export const GET_TUTORIAL = "GET_TUTORIAL";
export const GET_TUTORIALS = "GET_TUTORIALS"; export const GET_TUTORIALS = "GET_TUTORIALS";
export const GET_USERTUTORIALS = "GET_USERTUTORIALS";
export const GET_STATUS = "GET_STATUS"; export const GET_STATUS = "GET_STATUS";
export const TUTORIAL_SUCCESS = "TUTORIAL_SUCCESS"; export const TUTORIAL_SUCCESS = "TUTORIAL_SUCCESS";
export const TUTORIAL_ERROR = "TUTORIAL_ERROR"; export const TUTORIAL_ERROR = "TUTORIAL_ERROR";
@ -33,9 +32,6 @@ export const JSON_STRING = "JSON_STRING";
export const BUILDER_CHANGE = "BUILDER_CHANGE"; export const BUILDER_CHANGE = "BUILDER_CHANGE";
export const BUILDER_TITLE = "BUILDER_TITLE"; export const BUILDER_TITLE = "BUILDER_TITLE";
export const BUILDER_DIFFICULTY = "BUILDER_DIFFICULTY";
export const BUILDER_PUBLIC = "BUILDER_PUBLIC";
export const BUILDER_REVIEW = "BUILDER_REVIEW";
export const BUILDER_ID = "BUILDER_ID"; export const BUILDER_ID = "BUILDER_ID";
export const BUILDER_ADD_STEP = "BUILDER_ADD_STEP"; export const BUILDER_ADD_STEP = "BUILDER_ADD_STEP";
export const BUILDER_DELETE_STEP = "BUILDER_DELETE_STEP"; export const BUILDER_DELETE_STEP = "BUILDER_DELETE_STEP";
@ -47,9 +43,7 @@ export const PROGRESS = "PROGRESS";
export const VISIT = "VISIT"; export const VISIT = "VISIT";
export const LANGUAGE = "LANGUAGE"; export const LANGUAGE = "LANGUAGE";
export const PLATFORM = "PLATFORM";
export const RENDERER = "RENDERER"; export const RENDERER = "RENDERER";
export const SOUNDS = "SOUNDS";
export const STATISTICS = "STATISTICS"; export const STATISTICS = "STATISTICS";
// messages // messages
@ -63,6 +57,3 @@ export const GET_PROJECT = "GET_PROJECT";
export const GET_PROJECTS = "GET_PROJECTS"; export const GET_PROJECTS = "GET_PROJECTS";
export const PROJECT_TYPE = "PROJECT_TYPE"; export const PROJECT_TYPE = "PROJECT_TYPE";
export const PROJECT_DESCRIPTION = "PROJECT_DESCRIPTION"; export const PROJECT_DESCRIPTION = "PROJECT_DESCRIPTION";
//board
export const BOARD = "BOARD";

8
src/actions/workspaceActions.js
View File

@ -16,19 +16,13 @@ export const onChangeCode = () => (dispatch, getState) => {
code.arduino = Blockly.Arduino.workspaceToCode(workspace); code.arduino = Blockly.Arduino.workspaceToCode(workspace);
var xmlDom = Blockly.Xml.workspaceToDom(workspace); var xmlDom = Blockly.Xml.workspaceToDom(workspace);
code.xml = Blockly.Xml.domToPrettyText(xmlDom); code.xml = Blockly.Xml.domToPrettyText(xmlDom);
var selectedBlock = Blockly.getSelected(); var selectedBlock = Blockly.selected
if (selectedBlock !== null) { if (selectedBlock !== null) {
code.helpurl = selectedBlock.helpUrl code.helpurl = selectedBlock.helpUrl
code.tooltip = selectedBlock.tooltip code.tooltip = selectedBlock.tooltip
if (selectedBlock.data) {
code.data = selectedBlock.data
} else {
code.data = null
}
} else if (selectedBlock === null) { } else if (selectedBlock === null) {
code.tooltip = Blockly.Msg.tooltip_hint code.tooltip = Blockly.Msg.tooltip_hint
code.helpurl = '' code.helpurl = ''
code.data = null
} }

31
src/components/Alert.js
View File

@ -1,29 +1,34 @@
import React, { Component } from "react"; import React, { Component } from 'react';
import withStyles from '@mui/styles/withStyles'; import { withStyles } from '@material-ui/core/styles';
import { alpha } from "@mui/material/styles"; import { fade } from '@material-ui/core/styles/colorManipulator';
import Typography from "@mui/material/Typography"; import Typography from '@material-ui/core/Typography';
const styles = (theme) => ({ const styles = (theme) => ({
alert: { alert: {
marginBottom: "20px", marginBottom: '20px',
border: `1px solid ${theme.palette.primary.main}`, border: `1px solid ${theme.palette.primary.main}`,
padding: "10px 20px", padding: '10px 20px',
borderRadius: "4px", borderRadius: '4px',
background: alpha(theme.palette.primary.main, 0.3), background: fade(theme.palette.primary.main, 0.3),
color: "rgb(70,70,70)", color: 'rgb(70,70,70)'
}, }
}); });
export class Alert extends Component { export class Alert extends Component {
render() {
return ( render(){
return(
<div className={this.props.classes.alert}> <div className={this.props.classes.alert}>
<Typography>{this.props.children}</Typography> <Typography>
{this.props.children}
</Typography>
</div> </div>
); );
} }
} }
export default withStyles(styles, { withTheme: true })(Alert); export default withStyles(styles, { withTheme: true })(Alert);

2
src/components/Blockly/BlocklyComponent.jsx
View File

@ -27,7 +27,7 @@ import Blockly from "blockly/core";
import "blockly/blocks"; import "blockly/blocks";
import Toolbox from "./toolbox/Toolbox"; import Toolbox from "./toolbox/Toolbox";
import { Card } from "@mui/material"; import { Card } from "@material-ui/core";
import { import {
ScrollOptions, ScrollOptions,
ScrollBlockDragger, ScrollBlockDragger,

25
src/components/Blockly/BlocklyWindow.js
View File

@ -11,8 +11,6 @@ import "./blocks/index";
import "./generator/index"; import "./generator/index";
import { ZoomToFitControl } from "@blockly/zoom-to-fit"; import { ZoomToFitControl } from "@blockly/zoom-to-fit";
import { initialXml } from "./initialXml.js"; import { initialXml } from "./initialXml.js";
import { getMaxInstances } from "./helpers/maxInstances";
import { Backpack } from "@blockly/workspace-backpack";
class BlocklyWindow extends Component { class BlocklyWindow extends Component {
constructor(props) { constructor(props) {
@ -26,7 +24,6 @@ class BlocklyWindow extends Component {
this.props.clearStats(); this.props.clearStats();
workspace.addChangeListener((event) => { workspace.addChangeListener((event) => {
this.props.onChangeWorkspace(event); this.props.onChangeWorkspace(event);
// switch on that a block is displayed disabled or not depending on whether it is correctly connected // switch on that a block is displayed disabled or not depending on whether it is correctly connected
// for SVG display, a deactivated block in the display is undesirable // for SVG display, a deactivated block in the display is undesirable
if (this.props.blockDisabled) { if (this.props.blockDisabled) {
@ -36,24 +33,11 @@ class BlocklyWindow extends Component {
Blockly.svgResize(workspace); Blockly.svgResize(workspace);
const zoomToFit = new ZoomToFitControl(workspace); const zoomToFit = new ZoomToFitControl(workspace);
zoomToFit.init(); zoomToFit.init();
// Initialize plugin.
const backpack = new Backpack(workspace);
backpack.init();
} }
componentDidUpdate(props) { componentDidUpdate(props) {
const workspace = Blockly.getMainWorkspace(); const workspace = Blockly.getMainWorkspace();
var xml = this.props.initialXml; var xml = this.props.initialXml;
if (props.selectedBoard !== this.props.selectedBoard) {
xml = localStorage.getItem("autoSaveXML");
// change board
if(!xml) xml = initialXml;
var xmlDom = Blockly.Xml.textToDom(xml);
Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace);
// var toolbox = workspace.getToolbox();
// workspace.updateToolbox(toolbox.toolboxDef_);
}
// if svg is true, then the update process is done in the BlocklySvg component // if svg is true, then the update process is done in the BlocklySvg component
if (props.initialXml !== xml && !this.props.svg) { if (props.initialXml !== xml && !this.props.svg) {
// guarantees that the current xml-code (this.props.initialXml) is rendered // guarantees that the current xml-code (this.props.initialXml) is rendered
@ -63,9 +47,8 @@ class BlocklyWindow extends Component {
} }
if (props.language !== this.props.language) { if (props.language !== this.props.language) {
// change language // change language
xml = localStorage.getItem("autoSaveXML");
if (!xml) xml = initialXml; if (!xml) xml = initialXml;
xmlDom = Blockly.Xml.textToDom(xml); var xmlDom = Blockly.Xml.textToDom(xml);
Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace); Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace);
// var toolbox = workspace.getToolbox(); // var toolbox = workspace.getToolbox();
// workspace.updateToolbox(toolbox.toolboxDef_); // workspace.updateToolbox(toolbox.toolboxDef_);
@ -86,8 +69,6 @@ class BlocklyWindow extends Component {
this.props.trashcan !== undefined ? this.props.trashcan : true this.props.trashcan !== undefined ? this.props.trashcan : true
} }
renderer={this.props.renderer} renderer={this.props.renderer}
sounds={this.props.sounds}
maxInstances={getMaxInstances()}
zoom={{ zoom={{
// https://developers.google.com/blockly/guides/configure/web/zoom // https://developers.google.com/blockly/guides/configure/web/zoom
controls: controls:
@ -138,16 +119,12 @@ BlocklyWindow.propTypes = {
onChangeWorkspace: PropTypes.func.isRequired, onChangeWorkspace: PropTypes.func.isRequired,
clearStats: PropTypes.func.isRequired, clearStats: PropTypes.func.isRequired,
renderer: PropTypes.string.isRequired, renderer: PropTypes.string.isRequired,
sounds: PropTypes.bool.isRequired,
language: PropTypes.string.isRequired, language: PropTypes.string.isRequired,
selectedBoard: PropTypes.string.isRequired,
}; };
const mapStateToProps = (state) => ({ const mapStateToProps = (state) => ({
renderer: state.general.renderer, renderer: state.general.renderer,
sounds: state.general.sounds,
language: state.general.language, language: state.general.language,
selectedBoard: state.board.board,
}); });
export default connect(mapStateToProps, { onChangeWorkspace, clearStats })( export default connect(mapStateToProps, { onChangeWorkspace, clearStats })(

88
src/components/Blockly/blocks/CleVerLab.js
View File

@ -1,88 +0,0 @@
import Blockly from "blockly";
import { getColour } from "../helpers/colour";
import * as Types from "../helpers/types";
import { selectedBoard } from "../helpers/board";
import { FieldGridDropdown } from "@blockly/field-grid-dropdown";
/**
* DS18B20 Temperatursonde
*
*/
Blockly.Blocks["CleVerLab_dummy1"] = {
init: function () {
this.setColour(getColour().cleverlab);
this.appendDummyInput()
.appendField("tut nichts")
this.setOutput(true, Types.NUMBER.typeName);
this.data = {name: "empty"};
},
};
Blockly.Blocks["CleVerLab_temperature"] = {
init: function () {
this.setColour(getColour().cleverlab);
this.appendDummyInput()
.appendField("Temperatur")
.appendField("Digital Port:")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPorts), "DigitalPin");
this.setOutput(true, Types.NUMBER.typeName);
this.data = {name: "ds18b20"};
},
};
/**
* PH Wert
*
*/
Blockly.Blocks["CleVerLab_pH"] = {
init: function () {
this.setColour(getColour().cleverlab);
this.appendDummyInput()
.appendField("pH Wert")
.appendField("Digital Port:")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "DigitalPin");
this.setOutput(true, Types.NUMBER.typeName);
this.data = {name: "phoderso"};
},
};
Blockly.Blocks["CleVerLab_cali1"] = {
init: function () {
this.appendDummyInput()
.appendField("Kalibriere pH Sensor");
this.appendValueInput("VAR1", "Number")
.appendField("Referenzlösung pH 4.00 =")
.setAlign(Blockly.ALIGN_RIGHT);
this.appendValueInput("VAR2", "Number2")
.appendField("Referenzlösung pH 7.00 =")
.setAlign(Blockly.ALIGN_RIGHT);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().cleverlab);
this.setOutput(true, Types.NUMBER.typeName);
this.data = {name: "dsasda"};
},
};
/**
* Pump
*
*/
Blockly.Blocks['CleVerLab_pump'] = {
init: function() {
this.setColour(getColour().cleverlab);
var dropdown = new Blockly.FieldDropdown([
[ 'START','HIGH'],
[ 'STOPP','LOW']
]);
this.appendDummyInput()
.appendField(dropdown, "Mode")
.appendField(" Pumpe ")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "DigitalPin");
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
//this.setOutput(true, "Number");
this.setTooltip('');
this.setHelpUrl('');
}
};

5
src/components/Blockly/blocks/index.js
View File

@ -6,11 +6,9 @@ import "./sensebox-telegram";
import "./sensebox-osem"; import "./sensebox-osem";
import "./sensebox-web"; import "./sensebox-web";
import "./sensebox-display"; import "./sensebox-display";
import "./sensebox-motors";
import "./sensebox-lora"; import "./sensebox-lora";
import "./sensebox-led"; import "./sensebox-led";
import "./sensebox-rtc"; import "./sensebox-rtc";
import "./sensebox-ntp";
import "./sensebox-ble"; import "./sensebox-ble";
import "./sensebox-sd"; import "./sensebox-sd";
import "./mqtt"; import "./mqtt";
@ -20,12 +18,9 @@ import "./audio";
import "./math"; import "./math";
import "./map"; import "./map";
import "./procedures"; import "./procedures";
import "./serial";
import "./time"; import "./time";
import "./variables"; import "./variables";
import "./lists"; import "./lists";
import "./watchdog";
import "./webserver"; import "./webserver";
import "./CleVerLab"
import "../helpers/types"; import "../helpers/types";

481
src/components/Blockly/blocks/io.js
View File

@ -10,271 +10,248 @@
* *
* TODO: maybe change this to a "PIN" BlocklyType * TODO: maybe change this to a "PIN" BlocklyType
*/ */
import Blockly from "blockly/core"; import Blockly from 'blockly/core';
import { selectedBoard } from "../helpers/board"; import { selectedBoard } from '../helpers/board'
import * as Types from "../helpers/types"; import * as Types from '../helpers/types'
Blockly.Blocks["io_digitalwrite"] = {
/** Blockly.Blocks['io_digitalwrite'] = {
* Block for creating a 'set pin' to a state. /**
* @this Blockly.Block * Block for creating a 'set pin' to a state.
*/ * @this Blockly.Block
init: function () { */
this.setHelpUrl("http://arduino.cc/en/Reference/DigitalWrite"); init: function () {
this.setColour(250); this.setHelpUrl('http://arduino.cc/en/Reference/DigitalWrite');
this.appendValueInput("STATE") this.setColour(250);
.appendField(Blockly.Msg.ARD_DIGITALWRITE) this.appendValueInput('STATE')
.appendField( .appendField(Blockly.Msg.ARD_DIGITALWRITE)
new Blockly.FieldDropdown(selectedBoard().digitalPins), .appendField(new Blockly.FieldDropdown(
"PIN" selectedBoard().digitalPins), 'PIN')
) .appendField(Blockly.Msg.ARD_WRITE_TO)
.appendField(Blockly.Msg.ARD_WRITE_TO) .setCheck(Types.BOOLEAN.checkList);
.setCheck(Types.BOOLEAN.checkList); this.setInputsInline(false);
this.setInputsInline(false); this.setPreviousStatement(true, null);
this.setPreviousStatement(true, null); this.setNextStatement(true, null);
this.setNextStatement(true, null); this.setTooltip(Blockly.Msg.ARD_DIGITALWRITE_TIP);
this.setTooltip(Blockly.Msg.ARD_DIGITALWRITE_TIP); },
}, /**
/** * Updates the content of the the pin related fields.
* Updates the content of the the pin related fields. * @this Blockly.Block
* @this Blockly.Block */
*/ updateFields: function () {
updateFields: function () { Blockly.Arduino.Boards.refreshBlockFieldDropdown(
Blockly.Arduino.Boards.refreshBlockFieldDropdown( this, 'PIN', 'digitalPins');
this, }
"PIN",
"digitalPins"
);
},
}; };
Blockly.Blocks["io_digitalread"] = { Blockly.Blocks['io_digitalread'] = {
/** /**
* Block for creating a 'read pin'. * Block for creating a 'read pin'.
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/DigitalRead"); this.setHelpUrl('http://arduino.cc/en/Reference/DigitalRead');
this.setColour(250); this.setColour(250);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.ARD_DIGITALREAD) .appendField(Blockly.Msg.ARD_DIGITALREAD)
.appendField( .appendField(new Blockly.FieldDropdown(
new Blockly.FieldDropdown(selectedBoard().digitalPins), selectedBoard().digitalPins), 'PIN');
"PIN" this.setOutput(true, 'boolean');
); this.setTooltip(Blockly.Msg.ARD_DIGITALREAD_TIP);
this.setOutput(true, "boolean"); },
this.setTooltip(Blockly.Msg.ARD_DIGITALREAD_TIP); /** @return {!string} The type of return value for the block, an integer. */
}, getBlockType: function () {
/** @return {!string} The type of return value for the block, an integer. */ return Types.BOOLEAN;
getBlockType: function () { },
return Types.BOOLEAN; /**
}, * Updates the content of the the pin related fields.
/** * @this Blockly.Block
* Updates the content of the the pin related fields. */
* @this Blockly.Block updateFields: function () {
*/ Blockly.Arduino.Boards.refreshBlockFieldDropdown(
updateFields: function () { this, 'PIN', 'digitalPins');
Blockly.Arduino.Boards.refreshBlockFieldDropdown( }
this,
"PIN",
"digitalPins"
);
},
}; };
Blockly.Blocks["io_builtin_led"] = { Blockly.Blocks['io_builtin_led'] = {
/** /**
* Block for setting built-in LED to a state. * Block for setting built-in LED to a state.
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/DigitalWrite"); this.setHelpUrl('http://arduino.cc/en/Reference/DigitalWrite');
this.setColour(250); this.setColour(250);
this.appendValueInput("STATE") this.appendValueInput('STATE')
.appendField(Blockly.Msg.ARD_BUILTIN_LED) .appendField(Blockly.Msg.ARD_BUILTIN_LED)
.appendField( .appendField(new Blockly.FieldDropdown(
new Blockly.FieldDropdown(selectedBoard().builtinLed), selectedBoard().builtinLed), 'BUILT_IN_LED')
"BUILT_IN_LED" .appendField(Blockly.Msg.ARD_WRITE_TO)
) .setCheck(Types.BOOLEAN.compatibleTypes);
.appendField(Blockly.Msg.ARD_WRITE_TO) this.setInputsInline(false);
.setCheck(Types.BOOLEAN.compatibleTypes); this.setPreviousStatement(true, null);
this.setInputsInline(false); this.setNextStatement(true, null);
this.setPreviousStatement(true, null); this.setTooltip(Blockly.Msg.ARD_BUILTIN_LED_TIP);
this.setNextStatement(true, null); },
this.setTooltip(Blockly.Msg.ARD_BUILTIN_LED_TIP); /**
}, * Updates the content of the the pin related fields.
/** * @this Blockly.Block
* Updates the content of the the pin related fields. */
* @this Blockly.Block updateFields: function () {
*/ Blockly.Arduino.Boards.refreshBlockFieldDropdown(
updateFields: function () { this, 'BUILT_IN_LED', 'builtinLed');
Blockly.Arduino.Boards.refreshBlockFieldDropdown( },
this, /** @return {!string} The type of input value for the block, an integer. */
"BUILT_IN_LED", getBlockType: function () {
"builtinLed" return Types.BOOLEAN;
); },
},
/** @return {!string} The type of input value for the block, an integer. */
getBlockType: function () {
return Types.BOOLEAN;
},
}; };
Blockly.Blocks["io_analogwrite"] = { Blockly.Blocks['io_analogwrite'] = {
/** /**
* Block for creating a 'set pin' to an analogue value. * Block for creating a 'set pin' to an analogue value.
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/AnalogWrite"); this.setHelpUrl('http://arduino.cc/en/Reference/AnalogWrite');
this.setColour(250); this.setColour(250);
this.appendValueInput("NUM") this.appendValueInput('NUM')
.appendField(Blockly.Msg.ARD_ANALOGWRITE) .appendField(Blockly.Msg.ARD_ANALOGWRITE)
.appendField(new Blockly.FieldDropdown(selectedBoard().pwmPins), "PIN") .appendField(new Blockly.FieldDropdown(
.appendField(Blockly.Msg.ARD_WRITE_TO) selectedBoard().pwmPins), 'PIN')
.setCheck(Types.NUMBER.compatibleTypes); .appendField(Blockly.Msg.ARD_WRITE_TO)
this.setInputsInline(false); .setCheck(Types.NUMBER.compatibleTypes);
this.setPreviousStatement(true, null); this.setInputsInline(false);
this.setNextStatement(true, null); this.setPreviousStatement(true, null);
this.setTooltip(Blockly.Msg.ARD_ANALOGWRITE_TIP); this.setNextStatement(true, null);
}, this.setTooltip(Blockly.Msg.ARD_ANALOGWRITE_TIP);
/** },
* Updates the content of the the pin related fields. /**
* @this Blockly.Block * Updates the content of the the pin related fields.
*/ * @this Blockly.Block
updateFields: function () { */
Blockly.Arduino.Boards.refreshBlockFieldDropdown(this, "PIN", "pwmPins"); updateFields: function () {
}, Blockly.Arduino.Boards.refreshBlockFieldDropdown(this, 'PIN', 'pwmPins');
/** @return {!string} The type of input value for the block, an integer. */ },
getBlockType: function () { /** @return {!string} The type of input value for the block, an integer. */
return Types.NUMBER; getBlockType: function () {
}, return Types.NUMBER;
},
}; };
Blockly.Blocks["io_analogread"] = { Blockly.Blocks['io_analogread'] = {
/** /**
* Block for reading an analogue input. * Block for reading an analogue input.
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/AnalogRead"); this.setHelpUrl('http://arduino.cc/en/Reference/AnalogRead');
this.setColour(250); this.setColour(250);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.ARD_ANALOGREAD) .appendField(Blockly.Msg.ARD_ANALOGREAD)
.appendField( .appendField(new Blockly.FieldDropdown(
new Blockly.FieldDropdown(selectedBoard().analogPins), selectedBoard().analogPins), 'PIN');
"PIN" this.setOutput(true, Types.NUMBER.typeId);
); this.setTooltip(Blockly.Msg.ARD_ANALOGREAD_TIP);
this.setOutput(true, Types.NUMBER.typeName); },
this.setTooltip(Blockly.Msg.ARD_ANALOGREAD_TIP); /** @return {!string} The type of return value for the block, an integer. */
}, getBlockType: function () {
/** @return {!string} The type of return value for the block, an integer. */ return Types.NUMBER.typeId;
getBlockType: function () { },
return Types.NUMBER.typeName; /**
}, * Updates the content of the the pin related fields.
/** * @this Blockly.Block
* Updates the content of the the pin related fields. */
* @this Blockly.Block updateFields: function () {
*/ Blockly.Arduino.Boards.refreshBlockFieldDropdown(this, 'PIN', 'analogPins');
updateFields: function () { }
Blockly.Arduino.Boards.refreshBlockFieldDropdown(this, "PIN", "analogPins");
},
}; };
Blockly.Blocks["io_highlow"] = { Blockly.Blocks['io_highlow'] = {
/** /**
* Block for creating a pin state. * Block for creating a pin state.
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/Constants"); this.setHelpUrl('http://arduino.cc/en/Reference/Constants');
this.setColour(250); this.setColour(250);
this.appendDummyInput().appendField( this.appendDummyInput()
new Blockly.FieldDropdown([ .appendField(
[Blockly.Msg.ARD_HIGH, "HIGH"], new Blockly.FieldDropdown([[Blockly.Msg.ARD_HIGH, 'HIGH'], [Blockly.Msg.ARD_LOW, 'LOW']]),
[Blockly.Msg.ARD_LOW, "LOW"], 'STATE');
]), this.setOutput(true, Types.BOOLEAN.typeId);
"STATE" this.setTooltip(Blockly.Msg.ARD_HIGHLOW_TIP);
); },
this.setOutput(true, Types.BOOLEAN.typeName); /** @return {!string} The type of return value for the block, an integer. */
this.setTooltip(Blockly.Msg.ARD_HIGHLOW_TIP); getBlockType: function () {
}, return Types.BOOLEAN;
/** @return {!string} The type of return value for the block, an integer. */ }
getBlockType: function () {
return Types.BOOLEAN;
},
}; };
Blockly.Blocks["io_pulsein"] = { Blockly.Blocks['io_pulsein'] = {
/** /**
* Block for measuring the duration of a pulse in an input pin. * Block for measuring the duration of a pulse in an input pin.
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.jsonInit({ this.jsonInit({
type: "math_foo", "type": "math_foo",
message0: Blockly.Msg.ARD_PULSE_READ, "message0": Blockly.Msg.ARD_PULSE_READ,
args0: [ "args0": [{
{ "type": "input_value",
type: "input_value", "name": "PULSETYPE",
name: "PULSETYPE", "check": Types.BOOLEAN.compatibleTypes
check: Types.BOOLEAN.compatibleTypes, }, {
}, "type": "field_dropdown",
{ "name": "PULSEPIN",
type: "field_dropdown", "options": selectedBoard().digitalPins,
name: "PULSEPIN", }
options: selectedBoard().digitalPins, ],
}, "output": Types.NUMBER.typeId,
], "inputsInline": true,
output: Types.NUMBER.typeName, "colour": 250,
inputsInline: true, "tooltip": Blockly.Msg.ARD_PULSE_TIP,
colour: 250, "helpUrl": 'https://www.arduino.cc/en/Reference/PulseIn'
tooltip: Blockly.Msg.ARD_PULSE_TIP, });
helpUrl: "https://www.arduino.cc/en/Reference/PulseIn", },
}); /** @return {!string} The type of input value for the block, an integer. */
}, getBlockType: function () {
/** @return {!string} The type of input value for the block, an integer. */ return Types.NUMBER.typeId;
getBlockType: function () { }
return Types.NUMBER.typeName;
},
}; };
Blockly.Blocks["io_pulsetimeout"] = { Blockly.Blocks['io_pulsetimeout'] = {
/** /**
* Block for measuring (with a time-out) the duration of a pulse in an input * Block for measuring (with a time-out) the duration of a pulse in an input
* pin. * pin.
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.jsonInit({ this.jsonInit({
type: "math_foo", "type": "math_foo",
message0: Blockly.Msg.ARD_PULSE_READ_TIMEOUT, "message0": Blockly.Msg.ARD_PULSE_READ_TIMEOUT,
args0: [ "args0": [{
{ "type": "input_value",
type: "input_value", "name": "PULSETYPE",
name: "PULSETYPE", "check": Types.BOOLEAN.compatibleTypes
check: Types.BOOLEAN.compatibleTypes, }, {
}, "type": "field_dropdown",
{ "name": "PULSEPIN",
type: "field_dropdown", "options": selectedBoard().digitalPins,
name: "PULSEPIN", }, {
options: selectedBoard().digitalPins, "type": "input_value",
}, "name": "TIMEOUT",
{ "check": Types.NUMBER.compatibleTypes
type: "input_value", }
name: "TIMEOUT", ],
check: Types.NUMBER.compatibleTypes, "output": Types.NUMBER.typeId,
}, "inputsInline": true,
], "colour": 250,
output: Types.NUMBER.typeName, "tooltip": Blockly.Msg.ARD_PULSETIMEOUT_TIP,
inputsInline: true, "helpUrl": 'https://www.arduino.cc/en/Reference/PulseIn'
colour: 250, });
tooltip: Blockly.Msg.ARD_PULSETIMEOUT_TIP, },
helpUrl: "https://www.arduino.cc/en/Reference/PulseIn", /** @return {!string} The type of input value for the block, an integer. */
}); getBlockType: function () {
}, return Types.NUMBER.typeId;
/** @return {!string} The type of input value for the block, an integer. */ }
getBlockType: function () {
return Types.NUMBER.typeName;
},
}; };

103
src/components/Blockly/blocks/lists.js
View File

@ -1,54 +1,59 @@
import Blockly, { FieldDropdown } from "blockly/core"; import Blockly, { FieldDropdown } from 'blockly/core'
import * as Types from "../helpers/types"; import * as Types from '../helpers/types'
import { getColour } from "../helpers/colour"; import { getColour } from '../helpers/colour';
Blockly.Blocks["lists_create_empty"] = { Blockly.Blocks['lists_create_empty'] = {
/** /**
* Elapsed time in milliseconds block definition * Elapsed time in milliseconds block definition
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/Millis"); this.setHelpUrl('http://arduino.cc/en/Reference/Millis');
this.setColour(getColour().arrays); this.setColour(getColour().arrays);
this.appendDummyInput().appendField("create List with"); this.appendDummyInput()
this.appendValueInput("NUMBER"); .appendField("create List with")
this.appendDummyInput() this.appendValueInput('NUMBER');
.appendField("Items of Type") this.appendDummyInput()
.appendField(new FieldDropdown(Types.VARIABLE_TYPES), "type"); .appendField("Items of Type")
this.setOutput(true, Types.ARRAY.typeName); .appendField(new FieldDropdown(Types.VARIABLE_TYPES), 'type');
this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP); this.setOutput(true, Types.ARRAY.typeId);
}, this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP);
},
}; };
Blockly.Blocks["array_getIndex"] = {
/** Blockly.Blocks['array_getIndex'] = {
* Elapsed time in milliseconds block definition /**
* @this Blockly.Block * Elapsed time in milliseconds block definition
*/ * @this Blockly.Block
init: function () { */
this.setHelpUrl("http://arduino.cc/en/Reference/Millis"); init: function () {
this.setColour(getColour().arrays); this.setHelpUrl('http://arduino.cc/en/Reference/Millis');
this.appendDummyInput().appendField( this.setColour(getColour().arrays);
new Blockly.FieldVariable("X", null, ["Array"], "Array"), this.appendDummyInput()
"FIELDNAME" .appendField(new Blockly.FieldVariable(
); 'X',
this.setOutput(true, Types.ARRAY.typeName); null,
this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP); ['Array'],
}, 'Array'
), 'FIELDNAME');
this.setOutput(true, Types.ARRAY.typeId);
this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP);
},
}; };
Blockly.Blocks["lists_length"] = { Blockly.Blocks['lists_length'] = {
/** /**
* Elapsed time in milliseconds block definition * Elapsed time in milliseconds block definition
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/Millis"); this.setHelpUrl('http://arduino.cc/en/Reference/Millis');
this.setColour(getColour().arrays); this.setColour(getColour().arrays);
this.appendValueInput("ARRAY") this.appendValueInput('ARRAY')
.appendField("length of") .appendField('length of')
.setCheck(Types.ARRAY.compatibleTypes); .setCheck(Types.ARRAY.compatibleTypes);
this.setOutput(true, Types.NUMBER.typeName); this.setOutput(true, Types.NUMBER.typeName);
this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP); this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP);
}, },
}; };

1239
src/components/Blockly/blocks/logic.js
View File

File diff suppressed because it is too large Load Diff

69
src/components/Blockly/blocks/map.js
View File

@ -11,39 +11,40 @@
* TODO: This block can be improved to set the new range properly. * TODO: This block can be improved to set the new range properly.
*/ */
import * as Blockly from "blockly/core";
import { getColour } from "../helpers/colour";
import * as Types from "../helpers/types";
Blockly.Blocks["base_map"] = { import * as Blockly from 'blockly/core';
/** import { getColour } from '../helpers/colour';
* Block for creating a the map function. import * as Types from '../helpers/types'
* @this Blockly.Block
*/ Blockly.Blocks['base_map'] = {
init: function () { /**
this.setHelpUrl("http://arduino.cc/en/Reference/map"); * Block for creating a the map function.
this.setColour(getColour().math); * @this Blockly.Block
this.appendValueInput("NUM") */
.appendField(Blockly.Msg.ARD_MAP) init: function () {
.setCheck(Types.NUMBER.compatibleTypes); this.setHelpUrl('http://arduino.cc/en/Reference/map');
this.appendValueInput("FMIN") this.setColour(getColour().math);
.appendField(Blockly.Msg.ARD_MAP_FROMMIN) this.appendValueInput('NUM')
.setCheck(Types.NUMBER.compatibleTypes); .appendField(Blockly.Msg.ARD_MAP)
this.appendValueInput("FMAX") .setCheck(Types.NUMBER.compatibleTypes);
.appendField(Blockly.Msg.ARD_MAP_FROMMAX) this.appendValueInput('FMIN')
.setCheck(Types.NUMBER.compatibleTypes); .appendField(Blockly.Msg.ARD_MAP_FROMMIN)
this.appendValueInput("DMIN") .setCheck(Types.NUMBER.compatibleTypes);
.appendField(Blockly.Msg.ARD_MAP_TOMIN) this.appendValueInput('FMAX')
.setCheck(Types.NUMBER.compatibleTypes); .appendField(Blockly.Msg.ARD_MAP_FROMMAX)
this.appendValueInput("DMAX") .setCheck(Types.NUMBER.compatibleTypes);
.appendField(Blockly.Msg.ARD_MAP_TOMAX) this.appendValueInput('DMIN')
.setCheck(Types.NUMBER.compatibleTypes); .appendField(Blockly.Msg.ARD_MAP_TOMIN)
this.setOutput(true); .setCheck(Types.NUMBER.compatibleTypes);
this.setInputsInline(false); this.appendValueInput('DMAX')
this.setTooltip(Blockly.Msg.ARD_MAP_TIP); .appendField(Blockly.Msg.ARD_MAP_TOMAX)
}, .setCheck(Types.NUMBER.compatibleTypes);
/** @return {string} The type of return value for the block, an integer. */ this.setOutput(true);
getBlockType: function () { this.setInputsInline(false);
return Types.NUMBER.typeName; this.setTooltip(Blockly.Msg.ARD_MAP_TIP);
}, },
/** @return {string} The type of return value for the block, an integer. */
getBlockType: function () {
return Types.NUMBER.typeId;
}
}; };

9
src/components/Blockly/blocks/sensebox-ble.js
View File

@ -4,7 +4,6 @@ import { getColour } from "../helpers/colour";
Blockly.Blocks["sensebox_phyphox_init"] = { Blockly.Blocks["sensebox_phyphox_init"] = {
init: function () { init: function () {
this.setColour(getColour().phyphox); this.setColour(getColour().phyphox);
this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_phyphox_init) .appendField(Blockly.Msg.sensebox_phyphox_init)
.appendField(new Blockly.FieldTextInput("Geräte Name"), "devicename"); .appendField(new Blockly.FieldTextInput("Geräte Name"), "devicename");
@ -38,7 +37,6 @@ Blockly.Blocks["sensebox_phyphox_experiment"] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_tooltip); this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
}, },
}; };
@ -65,8 +63,8 @@ Blockly.Blocks["sensebox_phyphox_graph"] = {
.appendField(Blockly.Msg.sensebox_phyphox_graphStyle) .appendField(Blockly.Msg.sensebox_phyphox_graphStyle)
.appendField( .appendField(
new Blockly.FieldDropdown([ new Blockly.FieldDropdown([
[Blockly.Msg.sensebox_phyphox_style_line, "line"],
[Blockly.Msg.sensebox_phyphox_style_dots, "dots"], [Blockly.Msg.sensebox_phyphox_style_dots, "dots"],
[Blockly.Msg.sensebox_phyphox_style_line, "line"],
]), ]),
"style" "style"
); );
@ -79,7 +77,6 @@ Blockly.Blocks["sensebox_phyphox_graph"] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.sensebox_phyphox_graph_tooltip); this.setTooltip(Blockly.Msg.sensebox_phyphox_graph_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
}, },
}; };
@ -89,7 +86,6 @@ Blockly.Blocks["sensebox_phyphox_timestamp"] = {
this.appendDummyInput().appendField(Blockly.Msg.sensebox_phyphox_timestamp); this.appendDummyInput().appendField(Blockly.Msg.sensebox_phyphox_timestamp);
this.setOutput(true); this.setOutput(true);
this.setTooltip(Blockly.Msg.sensebox_phyphox_timestamp_tooltip); this.setTooltip(Blockly.Msg.sensebox_phyphox_timestamp_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
}, },
}; };
@ -111,7 +107,6 @@ Blockly.Blocks["sensebox_phyphox_channel"] = {
this.setOutput(true); this.setOutput(true);
this.setTooltip(Blockly.Msg.sensebox_phyphox_channel_tooltip); this.setTooltip(Blockly.Msg.sensebox_phyphox_channel_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
}, },
}; };
@ -134,7 +129,6 @@ Blockly.Blocks["sensebox_phyphox_sendchannel"] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.sensebox_phyphox_sendchannel_tooltip); this.setTooltip(Blockly.Msg.sensebox_phyphox_sendchannel_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
}, },
}; };
@ -147,6 +141,5 @@ Blockly.Blocks["sensebox_phyphox_experiment_send"] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_send_tooltip); this.setTooltip(Blockly.Msg.sensebox_phyphox_experiment_send_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_phyphox_helpurl);
}, },
}; };

583
src/components/Blockly/blocks/sensebox-display.js
View File

@ -1,329 +1,304 @@
import * as Blockly from "blockly/core"; import * as Blockly from 'blockly/core';
import { getColour } from "../helpers/colour"; import { getColour } from '../helpers/colour';
import * as Types from "../helpers/types"; import * as Types from '../helpers/types'
import { FieldSlider } from "@blockly/field-slider"; import { FieldSlider } from '@blockly/field-slider';
Blockly.Blocks["sensebox_display_beginDisplay"] = {
init: function () { Blockly.Blocks['sensebox_display_beginDisplay'] = {
this.appendDummyInput().appendField( init: function () {
Blockly.Msg.senseBox_display_beginDisplay this.appendDummyInput()
); .appendField(Blockly.Msg.senseBox_display_beginDisplay)
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_display_beginDisplay_tooltip); this.setTooltip(Blockly.Msg.senseBox_display_beginDisplay_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
}, }
}; };
Blockly.Blocks["sensebox_display_clearDisplay"] = { Blockly.Blocks['sensebox_display_clearDisplay'] = {
init: function () { init: function () {
this.appendDummyInput().appendField( this.appendDummyInput()
Blockly.Msg.senseBox_display_clearDisplay .appendField(Blockly.Msg.senseBox_display_clearDisplay)
); this.setPreviousStatement(true, null);
this.setPreviousStatement(true, null); this.setNextStatement(true, null);
this.setNextStatement(true, null); this.setColour(getColour().sensebox);
this.setColour(getColour().sensebox); this.setTooltip(Blockly.Msg.senseBox_display_clearDisplay_tooltip);
this.setTooltip(Blockly.Msg.senseBox_display_clearDisplay_tooltip); this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl); }
},
}; };
Blockly.Blocks["sensebox_display_printDisplay"] = { Blockly.Blocks['sensebox_display_printDisplay'] = {
init: function (block) { init: function (block) {
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput().appendField( this.appendDummyInput()
Blockly.Msg.senseBox_display_printDisplay .appendField(Blockly.Msg.senseBox_display_printDisplay);
); this.appendDummyInput()
this.appendDummyInput() .appendField(Blockly.Msg.senseBox_display_color)
.appendField(Blockly.Msg.senseBox_display_color) .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_display_white, "WHITE,BLACK"], [Blockly.Msg.senseBox_display_black, "BLACK,WHITE"]]), "COLOR");
.appendField( this.appendDummyInput()
new Blockly.FieldDropdown([ .appendField(Blockly.Msg.senseBox_display_setSize)
[Blockly.Msg.senseBox_display_white, "WHITE,BLACK"], .appendField(new FieldSlider(1, 1, 4), "SIZE");
[Blockly.Msg.senseBox_display_black, "BLACK,WHITE"], this.appendDummyInput()
]), .appendField(Blockly.Msg.senseBox_display_printDisplay_x)
"COLOR" .appendField(new FieldSlider(0, 0, 64), "X");
); this.appendDummyInput()
this.appendDummyInput() .appendField(Blockly.Msg.senseBox_display_printDisplay_y)
.appendField(Blockly.Msg.senseBox_display_setSize) .appendField(new FieldSlider(0, 0, 128), "Y");
.appendField(new FieldSlider(1, 1, 4), "SIZE"); this.appendValueInput('printDisplay')
this.appendDummyInput() .appendField(Blockly.Msg.senseBox_display_printDisplay_value)
.appendField(Blockly.Msg.senseBox_display_printDisplay_x) .setCheck(null);
.appendField(new FieldSlider(0, 0, 127), "X"); this.setPreviousStatement(true, null);
this.appendDummyInput() this.setNextStatement(true, null);
.appendField(Blockly.Msg.senseBox_display_printDisplay_y) this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tooltip);
.appendField(new FieldSlider(0, 0, 63), "Y"); this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
this.appendValueInput("printDisplay") },
.appendField(Blockly.Msg.senseBox_display_printDisplay_value) /**
.setCheck(null); * Called whenever anything on the workspace changes.
this.setPreviousStatement(true, null); * Add warning if block is not nested inside a the correct loop.
this.setNextStatement(true, null); * @param {!Blockly.Events.Abstract} e Change event.
this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tooltip); * @this Blockly.Block
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl); */
}, onchange: function (e) {
/** var legal = false;
// Is the block nested in a loop?
var block = this;
do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true;
break;
}
block = block.getSurroundParent();
} while (block);
if (legal) {
this.setWarningText(null);
} else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
}
},
LOOP_TYPES: ['sensebox_display_show'],
};
Blockly.Blocks['sensebox_display_fastPrint'] = {
init: function (block) {
this.setColour(getColour().sensebox);
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_display_fastPrint_show);
this.appendValueInput("Title1", 'Title1')
.appendField(Blockly.Msg.senseBox_display_fastPrint_title);
this.appendValueInput("Value1", 'Value1')
.appendField(Blockly.Msg.senseBox_display_fastPrint_value);
this.appendValueInput("Dimension1", 'Dimension1')
.appendField(Blockly.Msg.senseBox_display_fastPrint_dimension);
this.appendValueInput("Title2", 'Title2')
.appendField(Blockly.Msg.senseBox_display_fastPrint_title);
this.appendValueInput("Value2", 'Value2')
.appendField(Blockly.Msg.senseBox_display_fastPrint_value);
this.appendValueInput("Dimension2", 'Dimension2')
.appendField(Blockly.Msg.senseBox_display_fastPrint_dimension);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.sensebox_display_fastPrint_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
},
/**
* Called whenever anything on the workspace changes. * Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop. * Add warning if block is not nested inside a the correct loop.
* @param {!Blockly.Events.Abstract} e Change event. * @param {!Blockly.Events.Abstract} e Change event.
* @this Blockly.Block * @this Blockly.Block
*/ */
onchange: function (e) { onchange: function (e) {
var legal = false; var legal = false;
// Is the block nested in a loop? // Is the block nested in a loop?
var block = this; var block = this;
do { do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) { if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true; legal = true;
break; break;
} }
block = block.getSurroundParent(); block = block.getSurroundParent();
} while (block); } while (block);
if (legal) { if (legal) {
this.setWarningText(null); this.setWarningText(null);
} else { } else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING); this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
} }
}, },
LOOP_TYPES: ["sensebox_display_show"], LOOP_TYPES: ['sensebox_display_show'],
}; };
Blockly.Blocks["sensebox_display_fastPrint"] = {
init: function (block) { Blockly.Blocks['sensebox_display_plotDisplay'] = {
this.setColour(getColour().sensebox); init: function () {
this.appendDummyInput().appendField( this.setColour(getColour().sensebox);
Blockly.Msg.senseBox_display_fastPrint_show this.appendDummyInput()
); .appendField(Blockly.Msg.senseBox_display_plotDisplay)
this.appendValueInput("Title1", "Title1").appendField( this.appendValueInput("Title", 'Text')
Blockly.Msg.senseBox_display_fastPrint_title .appendField(Blockly.Msg.senseBox_display_plotTitle);
); this.appendValueInput("YLabel", 'Text')
this.appendValueInput("Value1", "Value1").appendField( .appendField(Blockly.Msg.senseBox_display_plotYLabel);
Blockly.Msg.senseBox_display_fastPrint_value this.appendValueInput("XLabel", 'Text')
); .appendField(Blockly.Msg.senseBox_display_plotXLabel);
this.appendValueInput("Dimension1", "Dimension1").appendField( this.appendValueInput("XRange1", 'Number')
Blockly.Msg.senseBox_display_fastPrint_dimension .appendField(Blockly.Msg.senseBox_display_plotXRange1);
); this.appendValueInput("XRange2", 'Number')
this.appendValueInput("Title2", "Title2").appendField( .appendField(Blockly.Msg.senseBox_display_plotXRange2)
Blockly.Msg.senseBox_display_fastPrint_title this.appendValueInput("YRange1", 'Number')
); .appendField(Blockly.Msg.senseBox_display_plotYRange1);
this.appendValueInput("Value2", "Value2").appendField( this.appendValueInput("YRange2", 'Number')
Blockly.Msg.senseBox_display_fastPrint_value .appendField(Blockly.Msg.senseBox_display_plotYRange2);
); this.setInputsInline(false);
this.appendValueInput("Dimension2", "Dimension2").appendField( this.appendValueInput("XTick", 'Number')
Blockly.Msg.senseBox_display_fastPrint_dimension .appendField(Blockly.Msg.senseBox_display_plotXTick);
); this.appendValueInput("YTick", 'Number')
this.setPreviousStatement(true, null); .appendField(Blockly.Msg.senseBox_display_plotYTick);
this.setNextStatement(true, null); this.appendValueInput("TimeFrame", 'Number')
this.setTooltip(Blockly.Msg.sensebox_display_fastPrint_tooltip); .appendField(Blockly.Msg.senseBox_display_plotTimeFrame);
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl); this.appendValueInput('plotDisplay')
}, .appendField(Blockly.Msg.senseBox_display_printDisplay_value)
/** .setCheck(null);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
},
/**
* Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop.
* @param {!Blockly.Events.Abstract} e Change event.
* @this Blockly.Block
*/
onchange: function (e) {
var legal = false;
// Is the block nested in a loop?
var block = this;
do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true;
break;
}
block = block.getSurroundParent();
} while (block);
if (legal) {
this.setWarningText(null);
} else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
}
},
LOOP_TYPES: ['sensebox_display_show'],
};
Blockly.Blocks['sensebox_display_show'] = {
init: function () {
this.setColour(getColour().sensebox);
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_display_show);
this.appendStatementInput('SHOW');
this.setTooltip(Blockly.Msg.sensebox_display_show_tip);
this.setHelpUrl('');
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
}
};
Blockly.Blocks['sensebox_display_fillCircle'] = {
init: function () {
this.setColour(getColour().sensebox);
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_display_fillCircle);
this.appendValueInput('X')
.appendField(Blockly.Msg.senseBox_display_printDisplay_x)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendValueInput('Y')
.appendField(Blockly.Msg.senseBox_display_printDisplay_y)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendValueInput('Radius')
.appendField(Blockly.Msg.sensebox_display_fillCircle_radius)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendDummyInput('fill')
.appendField(Blockly.Msg.senseBox_display_filled)
.appendField(new Blockly.FieldCheckbox("TRUE"), "FILL");
this.setInputsInline(false);
this.setTooltip(Blockly.Msg.senseBox_display_fillCircle_tooltip)
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl)
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
},
/**
* Called whenever anything on the workspace changes. * Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop. * Add warning if block is not nested inside a the correct loop.
* @param {!Blockly.Events.Abstract} e Change event. * @param {!Blockly.Events.Abstract} e Change event.
* @this Blockly.Block * @this Blockly.Block
*/ */
onchange: function (e) { onchange: function (e) {
var legal = false; var legal = false;
// Is the block nested in a loop? // Is the block nested in a loop?
var block = this; var block = this;
do { do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) { if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true; legal = true;
break; break;
} }
block = block.getSurroundParent(); block = block.getSurroundParent();
} while (block); } while (block);
if (legal) { if (legal) {
this.setWarningText(null); this.setWarningText(null);
} else { } else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING); this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
} }
}, },
LOOP_TYPES: ["sensebox_display_show"], LOOP_TYPES: ['sensebox_display_show'],
}; };
Blockly.Blocks["sensebox_display_plotDisplay"] = { Blockly.Blocks['sensebox_display_drawRectangle'] = {
init: function () { init: function () {
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput().appendField( this.appendDummyInput()
Blockly.Msg.senseBox_display_plotDisplay .appendField(Blockly.Msg.sensebox_display_drawRectangle);
); this.appendValueInput('X')
this.appendValueInput("Title", "Text").appendField( .appendField(Blockly.Msg.senseBox_display_printDisplay_x)
Blockly.Msg.senseBox_display_plotTitle .setCheck(Types.NUMBER.compatibleTypes);
); this.appendValueInput('Y')
this.appendValueInput("YLabel", "Text").appendField( .appendField(Blockly.Msg.senseBox_display_printDisplay_y)
Blockly.Msg.senseBox_display_plotYLabel .setCheck(Types.NUMBER.compatibleTypes);
); this.appendValueInput('width')
this.appendValueInput("XLabel", "Text").appendField( .appendField(Blockly.Msg.sensebox_display_drawRectangle_width)
Blockly.Msg.senseBox_display_plotXLabel .setCheck(Types.NUMBER.compatibleTypes);
); this.appendValueInput('height')
this.appendValueInput("XRange1", "Number").appendField( .appendField(Blockly.Msg.sensebox_display_drawRectangle_height)
Blockly.Msg.senseBox_display_plotXRange1 .setCheck(Types.NUMBER.compatibleTypes);
); this.appendDummyInput('fill')
this.appendValueInput("XRange2", "Number").appendField( .appendField(Blockly.Msg.senseBox_display_filled)
Blockly.Msg.senseBox_display_plotXRange2 .appendField(new Blockly.FieldCheckbox("TRUE"), "FILL");
); this.setInputsInline(false);
this.appendValueInput("YRange1", "Number").appendField( this.setTooltip(Blockly.Msg.senseBox_display_drawRectangle_tooltip)
Blockly.Msg.senseBox_display_plotYRange1 this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl)
); this.setPreviousStatement(true, null);
this.appendValueInput("YRange2", "Number").appendField( this.setNextStatement(true, null);
Blockly.Msg.senseBox_display_plotYRange2 },
); /**
this.setInputsInline(false);
this.appendValueInput("XTick", "Number").appendField(
Blockly.Msg.senseBox_display_plotXTick
);
this.appendValueInput("YTick", "Number").appendField(
Blockly.Msg.senseBox_display_plotYTick
);
this.appendValueInput("TimeFrame", "Number").appendField(
Blockly.Msg.senseBox_display_plotTimeFrame
);
this.appendValueInput("plotDisplay")
.appendField(Blockly.Msg.senseBox_display_printDisplay_value)
.setCheck(null);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
},
/**
* Called whenever anything on the workspace changes. * Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop. * Add warning if block is not nested inside a the correct loop.
* @param {!Blockly.Events.Abstract} e Change event. * @param {!Blockly.Events.Abstract} e Change event.
* @this Blockly.Block * @this Blockly.Block
*/ */
onchange: function (e) { onchange: function (e) {
var legal = false; var legal = false;
// Is the block nested in a loop? // Is the block nested in a loop?
var block = this; var block = this;
do { do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) { if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true; legal = true;
break; break;
} }
block = block.getSurroundParent(); block = block.getSurroundParent();
} while (block); } while (block);
if (legal) { if (legal) {
this.setWarningText(null); this.setWarningText(null);
} else { } else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING); this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
} }
}, },
LOOP_TYPES: ["sensebox_display_show"], LOOP_TYPES: ['sensebox_display_show'],
};
Blockly.Blocks["sensebox_display_show"] = {
init: function () {
this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(Blockly.Msg.sensebox_display_show);
this.appendStatementInput("SHOW");
this.setTooltip(Blockly.Msg.sensebox_display_show_tip);
this.setHelpUrl("");
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
},
};
Blockly.Blocks["sensebox_display_fillCircle"] = {
init: function () {
this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(
Blockly.Msg.sensebox_display_fillCircle
);
this.appendValueInput("X")
.appendField(Blockly.Msg.senseBox_display_printDisplay_x)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendValueInput("Y")
.appendField(Blockly.Msg.senseBox_display_printDisplay_y)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendValueInput("Radius")
.appendField(Blockly.Msg.sensebox_display_fillCircle_radius)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendDummyInput("fill")
.appendField(Blockly.Msg.senseBox_display_filled)
.appendField(new Blockly.FieldCheckbox("TRUE"), "FILL");
this.setInputsInline(false);
this.setTooltip(Blockly.Msg.senseBox_display_fillCircle_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
},
/**
* Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop.
* @param {!Blockly.Events.Abstract} e Change event.
* @this Blockly.Block
*/
onchange: function (e) {
var legal = false;
// Is the block nested in a loop?
var block = this;
do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true;
break;
}
block = block.getSurroundParent();
} while (block);
if (legal) {
this.setWarningText(null);
} else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
}
},
LOOP_TYPES: ["sensebox_display_show"],
};
Blockly.Blocks["sensebox_display_drawRectangle"] = {
init: function () {
this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(
Blockly.Msg.sensebox_display_drawRectangle
);
this.appendValueInput("X")
.appendField(Blockly.Msg.senseBox_display_printDisplay_x)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendValueInput("Y")
.appendField(Blockly.Msg.senseBox_display_printDisplay_y)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendValueInput("width")
.appendField(Blockly.Msg.sensebox_display_drawRectangle_width)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendValueInput("height")
.appendField(Blockly.Msg.sensebox_display_drawRectangle_height)
.setCheck(Types.NUMBER.compatibleTypes);
this.appendDummyInput("fill")
.appendField(Blockly.Msg.senseBox_display_filled)
.appendField(new Blockly.FieldCheckbox("TRUE"), "FILL");
this.setInputsInline(false);
this.setTooltip(Blockly.Msg.senseBox_display_drawRectangle_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_display_helpurl);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
},
/**
* Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop.
* @param {!Blockly.Events.Abstract} e Change event.
* @this Blockly.Block
*/
onchange: function (e) {
var legal = false;
// Is the block nested in a loop?
var block = this;
do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true;
break;
}
block = block.getSurroundParent();
} while (block);
if (legal) {
this.setWarningText(null);
} else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
}
},
LOOP_TYPES: ["sensebox_display_show"],
}; };

12
src/components/Blockly/blocks/sensebox-led.js
View File

@ -45,11 +45,15 @@ Blockly.Blocks['sensebox_rgb_led'] = {
Blockly.Blocks['sensebox_ws2818_led_init'] = { Blockly.Blocks['sensebox_ws2818_led_init'] = {
init: function () { init: function () {
var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, '1'],
[Blockly.Msg.senseBox_ultrasonic_port_B, '3'], [Blockly.Msg.senseBox_ultrasonic_port_C, '5']];
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_ws2818_rgb_led_init) .appendField(Blockly.Msg.senseBox_ws2818_rgb_led_init)
.appendField("Port:") .appendField("Port:")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPinsRGB), "Port") .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
this.appendValueInput("BRIGHTNESS", "brightness") this.appendValueInput("BRIGHTNESS", "brightness")
.appendField((Blockly.Msg.senseBox_ws2818_rgb_led_brightness)); .appendField((Blockly.Msg.senseBox_ws2818_rgb_led_brightness));
this.appendValueInput("NUMBER", "number") this.appendValueInput("NUMBER", "number")
@ -62,11 +66,15 @@ Blockly.Blocks['sensebox_ws2818_led_init'] = {
Blockly.Blocks['sensebox_ws2818_led'] = { Blockly.Blocks['sensebox_ws2818_led'] = {
init: function () { init: function () {
var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, '1'],
[Blockly.Msg.senseBox_ultrasonic_port_B, '3'], [Blockly.Msg.senseBox_ultrasonic_port_C, '5']];
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_ws2818_rgb_led) .appendField(Blockly.Msg.senseBox_ws2818_rgb_led)
.appendField("Port:") .appendField("Port:")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPinsRGB), "Port") .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
this.appendValueInput("POSITION", "position") this.appendValueInput("POSITION", "position")
.appendField((Blockly.Msg.senseBox_ws2818_rgb_led_position)); .appendField((Blockly.Msg.senseBox_ws2818_rgb_led_position));
this.appendValueInput("COLOR", 'Number') this.appendValueInput("COLOR", 'Number')

21
src/components/Blockly/blocks/sensebox-lora.js
View File

@ -158,8 +158,7 @@ Blockly.Blocks["sensebox_lora_ttn_mapper"] = {
this.appendValueInput("Fix Type").appendField("Fix Type").setCheck(null); this.appendValueInput("Fix Type").appendField("Fix Type").setCheck(null);
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.sensebox_lora_ttn_mapper_tip); this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tip);
this.setHelpUrl(Blockly.Msg.sensebox_lora_ttn_mapper_helpurl);
}, },
}; };
@ -300,21 +299,3 @@ Blockly.Blocks["sensebox_lora_cayenne_gps"] = {
}, },
LOOP_TYPES: ["sensebox_lora_cayenne_send"], LOOP_TYPES: ["sensebox_lora_cayenne_send"],
}; };
Blockly.Blocks["sensebox_lora_cayenne_concentration"] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_concentration_tip);
this.setHelpUrl("");
this.setColour(getColour().sensebox);
this.appendValueInput("Value").appendField(
Blockly.Msg.senseBox_LoRa_cayenne_concentration
);
this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
.appendField(new Blockly.FieldTextInput("1"), "CHANNEL");
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
},
LOOP_TYPES: ["sensebox_lora_cayenne_send"],
};

144
src/components/Blockly/blocks/sensebox-motors.js
View File

@ -1,144 +0,0 @@
import * as Blockly from "blockly/core";
import { getColour } from "../helpers/colour";
import { selectedBoard } from "../helpers/board";
import { FieldSlider } from "@blockly/field-slider";
/**
* Servo Motor
*
*/
Blockly.Blocks["sensebox_motors_beginServoMotor"] = {
init: function () {
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_beginServoMotor);
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_beginServoMotor_pin)
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "pin")
.setAlign(Blockly.ALIGN_RIGHT);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().motors);
this.setTooltip(Blockly.Msg.sensebox_motors_beginServoMotor_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_motors_beginServoMotor_helpurl);
},
};
Blockly.Blocks["sensebox_motors_moveServoMotor"] = {
init: function () {
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_moveServoMotor);
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_moveServoMotor_pin)
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "pin")
.setAlign(Blockly.ALIGN_RIGHT);
this.appendValueInput("degrees", "Number")
.appendField(Blockly.Msg.sensebox_motors_moveServoMotor_degrees)
.setAlign(Blockly.ALIGN_RIGHT);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().motors);
this.setTooltip(Blockly.Msg.sensebox_motors_moveServoMotor_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_motors_moveServoMotor_helpurl);
},
};
/**
* I2C Motor Board
*
*/
Blockly.Blocks["sensebox_motors_I2CMotorBoard_begin"] = {
init: function () {
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_begin);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().motors);
this.setTooltip(Blockly.Msg.sensebox_motors_I2CMotorBoard_begin_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_motors_I2CMotorBoard_begin_helpurl);
},
};
Blockly.Blocks["sensebox_motors_I2CMotorBoard_moveDCMotor"] = {
init: function () {
var dropdownOptions = [[Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_left, '1'],
[Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_right, '2']];
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor)
.appendField(new Blockly.FieldDropdown(dropdownOptions), "motor")
.appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_motor);
this.appendValueInput("speed", "Number")
.appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_speed)
.setAlign(Blockly.ALIGN_RIGHT);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().motors);
this.setTooltip(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_helpurl);
},
};
Blockly.Blocks["sensebox_motors_I2CMotorBoard_stopDCMotor"] = {
init: function () {
var dropdownOptions = [[Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_left, '1'],
[Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_right, '2']];
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor)
.appendField(new Blockly.FieldDropdown(dropdownOptions), "motor")
.appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_motor)
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().motors);
this.setTooltip(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_helpurl);
},
};
/**
* Stepper Motor
*
*/
Blockly.Blocks["sensebox_motors_beginStepperMotor"] = {
init: function () {
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_beginStepperMotor);
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_beginStepperMotor_pins);
this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "in1")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "in2")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "in3")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "in4");
this.setFieldValue("1", "in1");
this.setFieldValue("2", "in2");
this.setFieldValue("3", "in3");
this.setFieldValue("4", "in4");
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_beginStepperMotor_rpm)
.appendField(new FieldSlider(3, 1, 3), "rpm");
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().motors);
this.setTooltip(Blockly.Msg.sensebox_motors_beginStepperMotor_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_motors_beginStepperMotor_helpurl);
},
};
Blockly.Blocks["sensebox_motors_moveStepperMotor"] = {
init: function () {
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_motors_moveStepperMotor);
this.appendValueInput("steps", "Number")
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.sensebox_motors_moveStepperMotor_step);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().motors);
this.setTooltip(Blockly.Msg.sensebox_motors_moveStepperMotor_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_motors_moveStepperMotor_helpurl);
},
};

42
src/components/Blockly/blocks/sensebox-ntp.js
View File

@ -1,42 +0,0 @@
import * as Blockly from "blockly";
import { getColour } from "../helpers/colour";
import * as Types from "../helpers/types";
Blockly.Blocks["sensebox_ntp_init"] = {
init: function () {
this.setHelpUrl(Blockly.Msg.sensebox_ntp_helpurl);
this.setColour(getColour().time);
this.appendDummyInput().appendField(Blockly.Msg.sensebox_ntp_init);
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setTooltip(Blockly.Msg.sensebox_ntp_tooltip);
},
};
Blockly.Blocks["sensebox_ntp_get"] = {
init: function () {
this.setHelpUrl(Blockly.Msg.sensebox_ntp_get_helpurl);
this.setColour(getColour().time);
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_ntp_get)
.appendField(
new Blockly.FieldDropdown([
[Blockly.Msg.sensebox_ntp_epochTime, "getEpochTime"],
[Blockly.Msg.sensebox_ntp_formattedTimeStamp, "getFormattedTime"],
]),
"dropdown"
);
this.setOutput(true, Types.LARGE_NUMBER.typeName);
this.setTooltip(Blockly.Msg.sensebox_rtc_get_tooltip);
},
};
Blockly.Blocks["sensebox_ntp_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);
},
};

385
src/components/Blockly/blocks/sensebox-osem.js
View File

@ -1,199 +1,202 @@
import * as Blockly from "blockly/core"; import * as Blockly from 'blockly/core';
import { getColour } from "../helpers/colour"; import { getColour } from '../helpers/colour';
import store from "../../../store"; import store from '../../../store';
var boxes = store.getState().auth.user var boxes = store.getState().auth.user ? store.getState().auth.user.boxes : null;
? store.getState().auth.user.boxes
: null;
store.subscribe(() => { store.subscribe(() => {
boxes = store.getState().auth.user ? store.getState().auth.user.boxes : null; boxes = store.getState().auth.user ? store.getState().auth.user.boxes : null;
}); });
var selectedBox = ""; var selectedBox = '';
Blockly.Blocks["sensebox_osem_connection"] = {
init: function () {
var ssl = "TRUE";
this.setTooltip(Blockly.Msg.senseBox_osem_connection_tip);
this.setHelpUrl(Blockly.Msg.senseBox_osem_connection_helpurl);
this.setColour(getColour().sensebox);
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_osem_connection)
.appendField("SSL")
.appendField(new Blockly.FieldCheckbox(ssl), "SSL");
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_osem_restart)
.appendField(new Blockly.FieldCheckbox("TRUE"), "RESTART");
this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_osem_exposure)
.appendField(
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_osem_stationary, "Stationary"],
[Blockly.Msg.senseBox_osem_mobile, "Mobile"],
]),
"type"
);
if (!boxes) {
this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT)
.appendField("senseBox ID")
.appendField(new Blockly.FieldTextInput("senseBox ID"), "BoxID");
} else {
var dropdown = [];
for (var i = 0; i < boxes.length; i++) {
dropdown.push([boxes[i].name, boxes[i]._id]);
}
this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT)
.appendField("senseBox ID")
.appendField(new Blockly.FieldDropdown(dropdown), "BoxID");
}
this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_osem_access_token)
.appendField(new Blockly.FieldTextInput("access_token"), "access_token");
this.appendStatementInput("DO")
.appendField(Blockly.Msg.senseBox_sensor)
.setCheck(null);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.getField("type").setValidator(
function (val) {
this.updateShape_(val === "Mobile");
}.bind(this)
);
},
onchange: function (e) {
var legal = false;
// Is the block nested in a loop?
var block = this;
do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true;
break;
}
block = block.getSurroundParent();
} while (block);
if (legal) {
this.setWarningText(null);
} else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
}
/** Blockly.Blocks['sensebox_osem_connection'] = {
* List of block types that are loops and thus do not need warnings. init: function () {
* To add a new loop type add this to your code: this.setTooltip(Blockly.Msg.senseBox_osem_connection_tip);
* Blockly.Blocks['controls_flow_statements'].LOOP_TYPES.push('custom_loop'); this.setHelpUrl('');
*/ this.setColour(getColour().sensebox);
selectedBox = this.getFieldValue("BoxID"); this.appendDummyInput()
if (selectedBox !== "" && boxes) { .appendField(Blockly.Msg.senseBox_osem_connection)
var accessToken = boxes.find( .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_osem_host, '"ingress.opensensemap.org"'], [Blockly.Msg.senseBox_osem_host_workshop, '"ingress.workshop.opensensemap.org"']]), "host")
(element) => element._id === selectedBox .appendField('SSL')
).access_token; .appendField(new Blockly.FieldCheckbox("TRUE"), "SSL");
if (accessToken !== undefined) { this.appendDummyInput()
this.getField("access_token").setValue(accessToken); .setAlign(Blockly.ALIGN_LEFT)
} else { .appendField(Blockly.Msg.senseBox_osem_exposure)
this.getField("access_token").setValue("access_token"); .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_osem_stationary, 'Stationary'], [Blockly.Msg.senseBox_osem_mobile, 'Mobile']]), "type");
} if (!boxes) {
} this.appendDummyInput()
}, .setAlign(Blockly.ALIGN_LEFT)
updateShape_(isMobile) { .appendField("senseBox ID")
if (isMobile) { .appendField(new Blockly.FieldTextInput("senseBox ID"), "BoxID");
if (this.getInput("lat") == null) { } else {
this.appendValueInput("lat", "Number").appendField( var dropdown = []
Blockly.Msg.senseBox_gps_lat, for (var i = 0; i < boxes.length; i++) {
"gps" dropdown.push([boxes[i].name, boxes[i]._id])
); }
this.appendValueInput("lng", "Number").appendField( this.appendDummyInput()
Blockly.Msg.senseBox_gps_lng .setAlign(Blockly.ALIGN_LEFT)
); .appendField("senseBox ID")
this.appendValueInput("altitude", "Number").appendField( .appendField(new Blockly.FieldDropdown(dropdown), 'BoxID');
Blockly.Msg.senseBox_gps_alt
);
this.appendValueInput("timeStamp", "Number").appendField(
Blockly.Msg.senseBox_gps_timeStamp
);
}
} else {
this.removeInput("lat", true);
this.removeInput("lng", true);
this.removeInput("altitude", true);
this.removeInput("timeStamp", true);
}
},
LOOP_TYPES: ["sensebox_interval_timer"],
};
Blockly.Blocks["sensebox_send_to_osem"] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_send_to_osem_tip);
this.setHelpUrl("");
this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(Blockly.Msg.senseBox_send_to_osem);
if (boxes) {
this.appendValueInput("Value")
.appendField("Phänomen")
.appendField(
new Blockly.FieldDropdown(this.generateOptions),
"SensorID"
);
} else {
this.appendValueInput("Value")
.setAlign(Blockly.ALIGN_LEFT)
.appendField("Phänomen")
.appendField(new Blockly.FieldTextInput("sensorID"), "SensorID");
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
},
generateOptions: function () {
var dropdown = [["", ""]];
var boxID = selectedBox;
if (boxID !== "" && boxes) {
let box = boxes.find((el) => el._id === boxID);
if (box !== undefined) {
for (var i = 0; i < box.sensors.length; i++) {
dropdown.push([box.sensors[i].title, box.sensors[i]._id]);
} }
} this.appendDummyInput()
if (dropdown.length > 1) { .setAlign(Blockly.ALIGN_LEFT)
var options = dropdown.slice(1); .appendField(Blockly.Msg.senseBox_osem_access_token)
return options; .appendField(new Blockly.FieldTextInput("access_token"), "access_token");
} else { this.appendStatementInput('DO')
return dropdown; .appendField(Blockly.Msg.senseBox_sensor)
} .setCheck(null);
} this.setPreviousStatement(true, null);
return dropdown; this.setNextStatement(true, null);
}, },
/** onchange: function (e) {
* Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop. var legal = false;
* @param {!Blockly.Events.Abstract} e Change event. // Is the block nested in a loop?
* @this Blockly.Block var block = this;
*/ do {
onchange: function () { if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
var legal = false; legal = true;
// Is the block nested in a loop? break;
var block = this; }
do { block = block.getSurroundParent();
if (this.LOOP_TYPES.indexOf(block.type) !== -1) { } while (block);
legal = true; if (legal) {
break; this.setWarningText(null);
} } else {
block = block.getSurroundParent(); this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
} while (block); }
if (legal) {
this.setWarningText(null); /**
} else { * List of block types that are loops and thus do not need warnings.
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING); * To add a new loop type add this to your code:
} * Blockly.Blocks['controls_flow_statements'].LOOP_TYPES.push('custom_loop');
}, */
/** selectedBox = this.getFieldValue('BoxID');
* List of block types that are loops and thus do not need warnings. if (selectedBox !== '' && boxes) {
* To add a new loop type add this to your code: var accessToken = boxes.find(element => element._id === selectedBox).access_token
* Blockly.Blocks['controls_flow_statements'].LOOP_TYPES.push('custom_loop'); if (accessToken !== undefined) {
*/ this.getField('access_token').setValue(accessToken)
LOOP_TYPES: ["sensebox_osem_connection"], } else {
this.getField('access_token').setValue('access_token')
}
}
},
mutationToDom: function () {
var container = document.createElement('mutation');
var input = this.getFieldValue('type');
this.updateShape_(input);
container.setAttribute('type', input);
return container;
},
domToMutation: function (xmlElement) {
var connections = xmlElement.getAttribute('connections');
this.updateShape_(connections);
},
/**
* Modify this block to have the correct number of pins available.
* @param {boolean}
* @private
* @this Blockly.Block
*/
updateShape_: function () {
var extraFieldExist = this.getFieldValue('gps');
var input = this.getFieldValue('type');
if ((input === 'Mobile') && extraFieldExist === null) {
this.appendValueInput('lat', 'Number')
.appendField(Blockly.Msg.senseBox_gps_lat, 'gps');
this.appendValueInput('lng', 'Number')
.appendField(Blockly.Msg.senseBox_gps_lng);
this.appendValueInput('altitude', 'Number')
.appendField(Blockly.Msg.senseBox_gps_alt);
this.appendValueInput('timeStamp', 'Number')
.appendField(Blockly.Msg.senseBox_gps_timeStamp);
}
if (input === 'Stationary' && extraFieldExist !== null) {
this.removeInput('lat');
this.removeInput('lng');
this.removeInput('altitude');
this.removeInput('timeStamp');
}
},
LOOP_TYPES: ['sensebox_interval_timer']
};
Blockly.Blocks['sensebox_send_to_osem'] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_send_to_osem_tip);
this.setHelpUrl('');
this.setColour(getColour().sensebox);
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_send_to_osem);
if (boxes) {
this.appendValueInput('Value')
.appendField('Phänomen')
.appendField(new Blockly.FieldDropdown(
this.generateOptions), 'SensorID');
} else {
this.appendValueInput('Value')
.setAlign(Blockly.ALIGN_LEFT)
.appendField('Phänomen')
.appendField(new Blockly.FieldTextInput(
'sensorID'), 'SensorID')
}
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
},
generateOptions: function () {
var dropdown = [['', '']];
var boxID = selectedBox;
if (boxID !== '' && boxes) {
let box = boxes.find(el => el._id === boxID);
if (box !== undefined) {
for (var i = 0; i < box.sensors.length; i++) {
dropdown.push([box.sensors[i].title, box.sensors[i]._id])
}
}
if (dropdown.length > 1) {
var options = dropdown.slice(1)
return options
} else {
return dropdown
}
}
return dropdown
},
/**
* Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop.
* @param {!Blockly.Events.Abstract} e Change event.
* @this Blockly.Block
*/
onchange: function () {
var legal = false;
// Is the block nested in a loop?
var block = this;
do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true;
break;
}
block = block.getSurroundParent();
} while (block);
if (legal) {
this.setWarningText(null);
} else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
}
},
/**
* List of block types that are loops and thus do not need warnings.
* To add a new loop type add this to your code:
* Blockly.Blocks['controls_flow_statements'].LOOP_TYPES.push('custom_loop');
*/
LOOP_TYPES: ['sensebox_osem_connection']
}; };

66
src/components/Blockly/blocks/sensebox-rtc.js
View File

@ -62,7 +62,7 @@ Blockly.Blocks["sensebox_rtc_get"] = {
]), ]),
"dropdown" "dropdown"
); );
this.setOutput(true, Types.LARGE_NUMBER.typeName); this.setOutput(true, Types.LARGE_NUMBER.typeId);
this.setTooltip(Blockly.Msg.sensebox_rtc_get_tooltip); this.setTooltip(Blockly.Msg.sensebox_rtc_get_tooltip);
}, },
}; };
@ -76,67 +76,3 @@ Blockly.Blocks["sensebox_rtc_get_timestamp"] = {
this.setTooltip(Blockly.Msg.sensebox_rtc_get_timestamp_tooltip); this.setTooltip(Blockly.Msg.sensebox_rtc_get_timestamp_tooltip);
}, },
}; };
/**
* Internal RTC
*
*/
Blockly.Blocks["sensebox_internal_rtc_init"] = {
init: function () {
this.setHelpUrl(Blockly.Msg.sensebox_internal_rtc_helpurl);
this.setColour(getColour().time);
this.appendDummyInput().appendField(Blockly.Msg.sensebox_internal_rtc_init);
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setTooltip(Blockly.Msg.sensebox_internal_rtc_init_tooltip);
},
};
Blockly.Blocks["sensebox_internal_rtc_set"] = {
init: function () {
this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
this.setColour(getColour().time);
this.appendValueInput("time").appendField(
Blockly.Msg.sensebox_internal_rtc_set
);
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setTooltip(Blockly.Msg.sensebox_internal_rtc_set_tooltip);
},
};
Blockly.Blocks["sensebox_internal_rtc_get"] = {
init: function () {
this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
this.setColour(getColour().time);
this.appendDummyInput()
.appendField(Blockly.Msg.sensebox_internal_rtc_get)
.appendField(
new Blockly.FieldDropdown([
[Blockly.Msg.sensebox_internal_rtc_epoch, "Epoch"],
[Blockly.Msg.sensebox_internal_rtc_year, "Year"],
[Blockly.Msg.sensebox_internal_rtc_month, "Month"],
[Blockly.Msg.sensebox_internal_rtc_day, "Day"],
[Blockly.Msg.sensebox_internal_rtc_hour, "Hours"],
[Blockly.Msg.sensebox_internal_rtc_minutes, "Minutes"],
[Blockly.Msg.sensebox_internal_rtc_seconds, "Seconds"],
]),
"dropdown"
);
this.setOutput(true, Types.LARGE_NUMBER.typeName);
this.setTooltip(Blockly.Msg.sensebox_internal_rtc_get_tooltip);
},
};
Blockly.Blocks["sensebox_internal_rtc_get_timestamp"] = {
init: function () {
this.setHelpUrl(Blockly.Msg.sensebox_internal_rtc_helpurl);
this.setColour(getColour().time);
this.appendDummyInput().appendField(
Blockly.Msg.sensebox_internal_rtc_get_timestamp
);
this.setOutput(true);
this.setTooltip(Blockly.Msg.sensebox_internal_rtc_get_timestamp_tooltip);
},
};

236
src/components/Blockly/blocks/sensebox-sd.js
View File

@ -1,174 +1,80 @@
import * as Blockly from "blockly/core"; import * as Blockly from 'blockly/core';
import { getColour } from "../helpers/colour"; import { getColour } from '../helpers/colour';
var checkFileName = function (filename) {
var length = filename.length;
if (length > 8) {
alert("dateiname sollte kleiner als 8 Zeichen sein");
return filename.slice(0, 8);
}
return filename;
};
Blockly.Blocks["sensebox_sd_open_file"] = { Blockly.Blocks['sensebox_sd_open_file'] = {
init: function () { init: function () {
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_sd_open_file) .appendField(Blockly.Msg.senseBox_sd_open_file)
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField( .appendField(
new Blockly.FieldTextInput("Data", checkFileName), new Blockly.FieldTextInput('Data.txt'),
"Filename" 'Filename');
) this.appendStatementInput('SD')
.appendField(".") .setCheck(null);
.appendField( this.setPreviousStatement(true, null);
new Blockly.FieldDropdown([ this.setNextStatement(true, null);
["txt", "txt"], this.setColour(getColour().sensebox);
["csv", "csv"], this.setTooltip(Blockly.Msg.senseBox_sd_open_file_tooltip);
]), this.setHelpUrl('https://docs.sensebox.de/hardware/bee-sd/');
"extension"
);
this.appendStatementInput("SD").setCheck(null);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_sd_open_file_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl);
},
};
Blockly.Blocks["sensebox_sd_create_file"] = {
init: function () {
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_sd_create_file)
.setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_output_filename)
.appendField(
new Blockly.FieldTextInput("Data", checkFileName),
"Filename"
)
.appendField(".")
.appendField(
new Blockly.FieldDropdown([
["txt", "txt"],
["csv", "csv"],
]),
"extension"
);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_sd_create_file_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl);
},
};
Blockly.Blocks["sensebox_sd_write_file"] = {
init: function () {
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_sd_write_file)
.setAlign(Blockly.ALIGN_LEFT);
this.appendValueInput("DATA").setCheck(null);
this.appendDummyInput("CheckboxText")
.appendField(Blockly.Msg.senseBox_output_linebreak)
.appendField(new Blockly.FieldCheckbox("TRUE"), "linebreak");
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_sd_write_file_tooltip);
this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl);
},
/**
* Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop.
* @param {!Blockly.Events.Abstract} e Change event.
* @this Blockly.Block
*/
onchange: function (e) {
var legal = false;
// Is the block nested in a loop?
var block = this;
do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true;
break;
}
block = block.getSurroundParent();
} while (block);
if (legal) {
this.setWarningText(null);
} else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
} }
},
LOOP_TYPES: ["sensebox_sd_open_file"],
}; };
Blockly.Blocks["sensebox_sd_osem"] = { Blockly.Blocks['sensebox_sd_create_file'] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.sensebox_sd_osem_tip); this.appendDummyInput()
this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl); .appendField(Blockly.Msg.senseBox_sd_create_file)
this.setColour(getColour().sensebox); .setAlign(Blockly.ALIGN_LEFT)
this.appendDummyInput() .appendField(Blockly.Msg.senseBox_output_filename)
.setAlign(Blockly.ALIGN_LEFT) .appendField(
.appendField(Blockly.Msg.sensebox_sd_osem); new Blockly.FieldTextInput('Data.txt'),
this.appendDummyInput() 'Filename');
.setAlign(Blockly.ALIGN_LEFT) this.setPreviousStatement(true, null);
.appendField(Blockly.Msg.senseBox_osem_exposure) this.setNextStatement(true, null);
.appendField( this.setColour(getColour().sensebox);
new Blockly.FieldDropdown([ this.setTooltip(Blockly.Msg.senseBox_sd_create_file_tooltip);
[Blockly.Msg.senseBox_osem_stationary, "Stationary"], this.setHelpUrl('https://docs.sensebox.de/hardware/bee-sd/');
[Blockly.Msg.senseBox_osem_mobile, "Mobile"],
]),
"type"
);
this.appendValueInput("timeStamp", "Number").appendField(
Blockly.Msg.senseBox_gps_timeStamp
);
this.appendStatementInput("DO")
.appendField(Blockly.Msg.sensebox_sd_measurement)
.setCheck(null);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.getField("type").setValidator(
function (val) {
this.updateShape_(val === "Mobile");
}.bind(this)
);
},
updateShape_(isMobile) {
if (isMobile) {
if (this.getInput("lat") == null) {
this.appendValueInput("lat", "Number").appendField(
Blockly.Msg.senseBox_gps_lat,
"gps"
);
this.appendValueInput("lng", "Number").appendField(
Blockly.Msg.senseBox_gps_lng
);
this.appendValueInput("altitude", "Number").appendField(
Blockly.Msg.senseBox_gps_alt
);
}
} else {
this.removeInput("lat", true);
this.removeInput("lng", true);
this.removeInput("altitude", true);
} }
},
}; };
Blockly.Blocks["sensebox_sd_save_for_osem"] = { Blockly.Blocks['sensebox_sd_write_file'] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.sensebox_sd_save_for_osem_tip); this.appendDummyInput()
this.setHelpUrl(Blockly.Msg.sensebox_sd_helpurl); .appendField(Blockly.Msg.senseBox_sd_write_file)
this.setColour(getColour().sensebox); .setAlign(Blockly.ALIGN_LEFT);
this.appendDummyInput().appendField(Blockly.Msg.sensebox_sd_save_for_osem); this.appendValueInput('DATA')
this.appendValueInput("Value") .setCheck(null);
.setAlign(Blockly.ALIGN_LEFT) this.appendDummyInput('CheckboxText')
.appendField(Blockly.Msg.sensebox_sd_save_for_osem_id) .appendField(Blockly.Msg.senseBox_output_linebreak)
.appendField(new Blockly.FieldTextInput("sensorID"), "SensorID"); .appendField(new Blockly.FieldCheckbox('TRUE'), 'linebreak');
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
}, this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_sd_write_file_tooltip);
this.setHelpUrl('https://docs.sensebox.de/hardware/bee-sd/');
},
/**
* Called whenever anything on the workspace changes.
* Add warning if block is not nested inside a the correct loop.
* @param {!Blockly.Events.Abstract} e Change event.
* @this Blockly.Block
*/
onchange: function (e) {
var legal = false;
// Is the block nested in a loop?
var block = this;
do {
if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
legal = true;
break;
}
block = block.getSurroundParent();
} while (block);
if (legal) {
this.setWarningText(null);
} else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
}
},
LOOP_TYPES: ['sensebox_sd_open_file'],
}; };

570
src/components/Blockly/blocks/sensebox-sensors.js
View File

@ -1,156 +1,110 @@
import Blockly from "blockly"; import Blockly from 'blockly';
import { getColour } from "../helpers/colour"; import { getColour } from '../helpers/colour'
import * as Types from "../helpers/types"; import * as Types from '../helpers/types'
import { selectedBoard } from "../helpers/board"; import { selectedBoard } from '../helpers/board'
import { FieldGridDropdown } from "@blockly/field-grid-dropdown";
/** /**
* HDC1080 Temperature and Humidity Sensor * HDC1080 Temperature and Humidity Sensor
* *
*/ */
Blockly.Blocks["sensebox_sensor_temp_hum"] = { Blockly.Blocks['sensebox_sensor_temp_hum'] = {
init: function () { init: function () {
this.appendDummyInput().appendField(Blockly.Msg.senseBox_temp_hum); this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_temp_hum);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT) .setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_value) .appendField(Blockly.Msg.senseBox_value)
.appendField( .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_temp, "Temperature"], [Blockly.Msg.senseBox_hum, "Humidity"]]), "NAME");
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_temp, "Temperature"],
[Blockly.Msg.senseBox_hum, "Humidity"],
]),
"NAME"
);
this.setOutput(true, Types.DECIMAL.typeName); this.setOutput(true, Types.DECIMAL.typeName);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_temp_hum_tooltip); this.setTooltip(Blockly.Msg.senseBox_temp_hum_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_temp_hum_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_temp_hum_helpurl);
this.data = {name: "hdc1080", connection: "I2C"}; }
},
}; };
/** /**
* VEML6070 and TSL4513 * VEML6070 and TSL4513
* *
*/ */
Blockly.Blocks["sensebox_sensor_uv_light"] = {
Blockly.Blocks['sensebox_sensor_uv_light'] = {
init: function () { init: function () {
this.appendDummyInput().appendField(Blockly.Msg.senseBox_uv_light); this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_uv_light);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT) .setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_value) .appendField(Blockly.Msg.senseBox_value)
.appendField( .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_light, "Illuminance"], [Blockly.Msg.senseBox_uv, "UvIntensity"]]), "NAME");
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_light, "Illuminance"],
[Blockly.Msg.senseBox_uv, "UvIntensity"],
]),
"NAME"
);
this.setOutput(true, Types.DECIMAL.typeName); this.setOutput(true, Types.DECIMAL.typeName);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_uv_light_tooltip); this.setTooltip(Blockly.Msg.senseBox_uv_light_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_uv_light_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_uv_light_helpurl);
this.data = {name: "veml6070"}; }
},
}; };
/* /*
BMX055 Three differen Blocks for Accelerometer, Gyroscope, Compass BMX055 Three differen Blocks for Accelerometer, Gyroscope, Compass
*/ */
Blockly.Blocks["sensebox_sensor_bmx055_accelerometer"] = { Blockly.Blocks['sensebox_sensor_bmx055_accelerometer'] = {
init: function () { init: function () {
this.appendDummyInput().appendField( this.appendDummyInput()
Blockly.Msg.senseBox_bmx055_accelerometer .appendField(Blockly.Msg.senseBox_bmx055_accelerometer);
);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_bmx055_accelerometer_direction) .appendField(Blockly.Msg.senseBox_bmx055_accelerometer_direction)
.appendField( .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_bmx055_accelerometer_direction_x, "X"], [Blockly.Msg.senseBox_bmx055_accelerometer_direction_y, "Y"], [Blockly.Msg.senseBox_bmx055_accelerometer_direction_z, "Z"], [Blockly.Msg.senseBox_bmx055_accelerometer_direction_total, "Total"]]), "VALUE");
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_bmx055_accelerometer_direction_x, "X"],
[Blockly.Msg.senseBox_bmx055_accelerometer_direction_y, "Y"],
[Blockly.Msg.senseBox_bmx055_accelerometer_direction_z, "Z"],
[Blockly.Msg.senseBox_bmx055_accelerometer_direction_total, "Total"],
]),
"VALUE"
);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_bmx055_accelerometer_range) .appendField(Blockly.Msg.senseBox_bmx055_accelerometer_range)
.appendField( .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_bmx055_accelerometer_range_2g, "0x3"], [Blockly.Msg.senseBox_bmx055_accelerometer_range_4g, "0x5"], [Blockly.Msg.senseBox_bmx055_accelerometer_range_8g, "0x8"], [Blockly.Msg.senseBox_bmx055_accelerometer_range_16g, "0x0C"]]), "RANGE");
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_bmx055_accelerometer_range_2g, "0x3"],
[Blockly.Msg.senseBox_bmx055_accelerometer_range_4g, "0x5"],
[Blockly.Msg.senseBox_bmx055_accelerometer_range_8g, "0x8"],
[Blockly.Msg.senseBox_bmx055_accelerometer_range_16g, "0x0C"],
]),
"RANGE"
);
this.setOutput(true, Types.DECIMAL.typeName); this.setOutput(true, Types.DECIMAL.typeName);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_bmx055_accelerometer_tooltip); this.setTooltip(Blockly.Msg.senseBox_bmx055_accelerometer_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_bmx055_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_bmx055_helpurl);
this.data = {name: "bmx055"}; }
},
}; };
/** /**
* SDS011 Fine Particular Matter Sensor * SDS011 Fine Particular Matter Sensor
* *
*/ */
Blockly.Blocks["sensebox_sensor_sds011"] = { Blockly.Blocks['sensebox_sensor_sds011'] = {
init: function () { init: function () {
this.appendDummyInput().appendField(Blockly.Msg.senseBox_sds011); this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_sds011);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT) .setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_value) .appendField(Blockly.Msg.senseBox_value)
.appendField( .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_sds011_pm25, "Pm25"], [Blockly.Msg.senseBox_sds011_pm10, "Pm10"]]), "NAME")
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_sds011_pm25, "pm25"],
[Blockly.Msg.senseBox_sds011_pm10, "pm10"],
]),
"NAME"
)
.appendField(Blockly.Msg.senseBox_sds011_dimension) .appendField(Blockly.Msg.senseBox_sds011_dimension)
.appendField( .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_sds011_serial1, "Serial1"], [Blockly.Msg.senseBox_sds011_serial2, "Serial2"]]), "SERIAL");
new Blockly.FieldDropdown(
selectedBoard().serialSensors),
"SERIAL"
);
this.setOutput(true, Types.DECIMAL.typeName); this.setOutput(true, Types.DECIMAL.typeName);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_sds011_tooltip); this.setTooltip(Blockly.Msg.senseBox_sds011_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_sds011_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_sds011_helpurl);
this.data = {name: "sds011"}; }
},
}; };
/** /**
* BMP280 Pressure Sensor * BMP280 Pressure Sensor
* *
*/ */
Blockly.Blocks["sensebox_sensor_pressure"] = { Blockly.Blocks['sensebox_sensor_pressure'] = {
init: function () { init: function () {
var dropdownOptions = [ var dropdownOptions = [[Blockly.Msg.senseBox_pressure, "Pressure"], [Blockly.Msg.senseBox_temp, "Temperature"], [Blockly.Msg.senseBox_gps_alt, "Altitude"]];
[Blockly.Msg.senseBox_pressure, "Pressure"], var dropdown = new Blockly.FieldDropdown(dropdownOptions, function (option) {
[Blockly.Msg.senseBox_temp, "Temperature"], var input = (option === 'Pressure') || (option === 'Temperature') || (option === 'Altitude');
[Blockly.Msg.senseBox_gps_alt, "Altitude"],
];
var dropdown = new Blockly.FieldDropdown(dropdownOptions, function (
option
) {
var input =
option === "Pressure" ||
option === "Temperature" ||
option === "Altitude";
this.sourceBlock_.updateShape_(input); this.sourceBlock_.updateShape_(input);
}); });
this.appendDummyInput().appendField(Blockly.Msg.senseBox_pressure_sensor); this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_pressure_sensor);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT) .setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_value) .appendField(Blockly.Msg.senseBox_value)
@ -159,102 +113,16 @@ Blockly.Blocks["sensebox_sensor_pressure"] = {
this.setOutput(true, Types.DECIMAL.typeName); this.setOutput(true, Types.DECIMAL.typeName);
this.setTooltip(Blockly.Msg.senseBox_pressure_tooltip); this.setTooltip(Blockly.Msg.senseBox_pressure_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_pressure_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_pressure_helpurl);
this.data = {name: "bmp280"};
this.getField("NAME").setValidator(
function (val) {
this.updateShape_(val === "Altitude");
}.bind(this)
);
},
updateShape_(isAltitude) {
if (isAltitude) {
if (this.getInput("extraField") == null) {
this.appendDummyInput("extraField")
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_pressure_referencePressure)
.appendField(new Blockly.FieldTextInput("1013"), "referencePressure")
.appendField(Blockly.Msg.senseBox_pressure_referencePressure_dim);
}
} else {
this.removeInput("extraField", true);
}
},
};
/**
* BME680 Environmental Sensor
*
*/
Blockly.Blocks["sensebox_sensor_bme680_bsec"] = {
init: function () {
var dropdownOptions = [
[Blockly.Msg.senseBox_temp, "temperature"],
[Blockly.Msg.senseBox_hum, "humidity"],
[Blockly.Msg.senseBox_bme_pressure, "pressure"],
[Blockly.Msg.senseBox_bme_iaq, "IAQ"],
[Blockly.Msg.senseBox_bme_iaq_accuracy, "IAQAccuracy"],
[Blockly.Msg.senseBox_bme_co2, "CO2"],
[Blockly.Msg.senseBox_bme_breatheVocEquivalent, "breathVocEquivalent"],
];
this.appendDummyInput().appendField(Blockly.Msg.senseBox_bme680);
this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_value)
.appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown");
this.setOutput(true, Types.DECIMAL.typeName);
this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_bme_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_bme680_helpurl);
this.data = {name: "bme680"};
},
};
/**
* Ultrasonic Sensor
*
*
*/
Blockly.Blocks["sensebox_sensor_ultrasonic_ranger"] = {
init: function () {
var dropdown = new FieldGridDropdown(selectedBoard().digitalPorts, function (option) {
var input = option === "A" || option === "B" || option === "C";
this.sourceBlock_.updateShape_(input);
});
this.setColour(getColour().sensebox);
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_ultrasonic)
.appendField(dropdown, "port");
this.appendDummyInput("TrigEcho")
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_ultrasonic_trigger)
.appendField(
new Blockly.FieldDropdown(selectedBoard().digitalPins),
"ultrasonic_trigger"
)
.appendField(Blockly.Msg.senseBox_ultrasonic_echo)
.appendField(
new Blockly.FieldDropdown(selectedBoard().digitalPins),
"ultrasonic_echo"
);
this.appendDummyInput("maxDistance")
.appendField(Blockly.Msg.senseBox_ultrasonic_maxDistance)
.appendField(new Blockly.FieldTextInput("250"), "maxDistance")
.appendField("cm");
this.setOutput(true, Types.NUMBER.typeName);
this.setTooltip(Blockly.Msg.senseBox_ultrasonic_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_ultrasonic_helpurl);
this.data = {name: "hc-sr04"};
}, },
/** /**
* Parse XML to restore the number of pins available. * Parse XML to restore the number of pins available.
* @param {!Element} xmlElement XML storage element. * @param {!Element} xmlElement XML storage element.
* @this Blockly.Block * @this Blockly.Block
*/ */
domToMutation: function (xmlElement) { domToMutation: function (xmlElement) {
xmlElement.getAttribute("port"); (xmlElement.getAttribute('port'));
}, },
/** /**
* Create XML to represent number of pins selection. * Create XML to represent number of pins selection.
@ -262,8 +130,107 @@ Blockly.Blocks["sensebox_sensor_ultrasonic_ranger"] = {
* @this Blockly.Block * @this Blockly.Block
*/ */
mutationToDom: function () { mutationToDom: function () {
var container = document.createElement("mutation"); var container = document.createElement('mutation');
var input = this.getFieldValue("port"); var input = this.getFieldValue('NAME');
this.updateShape_(input);
container.setAttribute('NAME', input);
return container;
},
/**
* Modify this block to have the correct number of pins available.
* @param {boolean}
* @private
* @this Blockly.Block
*/
updateShape_: function () {
var extraFieldExist = this.getFieldValue('referencePressure');
var input = this.getFieldValue('NAME');
if (input === 'Altitude' && extraFieldExist === null) {
this.appendDummyInput('extraField')
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_pressure_referencePressure)
.appendField(new Blockly.FieldTextInput("1013"), "referencePressure")
.appendField(Blockly.Msg.senseBox_pressure_referencePressure_dim);
}
if ((input === 'Pressure' || input === 'Temperature') && extraFieldExist !== null) {
this.removeInput('extraField');
}
}
};
/**
* BME680 Environmental Sensor
*
*/
Blockly.Blocks['sensebox_sensor_bme680_bsec'] = {
init: function () {
var dropdownOptions = [[Blockly.Msg.senseBox_temp, "temperature"], [Blockly.Msg.senseBox_hum, "humidity"], [Blockly.Msg.senseBox_pressure, "pressure"], [Blockly.Msg.senseBox_bme_iaq, "IAQ"], [Blockly.Msg.senseBox_bme_iaq_accuracy, "IAQAccuracy"], [Blockly.Msg.senseBox_bme_co2, "CO2"], [Blockly.Msg.senseBox_bme_breatheVocEquivalent, "breathVocEquivalent"]];
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_bme680);
this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_value)
.appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown")
this.setOutput(true, Types.DECIMAL.typeName);
this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_bme_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_bme680_helpurl)
}
};
/**
* Ultrasonic Sensor
*
*
*/
Blockly.Blocks['sensebox_sensor_ultrasonic_ranger'] = {
init: function () {
var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, 'A'],
[Blockly.Msg.senseBox_ultrasonic_port_B, 'B'], [Blockly.Msg.senseBox_ultrasonic_port_C, 'C']];
var dropdown = new Blockly.FieldDropdown(dropdownOptions, function (option) {
var input = (option === 'A') || (option === 'B') || (option === 'C');
this.sourceBlock_.updateShape_(input);
});
this.setColour(getColour().sensebox);
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_ultrasonic)
.appendField(dropdown, "port");
this.appendDummyInput('TrigEcho')
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_ultrasonic_trigger)
.appendField(new Blockly.FieldDropdown(
selectedBoard().digitalPins), 'ultrasonic_trigger')
.appendField(Blockly.Msg.senseBox_ultrasonic_echo)
.appendField(new Blockly.FieldDropdown(
selectedBoard().digitalPins), 'ultrasonic_echo');
this.setOutput(true, Types.NUMBER.typeName);
this.setTooltip(Blockly.Msg.senseBox_ultrasonic_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_ultrasonic_helpurl);
},
/**
* Parse XML to restore the number of pins available.
* @param {!Element} xmlElement XML storage element.
* @this Blockly.Block
*/
domToMutation: function (xmlElement) {
(xmlElement.getAttribute('port'));
},
/**
* Create XML to represent number of pins selection.
* @return {!Element} XML storage element.
* @this Blockly.Block
*/
mutationToDom: function () {
var container = document.createElement('mutation');
var input = this.getFieldValue('port');
this.updateShape_(input); this.updateShape_(input);
container.setAttribute("port", input); container.setAttribute("port", input);
return container; return container;
@ -275,199 +242,159 @@ Blockly.Blocks["sensebox_sensor_ultrasonic_ranger"] = {
* @this Blockly.Block * @this Blockly.Block
*/ */
updateShape_: function () { updateShape_: function () {
var input = this.getFieldValue("port"); var input = this.getFieldValue('port');
switch (input) { switch (input) {
case "A": case 'A':
this.setFieldValue("1", "ultrasonic_trigger"); this.setFieldValue('1', 'ultrasonic_trigger');
this.setFieldValue("2", "ultrasonic_echo"); this.setFieldValue('2', 'ultrasonic_echo');
break; break;
case "B": case 'B':
this.setFieldValue("3", "ultrasonic_trigger"); this.setFieldValue('3', 'ultrasonic_trigger');
this.setFieldValue("4", "ultrasonic_echo"); this.setFieldValue('4', 'ultrasonic_echo');
break; break;
case "C": case 'C':
this.setFieldValue("5", "ultrasonic_trigger"); this.setFieldValue('5', 'ultrasonic_trigger');
this.setFieldValue("6", "ultrasonic_echo"); this.setFieldValue('6', 'ultrasonic_echo');
break; break;
default: default:
break; break;
} }
}, }
}; };
/** /**
* Microphone * Microphone
* *
*/ */
Blockly.Blocks["sensebox_sensor_sound"] = { Blockly.Blocks['sensebox_sensor_sound'] = {
init: function () { init: function () {
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_sound) .appendField(Blockly.Msg.senseBox_sound)
.appendField("Pin:") .appendField("Pin:")
.appendField( .appendField(new Blockly.FieldDropdown(selectedBoard().analogPins), "PIN")
new Blockly.FieldDropdown(selectedBoard().analogPins),
"PIN"
);
this.setOutput(true, Types.NUMBER.typeName); this.setOutput(true, Types.NUMBER.typeName);
this.setHelpUrl(Blockly.Msg.senseBox_sound_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_sound_helpurl);
this.setTooltip(Blockly.Msg.senseBox_sound_tooltip); this.setTooltip(Blockly.Msg.senseBox_sound_tooltip);
}, }
}; };
/** /**
* Button * Button
* *
* *
*/ */
Blockly.Blocks["sensebox_button"] = { Blockly.Blocks['sensebox_button'] = {
init: function () { init: function () {
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_button) .appendField(Blockly.Msg.senseBox_button)
.appendField( .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_button_isPressed, "isPressed"], [Blockly.Msg.senseBox_button_wasPressed, "wasPressed"], [Blockly.Msg.senseBox_button_switch, "Switch"]]), "FUNCTION")
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_button_isPressed, "isPressed"],
[Blockly.Msg.senseBox_button_wasPressed, "wasPressed"],
[Blockly.Msg.senseBox_button_longPress, "longPress"],
[Blockly.Msg.senseBox_button_switch,"toggleButton"]
]),
"FUNCTION"
)
.appendField("Pin:") .appendField("Pin:")
.appendField( .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPinsButton), "PIN");
new Blockly.FieldDropdown(selectedBoard().digitalPinsButton),
"PIN"
);
this.setOutput(true, Types.BOOLEAN.typeName); this.setOutput(true, Types.BOOLEAN.typeName);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_button_tooltip); this.setTooltip(Blockly.Msg.senseBox_button_tooltip);
this.getField("FUNCTION").setValidator( }
function (val) {
this.updateShape_(val === "longPress");
}.bind(this)
);
},
updateShape_(isLongPress) {
if (isLongPress) {
if (this.getInput("extraField") == null) {
this.appendDummyInput("extraField")
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_button_longPress_time)
.appendField(new Blockly.FieldTextInput("1000"), "time")
.appendField("ms");
}
} else {
this.removeInput("extraField", true);
}
},
}; };
/** /**
* SCD30 CO2 Sensor * SCD30 CO2 Sensor
* *
*/ */
Blockly.Blocks["sensebox_scd30"] = {
Blockly.Blocks['sensebox_scd30'] = {
init: function () { init: function () {
var dropdownOptions = [ var dropdownOptions = [[Blockly.Msg.senseBox_scd_co2, "CO2"], [Blockly.Msg.senseBox_temp, "temperature"], [Blockly.Msg.senseBox_hum, "humidity"]];
[Blockly.Msg.senseBox_scd_co2, "CO2"], this.appendDummyInput()
[Blockly.Msg.senseBox_temp, "temperature"], .appendField(Blockly.Msg.senseBox_scd30);
[Blockly.Msg.senseBox_hum, "humidity"],
];
this.appendDummyInput().appendField(Blockly.Msg.senseBox_scd30);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT) .setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_value) .appendField(Blockly.Msg.senseBox_value)
.appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown"); .appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown")
this.setOutput(true, Types.NUMBER.typeName); this.setOutput(true, Types.NUMBER.typeName);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_scd_tooltip); this.setTooltip(Blockly.Msg.senseBox_scd_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_scd_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_scd_helpurl);
this.data = {name: "scd30"};
}, },
onchange: function (e) { onchange: function (e) {
var dropdown = this.getFieldValue("dropdown"); var dropdown = this.getFieldValue('dropdown');
if (dropdown === "temperature" || dropdown === "humidity") { if (dropdown === 'temperature' || dropdown === 'humidity') {
this.setOutput(true, Types.DECIMAL.typeName); this.setOutput(true, Types.DECIMAL.typeName);
} else if (dropdown === "CO2") { } else if (dropdown === 'CO2') {
this.setOutput(true, Types.NUMBER.typeName); this.setOutput(true, Types.NUMBER.typeName);
} }
}, }
}; };
/** /**
* GPS Module * GPS Module
* *
*/ */
Blockly.Blocks["sensebox_gps"] = {
Blockly.Blocks['sensebox_gps'] = {
init: function () { init: function () {
var dropdownOptions = [ var dropdownOptions = [[Blockly.Msg.senseBox_gps_lat, "latitude"], [Blockly.Msg.senseBox_gps_lng, "longitude"], [Blockly.Msg.senseBox_gps_alt, "altitude"], ["pDOP", "pDOP"], ["Fix Type", "fixType"]];
[Blockly.Msg.senseBox_gps_lat, "latitude"], this.appendDummyInput()
[Blockly.Msg.senseBox_gps_lng, "longitude"], .appendField("GPS Modul");
[Blockly.Msg.senseBox_gps_alt, "altitude"],
[Blockly.Msg.senseBox_gps_timeStamp, "timestamp"],
[Blockly.Msg.senseBox_gps_speed, "speed"],
["pDOP", "pDOP"],
["Fix Type", "fixType"],
];
this.appendDummyInput().appendField("GPS Modul");
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT) .setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_value) .appendField(Blockly.Msg.senseBox_value)
.appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown"); .appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown")
this.setOutput(true, Types.NUMBER.typeName); this.setOutput(true, Types.NUMBER.typeName);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_gps_tooltip); this.setTooltip(Blockly.Msg.senseBox_gps_tooltip);
}, }
}; };
/** /**
* Block for Truebner STM50 * Block for Truebner STM50
*/ */
Blockly.Blocks["sensebox_sensor_truebner_smt50"] = { Blockly.Blocks['sensebox_sensor_truebner_smt50'] = {
init: function () { init: function () {
var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, 'A'],
[Blockly.Msg.senseBox_ultrasonic_port_B, 'B'], [Blockly.Msg.senseBox_ultrasonic_port_C, 'C']];
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(Blockly.Msg.senseBox_smt50); this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_smt50);
this.appendDummyInput() this.appendDummyInput()
.appendField("Port:") .appendField("Port:")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPorts), "Port"); .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_value) .appendField(Blockly.Msg.senseBox_value)
.appendField( .appendField(new Blockly.FieldDropdown([[Blockly.Msg.senseBox_temp, "temp"], [Blockly.Msg.senseBox_soil, "soil"]]), 'value')
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_temp, "temp"],
[Blockly.Msg.senseBox_soil, "soil"],
]),
"value"
);
this.setOutput(true, Types.NUMBER.typeName); this.setOutput(true, Types.NUMBER.typeName);
this.setTooltip(Blockly.Msg.senseBox_smt50_tooltip); this.setTooltip(Blockly.Msg.senseBox_smt50_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_smt50_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_smt50_helpurl);
this.data = {name: "smt50"}; }
},
}; };
/** /**
* DS18B20 Watertemperature * DS18B20 Watertemperature
* *
*/ */
Blockly.Blocks["sensebox_sensor_watertemperature"] = { Blockly.Blocks['sensebox_sensor_watertemperature'] = {
init: function () { init: function () {
var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, 'A'],
[Blockly.Msg.senseBox_ultrasonic_port_B, 'B'], [Blockly.Msg.senseBox_ultrasonic_port_C, 'C']];
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_watertemperature) .appendField(Blockly.Msg.senseBox_watertemperature)
.appendField("Port:") .appendField("Port:")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPorts), "Port"); .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
this.setOutput(true, Types.NUMBER.typeName); this.setOutput(true, Types.NUMBER.typeName);
this.setTooltip(Blockly.Msg.senseBox_watertemperature_tip); this.setTooltip(Blockly.Msg.senseBox_watertemperature_tip);
this.data = {name: "ds18b20"}; }
},
}; };
/** /**
@ -491,95 +418,18 @@ Blockly.Blocks['sensebox_windspeed'] = {
* DF Robot Soundsensor * DF Robot Soundsensor
*/ */
Blockly.Blocks["sensebox_soundsensor_dfrobot"] = {
Blockly.Blocks['sensebox_soundsensor_dfrobot'] = {
init: function () { init: function () {
var dropdownOptions = [[Blockly.Msg.senseBox_ultrasonic_port_A, 'A'],
[Blockly.Msg.senseBox_ultrasonic_port_B, 'B'], [Blockly.Msg.senseBox_ultrasonic_port_C, 'C']];
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_soundsensor_dfrobot) .appendField(Blockly.Msg.senseBox_soundsensor_dfrobot)
.appendField("Port:") .appendField("Port:")
.appendField(new Blockly.FieldDropdown(selectedBoard().digitalPorts), "Port"); .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port")
this.setOutput(true, Types.DECIMAL.typeName); this.setOutput(true, Types.DECIMAL.typeName);
this.setTooltip(Blockly.Msg.senseBox_soundsensor_dfrobot_tooltip); this.setTooltip(Blockly.Msg.senseBox_soundsensor_dfrobot_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_soundsensor_dfrobot_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_soundsensor_dfrobot_helpurl)
}, }
};
/**
* Infineon DPS310 Pressure Sensor
*
*/
Blockly.Blocks["sensebox_sensor_dps310"] = {
init: function () {
var dropdownOptions = [
[Blockly.Msg.senseBox_pressure, "Pressure"],
[Blockly.Msg.senseBox_temp, "Temperature"],
[Blockly.Msg.senseBox_gps_alt, "Altitude"],
];
var dropdown = new Blockly.FieldDropdown(dropdownOptions, function (
option
) {
var input =
option === "Pressure" ||
option === "Temperature" ||
option === "Altitude";
this.sourceBlock_.updateShape_(input);
});
this.appendDummyInput().appendField(Blockly.Msg.senseBox_sensor_dps310);
this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_value)
.appendField(dropdown, "NAME");
this.setColour(getColour().sensebox);
this.setOutput(true, Types.DECIMAL.typeName);
this.setTooltip(Blockly.Msg.senseBox_sensor_dps310_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_sensor_dps310_helpurl);
this.data = {name: "dps310"};
this.getField("NAME").setValidator(
function (val) {
this.updateShape_(val === "Altitude");
}.bind(this)
);
},
updateShape_(isAltitude) {
if (isAltitude) {
if (this.getInput("extraField") == null) {
this.appendDummyInput("extraField")
.setAlign(Blockly.ALIGN_RIGHT)
.appendField(Blockly.Msg.senseBox_pressure_referencePressure)
.appendField(new Blockly.FieldTextInput("1013"), "referencePressure")
.appendField(Blockly.Msg.senseBox_pressure_referencePressure_dim);
}
} else {
this.removeInput("extraField", true);
}
},
};
/**
* Sensirion SPS30 Fine Particular Matter Sensor
* added 02.12.2022
*/
Blockly.Blocks["sensebox_sensor_sps30"] = {
init: function () {
this.appendDummyInput().appendField(Blockly.Msg.senseBox_sps30);
this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_value)
.appendField(
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_sps30_1p0, "1p0"],
[Blockly.Msg.senseBox_sps30_2p5, "2p5"],
[Blockly.Msg.senseBox_sps30_4p0, "4p0"],
[Blockly.Msg.senseBox_sps30_10p0, "10p0"],
]),
"value"
)
.appendField(Blockly.Msg.senseBox_sps30_dimension);
this.setOutput(true, Types.DECIMAL.typeName);
this.setColour(getColour().sensebox);
this.setTooltip(Blockly.Msg.senseBox_sps30_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_sps30_helpurl);
},
}; };

209
src/components/Blockly/blocks/sensebox-web.js
View File

@ -1,153 +1,60 @@
import Blockly from "blockly"; import Blockly from 'blockly';
import { getColour } from "../helpers/colour"; import { getColour } from '../helpers/colour'
import * as Types from "../helpers/types";
Blockly.Blocks["sensebox_wifi"] = { Blockly.Blocks['sensebox_wifi'] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_wifi_tooltip); this.setTooltip(Blockly.Msg.senseBox_wifi_tooltip);
this.setHelpUrl(""); this.setHelpUrl('');
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_connect); this.appendDummyInput()
this.appendDummyInput() .appendField(Blockly.Msg.senseBox_wifi_connect);
.setAlign(Blockly.ALIGN_LEFT) this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_wifi_ssid) .setAlign(Blockly.ALIGN_LEFT)
.appendField(new Blockly.FieldTextInput("SSID"), "SSID"); .appendField(Blockly.Msg.senseBox_wifi_ssid)
this.appendDummyInput() .appendField(new Blockly.FieldTextInput("SSID"), "SSID");
.setAlign(Blockly.ALIGN_LEFT) this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_output_password) .setAlign(Blockly.ALIGN_LEFT)
.appendField(new Blockly.FieldTextInput("Password"), "Password"); .appendField(Blockly.Msg.senseBox_output_password)
this.setHelpUrl(Blockly.Msg.senseBox_wifi_helpurl); .appendField(new Blockly.FieldTextInput("Password"), "Password");
this.setPreviousStatement(true, null); this.setHelpUrl(Blockly.Msg.senseBox_wifi_helpurl)
this.setNextStatement(true, null); this.setPreviousStatement(true, null);
}, this.setNextStatement(true, null);
onchange: function (e) { },
var legal = false; onchange: function (e) {
// Is the block nested in a loop? var legal = false;
var block = this; // Is the block nested in a loop?
do { var block = this;
if (this.LOOP_TYPES.indexOf(block.type) !== -1) { do {
legal = true; if (this.LOOP_TYPES.indexOf(block.type) !== -1) {
break; legal = true;
} break;
block = block.getSurroundParent(); }
} while (block); block = block.getSurroundParent();
if (legal) { } while (block);
this.setWarningText(null); if (legal) {
} else { this.setWarningText(null);
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
} else {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
}
},
LOOP_TYPES: ['arduino_functions'],
};
Blockly.Blocks['sensebox_startap'] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_wifi_startap_tooltip);
this.setHelpUrl('');
this.setColour(getColour().sensebox);
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_wifi_startap);
this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_wifi_ssid)
.appendField(new Blockly.FieldTextInput("SSID"), "SSID");
this.setHelpUrl(Blockly.Msg.senseBox_wifi_helpurl)
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
} }
}, };
LOOP_TYPES: ["arduino_functions"],
};
Blockly.Blocks["sensebox_startap"] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_wifi_startap_tooltip);
this.setHelpUrl("");
this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_startap);
this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_wifi_ssid)
.appendField(new Blockly.FieldTextInput("SSID"), "SSID");
this.setHelpUrl(Blockly.Msg.senseBox_wifi_helpurl);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
},
};
Blockly.Blocks["sensebox_ethernet"] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_ethernet_tooltip);
this.setHelpUrl("");
this.setColour(getColour().sensebox);
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_ethernet)
.appendField(
new Blockly.FieldDropdown([
[Blockly.Msg.senseBox_ethernet_dhcp, "Dhcp"],
[Blockly.Msg.senseBox_ethernet_manuel_config, "Manual"],
]),
"dhcp"
);
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_ethernet_mac)
.appendField(
new Blockly.FieldTextInput("0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED"),
"mac"
);
this.setHelpUrl(Blockly.Msg.senseBox_ethernet_helpurl);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.getField("dhcp").setValidator(
function (val) {
this.updateShape_(val === "Manual");
}.bind(this)
);
},
updateShape_(isManual) {
if (isManual) {
this.appendDummyInput("ip-field")
.appendField(Blockly.Msg.senseBox_ethernet_ip)
.appendField(new Blockly.FieldTextInput("192.168.1.100"), "ip");
this.appendDummyInput("subnetmask-field")
.appendField(Blockly.Msg.senseBox_ethernet_subnetmask)
.appendField(new Blockly.FieldTextInput("255.255.255.0"), "subnetmask");
this.appendDummyInput("gateway-field")
.appendField(Blockly.Msg.senseBox_ethernet_gateway)
.appendField(new Blockly.FieldTextInput("192.168.1.1"), "gateway");
this.appendDummyInput("dns-field")
.appendField(Blockly.Msg.senseBox_ethernet_dns)
.appendField(new Blockly.FieldTextInput("8.8.8.8"), "dns");
} else {
this.removeInput("ip-field", true);
this.removeInput("subnetmask-field", true);
this.removeInput("gateway-field", true);
this.removeInput("dns-field", true);
}
},
};
Blockly.Blocks["sensebox_ethernetIp"] = {
init: function () {
this.appendDummyInput().appendField(Blockly.Msg.senseBox_ethernet_ip);
this.setColour(getColour().sensebox);
this.setHelpUrl(Blockly.Msg.senseBox_ethernetIp_helpurl);
this.setTooltip(Blockly.Msg.senseBox_ethernet_ip_tooltip);
this.setOutput(true, null);
}
};
Blockly.Blocks["sensebox_wifi_status"] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_wifi_status_tooltip);
this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_status);
this.setOutput(true, Types.BOOLEAN.typeName);
this.setHelpUrl(Blockly.Msg.senseBox_wifi_status_helpurl);
},
};
Blockly.Blocks["sensebox_get_ip"] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_wifi_ip_tooltip);
this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_ip);
this.setOutput(true, Types.TEXT.typeName);
this.setHelpUrl(Blockly.Msg.senseBox_wifi_ip_helpurl);
},
};
Blockly.Blocks["sensebox_wifi_rssi"] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_wifi_rssi_tooltip);
this.setColour(getColour().sensebox);
this.appendDummyInput().appendField(Blockly.Msg.senseBox_wifi_rssi);
this.setOutput(true, Types.NUMBER.typeName);
this.setHelpUrl(Blockly.Msg.senseBox_wifi_rssi_helpurl);
},
};

47
src/components/Blockly/blocks/serial.js
View File

@ -1,47 +0,0 @@
import * as Blockly from "blockly/core";
import { getColour } from "../helpers/colour";
import { selectedBoard } from "../helpers/board";
Blockly.Blocks["init_serial_monitor"] = {
init: function () {
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setColour(getColour().serial);
this.setHelpUrl("http://arduino.cc/en/Serial/Begin");
this.appendDummyInput()
.appendField(Blockly.Msg.ARD_SERIAL_SETUP)
.appendField(
new Blockly.FieldDropdown(selectedBoard().serial),
"SERIAL_ID"
)
.appendField(Blockly.Msg.ARD_SERIAL_SPEED)
.appendField(
new Blockly.FieldDropdown(selectedBoard().serialSpeed),
"SPEED"
)
.appendField(Blockly.Msg.ARD_SERIAL_BPS);
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.ARD_SERIAL_SETUP_TIP);
},
};
Blockly.Blocks["print_serial_monitor"] = {
init: function () {
this.setPreviousStatement(true);
this.setNextStatement(true);
this.setColour(getColour().serial);
this.setHelpUrl("http://www.arduino.cc/en/Serial/Print");
this.appendDummyInput()
.appendField(
new Blockly.FieldDropdown(selectedBoard().serial),
"SERIAL_ID"
)
.appendField(Blockly.Msg.ARD_SERIAL_PRINT);
this.appendValueInput("CONTENT");
this.appendDummyInput()
.appendField(new Blockly.FieldCheckbox("TRUE"), "NEW_LINE")
.appendField(Blockly.Msg.ARD_SERIAL_PRINT_NEWLINE);
this.setInputsInline(true);
this.setTooltip(Blockly.Msg.ARD_SERIAL_PRINT_TIP);
},
};

228
src/components/Blockly/blocks/time.js
View File

@ -8,135 +8,123 @@
* The arduino built in functions syntax can be found in * The arduino built in functions syntax can be found in
* http://arduino.cc/en/Reference/HomePage * http://arduino.cc/en/Reference/HomePage
*/ */
import Blockly from "blockly"; import Blockly from 'blockly';
import { getColour } from "../helpers/colour"; import { getColour } from '../helpers/colour'
import * as Types from "../helpers/types"; import * as Types from '../helpers/types'
Blockly.Blocks["time_delay"] = {
/** Blockly.Blocks['time_delay'] = {
* Delay block definition /**
* @this Blockly.Block * Delay block definition
*/ * @this Blockly.Block
init: function () { */
this.setHelpUrl("http://arduino.cc/en/Reference/Delay"); init: function () {
this.setColour(getColour().time); this.setHelpUrl('http://arduino.cc/en/Reference/Delay');
this.appendValueInput("DELAY_TIME_MILI") this.setColour(getColour().time);
.setCheck(Types.NUMBER.checkList) this.appendValueInput('DELAY_TIME_MILI')
.appendField(Blockly.Msg.ARD_TIME_DELAY); .setCheck(Types.NUMBER.checkList)
this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_MS); .appendField(Blockly.Msg.ARD_TIME_DELAY);
this.setInputsInline(true); this.appendDummyInput()
this.setPreviousStatement(true, null); .appendField(Blockly.Msg.ARD_TIME_MS);
this.setNextStatement(true, null); this.setInputsInline(true);
this.setTooltip(Blockly.Msg.ARD_TIME_DELAY_TIP); this.setPreviousStatement(true, null);
}, this.setNextStatement(true, null);
this.setTooltip(Blockly.Msg.ARD_TIME_DELAY_TIP);
}
}; };
Blockly.Blocks["time_delaymicros"] = { Blockly.Blocks['time_delaymicros'] = {
/** /**
* delayMicroseconds block definition * delayMicroseconds block definition
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/DelayMicroseconds"); this.setHelpUrl('http://arduino.cc/en/Reference/DelayMicroseconds');
this.setColour(getColour().time); this.setColour(getColour().time);
this.appendValueInput("DELAY_TIME_MICRO") this.appendValueInput('DELAY_TIME_MICRO')
.setCheck(Types.NUMBER.checkList) .setCheck(Types.NUMBER.checkList)
.appendField(Blockly.Msg.ARD_TIME_DELAY); .appendField(Blockly.Msg.ARD_TIME_DELAY);
this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_DELAY_MICROS); this.appendDummyInput()
this.setInputsInline(true); .appendField(Blockly.Msg.ARD_TIME_DELAY_MICROS);
this.setPreviousStatement(true, null); this.setInputsInline(true);
this.setNextStatement(true, null); this.setPreviousStatement(true, null);
this.setTooltip(Blockly.Msg.ARD_TIME_DELAY_MICRO_TIP); this.setNextStatement(true, null);
}, this.setTooltip(Blockly.Msg.ARD_TIME_DELAY_MICRO_TIP);
}
}; };
Blockly.Blocks["time_millis"] = { Blockly.Blocks['time_millis'] = {
/** /**
* Elapsed time in milliseconds block definition * Elapsed time in milliseconds block definition
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/Millis"); this.setHelpUrl('http://arduino.cc/en/Reference/Millis');
this.setColour(getColour().time); this.setColour(getColour().time);
this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_MILLIS); this.appendDummyInput()
this.setOutput(true, Types.LARGE_NUMBER.typeName); .appendField(Blockly.Msg.ARD_TIME_MILLIS);
this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP); this.setOutput(true, Types.LARGE_NUMBER.typeId);
}, this.setTooltip(Blockly.Msg.ARD_TIME_MILLIS_TIP);
/** @return {string} The type of return value for the block, an integer. */ },
getBlockType: function () { /** @return {string} The type of return value for the block, an integer. */
return Blockly.Types.LARGE_NUMBER; getBlockType: function () {
}, return Blockly.Types.LARGE_NUMBER;
}
}; };
Blockly.Blocks["time_micros"] = { Blockly.Blocks['time_micros'] = {
/** /**
* Elapsed time in microseconds block definition * Elapsed time in microseconds block definition
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl("http://arduino.cc/en/Reference/Micros"); this.setHelpUrl('http://arduino.cc/en/Reference/Micros');
this.setColour(getColour().time); this.setColour(getColour().time);
this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_MICROS); this.appendDummyInput()
this.setOutput(true, Types.LARGE_NUMBER.typeName); .appendField(Blockly.Msg.ARD_TIME_MICROS);
this.setTooltip(Blockly.Msg.ARD_TIME_MICROS_TIP); this.setOutput(true, Types.LARGE_NUMBER.typeId);
}, this.setTooltip(Blockly.Msg.ARD_TIME_MICROS_TIP);
/** },
* Should be a long (32bit), but for for now an int. /**
* @return {string} The type of return value for the block, an integer. * Should be a long (32bit), but for for now an int.
*/ * @return {string} The type of return value for the block, an integer.
getBlockType: function () { */
return Types.LARGE_NUMBER; getBlockType: function () {
}, return Types.LARGE_NUMBER;
}
}; };
Blockly.Blocks["infinite_loop"] = { Blockly.Blocks['infinite_loop'] = {
/** /**
* Waits forever, end of program. * Waits forever, end of program.
* @this Blockly.Block * @this Blockly.Block
*/ */
init: function () { init: function () {
this.setHelpUrl(""); this.setHelpUrl('');
this.setColour(getColour().time); this.setColour(getColour().time);
this.appendDummyInput().appendField(Blockly.Msg.ARD_TIME_INF); this.appendDummyInput()
this.setInputsInline(true); .appendField(Blockly.Msg.ARD_TIME_INF);
this.setPreviousStatement(true); this.setInputsInline(true);
this.setTooltip(Blockly.Msg.ARD_TIME_INF_TIP); this.setPreviousStatement(true);
}, this.setTooltip(Blockly.Msg.ARD_TIME_INF_TIP);
}
}; };
// Blockly.Blocks["sensebox_interval_timer"] = { Blockly.Blocks['sensebox_interval_timer'] = {
// init: function () { init: function () {
// this.setTooltip(Blockly.Msg.senseBox_interval_timer_tip); this.setTooltip(Blockly.Msg.senseBox_interval_timer_tip);
// this.setInputsInline(true); this.setInputsInline(true);
// this.setHelpUrl(""); this.setHelpUrl('');
// this.setColour(getColour().time); this.setColour(getColour().time);
// this.appendDummyInput().appendField(Blockly.Msg.senseBox_interval_timer); this.appendDummyInput()
// this.appendDummyInput() .appendField(Blockly.Msg.senseBox_interval_timer);
// .setAlign(Blockly.ALIGN_LEFT) this.appendDummyInput()
// .appendField(new Blockly.FieldTextInput("10000"), "interval") .setAlign(Blockly.ALIGN_LEFT)
// .appendField(Blockly.Msg.senseBox_interval); .appendField(new Blockly.FieldTextInput("10000"), "interval")
// this.appendStatementInput("DO").setCheck(null); .appendField(Blockly.Msg.senseBox_interval);
// this.setPreviousStatement(true, null); this.appendStatementInput('DO')
// this.setNextStatement(true, null); .setCheck(null);
// }, this.setPreviousStatement(true, null);
// }; this.setNextStatement(true, null);
}
Blockly.Blocks["sensebox_interval_timer"] = {
init: function () {
this.setTooltip(Blockly.Msg.senseBox_interval_timer_tip);
this.setInputsInline(true);
this.setHelpUrl("");
this.setColour(getColour().time);
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_interval_timer)
.appendField(new Blockly.FieldTextInput("Interval"), "name");
this.appendDummyInput()
.appendField(Blockly.Msg.senseBox_interval_time)
.setAlign(Blockly.ALIGN_LEFT)
.appendField(new Blockly.FieldTextInput("10000"), "interval")
.appendField(Blockly.Msg.senseBox_interval);
this.appendStatementInput("DO").setCheck(null);
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
},
}; };

4
src/components/Blockly/blocks/variables.js
View File

@ -9,10 +9,10 @@ Blockly.Blocks["variables_set_dynamic"] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
this.appendValueInput("VALUE") this.appendValueInput("VALUE")
.appendField(Blockly.Msg.variables_set, Blockly.Msg.variables_set) .appendField("set", "set")
.appendField("", "type") .appendField("", "type")
.appendField(new Blockly.FieldVariable("VAR"), "VAR") .appendField(new Blockly.FieldVariable("VAR"), "VAR")
.appendField(Blockly.Msg.variables_to); .appendField("to");
}, },
onchange: function (e) { onchange: function (e) {
let variableID = this.getFieldValue("VAR"); let variableID = this.getFieldValue("VAR");

28
src/components/Blockly/blocks/watchdog.js
View File

@ -1,28 +0,0 @@
import Blockly from "blockly/core";
import { getColour } from "../helpers/colour";
Blockly.Blocks["watchdog_enable"] = {
init: function () {
this.appendDummyInput()
.appendField("Watchdog aktivieren")
.appendField(new Blockly.FieldTextInput("10000"), "TIME")
.appendField("ms");
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().io);
this.setTooltip("");
this.setHelpUrl("");
},
};
Blockly.Blocks["watchdog_reset"] = {
init: function () {
this.appendDummyInput().appendField("Watchdog zurücksetzen");
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setColour(getColour().io);
this.setTooltip("");
this.setHelpUrl("");
},
};

61
src/components/Blockly/generator/CleVerLab.js
View File

@ -1,61 +0,0 @@
import Blockly from "blockly";
/**
* starte/stoppe Pumpe
*
*/
Blockly.Arduino.CleVerLab_pump = function (block) {
var pin = block.getFieldValue('DigitalPin');
var state = block.getFieldValue("Mode");
Blockly['Arduino'].setupCode_['pinMode'] = 'pinMode(' + pin + ', OUTPUT);';
var code = 'digitalWrite(' + pin + ', ' + state + ');\n';
return code;
};
/**
* PH wert
*
*/
Blockly.Arduino.CleVerLab_temperature = function () {
var dropdown_pin = this.getFieldValue("DigitalPort");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_["library_oneWire"] =
"#include <OneWire.h> // http://librarymanager/All#OneWire";
Blockly.Arduino.libraries_["library_oneDallasTemperature"] =
"#include <DallasTemperature.h> // http://librarymanager/All#DallasTemperature";
Blockly.Arduino.definitions_["define_OneWire"] =
"#define ONE_WIRE_BUS " +
dropdown_pin +
"\nOneWire oneWire(ONE_WIRE_BUS);\nDallasTemperature sensors(&oneWire);";
Blockly.Arduino.setupCode_["sensebox_oneWireSetup"] = "sensors.begin();";
Blockly.Arduino.codeFunctions_["sensebox_requestTemp"] =
"float getWaterTemp(){\nsensors.requestTemperatures();\nsensors.getTempCByIndex(0);\n}";
var code = "getWaterTemp()";
return [code, Blockly.Arduino.ORDER_ATOMIC];
};
Blockly.Arduino.CleVerLab_pH = function () {
var dropdown_pin = this.getFieldValue("DigitalPin");
Blockly.Arduino.definitions_["define_pHgetter"] =
"#define SensorPin " + dropdown_pin +"\n#define samplingInterval 20\n#define printInterval 800\n#define ArrayLenth 40 //times of collection\nint pHArray[ArrayLenth]; //Store the average value of the sensor feedback\nint pHArrayIndex=0;\nfloat slope = 1.00;\nfloat b =0.00;";
Blockly.Arduino.codeFunctions_["sensebox_requestpH"] =
"float getpH(){\nstatic unsigned long samplingTime = millis();\nstatic unsigned long printTime = millis();\nstatic float pHValue,voltage;\n//nif(millis()-samplingTime > samplingInterval){\n//pHArray[pHArrayIndex++]=analogRead(SensorPin);\nfor (int i = 1; i <= 10; i += 1) {\nvoltage = voltage + analogRead(SensorPin);\n}\n voltage = (voltage / 10)*5.0/1024; \nsamplingTime=millis();\n\nreturn pHValue = 3.5*voltage*slope+b;\n}\n";
Blockly.Arduino.codeFunctions_["avergearraypH"] =
"double avergearray(int* arr, int number) {\n int i;\n int max, min;\n double avg;\n long amount = 0;\n if (number <= 0) {\n return 0;\n }\n if (number < 5) {\n for (i = 0; i < number; i++) {\n amount += arr[i];\n }\n avg = amount / number;\n return avg;\n }\n else {\n if (arr[0] < arr[1]) {\n min = arr[0];\n max = arr[1];\n }\n else {\n min = arr[1];\n max = arr[0];\n }\n for (i = 2; i < number; i++) {\n if (arr[i] < min) {\n amount += min;\n min = arr[i];\n }\n else {\n if (arr[i] > max) {\n amount += max;\n max = arr[i];\n }\n else {\n amount += arr[i];\n }\n }\n }\n avg = (double)amount / (number - 2);\n }\n return avg;\n}";
var code = "getpH()";
return [code, Blockly.Arduino.ORDER_ATOMIC];
};
Blockly.Arduino.CleVerLab_cali1 = function () {
var var1 = Blockly.Arduino.valueToCode(this, 'VAR1', Blockly.Arduino.ORDER_ATOMIC) || "4.00";
var var2 = Blockly.Arduino.valueToCode(this, 'VAR2', Blockly.Arduino.ORDER_ATOMIC) || "7.00";
//var var1 = this.getFieldValue("VAR1");
//var var2 = this.getFieldValue("VAR2");
Blockly.Arduino.definitions_["define_pHKali"] = "#define pH4 4.00\n#define pH7 7.00\nfloat pH4is = "+ var1+";\nfloat pH7is = "+ var2 +";";
Blockly.Arduino.setupCode_["asdsadsa"] ="slope = (2.00-(4.00/3.50))/(pH7is/3.50 - pH4is/3.50);\n b = 7 - (pH7is * slope);";
var code = "0";
return [code, Blockly.Arduino.ORDER_ATOMIC];
};

136
src/components/Blockly/generator/generator.js
View File

@ -26,17 +26,6 @@
import * as Blockly from "blockly/core"; import * as Blockly from "blockly/core";
import store from "../../../store";
var ota = store.getState().general.platform
? store.getState().general.platform
: null;
store.subscribe(() => {
ota = store.getState().general.platform
? store.getState().general.platform
: null;
});
/** /**
* Arduino code generator. * Arduino code generator.
* @type !Blockly.Generator * @type !Blockly.Generator
@ -62,7 +51,9 @@ Blockly["Arduino"].addReservedWords(
"pulseIn,millis,micros,delay,delayMicroseconds,min,max,abs,constrain," + "pulseIn,millis,micros,delay,delayMicroseconds,min,max,abs,constrain," +
"map,pow,sqrt,sin,cos,tan,randomSeed,random,lowByte,highByte,bitRead," + "map,pow,sqrt,sin,cos,tan,randomSeed,random,lowByte,highByte,bitRead," +
"bitWrite,bitSet,bitClear,ultraSonicDistance,parseDouble,setNeoPixelColor," + "bitWrite,bitSet,bitClear,ultraSonicDistance,parseDouble,setNeoPixelColor," +
"bit,attachInterrupt,detachInterrupt,interrupts,noInterrupts,short,isBtnPressed" "bit,attachInterrupt,detachInterrupt,interrupts,noInterrupts",
"short",
"isBtnPressed"
); );
/** /**
@ -130,25 +121,71 @@ Blockly["Arduino"].init = function (workspace) {
Blockly["Arduino"].variablesInitCode_ = ""; Blockly["Arduino"].variablesInitCode_ = "";
if (!Blockly["Arduino"].nameDB_) { if (!Blockly["Arduino"].variableDB_) {
Blockly["Arduino"].nameDB_ = new Blockly.Names( Blockly["Arduino"].variableDB_ = new Blockly.Names(
Blockly["Arduino"].RESERVED_WORDS_ Blockly["Arduino"].RESERVED_WORDS_
); );
} else { } else {
Blockly["Arduino"].nameDB_.reset(); Blockly["Arduino"].variableDB_.reset();
} }
Blockly["Arduino"].nameDB_.setVariableMap(workspace.getVariableMap()); Blockly["Arduino"].variableDB_.setVariableMap(workspace.getVariableMap());
// We don't have developer variables for now // We don't have developer variables for now
// // Add developer variables (not created or named by the user). // // Add developer variables (not created or named by the user).
// var devVarList = Blockly.Variables.allDeveloperVariables(workspace); // var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
// for (var i = 0; i < devVarList.length; i++) { // for (var i = 0; i < devVarList.length; i++) {
// defvars.push(Blockly['Arduino'].nameDB_.getName(devVarList[i], // defvars.push(Blockly['Arduino'].variableDB_.getName(devVarList[i],
// Blockly.Names.DEVELOPER_VARIABLE_TYPE)); // 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 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 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;
}; };
/** /**
@ -217,49 +254,26 @@ Blockly["Arduino"].finish = function (code) {
"\n}\n"; "\n}\n";
let loopCode = "\nvoid loop() { \n" + loopCodeOnce + code + "\n}\n"; let loopCode = "\nvoid loop() { \n" + loopCodeOnce + code + "\n}\n";
// only add OTA code if tablet mode is enabled
if (ota === true) { // Convert the definitions dictionary into a list.
code = code =
devVariables + devVariables +
"\n" + "\n" +
"#include <SenseBoxOTA.h>" + libraryCode +
"\n" + "\n" +
libraryCode + variablesCode +
"\n" + "\n" +
variablesCode + definitionsCode +
"\n" + "\n" +
definitionsCode + codeFunctions +
"\n" + "\n" +
codeFunctions + Blockly["Arduino"].variablesInitCode_ +
"\n" + "\n" +
Blockly["Arduino"].variablesInitCode_ + functionsCode +
"\n" + "\n" +
functionsCode + setupCode +
"\n" + "\n" +
setupCode + loopCode;
"\n" +
loopCode;
} else {
// 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. // Clean up temporary data.
delete Blockly["Arduino"].definitions_; delete Blockly["Arduino"].definitions_;
@ -267,7 +281,7 @@ Blockly["Arduino"].finish = function (code) {
delete Blockly["Arduino"].loopCodeOnce_; delete Blockly["Arduino"].loopCodeOnce_;
delete Blockly["Arduino"].variablesInitCode_; delete Blockly["Arduino"].variablesInitCode_;
delete Blockly["Arduino"].libraries_; delete Blockly["Arduino"].libraries_;
Blockly["Arduino"].nameDB_.reset(); Blockly["Arduino"].variableDB_.reset();
return code; return code;
}; };

5
src/components/Blockly/generator/index.js
View File

@ -5,12 +5,10 @@ import "./sensebox-telegram";
import "./sensebox-osem"; import "./sensebox-osem";
import "./sensebox-web"; import "./sensebox-web";
import "./sensebox-display"; import "./sensebox-display";
import "./sensebox-motors";
import "./sensebox-lora"; import "./sensebox-lora";
import "./sensebox-led"; import "./sensebox-led";
import "./sensebox"; import "./sensebox";
import "./sensebox-rtc"; import "./sensebox-rtc";
import "./sensebox-ntp";
import "./sensebox-ble"; import "./sensebox-ble";
import "./sensebox-sd"; import "./sensebox-sd";
import "./mqtt"; import "./mqtt";
@ -21,10 +19,7 @@ import "./map";
import "./io"; import "./io";
import "./audio"; import "./audio";
import "./procedures"; import "./procedures";
import "./serial";
import "./time"; import "./time";
import "./variables"; import "./variables";
import "./lists"; import "./lists";
import "./watchdog";
import "./webserver"; import "./webserver";
import "./CleVerLab"

13
src/components/Blockly/generator/math.js
View File

@ -275,15 +275,10 @@ Blockly.Arduino["math_change"] = function (block) {
"DELTA", "DELTA",
Blockly.Arduino.ORDER_ADDITIVE Blockly.Arduino.ORDER_ADDITIVE
) || "0"; ) || "0";
var id = block.getFieldValue("VAR") var varName = Blockly.Arduino.variableDB_.getName(
const varName = Blockly.Variables.getVariable( block.getFieldValue("VAR"),
Blockly.getMainWorkspace(), Blockly.Variables.NAME_TYPE
id );
).name;
// var varName = Blockly.Arduino.nameDB_.getName(
// block.getFieldValue("VAR"),
// Blockly.Variables.NAME_TYPE
// );
return varName + " += " + argument0 + ";\n"; return varName + " += " + argument0 + ";\n";
}; };

142
src/components/Blockly/generator/mqtt.js
View File

@ -1,77 +1,52 @@
import * as Blockly from "blockly/core"; import * as Blockly from 'blockly/core';
/** /**
* MQTT Blocks * MQTT Blocks
*/ */
let service; let service;
Blockly.Arduino.sensebox_mqtt_setup = function () { Blockly.Arduino.sensebox_mqtt_setup = function () {
var server = this.getFieldValue("server"); var server = this.getFieldValue('server');
var port = this.getFieldValue("port"); var port = this.getFieldValue('port');
var username = this.getFieldValue("username"); var username = this.getFieldValue('username');
var pass = this.getFieldValue("password"); var pass = this.getFieldValue('password');
service = this.getFieldValue("service"); service = this.getFieldValue('service');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_adafruitmqtt"] = Blockly.Arduino.libraries_['library_adafruitmqtt'] = '#include "Adafruit_MQTT.h"';
'#include <Adafruit_MQTT.h> //http://librarymanager/All#Adafruit_MQTT_Library"'; Blockly.Arduino.libraries_['library_adafruitmqttclient'] = '#include "Adafruit_MQTT_Client.h"';
Blockly.Arduino.libraries_["library_adafruitmqttclient"] = Blockly.Arduino.definitions_['mqtt_server'] = '#define SERVER "' + server + '"';
'#include <Adafruit_MQTT_Client.h>'; Blockly.Arduino.definitions_['mqtt_port'] = '#define SERVERPORT ' + port + '';
Blockly.Arduino.definitions_["mqtt_server"] = Blockly.Arduino.definitions_['mqtt_username'] = '#define USERNAME "' + username + '"';
'#define SERVER "' + server + '"'; Blockly.Arduino.definitions_['mqtt_pass'] = '#define PASS "' + pass + '"';
Blockly.Arduino.definitions_["mqtt_port"] = Blockly.Arduino.definitions_['wifi_client'] = 'WiFiClient client;';
"#define SERVERPORT " + port + ""; Blockly.Arduino.definitions_['mqtt_client'] = 'Adafruit_MQTT_Client mqtt(&client, SERVER, SERVERPORT, USERNAME, PASS);'
Blockly.Arduino.definitions_["mqtt_username"] = var code = '';
'#define USERNAME "' + username + '"'; return code;
Blockly.Arduino.definitions_["mqtt_pass"] =
'#define PASS "' + pass + '"';
Blockly.Arduino.definitions_["wifi_client"] = "WiFiClient client;";
Blockly.Arduino.definitions_["mqtt_client"] =
"Adafruit_MQTT_Client mqtt(&client, SERVER, SERVERPORT, USERNAME, PASS);";
var code = "";
return code;
}; };
Blockly.Arduino.sensebox_mqtt_publish = function (block) { Blockly.Arduino.sensebox_mqtt_publish = function (block) {
var feedname = this.getFieldValue("publishfeed"); var feedname = this.getFieldValue('publishfeed');
var res = feedname.split("/"); var res = feedname.split("/");
var feed_client = res[res.length - 1]; var feed_client = res[res.length - 1];
var value = var value = Blockly.Arduino.valueToCode(this, 'value', Blockly.Arduino.ORDER_ATOMIC) || '"No Block connected"';
Blockly.Arduino.valueToCode(this, "value", Blockly.Arduino.ORDER_ATOMIC) ||
'"No Block connected"';
switch (service) { switch (service) {
case "adafruitio": case 'adafruitio':
Blockly.Arduino.definitions_["mqtt_" + feed_client + ""] = Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, USERNAME "/feeds/' + feedname + '");'
"Adafruit_MQTT_Publish " + break;
feed_client + case 'dioty':
' = Adafruit_MQTT_Publish(&mqtt, USERNAME "/feeds/' + Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, "/"USERNAME"/' + feedname + '");'
feedname + break;
'");'; case 'custom':
break; Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, "' + feedname + '");'
case "dioty": break;
Blockly.Arduino.definitions_["mqtt_" + feed_client + ""] = default:
"Adafruit_MQTT_Publish " + break;
feed_client +
' = Adafruit_MQTT_Publish(&mqtt, "/"USERNAME"/' +
feedname +
'");';
break;
case "custom":
Blockly.Arduino.definitions_["mqtt_" + feed_client + ""] =
"Adafruit_MQTT_Publish " +
feed_client +
' = Adafruit_MQTT_Publish(&mqtt, "' +
feedname +
'");';
break;
default:
break;
}
//Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, USERNAME "/feeds/' + feedname + '");' }
Blockly.Arduino.codeFunctions_[
"mqtt_connect_function" //Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Publish ' + feed_client + ' = Adafruit_MQTT_Publish(&mqtt, USERNAME "/feeds/' + feedname + '");'
] = `// Function to connect and reconnect as necessary to the MQTT server. Blockly.Arduino.codeFunctions_['mqtt_connect_function'] = `// Function to connect and reconnect as necessary to the MQTT server.
// Should be called in the loop function and it will take care if connecting. // Should be called in the loop function and it will take care if connecting.
void MQTT_connect() { void MQTT_connect() {
int8_t ret; int8_t ret;
@ -84,34 +59,23 @@ void MQTT_connect() {
delay(5000); // wait 5 seconds delay(5000); // wait 5 seconds
} }
}`; }`;
Blockly.Arduino.loopCodeOnce_["mqtt_connect"] = "MQTT_connect();"; Blockly.Arduino.loopCodeOnce_['mqtt_connect'] = 'MQTT_connect();';
var code = "" + feed_client + ".publish(" + value + ");"; var code = '' + feed_client + '.publish(' + value + ');';
return code; return code
}; };
Blockly.Arduino.sensebox_mqtt_subscribe = function (block) { Blockly.Arduino.sensebox_mqtt_subscribe = function (block) {
var feedname = this.getFieldValue("subscribefeed"); var feedname = this.getFieldValue('subscribefeed');
var x = 5, var x = 5, feed_client;
feed_client; feed_client = feedname.substr(feedname.length - x, x);
feed_client = feedname.substr(feedname.length - x, x); Blockly.Arduino.definitions_['mqtt_' + feed_client + ''] = 'Adafruit_MQTT_Subscribe ' + feed_client + '= Adafruit_MQTT_Subscribe(&mqtt,' + feedname + ');';
Blockly.Arduino.definitions_["mqtt_" + feed_client + ""] = Blockly.Arduino.codeFunctions_['mqtt_' + feed_client + 'callbackFunction'] = `void ` + feed_client + `Callback (double x){
"Adafruit_MQTT_Subscribe " +
feed_client +
"= Adafruit_MQTT_Subscribe(&mqtt," +
feedname +
");";
Blockly.Arduino.codeFunctions_["mqtt_" + feed_client + "callbackFunction"] =
`void ` +
feed_client +
`Callback (double x){
Serial.println(x); Serial.println(x);
}`; }`;
Blockly.Arduino.setupCode_["mqtt_" + feed_client + "_callback"] = Blockly.Arduino.setupCode_['mqtt_' + feed_client + '_callback'] = '' + feed_client + '.setCallback(' + feed_client + 'Callback);';
"" + feed_client + ".setCallback(" + feed_client + "Callback);"; Blockly.Arduino.setupCode_['mqtt_' + feed_client + '_subscribe'] = 'mqtt.subscribe(&' + feed_client + ');';
Blockly.Arduino.setupCode_["mqtt_" + feed_client + "_subscribe"] = Blockly.Arduino.loopCodeOnce_['mqtt_processPackages'] = 'mqtt.processPackets(10);';
"mqtt.subscribe(&" + feed_client + ");"; var code = '';
Blockly.Arduino.loopCodeOnce_["mqtt_processPackages"] = return code;
"mqtt.processPackets(10);";
var code = "";
return code;
}; };

210
src/components/Blockly/generator/procedures.js
View File

@ -1,4 +1,5 @@
import * as Blockly from "blockly/core"; import * as Blockly from 'blockly/core';
/** /**
* Code generator to add code into the setup() and loop() functions. * Code generator to add code into the setup() and loop() functions.
@ -6,122 +7,121 @@ import * as Blockly from "blockly/core";
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {string} Completed code. * @return {string} Completed code.
*/ */
Blockly.Arduino["arduino_functions"] = function (block) { Blockly.Arduino['arduino_functions'] = function (block) {
// Edited version of Blockly.Generator.prototype.statementToCode // Edited version of Blockly.Generator.prototype.statementToCode
function statementToCodeNoTab(block, name) { function statementToCodeNoTab(block, name) {
var targetBlock = block.getInputTargetBlock(name); var targetBlock = block.getInputTargetBlock(name);
var code = Blockly.Arduino.blockToCode(targetBlock); var code = Blockly.Arduino.blockToCode(targetBlock);
if (typeof code != "string") { if (typeof code != 'string') {
throw new Error( throw new Error('Expecting code from statement block "' + targetBlock.type + '".');
'Expecting code from statement block "' + targetBlock.type + '".' }
); return code;
} }
return code;
}
var setupBranch = Blockly.Arduino.statementToCode(block, "SETUP_FUNC"); var setupBranch = Blockly.Arduino.statementToCode(block, 'SETUP_FUNC');
// //var setupCode = Blockly.Arduino.scrub_(block, setupBranch); No comment block // //var setupCode = Blockly.Arduino.scrub_(block, setupBranch); No comment block
if (setupBranch) { if (setupBranch) {
Blockly.Arduino.setupCode_["mainsetup"] = setupBranch; Blockly.Arduino.setupCode_['mainsetup'] = setupBranch;
} }
var loopBranch = statementToCodeNoTab(block, "LOOP_FUNC"); var loopBranch = statementToCodeNoTab(block, 'LOOP_FUNC');
//var loopcode = Blockly.Arduino.scrub_(block, loopBranch); No comment block //var loopcode = Blockly.Arduino.scrub_(block, loopBranch); No comment block
return loopBranch; return loopBranch;
}; };
Blockly.Arduino["procedures_defreturn"] = function (block) { Blockly.Arduino['procedures_defreturn'] = function (block) {
// Define a procedure with a return value. // Define a procedure with a return value.
const funcName = Blockly.Arduino.nameDB_.getName( const funcName = Blockly.Arduino.variableDB_.getName(
block.getFieldValue("NAME"), block.getFieldValue('NAME'),
Blockly.Procedures.NAME_TYPE Blockly.Procedures.NAME_TYPE
); );
const branch = Blockly.Arduino.statementToCode(block, "STACK"); const branch = Blockly.Arduino.statementToCode(block, 'STACK');
const returnType = block.getFieldValue("RETURN TYPE") || "void"; const returnType = block.getFieldValue('RETURN TYPE') || 'void';
let returnValue = let returnValue =
Blockly.Arduino.valueToCode(block, "RETURN", Blockly.Arduino.ORDER_NONE) || Blockly.Arduino.valueToCode(block, 'RETURN', Blockly.Arduino.ORDER_NONE) ||
""; '';
if (returnValue) { if (returnValue) {
returnValue = Blockly.Arduino.INDENT + "return " + returnValue + ";\n"; returnValue = Blockly.Arduino.INDENT + 'return ' + returnValue + ';\n';
} }
const args = []; const args = [];
for (let i = 0; i < block.argumentVarModels_.length; i++) { for (let i = 0; i < block.argumentVarModels_.length; i++) {
args[i] = args[i] =
translateType(block.argumentVarModels_[i].type) + translateType(block.argumentVarModels_[i].type) +
" " + ' ' +
block.argumentVarModels_[i].name; block.argumentVarModels_[i].name;
} }
let code = let code =
translateType(returnType) + translateType(returnType) +
" " + ' ' +
funcName + funcName +
"(" + '(' +
args.join(", ") + args.join(', ') +
") {\n" + ') {\n' +
branch + branch +
returnValue + returnValue +
"}"; '}';
code = Blockly.Arduino.scrub_(block, code); code = Blockly.Arduino.scrub_(block, code);
// Add % so as not to collide with helper functions in definitions list. // Add % so as not to collide with helper functions in definitions list.
Blockly.Arduino.functionNames_["%" + funcName] = code; Blockly.Arduino.functionNames_['%' + funcName] = code;
return null; return null;
}; };
function translateType(type) { function translateType(type) {
switch (type) { switch (type) {
case "int":
return "int"; case 'int':
case "String": return 'int';
return "String"; case 'String':
case "void": return 'String';
return "void"; case 'void':
case "boolean": return 'void';
return "boolean"; case 'boolean':
case "float": return 'boolean';
return "float"; case 'float':
default: return 'float'
throw new Error("Invalid Parameter Type"); default:
} throw new Error('Invalid Parameter Type');
}
} }
Blockly.Arduino["procedures_defnoreturn"] = Blockly.Arduino['procedures_defnoreturn'] =
Blockly.Arduino["procedures_defreturn"]; Blockly.Arduino['procedures_defreturn'];
Blockly.Arduino["procedures_callreturn"] = function (block) { Blockly.Arduino['procedures_callreturn'] = function (block) {
// Call a procedure with a return value. // Call a procedure with a return value.
const funcName = Blockly.Arduino.nameDB_.getName( const funcName = Blockly.Arduino.variableDB_.getName(
block.getFieldValue("NAME"), block.getFieldValue('NAME'),
Blockly.Procedures.NAME_TYPE Blockly.Procedures.NAME_TYPE
); );
const args = []; const args = [];
for (let i = 0; i < block.arguments_.length; i++) { for (let i = 0; i < block.arguments_.length; i++) {
args[i] = args[i] =
Blockly.Arduino.valueToCode( Blockly.Arduino.valueToCode(
block, block,
"ARG" + i, 'ARG' + i,
Blockly.Arduino.ORDER_COMMA Blockly.Arduino.ORDER_COMMA
) || "null"; ) || 'null';
} }
const code = funcName + "(" + args.join(", ") + ")"; const code = funcName + '(' + args.join(', ') + ')';
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
Blockly.Arduino["procedures_callnoreturn"] = function (block) { Blockly.Arduino['procedures_callnoreturn'] = function (block) {
// Call a procedure with no return value. // Call a procedure with no return value.
const funcName = Blockly.Arduino.nameDB_.getName( const funcName = Blockly.Arduino.variableDB_.getName(
block.getFieldValue("NAME"), block.getFieldValue('NAME'),
Blockly.Procedures.NAME_TYPE Blockly.Procedures.NAME_TYPE
); );
const args = []; const args = [];
for (let i = 0; i < block.arguments_.length; i++) { for (let i = 0; i < block.arguments_.length; i++) {
args[i] = args[i] =
Blockly.Arduino.valueToCode( Blockly.Arduino.valueToCode(
block, block,
"ARG" + i, 'ARG' + i,
Blockly.Arduino.ORDER_COMMA Blockly.Arduino.ORDER_COMMA
) || "null"; ) || 'null';
} }
return funcName + "(" + args.join(", ") + ");\n"; return funcName + '(' + args.join(', ') + ');\n';
}; };

9
src/components/Blockly/generator/sensebox-ble.js
View File

@ -2,8 +2,9 @@ import * as Blockly from "blockly/core";
Blockly.Arduino.sensebox_phyphox_init = function () { Blockly.Arduino.sensebox_phyphox_init = function () {
var name = this.getFieldValue("devicename"); var name = this.getFieldValue("devicename");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_["phyphox_library"] = `#include <phyphoxBle.h>`; Blockly.Arduino.libraries_["phyphox_library"] = `#include <phyphoxBle.h>`;
Blockly.Arduino.libraries_["library_senseBoxMCU"] =
'#include "SenseBoxMCU.h"';
Blockly.Arduino.phyphoxSetupCode_[ Blockly.Arduino.phyphoxSetupCode_[
"phyphox_start" "phyphox_start"
] = `PhyphoxBLE::start("${name}");`; ] = `PhyphoxBLE::start("${name}");`;
@ -90,9 +91,7 @@ Blockly.Arduino.sensebox_phyphox_graph = function () {
code += `${label}.setUnitY("${unity}");\n`; code += `${label}.setUnitY("${unity}");\n`;
code += `${label}.setLabelX("${labelx}");\n`; code += `${label}.setLabelX("${labelx}");\n`;
code += `${label}.setLabelY("${labely}");\n`; code += `${label}.setLabelY("${labely}");\n`;
if (style === "dots"){ code += `${label}.setStyle("${style}");\n`;
code += `${label}.setStyle("${style}");\n`;
}
code += `${label}.setChannel(${channelX}, ${channelY});\n`; code += `${label}.setChannel(${channelX}, ${channelY});\n`;
code += `firstView.addElement(${label});\n`; code += `firstView.addElement(${label});\n`;
return code; return code;
@ -101,6 +100,7 @@ Blockly.Arduino.sensebox_phyphox_graph = function () {
Blockly.Arduino.sensebox_phyphox_experiment_send = function () { Blockly.Arduino.sensebox_phyphox_experiment_send = function () {
var branch = Blockly.Arduino.statementToCode(this, "sendValues"); var branch = Blockly.Arduino.statementToCode(this, "sendValues");
var blocks = this.getDescendants(); var blocks = this.getDescendants();
console.log(blocks);
var count = 0; var count = 0;
if (blocks !== undefined) { if (blocks !== undefined) {
for (var i = 0; i < blocks.length; i++) { for (var i = 0; i < blocks.length; i++) {
@ -114,6 +114,7 @@ Blockly.Arduino.sensebox_phyphox_experiment_send = function () {
var string = ""; var string = "";
for (var j = 1; j <= count; j++) { for (var j = 1; j <= count; j++) {
console.log("append");
if (string === "") { if (string === "") {
string += `channel${j}`; string += `channel${j}`;
} else if (string !== "") { } else if (string !== "") {

276
src/components/Blockly/generator/sensebox-display.js
View File

@ -1,79 +1,45 @@
import * as Blockly from "blockly/core"; import * as Blockly from 'blockly/core';
/*Display Blocks*/ /*Display Blocks*/
Blockly.Arduino.sensebox_display_beginDisplay = function () { Blockly.Arduino.sensebox_display_beginDisplay = function () {
Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>"; Blockly.Arduino.libraries_['library_spi'] = '#include <SPI.h>';
Blockly.Arduino.libraries_["library_wire"] = "#include <Wire.h>"; Blockly.Arduino.libraries_['library_wire'] = '#include <Wire.h>';
Blockly.Arduino.libraries_["library_AdafruitGFX"] = Blockly.Arduino.libraries_['library_AdafruitGFX'] = '#include <Adafruit_GFX.h>';
"#include <Adafruit_GFX.h> // http://librarymanager/All#Adafruit_GFX_Library"; Blockly.Arduino.libraries_['library_AdafruitSSD1306'] = '#include <Adafruit_SSD1306.h>';
Blockly.Arduino.libraries_["library_AdafruitSSD1306"] = Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
"#include <Adafruit_SSD1306.h> // http://librarymanager/All#Adafruit_SSD1306"; Blockly.Arduino.definitions_['define_display'] = '#define OLED_RESET 4\nAdafruit_SSD1306 display(OLED_RESET);';
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.setupCode_['sensebox_display_begin'] = 'senseBoxIO.powerI2C(true);\ndelay(2000);\ndisplay.begin(SSD1306_SWITCHCAPVCC, 0x3D);\ndisplay.display();\ndelay(100);\ndisplay.clearDisplay();';
Blockly.Arduino.definitions_[ var code = '';
"define_display_size" return code;
] = `#define SCREEN_WIDTH 128\n#define SCREEN_HEIGHT 64`;
Blockly.Arduino.definitions_["define_display"] =
"#define OLED_RESET -1\nAdafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);";
Blockly.Arduino.setupCode_["sensebox_display_begin"] =
"senseBoxIO.powerI2C(true);\ndelay(2000);\ndisplay.begin(SSD1306_SWITCHCAPVCC, 0x3D);\ndisplay.display();\ndelay(100);\ndisplay.clearDisplay();";
var code = "";
return code;
}; };
Blockly.Arduino.sensebox_display_clearDisplay = function () { Blockly.Arduino.sensebox_display_clearDisplay = function () {
var code = "display.clearDisplay();\n"; var code = 'display.clearDisplay();\n';
return code; return code;
}; };
Blockly.Arduino.sensebox_display_printDisplay = function () { Blockly.Arduino.sensebox_display_printDisplay = function () {
var x = this.getFieldValue("X"); var x = this.getFieldValue('X');
var y = this.getFieldValue("Y"); var y = this.getFieldValue('Y');
var printDisplay = var printDisplay = Blockly.Arduino.valueToCode(this, 'printDisplay', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
Blockly.Arduino.valueToCode( var size = this.getFieldValue('SIZE');
this, var color = this.getFieldValue('COLOR');
"printDisplay", var code = 'display.setCursor(' + x + ',' + y + ');\n';
Blockly.Arduino.ORDER_ATOMIC code += 'display.setTextSize(' + size + ');\n';
) || '"Keine Eingabe"'; code += 'display.setTextColor(' + color + ');\n';
var size = this.getFieldValue("SIZE"); code += 'display.println(' + printDisplay + ');\n';
var color = this.getFieldValue("COLOR"); return code;
var code = "display.setCursor(" + x + "," + y + ");\n";
code += "display.setTextSize(" + size + ");\n";
code += "display.setTextColor(" + color + ");\n";
code += "display.println(" + printDisplay + ");\n";
return code;
}; };
Blockly.Arduino.sensebox_display_fastPrint = function () { Blockly.Arduino.sensebox_display_fastPrint = function () {
var title1 = var title1 = Blockly.Arduino.valueToCode(this, 'Title1', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.valueToCode(this, "Title1", Blockly.Arduino.ORDER_ATOMIC) || var value1 = Blockly.Arduino.valueToCode(this, 'Value1', Blockly.Arduino.ORDER_ATOMIC);
"0"; var dimension1 = Blockly.Arduino.valueToCode(this, 'Dimension1', Blockly.Arduino.ORDER_ATOMIC) || '0'
var value1 = Blockly.Arduino.valueToCode( var title2 = Blockly.Arduino.valueToCode(this, 'Title2', Blockly.Arduino.ORDER_ATOMIC) || '0'
this, var value2 = Blockly.Arduino.valueToCode(this, 'Value2', Blockly.Arduino.ORDER_ATOMIC);
"Value1", var dimension2 = Blockly.Arduino.valueToCode(this, 'Dimension2', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.ORDER_ATOMIC Blockly.Arduino.codeFunctions_['sensebox_fastPrint'] = `
);
var dimension1 =
Blockly.Arduino.valueToCode(
this,
"Dimension1",
Blockly.Arduino.ORDER_ATOMIC
) || "0";
var title2 =
Blockly.Arduino.valueToCode(this, "Title2", Blockly.Arduino.ORDER_ATOMIC) ||
"0";
var value2 = Blockly.Arduino.valueToCode(
this,
"Value2",
Blockly.Arduino.ORDER_ATOMIC
);
var dimension2 =
Blockly.Arduino.valueToCode(
this,
"Dimension2",
Blockly.Arduino.ORDER_ATOMIC
) || "0";
Blockly.Arduino.codeFunctions_["sensebox_fastPrint"] = `
void printOnDisplay(String title1, String measurement1, String unit1, String title2, String measurement2, String unit2) { void printOnDisplay(String title1, String measurement1, String unit1, String title2, String measurement2, String unit2) {
display.setCursor(0, 0); display.setCursor(0, 0);
@ -96,141 +62,67 @@ Blockly.Arduino.sensebox_display_fastPrint = function () {
display.setTextSize(1); display.setTextSize(1);
display.println(unit2); display.println(unit2);
} }
`; `
var code = ` printOnDisplay(${title1}, String(${value1}), ${dimension1}, ${title2}, String(${value2}), ${dimension2});\n`; var code = ` printOnDisplay(${title1}, String(${value1}), ${dimension1}, ${title2}, String(${value2}), ${dimension2});\n`;
return code; return code;
}; };
Blockly.Arduino.sensebox_display_show = function (block) { Blockly.Arduino.sensebox_display_show = function (block) {
var show = Blockly.Arduino.statementToCode(block, "SHOW"); var show = Blockly.Arduino.statementToCode(block, 'SHOW');
var code = ""; var code = '';
code += show; code += show;
code += "display.display();\n"; code += 'display.display();\n';
return code; return code;
}; };
Blockly.Arduino.sensebox_display_plotDisplay = function () { Blockly.Arduino.sensebox_display_plotDisplay = function () {
var YLabel = var YLabel = Blockly.Arduino.valueToCode(this, 'YLabel', Blockly.Arduino.ORDER_ATOMIC) || 'Y'
Blockly.Arduino.valueToCode(this, "YLabel", Blockly.Arduino.ORDER_ATOMIC) || var XLabel = Blockly.Arduino.valueToCode(this, 'XLabel', Blockly.Arduino.ORDER_ATOMIC) || 'X'
"Y"; var Title = Blockly.Arduino.valueToCode(this, 'Title', Blockly.Arduino.ORDER_ATOMIC) || 'Title'
var XLabel = var XRange1 = Blockly.Arduino.valueToCode(this, 'XRange1', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.valueToCode(this, "XLabel", Blockly.Arduino.ORDER_ATOMIC) || var XRange2 = Blockly.Arduino.valueToCode(this, 'XRange2', Blockly.Arduino.ORDER_ATOMIC) || '0'
"X"; var YRange1 = Blockly.Arduino.valueToCode(this, 'YRange1', Blockly.Arduino.ORDER_ATOMIC) || '0'
var Title = var YRange2 = Blockly.Arduino.valueToCode(this, 'YRange2', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.valueToCode(this, "Title", Blockly.Arduino.ORDER_ATOMIC) || var XTick = Blockly.Arduino.valueToCode(this, 'XTick', Blockly.Arduino.ORDER_ATOMIC) || '0'
"Title"; var YTick = Blockly.Arduino.valueToCode(this, 'YTick', Blockly.Arduino.ORDER_ATOMIC) || '0'
var XRange1 = var TimeFrame = Blockly.Arduino.valueToCode(this, 'TimeFrame', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.valueToCode( var plotDisplay = Blockly.Arduino.valueToCode(this, 'plotDisplay', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
this, Blockly.Arduino.libraries_['library_plot'] = '#include <Plot.h>';
"XRange1", Blockly.Arduino.definitions_['define_plot_class'] = 'Plot DataPlot(&display);\n';
Blockly.Arduino.ORDER_ATOMIC Blockly.Arduino.variables_['define_plot_class'] = 'const double TIMEFRAME = ' + TimeFrame + ';\n';
) || "0"; Blockly.Arduino.setupCode_['sensebox_plot_setup'] = 'DataPlot.setTitle(' + Title + ');\nDataPlot.setXLabel(' + XLabel + ');\nDataPlot.setYLabel(' + YLabel + ');\nDataPlot.setXRange(' + XRange1 + ',' + XRange2 + ');\nDataPlot.setYRange(' + YRange1 + ',' + YRange2 + ');\nDataPlot.setXTick(' + XTick + ');\nDataPlot.setYTick(' + YTick + ');\nDataPlot.setXPrecision(0);\nDataPlot.setYPrecision(0);\n';
var XRange2 = var code = 'DataPlot.clear();'
Blockly.Arduino.valueToCode( code += 'double starttime = millis();\ndouble t = 0;\nwhile (t <= TIMEFRAME) {\nt = (millis() - starttime) / 1000.0;\nfloat value = ' + plotDisplay + ';\n';
this, code += 'DataPlot.addDataPoint(t,value);\n}\n';
"XRange2", return code;
Blockly.Arduino.ORDER_ATOMIC
) || "0";
var YRange1 =
Blockly.Arduino.valueToCode(
this,
"YRange1",
Blockly.Arduino.ORDER_ATOMIC
) || "0";
var YRange2 =
Blockly.Arduino.valueToCode(
this,
"YRange2",
Blockly.Arduino.ORDER_ATOMIC
) || "0";
var XTick =
Blockly.Arduino.valueToCode(this, "XTick", Blockly.Arduino.ORDER_ATOMIC) ||
"0";
var YTick =
Blockly.Arduino.valueToCode(this, "YTick", Blockly.Arduino.ORDER_ATOMIC) ||
"0";
var TimeFrame =
Blockly.Arduino.valueToCode(
this,
"TimeFrame",
Blockly.Arduino.ORDER_ATOMIC
) || "0";
var plotDisplay =
Blockly.Arduino.valueToCode(
this,
"plotDisplay",
Blockly.Arduino.ORDER_ATOMIC
) || '"Keine Eingabe"';
Blockly.Arduino.libraries_["library_plot"] = "#include <Plot.h>";
Blockly.Arduino.definitions_["define_plot_class"] =
"Plot DataPlot(&display);\n";
Blockly.Arduino.variables_["define_plot_class"] =
"const double TIMEFRAME = " + TimeFrame + ";\n";
Blockly.Arduino.setupCode_["sensebox_plot_setup"] =
"DataPlot.setTitle(" +
Title +
");\nDataPlot.setXLabel(" +
XLabel +
");\nDataPlot.setYLabel(" +
YLabel +
");\nDataPlot.setXRange(" +
XRange1 +
"," +
XRange2 +
");\nDataPlot.setYRange(" +
YRange1 +
"," +
YRange2 +
");\nDataPlot.setXTick(" +
XTick +
");\nDataPlot.setYTick(" +
YTick +
");\nDataPlot.setXPrecision(0);\nDataPlot.setYPrecision(0);\n";
var code = "DataPlot.clear();";
code +=
"double starttime = millis();\ndouble t = 0;\nwhile (t <= TIMEFRAME) {\nt = (millis() - starttime) / 1000.0;\nfloat value = " +
plotDisplay +
";\n";
code += "DataPlot.addDataPoint(t,value);\n}\n";
return code;
}; };
Blockly.Arduino.sensebox_display_fillCircle = function () { Blockly.Arduino.sensebox_display_fillCircle = function () {
let code = ""; let code = '';
var x = var x = Blockly.Arduino.valueToCode(this, 'X', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.valueToCode(this, "X", Blockly.Arduino.ORDER_ATOMIC) || "0"; var y = Blockly.Arduino.valueToCode(this, 'Y', Blockly.Arduino.ORDER_ATOMIC) || '0'
var y = var radius = Blockly.Arduino.valueToCode(this, 'Radius', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.valueToCode(this, "Y", Blockly.Arduino.ORDER_ATOMIC) || "0"; var fill = this.getFieldValue('FILL');
var radius = if (fill === 'TRUE') {
Blockly.Arduino.valueToCode(this, "Radius", Blockly.Arduino.ORDER_ATOMIC) || code = 'display.fillCircle(' + x + ',' + y + ',' + radius + ',1);\n';
"0"; }
var fill = this.getFieldValue("FILL"); else {
if (fill === "TRUE") { code = 'display.drawCircle(' + x + ',' + y + ',' + radius + ',1);\n';
code = "display.fillCircle(" + x + "," + y + "," + radius + ",1);\n"; }
} else { return code;
code = "display.drawCircle(" + x + "," + y + "," + radius + ",1);\n"; }
}
return code;
};
Blockly.Arduino.sensebox_display_drawRectangle = function () { Blockly.Arduino.sensebox_display_drawRectangle = function () {
let code = ""; let code = '';
var x = var x = Blockly.Arduino.valueToCode(this, 'X', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.valueToCode(this, "X", Blockly.Arduino.ORDER_ATOMIC) || "0"; var y = Blockly.Arduino.valueToCode(this, 'Y', Blockly.Arduino.ORDER_ATOMIC) || '0'
var y = var width = Blockly.Arduino.valueToCode(this, 'width', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.valueToCode(this, "Y", Blockly.Arduino.ORDER_ATOMIC) || "0"; var height = Blockly.Arduino.valueToCode(this, 'height', Blockly.Arduino.ORDER_ATOMIC) || '0'
var width = var fill = this.getFieldValue('FILL');
Blockly.Arduino.valueToCode(this, "width", Blockly.Arduino.ORDER_ATOMIC) || if (fill === 'TRUE') {
"0"; code = 'display.fillRect(' + x + ',' + y + ',' + width + ',' + height + ',1);\n';
var height = }
Blockly.Arduino.valueToCode(this, "height", Blockly.Arduino.ORDER_ATOMIC) || else {
"0"; code = 'display.drawRect(' + x + ',' + y + ',' + width + ',' + height + ',1);\n';
var fill = this.getFieldValue("FILL"); }
if (fill === "TRUE") { return code;
code = }
"display.fillRect(" + x + "," + y + "," + width + "," + height + ",1);\n";
} else {
code =
"display.drawRect(" + x + "," + y + "," + width + "," + height + ",1);\n";
}
return code;
};

6
src/components/Blockly/generator/sensebox-led.js
View File

@ -3,7 +3,6 @@ import * as Blockly from 'blockly/core';
Blockly.Arduino.sensebox_led = function () { Blockly.Arduino.sensebox_led = function () {
var dropdown_pin = this.getFieldValue('PIN'); var dropdown_pin = this.getFieldValue('PIN');
var dropdown_stat = this.getFieldValue('STAT'); var dropdown_stat = this.getFieldValue('STAT');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.setupCode_['setup_led_' + dropdown_pin] = 'pinMode(' + dropdown_pin + ', OUTPUT);'; Blockly.Arduino.setupCode_['setup_led_' + dropdown_pin] = 'pinMode(' + dropdown_pin + ', OUTPUT);';
var code = 'digitalWrite(' + dropdown_pin + ',' + dropdown_stat + ');\n' var code = 'digitalWrite(' + dropdown_pin + ',' + dropdown_stat + ');\n'
return code; return code;
@ -12,7 +11,6 @@ Blockly.Arduino.sensebox_led = function () {
Blockly.Arduino.sensebox_rgb_led = function () { Blockly.Arduino.sensebox_rgb_led = function () {
var dropdown_pin = this.getFieldValue('PIN'); var dropdown_pin = this.getFieldValue('PIN');
var color = Blockly.Arduino.valueToCode(this, 'COLOR', Blockly.Arduino.ORDER_ATOMIC) || '0' var color = Blockly.Arduino.valueToCode(this, 'COLOR', Blockly.Arduino.ORDER_ATOMIC) || '0'
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_['define_rgb_led' + dropdown_pin] = '#include <Adafruit_NeoPixel.h>\n Adafruit_NeoPixel rgb_led_' + dropdown_pin + ' = Adafruit_NeoPixel(1,' + dropdown_pin + ',NEO_RGB + NEO_KHZ800);\n'; Blockly.Arduino.libraries_['define_rgb_led' + dropdown_pin] = '#include <Adafruit_NeoPixel.h>\n Adafruit_NeoPixel rgb_led_' + dropdown_pin + ' = Adafruit_NeoPixel(1,' + dropdown_pin + ',NEO_RGB + NEO_KHZ800);\n';
Blockly.Arduino.setupCode_['setup_rgb_led' + dropdown_pin] = 'rgb_led_' + dropdown_pin + '.begin();'; Blockly.Arduino.setupCode_['setup_rgb_led' + dropdown_pin] = 'rgb_led_' + dropdown_pin + '.begin();';
var code = 'rgb_led_' + dropdown_pin + '.setPixelColor(0,rgb_led_' + dropdown_pin + '.Color(' + color + '));\n'; var code = 'rgb_led_' + dropdown_pin + '.setPixelColor(0,rgb_led_' + dropdown_pin + '.Color(' + color + '));\n';
@ -25,7 +23,6 @@ Blockly.Arduino.sensebox_ws2818_led_init = function () {
var dropdown_pin = this.getFieldValue('Port'); var dropdown_pin = this.getFieldValue('Port');
var numPixel = Blockly.Arduino.valueToCode(this, 'NUMBER', Blockly.Arduino.ORDER_ATOMIC) || '1'; var numPixel = Blockly.Arduino.valueToCode(this, 'NUMBER', Blockly.Arduino.ORDER_ATOMIC) || '1';
var brightness = Blockly.Arduino.valueToCode(this, 'BRIGHTNESS', Blockly.Arduino.ORDER_ATOMIC) || '50' var brightness = Blockly.Arduino.valueToCode(this, 'BRIGHTNESS', Blockly.Arduino.ORDER_ATOMIC) || '50'
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.definitions_['define_rgb_led' + dropdown_pin] = `#include <Adafruit_NeoPixel.h>\n Adafruit_NeoPixel rgb_led_${dropdown_pin}= Adafruit_NeoPixel(${numPixel}, ${dropdown_pin},NEO_GRB + NEO_KHZ800);\n`; Blockly.Arduino.definitions_['define_rgb_led' + dropdown_pin] = `#include <Adafruit_NeoPixel.h>\n Adafruit_NeoPixel rgb_led_${dropdown_pin}= Adafruit_NeoPixel(${numPixel}, ${dropdown_pin},NEO_GRB + NEO_KHZ800);\n`;
Blockly.Arduino.setupCode_['setup_rgb_led' + dropdown_pin] = 'rgb_led_' + dropdown_pin + '.begin();\n'; Blockly.Arduino.setupCode_['setup_rgb_led' + dropdown_pin] = 'rgb_led_' + dropdown_pin + '.begin();\n';
Blockly.Arduino.setupCode_['setup_rgb_led_brightness' + dropdown_pin] = `rgb_led_${dropdown_pin}.setBrightness(${brightness});\n`; Blockly.Arduino.setupCode_['setup_rgb_led_brightness' + dropdown_pin] = `rgb_led_${dropdown_pin}.setBrightness(${brightness});\n`;
@ -33,7 +30,6 @@ Blockly.Arduino.sensebox_ws2818_led_init = function () {
}; };
Blockly.Arduino.sensebox_ws2818_led = function () { Blockly.Arduino.sensebox_ws2818_led = function () {
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
var dropdown_pin = this.getFieldValue('Port'); var dropdown_pin = this.getFieldValue('Port');
var position = Blockly.Arduino.valueToCode(this, 'POSITION', Blockly.Arduino.ORDER_ATOMIC) || '0'; var position = Blockly.Arduino.valueToCode(this, 'POSITION', Blockly.Arduino.ORDER_ATOMIC) || '0';
var color = Blockly.Arduino.valueToCode(this, 'COLOR', Blockly.Arduino.ORDER_ATOMIC) || '0' var color = Blockly.Arduino.valueToCode(this, 'COLOR', Blockly.Arduino.ORDER_ATOMIC) || '0'
@ -52,7 +48,6 @@ function hexToRgb(hex) {
} }
Blockly.Arduino['colour_picker'] = function (block) { Blockly.Arduino['colour_picker'] = function (block) {
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
const rgb = hexToRgb(block.getFieldValue('COLOUR')); const rgb = hexToRgb(block.getFieldValue('COLOUR'));
return [rgb.r + ', ' + rgb.g + ', ' + rgb.b, Blockly.Arduino.ORDER_ATOMIC]; return [rgb.r + ', ' + rgb.g + ', ' + rgb.b, Blockly.Arduino.ORDER_ATOMIC];
@ -63,7 +58,6 @@ Blockly.Arduino['colour_random'] = function (block) {
}; };
Blockly.Arduino['colour_rgb'] = function (block) { Blockly.Arduino['colour_rgb'] = function (block) {
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
const red = Blockly.Arduino.valueToCode(block, 'RED', Blockly.Arduino.ORDER_ATOMIC); const red = Blockly.Arduino.valueToCode(block, 'RED', Blockly.Arduino.ORDER_ATOMIC);
const green = Blockly.Arduino.valueToCode(block, 'GREEN', Blockly.Arduino.ORDER_ATOMIC); const green = Blockly.Arduino.valueToCode(block, 'GREEN', Blockly.Arduino.ORDER_ATOMIC);
const blue = Blockly.Arduino.valueToCode(block, 'BLUE', Blockly.Arduino.ORDER_ATOMIC); const blue = Blockly.Arduino.valueToCode(block, 'BLUE', Blockly.Arduino.ORDER_ATOMIC);

21
src/components/Blockly/generator/sensebox-lora.js
View File

@ -5,10 +5,10 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
var appID = this.getFieldValue("APPID"); var appID = this.getFieldValue("APPID");
var appKey = this.getFieldValue("APPKEY"); var appKey = this.getFieldValue("APPKEY");
var interval = this.getFieldValue("INTERVAL"); var interval = this.getFieldValue("INTERVAL");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_["library_senseBoxMCU"] =
'#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>"; Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>";
Blockly.Arduino.libraries_["library_lmic"] = Blockly.Arduino.libraries_["library_lmic"] = "#include <lmic.h>";
"#include <lmic.h> // http://librarymanager/All#IBM_LMIC_framework";
Blockly.Arduino.libraries_["library_hal"] = "#include <hal/hal.h>"; Blockly.Arduino.libraries_["library_hal"] = "#include <hal/hal.h>";
Blockly.Arduino.definitions_["define_LoRaVariablesOTAA"] = ` Blockly.Arduino.definitions_["define_LoRaVariablesOTAA"] = `
static const u1_t PROGMEM APPEUI[8]= {${appID}}; static const u1_t PROGMEM APPEUI[8]= {${appID}};
@ -177,8 +177,7 @@ Blockly.Arduino.sensebox_send_lora_sensor_value = function (block) {
}; };
Blockly.Arduino.sensebox_lora_cayenne_send = function (block) { Blockly.Arduino.sensebox_lora_cayenne_send = function (block) {
Blockly.Arduino.libraries_["library_cayene"] = Blockly.Arduino.libraries_["library_cayene"] = "#include <CayenneLPP.h>";
"#include <CayenneLPP.h> // http://librarymanager/All#CayenneLPP";
Blockly.Arduino.variables_["variable_cayenne"] = "CayenneLPP lpp(51);"; Blockly.Arduino.variables_["variable_cayenne"] = "CayenneLPP lpp(51);";
var lora_sensor_values = Blockly.Arduino.statementToCode(block, "DO"); var lora_sensor_values = Blockly.Arduino.statementToCode(block, "DO");
Blockly.Arduino.functionNames_["functions_do_send"] = ` Blockly.Arduino.functionNames_["functions_do_send"] = `
@ -279,7 +278,8 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
var appskey = this.getFieldValue("APPSKEY"); var appskey = this.getFieldValue("APPSKEY");
var devaddr = this.getFieldValue("DEVADDR"); var devaddr = this.getFieldValue("DEVADDR");
var interval = this.getFieldValue("INTERVAL"); var interval = this.getFieldValue("INTERVAL");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_["library_senseBoxMCU"] =
'#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>"; Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>";
Blockly.Arduino.libraries_["library_lmic"] = "#include <lmic.h>"; Blockly.Arduino.libraries_["library_lmic"] = "#include <lmic.h>";
Blockly.Arduino.libraries_["library_hal"] = "#include <hal/hal.h>"; Blockly.Arduino.libraries_["library_hal"] = "#include <hal/hal.h>";
@ -525,12 +525,3 @@ Blockly.Arduino.sensebox_lora_cayenne_gps = function (block) {
var code = `lpp.addGPS(${channel}, ${lat}, ${lng}, ${alt});\n`; var code = `lpp.addGPS(${channel}, ${lat}, ${lng}, ${alt});\n`;
return code; return code;
}; };
Blockly.Arduino.sensebox_lora_cayenne_concentration = function (block) {
var value =
Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
0;
var channel = this.getFieldValue("CHANNEL");
var code = `lpp.addConcentration(${channel}, ${value});\n`;
return code;
};

77
src/components/Blockly/generator/sensebox-motors.js
View File

@ -1,77 +0,0 @@
import * as Blockly from "blockly/core";
/**
* Servo Motor
*
*/
Blockly.Arduino.sensebox_motors_beginServoMotor = function () {
var pin = this.getFieldValue("pin");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_["include_servo_motor"] = "#include <Servo.h>";
Blockly.Arduino.definitions_[`define_servo_motor_${pin}`] = `Servo servo_motor_${pin}; // servo Motor`;
Blockly.Arduino.setupCode_[`setup_servo_motor_${pin}`] = `servo_motor_${pin}.attach(${pin}); // attach servo motor to pin ${pin}`;
var code = "";
return code;
};
Blockly.Arduino.sensebox_motors_moveServoMotor = function () {
var pin = this.getFieldValue("pin");
var degrees = Blockly.Arduino.valueToCode(this, 'degrees', Blockly.Arduino.ORDER_ATOMIC) || "90";
var code = `servo_motor_${pin}.write(${degrees}); // move servo motor to ${degrees} degrees\n`;
return code;
};
/**
* I2C Motor Board
*
*/
Blockly.Arduino.sensebox_motors_I2CMotorBoard_begin = function () {
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_["include_i2c_motor_board"] = "#include <Grove_I2C_Motor_Driver.h>";
Blockly.Arduino.definitions_["define_i2c_motor_board"] = `
#define I2C_MOTOR_BOARD_ADDRESS 0x0f // default I2C address of I2C Motor Board`;
Blockly.Arduino.setupCode_["setup_i2c_motor_board"] = `
Motor.begin(I2C_MOTOR_BOARD_ADDRESS); // Initialize I2C Motor Board`;
var code = "";
return code;
};
Blockly.Arduino.sensebox_motors_I2CMotorBoard_moveDCMotor = function () {
var motor = this.getFieldValue("motor");
var speed = Blockly.Arduino.valueToCode(this, 'speed', Blockly.Arduino.ORDER_ATOMIC) || "50";
var code = `Motor.speed(MOTOR${motor}, ${speed}); // set speed of motor\n`;
return code;
};
Blockly.Arduino.sensebox_motors_I2CMotorBoard_stopDCMotor = function () {
var motor = this.getFieldValue("motor");
var code = `Motor.stop(MOTOR${motor}); // stop motor\n`;
return code;
};
/**
* Stepper Motor
*/
Blockly.Arduino.sensebox_motors_beginStepperMotor = function () {
var in1 = this.getFieldValue("in1");
var in2 = this.getFieldValue("in2");
var in3 = this.getFieldValue("in3");
var in4 = this.getFieldValue("in4");
var rpm = this.getFieldValue("rpm");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_["include_stepper_motor"] = "#include <Stepper.h>";
Blockly.Arduino.definitions_["define_stepper_motor"] = `
Stepper stepper_motor(2048, ${in1}, ${in2}, ${in3}, ${in4}); // stepper Motor with 2048 steps per rotation`;
Blockly.Arduino.setupCode_["setup_stepper_motor"] =
`stepper_motor.setSpeed(${rpm}); // speed in rotations per minute`;
var code = "";
return code;
};
Blockly.Arduino.sensebox_motors_moveStepperMotor = function () {
var steps = Blockly.Arduino.valueToCode(this, 'steps', Blockly.Arduino.ORDER_ATOMIC) || '2048';
var code = `stepper_motor.step(${steps}); // 2048 steps correspond to one rotation\n`;
return code;
};

19
src/components/Blockly/generator/sensebox-ntp.js
View File

@ -1,19 +0,0 @@
import Blockly from "blockly";
Blockly.Arduino.sensebox_ntp_init = function () {
Blockly.Arduino.libraries_["WiFiUdp"] = `#include <WiFiUdp.h>`;
Blockly.Arduino.libraries_["NTPClient"] = `#include <NTPClient.h>`;
Blockly.Arduino.definitions_["WiFiUDP"] = `WiFiUDP ntpUDP;`;
Blockly.Arduino.definitions_["NTPClient"] = `NTPClient timeClient(ntpUDP);`;
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.setupCode_["timeclient.begin"] = `timeClient.begin();`;
Blockly.Arduino.setupCode_["timeclient.update"] = `timeClient.update();`;
var code = ``;
return code;
};
Blockly.Arduino.sensebox_ntp_get = function () {
var format = this.getFieldValue("dropdown");
var code = `timeClient.${format}()`;
return [code, Blockly.Arduino.ORDER_ATOMIC];
};

241
src/components/Blockly/generator/sensebox-osem.js
View File

@ -1,125 +1,66 @@
import Blockly from "blockly"; import Blockly from 'blockly';
/** /**
* Block send Data to the openSenseMap * Block send Data to the openSenseMap
*/ */
Blockly.Arduino.sensebox_send_to_osem = function (block) { Blockly.Arduino.sensebox_send_to_osem = function (block) {
var code = ""; var code = '';
var sensor_id = this.getFieldValue("SensorID"); var sensor_id = this.getFieldValue('SensorID');
var id = sensor_id.slice(-3).toUpperCase(); var id = sensor_id.slice(-3).toUpperCase();
var sensor_value = var sensor_value = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) || Blockly.Arduino.definitions_['SENSOR_ID' + id + ''] = 'const char SENSOR_ID' + id + '[] PROGMEM = "' + sensor_id + '";';
'"Keine Eingabe"'; code += 'addMeasurement(SENSOR_ID' + id + ',' + sensor_value + ');\n';
Blockly.Arduino.definitions_["SENSOR_ID" + id + ""] =
"const char SENSOR_ID" + id + '[] PROGMEM = "' + sensor_id + '";';
code += "addMeasurement(SENSOR_ID" + id + "," + sensor_value + ");\n";
return code; return code;
}; };
Blockly.Arduino.sensebox_osem_connection = function (Block) { Blockly.Arduino.sensebox_osem_connection = function (Block) {
var workspace = Blockly.getMainWorkspace(); var box_id = this.getFieldValue('BoxID');
var wifi = false; var host = this.getFieldValue('host');
var ethernet = false; var branch = Blockly.Arduino.statementToCode(Block, 'DO');
if (workspace.getBlocksByType("sensebox_wifi").length > 0) { var access_token = this.getFieldValue('access_token');
wifi = true;
ethernet = false;
} else if (workspace.getBlocksByType("sensebox_ethernet").length > 0) {
ethernet = true;
wifi = false;
}
var box_id = this.getFieldValue("BoxID");
var branch = Blockly.Arduino.statementToCode(Block, "DO");
var access_token = this.getFieldValue("access_token");
var blocks = this.getDescendants(); var blocks = this.getDescendants();
var type = this.getFieldValue("type"); var type = this.getFieldValue('type');
var ssl = this.getFieldValue("SSL"); var ssl = this.getFieldValue('SSL');
var restart = this.getFieldValue("RESTART");
var port = 0; var port = 0;
var count = 0; var count = 0;
if (blocks !== undefined) { if (blocks !== undefined) {
for (var i = 0; i < blocks.length; i++) { for (var i = 0; i < blocks.length; i++) {
if (blocks[i].type === "sensebox_send_to_osem") { if (blocks[i].type === 'sensebox_send_to_osem') {
count++; count++;
} }
} }
} }
var num_sensors = count; var num_sensors = count;
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.definitions_["num_sensors"] = Blockly.Arduino.definitions_['num_sensors'] = 'static const uint8_t NUM_SENSORS = ' + num_sensors + ';'
"static const uint8_t NUM_SENSORS = " + num_sensors + ";"; Blockly.Arduino.definitions_['SenseBoxID'] = 'const char SENSEBOX_ID [] PROGMEM = "' + box_id + '";';
Blockly.Arduino.definitions_["SenseBoxID"] = Blockly.Arduino.definitions_['host'] = 'const char server [] PROGMEM =' + host + ';';
'const char SENSEBOX_ID [] PROGMEM = "' + box_id + '";'; if (ssl === 'TRUE') {
Blockly.Arduino.definitions_["host"] = Blockly.Arduino.definitions_['WiFiSSLClient'] = 'WiFiSSLClient client;';
'const char server [] PROGMEM ="ingress.opensensemap.org";'; port = 443;
if (wifi === true) { } else if (ssl === 'FALSE') {
if (ssl === "TRUE") { Blockly.Arduino.definitions_['WiFiClient'] = 'WiFiClient client;';
Blockly.Arduino.libraries_["library_bearSSL"] = port = 80;
"#include <ArduinoBearSSL.h>";
Blockly.Arduino.libraries_["library_arduinoECC08"] =
"#include <ArduinoECCX08.h>";
Blockly.Arduino.definitions_["WiFiClient"] = "WiFiClient wifiClient;";
Blockly.Arduino.definitions_["BearSSLClient"] =
"BearSSLClient client(wifiClient);";
Blockly.Arduino.functionNames_["getTime"] = `unsigned long getTime() {
return WiFi.getTime();
}`;
Blockly.Arduino.setupCode_["initBearSSL"] =
"ArduinoBearSSL.onGetTime(getTime);";
port = 443;
} else if (ssl === "FALSE") {
Blockly.Arduino.definitions_["WiFiClient"] = "WiFiClient client;";
port = 80;
}
} else if (ethernet === true) {
if (ssl === "TRUE") {
Blockly.Arduino.libraries_["library_bearSSL"] =
"#include <ArduinoBearSSL.h>";
Blockly.Arduino.libraries_["library_arduinoECC08"] =
"#include <ArduinoECCX08.h>";
Blockly.Arduino.libraries_["library_ethernetUdp"] =
"#include <EthernetUdp.h>";
Blockly.Arduino.libraries_["library_NTPClient"] =
"#include <NTPClient.h>";
Blockly.Arduino.definitions_["EthernetClient"] =
"EthernetClient eclient;";
Blockly.Arduino.definitions_["BearSSLClient"] =
"BearSSLClient client(eclient);";
Blockly.Arduino.definitions_["EthernetUDP"] = "EthernetUDP Udp;";
Blockly.Arduino.definitions_["NTPClient"] = "NTPClient timeClient(Udp);";
Blockly.Arduino.functionNames_["getTime"] = `
unsigned long getTime() {
timeClient.update();
return timeClient.getEpochTime();
}`;
Blockly.Arduino.setupCode_["timeClient_begin"] = "timeClient.begin();";
Blockly.Arduino.setupCode_["initBearSSL"] =
"ArduinoBearSSL.onGetTime(getTime);";
port = 443;
} else if (ssl === "FALSE") {
Blockly.Arduino.definitions_["EthernetClient"] = "EthernetClient client;";
port = 80;
}
} }
Blockly.Arduino.definitions_["measurement"] = `typedef struct measurement {
Blockly.Arduino.definitions_['measurement'] = `typedef struct measurement {
const char *sensorId; const char *sensorId;
float value; float value;
} measurement;`; } measurement;`;
Blockly.Arduino.definitions_["buffer"] = "char buffer[750];"; Blockly.Arduino.definitions_['buffer'] = 'char buffer[750];';
Blockly.Arduino.definitions_[ Blockly.Arduino.definitions_['num_measurement'] = `measurement measurements[NUM_SENSORS];
"num_measurement"
] = `measurement measurements[NUM_SENSORS];
uint8_t num_measurements = 0;`; uint8_t num_measurements = 0;`;
Blockly.Arduino.definitions_["lengthMultiplikator"] = Blockly.Arduino.definitions_['lengthMultiplikator'] = 'const int lengthMultiplikator = 35;';
"const int lengthMultiplikator = 35;"; Blockly.Arduino.functionNames_['addMeasurement'] = `
Blockly.Arduino.functionNames_["addMeasurement"] = `
void addMeasurement(const char *sensorId, float value) { void addMeasurement(const char *sensorId, float value) {
measurements[num_measurements].sensorId = sensorId; measurements[num_measurements].sensorId = sensorId;
measurements[num_measurements].value = value; measurements[num_measurements].value = value;
num_measurements++; num_measurements++;
}`; }`;
if (type === "Stationary") { if (type === 'Stationary') {
Blockly.Arduino.functionNames_["writeMeasurementsToClient"] = ` Blockly.Arduino.functionNames_['writeMeasurementsToClient'] = `
void writeMeasurementsToClient() { void writeMeasurementsToClient() {
// iterate throug the measurements array // iterate throug the measurements array
for (uint8_t i = 0; i < num_measurements; i++) { for (uint8_t i = 0; i < num_measurements; i++) {
@ -131,26 +72,18 @@ unsigned long getTime() {
// reset num_measurements // reset num_measurements
num_measurements = 0; num_measurements = 0;
}`; }`;
Blockly.Arduino.functionNames_["submitValues"] = Blockly.Arduino.functionNames_['submitValues'] = `
` void submitValues() {
void submitValues() {
${
wifi === true
? "if (WiFi.status() != WL_CONNECTED) {\nWiFi.disconnect();\ndelay(1000); // wait 1s\nWiFi.begin(ssid, pass);\ndelay(5000); // wait 5s\n}"
: ""
}
if (client.connected()) { if (client.connected()) {
client.stop(); client.stop();
delay(1000); delay(10);
} }
bool connected = false; bool connected = false;
char _server[strlen_P(server)]; char _server[strlen_P(server)];
strcpy_P(_server, server); strcpy_P(_server, server);
for (uint8_t timeout = 2; timeout != 0; timeout--) { for (uint8_t timeout = 2; timeout != 0; timeout--) {
Serial.println(F("connecting...")); Serial.println(F("connecting..."));
connected = client.connect(_server, ` + connected = client.connect(_server, `+ port + `);
port +
`);
if (connected == true) { if (connected == true) {
// construct the HTTP POST request: // construct the HTTP POST request:
sprintf_P(buffer, sprintf_P(buffer,
@ -172,56 +105,22 @@ ${
break; break;
} }
} }
while (client.available()) {
char c = client.read();
// if the server's disconnected, stop the client:
if (!client.connected()) {
client.stop();
break;
}
}
num_measurements = 0; num_measurements = 0;
break; break;
} }
delay(1000);
}
${
restart === "TRUE"
? "if (connected == false) {\n delay(5000);\n noInterrupts();\n NVIC_SystemReset();\n while (1)\n ;\n }"
: ""
} }
}`; }`;
var code = '';
var code = "";
code += branch; code += branch;
code += "submitValues();\n"; code += "submitValues();\n";
} else if (type === "Mobile") { }
var lat = Blockly.Arduino.valueToCode( else if (type === 'Mobile') {
Block, var lat = Blockly.Arduino.valueToCode(Block, 'lat', Blockly.Arduino.ORDER_ATOMIC);
"lat", var lng = Blockly.Arduino.valueToCode(Block, 'lng', Blockly.Arduino.ORDER_ATOMIC);
Blockly.Arduino.ORDER_ATOMIC var timestamp = Blockly.Arduino.valueToCode(Block, 'timeStamp', Blockly.Arduino.ORDER_ATOMIC);
); var altitude = Blockly.Arduino.valueToCode(Block, 'altitude', Blockly.Arduino.ORDER_ATOMIC);
var lng = Blockly.Arduino.valueToCode( Blockly.Arduino.definitions_['lengthMultiplikator'] = 'const int lengthMultiplikator = 77;';
Block, Blockly.Arduino.functionNames_['writeMeasurementsToClient'] = `
"lng",
Blockly.Arduino.ORDER_ATOMIC
);
var timestamp = Blockly.Arduino.valueToCode(
Block,
"timeStamp",
Blockly.Arduino.ORDER_ATOMIC
);
var altitude = Blockly.Arduino.valueToCode(
Block,
"altitude",
Blockly.Arduino.ORDER_ATOMIC
);
Blockly.Arduino.definitions_["lengthMultiplikator"] =
"const int lengthMultiplikator = 77;";
Blockly.Arduino.functionNames_["writeMeasurementsToClient"] = `
void writeMeasurementsToClient(float lat, float lng, float altitude, char* timeStamp) { void writeMeasurementsToClient(float lat, float lng, float altitude, char* timeStamp) {
// iterate throug the measurements array // iterate throug the measurements array
for (uint8_t i = 0; i < num_measurements; i++) { for (uint8_t i = 0; i < num_measurements; i++) {
@ -233,10 +132,7 @@ ${
// reset num_measurements // reset num_measurements
num_measurements = 0; num_measurements = 0;
}`; }`;
Blockly.Arduino.variables_["latitude"] = "float latitude;"; Blockly.Arduino.functionNames_['submitValues'] = `
Blockly.Arduino.variables_["longitude"] = "float longitude;";
Blockly.Arduino.functionNames_["submitValues"] =
`
void submitValues(float lat, float lng, float altitude, char* timeStamp) { void submitValues(float lat, float lng, float altitude, char* timeStamp) {
if (client.connected()) { if (client.connected()) {
client.stop(); client.stop();
@ -247,9 +143,7 @@ ${
strcpy_P(_server, server); strcpy_P(_server, server);
for (uint8_t timeout = 2; timeout != 0; timeout--) { for (uint8_t timeout = 2; timeout != 0; timeout--) {
Serial.println(F("connecting...")); Serial.println(F("connecting..."));
connected = client.connect(_server, ` + connected = client.connect(_server, `+ port + `);
port +
`);
if (connected == true) { if (connected == true) {
// construct the HTTP POST request: // construct the HTTP POST request:
sprintf_P(buffer, sprintf_P(buffer,
@ -271,40 +165,15 @@ ${
break; break;
} }
} }
while (client.available()) {
char c = client.read();
// if the server's disconnected, stop the client:
if (!client.connected()) {
client.stop();
break;
}
delay(1000);
}
num_measurements = 0; num_measurements = 0;
break; break;
} }
} }
}`
${ code = '';
restart === "TRUE"
? "if (connected == false) {\n delay(5000);\n noInterrupts();\n NVIC_SystemReset();\n while (1)\n ;\n }"
: ""
}
}`;
code = "";
code += branch; code += branch;
code += code += 'submitValues(' + lat + ',' + lng + ',' + altitude + ',' + timestamp + ');\n';
"submitValues((" +
lat +
"/float(10000000)),(" +
lng +
"/float(10000000)),(" +
altitude +
"/float(100))," +
timestamp +
");\n";
} }
return code; return code;
}; };

83
src/components/Blockly/generator/sensebox-rtc.js
View File

@ -3,7 +3,8 @@ import Blockly from "blockly";
Blockly.Arduino.sensebox_rtc_init = function () { Blockly.Arduino.sensebox_rtc_init = function () {
Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`; Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
Blockly.Arduino.definitions_["RTC"] = `RV8523 rtc;`; Blockly.Arduino.definitions_["RTC"] = `RV8523 rtc;`;
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_["library_senseBoxMCU"] =
'#include "SenseBoxMCU.h"';
Blockly.Arduino.setupCode_["rtc.begin"] = `rtc.begin();`; Blockly.Arduino.setupCode_["rtc.begin"] = `rtc.begin();`;
var code = ``; var code = ``;
return code; return code;
@ -14,22 +15,19 @@ Blockly.Arduino.sensebox_rtc_set = function () {
Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) || Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
"0"; "0";
var minutes = var minutes =
Blockly.Arduino.valueToCode( Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
this, "0";
"minutes",
Blockly.Arduino.ORDER_ATOMIC
) || "0";
var hour = var hour =
Blockly.Arduino.valueToCode(this, "hour", Blockly.Arduino.ORDER_ATOMIC) || Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
"0"; "0";
var day = var day =
Blockly.Arduino.valueToCode(this, "day", Blockly.Arduino.ORDER_ATOMIC) || Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
"0"; "0";
var month = var month =
Blockly.Arduino.valueToCode(this, "month", Blockly.Arduino.ORDER_ATOMIC) || Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
"0"; "0";
var year = var year =
Blockly.Arduino.valueToCode(this, "year", Blockly.Arduino.ORDER_ATOMIC) || Blockly.Arduino.valueToCode(this, "second", Blockly.Arduino.ORDER_ATOMIC) ||
"0"; "0";
Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`; Blockly.Arduino.libraries_["RV8523"] = `#include <RV8523.h>`;
Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`; Blockly.Arduino.setupCode_["rtc.start"] = `rtc.start();`;
@ -81,59 +79,18 @@ Blockly.Arduino.sensebox_rtc_get_timestamp = function () {
Blockly.Arduino.setupCode_[ Blockly.Arduino.setupCode_[
"rtc.batterySwitchOver" "rtc.batterySwitchOver"
] = `rtc.batterySwitchOver(1);`; ] = `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.variables_["rtc_timestamp"] = `char timestamp[20];`;
Blockly.Arduino.codeFunctions_["getTimeStamp"] = ` Blockly.Arduino.loopCodeOnce_[
char* getTimeStamp() { "rtc_get"
uint8_t sec, min, hour, day, month; ] = `rtc.get(&sec, &min, &hour, &day, &month, &year);`;
uint16_t year;
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); ""
return timestamp; ] = `sprintf(timestamp, "%02d-%02d-%02dT%02d:%02d:%02dZ", year, month, day, hour, min, sec);`;
}
`; var code = `timestamp`;
var code = `getTimeStamp()`;
return [code, Blockly.Arduino.ORDER_ATOMIC];
};
Blockly.Arduino.sensebox_internal_rtc_init = function () {
Blockly.Arduino.libraries_["RTClib"] = `#include <RTCZero.h>`;
Blockly.Arduino.definitions_["RTC"] = `RTCZero rtc;`;
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.setupCode_["rtc.begin"] = `rtc.begin();`;
return "";
};
Blockly.Arduino.sensebox_internal_rtc_set = function () {
var branch =
Blockly.Arduino.valueToCode(this, "time", Blockly.Arduino.ORDER_ATOMIC) ||
"0";
Blockly.Arduino.setupCode_["rtc.setEpoch"] = `rtc.setEpoch(${branch});`;
var code = ``;
return code;
};
Blockly.Arduino.sensebox_internal_rtc_get = function () {
var dropdown = this.getFieldValue("dropdown");
var code = `rtc.get${dropdown}()`;
return [code, Blockly.Arduino.ORDER_ATOMIC];
};
Blockly.Arduino.sensebox_internal_rtc_get_timestamp = function () {
Blockly.Arduino.variables_["rtc_timestamp"] = `char timestamp[20];`;
Blockly.Arduino.codeFunctions_["getTimeStamp"] = `
char* getTimeStamp() {
uint8_t sec, min, hour, day, month;
uint16_t year;
sec = rtc.getSeconds();
min = rtc.getMinutes();
hour = rtc.getHours();
day = rtc.getDay();
month = rtc.getMonth();
year = rtc.getYear();
sprintf(timestamp, "%02d-%02d-%02dT%02d:%02d:%02dZ", year, month, day, hour, min, sec);
return timestamp;
}
`;
var code = `getTimeStamp()`;
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };

221
src/components/Blockly/generator/sensebox-sd.js
View File

@ -1,4 +1,5 @@
import Blockly from "blockly"; import Blockly from 'blockly';
/* SD-Card Blocks using the Standard SD Library*/ /* SD-Card Blocks using the Standard SD Library*/
/** /**
@ -9,199 +10,45 @@ import Blockly from "blockly";
*/ */
Blockly.Arduino.sensebox_sd_create_file = function (block) { Blockly.Arduino.sensebox_sd_create_file = function (block) {
var filename = this.getFieldValue("Filename"); var filename = this.getFieldValue('Filename');
var extension = this.getFieldValue("extension"); var res = filename.slice(0, 4);
var newFileName = filename.concat(".", extension); Blockly.Arduino.libraries_['library_spi'] = '#include <SPI.h>';
Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>"; Blockly.Arduino.libraries_['library_sd'] = '#include <SD.h>';
Blockly.Arduino.libraries_["library_sd"] = "#include <SD.h>"; Blockly.Arduino.definitions_['define_' + res] = 'File dataFile' + res + ';';
Blockly.Arduino.definitions_["define_" + filename] = `File ${filename};`; Blockly.Arduino.setupCode_['sensebox_sd'] = 'SD.begin(28);';
Blockly.Arduino.setupCode_["sensebox_sd"] = "SD.begin(28);\n"; Blockly.Arduino.setupCode_['sensebox_sd' + filename] = 'dataFile' + res + ' = SD.open("' + filename + '", FILE_WRITE);\ndataFile' + res + '.close();\n';
Blockly.Arduino.setupCode_[ var code = '';
"sensebox_sd" + filename return code;
] = `${filename} = SD.open("${newFileName}", FILE_WRITE);\n${filename}.close();\n`;
var code = "";
return code;
}; };
Blockly.Arduino.sensebox_sd_open_file = function (block) { Blockly.Arduino.sensebox_sd_open_file = function (block) {
var filename = this.getFieldValue("Filename"); var filename = this.getFieldValue('Filename');
var extension = this.getFieldValue("extension"); var res = filename.slice(0, 4);
var newFileName = filename.concat(".", extension); var branch = Blockly.Arduino.statementToCode(block, 'SD');
var branch = Blockly.Arduino.statementToCode(block, "SD"); var code = 'dataFile' + res + ' = SD.open("' + filename + '", FILE_WRITE);\n'
var code = `${filename} = SD.open("${newFileName}", FILE_WRITE);\n`; code += branch;
code += branch; code += 'dataFile' + res + '.close();\n'
code += `${filename}.close();\n`; return code;
return code;
}; };
Blockly.Arduino.sensebox_sd_write_file = function (block) { Blockly.Arduino.sensebox_sd_write_file = function (block) {
if (this.parentBlock_ != null) { if (this.parentBlock_ != null) {
var filename = this.getSurroundParent().getFieldValue("Filename"); var filename = this.getSurroundParent().getFieldValue('Filename');
}
var branch =
Blockly.Arduino.valueToCode(this, "DATA", Blockly.Arduino.ORDER_ATOMIC) ||
'"Keine Eingabe"';
var linebreak = this.getFieldValue("linebreak");
if (linebreak === "TRUE") {
linebreak = "ln";
} else {
linebreak = "";
}
var code = "";
if (branch === "gps.getLongitude()" || branch === "gps.getLatitude()") {
code = `${filename}.print${linebreak}(${branch},5);\n`;
} else {
code = `${filename}.print${linebreak}(${branch});\n`;
}
return code;
};
Blockly.Arduino.sensebox_sd_osem = function () {
if (this.parentBlock_ != null) {
var filename = this.getSurroundParent().getFieldValue("Filename");
}
var type = this.getFieldValue("type");
var blocks = this.getDescendants();
var branch = Blockly.Arduino.statementToCode(this, "DO");
var count = 0;
if (blocks !== undefined) {
for (var i = 0; i < blocks.length; i++) {
if (blocks[i].type === "sensebox_sd_save_for_osem") {
count++;
}
} }
} var res = filename.slice(0, 4);
var num_sensors = count; var text = Blockly.Arduino.valueToCode(this, 'DATA', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
var timestamp = Blockly.Arduino.valueToCode( var linebreak = this.getFieldValue('linebreak');
this, if (linebreak === "TRUE") {
"timeStamp", linebreak = "ln";
Blockly.Arduino.ORDER_ATOMIC } else {
); linebreak = "";
Blockly.Arduino.definitions_["num_sensors"] =
"static const uint8_t NUM_SENSORS = " + num_sensors + ";";
Blockly.Arduino.definitions_["measurement"] = `typedef struct measurement {
const char *sensorId;
float value;
} measurement;`;
Blockly.Arduino.definitions_["buffer"] = "char buffer[750];";
Blockly.Arduino.definitions_[
"num_measurement"
] = `measurement measurements[NUM_SENSORS];
uint8_t num_measurements = 0;`;
if (type === "Stationary") {
Blockly.Arduino.functionNames_["addMeasurement"] = `
void addMeasurement(const char *sensorId, float value) {
measurements[num_measurements].sensorId = sensorId;
measurements[num_measurements].value = value;
num_measurements++;
} }
`; var code = '';
Blockly.Arduino.functionNames_["writeMeasurementsToSdCard"] = ` if (text === "gps.getLongitude()" || text === "gps.getLatitude()") {
void writeMeasurementsToSdCard(char* timeStamp) { code = 'dataFile' + res + '.print' + linebreak + '(' + text + ',5);\n'
// iterate throug the measurements array
for (uint8_t i = 0; i < num_measurements; i++) {
sprintf_P(buffer, PSTR("%s,%9.2f,%s"), measurements[i].sensorId, measurements[i].value, timeStamp);
// transmit buffer to client
${filename}.println(buffer);
} }
// reset num_measurements else {
num_measurements = 0; code = 'dataFile' + res + '.print' + linebreak + '(' + text + ');\n'
} }
`; return code;
Blockly.Arduino.functionNames_["saveValues"] = `
void saveValues() {
// send measurements
writeMeasurementsToSdCard(${timestamp});
num_measurements = 0;
}
`;
var code = "";
code += branch;
code += "saveValues();";
} else if (type === "Mobile") {
/**
* add mobile functions here
*/
Blockly.Arduino.libraries_["dtostrf.h"] = "#include <avr/dtostrf.h>";
var lat = Blockly.Arduino.valueToCode(
this,
"lat",
Blockly.Arduino.ORDER_ATOMIC
);
var lng = Blockly.Arduino.valueToCode(
this,
"lng",
Blockly.Arduino.ORDER_ATOMIC
);
// var altitude = Blockly.Arduino.valueToCode(
// this,
// "altitude",
// Blockly.Arduino.ORDER_ATOMIC
// );
Blockly.Arduino.definitions_["num_sensors"] =
"static const uint8_t NUM_SENSORS = " + num_sensors + ";";
Blockly.Arduino.definitions_["measurement"] = `typedef struct measurement {
const char *sensorId;
float value;
} measurement;`;
Blockly.Arduino.definitions_["buffer"] = "char buffer[750];";
Blockly.Arduino.definitions_[
"num_measurement"
] = `measurement measurements[NUM_SENSORS];
uint8_t num_measurements = 0;`;
Blockly.Arduino.functionNames_["addMeasurement"] = `
void addMeasurement(const char *sensorId, float value) {
measurements[num_measurements].sensorId = sensorId;
measurements[num_measurements].value = value;
num_measurements++;
}
`;
Blockly.Arduino.functionNames_["writeMeasurementsToSdCard"] = `
void writeMeasurementsToSdCard(char* timeStamp, int32_t latitudes, int32_t longitudes) {
// iterate throug the measurements array
for (uint8_t i = 0; i < num_measurements; i++) {
char lng[20];
char lat[20];
float longitude = longitudes / (float)10000000;
float latitude = latitudes / (float)10000000;
dtostrf(longitude, 8, 7, lng);
dtostrf(latitude, 8, 7, lat);
sprintf_P(buffer, PSTR("%s,%9.2f,%s,%02s,%02s"), measurements[i].sensorId, measurements[i].value, timeStamp, lng, lat);
// transmit buffer to client
${filename}.println(buffer);
}
// reset num_measurements
num_measurements = 0;
}
`;
Blockly.Arduino.functionNames_["saveValues"] = `
void saveValues() {
// send measurements
writeMeasurementsToSdCard(${timestamp}, ${lat}, ${lng});
num_measurements = 0;
}
`;
code = "";
code += branch;
code += "saveValues();\n";
}
return code;
};
Blockly.Arduino.sensebox_sd_save_for_osem = function (block) {
var code = "";
var sensor_id = this.getFieldValue("SensorID");
var id = sensor_id.slice(-3).toUpperCase();
var sensor_value =
Blockly.Arduino.valueToCode(block, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
'"Keine Eingabe"';
Blockly.Arduino.definitions_["SENSOR_ID" + id + ""] =
"const char SENSOR_ID" + id + '[] PROGMEM = "' + sensor_id + '";';
code += "addMeasurement(SENSOR_ID" + id + "," + sensor_value + ");\n";
return code;
}; };

711
src/components/Blockly/generator/sensebox-sensors.js
View File

@ -1,234 +1,123 @@
import Blockly from "blockly"; import Blockly from 'blockly';
/** /**
* HDC1080 Temperature and Humidity Sensor * HDC1080 Temperature and Humidity Sensor
* *
*/ */
Blockly.Arduino.sensebox_sensor_temp_hum = function () { Blockly.Arduino.sensebox_sensor_temp_hum = function () {
var dropdown_name = this.getFieldValue("NAME"); var dropdown_name = this.getFieldValue('NAME');
Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_adafruithdc1000"] = Blockly.Arduino.definitions_['define_hdc'] = 'HDC1080 hdc;';
"#include <Adafruit_HDC1000.h> // http://librarymanager/All#Adafruit_HDC1000_Library"; Blockly.Arduino.setupCode_['sensebox_sensor_temp_hum'] = 'hdc.begin();';
Blockly.Arduino.definitions_["define_hdc"] = var code = 'hdc.get' + dropdown_name + '()';
"Adafruit_HDC1000 hdc = Adafruit_HDC1000();";
Blockly.Arduino.setupCode_["sensebox_sensor_temp_hum"] = "hdc.begin();";
var code = `hdc.read${dropdown_name}()`;
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* VEML 6070 and TSL4513 UV-Light/Illuminance Sensor * VEML 6070 and TSL4513 UV-Light/Illuminance Sensor
* *
*/ */
Blockly.Arduino.sensebox_sensor_uv_light = function () { Blockly.Arduino.sensebox_sensor_uv_light = function () {
var dropdown_name = this.getFieldValue("NAME"); var dropdown_name = this.getFieldValue('NAME');
let code = ""; let code = '';
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
if (dropdown_name === 'UvIntensity') {
if (dropdown_name === "UvIntensity") { Blockly.Arduino.definitions_['define_veml'] = 'VEML6070 veml;'
Blockly.Arduino.libraries_["library_veml6070"] = "#include <VEML6070.h>"; Blockly.Arduino.setupCode_['sensebox_sensor_uv_light'] = 'veml.begin();'
Blockly.Arduino.definitions_["define_veml"] = "VEML6070 veml;"; code = 'veml.get' + dropdown_name + '()';
Blockly.Arduino.setupCode_["sensebox_sensor_uv_light"] = "veml.begin();";
code = "veml.getUV()";
} }
if (dropdown_name === "Illuminance") { // if (dropdown_name === 'Illuminance') {
Blockly.Arduino.libraries_["library_ltr329"] = `#include <LTR329.h>`; // Blockly.Arduino.definitions_['define_tsl'] = 'TSL45315 tsl;'
Blockly.Arduino.libraries_["library_wire"] = "#include <Wire.h>"; // Blockly.Arduino.setupCode_['sensebox_sensor_illuminance'] = 'tsl.begin();'
Blockly.Arduino.codeFunctions_["read_reg"] = ` // code = 'tsl.get' + dropdown_name + '()';
int read_reg(byte address, uint8_t reg) // }
{ if (dropdown_name === 'Illuminance') {
int i = 0; Blockly.Arduino.definitions_['define_lightsensor'] = 'Lightsensor lightsensor;'
Wire.beginTransmission(address); Blockly.Arduino.setupCode_['sensebox_sensor_illuminance'] = 'lightsensor.begin();'
Wire.write(reg); code = 'lightsensor.get' + dropdown_name + '()';
Wire.endTransmission();
Wire.requestFrom((uint8_t)address, (uint8_t)1);
delay(1);
if(Wire.available())
i = Wire.read();
return i;
}
`;
Blockly.Arduino.codeFunctions_["write_reg"] = `
void write_reg(byte address, uint8_t reg, uint8_t val)
{
Wire.beginTransmission(address);
Wire.write(reg);
Wire.write(val);
Wire.endTransmission();
}`;
Blockly.Arduino.codeFunctions_["Lightsensor_begin"] = `
void Lightsensor_begin()
{
Wire.begin();
unsigned int u = 0;
u = read_reg(0x29, 0x80 | 0x0A); //id register
if ((u & 0xF0) == 0xA0) // TSL45315
{
write_reg(0x29, 0x80 | 0x00, 0x03); //control: power on
write_reg(0x29, 0x80 | 0x01, 0x02); //config: M=4 T=100ms
delay(120);
lightsensortype = 0; //TSL45315
}
else
{
LTR.begin();
LTR.setControl(gain, false, false);
LTR.setMeasurementRate(integrationTime, measurementRate);
LTR.setPowerUp(); //power on with default settings
delay(10); //Wait 10 ms (max) - wakeup time from standby
lightsensortype = 1; //
}
}
`;
Blockly.Arduino.codeFunctions_["Lightsensor_getIlluminance"] = `
unsigned int Lightsensor_getIlluminance()
{
unsigned int lux = 0;
if (lightsensortype == 0) // TSL45315
{
unsigned int u = (read_reg(0x29, 0x80 | 0x04) << 0); //data low
u |= (read_reg(0x29, 0x80 | 0x05) << 8); //data high
lux = u * 4; // calc lux with M=4 and T=100ms
}
else if (lightsensortype == 1) //LTR-329ALS-01
{
delay(100);
unsigned int data0, data1;
for (int i = 0; i < 5; i++) {
if (LTR.getData(data0, data1)) {
if(LTR.getLux(gain, integrationTime, data0, data1, lux));
if(lux > 0) break;
else delay(10);
}
else {
byte error = LTR.getError();
}
}
}
return lux;
}
`;
Blockly.Arduino.definitions_["define_lightsensor"] = `
bool lightsensortype = 0; //0 for tsl - 1 for ltr
//settings for LTR sensor
LTR329 LTR;
unsigned char gain = 1;
unsigned char integrationTime = 0;
unsigned char measurementRate = 3;
`;
Blockly.Arduino.setupCode_["sensebox_sensor_illuminance"] =
"Lightsensor_begin();";
code = "Lightsensor_getIlluminance()";
} }
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* BMX055 Accelerometer * BMX055 Accelerometer
* *
*/ */
Blockly.Arduino.sensebox_sensor_bmx055_accelerometer = function () { Blockly.Arduino.sensebox_sensor_bmx055_accelerometer = function () {
var dropdown_value = this.getFieldValue("VALUE"); var dropdown_value = this.getFieldValue('VALUE');
var range = this.getFieldValue("RANGE"); var range = this.getFieldValue('RANGE');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_bmx055"] = `#include <BMX055.h>`; Blockly.Arduino.definitions_['define_bmx'] = 'BMX055 bmx;';
Blockly.Arduino.definitions_["define_bmx"] = "BMX055 bmx;"; Blockly.Arduino.setupCode_['sensebox_sensor_bmx055'] = 'bmx.beginAcc(' + range + ');';
Blockly.Arduino.setupCode_["sensebox_sensor_bmx055"] = var code = 'bmx.getAcceleration' + dropdown_value + '()';
"bmx.beginAcc(" + range + ");";
var code = "bmx.getAcceleration" + dropdown_value + "()";
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* SDS011 Fine Particlar Matter * SDS011 Fine Particlar Matter
* *
*/ */
Blockly.Arduino.sensebox_sensor_sds011 = function () { Blockly.Arduino.sensebox_sensor_sds011 = function () {
var dropdown_name = this.getFieldValue("NAME"); var dropdown_name = this.getFieldValue('NAME');
var serial_name = this.getFieldValue("SERIAL"); var serial_name = this.getFieldValue('SERIAL');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_[ Blockly.Arduino.codeFunctions_['define_sds011'] = 'SDS011 my_sds(' + serial_name + ');';
"SdsDustSensor" Blockly.Arduino.variables_['variables_sds011'] = 'float p10,p25;\n';
] = `#include <SdsDustSensor.h> // http://librarymanager/All#Nova_Fitness_Sds_dust_sensors_library`; Blockly.Arduino.setupCode_['sensebox_sensor_sds011'] = serial_name + '.begin(9600);';
Blockly.Arduino.definitions_["define_sds011"] = var code = 'my_sds.get' + dropdown_name + '()';
"SdsDustSensor sds(" + serial_name + ");";
Blockly.Arduino.setupCode_["sds011_begin"] = "sds.begin();";
Blockly.Arduino.setupCode_["sds011_setQueryReportingMode"] =
"sds.setQueryReportingMode();";
Blockly.Arduino.loopCodeOnce_[
"sds011_getData"
] = `PmResult pm = sds.queryPm();`;
var code = `pm.${dropdown_name}`;
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* BMP280 Pressure Sensor * BMP280 Pressure Sensor
* *
*/ */
Blockly.Arduino.sensebox_sensor_pressure = function () { Blockly.Arduino.sensebox_sensor_pressure = function () {
var dropdown_name = this.getFieldValue("NAME"); var dropdown_name = this.getFieldValue('NAME');
var code = ""; var code = '';
var referencePressure = this.getFieldValue("referencePressure"); var referencePressure = this.getFieldValue('referencePressure');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_[ Blockly.Arduino.definitions_['define_pressure'] = 'BMP280 bmp_sensor;';
"adafruit_bmp280" Blockly.Arduino.setupCode_['sensebox_bmp_sensor'] = 'bmp_sensor.begin();';
] = `#include <Adafruit_BMP280.h> // http://librarymanager/All#Adafruit_BMP280_Library`; if (dropdown_name === 'Pressure' || dropdown_name === 'Temperature') {
Blockly.Arduino.definitions_["define_pressure"] = "Adafruit_BMP280 bmp;"; code = 'bmp_sensor.get' + dropdown_name + '()';
Blockly.Arduino.setupCode_["sensebox_bmp_sensor"] = "bmp.begin(0x76);"; }
Blockly.Arduino.setupCode_["bmp_setSampling"] = ` else if (dropdown_name === 'Altitude') {
bmp.setSampling(Adafruit_BMP280::MODE_NORMAL, code = 'bmp_sensor.getAltitude(' + referencePressure + ')';
Adafruit_BMP280::SAMPLING_X2,
Adafruit_BMP280::SAMPLING_X16,
Adafruit_BMP280::FILTER_X16,
Adafruit_BMP280::STANDBY_MS_500);
`;
switch (dropdown_name) {
case "Temperature":
code = "bmp.readTemperature()";
break;
case "Pressure":
code = "bmp.readPressure()/100";
break;
case "Altitude":
code = "bmp.readAltitude(" + referencePressure + ")";
break;
default:
code = "";
} }
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* BME680 Environmental Sensor * BME680 Environmental Sensor
* *
*/ */
Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
var dropdown_name = this.getFieldValue("dropdown");
let code = "";
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_["library_bsec"] =
"#include <bsec.h> // http://librarymanager/All#BSEC_Software_Library";
Blockly.Arduino.definitions_["bsec_iaqSensor"] = "Bsec iaqSensor;";
Blockly.Arduino.variables_["bmeTemperatur"] = "float bmeTemperatur;";
Blockly.Arduino.variables_["bmeHumidity"] = "float bmeHumidity;";
Blockly.Arduino.variables_["bmePressure"] = "double bmePressure;";
Blockly.Arduino.variables_["bmeIAQ"] = "float bmeIAQ;";
Blockly.Arduino.variables_["bmeIAQAccuracy"] = "float bmeIAQAccuracy;";
Blockly.Arduino.variables_["bmeCO2"] = "int bmeCO2;";
Blockly.Arduino.variables_["bmeBreathVocEquivalent"] =
"float bmeBreathVocEquivalent;";
Blockly.Arduino.functionNames_["checkIaqSensorStatus"] = ` Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
var dropdown_name = this.getFieldValue('dropdown');
let code = '';
Blockly.Arduino.libraries_['library_bsec'] = '#include "bsec.h"';
Blockly.Arduino.definitions_['bsec_iaqSensor'] = 'Bsec iaqSensor;'
Blockly.Arduino.variables_['bmeTemperatur'] = 'float bmeTemperatur;';
Blockly.Arduino.variables_['bmeHumidity'] = 'float bmeHumidity;';
Blockly.Arduino.variables_['bmePressure'] = 'double bmePressure;';
Blockly.Arduino.variables_['bmeIAQ'] = 'float bmeIAQ;';
Blockly.Arduino.variables_['bmeIAQAccuracy'] = 'float bmeIAQAccuracy;';
Blockly.Arduino.variables_['bmeCO2'] = 'int bmeCO2;';
Blockly.Arduino.variables_['bmeBreathVocEquivalent'] = 'float bmeBreathVocEquivalent;'
Blockly.Arduino.functionNames_['checkIaqSensorStatus'] = `
void checkIaqSensorStatus(void) void checkIaqSensorStatus(void)
{ {
if (iaqSensor.status != BSEC_OK) { if (iaqSensor.status != BSEC_OK) {
@ -246,7 +135,7 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
} }
} }
`; `;
Blockly.Arduino.functionNames_["errLeds"] = ` Blockly.Arduino.functionNames_['errLeds'] = `
void errLeds(void) void errLeds(void)
{ {
pinMode(LED_BUILTIN, OUTPUT); pinMode(LED_BUILTIN, OUTPUT);
@ -256,12 +145,10 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
delay(100); delay(100);
}`; }`;
//Setup Code //Setup Code
Blockly.Arduino.setupCode_["Wire.begin"] = "Wire.begin();"; Blockly.Arduino.setupCode_['Wire.begin'] = 'Wire.begin();';
Blockly.Arduino.setupCode_["iaqSensor.begin"] = Blockly.Arduino.setupCode_['iaqSensor.begin'] = 'iaqSensor.begin(BME680_I2C_ADDR_PRIMARY, Wire);';
"iaqSensor.begin(BME680_I2C_ADDR_PRIMARY, Wire);"; Blockly.Arduino.setupCode_['checkIaqSensorStatus'] = 'checkIaqSensorStatus();';
Blockly.Arduino.setupCode_["checkIaqSensorStatus"] = Blockly.Arduino.setupCode_['bsec_sensorlist'] = `
"checkIaqSensorStatus();";
Blockly.Arduino.setupCode_["bsec_sensorlist"] = `
bsec_virtual_sensor_t sensorList[10] = { bsec_virtual_sensor_t sensorList[10] = {
BSEC_OUTPUT_RAW_TEMPERATURE, BSEC_OUTPUT_RAW_TEMPERATURE,
BSEC_OUTPUT_RAW_PRESSURE, BSEC_OUTPUT_RAW_PRESSURE,
@ -275,10 +162,9 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY, BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY,
}; };
`; `;
Blockly.Arduino.setupCode_["iaqSensorUpdateSubscription"] = Blockly.Arduino.setupCode_['iaqSensorUpdateSubscription'] = 'iaqSensor.updateSubscription(sensorList, 10, BSEC_SAMPLE_RATE_LP);\ncheckIaqSensorStatus();';
"iaqSensor.updateSubscription(sensorList, 10, BSEC_SAMPLE_RATE_LP);\ncheckIaqSensorStatus();";
//Loop Code //Loop Code
Blockly.Arduino.loopCodeOnce_["iaqloop"] = ` Blockly.Arduino.loopCodeOnce_['iaqloop'] = `
if (iaqSensor.run()) { if (iaqSensor.run()) {
bmeTemperatur = iaqSensor.temperature; bmeTemperatur = iaqSensor.temperature;
bmeHumidity = iaqSensor.humidity; bmeHumidity = iaqSensor.humidity;
@ -292,26 +178,26 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
} }
`; `;
switch (dropdown_name) { switch (dropdown_name) {
case "temperature": case 'temperature':
code = "bmeTemperatur"; code = 'bmeTemperatur';
break; break;
case "humidity": case 'humidity':
code = "bmeHumidity"; code = 'bmeHumidity';
break; break;
case "pressure": case 'pressure':
code = "bmePressure"; code = 'bmePressure'
break; break;
case "IAQ": case 'IAQ':
code = "bmeIAQ"; code = 'bmeIAQ';
break; break;
case "IAQAccuracy": case 'IAQAccuracy':
code = "bmeIAQAccuracy"; code = 'bmeIAQAccuracy';
break; break;
case "CO2": case 'CO2':
code = "bmeCO2"; code = 'bmeCO2';
break; break;
case "breathVocEquivalent": case 'breathVocEquivalent':
code = "bmeBreathVocEquivalent"; code = 'bmeBreathVocEquivalent';
break; break;
default: default:
break; break;
@ -319,158 +205,109 @@ Blockly.Arduino.sensebox_sensor_bme680_bsec = function () {
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* Ultrasonic Distance Sensor * Ultrasonic Distance Sensor
* *
*/ */
Blockly.Arduino.sensebox_sensor_ultrasonic_ranger = function () { Blockly.Arduino.sensebox_sensor_ultrasonic_ranger = function () {
var dropdown_pin_RX = this.getFieldValue("ultrasonic_trigger"); var dropdown_pin_RX = this.getFieldValue('ultrasonic_trigger');
var dropdown_pin_TX = this.getFieldValue("ultrasonic_echo"); var dropdown_pin_TX = this.getFieldValue('ultrasonic_echo');
var port = this.getFieldValue("port"); var port = this.getFieldValue('port');
var maxDistance = this.getFieldValue("maxDistance"); Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.definitions_['var_ultrasonic' + port] = 'Ultrasonic Ultrasonic' + port + '(' + dropdown_pin_RX + ',' + dropdown_pin_TX + ');';
Blockly.Arduino.libraries_[
"library_newPing"
] = `#include <NewPing.h> // http://librarymanager/All#NewPing`;
Blockly.Arduino.variables_["define_newPingVariables" + port] = `
#define TRIGGER_PIN_${port} ${dropdown_pin_RX}
#define ECHO_PIN_${port} ${dropdown_pin_TX}
#define MAX_DISTANCE_${port} ${maxDistance}
`;
Blockly.Arduino.definitions_[
"define_newPing" + port
] = `NewPing sonar${port}(TRIGGER_PIN_${port}, ECHO_PIN_${port}, MAX_DISTANCE_${port});`;
var code; var code;
code = `sonar${port}.ping_cm()`; code = 'Ultrasonic' + port + '.getDistance()';
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* Microphone * Microphone
* *
*/ */
Blockly.Arduino.sensebox_sensor_sound = function () { Blockly.Arduino.sensebox_sensor_sound = function () {
var dropdown_pin = this.getFieldValue("PIN"); var dropdown_pin = this.getFieldValue('PIN');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.codeFunctions_["define_sound"] = ` Blockly.Arduino.definitions_['define_microphone'] = 'Microphone microphone(' + dropdown_pin + ');'
float getSoundValue(int pin) { var code = 'microphone.getValue()';
unsigned long start = millis(); // Start des Messintervalls
unsigned int peakToPeak = 0; // Abstand von maximalem zu minimalem Amplitudenausschlag
unsigned int signalMax = 0;
unsigned int signalMin = 1023;
const int sampleTime = 100;
unsigned int micValue;
// Sammle Daten für 100 Millisekunden
while (millis() - start < sampleTime)
{
micValue = analogRead(pin); // Messe den aktuellen Wert
if (micValue < 1023) // sortiere Fehlmessungen aus, deren Werte über dem max Wert 1024 liegen
{
if (micValue > signalMax)
{
signalMax = micValue; // speichere den maximal gemessenen Wert
}
else if (micValue < signalMin)
{
signalMin = micValue; // speichere den minimal gemessenen Wert
}
}
}
peakToPeak = signalMax - signalMin; // max - min = Abstand von maximalem zu minimalem Amplitudenausschlag
double volts = (peakToPeak * 5.0) / 1023; // wandle in Volt um
return volts;
}`;
var code = "getSoundValue(" + dropdown_pin + ")";
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* Button * Button
* *
*/ */
Blockly.Arduino.sensebox_button = function () {
var dropdown_pin = this.getFieldValue("PIN");
var dropown_function = this.getFieldValue("FUNCTION");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_[
"library_jcButtons"
] = `#include <JC_Button.h> // http://librarymanager/All#JC_Button`;
Blockly.Arduino.definitions_["define_button" + dropdown_pin + ""] = Blockly.Arduino.sensebox_button = function () {
"Button button_" + dropdown_pin + "(" + dropdown_pin + ");"; var dropdown_pin = this.getFieldValue('PIN');
Blockly.Arduino.setupCode_["setup_button" + dropdown_pin + ""] = var dropown_function = this.getFieldValue('FUNCTION');
"button_" + dropdown_pin + ".begin();"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.loopCodeOnce_["loop_button" + dropdown_pin + ""] = Blockly.Arduino.definitions_['define_button' + dropdown_pin + ''] = 'Button button_' + dropdown_pin + '(' + dropdown_pin + ');';
"button_" + dropdown_pin + ".read();"; Blockly.Arduino.setupCode_['setup_button' + dropdown_pin + ''] = 'button_' + dropdown_pin + '.begin();';
var code = ""; var code = '';
if (dropown_function === "isPressed") { if (dropown_function === 'isPressed') {
code = "button_" + dropdown_pin + ".isPressed()"; code = 'button_' + dropdown_pin + '.isPressed()';
} else if (dropown_function === "wasPressed") { }
code = "button_" + dropdown_pin + ".wasPressed()"; else if (dropown_function === 'Switch') {
} else if (dropown_function === "longPress") { code = 'button_' + dropdown_pin + '.getSwitch()';
var time = this.getFieldValue("time"); }
code = "button_" + dropdown_pin + ".pressedFor(" + time + ")"; else if (dropown_function === 'wasPressed') {
} else if (dropown_function === "toggleButton") { code = 'button_' + dropdown_pin + '.wasPressed()';
code = "button_" + dropdown_pin + ".toggleState()";
Blockly.Arduino.definitions_["define_button" + dropdown_pin + ""] =
"ToggleButton button_" + dropdown_pin + "(" + dropdown_pin + ");";
} }
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* SCD30 CO2 Sensor * SCD30 CO2 Sensor
* *
*/ */
Blockly.Arduino.sensebox_scd30 = function () { Blockly.Arduino.sensebox_scd30 = function () {
var dropdown = this.getFieldValue("dropdown"); var dropdown = this.getFieldValue('dropdown');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['scd30_library'] = '#include "SparkFun_SCD30_Arduino_Library.h"'
Blockly.Arduino.libraries_["scd30_library"] = Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
"#include <SparkFun_SCD30_Arduino_Library.h> // http://librarymanager/All#SparkFun_SCD30_Arduino_Library"; Blockly.Arduino.definitions_['SCD30'] = 'SCD30 airSensor;';
Blockly.Arduino.definitions_["SCD30"] = "SCD30 airSensor;"; Blockly.Arduino.setupCode_['init_scd30'] = ` Wire.begin();
Blockly.Arduino.setupCode_["init_scd30"] = ` Wire.begin(); if (airSensor.begin() == false)
if (airSensor.begin() == false) {
{ while (1)
while (1) ;
; }`;
}`; var code = '';
Blockly.Arduino.setupCode_["scd30_staleData"] =
"airSensor.useStaleData(true);";
var code = "";
switch (dropdown) { switch (dropdown) {
case "temperature": case 'temperature':
code = "airSensor.getTemperature()"; code = 'airSensor.getTemperature()';
break; break;
case "humidity": case 'humidity':
code = "airSensor.getHumidity()"; code = 'airSensor.getHumiditiy()';
break; break;
case "CO2": case 'CO2':
code = "airSensor.getCO2()"; code = 'airSensor.getCO2()';
break; break;
default: default:
code = ""; code = ''
} }
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
};
}
/** /**
* GPS Module * GPS Module
* *
*/ */
Blockly.Arduino.sensebox_gps = function () { Blockly.Arduino.sensebox_gps = function () {
var dropdown = this.getFieldValue("dropdown"); var dropdown = this.getFieldValue('dropdown');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['gps_library'] = '#include <SparkFun_u-blox_GNSS_Arduino_Library.h>'
Blockly.Arduino.libraries_["gps_library"] = Blockly.Arduino.libraries_['library_wire'] = '#include <Wire.h>';
"#include <SparkFun_u-blox_GNSS_Arduino_Library.h> // http://librarymanager/All#SparkFun_u-blox_GNSS_Arduino_Library"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_wire"] = "#include <Wire.h>"; Blockly.Arduino.definitions_['GPS'] = 'SFE_UBLOX_GNSS myGNSS;';
Blockly.Arduino.definitions_["GPS"] = "SFE_UBLOX_GNSS myGNSS;"; Blockly.Arduino.setupCode_['init_gps'] = ` Wire.begin();
Blockly.Arduino.setupCode_["init_gps"] = ` Wire.begin();
if (myGNSS.begin() == false) //Connect to the Ublox module using Wire port if (myGNSS.begin() == false) //Connect to the Ublox module using Wire port
{ {
@ -480,120 +317,95 @@ Blockly.Arduino.sensebox_gps = function () {
myGNSS.setI2COutput(COM_TYPE_UBX); //Set the I2C port to output UBX only (turn off NMEA noise) myGNSS.setI2COutput(COM_TYPE_UBX); //Set the I2C port to output UBX only (turn off NMEA noise)
myGNSS.saveConfiguration(); //Save the current settings to flash and BBR`; myGNSS.saveConfiguration(); //Save the current settings to flash and BBR`;
var code = ""; var code = '';
switch (dropdown) { switch (dropdown) {
case "latitude": case 'latitude':
code = "myGNSS.getLatitude()"; code = 'myGNSS.getLatitude()';
break; break;
case "longitude": case 'longitude':
code = "myGNSS.getLongitude()"; code = 'myGNSS.getLongitude()';
break; break;
case "altitude": case 'altitude':
code = "myGNSS.getAltitudeMSL()"; code = 'myGNSS.getAltitudeMSL()';
break; break;
case "pDOP": case 'pDOP':
code = "myGNSS.getPDOP()"; code = 'myGNSS.getPDOP()';
break; break;
case "fixType": case 'fixType':
code = "myGNSS.getFixType()"; code = 'myGNSS.getFixType()';
break;
case "timestamp":
Blockly.Arduino.variables_["timestampVars"] = `
char tsBuffer[21];
`;
Blockly.Arduino.codeFunctions_["getTimeStamp()"] = `
char* getTimeStamp()
{
if (myGNSS.getTimeValid() == true)
{
sprintf(tsBuffer, "%04d-%02d-%02dT%02d:%02d:%02dZ",
myGNSS.getYear(), myGNSS.getMonth(), myGNSS.getDay(), myGNSS.getHour(), myGNSS.getMinute(), myGNSS.getSecond());
}
return tsBuffer;
}
`;
code = "getTimeStamp()";
break;
case "speed":
code = "myGNSS.getGroundSpeed()";
break; break;
default: default:
code = ""; code = ''
} }
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
};
}
/** /**
* Block for Truebner STM50 * Block for Truebner STM50
*/ */
Blockly.Arduino.sensebox_sensor_truebner_smt50 = function () { Blockly.Arduino.sensebox_sensor_truebner_smt50 = function () {
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; var dropdown_port = this.getFieldValue('Port')
var dropdown_port = this.getFieldValue("Port"); var dropdown_value = this.getFieldValue('value');
var dropdown_value = this.getFieldValue("value");
var dropdown_pin = 1; var dropdown_pin = 1;
var code = ""; var code = '';
if (dropdown_value === "temp") { if (dropdown_value === 'temp') {
if (dropdown_port === "A") { if (dropdown_port === 'A') {
dropdown_pin = 1; dropdown_pin = 1;
} }
if (dropdown_port === "B") { if (dropdown_port === 'B') {
dropdown_pin = 3; dropdown_pin = 3;
} }
if (dropdown_port === "C") { if (dropdown_port === 'C') {
dropdown_pin = 5; dropdown_pin = 5;
} }
Blockly.Arduino.codeFunctions_["sensebox_smt50_temp"] = Blockly.Arduino.codeFunctions_['sensebox_smt50_temp'] = 'float getSMT50Temperature(int analogPin){\n int sensorValue = analogRead(analogPin);\n float voltage = sensorValue * (3.3 / 1024.0);\n return (voltage - 0.5) * 100;\n}';
"float getSMT50Temperature(int analogPin){\n int sensorValue = analogRead(analogPin);\n float voltage = sensorValue * (3.3 / 1024.0);\n return (voltage - 0.5) * 100;\n}"; code = 'getSMT50Temperature(' + dropdown_pin + ')';
code = "getSMT50Temperature(" + dropdown_pin + ")";
return [code, Blockly.Arduino.ORDER_ATOMIC];
} else if (dropdown_value === "soil") {
if (dropdown_port === "A") {
dropdown_pin = 2;
}
if (dropdown_port === "B") {
dropdown_pin = 4;
}
if (dropdown_port === "C") {
dropdown_pin = 6;
}
Blockly.Arduino.codeFunctions_["sensebox_smt50_soil"] =
"float getSMT50Moisture(int analogPin){\n int sensorValue = analogRead(analogPin);\n float voltage = sensorValue * (3.3 / 1024.0);\n return (voltage * 50) / 3;\n}";
code = "getSMT50Moisture(" + dropdown_pin + ")";
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
} }
else if (dropdown_value === 'soil') {
if (dropdown_port === 'A') {
dropdown_pin = 2;
}
if (dropdown_port === 'B') {
dropdown_pin = 4;
}
if (dropdown_port === 'C') {
dropdown_pin = 6;
}
Blockly.Arduino.codeFunctions_['sensebox_smt50_soil'] = 'float getSMT50Moisture(int analogPin){\n int sensorValue = analogRead(analogPin);\n float voltage = sensorValue * (3.3 / 1024.0);\n return (voltage * 50) / 3;\n}';
code = 'getSMT50Moisture(' + dropdown_pin + ')';
return [code, Blockly.Arduino.ORDER_ATOMIC];
}
}; };
/** /**
* DS18B20 Watertemperature * DS18B20 Watertemperature
* *
*/ */
Blockly.Arduino.sensebox_sensor_watertemperature = function () { Blockly.Arduino.sensebox_sensor_watertemperature = function () {
var dropdown_port = this.getFieldValue("Port");
var dropdown_port = this.getFieldValue('Port');
var dropdown_pin = 1; var dropdown_pin = 1;
if (dropdown_port === "A") { if (dropdown_port === 'A') {
dropdown_pin = 1; dropdown_pin = 1;
} }
if (dropdown_port === "B") { if (dropdown_port === 'B') {
dropdown_pin = 3; dropdown_pin = 3;
} }
if (dropdown_port === "C") { if (dropdown_port === 'C') {
dropdown_pin = 5; dropdown_pin = 5;
} }
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_oneWire'] = '#include "OneWire.h"';
Blockly.Arduino.libraries_["library_oneWire"] = Blockly.Arduino.libraries_['library_oneDallasTemperature'] = '#include "DallasTemperature.h"';
"#include <OneWire.h> // http://librarymanager/All#OneWire"; Blockly.Arduino.definitions_['define_OneWire'] = '#define ONE_WIRE_BUS ' + dropdown_pin + '\nOneWire oneWire(ONE_WIRE_BUS);\nDallasTemperature sensors(&oneWire);';
Blockly.Arduino.libraries_["library_oneDallasTemperature"] = Blockly.Arduino.setupCode_['sensebox_oneWireSetup'] = 'sensors.begin();';
"#include <DallasTemperature.h> // http://librarymanager/All#DallasTemperature"; Blockly.Arduino.codeFunctions_['sensebox_requestTemp'] = 'float getWaterTemp(){\nsensors.requestTemperatures();\nsensors.getTempCByIndex(0);\n}';
Blockly.Arduino.definitions_["define_OneWire"] = var code = 'getWaterTemp()';
"#define ONE_WIRE_BUS " +
dropdown_pin +
"\nOneWire oneWire(ONE_WIRE_BUS);\nDallasTemperature sensors(&oneWire);";
Blockly.Arduino.setupCode_["sensebox_oneWireSetup"] = "sensors.begin();";
Blockly.Arduino.codeFunctions_["sensebox_requestTemp"] =
"float getWaterTemp(){\nsensors.requestTemperatures();\nsensors.getTempCByIndex(0);\n}";
var code = "getWaterTemp()";
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
@ -631,125 +443,28 @@ float getWindspeed(){
*/ */
/** /**
* *
* *
*/ */
Blockly.Arduino.sensebox_soundsensor_dfrobot = function () { Blockly.Arduino.sensebox_soundsensor_dfrobot = function () {
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; var dropdown_port = this.getFieldValue('Port');
var dropdown_port = this.getFieldValue("Port");
var dropdown_pin = 1; var dropdown_pin = 1;
if (dropdown_port === "A") { if (dropdown_port === 'A') {
dropdown_pin = 1; dropdown_pin = 1;
} }
if (dropdown_port === "B") { if (dropdown_port === 'B') {
dropdown_pin = 3; dropdown_pin = 3;
} }
if (dropdown_port === "C") { if (dropdown_port === 'C') {
dropdown_pin = 5; dropdown_pin = 5;
} }
Blockly.Arduino.codeFunctions_["soundsensor"] = Blockly.Arduino.codeFunctions_['soundsensor'] = `
`
float getSoundValue(){ float getSoundValue(){
float v = analogRead(` + float v = analogRead(`+ dropdown_pin + `) * (3.3 / 1024.0);
dropdown_pin +
`) * (3.3 / 1024.0);
float decibel = v * 50; float decibel = v * 50;
return decibel; return decibel;
}`; }`
var code = "getSoundValue()"; var code = 'getSoundValue()';
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/**
* Infineon DPS310 Pressure Sensor
*
*/
Blockly.Arduino.sensebox_sensor_dps310 = function () {
var dropdown_name = this.getFieldValue("NAME");
var code = "";
var referencePressure = this.getFieldValue("referencePressure");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_[
"adafruit_dps310"
] = `#include <Adafruit_DPS310.h> // http://librarymanager/All#Adafruit_DPS310`;
Blockly.Arduino.definitions_["define_dps"] = "Adafruit_DPS310 dps;";
Blockly.Arduino.setupCode_["dps_begin"] = "dps.begin_I2C(0x76);";
Blockly.Arduino.setupCode_["dps_configuration"] = `
dps.configurePressure(DPS310_64HZ, DPS310_64SAMPLES);
dps.configureTemperature(DPS310_64HZ, DPS310_64SAMPLES);
`;
Blockly.Arduino.loopCodeOnce_["dps_events"] =
"sensors_event_t temp_event, pressure_event;";
Blockly.Arduino.loopCodeOnce_["dps_getEvents"] =
"dps.getEvents(&temp_event, &pressure_event);";
switch (dropdown_name) {
case "Temperature":
code = "temp_event.temperature";
break;
case "Pressure":
code = "pressure_event.pressure";
break;
case "Altitude":
code = "dps.readAltitude(" + referencePressure + ")";
break;
default:
code = "";
}
return [code, Blockly.Arduino.ORDER_ATOMIC];
};
/**
* Sensirion SPS30 Fine Particlar Matter
*
*/
Blockly.Arduino.sensebox_sensor_sps30 = function () {
var dropdown_name = this.getFieldValue("value");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_[
"sps30"
] = `#include <sps30.h> // http://librarymanager/All#`;
Blockly.Arduino.variables_["sps30_measurement"] =
"struct sps30_measurement m;";
Blockly.Arduino.variables_["sps30_auto_clean_days"] =
"uint32_t auto_clean_days = 4;";
Blockly.Arduino.variables_["sps30_interval_intervalsps"] =
"const long intervalsps = 1000;";
Blockly.Arduino.variables_["sps30_time_startsps"] =
"unsigned long time_startsps = 0;";
Blockly.Arduino.variables_["sps30_time_actualsps"] =
"unsigned long time_actualsps = 0;";
Blockly.Arduino.codeFunctions_["sps30_getData"] = `
void getSPS30Data(){
uint16_t data_ready;
int16_t ret;
do {
ret = sps30_read_data_ready(&data_ready);
if (ret < 0) {
} else if (!data_ready) {}
else
break;
delay(100); /* retry in 100ms */
} while (1);
ret = sps30_read_measurement(&m);
}
`;
Blockly.Arduino.setupCode_["sps30_begin"] = "sensirion_i2c_init();";
Blockly.Arduino.setupCode_["sps30_setFanCleaningInterval"] =
"sps30_set_fan_auto_cleaning_interval_days(auto_clean_days);";
Blockly.Arduino.setupCode_["sps30_startMeasurement"] =
"sps30_start_measurement();";
Blockly.Arduino.loopCodeOnce_["getSPS30Data();"] = `
time_startsps = millis();
if (time_startsps > time_actualsps + intervalsps) {
time_actualsps = millis();
getSPS30Data();
}`;
var code = `m.mc_${dropdown_name}`;
return [code, Blockly.Arduino.ORDER_ATOMIC];
};

54
src/components/Blockly/generator/sensebox-telegram.js
View File

@ -1,40 +1,29 @@
import * as Blockly from "blockly/core"; import * as Blockly from 'blockly/core';
/** /**
* Telegram Bot by re:edu * Telegram Bot by re:edu
*/ */
Blockly.Arduino.sensebox_telegram = function (Block) { Blockly.Arduino.sensebox_telegram = function (Block) {
let token = Block.getFieldValue("telegram_token"); let token = Block.getFieldValue('telegram_token');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly['Arduino'].libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly["Arduino"].libraries_[ Blockly['Arduino'].libraries_['library_telegram'] = `#include <UniversalTelegramBot.h>`
"library_telegram" Blockly['Arduino'].functionNames_['WiFiSSLClient'] = 'WiFiSSLClient client;';
] = `#include <UniversalTelegramBot.h>`; Blockly['Arduino'].functionNames_['telegram_objects'] = `#define BOTtoken "${token}" // your Bot Token (Get from Botfather)
Blockly["Arduino"].functionNames_["WiFiSSLClient"] = "WiFiSSLClient client;";
Blockly["Arduino"].functionNames_[
"telegram_objects"
] = `#define BOTtoken "${token}" // your Bot Token (Get from Botfather)
UniversalTelegramBot bot(BOTtoken, client);`; UniversalTelegramBot bot(BOTtoken, client);`
let code = ""; let code = '';
return code; return code;
}; };
Blockly.Arduino.sensebox_telegram_do = function (block) { Blockly.Arduino.sensebox_telegram_do = function (block) {
var messageProcessing = Blockly.Arduino.statementToCode( var messageProcessing = Blockly.Arduino.statementToCode(block, 'telegram_do', Blockly.Arduino.ORDER_ATOMIC);
block,
"telegram_do",
Blockly.Arduino.ORDER_ATOMIC
);
Blockly.Arduino.definitions_[ Blockly.Arduino.definitions_['telegram_variables'] = `int Bot_mtbs = 1000; //mean time between scan messages
"telegram_variables" long Bot_lasttime; //last time messages' scan has been done`
] = `int Bot_mtbs = 1000; //mean time between scan messages
long Bot_lasttime; //last time messages' scan has been done`;
Blockly.Arduino.loopCodeOnce_[ Blockly.Arduino.loopCodeOnce_['sensebox_telegram_loop'] = `if (millis() > Bot_lasttime + Bot_mtbs) {
"sensebox_telegram_loop"
] = `if (millis() > Bot_lasttime + Bot_mtbs) {
int numNewMessages = bot.getUpdates(bot.last_message_received + 1); int numNewMessages = bot.getUpdates(bot.last_message_received + 1);
while(numNewMessages) { while(numNewMessages) {
for(int i=0; i<numNewMessages; i++) { for(int i=0; i<numNewMessages; i++) {
@ -47,17 +36,13 @@ Blockly.Arduino.sensebox_telegram_do = function (block) {
} }
Bot_lasttime = millis(); Bot_lasttime = millis();
}`; }`;
var code = ""; var code = '';
return code; return code;
}; };
Blockly.Arduino.sensebox_telegram_do_on_message = function (block) { Blockly.Arduino.sensebox_telegram_do_on_message = function (block) {
var message = this.getFieldValue("telegram_message"); var message = this.getFieldValue('telegram_message');
var stuffToDo = Blockly.Arduino.statementToCode( var stuffToDo = Blockly.Arduino.statementToCode(block, 'telegram_do_on_message', Blockly.Arduino.ORDER_ATOMIC);
block,
"telegram_do_on_message",
Blockly.Arduino.ORDER_ATOMIC
);
var code = ` var code = `
if (text == "${message}") { if (text == "${message}") {
${stuffToDo} ${stuffToDo}
@ -66,12 +51,7 @@ Blockly.Arduino.sensebox_telegram_do_on_message = function (block) {
}; };
Blockly.Arduino.sensebox_telegram_send = function (block) { Blockly.Arduino.sensebox_telegram_send = function (block) {
var textToSend = var textToSend = Blockly.Arduino.valueToCode(this, 'telegram_text_to_send', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"';
Blockly.Arduino.valueToCode(
this,
"telegram_text_to_send",
Blockly.Arduino.ORDER_ATOMIC
) || '"Keine Eingabe"';
var code = `bot.sendMessage(chat_id, String(${textToSend}), "");\n`; var code = `bot.sendMessage(chat_id, String(${textToSend}), "");\n`;
return code; return code;
}; };

133
src/components/Blockly/generator/sensebox-web.js
View File

@ -1,122 +1,25 @@
import Blockly from "blockly"; import Blockly from 'blockly';
//import store from "../../../store";
// preperations for the esp board
// var selectedBoard = store.getState().board.board;
// store.subscribe(() => {
// selectedBoard = store.getState().board.board;
// });
/* Wifi connection and openSenseMap Blocks*/ /* Wifi connection and openSenseMap Blocks*/
Blockly.Arduino.sensebox_wifi = function (block) { Blockly.Arduino.sensebox_wifi = function (block) {
var pw = this.getFieldValue("Password"); var pw = this.getFieldValue('Password');
var ssid = this.getFieldValue("SSID"); var ssid = this.getFieldValue('SSID');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_WiFi"] = "#include <WiFi101.h>"; Blockly.Arduino.definitions_['define_network'] = 'Bee* b = new Bee();';
Blockly.Arduino.variables_["ssid"] = `char ssid[] = "${ssid}";`; if (pw === "") {
Blockly.Arduino.variables_["pass"] = `char pass[] = "${pw}";`; Blockly.Arduino.setupCode_['sensebox_network'] = 'b->connectToWifi("' + ssid + '");\ndelay(1000);';
Blockly.Arduino.variables_["wifi_Status"] = "int status = WL_IDLE_STATUS;"; } else
if (pw === "") { Blockly.Arduino.setupCode_['sensebox_network'] = 'b->connectToWifi("' + ssid + '","' + pw + '");\ndelay(1000);';
Blockly.Arduino.setupCode_["wifi_begin"] = ` var code = '';
if (WiFi.status() == WL_NO_SHIELD) { return code;
while (true);
}
while (status != WL_CONNECTED) {
status = WiFi.begin(ssid);
delay(5000);
}
`;
} else
Blockly.Arduino.setupCode_["wifi_begin"] = `
if (WiFi.status() == WL_NO_SHIELD) {
while (true);
}
while (status != WL_CONNECTED) {
status = WiFi.begin(ssid, pass);
delay(5000);
}
`;
var code = "";
return code;
};
Blockly.Arduino.sensebox_wifi_status = function () {
var code = "WiFi.status()";
return [code, Blockly.Arduino.ORDER_ATOMIC];
};
Blockly.Arduino.sensebox_wifi_rssi = function () {
var code = "WiFi.RSSI()";
return [code, Blockly.Arduino.ORDER_ATOMIC];
};
Blockly.Arduino.sensebox_get_ip = function () {
Blockly.Arduino.definitions_["define_ipadress"] = "IPAddress ip;";
Blockly.Arduino.setupCode_["sensebox_get_ip"] = " ip = WiFi.localIP();";
var code = "ip";
return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
Blockly.Arduino.sensebox_startap = function (block) { Blockly.Arduino.sensebox_startap = function (block) {
var ssid = this.getFieldValue("SSID"); var ssid = this.getFieldValue('SSID');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_WiFi"] = "#include <WiFi101.h>"; Blockly.Arduino.definitions_['define_network'] = 'Bee* b = new Bee();';
Blockly.Arduino.setupCode_["wifi_startAP"] = `WiFi.beginAP(${ssid});`; Blockly.Arduino.setupCode_['sensebox_network'] = 'b->startAP("' + ssid + '");'
var code = ""; var code = '';
return code; return code;
}; };
Blockly.Arduino.sensebox_ethernet = function () {
var ip = this.getFieldValue("ip");
var gateway = this.getFieldValue("gateway");
var subnetmask = this.getFieldValue("subnetmask");
var dns = this.getFieldValue("dns");
var mac = this.getFieldValue("mac");
var dhcp = this.getFieldValue("dhcp");
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
Blockly.Arduino.libraries_["library_ethernet"] =
"#include <Ethernet.h> // http://librarymanager/All#Ethernet";
Blockly.Arduino.definitions_["ethernet_config"] = `
byte mac[] = { ${mac}};`;
if (dhcp === "Manual") {
Blockly.Arduino.definitions_["ethernet_manual_config"] = `
//Configure static IP setup (only needed if DHCP is disabled)
IPAddress myIp(${ip.replaceAll(".", ", ")});
IPAddress myDns(${dns.replaceAll(".", ",")});
IPAddress myGateway(${gateway.replaceAll(".", ",")});
IPAddress mySubnet(${subnetmask.replaceAll(".", ",")});
`;
Blockly.Arduino.setupCode_["ethernet_setup"] = `
Ethernet.init(23);
// start the Ethernet connection:
if (Ethernet.begin(mac) == 0) {
// no point in carrying on, so do nothing forevermore:
// try to congifure using IP address instead of DHCP:
Ethernet.begin(mac, myIp);
}
// give the Ethernet shield a second to initialize:
delay(1000);
`;
} else {
Blockly.Arduino.setupCode_["ethernet_setup"] = `
Ethernet.init(23);
// start the Ethernet connection:
Ethernet.begin(mac);
// give the Ethernet shield a second to initialize:
delay(1000);
`;
}
var code = "";
return code;
};
Blockly.Arduino.sensebox_ethernetIp = function () {
var code = "Ethernet.localIP()";
return [code, Blockly.Arduino.ORDER_ATOMIC];
};

35
src/components/Blockly/generator/serial.js
View File

@ -1,35 +0,0 @@
import * as Blockly from "blockly/core";
Blockly.Arduino["print_serial_monitor"] = function (block) {
var serialId = block.getFieldValue("SERIAL_ID");
var content =
Blockly.Arduino.valueToCode(
block,
"CONTENT",
Blockly.Arduino.ORDER_ATOMIC
) || "0";
var checkbox_name = block.getFieldValue("NEW_LINE") === "TRUE";
var code = "";
if (checkbox_name) {
code = serialId + ".println(" + content + ");\n";
} else {
code = serialId + ".print(" + content + ");\n";
}
return code;
};
/**
* Code generator for block for setting the serial com speed.
* Arduino code: setup{ Serial.begin(X); }
* @param {!Blockly.Block} block Block to generate the code from.
* @return {array} Completed code.
*/
Blockly.Arduino["init_serial_monitor"] = function (block) {
var serialId = block.getFieldValue("SERIAL_ID");
var serialSpeed = block.getFieldValue("SPEED");
Blockly.Arduino.setupCode_[
"init_serial"
] = `${serialId}.begin(${serialSpeed});`;
var code = "";
return code;
};

107
src/components/Blockly/generator/text.js
View File

@ -1,4 +1,5 @@
import * as Blockly from "blockly/core"; import * as Blockly from 'blockly/core';
/** /**
* Code generator for a literal String (X). * Code generator for a literal String (X).
@ -6,11 +7,12 @@ import * as Blockly from "blockly/core";
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {array} Completed code with order of operation. * @return {array} Completed code with order of operation.
*/ */
Blockly.Arduino["text"] = function (block) { Blockly.Arduino['text'] = function (block) {
var code = Blockly.Arduino.quote_(block.getFieldValue("TEXT")); var code = Blockly.Arduino.quote_(block.getFieldValue('TEXT'));
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
* Code generator for a String concatenation (X...Y). This string can be made * Code generator for a String concatenation (X...Y). This string can be made
* up of any number of elements of any type. * up of any number of elements of any type.
@ -20,37 +22,30 @@ Blockly.Arduino["text"] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {array} Completed code with order of operation. * @return {array} Completed code with order of operation.
*/ */
Blockly.Arduino["text_join"] = function (block) { Blockly.Arduino['text_join'] = function (block) {
var code; var code;
if (block.itemCount_ === 0) { if (block.itemCount_ === 0) {
return ['""', Blockly.Arduino.ORDER_ATOMIC]; return ['""', Blockly.Arduino.ORDER_ATOMIC];
} else if (block.itemCount_ === 1) { } else if (block.itemCount_ === 1) {
var argument0 = var argument0 = Blockly.Arduino.valueToCode(block, 'ADD0',
Blockly.Arduino.valueToCode( Blockly.Arduino.ORDER_UNARY_POSTFIX) || '""';
block, code = 'String(' + argument0 + ')';
"ADD0", return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
Blockly.Arduino.ORDER_UNARY_POSTFIX } else {
) || '""'; var argument;
code = "String(" + argument0 + ")"; code = [];
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX]; for (var n = 0; n < block.itemCount_; n++) {
} else { argument = Blockly.Arduino.valueToCode(
var argument; block, 'ADD' + n, Blockly.Arduino.ORDER_NONE);
code = []; if (argument === '') {
for (var n = 0; n < block.itemCount_; n++) { code[n] = '""';
argument = Blockly.Arduino.valueToCode( } else {
block, code[n] = 'String(' + argument + ')';
"ADD" + n, }
Blockly.Arduino.ORDER_NONE }
); code = code.join(' + ');
if (argument === "") { return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
code[n] = '""';
} else {
code[n] = "String(" + argument + ")";
}
} }
code = code.join(" + ");
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
}
}; };
/** /**
@ -60,23 +55,18 @@ Blockly.Arduino["text_join"] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {string} Completed code. * @return {string} Completed code.
*/ */
Blockly.Arduino["text_append"] = function (block) { Blockly.Arduino['text_append'] = function (block) {
// Append to a variable in place. // Append to a variable in place.
var varName = Blockly.Arduino.nameDB_.getName( var varName = Blockly.Arduino.variableDB_.getName(
block.getFieldValue("VAR"), block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
Blockly.Variables.NAME_TYPE var argument0 = Blockly.Arduino.valueToCode(block, 'TEXT',
); Blockly.Arduino.ORDER_UNARY_POSTFIX);
var argument0 = Blockly.Arduino.valueToCode( if (argument0 === '') {
block, argument0 = '""';
"TEXT", } else {
Blockly.Arduino.ORDER_UNARY_POSTFIX argument0 = 'String(' + argument0 + ')';
); }
if (argument0 === "") { return varName + ' += ' + argument0 + ';\n';
argument0 = '""';
} else {
argument0 = "String(" + argument0 + ")";
}
return varName + " += " + argument0 + ";\n";
}; };
/** /**
@ -86,13 +76,10 @@ Blockly.Arduino["text_append"] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {array} Completed code with order of operation. * @return {array} Completed code with order of operation.
*/ */
Blockly.Arduino["text_length"] = function (block) { Blockly.Arduino['text_length'] = function (block) {
var argument0 = var argument0 = Blockly.Arduino.valueToCode(block, 'VALUE',
Blockly.Arduino.valueToCode( Blockly.Arduino.ORDER_UNARY_POSTFIX) || '""';
block, var code = 'String(' + argument0 + ').length()';
"VALUE", return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
Blockly.Arduino.ORDER_UNARY_POSTFIX
) || '""';
var code = "String(" + argument0 + ").length()";
return [code, Blockly.Arduino.ORDER_UNARY_POSTFIX];
}; };

86
src/components/Blockly/generator/time.js
View File

@ -1,4 +1,4 @@
import Blockly from "blockly"; import Blockly from 'blockly';
/** /**
* @license Licensed under the Apache License, Version 2.0 (the "License"): * @license Licensed under the Apache License, Version 2.0 (the "License"):
@ -16,15 +16,11 @@ import Blockly from "blockly";
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {string} Completed code. * @return {string} Completed code.
*/ */
Blockly.Arduino["time_delay"] = function (block) { Blockly.Arduino['time_delay'] = function (block) {
var delayTime = var delayTime = Blockly.Arduino.valueToCode(
Blockly.Arduino.valueToCode( block, 'DELAY_TIME_MILI', Blockly.Arduino.ORDER_ATOMIC) || '0';
block, var code = 'delay(' + delayTime + ');\n';
"DELAY_TIME_MILI", return code;
Blockly.Arduino.ORDER_ATOMIC
) || "0";
var code = "delay(" + delayTime + ");\n";
return code;
}; };
/** /**
@ -33,15 +29,11 @@ Blockly.Arduino["time_delay"] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {string} Completed code. * @return {string} Completed code.
*/ */
Blockly.Arduino["time_delaymicros"] = function (block) { Blockly.Arduino['time_delaymicros'] = function (block) {
var delayTimeMs = var delayTimeMs = Blockly.Arduino.valueToCode(
Blockly.Arduino.valueToCode( block, 'DELAY_TIME_MICRO', Blockly.Arduino.ORDER_ATOMIC) || '0';
block, var code = 'delayMicroseconds(' + delayTimeMs + ');\n';
"DELAY_TIME_MICRO", return code;
Blockly.Arduino.ORDER_ATOMIC
) || "0";
var code = "delayMicroseconds(" + delayTimeMs + ");\n";
return code;
}; };
/** /**
@ -50,9 +42,9 @@ Blockly.Arduino["time_delaymicros"] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {array} Completed code with order of operation. * @return {array} Completed code with order of operation.
*/ */
Blockly.Arduino["time_millis"] = function (block) { Blockly.Arduino['time_millis'] = function (block) {
var code = "millis()"; var code = 'millis()';
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
@ -61,9 +53,9 @@ Blockly.Arduino["time_millis"] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {array} Completed code with order of operation. * @return {array} Completed code with order of operation.
*/ */
Blockly.Arduino["time_micros"] = function (block) { Blockly.Arduino['time_micros'] = function (block) {
var code = "micros()"; var code = 'micros()';
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
/** /**
@ -72,39 +64,17 @@ Blockly.Arduino["time_micros"] = function (block) {
* @param {!Blockly.Block} block Block to generate the code from. * @param {!Blockly.Block} block Block to generate the code from.
* @return {string} Completed code. * @return {string} Completed code.
*/ */
Blockly.Arduino["infinite_loop"] = function (block) { Blockly.Arduino['infinite_loop'] = function (block) {
return "while(true);\n"; return 'while(true);\n';
}; };
// Blockly.Arduino.sensebox_interval_timer = function (block) {
// var interval = this.getFieldValue("interval");
// Blockly.Arduino.variables_["define_interval_variables"] =
// "const long interval = " +
// interval +
// ";\nlong time_start = 0;\nlong time_actual = 0;";
// var branch = Blockly.Arduino.statementToCode(block, "DO");
// var code = "time_start = millis();\n";
// code +=
// "if (time_start > time_actual + interval) {\n time_actual = millis();\n";
// code += branch;
// code += "}\n";
// return code;
// };
Blockly.Arduino.sensebox_interval_timer = function (block) { Blockly.Arduino.sensebox_interval_timer = function (block) {
var intervalTime = this.getFieldValue("interval"); var interval = this.getFieldValue('interval');
var intervalName = this.getFieldValue("name"); Blockly.Arduino.variables_['define_interval_variables'] = 'const long interval = ' + interval + ';\nlong time_start = 0;\nlong time_actual = 0;';
Blockly.Arduino.variables_[`define_interval_variables${intervalName}`] = ` var branch = Blockly.Arduino.statementToCode(block, 'DO');
const long interval${intervalName} = ${intervalTime}; var code = 'time_start = millis();\n';
long time_start${intervalName} = 0; code += 'if (time_start > time_actual + interval) {\n time_actual = millis();\n'
long time_actual${intervalName} = 0;`; code += branch;
Blockly.Arduino.loopCodeOnce_[ code += '}\n'
`interval_loop${intervalName}` return code;
] = `time_start${intervalName} = millis();\n`; };
var branch = Blockly.Arduino.statementToCode(block, "DO");
var code = `
if (time_start${intervalName} > time_actual${intervalName} + interval${intervalName}) {\n time_actual${intervalName} = millis();\n`;
code += branch;
code += "}\n";
return code;
};

65
src/components/Blockly/generator/variables.js
View File

@ -2,17 +2,10 @@ import Blockly from "blockly";
const setVariableFunction = function (defaultValue) { const setVariableFunction = function (defaultValue) {
return function (block) { return function (block) {
var id = block.getFieldValue("VAR"); const variableName = Blockly["Arduino"].variableDB_.getName(
block.getFieldValue("VAR"),
const variableName = Blockly.Variables.getVariable( Blockly.Variables.NAME_TYPE
Blockly.getMainWorkspace(), );
id
).name;
// const variableName = Blockly["Arduino"].nameDB_.getName(
// id,
// Blockly.Variables.NAME_TYPE
// );
const variableValue = Blockly["Arduino"].valueToCode( const variableValue = Blockly["Arduino"].valueToCode(
block, block,
"VALUE", "VALUE",
@ -24,32 +17,42 @@ const setVariableFunction = function (defaultValue) {
.getAllVariables(); .getAllVariables();
const myVar = allVars.filter((v) => v.name === variableName)[0]; const myVar = allVars.filter((v) => v.name === variableName)[0];
var code = ""; var code = "";
if (myVar !== undefined) {
Blockly.Arduino.variables_[variableName + myVar.type] = switch (myVar.type) {
myVar.type + " " + myVar.name + ";\n"; default:
code = variableName + " = " + (variableValue || defaultValue) + ";\n"; Blockly.Arduino.variables_[variableName + myVar.type] =
myVar.type + " " + myVar.name + ";\n";
code = variableName + " = " + (variableValue || defaultValue) + ";\n";
break;
case "Array":
var arrayType;
var number;
if (this.getChildren().length > 0) {
if (this.getChildren()[0].type === "lists_create_empty") {
arrayType = this.getChildren()[0].getFieldValue("type");
number = Blockly.Arduino.valueToCode(
this.getChildren()[0],
"NUMBER",
Blockly["Arduino"].ORDER_ATOMIC
);
Blockly.Arduino.variables_[
myVar + myVar.type
] = `${arrayType} ${myVar.name} [${number}];\n`;
}
}
break;
} }
return code; return code;
}; };
}; };
const getVariableFunction = function (block) { const getVariableFunction = function (block) {
var id = block.getFieldValue("VAR"); const variableName = Blockly["Arduino"].variableDB_.getName(
block.getFieldValue("VAR"),
const variableName = Blockly.Variables.getVariable( Blockly.Variables.NAME_TYPE
Blockly.getMainWorkspace(), );
id var code = variableName;
).name;
const allVars = Blockly.getMainWorkspace()
.getVariableMap()
.getAllVariables();
const myVar = allVars.filter((v) => v.name === variableName)[0];
// const variableName = Blockly["Arduino"].nameDB_.getName(
// block.getFieldValue("VAR"),
// Blockly.Variables.NAME_TYPE
// );
var code = myVar.name;
return [code, Blockly["Arduino"].ORDER_ATOMIC]; return [code, Blockly["Arduino"].ORDER_ATOMIC];
}; };

16
src/components/Blockly/generator/watchdog.js
View File

@ -1,16 +0,0 @@
import * as Blockly from "blockly/core";
Blockly.Arduino.watchdog_enable = function () {
var time = this.getFieldValue("TIME");
Blockly.Arduino.libraries_["Adafruit_sleepydog"] =
"#include <Adafruit_SleepyDog.h> // http://librarymanager/All#Adafruit_SleepyDog_Library";
Blockly.Arduino.setupCode_["watchdog_enable"] = `Watchdog.enable(${time});`;
var code = "";
return code;
};
Blockly.Arduino.watchdog_reset = function () {
var code = "Watchdog.reset();";
return code;
};

171
src/components/Blockly/generator/webserver.js
View File

@ -1,133 +1,114 @@
import Blockly from "blockly"; import Blockly from 'blockly';
/** /**
* Webserver Blocks by Lucas Steinmann * Webserver Blocks by Lucas Steinmann
* *
*/ */
Blockly.Arduino.sensebox_initialize_http_server = function (block) { Blockly.Arduino.sensebox_initialize_http_server = function (block) {
var box_id = this.getFieldValue("Port"); var box_id = this.getFieldValue('Port');
Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>"; Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_["library_http"] = "#include <WebUtil.h>"; Blockly.Arduino.codeFunctions_['define_wifi_server'] = 'WiFiServer server(' + box_id + ');';
Blockly.Arduino.setupCode_['sensebox_wifi_server_beging'] = 'server.begin();';
Blockly.Arduino.codeFunctions_["define_wifi_server"] = return '';
"WiFiServer server(" + box_id + ");";
Blockly.Arduino.setupCode_["sensebox_wifi_server_beging"] = "server.begin();";
return "";
}; };
Blockly.Arduino.sensebox_http_on_client_connect = function (block) { Blockly.Arduino.sensebox_http_on_client_connect = function (block) {
var onConnect = Blockly.Arduino.statementToCode(block, "ON_CONNECT"); var onConnect = Blockly.Arduino.statementToCode(block, 'ON_CONNECT');
var code = ""; var code = '';
code += "WiFiClient client = server.available();\n"; code += 'WiFiClient client = server.available();\n';
code += "if (client && client.available()) {\n"; code += 'if (client && client.available()) {\n';
code += " String request_string = listenClient(client);\n"; code += ' String request_string = listenClient(client);\n';
code += " Request request;\n"; code += ' Request request;\n';
code += " if (parseRequestSafe(request_string, request)) {\n"; code += ' if (parseRequestSafe(request_string, request)) {\n';
code += onConnect; code += onConnect;
code += " }\n"; code += ' }\n';
code += " delay(1);\n"; code += ' delay(1);\n';
code += " client.stop();\n"; code += ' client.stop();\n';
code += " delay(1);\n"; code += ' delay(1);\n';
code += "}\n"; code += '}\n';
return code; return code;
}; };
Blockly.Arduino.sensebox_http_method = function (block) { Blockly.Arduino.sensebox_http_method = function (block) {
var code = "request.method"; var code = "request.method";
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
Blockly.Arduino.sensebox_http_uri = function (block) { Blockly.Arduino.sensebox_http_uri = function (block) {
var code = "request.uri"; var code = "request.uri";
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
Blockly.Arduino.sensebox_http_protocol_version = function (block) { Blockly.Arduino.sensebox_http_protocol_version = function (block) {
var code = "request.protocol_version"; var code = "request.protocol_version";
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
Blockly.Arduino.sensebox_http_user_agent = function (block) { Blockly.Arduino.sensebox_http_user_agent = function (block) {
var code = "request.user_agent"; var code = "request.user_agent";
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
Blockly.Arduino.sensebox_generate_html_doc = function (block) { Blockly.Arduino.sensebox_generate_html_doc = function (block) {
var header = var header = Blockly.Arduino.valueToCode(block, 'HEADER', Blockly.Arduino.ORDER_NONE) || '""';
Blockly.Arduino.valueToCode(block, "HEADER", Blockly.Arduino.ORDER_NONE) || var body = Blockly.Arduino.valueToCode(block, 'BODY', Blockly.Arduino.ORDER_NONE) || '""';
'""'; var code = 'buildHTML(' + header + ', ' + body + ')';
var body = return [code, Blockly.Arduino.ORDER_ATOMIC];
Blockly.Arduino.valueToCode(block, "BODY", Blockly.Arduino.ORDER_NONE) ||
'""';
var code = "buildHTML(" + header + ", " + body + ")";
return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
Blockly.Arduino.sensebox_generate_http_succesful_response = function (block) { Blockly.Arduino.sensebox_generate_http_succesful_response = function (block) {
var content = var content = Blockly.Arduino.valueToCode(block, 'CONTENT', Blockly.Arduino.ORDER_NONE) || '""';
Blockly.Arduino.valueToCode(block, "CONTENT", Blockly.Arduino.ORDER_NONE) || var code = 'client.println(buildSuccessfulResponse(request, ' + content + '));\n';
'""'; return code;
var code =
"client.println(buildSuccessfulResponse(request, " + content + "));\n";
return code;
}; };
Blockly.Arduino.sensebox_generate_http_not_found_response = function (block) { Blockly.Arduino.sensebox_generate_http_not_found_response = function (block) {
var code = "client.println(buildNotFoundResponse(request));\n"; var code = 'client.println(buildNotFoundResponse(request));\n';
return code; return code;
}; };
Blockly.Arduino.sensebox_ip_address = function (block) { Blockly.Arduino.sensebox_ip_address = function (block) {
var code = "b->getIpAddress()"; var code = "b->getIpAddress()";
return [code, Blockly.Arduino.ORDER_ATOMIC]; return [code, Blockly.Arduino.ORDER_ATOMIC];
}; };
Blockly.Arduino.sensebox_general_html_tag = function (block) { Blockly.Arduino.sensebox_general_html_tag = function (block) {
var tag = this.getFieldValue("TAG"); var tag = this.getFieldValue('TAG');
var code = 'buildTag("' + tag + '",'; var code = 'buildTag("' + tag + '",';
var n = 0; var n = 0;
var branch = Blockly.Arduino.valueToCode( var branch = Blockly.Arduino.valueToCode(block, 'DO' + n, Blockly.Arduino.ORDER_NONE);
block, if (branch.length > 0) {
"DO" + n, code += '\n ' + branch;
Blockly.Arduino.ORDER_NONE } else {
); code += '""';
if (branch.length > 0) { }
code += "\n " + branch; for (n = 1; n <= block.additionalChildCount_; n++) {
} else { branch = Blockly.Arduino.valueToCode(block, 'DO' + n, Blockly.Arduino.ORDER_NONE);
code += '""'; code += ' +' + branch;
} }
for (n = 1; n <= block.additionalChildCount_; n++) { return [code + ')', Blockly.Arduino.ORDER_ATOMIC];
branch = Blockly.Arduino.valueToCode(
block,
"DO" + n,
Blockly.Arduino.ORDER_NONE
);
code += " +" + branch;
}
return [code + ")", Blockly.Arduino.ORDER_ATOMIC];
}; };
Blockly.Arduino.sensebox_web_readHTML = function (block) { Blockly.Arduino.sensebox_web_readHTML = function (block) {
var filename = this.getFieldValue("FILENAME"); var filename = this.getFieldValue('FILENAME');
Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>"; Blockly.Arduino.libraries_['library_spi'] = '#include <SPI.h>';
Blockly.Arduino.libraries_["library_sd"] = "#include <SD.h>"; Blockly.Arduino.libraries_['library_sd'] = '#include <SD.h>';
Blockly.Arduino.codeFunctions_["define_sd" + filename] = "File webFile;"; Blockly.Arduino.codeFunctions_['define_sd' + filename] = 'File webFile;';
Blockly.Arduino.setupCode_["sensebox_sd"] = "SD.begin(28);"; Blockly.Arduino.setupCode_['sensebox_sd'] = 'SD.begin(28);';
var func = [ var func = [
"String generateHTML(){", 'String generateHTML(){',
' webFile = SD.open("' + filename + '", FILE_READ);', ' webFile = SD.open("' + filename + '", FILE_READ);',
' String finalString ="";', ' String finalString ="";',
" while (webFile.available())", ' while (webFile.available())',
" {", ' {',
" finalString+=(char)webFile.read();", ' finalString+=(char)webFile.read();',
" }", ' }',
" return finalString;", ' return finalString;',
"}", '}'];
]; var functionName = Blockly.Arduino.addFunction(
var functionName = Blockly.Arduino.addFunction( 'generateHTML', func.join('\n'));
"generateHTML", var code = functionName + '()';
func.join("\n") return [code, Blockly.Arduino.ORDER_ATOMIC];
); };
var code = functionName + "()";
return [code, Blockly.Arduino.ORDER_ATOMIC];
};

294
src/components/Blockly/helpers/board.js
View File

@ -3,266 +3,42 @@
* *
*/ */
const sensebox_mcu = { const sensebox_mcu = {
description: "senseBox Microcontroller Unit based on Microchip SAMD21G18A", description: 'senseBox Microcontroller Unit based on Microchip SAMD21G18A',
compilerFlag: "arduino:samd", compilerFlag: 'arduino:samd',
digitalPins: [ digitalPins: [['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
["A1", "1"], digitalPinsLED: [['BUILTIN_1', '7'], ['BUILTIN_2', '8'], ['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
["A2", "2"], digitalPinsButton: [['on Board', '0'], ['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
["B3", "3"], pwmPins: [['D1', '1'], ['D2', '2'], ['D3', '3'], ['D4', '4'], ['D5', '5'], ['D6', '6']],
["B4", "4"], serial: [['serial', 'SerialUSB'], ['serial_1', 'Serial1'], ['serial_2', 'Serial2']],
["C5", "5"], serialPins: {
["C6", "6"], SerialUSB: [['RX', ''], ['TX', '']],
], Serial1: [['RX', '11'], ['TX', '10']],
digitalPorts: [ Serial2: [['RX', '13'], ['TX', '12']]
["A", "A"], },
["B", "B"], serialSpeed: [['300', '300'], ['600', '600'], ['1200', '1200'],
["C", "C"], ['2400', '2400'], ['4800', '4800'], ['9600', '9600'],
], ['14400', '14400'], ['19200', '19200'], ['28800', '28800'],
digitalPinsLED: [ ['31250', '31250'], ['38400', '38400'], ['57600', '57600'],
["BUILTIN_1", "7"], ['115200', '115200']],
["BUILTIN_2", "8"], spi: [['SPI', 'SPI']],
["A1", "1"], spiPins: { SPI: [['MOSI', '19'], ['MISO', '21'], ['SCK', '20']] },
["A2", "2"], spiClockDivide: [['2 (8MHz)', 'SPI_CLOCK_DIV2'],
["B3", "3"], ['4 (4MHz)', 'SPI_CLOCK_DIV4'],
["B4", "4"], ['8 (2MHz)', 'SPI_CLOCK_DIV8'],
["C5", "5"], ['16 (1MHz)', 'SPI_CLOCK_DIV16'],
["C6", "6"], ['32 (500KHz)', 'SPI_CLOCK_DIV32'],
], ['64 (250KHz)', 'SPI_CLOCK_DIV64'],
digitalPinsRGB: [ ['128 (125KHz)', 'SPI_CLOCK_DIV128']],
["A", "1"], i2c: [['I2C', 'Wire']],
["B", "3"], i2cPins: { Wire: [['SDA', '17'], ['SCL', '16']] },
["C", "5"], i2cSpeed: [['100kHz', '100000L'], ['400kHz', '400000L']],
], builtinLed: [['BUILTIN_1', '7'], ['BUILTIN_2', '8']],
digitalPinsButton: [ interrupt: [['interrupt1', '1'], ['interrupt2', '2'], ['interrupt3', '3'], ['interrupt4', '4'], ['interrupt5', '5'], ['interrupt6', '6']],
["on Board", "0"], analogPins: [['A1', 'A1'], ['A2', 'A2'], ['A3', 'A3'], ['A4', 'A4'], ['A5', 'A5'], ['A6', 'A6']],
["A1", "1"], serial_baud_rate: 9600,
["A2", "2"], parseKey: '_*_'
["B3", "3"],
["B4", "4"],
["C5", "5"],
["C6", "6"],
],
pwmPins: [
["A1", "1"],
["A2", "2"],
["B3", "3"],
["B4", "4"],
["C5", "5"],
["C6", "6"],
],
serial: [
["SerialUSB", "SerialUSB"],
["Serial1", "Serial1"],
["Serial2", "Serial2"],
],
serialSensors: [
["Serial1", "Serial1"],
["Serial2", "Serial2"],
],
serialPins: {
SerialUSB: [
["RX", ""],
["TX", ""],
],
Serial1: [
["RX", "11"],
["TX", "10"],
],
Serial2: [
["RX", "13"],
["TX", "12"],
],
},
serialSpeed: [
["300", "300"],
["600", "600"],
["1200", "1200"],
["2400", "2400"],
["4800", "4800"],
["9600", "9600"],
["14400", "14400"],
["19200", "19200"],
["28800", "28800"],
["31250", "31250"],
["38400", "38400"],
["57600", "57600"],
["115200", "115200"],
],
spi: [["SPI", "SPI"]],
spiPins: {
SPI: [
["MOSI", "19"],
["MISO", "21"],
["SCK", "20"],
],
},
spiClockDivide: [
["2 (8MHz)", "SPI_CLOCK_DIV2"],
["4 (4MHz)", "SPI_CLOCK_DIV4"],
["8 (2MHz)", "SPI_CLOCK_DIV8"],
["16 (1MHz)", "SPI_CLOCK_DIV16"],
["32 (500KHz)", "SPI_CLOCK_DIV32"],
["64 (250KHz)", "SPI_CLOCK_DIV64"],
["128 (125KHz)", "SPI_CLOCK_DIV128"],
],
i2c: [["I2C", "Wire"]],
i2cPins: {
Wire: [
["SDA", "17"],
["SCL", "16"],
],
},
i2cSpeed: [
["100kHz", "100000L"],
["400kHz", "400000L"],
],
builtinLed: [
["BUILTIN_1", "7"],
["BUILTIN_2", "8"],
],
interrupt: [
["interrupt1", "1"],
["interrupt2", "2"],
["interrupt3", "3"],
["interrupt4", "4"],
["interrupt5", "5"],
["interrupt6", "6"],
],
analogPins: [
["A1", "A1"],
["A2", "A2"],
["B3", "A3"],
["B4", "A4"],
["C5", "A5"],
["C6", "A6"],
],
serial_baud_rate: 9600,
parseKey: "_*_",
}; };
//senseBox MCU mini
const sensebox_mini = {
description: "senseBox Mini",
compilerFlag: "arduino:samd",
digitalPins: [
["IO1", "1"],
["IO2", "2"],
],
digitalPorts: [
["IO1-2", "A"],
],
digitalPinsLED: [
["BUILTIN_1", "7"],
["BUILTIN_2", "8"],
["IO1", "1"],
["IO2", "2"],
],
digitalPinsRGB: [
["on Board", "6"],
["IO1-2", "1"],
],
digitalPinsButton: [
["on Board", "0"],
["IO1", "1"],
["IO2", "2"],
],
pwmPins: [
["IO1", "1"],
["IO2", "2"],
],
serial: [
["SerialUSB", "SerialUSB"],
["Serial1", "Serial1"],
],
serialSensors: [
["Serial1", "Serial1"],
],
serialPins: {
SerialUSB: [
["RX", ""],
["TX", ""],
],
Serial1: [
["RX", "11"],
["TX", "10"],
],
Serial2: [
["RX", "13"],
["TX", "12"],
],
},
serialSpeed: [
["300", "300"],
["600", "600"],
["1200", "1200"],
["2400", "2400"],
["4800", "4800"],
["9600", "9600"],
["14400", "14400"],
["19200", "19200"],
["28800", "28800"],
["31250", "31250"],
["38400", "38400"],
["57600", "57600"],
["115200", "115200"],
],
spi: [["SPI", "SPI"]],
spiPins: {
SPI: [
["MOSI", "19"],
["MISO", "21"],
["SCK", "20"],
],
},
spiClockDivide: [
["2 (8MHz)", "SPI_CLOCK_DIV2"],
["4 (4MHz)", "SPI_CLOCK_DIV4"],
["8 (2MHz)", "SPI_CLOCK_DIV8"],
["16 (1MHz)", "SPI_CLOCK_DIV16"],
["32 (500KHz)", "SPI_CLOCK_DIV32"],
["64 (250KHz)", "SPI_CLOCK_DIV64"],
["128 (125KHz)", "SPI_CLOCK_DIV128"],
],
i2c: [["I2C", "Wire"]],
i2cPins: {
Wire: [
["SDA", "17"],
["SCL", "16"],
],
},
i2cSpeed: [
["100kHz", "100000L"],
["400kHz", "400000L"],
],
builtinLed: [
["BUILTIN_1", "7"],
["BUILTIN_2", "8"],
],
interrupt: [
["interrupt1", "1"],
["interrupt2", "2"],
],
analogPins: [
["A1", "A1"],
["A2", "A2"],
],
serial_baud_rate: 9600,
parseKey: "_*_",
};
var board = sensebox_mcu
export const setBoard = (selectedBoard) => {
if (selectedBoard === "mini"){
board = sensebox_mini
}
else {
board = sensebox_mcu
}
}
export const selectedBoard = () => { export const selectedBoard = () => {
return board; return sensebox_mcu;
}; };

3
src/components/Blockly/helpers/colour.js
View File

@ -11,11 +11,8 @@ const colours = {
audio: 250, audio: 250,
arrays: 33, arrays: 33,
mqtt: 90, mqtt: 90,
serial: 230,
webserver: 40, webserver: 40,
phyphox: 25, phyphox: 25,
motors: 190,
cleverlab: 185 ,
}; };
export const getColour = () => { export const getColour = () => {

23
src/components/Blockly/helpers/maxInstances.js
View File

@ -1,23 +0,0 @@
/**
* To limit number of specific blocks in the workspace add block name and number of maxInstances here.
*
*/
const maxInstances = {
sensebox_wifi: 1,
sensebox_startap: 1,
sensebox_display_beginDisplay: 1,
sensebox_telegram: 1,
sensebox_telegram_do: 1,
sensebox_osem_connection: 1,
sensebox_lora_initialize_otaa: 1,
sensebox_lora_initialize_abp: 1,
sensebox_phyphox_init: 1,
sensebox_phyphox_experiment: 1,
sensebox_phyphox_experiment_send: 1,
sensebox_ethernet: 1,
};
export const getMaxInstances = () => {
return maxInstances;
};

50
src/components/Blockly/index.js
View File

@ -1,6 +1,6 @@
/** /**
* @license * @license
* *
* Copyright 2019 Google LLC * Copyright 2019 Google LLC
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -21,51 +21,39 @@
* @author samelh@google.com (Sam El-Husseini) * @author samelh@google.com (Sam El-Husseini)
*/ */
import React from "react"; import React from 'react';
import BlocklyComponent from "./BlocklyComponent"; import BlocklyComponent from './BlocklyComponent';
export default BlocklyComponent; export default BlocklyComponent;
const Block = (p) => { const Block = (p) => {
const { children, ...props } = p; const { children, ...props } = p;
props.is = "blockly"; props.is = "blockly";
return React.createElement("block", props, children); return React.createElement("block", props, children);
}; };
const Category = (p) => { const Category = (p) => {
const { children, ...props } = p; const { children, ...props } = p;
props.is = "blockly"; props.is = "blockly";
return React.createElement("category", props, children); return React.createElement("category", props, children);
}; };
const Value = (p) => { const Value = (p) => {
const { children, ...props } = p; const { children, ...props } = p;
props.is = "blockly"; props.is = "blockly";
return React.createElement("value", props, children); return React.createElement("value", props, children);
}; };
const Field = (p) => { const Field = (p) => {
const { children, ...props } = p; const { children, ...props } = p;
props.is = "blockly"; props.is = "blockly";
return React.createElement("field", props, children); return React.createElement("field", props, children);
}; };
const Shadow = (p) => { const Shadow = (p) => {
const { children, ...props } = p; const { children, ...props } = p;
props.is = "blockly"; props.is = "blockly";
return React.createElement("shadow", props, children); return React.createElement("shadow", props, children);
}; };
const Sep = (p) => { export { Block, Category, Value, Field, Shadow }
const { children, ...props } = p;
props.is = "blockly";
return React.createElement("sep", props, children);
};
const Label = (p) => {
const { children, ...props } = p;
props.is = "blockly";
return React.createElement("label", props, children);
};
export { Block, Category, Value, Field, Shadow, Sep, Label };

4
src/components/Blockly/msg/de.js
View File

@ -7,12 +7,10 @@ import { LOOPS } from "./de/loops";
import { MATH } from "./de/math"; import { MATH } from "./de/math";
import { MQTT } from "./de/mqtt"; import { MQTT } from "./de/mqtt";
import { DISPLAY } from "./de/sensebox-display"; import { DISPLAY } from "./de/sensebox-display";
import { MOTORS } from "./de/sensebox-motors";
import { LED } from "./de/sensebox-led"; import { LED } from "./de/sensebox-led";
import { LORA } from "./de/sensebox-lora"; import { LORA } from "./de/sensebox-lora";
import { OSEM } from "./de/sensebox-osem"; import { OSEM } from "./de/sensebox-osem";
import { RTC } from "./de/sensebox-rtc"; import { RTC } from "./de/sensebox-rtc";
import { NTP } from "./de/sensebox-ntp";
import { SD } from "./de/sensebox-sd"; import { SD } from "./de/sensebox-sd";
import { SENSORS } from "./de/sensebox-sensors"; import { SENSORS } from "./de/sensebox-sensors";
import { SENSEBOX } from "./de/sensebox"; import { SENSEBOX } from "./de/sensebox";
@ -36,12 +34,10 @@ export const De = {
...MATH, ...MATH,
...MQTT, ...MQTT,
...DISPLAY, ...DISPLAY,
...MOTORS,
...LED, ...LED,
...LORA, ...LORA,
...OSEM, ...OSEM,
...RTC, ...RTC,
...NTP,
...SD, ...SD,
...SENSORS, ...SENSORS,
...SENSEBOX, ...SENSEBOX,

24
src/components/Blockly/msg/de/faq.js
View File

@ -1,10 +1,10 @@
export const FAQ = { export const FAQ = {
/** /**
* FAQ * FAQ
*/ */
faq_q1_question: `Wie kann ich mein Programm auf die senseBox kopieren?`, faq_q1_question: `Wie kann ich mein Programm auf die senseBox kopieren?`,
faq_q1_answer: `Um Programme auf die senseBox zu kopieren wird diese mit dem Micro USB Kabel an den Computer angeschlossen. Mache anschließend auf der senseBox MCU einen Doppelklick auf den roten Reset Button. Die senseBox wird nun als Wechseldatenträger an deinem Computer erkannt und die zuvor erstellen Programm können per Drag & Drop kopiert werden. Nach jeder Änderung des Programmcodes muss das Programm neu kompiliert und übertragen werden faq_q1_answer: `Um Programme auf die senseBox zu kopieren wird diese mit dem Micro USB Kabel an den Computer angeschlossen. Mache anschließend auf der senseBox MCU einen Doppelklick auf den roten Reset Button. Die senseBox wird nun als Wechseldatenträger an deinem Computer erkannt und die zuvor erstellen Programm können per Drag & Drop kopiert werden. Nach jeder Änderung des Programmcodes muss das Programm neu kompiliert und übertragen werden
#### Lernmodus der MCU aktivieren #### Lernmodus der MCU aktivieren
<iframe width="560" height="315" src="https://www.youtube.com/embed/jzlOJ7Zuqqw" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe> <iframe width="560" height="315" src="https://www.youtube.com/embed/jzlOJ7Zuqqw" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
@ -14,16 +14,14 @@ Das Kopieren der Programme unter MacOS funktioniert nicht über den Finder, es g
- [muCommander](https://www.mucommander.com/) - [muCommander](https://www.mucommander.com/)
`, `,
faq_q2_question: `Mit welcher senseBox ist die Programmierumgebung kompatibel?`, faq_q2_question: `Mit welcher senseBox ist die Programmierumgebung kompatibel?`,
faq_q2_answer: ` faq_q2_answer: `
Grundsätzlich kann die Programmierumgebung mit jeder senseBox mit senseBox MCU verwendet werden. Grundsätzlich kann die Programmierumgebung mit jeder senseBox mit senseBox MCU verwendet werden.
`, `,
faq_q3_question: `Ich habe einen Fehler gefunden oder etwas funktioniert nicht. Wo kann ich diesen melden?`,
faq_q3_answer: ` faq_q3_question: `Ich habe einen Fehler gefunden oder etwas funktioniert nicht. Wo kann ich diesen melden?`,
faq_q3_answer: `
Am besten legst du dazu ein Issue auf [Github](https://github.com/sensebox/React-Ardublockly/issues) an. Alternativ kannst du uns auch eine Email an info(at)sensebox.de senden Am besten legst du dazu ein Issue auf [Github](https://github.com/sensebox/React-Ardublockly/issues) an. Alternativ kannst du uns auch eine Email an info(at)sensebox.de senden
`, `,
}
faq_tablet_question: `Kann ich die senseBox auch über ein Tablet programmieren?`,
faq_tablet_answer: `Ja! Installiere dazu die senseBox Connect App aus dem App Store und rufe die Learn- und Programmierumgebung in deinem Browser am Tablet auf. Genaue Informationen zur Verwendung der App findest du unter [https://sensebox.de/app](https://sensebox.de/app)`,
};

224
src/components/Blockly/msg/de/io.js
View File

@ -1,118 +1,108 @@
export const IO = { export const IO = {
ARD_ANALOGREAD: "lese analogen Pin#",
ARD_ANALOGREAD_TIP: "Gibt einen Wert zwischen 0 und 1023 zurück", ARD_ANALOGREAD: "lese analogen Pin#",
ARD_ANALOGWRITE: "setzte analogen Pin#", ARD_ANALOGREAD_TIP: "Gibt einen Wert zwischen 0 und 1024 zurüch",
ARD_ANALOGWRITE_TIP: ARD_ANALOGWRITE: "setzte analogen Pin#",
"Schreibe analogen Wert zwischen 0 und 255 an einen spezifischen PWM Port", ARD_ANALOGWRITE_TIP: "Schreibe analogen Wert zwischen 0 und 255 an einen spezifischen PWM Port",
ARD_BUILTIN_LED: "eingebaute LED", ARD_BUILTIN_LED: "eingebaute LED",
ARD_BUILTIN_LED_TIP: "Schaltet die interne LED An oder Aus", ARD_BUILTIN_LED_TIP: "Schaltet die interne LED An oder Aus",
ARD_COMPONENT_WARN1: ARD_COMPONENT_WARN1: "A %1 configuration block with the same %2 name must be added to use this block!",
"A %1 configuration block with the same %2 name must be added to use this block!", ARD_DEFINE: "Definiere",
ARD_DEFINE: "Definiere", ARD_DIGITALREAD: "lesen digitalen Pin#",
ARD_DIGITALREAD: "lesen digitalen Pin#", ARD_DIGITALREAD_TIP: "Lese Wert an digitalen Pin: HIGH(1) oder LOW(0)",
ARD_DIGITALREAD_TIP: "Lese Wert an digitalen Pin: HIGH(1) oder LOW(0)", ARD_DIGITALWRITE: "setzte digitalen Pin#",
ARD_DIGITALWRITE: "setzte digitalen Pin#", ARD_DIGITALWRITE_TIP: "Schreibe digitalen Wert HIGH (1) oder LOW(0) an spezifischen Port",
ARD_DIGITALWRITE_TIP: ARD_FUN_RUN_LOOP: "Endlosschleife()",
"Schreibe digitalen Wert HIGH (1) oder LOW(0) an spezifischen Port", ARD_FUN_RUN_SETUP: "Setup()",
ARD_FUN_RUN_LOOP: "Endlosschleife()", ARD_FUN_RUN_TIP: "Definiert die setup() und loop() Funktionen. Die setup()-Funktion wird beim starten **einmal** ausgeführt. Anschließend wir die loop()-Funktion in einer **Endlosschleife** ausgeführt. Füge in die Setup()-Funktion Blöcke ein, um z.B. das Display zu initalisieren, eine Verbindung zum WiFi-Netzwerk herzustellen oder um die LoRa Verbindung zu initialsieren.",
ARD_FUN_RUN_SETUP: "Setup()", ARD_HIGH: "HIGH",
ARD_FUN_RUN_TIP: ARD_HIGHLOW_TIP: "Setzt einen Status auf HIGH oder LOWSet a pin state logic High or Low.",
"Definiert die setup() und loop() Funktionen. Die setup()-Funktion wird beim starten **einmal** ausgeführt. Anschließend wir die loop()-Funktion in einer **Endlosschleife** ausgeführt. Füge in die Setup()-Funktion Blöcke ein, um z.B. das Display zu initalisieren, eine Verbindung zum WiFi-Netzwerk herzustellen oder um die LoRa Verbindung zu initialsieren.", ARD_LOW: "LOW",
ARD_HIGH: "HIGH", ARD_MAP: "Verteile Wert",
ARD_HIGHLOW_TIP: ARD_MAP_FROMMIN: "von Minimum",
"Setzt einen Status auf HIGH oder LOWSet a pin state logic High or Low.", ARD_MAP_FROMMAX: "bis maximum",
ARD_LOW: "LOW", ARD_MAP_TOMIN: "auf Minimum",
ARD_MAP: "Verteile Wert", ARD_MAP_TOMAX: "bis Maximum",
ARD_MAP_FROMMIN: "von Minimum", ARD_MAP_TIP: "Verteilt Werte zwischen [0-1024] zu andere.",
ARD_MAP_FROMMAX: "bis maximum", ARD_MAP_VAL: "Wert zu [0-",
ARD_MAP_TOMIN: "auf Minimum", ARD_NOTONE: "Schalte Ton aus an Pin",
ARD_MAP_TOMAX: "bis Maximum", ARD_NOTONE_PIN: "keinen Ton an Pin",
ARD_MAP_TIP: "Verteilt Werte zwischen [0-1024] zu andere.", ARD_NOTONE_PIN_TIP: "Stoppe die Tonerzeugung an Pin",
ARD_MAP_VAL: "Wert zu [0-", ARD_NOTONE_TIP: "Schaltet den Ton am ausgewählten Pin aus",
ARD_NOTONE: "Schalte Ton aus an Pin", ARD_PIN_WARN1: "Pin %1 wird benötigt für %2 als Pin %3. Bereitsgenutzt als %4.",
ARD_NOTONE_PIN: "keinen Ton an Pin", ARD_PULSETIMEOUT_TIP: "Misst die Laufzeit eines Impulses am ausgewählten Pin, wenn die Zeit ist in Microsekunden.",
ARD_NOTONE_PIN_TIP: "Stoppe die Tonerzeugung an Pin", ARD_PULSE_READ: "Misst %1 Impuls an Pin #%2",
ARD_NOTONE_TIP: "Schaltet den Ton am ausgewählten Pin aus", ARD_PULSE_READ_TIMEOUT: "Misst %1 Impuls an Pin #%2 (Unterbrechung nach %3 μs)",
ARD_PIN_WARN1: ARD_PULSE_TIP: "Misst die Zeit eines Impulses an dem ausgewählten Pin.",
"Pin %1 wird benötigt für %2 als Pin %3. Bereitsgenutzt als %4.", ARD_SERIAL_BPS: "bps",
ARD_PULSETIMEOUT_TIP: ARD_SERIAL_PRINT: "schreibe",
"Misst die Laufzeit eines Impulses am ausgewählten Pin, wenn die Zeit ist in Microsekunden.", ARD_SERIAL_PRINT_NEWLINE: "neue Zeile hinzufügen",
ARD_PULSE_READ: "Misst %1 Impuls an Pin #%2", ARD_SERIAL_PRINT_TIP: "Prints data to the console/serial port as human-readable ASCII text.", // untranslated
ARD_PULSE_READ_TIMEOUT: ARD_SERIAL_PRINT_WARN: "A setup block for %1 must be added to the workspace to use this block!", // untranslated
"Misst %1 Impuls an Pin #%2 (Unterbrechung nach %3 μs)", ARD_SERIAL_SETUP: "Setup",
ARD_PULSE_TIP: "Misst die Zeit eines Impulses an dem ausgewählten Pin.", ARD_SERIAL_SETUP_TIP: "Selects the speed for a specific Serial peripheral", // untranslated
ARD_SERIAL_BPS: "bps", ARD_SERIAL_SPEED: ": Übertragungsgeschwindigkeit zu",
ARD_SERIAL_PRINT: "schreibe", ARD_SERVO_READ: "liest SERVO an PIN#",
ARD_SERIAL_PRINT_NEWLINE: "neue Zeile hinzufügen", ARD_SERVO_READ_TIP: "Liest den Winkel des Servomotors aus",
ARD_SERIAL_PRINT_TIP: ARD_SERVO_WRITE: "setzt SERVO an Pin",
"Prints data to the console/serial port as human-readable ASCII text.", // untranslated ARD_SERVO_WRITE_DEG_180: "Winkel (0~180)",
ARD_SERIAL_PRINT_WARN: ARD_SERVO_WRITE_TIP: "Set a Servo to an specified angle", // untranslated
"A setup block for %1 must be added to the workspace to use this block!", // untranslated ARD_SERVO_WRITE_TO: "", // untranslated
ARD_SERIAL_SETUP: "Setup", ARD_SETTONE: "Spiele Ton an Pin", // untranslated
ARD_SERIAL_SETUP_TIP: "Selects the speed for a specific Serial peripheral", // untranslated ARD_SPI_SETUP: "Setup",
ARD_SERIAL_SPEED: ": Übertragungsgeschwindigkeit zu", ARD_SPI_SETUP_CONF: "Konfiguration:",
ARD_SERVO_READ: "liest SERVO an PIN#", ARD_SPI_SETUP_DIVIDE: "clock divide", // untranslated
ARD_SERVO_READ_TIP: "Liest den Winkel des Servomotors aus", ARD_SPI_SETUP_LSBFIRST: "LSBFIRST", // untranslated
ARD_SERVO_WRITE: "setzt SERVO an Pin", ARD_SPI_SETUP_MODE: "SPI mode (idle - edge)", // untranslated
ARD_SERVO_WRITE_DEG_180: "Winkel (0~180)", ARD_SPI_SETUP_MODE0: "0 (LOW - Fallend)",
ARD_SERVO_WRITE_TIP: "Set a Servo to an specified angle", // untranslated ARD_SPI_SETUP_MODE1: "1 (LOW - Steigend)",
ARD_SERVO_WRITE_TO: "", // untranslated ARD_SPI_SETUP_MODE2: "2 (HIGH - Fallend)",
ARD_SETTONE: "Spiele Ton an Pin", // untranslated ARD_SPI_SETUP_MODE3: "3 (HIGH - Steigend)",
ARD_SPI_SETUP: "Setup", ARD_SPI_SETUP_MSBFIRST: "MSBFIRST", // untranslated
ARD_SPI_SETUP_CONF: "Konfiguration:", ARD_SPI_SETUP_SHIFT: "data shift", // untranslated
ARD_SPI_SETUP_DIVIDE: "clock divide", // untranslated ARD_SPI_SETUP_TIP: "Configures the SPI peripheral.", // untranslated
ARD_SPI_SETUP_LSBFIRST: "LSBFIRST", // untranslated ARD_SPI_TRANSRETURN_TIP: "Send a SPI message to an specified slave device and get data back.", // untranslated
ARD_SPI_SETUP_MODE: "SPI mode (idle - edge)", // untranslated ARD_SPI_TRANS_NONE: "none", // untranslated
ARD_SPI_SETUP_MODE0: "0 (LOW - Fallend)", ARD_SPI_TRANS_SLAVE: "to slave pin", // untranslated
ARD_SPI_SETUP_MODE1: "1 (LOW - Steigend)", ARD_SPI_TRANS_TIP: "Send a SPI message to an specified slave device.", // untranslated
ARD_SPI_SETUP_MODE2: "2 (HIGH - Fallend)", ARD_SPI_TRANS_VAL: "transfer", // untranslated
ARD_SPI_SETUP_MODE3: "3 (HIGH - Steigend)", ARD_SPI_TRANS_WARN1: "A setup block for %1 must be added to the workspace to use this block!", // untranslated
ARD_SPI_SETUP_MSBFIRST: "MSBFIRST", // untranslated ARD_SPI_TRANS_WARN2: "Old pin value %1 is no longer available.", // untranslated
ARD_SPI_SETUP_SHIFT: "data shift", // untranslated ARD_STEPPER_COMPONENT: "stepper", // untranslated
ARD_SPI_SETUP_TIP: "Configures the SPI peripheral.", // untranslated ARD_STEPPER_DEFAULT_NAME: "MyStepper", // untranslated
ARD_SPI_TRANSRETURN_TIP: ARD_STEPPER_FOUR_PINS: "4", // untranslated
"Send a SPI message to an specified slave device and get data back.", // untranslated ARD_STEPPER_MOTOR: "stepper motor:", // untranslated
ARD_SPI_TRANS_NONE: "none", // untranslated ARD_STEPPER_NUMBER_OF_PINS: "Number of pins", // untranslated
ARD_SPI_TRANS_SLAVE: "to slave pin", // untranslated ARD_STEPPER_PIN1: "pin1#", // untranslated
ARD_SPI_TRANS_TIP: "Send a SPI message to an specified slave device.", // untranslated ARD_STEPPER_PIN2: "pin2#", // untranslated
ARD_SPI_TRANS_VAL: "transfer", // untranslated ARD_STEPPER_PIN3: "pin3#", // untranslated
ARD_SPI_TRANS_WARN1: ARD_STEPPER_PIN4: "pin4#", // untranslated
"A setup block for %1 must be added to the workspace to use this block!", // untranslated ARD_STEPPER_REVOLVS: "how many steps per revolution", // untranslated
ARD_SPI_TRANS_WARN2: "Old pin value %1 is no longer available.", // untranslated ARD_STEPPER_SETUP: "Setup stepper motor", // untranslated
ARD_STEPPER_COMPONENT: "stepper", // untranslated ARD_STEPPER_SETUP_TIP: "Configures a stepper motor pinout and other settings.", // untranslated
ARD_STEPPER_DEFAULT_NAME: "MyStepper", // untranslated ARD_STEPPER_SPEED: "set speed (rpm) to", // untranslated
ARD_STEPPER_FOUR_PINS: "4", // untranslated ARD_STEPPER_STEP: "move stepper", // untranslated
ARD_STEPPER_MOTOR: "stepper motor:", // untranslated ARD_STEPPER_STEPS: "steps", // untranslated
ARD_STEPPER_NUMBER_OF_PINS: "Number of pins", // untranslated ARD_STEPPER_STEP_TIP: "Turns the stepper motor a specific number of steps.", // untranslated
ARD_STEPPER_PIN1: "pin1#", // untranslated ARD_STEPPER_TWO_PINS: "2", // untranslated
ARD_STEPPER_PIN2: "pin2#", // untranslated ARD_TYPE_ARRAY: "Array",
ARD_STEPPER_PIN3: "pin3#", // untranslated ARD_TYPE_BOOL: "Boolean",
ARD_STEPPER_PIN4: "pin4#", // untranslated ARD_TYPE_CHAR: "Zeichen",
ARD_STEPPER_REVOLVS: "how many steps per revolution", // untranslated ARD_TYPE_CHILDBLOCKMISSING: "ChildBlockMissing", // untranslated
ARD_STEPPER_SETUP: "Setup stepper motor", // untranslated ARD_TYPE_DECIMAL: "Dezimalzahl",
ARD_STEPPER_SETUP_TIP: ARD_TYPE_LONG: "große Zahl",
"Configures a stepper motor pinout and other settings.", // untranslated ARD_TYPE_NULL: "Null",
ARD_STEPPER_SPEED: "set speed (rpm) to", // untranslated ARD_TYPE_NUMBER: "Zahl",
ARD_STEPPER_STEP: "move stepper", // untranslated ARD_TYPE_SHORT: "kurze Zahl",
ARD_STEPPER_STEPS: "steps", // untranslated ARD_TYPE_TEXT: "Text",
ARD_STEPPER_STEP_TIP: "Turns the stepper motor a specific number of steps.", // untranslated ARD_TYPE_UNDEF: "Undefiniert",
ARD_STEPPER_TWO_PINS: "2", // untranslated ARD_VAR_AS: "als",
ARD_TYPE_ARRAY: "Array", ARD_VAR_AS_TIP: "Wert einem spezififischen Datentyp zuordnen",
ARD_TYPE_BOOL: "Boolean", ARD_WRITE_TO: "zu",
ARD_TYPE_CHAR: "Zeichen", NEW_INSTANCE: "Neue Instanz...",
ARD_TYPE_CHILDBLOCKMISSING: "ChildBlockMissing", // untranslated NEW_INSTANCE_TITLE: "Neue Instanz mit Name:",
ARD_TYPE_DECIMAL: "Dezimalzahl", RENAME_INSTANCE: "Instanz umbenennen...",
ARD_TYPE_LONG: "große Zahl", RENAME_INSTANCE_TITLE: "Benenne alle '%1' Instanzen zu:",
ARD_TYPE_NULL: "Null",
ARD_TYPE_NUMBER: "Zahl", }
ARD_TYPE_SHORT: "kurze Zahl",
ARD_TYPE_TEXT: "Text",
ARD_TYPE_UNDEF: "Undefiniert",
ARD_VAR_AS: "als",
ARD_VAR_AS_TIP: "Wert einem spezififischen Datentyp zuordnen",
ARD_WRITE_TO: "zu",
NEW_INSTANCE: "Neue Instanz...",
NEW_INSTANCE_TITLE: "Neue Instanz mit Name:",
RENAME_INSTANCE: "Instanz umbenennen...",
RENAME_INSTANCE_TITLE: "Benenne alle '%1' Instanzen zu:",
};

110
src/components/Blockly/msg/de/logic.js
View File

@ -1,64 +1,50 @@
export const LOGIC = { export const LOGIC = {
CONTROLS_IF_ELSEIF_TOOLTIP: "Eine weitere Bedingung hinzufügen.",
CONTROLS_IF_ELSE_TOOLTIP:
"Eine sonst-Bedingung hinzufügen, führt eine Anweisung aus, falls keine Bedingung zutrifft.",
CONTROLS_IF_HELPURL: "https://github.com/google/blockly/wiki/IfElse", // untranslated
CONTROLS_IF_IF_TOOLTIP: "Hinzufügen, entfernen oder sortieren von Sektionen",
CONTROLS_IF_MSG_ELSE: "sonst",
CONTROLS_IF_MSG_ELSEIF: "sonst wenn",
CONTROLS_IF_MSG_IF: "wenn",
CONTROLS_IF_TOOLTIP_1:
"Wenn eine Bedingung wahr (true) ist, dann führe eine Anweisung aus.",
CONTROLS_IF_TOOLTIP_2:
"Wenn eine Bedingung wahr (true) ist, dann führe die erste Anweisung aus. Ansonsten führe die zweite Anweisung aus.",
CONTROLS_IF_TOOLTIP_3:
"Wenn die erste Bedingung wahr (true) ist, dann führe die erste Anweisung aus. Oder wenn die zweite Bedingung wahr (true) ist, dann führe die zweite Anweisung aus.",
CONTROLS_IF_TOOLTIP_4:
"Wenn die erste Bedingung wahr (true) ist, dann führe die erste Anweisung aus. Oder wenn die zweite Bedingung wahr (true) ist, dann führe die zweite Anweisung aus. Falls keine der beiden Bedingungen wahr (true) ist, dann führe die dritte Anweisung aus.",
LOGIC_BOOLEAN_HELPURL: "https://github.com/google/blockly/wiki/Logic#values", // untranslated
LOGIC_BOOLEAN_TOOLTIP: "Ist entweder wahr (true) oder falsch (false)",
LOGIC_BOOLEAN_TRUE: "wahr",
LOGIC_COMPARE_HELPURL: "https://de.wikipedia.org/wiki/Vergleich_%28Zahlen%29",
LOGIC_COMPARE_TOOLTIP_EQ: "Ist wahr (true), wenn beide Werte gleich sind.",
LOGIC_COMPARE_TOOLTIP_GT:
"Ist wahr (true), wenn der erste Wert größer als der zweite Wert ist.",
LOGIC_COMPARE_TOOLTIP_GTE:
"Ist wahr (true), wenn der erste Wert größer als oder gleich groß wie der zweite Wert ist.",
LOGIC_COMPARE_TOOLTIP_LT:
"Ist wahr (true), wenn der erste Wert kleiner als der zweite Wert ist.",
LOGIC_COMPARE_TOOLTIP_LTE:
"Ist wahr (true), wenn der erste Wert kleiner als oder gleich groß wie der zweite Wert ist.",
LOGIC_COMPARE_TOOLTIP_NEQ:
"Ist wahr (true), wenn beide Werte unterschiedlich sind.",
LOGIC_NEGATE_HELPURL: "https://github.com/google/blockly/wiki/Logic#not", // untranslated
LOGIC_NEGATE_TITLE: "nicht %1",
LOGIC_NEGATE_TOOLTIP:
"Ist wahr (true), wenn der Eingabewert falsch (false) ist. Ist falsch (false), wenn der Eingabewert wahr (true) ist.",
LOGIC_NULL: "null",
LOGIC_NULL_HELPURL: "https://de.wikipedia.org/wiki/Nullwert",
LOGIC_NULL_TOOLTIP: "Ist NULL.",
LOGIC_OPERATION_AND: "und",
LOGIC_OPERATION_HELPURL:
"https://github.com/google/blockly/wiki/Logic#logical-operations", // untranslated
LOGIC_OPERATION_OR: "oder",
LOGIC_OPERATION_TOOLTIP_AND:
"Ist wahr (true), wenn beide Werte wahr (true) sind.",
LOGIC_OPERATION_TOOLTIP_OR:
"Ist wahr (true), wenn einer der beiden Werte wahr (true) ist.",
LOGIC_TERNARY_CONDITION: "teste",
LOGIC_TERNARY_HELPURL: "https://de.wikipedia.org/wiki/%3F:#Auswahloperator",
LOGIC_TERNARY_IF_FALSE: "wenn falsch",
LOGIC_TERNARY_IF_TRUE: "wenn wahr",
LOGIC_TERNARY_TOOLTIP:
'Überprüft eine Bedingung "teste". Wenn die Bedingung wahr ist, wird der "wenn wahr" Wert zurückgegeben, andernfalls der "wenn falsch" Wert',
/** CONTROLS_IF_ELSEIF_TOOLTIP: "Eine weitere Bedingung hinzufügen.",
* Cases CONTROLS_IF_ELSE_TOOLTIP: "Eine sonst-Bedingung hinzufügen, führt eine Anweisung aus, falls keine Bedingung zutrifft.",
*/ CONTROLS_IF_HELPURL: "https://github.com/google/blockly/wiki/IfElse", // untranslated
cases_do: "Führe aus", CONTROLS_IF_IF_TOOLTIP: "Hinzufügen, entfernen oder sortieren von Sektionen",
cases_condition: "Fall (Variable): ", CONTROLS_IF_MSG_ELSE: "sonst",
cases_switch: "Variable", CONTROLS_IF_MSG_ELSEIF: "sonst wenn",
cases_add: "Fall", CONTROLS_IF_MSG_IF: "wenn",
cases_tooltip: CONTROLS_IF_TOOLTIP_1: "Wenn eine Bedingung wahr (true) ist, dann führe eine Anweisung aus.",
"Führt den entsprechenden Fall aus, wenn die Überprüfung der Variable TRUE ergibt. Über das Zahnrad kannst du weitere Fälle hinzufügen. Über den 'Default' fall kannst du bestimmen, was passieren soll wenn keiner der vorher definierten Fälle eingetreten ist.", CONTROLS_IF_TOOLTIP_2: "Wenn eine Bedingung wahr (true) ist, dann führe die erste Anweisung aus. Ansonsten führe die zweite Anweisung aus.",
}; CONTROLS_IF_TOOLTIP_3: "Wenn die erste Bedingung wahr (true) ist, dann führe die erste Anweisung aus. Oder wenn die zweite Bedingung wahr (true) ist, dann führe die zweite Anweisung aus.",
CONTROLS_IF_TOOLTIP_4: "Wenn die erste Bedingung wahr (true) ist, dann führe die erste Anweisung aus. Oder wenn die zweite Bedingung wahr (true) ist, dann führe die zweite Anweisung aus. Falls keine der beiden Bedingungen wahr (true) ist, dann führe die dritte Anweisung aus.",
LOGIC_BOOLEAN_HELPURL: "https://github.com/google/blockly/wiki/Logic#values", // untranslated
LOGIC_BOOLEAN_TOOLTIP: "Ist entweder wahr (true) oder falsch (false)",
LOGIC_BOOLEAN_TRUE: "wahr",
LOGIC_COMPARE_HELPURL: "https://de.wikipedia.org/wiki/Vergleich_%28Zahlen%29",
LOGIC_COMPARE_TOOLTIP_EQ: "Ist wahr (true), wenn beide Werte gleich sind.",
LOGIC_COMPARE_TOOLTIP_GT: "Ist wahr (true), wenn der erste Wert größer als der zweite Wert ist.",
LOGIC_COMPARE_TOOLTIP_GTE: "Ist wahr (true), wenn der erste Wert größer als oder gleich groß wie der zweite Wert ist.",
LOGIC_COMPARE_TOOLTIP_LT: "Ist wahr (true), wenn der erste Wert kleiner als der zweite Wert ist.",
LOGIC_COMPARE_TOOLTIP_LTE: "Ist wahr (true), wenn der erste Wert kleiner als oder gleich groß wie der zweite Wert ist.",
LOGIC_COMPARE_TOOLTIP_NEQ: "Ist wahr (true), wenn beide Werte unterschiedlich sind.",
LOGIC_NEGATE_HELPURL: "https://github.com/google/blockly/wiki/Logic#not", // untranslated
LOGIC_NEGATE_TITLE: "nicht %1",
LOGIC_NEGATE_TOOLTIP: "Ist wahr (true), wenn der Eingabewert falsch (false) ist. Ist falsch (false), wenn der Eingabewert wahr (true) ist.",
LOGIC_NULL: "null",
LOGIC_NULL_HELPURL: "https://de.wikipedia.org/wiki/Nullwert",
LOGIC_NULL_TOOLTIP: "Ist NULL.",
LOGIC_OPERATION_AND: "und",
LOGIC_OPERATION_HELPURL: "https://github.com/google/blockly/wiki/Logic#logical-operations", // untranslated
LOGIC_OPERATION_OR: "oder",
LOGIC_OPERATION_TOOLTIP_AND: "Ist wahr (true), wenn beide Werte wahr (true) sind.",
LOGIC_OPERATION_TOOLTIP_OR: "Ist wahr (true), wenn einer der beiden Werte wahr (true) ist.",
LOGIC_TERNARY_CONDITION: "teste",
LOGIC_TERNARY_HELPURL: "https://de.wikipedia.org/wiki/%3F:#Auswahloperator",
LOGIC_TERNARY_IF_FALSE: "wenn falsch",
LOGIC_TERNARY_IF_TRUE: "wenn wahr",
LOGIC_TERNARY_TOOLTIP: "Überprüft eine Bedingung \"teste\". Wenn die Bedingung wahr ist, wird der \"wenn wahr\" Wert zurückgegeben, andernfalls der \"wenn falsch\" Wert",
/**
* Cases
*/
cases_do: "Führe aus",
cases_condition: "Fall (Variable): ",
cases_switch: "Variable",
cases_add: "Fall",
cases_tooltip: "Führt den entsprechenden Fall aus, wenn die Überprüfung der Variable TRUE ergibt. Über das Zahnrad kannst du weitere Fälle hinzufügen. Über den 'Default' fall kannst du bestimmen, was passieren soll wenn keiner der vorher definierten Fälle eingetreten ist.",
}

2
src/components/Blockly/msg/de/sensebox-ble.js
View File

@ -27,7 +27,7 @@ export const BLE = {
sensebox_phyphox_graphStyle: "Stil", sensebox_phyphox_graphStyle: "Stil",
sensebox_phyphox_init_tooltip: sensebox_phyphox_init_tooltip:
"Initialisere das Bluetooth Bee. Stecke diese auf dem Steckplatz **XBEE1**. Gib dem Phyphox Messgerät einen eindeutigen Namen, damit du dieses in der App wiederfindest", "Initialisere das Bluetooth Bee. Stecke diese auf dem Steckplatz **XBEE1**. Gib dem Phphox Messgerät einen eindeutigen Namen, damit du dieses in der App wiederfindest",
sensebox_phyphox_experiment_tooltip: sensebox_phyphox_experiment_tooltip:
"Erstelle ein Experiment und vergib einen eindeutigen Namen und eine kurze Beschreibung. Füge bis zu 5 verschiedene Graphen in der Ansicht hinzu. ", "Erstelle ein Experiment und vergib einen eindeutigen Namen und eine kurze Beschreibung. Füge bis zu 5 verschiedene Graphen in der Ansicht hinzu. ",
sensebox_phyphox_graph_tooltip: sensebox_phyphox_graph_tooltip:

93
src/components/Blockly/msg/de/sensebox-lora.js
View File

@ -1,59 +1,44 @@
export const LORA = { export const LORA = {
/* /*
* LoRa Blöcke * LoRa Blöcke
*/ */
senseBox_LoRa_connect: "Zu TTN senden", senseBox_LoRa_connect: "Zu TTN senden",
senseBox_LoRa_device_id: "Device EUI (lsb)", senseBox_LoRa_device_id: "Device EUI (lsb)",
senseBox_LoRa_app_id: "Application EUI (lsb)", senseBox_LoRa_app_id: "Application EUI (lsb)",
senseBox_LoRa_app_key: "App Key (msb)", senseBox_LoRa_app_key: "App Key (msb)",
senseBox_LoRa_nwskey_id: "Network Session Key (msb)", senseBox_LoRa_nwskey_id: "Network Session Key (msb)",
senseBox_LoRa_appskey_id: "App Session Key (msb)", senseBox_LoRa_appskey_id: "App Session Key (msb)",
senseBox_LoRa_devaddr_id: "Device Adress", senseBox_LoRa_devaddr_id: "Device Adress",
senseBox_LoRa_interval: "Intervall in Minuten", senseBox_LoRa_interval: "Intervall in Minuten",
senseBox_measurement: "Messung", senseBox_measurement: "Messung",
senseBox_measurements: "Messungen", senseBox_measurements: "Messungen",
senseBox_LoRa_send_message: "Sende als Lora Nachricht", senseBox_LoRa_send_message: "Sende als Lora Nachricht",
senseBox_LoRa_send_cayenne: "Sende als Cayenne Nachricht", senseBox_LoRa_send_cayenne: "Sende als Cayenne Nachricht",
senseBox_LoRa_cayenne_temperature: "Temperatur", senseBox_LoRa_cayenne_temperature: "Temperatur",
senseBox_LoRa_cayenne_channel: "Kanal", senseBox_LoRa_cayenne_channel: "Kanal",
senseBox_LoRa_cayenne_humidity: "Luftfeuchtigkeit", senseBox_LoRa_cayenne_humidity: "Luftfeuchtigkeit",
senseBox_LoRa_cayenne_pressure: "Luftdruck", senseBox_LoRa_cayenne_pressure: "Luftdruck",
senseBox_LoRa_cayenne_luminosity: "Helligkeit", senseBox_LoRa_cayenne_luminosity: "Helligkeit",
senseBox_LoRa_cayenne_analog: "Analoger Wert", senseBox_LoRa_cayenne_analog: "Analoger Wert",
senseBox_LoRa_cayenne_x: "X Wert", senseBox_LoRa_cayenne_x: "X Wert",
senseBox_LoRa_cayenne_y: "Y Wert", senseBox_LoRa_cayenne_y: "Y Wert",
senseBox_LoRa_cayenne_z: "Z Wert", senseBox_LoRa_cayenne_z: "Z Wert",
senseBox_LoRa_cayenne_lat: "Breitengrad", senseBox_LoRa_cayenne_lat: "Breitengrad",
senseBox_LoRa_cayenne_lng: "Längengrad", senseBox_LoRa_cayenne_lng: "Längengrad",
senseBox_LoRa_cayenne_alt: "Höhe", senseBox_LoRa_cayenne_alt: "Höhe",
senseBox_LoRa_cayenne_concentration: "Konzentration",
senseBox_LoRa_cayenne_tip: "Sende Daten als Cayenne Payload Format", senseBox_LoRa_cayenne_tip: "Sende Daten als Cayenne Payload Format",
senseBox_LoRa_cayenne_gps_tip: "Sende GPS", senseBox_LoRa_cayenne_gps_tip: "Sende GPS",
senseBox_LoRa_cayenne_temperature_tip: senseBox_LoRa_cayenne_temperature_tip: "Sendet Temperaturwert mit einer Nachkommastelle",
"Sendet Temperaturwert mit einer Nachkommastelle", senseBox_LoRa_cayenne_pressure_tip: "Sendet Luftdruck mit einer Nachkommastelle",
senseBox_LoRa_cayenne_pressure_tip: senseBox_LoRa_cayenne_luminosity_tip: "Sendet Helligkeitswert",
"Sendet Luftdruck mit einer Nachkommastelle", senseBox_LoRa_cayenne_analog_tip: "Sendet einen Dezimalwert mit einer Nachkommastelle",
senseBox_LoRa_cayenne_luminosity_tip: "Sendet Helligkeitswert",
senseBox_LoRa_cayenne_analog_tip:
"Sendet einen Dezimalwert mit einer Nachkommastelle",
senseBox_LoRa_cayenne_concentration_tip: "Sendet eine Konzentration in PPM", senseBox_LoRa_message_tooltip: "Sende eine Nachricht über LoRa",
senseBox_LoRa_sensor_tip: "Sende einen Sensorwert mit einer bestimmten Anzahl an Bytes",
senseBox_LoRa_message_tooltip: "Sende eine Nachricht über LoRa", senseBox_LoRa_init_abp_tooltip: "Initialisiere die LoRa übertragung. Die Aktivierung erfolgt über ABP. Registriere eine Application auf [thethingsnetwork](https://thethingsnetwork.com) und kopiere den **Network Session Key** und den **App Session Key** im **msb Format** und die **Device ID** im **hex Format**.",
senseBox_LoRa_sensor_tip: senseBox_LoRa_init_helpurl: "https://docs.sensebox.de/blockly/blockly-web-lora/",
"Sende einen Sensorwert mit einer bestimmten Anzahl an Bytes", senseBox_LoRa_init_otaa_tooltip: "Initialisiere die LoRa übertragung. Die Aktivierung erfolgt über OTAA. Registriere eine Application auf [thethingsnetwork](https://thethingsnetwork.com) und kopiere die **DEVICE EUI** und die **Application EUI** im **lsb Format** den **App Key** im **msb Format**.",
senseBox_LoRa_init_abp_tooltip: }
"Initialisiere die LoRa übertragung. Die Aktivierung erfolgt über ABP. Registriere eine Application auf [thethingsnetwork](https://thethingsnetwork.com) und kopiere den **Network Session Key** und den **App Session Key** im **msb Format** und die **Device ID** im **hex Format**.",
senseBox_LoRa_init_helpurl:
"https://docs.sensebox.de/blockly/blockly-web-lora/",
senseBox_LoRa_init_otaa_tooltip:
"Initialisiere die LoRa übertragung. Die Aktivierung erfolgt über OTAA. Registriere eine Application auf [thethingsnetwork](https://thethingsnetwork.com) und kopiere die **DEVICE EUI** und die **Application EUI** im **lsb Format** den **App Key** im **msb Format**.",
sensebox_lora_ttn_mapper_tip:
"Mit einem TTN Mapper kannst du die LoRa-Netzabdeckung in deiner Umgebung aufzeichnen. Die Daten werden dann auf [ttnmaper](https://ttnmapper.org) angezeigt. Den notwendigen Decoder findest du [hier](https://gist.github.com/felixerdy/f959ac03df98c6947f1c7f35d537f23e#file-decoder-js).",
sensebox_lora_ttn_mapper_helpurl:
"https://sensebox.de/projects/de/2020-03-06-ttn-mapper",
};

48
src/components/Blockly/msg/de/sensebox-motors.js
View File

@ -1,48 +0,0 @@
export const MOTORS = {
/**
* Motors
*/
sensebox_motors_beginServoMotor: "Initialisiere Servomotor",
sensebox_motors_beginServoMotor_pin: "Pin:",
sensebox_motors_beginServoMotor_tooltip: "Verbinde einen digitalen Pin mit dem orangen Kabel des Servomotrors. Verbinde zusätzlich GND mit GND (schwarzes und braunes Kabel) und 5V mit 5V (rotes Kabel).",
sensebox_motors_beginServoMotor_helpurl: "https://de.wikipedia.org/wiki/Servomotor",
sensebox_motors_moveServoMotor: "Bewege Servomotor",
sensebox_motors_moveServoMotor_pin: "Pin:",
sensebox_motors_moveServoMotor_degrees: "Winkel in Grad:",
sensebox_motors_moveServoMotor_tooltip: "Der Servomotor kann zwischen 0 und 180 Grad bewegt werden.",
sensebox_motors_moveServoMotor_helpurl: "https://de.wikipedia.org/wiki/Servomotor",
sensebox_motors_I2CMotorBoard_begin: "Initialize I2C Motor Board",
sensebox_motors_I2CMotorBoard_begin_tooltip: "Connect the I2C Moztor Board with the two DC Motors to one of the five I2C-Ports. Use this Block inside the setup()-function.",
sensebox_motors_I2CMotorBoard_begin_helpurl: "TODO",
sensebox_motors_I2CMotorBoard_moveDCMotor: "Move",
sensebox_motors_I2CMotorBoard_moveDCMotor_left: "left",
sensebox_motors_I2CMotorBoard_moveDCMotor_right: "right",
sensebox_motors_I2CMotorBoard_moveDCMotor_motor: "DC Motor at I2C Motor Board",
sensebox_motors_I2CMotorBoard_moveDCMotor_speed: "Speed:",
sensebox_motors_I2CMotorBoard_moveDCMotor_tooltip: "You can set the Speed between -100 and 100.",
sensebox_motors_I2CMotorBoard_moveDCMotor_helpurl: "TODO",
sensebox_motors_I2CMotorBoard_stopDCMotor: "Stop ",
sensebox_motors_I2CMotorBoard_stopDCMotor_left: "left",
sensebox_motors_I2CMotorBoard_stopDCMotor_right: "right",
sensebox_motors_I2CMotorBoard_stopDCMotor_motor: "DC Motor at I2C Motor Board",
sensebox_motors_I2CMotorBoard_stopDCMotor_tooltip: "TODO",
sensebox_motors_I2CMotorBoard_stopDCMotor_helpurl: "TODO",
sensebox_motors_beginStepperMotor: "Initialize Stepper Motor (28BYJ-48)",
sensebox_motors_beginStepperMotor_rpm: "Rotations per Minute:",
sensebox_motors_beginStepperMotor_pins: "Input Pins (IN1-IN4):",
sensebox_motors_beginStepperMotor_tooltip: "Connect four of the the digital pins in the right order to the inputs IN1-IN4 on the stepper motor board. Connect a GND pin (black wire) to the minus pin and a 5V pin (red wire) to the plus pin on the board. Also connect the stepper motor to this Board. Use this Block inside the setup()-function.",
sensebox_motors_beginStepperMotor_helpurl: "TODO",
sensebox_motors_moveStepperMotor: "Move Stepper Motor (28BYJ-48)",
sensebox_motors_moveStepperMotor_step: "Steps:",
sensebox_motors_moveStepperMotor_tooltip: "Move stepper motor. 2048 steps equal a full rotation.",
sensebox_motors_moveStepperMotor_helpurl: "TODO",
};

11
src/components/Blockly/msg/de/sensebox-ntp.js
View File

@ -1,11 +0,0 @@
export const NTP = {
sensebox_ntp_init: "Initialisiere NTP",
sensebox_ntp_init_tooltip: "Initialisiere den NTP Server.",
sensebox_ntp_get: "Hole Zeit von NTP Server: ",
sensebox_ntp_get_timestamp_tooltip:
"Gibt dir einen in ISO 8601 formatierten Zeitstempel zurück. Bsp: 2021-12-24T18:21Z",
sensebox_ntp_get_tooltip:
"Gibt dir den ausgewählten Wert zurück. Unix Zeit entspricht der Anzahl der Sekunden seit dem 1.1.1970",
sensebox_ntp_epochTime: "Unix Zeit",
sensebox_ntp_formattedTimeStamp: "Zeitstempel (hh:mm:ss)",
};

38
src/components/Blockly/msg/de/sensebox-osem.js
View File

@ -1,23 +1,17 @@
export const OSEM = { export const OSEM = {
/** /**
* openSenseMap * openSenseMap
*/ */
senseBox_osem_connection_tip: senseBox_osem_connection_tip: "stellt eine WLAN verbindung her",
"Verwende diesen Block, um deine senseBox mit der openSenseMap zu verbinden. Registriere deine senseBox auf der openSenseMap und trage die IDs und den API-Schlüssel ein. Verwende anschließend den Block ***Sende Messwert an die openSenseMap*** und die Sensor-ID, um die Messwerte zu übertragen.", senseBox_send_to_osem_tip: "sende Messwert an",
senseBox_osem_connection_helpurl: "https://www.opensensemap.org/", senseBox_send_to_osem: "Sende Messwert an die openSenseMap",
senseBox_send_to_osem_tip: senseBox_osem_connection: "Verbinde mit openSenseMap:",
"Sende mit diesem Block Messwerte an die openSenseMap. Verwende pro Messwert einen Block und trage die zugewiesene Sensor ID ein", senseBox_osem_host: "opensensemap.org",
senseBox_send_to_osem: "Sende Messwert an die openSenseMap", senseBox_osem_host_workshop: "workshop.opensensemap.org",
senseBox_osem_connection: "Verbinde mit openSenseMap:", senseBox_osem_exposure: "Typ",
senseBox_osem_host: "opensensemap.org", senseBox_osem_stationary: "Stationär",
senseBox_osem_host_workshop: "workshop.opensensemap.org", senseBox_osem_mobile: "Mobil",
senseBox_osem_exposure: "Typ", senseBox_osem_access_token: "API Schlüssel",
senseBox_osem_stationary: "Stationär", senseBox_send_mobile_to_osem: "Sende Messwert und Standort an die openSenseMap",
senseBox_osem_mobile: "Mobil", senseBox_send_mobile_to_osem_tip: "Sende Messwert und Standort an die openSenseMap",
senseBox_osem_access_token: "API Schlüssel", }
senseBox_send_mobile_to_osem:
"Sende Messwert und Standort an die openSenseMap",
senseBox_send_mobile_to_osem_tip:
"Sende Messwert und Standort an die openSenseMap",
senseBox_osem_restart: "Bei Verbindungsverlust Gerät neustarten?",
};

26
src/components/Blockly/msg/de/sensebox-rtc.js
View File

@ -1,14 +1,14 @@
export const RTC = { export const RTC = {
sensebox_rtc_init: "Initialisiere externe RTC", sensebox_rtc_init: "Initialisiere RTC",
sensebox_rtc_init_tooltip: 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.", "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 externen RTC", sensebox_rtc_set: "Setze Uhrzeit/Datum der RTC",
sensebox_rtc_set_tooltip: sensebox_rtc_set_tooltip:
"Stellt die Uhrzeit der RTC ein. Beachte, dass du diesen Block im Setup ausführst.", "Stellt die Uhrzeit der RTC ein. Beachte, dass du diesen Block im Setup ausführst.",
sensebox_rtc_get_timestamp: "Zeitstempel externe RTC (RFC 3339)", sensebox_rtc_get_timestamp: "Zeitstempel",
sensebox_rtc_get_timestamp_tooltip: sensebox_rtc_get_timestamp_tooltip:
"Gibt dir einen in ISO 8601 formatierten Zeitstempel zurück. Bsp: 2021-12-24T18:21Z", "Gibt dir einen in ISO 8601 formatierten Zeitstempel zurück. Bsp: 2021-12-24T18:21Z",
sensebox_rtc_get: "Wert (externe RTC): ", sensebox_rtc_get: "Wert: ",
sensebox_rtc_get_tooltip: "Gibt dir den ausgewählten Wert zurück.", sensebox_rtc_get_tooltip: "Gibt dir den ausgewählten Wert zurück.",
sensebox_rtc_second: "Sekunden", sensebox_rtc_second: "Sekunden",
sensebox_rtc_minutes: "Minuten", sensebox_rtc_minutes: "Minuten",
@ -16,22 +16,4 @@ export const RTC = {
sensebox_rtc_day: "Tag", sensebox_rtc_day: "Tag",
sensebox_rtc_month: "Monat", sensebox_rtc_month: "Monat",
sensebox_rtc_year: "Jahr", sensebox_rtc_year: "Jahr",
sensebox_internal_rtc_init: "Initialisiere interne RTC",
sensebox_internal_rtc_init_tooltip:
"Initialisieren der internen RTC. Diese RTC ist nicht batteriegepuffert und wird bei jedem Einschaltvorgang zurückgesetzt",
sensebox_internal_rtc_set: "Setze interne RTC Zeit/Datum (Unix Time)",
sensebox_internal_rtc_set_tooltip:
"Setzt die Zeit der internen RTC. Führe den Block einmalig im Setup aus und setzte die Uhrzeit über die Unix Zeit.",
sensebox_internal_rtc_get: "Wert (interne RTC): ",
sensebox_internal_rtc_get_timestamp: "Zeitstempel interne RTC (RFC 3339)",
sensebox_internal_rtc_get_timestamp_tooltip:
"Returns a timestamp formatted in ISO 8601. Ex: 2021-12-24T18:21Z",
sensebox_internal_rtc_get_tooltip: "Gibt den ausgewählten Wert zurück",
sensebox_internal_rtc_epoch: "Unix Zeit",
sensebox_internal_rtc_year: "Jahr",
sensebox_internal_rtc_month: "Monat",
sensebox_internal_rtc_day: "Tag",
sensebox_internal_rtc_hour: "Stunde",
sensebox_internal_rtc_minutes: "Minute",
sensebox_internal_rtc_seconds: "Sekunde",
}; };

36
src/components/Blockly/msg/de/sensebox-sd.js
View File

@ -1,25 +1,13 @@
export const SD = { export const SD = {
/** /**
* SD-Block * SD-Block
*/ */
senseBox_sd_create_file: "Erstelle Datei auf SD-Karte", senseBox_sd_create_file: "Erstelle Datei auf SD-Karte",
sensebox_sd_helpurl: "https://docs.sensebox.de/hardware/bee-sd/", senseBox_sd_write_file: "Schreibe Daten auf SD-Karte",
senseBox_sd_write_file: "Schreibe Daten auf SD-Karte", senseBox_sd_open_file: "Öffne eine Datei auf der SD-Karte",
senseBox_sd_open_file: "Öffne eine Datei auf der SD-Karte", senseBox_sd_create_file_tooltip: "Erstellt eine Datei auf der Karte. Stecke das SD-Bee auf den Steckplatz **XBEE2**. Die **maximale** Länge des Dateinamen sind **8 Zeichen**. Die Datei sollte zuerst im *Setup()* erstellt werden",
senseBox_sd_create_file_tooltip: senseBox_sd_write_file_tooptip: "Schreibe Daten auf die SD-Karte. Beachte, dass die Datei zuerst geöffnet werden muss.",
"Erstellt eine Datei auf der Karte. Stecke das SD-Bee auf den Steckplatz **XBEE2**. Die **maximale** Länge des Dateinamen sind **8 Zeichen**. Die Datei sollte zuerst im *Setup()* erstellt werden", senseBox_sd_open_file_tooltip: "Öffne die Datei auf der SD-Karte, um Dateien zu speichern. Am Ende der Schleife wird die Datei automatisch wieder geschlossen.",
senseBox_sd_write_file_tooptip: sensebox_sd_filename: "Daten",
"Schreibe Daten auf die SD-Karte. Beachte, dass die Datei zuerst geöffnet werden muss.", senseBox_sd_decimals: "Dezimalen",
senseBox_sd_open_file_tooltip: }
"Öffne die Datei auf der SD-Karte, um Dateien zu speichern. Am Ende der Schleife wird die Datei automatisch wieder geschlossen.",
sensebox_sd_filename: "Daten",
senseBox_sd_decimals: "Dezimalen",
sensebox_sd_osem: "Erstelle CSV-Datei für openSenseMap",
sensebox_sd_osem_tip:
"Erstellt eine CSV-Datei, die später auf die openSenseMap hochgeladen werden kann. ",
sensebox_sd_save_for_osem: "Speichere Messwert",
sensebox_sd_save_for_osem_tip:
"Füge eine Messung mit Sensor ID zur CSV-Datei hinzu",
sensebox_sd_save_for_osem_id: "Sensor ID:",
sensebox_sd_measurement: "Messwerte",
};

329
src/components/Blockly/msg/de/sensebox-sensors.js
View File

@ -1,148 +1,129 @@
export const SENSORS = { export const SENSORS = {
/** /**
* Sensors * Sensors
* --------------------------------------------------- * ---------------------------------------------------
* *
*/ */
/** /**
* BMP280 * BMP280
*/ */
senseBox_pressure_sensor: "Luftdruck-/Temperatursensor (BMP280)", senseBox_pressure_sensor: "Luftdruck-/Temperatursensor (BMP280)",
senseBox_pressure: "Luftdruck in hPa", senseBox_pressure: "Luftdruck in Pa",
senseBox_pressure_dimension: "Luftdruck in hPa", senseBox_pressure_dimension: "Luftdruck in Pa",
senseBox_pressure_tooltip: senseBox_pressure_tip: "Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für den Luftdruck in Pa. Um die korrekte Höhe über NN zu berechnen benötigt der Sensor einen aktuellen Referenzwert.",
"Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für den Luftdruck in hPa. Um die korrekte Höhe über NN zu berechnen benötigt der Sensor einen aktuellen Referenzwert.", senseBox_pressure_referencePressure: "Luftdruck auf NN",
senseBox_pressure_referencePressure: "Luftdruck auf NN", senseBox_pressure_referencePressure_dim: "hPa",
senseBox_pressure_referencePressure_dim: "hPa", senseBox_pressure_helpurl: "",
senseBox_pressure_helpurl:
"https://docs.sensebox.de/hardware/sensoren-luftdruck-temperatur/",
/**
* DPS310
*/
senseBox_sensor_dps310: "Luftdruck-/Temperatursensor (DPS310)",
senseBox_sensor_dps310_tooltip:
"Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für den Luftdruck in hPa. Um die korrekte Höhe über NN zu berechnen benötigt der Sensor einen aktuellen Referenzwert.",
senseBox_sensor_dps310_helpurl: "",
/** /**
* Mikro * Mikro
*/ */
senseBox_sound: "Mikrofon", senseBox_sound: "Mikrofon",
senseBox_sound_tip: senseBox_sound_tip: "Schließe den Sensor über das Breadbord an einen der 3 **analog/digital** Ports an. Gibt den Messwert des Mikrofons in Volt zurück",
"Schließe den Sensor über das Breadbord an einen der 3 **analog/digital** Ports an. Gibt den Messwert des Mikrofons in Volt zurück", senseBox_sound_helpurl: "https://docs.sensebox.de/hardware/sensoren-mikro/",
senseBox_sound_helpurl: "https://docs.sensebox.de/hardware/sensoren-mikro/",
/** /**
* Temperature and Humidity Sensor (HDC1080) * Temperature and Humidity Sensor (HDC1080)
*/ */
senseBox_temp: "Temperatur in °C", senseBox_temp: "Temperatur in °C",
senseBox_temp_hum: "Temperatur-/Luftfeuchtigkeitssensor (HDC1080)", senseBox_temp_hum: "Temperatur-/Luftfeuchtigkeitssensor (HDC1080)",
senseBox_temp_hum_tooltip: senseBox_temp_hum_tooltip: "Dieser Block gibt dir die Messwerte des Temperatur- und Luftfeuchtigkeitssensor zurück. Schließe den Sensor an einen der 5 I2C Anschlüsse an. Messwert wird mit 2 Nachkommastellen ausgegeben.",
"Dieser Block gibt dir die Messwerte des Temperatur- und Luftfeuchtigkeitssensor zurück. Schließe den Sensor an einen der 5 I2C Anschlüsse an. Messwert wird mit 2 Nachkommastellen ausgegeben.", senseBox_temp_hum_helpurl: "https://docs.sensebox.de/hardware/sensoren-temperatur-luftfeuchte/",
senseBox_temp_hum_helpurl:
"https://docs.sensebox.de/hardware/sensoren-temperatur-luftfeuchte/",
/** /**
* Ultraschalldistanzsensor * Ultraschalldistanzsensor
*/ */
senseBox_ultrasonic: "Ultraschall-Abstandssensor an Port", senseBox_ultrasonic: "Ultraschall-Abstandssensor an Port",
senseBox_ultrasonic_trigger: "Trigger", senseBox_ultrasonic_trigger: "Trigger",
senseBox_ultrasonic_echo: "Echo", senseBox_ultrasonic_echo: "Echo",
senseBox_ultrasonic_maxDistance: "Maximale Distanz", senseBox_ultrasonic_port_A: "A",
senseBox_ultrasonic_port_A: "A", senseBox_ultrasonic_port_B: "B",
senseBox_ultrasonic_port_B: "B", senseBox_ultrasonic_port_C: "C",
senseBox_ultrasonic_port_C: "C", senseBox_ultrasonic_tooltip: `Misst die Distanz mithilfe von Ultraschall in cm. Schließe den Sensor an einen der drei Digital/Analog Ports an:
senseBox_ultrasonic_tooltip: `Misst die Distanz mithilfe von Ultraschall in cm. Schließe den Sensor an einen der drei Digital/Analog Ports an:
- Trigger: Grünes Kabel - Trigger: Grünes Kabel
- Echo: gelbes Kabel - Echo: gelbes Kabel`,
Wenn die maximale Distanz überschritten wird, wird ein Wert von **O** ausgegeben`, senseBox_ultrasonic_helpurl: "https://docs.sensebox.de/hardware/sensoren-distanz/",
senseBox_ultrasonic_helpurl: /**
"https://docs.sensebox.de/hardware/sensoren-distanz/", * UV and Lightsensor
/** */
* UV and Lightsensor senseBox_value: "Messwert:",
*/ senseBox_uv_light: "Helligkeit-/UV-Sensor",
senseBox_value: "Messwert:", senseBox_uv_light_tooltip: "Sensor misst UV-Licht oder die Helligkeit. Die Helligkeit wird als **Ganzezahl** in Lux ausgegeben. Die UV-Intensität als **Kommazahl** in µW/cm².",
senseBox_uv_light: "Helligkeit-/UV-Sensor", senseBox_uv: "UV-Intensität in µW/cm²",
senseBox_uv_light_tooltip: senseBox_light: "Beleuchtungsstärke in Lux",
"Sensor misst UV-Licht oder die Helligkeit. Die Helligkeit wird als **Ganzezahl** in Lux ausgegeben. Die UV-Intensität als **Kommazahl** in µW/cm².", senseBox_uv_light_helpurl: "https://docs.sensebox.de/hardware/sensoren-helligkeit-uv/",
senseBox_uv: "UV-Intensität in µW/cm²",
senseBox_light: "Beleuchtungsstärke in Lux",
senseBox_uv_light_helpurl:
"https://docs.sensebox.de/hardware/sensoren-helligkeit-uv/",
/** /**
* BMX055 * BMX055
*/ */
senseBox_bmx055_compass: "Lage Sensor", senseBox_bmx055_compass: "Lage Sensor",
senseBox_bmx055_accelerometer: "Beschleunigungssensor", senseBox_bmx055_accelerometer: "Beschleunigungssensor",
senseBox_bmx055_accelerometer_range: "Messbereich", senseBox_bmx055_accelerometer_range: "Messbereich",
senseBox_bmx055_accelerometer_range_2g: "2g", senseBox_bmx055_accelerometer_range_2g: "2g",
senseBox_bmx055_accelerometer_range_4g: "4g", senseBox_bmx055_accelerometer_range_4g: "4g",
senseBox_bmx055_accelerometer_range_8g: "8g", senseBox_bmx055_accelerometer_range_8g: "8g",
senseBox_bmx055_accelerometer_range_16g: "16g", senseBox_bmx055_accelerometer_range_16g: "16g",
senseBox_bmx055_accelerometer_direction: "Richtung", senseBox_bmx055_accelerometer_direction: "Richtung",
senseBox_bmx055_accelerometer_direction_x: "X-Achse", senseBox_bmx055_accelerometer_direction_x: "X-Achse",
senseBox_bmx055_accelerometer_direction_y: "Y-Achse", senseBox_bmx055_accelerometer_direction_y: "Y-Achse",
senseBox_bmx055_accelerometer_direction_z: "Z-Achse", senseBox_bmx055_accelerometer_direction_z: "Z-Achse",
senseBox_bmx055_accelerometer_direction_total: "Gesamt", senseBox_bmx055_accelerometer_direction_total: "Gesamt",
senseBox_bmx055_gyroscope: "Lage Sensor", senseBox_bmx055_gyroscope: "Lage Sensor",
senseBox_bmx055_accelerometer_tip: "Lage Sensor", senseBox_bmx055_accelerometer_tip: "Lage Sensor",
senseBox_bmx055_compass_tip: "Lage Sensor", senseBox_bmx055_compass_tip: "Lage Sensor",
senseBox_bmx055_gyroscope_tip: "Lage Sensor", senseBox_bmx055_gyroscope_tip: "Lage Sensor",
senseBox_bmx055_x: "X-Richtung", senseBox_bmx055_x: "X-Richtung",
senseBox_bmx055_y: "Y-Richtung", senseBox_bmx055_y: "Y-Richtung",
senseBox_bmx055_accelerometer_tooltip: `Dieser Block gibt dir den Messwert des Beschleunigungssensors der direkt auf der senseBox MCU aufgelötet ist. Im Dropdown Menü kannst du die Richtung und den Messbereich auswählen.`, senseBox_bmx055_accelerometer_tooltip: `Dieser Block gibt dir den Messwert des Beschleunigungssensors der direkt auf der senseBox MCU aufgelötet ist. Im Dropdown Menü kannst du die Richtung und den Messbereich auswählen.`,
senseBox_bmx055_helpurl: "", senseBox_bmx055_helpurl: "",
/**
* /**
* GPS *
*/ * GPS
senseBox_gps_getValues: "GPS Modul", */
senseBox_gps_lat: "Breitengrad", senseBox_gps_getValues: "GPS Modul",
senseBox_gps_lng: "Längengrad", senseBox_gps_lat: "Breitengrad",
senseBox_gps_alt: "Höhe über NN in m", senseBox_gps_lng: "Längengrad",
senseBox_gps_speed: "Geschwindigkeit in km/h", senseBox_gps_alt: "Höhe über NN in m",
senseBox_gps_date: "Datum", senseBox_gps_speed: "Geschwindigkeit in km/h",
senseBox_gps_time: "Uhrzeit", senseBox_gps_date: "Datum",
senseBox_gps_timeStamp: "Zeitstempel (RFC 3339)", senseBox_gps_time: "Uhrzeit",
senseBox_gps_tooltip: `Liest das GPS Modul aus und gibt dir die Standortinformationen. Längen- und Breitengrad werden als Kommazahl mit 6 Nachkommastellen ausgegeben. senseBox_gps_timeStamp: "Zeitstempel (RFC 3339)",
senseBox_gps_tooltip: `Liest das GPS Modul aus und gibt dir die Standortinformationen. Längen- und Breitengrad werden als Kommazahl mit 6 Nachkommastellen ausgegeben.
**Anschluss: I2C** **Anschluss: I2C**
**Beachte:** Das GPS Modul benöigt beim ersten Verwenden relativ lange (ca. 5-10 Minuten) bis es deinen Standort gefunden hat! **Beachte:** Das GPS Modul benöigt beim ersten Verwenden relativ lange (ca. 5-10 Minuten) bis es deinen Standort gefunden hat!
`, `,
senseBox_gps_helpurl: "https://docs.sensebox.de/hardware/sensoren-gps/", senseBox_gps_helpurl: "https://docs.sensebox.de/hardware/sensoren-gps/",
/** /**
* Windspeed * Windspeed
*/ */
senseBox_windspeed: "Windgeschwindigkeitssensor", senseBox_windspeed: "Windgeschwindigkeitssensor",
senseBox_windspeed_tooltip: "", senseBox_windspeed_tooltip: "",
/* /*
* Soundsensor * Soundsensor
*/ */
senseBox_soundsensor_dfrobot: "Soundsensor (DF Robot)", senseBox_soundsensor_dfrobot: "Soundsensor (DF Robot)",
senseBox_soundsensor_dfrobot_tooltip: senseBox_soundsensor_dfrobot_tooltip: "Schließe den Sensor an einen der 3 **digital/analog Ports** an. Der Sensor gibt dir den Messwert in dB mit einer Nachkommastelle",
"Schließe den Sensor an einen der 3 **digital/analog Ports** an. Der Sensor gibt dir den Messwert in dB mit einer Nachkommastelle", senseBox_soundsensor_dfrobot_helpurl: "https://docs.sensebox.de/hardware/sensoren-lautstaerke/",
senseBox_soundsensor_dfrobot_helpurl: /*
"https://docs.sensebox.de/hardware/sensoren-lautstaerke/", * BME680
/* */
* BME680
*/
senseBox_bme680: "Umweltsensor (BME680)", senseBox_bme680: "Umweltsensor (BME680)",
senseBox_bme_iaq: "Innenraumluftqualität (IAQ)", senseBox_bme_iaq: "Innenraumluftqualität (IAQ)",
senseBox_bme_iaq_accuracy: "Kalibrierungswert", senseBox_bme_iaq_accuracy: "Kalibrierungswert",
senseBox_bme_co2: "CO2 Äquivalent", senseBox_bme_co2: "CO2 Äquivalent",
senseBox_bme_pressure: "Luftdruck in Pa", senseBox_bme_breatheVocEquivalent: "Atemluft VOC Äquivalent",
senseBox_bme_breatheVocEquivalent: "Atemluft VOC Äquivalent", senseBox_bme_tooltip: `Schließe den Umweltsensor an einen der 5 **I2C-Anschlüsse** an. **Beachte:** Der Sensor benöigt eine gewisse Zeit zum kalibrieren.
senseBox_bme_tooltip: `Schließe den Umweltsensor an einen der 5 **I2C-Anschlüsse** an. **Beachte:** Der Sensor benöigt eine gewisse Zeit zum kalibrieren.
Den Status der Kalibrierung kann über den Kalibrierungswert abgelesen werden. Er ist entweder 0, 1, 2 oder 3 und sagt folgendes aus: Den Status der Kalibrierung kann über den Kalibrierungswert abgelesen werden. Er ist entweder 0, 1, 2 oder 3 und sagt folgendes aus:
- IAQ Accuracy : 0 heißt Sensor wird stabilisiert (dauert ca. 25 Minuten) oder dass es eine Zeitüberschreitung gab, - IAQ Accuracy : 0 heißt Sensor wird stabilisiert (dauert ca. 25 Minuten) oder dass es eine Zeitüberschreitung gab,
@ -151,73 +132,49 @@ Den Status der Kalibrierung kann über den Kalibrierungswert abgelesen werden. E
- IAQ Accuracy : 3 heißt Sensor erfolgreich kalibriert. - IAQ Accuracy : 3 heißt Sensor erfolgreich kalibriert.
Die Messwerte für Temperatur, Luftfeuchtigkeit und Luftdruck können direkt verwendet werden.`, Die Messwerte für Temperatur, Luftfeuchtigkeit und Luftdruck können direkt verwendet werden.`,
senseBox_bme680_helpurl: senseBox_bme680_helpurl: "https://docs.sensebox.de/hardware/sensoren-umweltsensor/",
"https://docs.sensebox.de/hardware/sensoren-umweltsensor/",
/**
* Truebner SMT50
*/
senseBox_smt50: "Bodenfeuchte/-temperatur (SMT50)",
senseBox_smt50_helpurl:
"https://docs.sensebox.de/hardware/sensoren-truebner/",
senseBox_smt50_tooltip:
"Schließe den Bodenfeuchtigkeit- und Temperatursensor an einen der 3 digital/analog Ports an und wähle den Port im Block aus. Der Sensor gibt die Bodentemperatur in °C und die Bodenfeuchtigkeit in % aus.",
/** /**
* SCD30 CO2 Sensor * Truebner SMT50
*/ */
senseBox_scd30: "CO2 Sensor (Sensirion SCD30)", senseBox_smt50: "Bodenfeuchte/-temperatur (SMT50)",
senseBox_scd_tooltip: senseBox_smt50_helpurl: "https://docs.sensebox.de/hardware/sensoren-truebner/",
"Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für die CO2-Konzentration in ppm. Der Temperaturmesswert kann aufgrund der Messung direkt am Sensor um einige Grad vom realen Wert abweichen.", senseBox_smt50_tooltip: "Schließe den Bodenfeuchtigkeit- und Temperatursensor an einen der 3 digital/analog Ports an und wähle den Port im Block aus. Der Sensor gibt die Bodentemperatur in °C und die Bodenfeuchtigkeit in % aus.",
senseBox_scd_co2: "CO2 in ppm",
senseBox_scd_helpurl: "https://docs.sensebox.de/hardware/sensoren-co2/",
/** /**
* Feinstaubsensor (SDS011) * SCD30 CO2 Sensor
*/ */
senseBox_scd30: "CO2 Sensor (Sensirion SCD30)",
senseBox_scd_tooltip: "Schließe den Sensor an einen der 5 **I2C-Anschlüsse** an. Der Sensor gibt dir den Messwert für die CO2-Konzentration in ppm. Der Temperaturmesswert kann aufgrund der Messung direkt am Sensor um einige Grad vom realen Wert abweichen.",
senseBox_scd_co2: "CO2 in ppm",
senseBox_scd_helpurl: "https://docs.sensebox.de/hardware/sensoren-co2/",
senseBox_sds011: "Feinstaubsensor SDS011", /**
senseBox_sds011_dimension: "in µg/m³ an", * Feinstaubsensor (SDS011)
senseBox_sds011_pm25: "PM2.5", */
senseBox_sds011_pm10: "PM10",
senseBox_sds011_tooltip:
"Dieser Block gibt dir den Messwert des Feinstaubsensor. Schließe den Feinstaubsensor an einen der 2 **Serial/UART** Anschlüssen an. Im Dropdown Menü zwischen PM2.5 und PM10 auswählen. Der Messwert wird dir als **Kommazahl** in µg/m3",
senseBox_sds011_serial1: "Serial1",
senseBox_sds011_serial2: "Serial2",
senseBox_sds011_helpurl:
"https://docs.sensebox.de/hardware/sensoren-feinstaub/",
/** senseBox_sds011: "Feinstaubsensor",
* Button senseBox_sds011_dimension: "in µg/m³ an",
*/ senseBox_sds011_pm25: "PM2.5",
senseBox_button: "Button", senseBox_sds011_pm10: "PM10",
senseBox_button_isPressed: "ist gedrückt", senseBox_sds011_tooltip: "Dieser Block gibt dir den Messwert des Feinstaubsensor. Schließe den Feinstaubsensor an einen der 2 **Serial/UART** Anschlüssen an. Im Dropdown Menü zwischen PM2.5 und PM10 auswählen. Der Messwert wird dir als **Kommazahl** in µg/m3",
senseBox_button_switch: "als Schalter", senseBox_sds011_serial1: "Serial1",
senseBox_button_wasPressed: "wurde gedrückt", senseBox_sds011_serial2: "Serial2",
senseBox_button_longPress: "Gedrückt für", senseBox_sds011_helpurl: "https://docs.sensebox.de/hardware/sensoren-feinstaub/",
senseBox_button_tooltip: `Dieser Block gibt dir den Status des angeschlossenen Buttons. Im Dropdown Menü können verschiedene Modi für den Button ausgewählt werden. Angesteuert können entweder der on Board Button oder ein Button, der an einen der 6 digitalen Pins angeschlossen ist. verschiedene Modi:
/**
* Button
*/
senseBox_button: "Button",
senseBox_button_isPressed: "ist gedrückt",
senseBox_button_switch: "als Schalter",
senseBox_button_wasPressed: "wurde gedrückt",
senseBox_button_tooltip: `Dieser Block gibt dir den Status des angeschlossenen Buttons. Im Dropdown Menü können verschiedene Modi für den Button ausgewählt werden. Angesteuert können entweder der on Board Button oder ein Button, der an einen der 6 digitalen Pins angeschlossen ist. verschiedene Modi:
- "ist gedrückt": Mit diesem Modus kannst du abfragen ob der Block gerade gedrückt wird. Du erhältst entweder den Wert TRUE oder FALSE. - "ist gedrückt": Mit diesem Modus kannst du abfragen ob der Block gerade gedrückt wird. Du erhältst entweder den Wert TRUE oder FALSE.
- "wurde gedrückt": Mit diesem Modus kannst du abfragen ob der Block gedrückt wurde. Erst wenn der Knopf gedrückt und wieder losgelassen wurde erhältst du TRUE zurück - "wurde gedrückt": Mit diesem Modus kannst du abfragen ob der Block gedrückt wurde. Erst wenn der Knopf gedrückt und wieder losgelassen wurde erhältst du TRUE zurück
- "als Schalter": Wenn du diesen Block verwendest kannst du den Knopf wie ein Lichtschalter verwenden. Der Status wird gespeichert bis der Button erneut gedrückt wird`, - "als Schalter": Wenn du diesen Block verwendest kannst du den Knopf wie ein Lichtschalter verwenden. Der Status wird gespeichert bis der Button erneut gedrückt wird`,
senseBox_button_helpurl: "", senseBox_button_helpurl: "",
}
/**
* Feinstaubsensor Sensirion SPS30
*/
senseBox_sps30: "Feinstaubsensor Sensirion SPS30",
senseBox_sps30_dimension: "in µg/m³",
senseBox_sps30_1p0: "PM1.0",
senseBox_sps30_2p5: "PM2.5",
senseBox_sps30_4p0: "PM4.0",
senseBox_sps30_10p0: "PM10",
senseBox_sps30_tooltip:"Dieser Block gibt dir den Messwert des Sensirion SPS30 Feinstaubsensor. Schließe den Feinstaubsensor an einen der 5 **I2C** Anschlüssen an. Im Dropdown Menü zwischen PM1.0, PM2.5, PM4.0 und PM10 auswählen. Der Messwert wird dir als **Kommazahl** in µg/m3",
senseBox_sps30_helpurl:
"https://docs.sensebox.de/hardware/sensoren-feinstaub/",
};

38
src/components/Blockly/msg/de/sensebox-web.js
View File

@ -1,29 +1,11 @@
export const WEB = { export const WEB = {
/** /**
* WiFi * WiFi
*/ */
senseBox_wifi_connect: "Verbinde mit WLAN", senseBox_wifi_connect: "Verbinde mit WLAN",
senseBox_wifi_ssid: "Netzwerkname", senseBox_wifi_ssid: "Netzwerkname",
senseBox_wifi_ip: "IP-Address", senseBox_wifi_tooltip: "Stellt eine Verbindung mit einem WLAN-Netzwerk her. Möchtest du dich mit einem ungesicheren Netzwerk (z.B. Freifunk) verbinden lösche das Feld Passwort. Das WiFi-Bee muss auf den Steckplatz **XBEE1** aufgesteckt werden.",
senseBox_wifi_ip_tooltip: "Gibt die IP-Address der senseBox aus", senseBox_wifi_startap: "Initialisiere WLAN Access Point",
senseBox_wifi_status: "WiFi-Status", senseBox_wifi_startap_tooltip: "Erstellt einen WiFi-Accesspoint zu dem du dich verbinden kannst. Beachte, dass immer nur 1 Gerät gleichzeitig verbunden werden kann.",
senseBox_wifi_status_tooltip: "Gibt den Status der WiFi-Verbindung aus", senseBox_wifi_helpurl: "https://docs.sensebox.de/blockly/blockly-web-wifi/",
senseBox_wifi_rssi: "RSSI", }
senseBox_wifi_rssi_tooltip: "Gibt die Sigal Stärke der WiFi-Verbindung",
senseBox_wifi_tooltip:
"Stellt eine Verbindung mit einem WLAN-Netzwerk her. Möchtest du dich mit einem ungesicheren Netzwerk (z.B. Freifunk) verbinden lösche das Feld Passwort. Das WiFi-Bee muss auf den Steckplatz **XBEE1** aufgesteckt werden.",
senseBox_wifi_startap: "Initialisiere WLAN Access Point",
senseBox_wifi_startap_tooltip:
"Erstellt einen WiFi-Accesspoint zu dem du dich verbinden kannst. Beachte, dass immer nur 1 Gerät gleichzeitig verbunden werden kann.",
senseBox_wifi_helpurl: "https://docs.sensebox.de/blockly/blockly-web-wifi/",
senseBox_ethernet: "Verbinde mit Ethernet",
senseBox_ethernet_dhcp: "DHCP",
senseBox_ethernet_manuel_config: "Manuelle Konfiguration",
senseBox_ethernet_ip: "IP-Adresse",
senseBox_ethernet_gateway: "Gateway",
senseBox_ethernet_subnetmask: "Subnetzmaske",
senseBox_ethernet_mac: "MAC-Adresse",
senseBox_ethernet_dns: "DNS-Server",
senseBox_ethernet_tooltip:
"Verbinde das LAN-Bee mit dem Steckplatz XBEE1. Die meisten Netzwerke verwenden DHCP und vergeben automatisch eine IP-Adresse. Solltest du eine Manuelle Konfiguration durchführen wollen wählen im Dropdown Menü **Manuelle Konfiguration** aus und gebe die entsprechenden Daten ein.",
};

40
src/components/Blockly/msg/de/time.js
View File

@ -1,22 +1,20 @@
export const TIME = { export const TIME = {
/**
* Interval Block /**
*/ * Interval Block
senseBox_interval_timer: "Intervall: ", */
senseBox_interval: "ms", senseBox_interval_timer: "Messintervall",
senseBox_interval_timer_tip: senseBox_interval: "ms",
"Definiere ein Intervall, das alle x Millisekunden ausgeführt wird", senseBox_interval_timer_tip: "Intervall",
ARD_TIME_DELAY: "Warte", ARD_TIME_DELAY: "Warte",
ARD_TIME_DELAY_MICROS: "Mikrosekunden", ARD_TIME_DELAY_MICROS: "Mikrosekunden",
ARD_TIME_DELAY_MICRO_TIP: "Warte eine spezifischen Zeit in Microsekunden", ARD_TIME_DELAY_MICRO_TIP: "Warte eine spezifischen Zeit in Microsekunden",
ARD_TIME_DELAY_TIP: "Warte spezifische Zeit in Millisekunden", ARD_TIME_DELAY_TIP: "Warte spezifische Zeit in Millisekunden",
ARD_TIME_INF: "Warte für immer (Beende Programm)", ARD_TIME_INF: "Warte für immer (Beende Programm)",
ARD_TIME_INF_TIP: "Stoppt das Programm.", ARD_TIME_INF_TIP: "Stoppt das Programm.",
ARD_TIME_MICROS: "Bereits vergangen Zeit (Mikrosekunden)", ARD_TIME_MICROS: "Bereits vergangen Zeit (Mikrosekunden)",
ARD_TIME_MICROS_TIP: ARD_TIME_MICROS_TIP: "Gibt eine Zahl in Microsekunden zurück, die der Zeitdauer des Aktuellen Programms entspricht. Muss als positiven Integer gespeichert werden", // untranslated
"Gibt eine Zahl in Microsekunden zurück, die der Zeitdauer des Aktuellen Programms entspricht. Muss als positiven Integer gespeichert werden", // untranslated ARD_TIME_MILLIS: "Bereits vergangen Zeit (Millisekunden)",
ARD_TIME_MILLIS: "Bereits vergangen Zeit (Millisekunden)", ARD_TIME_MILLIS_TIP: "Gibt eine Zahl in Millisekunden zurück, die der Zeitdauer des Aktuellen Programms entspricht. Muss als positiven Integer gespeichert werden", // untranslated
ARD_TIME_MILLIS_TIP: ARD_TIME_MS: "Millisekunden",
"Gibt eine Zahl in Millisekunden zurück, die der Zeitdauer des Aktuellen Programms entspricht. Muss als positiven Integer gespeichert werden", // untranslated }
ARD_TIME_MS: "Millisekunden",
};

467
src/components/Blockly/msg/de/translations.js
View File

@ -1,265 +1,212 @@
export const TRANSLATIONS = { export const TRANSLATIONS = {
AUTH: "Bitte autorisiere diese App zum Aktivieren der Speicherung deiner Arbeit und zum Teilen.",
CHANGE_VALUE_TITLE: "Wert ändern:",
CHAT: "Chatte mit unserem Mitarbeiter durch Eingeben von Text in diesen Kasten!",
CLEAN_UP: "Blöcke aufräumen",
COLLAPSE_ALL: "Alle Blöcke zusammenfalten",
COLLAPSE_BLOCK: "Block zusammenfalten",
DELETE_ALL_BLOCKS: "Alle %1 Bausteine löschen?",
DELETE_BLOCK: "Block löschen",
DELETE_X_BLOCKS: "Block %1 löschen",
DISABLE_BLOCK: "Block deaktivieren",
DUPLICATE_BLOCK: "Kopieren",
ENABLE_BLOCK: "Block aktivieren",
EXPAND_ALL: "Alle Blöcke entfalten",
EXPAND_BLOCK: "Block entfalten",
EXTERNAL_INPUTS: "externe Eingänge",
HELP: "Hilfe",
INLINE_INPUTS: "interne Eingänge",
LISTS_CREATE_EMPTY_HELPURL:
"https://github.com/google/blockly/wiki/Lists#create-empty-list",
LISTS_CREATE_EMPTY_TITLE: "Erzeuge eine leere Liste",
LISTS_CREATE_EMPTY_TOOLTIP: "Erzeugt eine leere Liste ohne Inhalt.",
LISTS_CREATE_WITH_CONTAINER_TITLE_ADD: "Liste",
LISTS_CREATE_WITH_CONTAINER_TOOLTIP:
"Hinzufügen, entfernen und sortieren von Elementen.",
LISTS_CREATE_WITH_HELPURL:
"https://github.com/google/blockly/wiki/Lists#create-list-with",
LISTS_CREATE_WITH_INPUT_WITH: "Erzeuge Liste mit",
LISTS_CREATE_WITH_ITEM_TOOLTIP: "Ein Element zur Liste hinzufügen.",
LISTS_CREATE_WITH_TOOLTIP: "Erzeugt eine List mit konfigurierten Elementen.",
LISTS_GET_INDEX_FIRST: "erstes",
LISTS_GET_INDEX_FROM_END: "#tes von hinten",
LISTS_GET_INDEX_FROM_START: "#tes",
LISTS_GET_INDEX_GET: "nimm",
LISTS_GET_INDEX_GET_REMOVE: "nimm und entferne",
LISTS_GET_INDEX_LAST: "letztes",
LISTS_GET_INDEX_RANDOM: "zufälliges",
LISTS_GET_INDEX_REMOVE: "entferne",
LISTS_GET_INDEX_TAIL: "",
LISTS_GET_INDEX_TOOLTIP_GET_FIRST:
"Extrahiere das erste Element aus der Liste.",
LISTS_GET_INDEX_TOOLTIP_GET_FROM_END:
"Extrahiere das #1te Element aus Ende der Liste.",
LISTS_GET_INDEX_TOOLTIP_GET_FROM_START:
"Extrahiere das #1te Element aus der Liste.",
LISTS_GET_INDEX_TOOLTIP_GET_LAST:
"Extrahiere das letzte Element aus der Liste.",
LISTS_GET_INDEX_TOOLTIP_GET_RANDOM:
"Extrahiere ein zufälliges Element aus der Liste.",
LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST:
"Extrahiere und entfernt das erste Element aus der Liste.",
LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END:
"Extrahiere und entfernt das #1te Element aus Ende der Liste.",
LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START:
"Extrahiere und entfernt das #1te Element aus der Liste.",
LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST:
"Extrahiere und entfernt das letzte Element aus der Liste.",
LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM:
"Extrahiere und entfernt ein zufälliges Element aus der Liste.",
LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST:
"Entfernt das erste Element von der Liste.",
LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END:
"Entfernt das #1te Element von Ende der Liste.",
LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START:
"Entfernt das #1te Element von der Liste.",
LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST:
"Entfernt das letzte Element von der Liste.",
LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM:
"Entfernt ein zufälliges Element von der Liste.",
LISTS_GET_SUBLIST_END_FROM_END: "bis zu # von hinten",
LISTS_GET_SUBLIST_END_FROM_START: "bis zu #",
LISTS_GET_SUBLIST_END_LAST: "bis zum Ende",
LISTS_GET_SUBLIST_HELPURL:
"http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
LISTS_GET_SUBLIST_START_FIRST: "erhalte Unterliste vom Anfang",
LISTS_GET_SUBLIST_START_FROM_END: "erhalte Unterliste von # von hinten",
LISTS_GET_SUBLIST_START_FROM_START: "erhalte Unterliste von #",
LISTS_GET_SUBLIST_TAIL: "",
LISTS_GET_SUBLIST_TOOLTIP:
"Erstellt eine Kopie mit dem angegebenen Abschnitt der Liste.",
LISTS_INDEX_OF_FIRST: "suche erstes Auftreten von",
LISTS_INDEX_OF_HELPURL:
"http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
LISTS_INDEX_OF_LAST: "suche letztes Auftreten von",
LISTS_INDEX_OF_TOOLTIP:
"Sucht die Position (index) eines Elementes in der Liste. Gibt 0 zurück, falls kein Element gefunden wurde.",
LISTS_INLIST: "von der Liste",
LISTS_ISEMPTY_HELPURL:
"https://github.com/google/blockly/wiki/Lists#is-empty", // untranslated
LISTS_ISEMPTY_TITLE: "%1 ist leer?",
LISTS_ISEMPTY_TOOLTIP: "Ist wahr (true), wenn die Liste leer ist.",
LISTS_LENGTH_HELPURL:
"https://github.com/google/blockly/wiki/Lists#length-of", // untranslated
LISTS_LENGTH_TITLE: "Länge von %1",
LISTS_LENGTH_TOOLTIP: "Die Anzahl von Elementen in der Liste.",
LISTS_REPEAT_HELPURL:
"http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
LISTS_REPEAT_TITLE: "Erzeuge Liste mit Element %1 wiederhole es %2 mal",
LISTS_REPEAT_TOOLTIP:
"Erzeugt eine Liste mit einer variablen Anzahl von Elementen",
LISTS_SET_INDEX_HELPURL:
"http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
LISTS_SET_INDEX_INPUT_TO: "ein",
LISTS_SET_INDEX_INSERT: "füge",
LISTS_SET_INDEX_SET: "setze",
LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST:
"Fügt das Element an den Anfang der Liste an.",
LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END:
"Fügt das Element an der angegebenen Position in der Liste ein. #1 ist das letzte Element.",
LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START:
"Fügt das Element an der angegebenen Position in der Liste ein. #1 ist die erste Element.",
LISTS_SET_INDEX_TOOLTIP_INSERT_LAST:
"Fügt das Element ans Ende der Liste an.",
LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM:
"Fügt das Element zufällig in die Liste ein.",
LISTS_SET_INDEX_TOOLTIP_SET_FIRST: "Setzt das erste Element in der Liste.",
LISTS_SET_INDEX_TOOLTIP_SET_FROM_END:
"Setzt das Element an der angegebenen Position in der Liste. #1 ist das letzte Element.",
LISTS_SET_INDEX_TOOLTIP_SET_FROM_START:
"Setzte das Element an der angegebenen Position in der Liste. #1 ist das erste Element.",
LISTS_SET_INDEX_TOOLTIP_SET_LAST: "Setzt das letzte Element in der Liste.",
LISTS_SET_INDEX_TOOLTIP_SET_RANDOM:
"Setzt ein zufälliges Element in der Liste.",
LISTS_SORT_HELPURL:
"https://github.com/google/blockly/wiki/Lists#sorting-a-list",
LISTS_SORT_ORDER_ASCENDING: "aufsteigend",
LISTS_SORT_ORDER_DESCENDING: "absteigend",
LISTS_SORT_TITLE: "%1 %2 %3 sortieren",
LISTS_SORT_TOOLTIP: "Eine Kopie einer Liste sortieren.",
LISTS_SORT_TYPE_IGNORECASE: "alphabetisch, Schreibung ignorieren",
LISTS_SORT_TYPE_NUMERIC: "numerisch",
LISTS_SORT_TYPE_TEXT: "alphabetisch",
LISTS_SPLIT_HELPURL:
"https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
LISTS_SPLIT_LIST_FROM_TEXT: "Liste aus Text erstellen",
LISTS_SPLIT_TEXT_FROM_LIST: "Text aus Liste erstellen",
LISTS_SPLIT_TOOLTIP_JOIN:
"Liste mit Texten in einen Text vereinen, getrennt durch ein Trennzeichen.",
LISTS_SPLIT_TOOLTIP_SPLIT:
"Text in eine Liste mit Texten aufteilen, unterbrochen bei jedem Trennzeichen.",
LISTS_SPLIT_WITH_DELIMITER: "mit Trennzeichen",
LOGIC_BOOLEAN_FALSE: "falsch",
ME: "Ich", AUTH: "Bitte autorisiere diese App zum Aktivieren der Speicherung deiner Arbeit und zum Teilen.",
NEW_VARIABLE: "Neue Variable...", CHANGE_VALUE_TITLE: "Wert ändern:",
NEW_VARIABLE_TITLE: "Name der neuen Variable:", CHAT: "Chatte mit unserem Mitarbeiter durch Eingeben von Text in diesen Kasten!",
ORDINAL_NUMBER_SUFFIX: "", CLEAN_UP: "Blöcke aufräumen",
PROCEDURES_ALLOW_STATEMENTS: "Aussagen erlauben", COLLAPSE_ALL: "Alle Blöcke zusammenfalten",
PROCEDURES_CALLNORETURN_HELPURL: COLLAPSE_BLOCK: "Block zusammenfalten",
"https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29", DELETE_ALL_BLOCKS: "Alle %1 Bausteine löschen?",
PROCEDURES_CALLNORETURN_TOOLTIP: DELETE_BLOCK: "Block löschen",
"Rufe einen Funktionsblock ohne Rückgabewert auf.", DELETE_X_BLOCKS: "Block %1 löschen",
PROCEDURES_CALLRETURN_HELPURL: DISABLE_BLOCK: "Block deaktivieren",
"https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29", DUPLICATE_BLOCK: "Kopieren",
PROCEDURES_CALLRETURN_TOOLTIP: ENABLE_BLOCK: "Block aktivieren",
"Rufe einen Funktionsblock mit Rückgabewert auf.", EXPAND_ALL: "Alle Blöcke entfalten",
PROCEDURES_CALL: "Rufe", EXPAND_BLOCK: "Block entfalten",
PROCEDURES_CALL_END: "auf", EXTERNAL_INPUTS: "externe Eingänge",
PROCEDURES_DEFNORETURN: "Erstelle Funktion", HELP: "Hilfe",
PROCEDURES_BEFORE_PARAMS: "mit Eingabeparameter:", INLINE_INPUTS: "interne Eingänge",
PROCEDURES_DEFRETURN_RETURN_TYPE: "Rückgabetype", LISTS_CREATE_EMPTY_HELPURL: "https://github.com/google/blockly/wiki/Lists#create-empty-list",
PROCEDURES_CALL_BEFORE_PARAMS: "mit:", LISTS_CREATE_EMPTY_TITLE: "Erzeuge eine leere Liste",
PROCEDURES_CREATE_DO: 'Erzeuge "Aufruf %1"', LISTS_CREATE_EMPTY_TOOLTIP: "Erzeugt eine leere Liste ohne Inhalt.",
PROCEDURES_DEFNORETURN_COMMENT: "Beschreibe diese Funktion …", LISTS_CREATE_WITH_CONTAINER_TITLE_ADD: "Liste",
PROCEDURES_DEFNORETURN_DO: "", LISTS_CREATE_WITH_CONTAINER_TOOLTIP: "Hinzufügen, entfernen und sortieren von Elementen.",
PROCEDURES_DEFNORETURN_HELPURL: LISTS_CREATE_WITH_HELPURL: "https://github.com/google/blockly/wiki/Lists#create-list-with",
"https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29", LISTS_CREATE_WITH_INPUT_WITH: "Erzeuge Liste mit",
PROCEDURES_DEFNORETURN_PROCEDURE: "Funktionsblock", LISTS_CREATE_WITH_ITEM_TOOLTIP: "Ein Element zur Liste hinzufügen.",
PROCEDURES_DEFNORETURN_TITLE: "zu", LISTS_CREATE_WITH_TOOLTIP: "Erzeugt eine List mit konfigurierten Elementen.",
PROCEDURES_DEFNORETURN_TOOLTIP: "Ein Funktionsblock ohne Rückgabewert.", LISTS_GET_INDEX_FIRST: "erstes",
PROCEDURES_DEFRETURN_HELPURL: LISTS_GET_INDEX_FROM_END: "#tes von hinten",
"https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29", LISTS_GET_INDEX_FROM_START: "#tes",
PROCEDURES_DEFRETURN_RETURN: "gebe zurück", LISTS_GET_INDEX_GET: "nimm",
PROCEDURES_DEFRETURN_TOOLTIP: "Ein Funktionsblock mit Rückgabewert.", LISTS_GET_INDEX_GET_REMOVE: "nimm und entferne",
PROCEDURES_DEF_DUPLICATE_WARNING: LISTS_GET_INDEX_LAST: "letztes",
"Warnung: dieser Funktionsblock hat zwei gleich benannte Parameter.", LISTS_GET_INDEX_RANDOM: "zufälliges",
PROCEDURES_HIGHLIGHT_DEF: "Markiere Funktionsblock", LISTS_GET_INDEX_REMOVE: "entferne",
PROCEDURES_IFRETURN_HELPURL: "http://c2.com/cgi/wiki?GuardClause", LISTS_GET_INDEX_TAIL: "",
PROCEDURES_IFRETURN_TOOLTIP: LISTS_GET_INDEX_TOOLTIP_GET_FIRST: "Extrahiere das erste Element aus der Liste.",
"Wenn der erste Wert wahr (true) ist, Gebe den zweiten Wert zurück.", LISTS_GET_INDEX_TOOLTIP_GET_FROM_END: "Extrahiere das #1te Element aus Ende der Liste.",
PROCEDURES_IFRETURN_WARNING: LISTS_GET_INDEX_TOOLTIP_GET_FROM_START: "Extrahiere das #1te Element aus der Liste.",
"Warnung: Dieser Block darf nur innerhalb eines Funktionsblock genutzt werden.", LISTS_GET_INDEX_TOOLTIP_GET_LAST: "Extrahiere das letzte Element aus der Liste.",
PROCEDURES_MUTATORARG_TITLE: "Variable:", LISTS_GET_INDEX_TOOLTIP_GET_RANDOM: "Extrahiere ein zufälliges Element aus der Liste.",
PROCEDURES_MUTATORARG_TOOLTIP: "Eine Eingabe zur Funktion hinzufügen.", LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FIRST: "Extrahiere und entfernt das erste Element aus der Liste.",
PROCEDURES_MUTATORCONTAINER_TITLE: "Parameter", LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_END: "Extrahiere und entfernt das #1te Element aus Ende der Liste.",
PROCEDURES_MUTATORCONTAINER_TOOLTIP: LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_FROM_START: "Extrahiere und entfernt das #1te Element aus der Liste.",
"Die Eingaben zu dieser Funktion hinzufügen, entfernen oder neu anordnen.", LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_LAST: "Extrahiere und entfernt das letzte Element aus der Liste.",
REDO: "Wiederholen", LISTS_GET_INDEX_TOOLTIP_GET_REMOVE_RANDOM: "Extrahiere und entfernt ein zufälliges Element aus der Liste.",
REMOVE_COMMENT: "Kommentar entfernen", LISTS_GET_INDEX_TOOLTIP_REMOVE_FIRST: "Entfernt das erste Element von der Liste.",
RENAME_VARIABLE: "Variable umbenennen...", LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_END: "Entfernt das #1te Element von Ende der Liste.",
RENAME_VARIABLE_TITLE: 'Alle "%1" Variablen umbenennen in:', LISTS_GET_INDEX_TOOLTIP_REMOVE_FROM_START: "Entfernt das #1te Element von der Liste.",
LISTS_GET_INDEX_TOOLTIP_REMOVE_LAST: "Entfernt das letzte Element von der Liste.",
LISTS_GET_INDEX_TOOLTIP_REMOVE_RANDOM: "Entfernt ein zufälliges Element von der Liste.",
LISTS_GET_SUBLIST_END_FROM_END: "bis zu # von hinten",
LISTS_GET_SUBLIST_END_FROM_START: "bis zu #",
LISTS_GET_SUBLIST_END_LAST: "bis zum Ende",
LISTS_GET_SUBLIST_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
LISTS_GET_SUBLIST_START_FIRST: "erhalte Unterliste vom Anfang",
LISTS_GET_SUBLIST_START_FROM_END: "erhalte Unterliste von # von hinten",
LISTS_GET_SUBLIST_START_FROM_START: "erhalte Unterliste von #",
LISTS_GET_SUBLIST_TAIL: "",
LISTS_GET_SUBLIST_TOOLTIP: "Erstellt eine Kopie mit dem angegebenen Abschnitt der Liste.",
LISTS_INDEX_OF_FIRST: "suche erstes Auftreten von",
LISTS_INDEX_OF_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
LISTS_INDEX_OF_LAST: "suche letztes Auftreten von",
LISTS_INDEX_OF_TOOLTIP: "Sucht die Position (index) eines Elementes in der Liste. Gibt 0 zurück, falls kein Element gefunden wurde.",
LISTS_INLIST: "von der Liste",
LISTS_ISEMPTY_HELPURL: "https://github.com/google/blockly/wiki/Lists#is-empty", // untranslated
LISTS_ISEMPTY_TITLE: "%1 ist leer?",
LISTS_ISEMPTY_TOOLTIP: "Ist wahr (true), wenn die Liste leer ist.",
LISTS_LENGTH_HELPURL: "https://github.com/google/blockly/wiki/Lists#length-of", // untranslated
LISTS_LENGTH_TITLE: "Länge von %1",
LISTS_LENGTH_TOOLTIP: "Die Anzahl von Elementen in der Liste.",
LISTS_REPEAT_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
LISTS_REPEAT_TITLE: "Erzeuge Liste mit Element %1 wiederhole es %2 mal",
LISTS_REPEAT_TOOLTIP: "Erzeugt eine Liste mit einer variablen Anzahl von Elementen",
LISTS_SET_INDEX_HELPURL: "http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic:%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Farsubex.htm",
LISTS_SET_INDEX_INPUT_TO: "ein",
LISTS_SET_INDEX_INSERT: "füge",
LISTS_SET_INDEX_SET: "setze",
LISTS_SET_INDEX_TOOLTIP_INSERT_FIRST: "Fügt das Element an den Anfang der Liste an.",
LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_END: "Fügt das Element an der angegebenen Position in der Liste ein. #1 ist das letzte Element.",
LISTS_SET_INDEX_TOOLTIP_INSERT_FROM_START: "Fügt das Element an der angegebenen Position in der Liste ein. #1 ist die erste Element.",
LISTS_SET_INDEX_TOOLTIP_INSERT_LAST: "Fügt das Element ans Ende der Liste an.",
LISTS_SET_INDEX_TOOLTIP_INSERT_RANDOM: "Fügt das Element zufällig in die Liste ein.",
LISTS_SET_INDEX_TOOLTIP_SET_FIRST: "Setzt das erste Element in der Liste.",
LISTS_SET_INDEX_TOOLTIP_SET_FROM_END: "Setzt das Element an der angegebenen Position in der Liste. #1 ist das letzte Element.",
LISTS_SET_INDEX_TOOLTIP_SET_FROM_START: "Setzte das Element an der angegebenen Position in der Liste. #1 ist das erste Element.",
LISTS_SET_INDEX_TOOLTIP_SET_LAST: "Setzt das letzte Element in der Liste.",
LISTS_SET_INDEX_TOOLTIP_SET_RANDOM: "Setzt ein zufälliges Element in der Liste.",
LISTS_SORT_HELPURL: "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
LISTS_SORT_ORDER_ASCENDING: "aufsteigend",
LISTS_SORT_ORDER_DESCENDING: "absteigend",
LISTS_SORT_TITLE: "%1 %2 %3 sortieren",
LISTS_SORT_TOOLTIP: "Eine Kopie einer Liste sortieren.",
LISTS_SORT_TYPE_IGNORECASE: "alphabetisch, Schreibung ignorieren",
LISTS_SORT_TYPE_NUMERIC: "numerisch",
LISTS_SORT_TYPE_TEXT: "alphabetisch",
LISTS_SPLIT_HELPURL: "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
LISTS_SPLIT_LIST_FROM_TEXT: "Liste aus Text erstellen",
LISTS_SPLIT_TEXT_FROM_LIST: "Text aus Liste erstellen",
LISTS_SPLIT_TOOLTIP_JOIN: "Liste mit Texten in einen Text vereinen, getrennt durch ein Trennzeichen.",
LISTS_SPLIT_TOOLTIP_SPLIT: "Text in eine Liste mit Texten aufteilen, unterbrochen bei jedem Trennzeichen.",
LISTS_SPLIT_WITH_DELIMITER: "mit Trennzeichen",
LOGIC_BOOLEAN_FALSE: "falsch",
TODAY: "Heute", ME: "Ich",
UNDO: "Rückgängig", NEW_VARIABLE: "Neue Variable...",
VARIABLES_DEFAULT_NAME: "Element", NEW_VARIABLE_TITLE: "Name der neuen Variable:",
VARIABLES_GET_CREATE_SET: 'Erzeuge "Schreibe %1"', ORDINAL_NUMBER_SUFFIX: "",
VARIABLES_GET_HELPURL: PROCEDURES_ALLOW_STATEMENTS: "Aussagen erlauben",
"https://de.wikipedia.org/wiki/Variable_%28Programmierung%29", PROCEDURES_CALLNORETURN_HELPURL: "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
VARIABLES_GET_TOOLTIP: "Gibt den Wert der Variable zurück.", PROCEDURES_CALLNORETURN_TOOLTIP: "Rufe einen Funktionsblock ohne Rückgabewert auf.",
VARIABLES_SET: "Schreibe %1 %2", PROCEDURES_CALLRETURN_HELPURL: "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
VARIABLES_SET_CREATE_GET: 'Erzeuge "Lese %1"', PROCEDURES_CALLRETURN_TOOLTIP: "Rufe einen Funktionsblock mit Rückgabewert auf.",
VARIABLES_SET_HELPURL: PROCEDURES_CALL: "Rufe",
"https://de.wikipedia.org/wiki/Variable_%28Programmierung%29", PROCEDURES_CALL_END: "auf",
VARIABLES_SET_TOOLTIP: "Setzt den Wert einer Variable.", PROCEDURES_DEFNORETURN: "Erstelle Funktion",
MATH_CHANGE_TITLE_ITEM: "Element", PROCEDURES_BEFORE_PARAMS: "mit Eingabeparameter:",
PROCEDURES_DEFRETURN_TITLE: "zu", PROCEDURES_DEFRETURN_RETURN_TYPE: "Rückgabetype",
CONTROLS_IF_IF_TITLE_IF: "if", PROCEDURES_CALL_BEFORE_PARAMS: "mit:",
CONTROLS_WHILEUNTIL_INPUT_DO: "mache", PROCEDURES_CREATE_DO: "Erzeuge \"Aufruf %1\"",
CONTROLS_IF_MSG_THEN: "mache", PROCEDURES_DEFNORETURN_COMMENT: "Beschreibe diese Funktion …",
CONTROLS_IF_ELSE_TITLE_ELSE: "sonst", PROCEDURES_DEFNORETURN_DO: "",
PROCEDURES_DEFRETURN_PROCEDURE: "Funktionsblock", PROCEDURES_DEFNORETURN_HELPURL: "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
LISTS_GET_SUBLIST_INPUT_IN_LIST: "in der Liste", PROCEDURES_DEFNORETURN_PROCEDURE: "Funktionsblock",
LISTS_GET_INDEX_INPUT_IN_LIST: "in der Liste", PROCEDURES_DEFNORETURN_TITLE: "zu",
PROCEDURES_DEFRETURN_DO: "", PROCEDURES_DEFNORETURN_TOOLTIP: "Ein Funktionsblock ohne Rückgabewert.",
CONTROLS_IF_ELSEIF_TITLE_ELSEIF: "sonst wenn", PROCEDURES_DEFRETURN_HELPURL: "https://de.wikipedia.org/wiki/Prozedur_%28Programmierung%29",
LISTS_GET_INDEX_HELPURL: PROCEDURES_DEFRETURN_RETURN: "gebe zurück",
"https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list", PROCEDURES_DEFRETURN_TOOLTIP: "Ein Funktionsblock mit Rückgabewert.",
CONTROLS_FOREACH_INPUT_DO: "mache", PROCEDURES_DEF_DUPLICATE_WARNING: "Warnung: dieser Funktionsblock hat zwei gleich benannte Parameter.",
LISTS_SET_INDEX_INPUT_IN_LIST: "in der Liste", PROCEDURES_HIGHLIGHT_DEF: "Markiere Funktionsblock",
CONTROLS_FOR_INPUT_DO: "mache", PROCEDURES_IFRETURN_HELPURL: "http://c2.com/cgi/wiki?GuardClause",
LISTS_CREATE_WITH_ITEM_TITLE: "item", PROCEDURES_IFRETURN_TOOLTIP: "Wenn der erste Wert wahr (true) ist, Gebe den zweiten Wert zurück.",
TEXT_APPEND_VARIABLE: "item", PROCEDURES_IFRETURN_WARNING: "Warnung: Dieser Block darf nur innerhalb eines Funktionsblock genutzt werden.",
TEXT_CREATE_JOIN_ITEM_TITLE_ITEM: "item", PROCEDURES_MUTATORARG_TITLE: "Variable:",
LISTS_INDEX_OF_INPUT_IN_LIST: "von der Liste", PROCEDURES_MUTATORARG_TOOLTIP: "Eine Eingabe zur Funktion hinzufügen.",
PROCEDURES_DEFRETURN_COMMENT: "Beschreibe diese Funktion …", PROCEDURES_MUTATORCONTAINER_TITLE: "Parameter",
PROCEDURES_MUTATORCONTAINER_TOOLTIP: "Die Eingaben zu dieser Funktion hinzufügen, entfernen oder neu anordnen.",
REDO: "Wiederholen",
REMOVE_COMMENT: "Kommentar entfernen",
RENAME_VARIABLE: "Variable umbenennen...",
RENAME_VARIABLE_TITLE: "Alle \"%1\" Variablen umbenennen in:",
/*senseBox Blockly Translations*/ TODAY: "Heute",
UNDO: "Rückgängig",
VARIABLES_DEFAULT_NAME: "Element",
VARIABLES_GET_CREATE_SET: "Erzeuge \"Schreibe %1\"",
VARIABLES_GET_HELPURL: "https://de.wikipedia.org/wiki/Variable_%28Programmierung%29",
VARIABLES_GET_TOOLTIP: "Gibt den Wert der Variable zurück.",
VARIABLES_SET: "Schreibe %1 %2",
VARIABLES_SET_CREATE_GET: "Erzeuge \"Lese %1\"",
VARIABLES_SET_HELPURL: "https://de.wikipedia.org/wiki/Variable_%28Programmierung%29",
VARIABLES_SET_TOOLTIP: "Setzt den Wert einer Variable.",
MATH_CHANGE_TITLE_ITEM: "Element",
PROCEDURES_DEFRETURN_TITLE: "zu",
CONTROLS_IF_IF_TITLE_IF: "if",
CONTROLS_WHILEUNTIL_INPUT_DO: "mache",
CONTROLS_IF_MSG_THEN: "mache",
CONTROLS_IF_ELSE_TITLE_ELSE: "sonst",
PROCEDURES_DEFRETURN_PROCEDURE: "Funktionsblock",
LISTS_GET_SUBLIST_INPUT_IN_LIST: "in der Liste",
LISTS_GET_INDEX_INPUT_IN_LIST: "in der Liste",
PROCEDURES_DEFRETURN_DO: "",
CONTROLS_IF_ELSEIF_TITLE_ELSEIF: "sonst wenn",
LISTS_GET_INDEX_HELPURL: "https://github.com/google/blockly/wiki/Lists#getting-items-from-a-list",
CONTROLS_FOREACH_INPUT_DO: "mache",
LISTS_SET_INDEX_INPUT_IN_LIST: "in der Liste",
CONTROLS_FOR_INPUT_DO: "mache",
LISTS_CREATE_WITH_ITEM_TITLE: "item",
TEXT_APPEND_VARIABLE: "item",
TEXT_CREATE_JOIN_ITEM_TITLE_ITEM: "item",
LISTS_INDEX_OF_INPUT_IN_LIST: "von der Liste",
PROCEDURES_DEFRETURN_COMMENT: "Beschreibe diese Funktion …",
senseBox_basic_blue: "Blau", /*senseBox Blockly Translations*/
senseBox_basic_green: "Grün",
senseBox_basic_red: "Rot", senseBox_basic_blue: "Blau",
senseBox_basic_state: "Status", senseBox_basic_green: "Grün",
senseBox_off: "Aus", senseBox_basic_red: "Rot",
senseBox_on: "Ein", senseBox_basic_state: "Status",
senseBox_sensor: "Sensoren", senseBox_off: "Aus",
senseBox_output_filename: "Daten", senseBox_on: "Ein",
senseBox_output_format: "Format:", senseBox_sensor: "Sensoren",
senseBox_output_linebreak: "Zeilenumbruch", senseBox_output_filename: "Daten",
senseBox_output_networkid: "NetzwerkID", senseBox_output_format: "Format:",
senseBox_output_password: "Passwort", senseBox_output_linebreak: "Zeilenumbruch",
senseBox_output_safetosd: "Auf SD Karte speichern", senseBox_output_networkid: "NetzwerkID",
senseBox_output_safetosd_tip: "Speichert Messwerte auf SD Karte", senseBox_output_password: "Passwort",
senseBox_output_serialprint: "Auf Kommandozeile ausgeben", senseBox_output_safetosd: "Auf SD Karte speichern",
senseBox_serial_tip: senseBox_output_safetosd_tip: "Speichert Messwerte auf SD Karte",
"Gibt Messwerte oder Daten auf dem Seriellen Monitor der Arduino IDE aus. Praktisch um ohne Display zu arbeiten", senseBox_output_serialprint: "Auf Kommandozeile ausgeben",
senseBox_output_timestamp: "Zeitstempel (RFC 3339)", senseBox_serial_tip: "Gibt Messwerte oder Daten auf dem Seriellen Monitor der Arduino IDE aus. Praktisch um ohne Display zu arbeiten",
senseBox_led: "LED an", senseBox_output_timestamp: "Zeitstempel",
senseBox_led_tip: senseBox_led: "LED an digitalen",
"Einfache LED. Beim Anschluss sollte immer ein Vorwiderstand verwendet werden", senseBox_led_tip: "Einfache LED. Beim Anschluss sollte immer ein Vorwiderstand verwendet werden",
senseBox_piezo: "Piezo an digital", senseBox_piezo: "Piezo an digital",
senseBox_piezo_tip: senseBox_piezo_tip: "Piezo an digital PIN. Beim Anschluss sollte immer ein Vorwiderstand verwendet werden",
"Piezo an digital PIN. Beim Anschluss sollte immer ein Vorwiderstand verwendet werden", senseBox_foto: "Fotowiderstand",
senseBox_foto: "Fotowiderstand", senseBox_foto_tip: "Fotowiderstand",
senseBox_foto_tip: "Fotowiderstand", senseBox_hum: "Luftfeuchtigkeit in %",
senseBox_hum: "Luftfeuchtigkeit in %", senseBox_hum_tip: "Luftfeuchtigkeit",
senseBox_hum_tip: "Luftfeuchtigkeit", senseBox_ir: "Infrarot Abstandssensor",
senseBox_ir: "Infrarot Abstandssensor", senseBox_ir_tip: "Infrarot Abstandssensor",
senseBox_ir_tip: "Infrarot Abstandssensor", senseBox_lux: "Helligkeitssensor",
senseBox_lux: "Helligkeitssensor", senseBox_lux_tip: "Helligkeitssensor",
senseBox_lux_tip: "Helligkeitssensor", senseBox_poti: "Potenziometer",
senseBox_poti: "Potenziometer", senseBox_poti_tip: "Potenziometer",
senseBox_poti_tip: "Potenziometer", senseBox_soil: "Bodenfeuchte",
senseBox_soil: "Bodenfeuchte", senseBox_watertemperature: "Wassertemperatur",
senseBox_watertemperature: "Wassertemperatur",
}; }

95
src/components/Blockly/msg/de/ui.js
View File

@ -8,27 +8,18 @@ export const UI = {
toolbox_math: "Mathematik", toolbox_math: "Mathematik",
toolbox_io: "Eingang/Ausgang", toolbox_io: "Eingang/Ausgang",
toolbox_time: "Zeit", toolbox_time: "Zeit",
toolbox_rtc: "RTC",
toolbox_ntp: "NTP",
toolbox_functions: "Funktionen", toolbox_functions: "Funktionen",
toolbox_variables: "Variablen", toolbox_variables: "Variablen",
toolbox_serial: "Seriell",
toolbox_advanced: "Erweitert",
toolbox_motors: "Motoren",
toolbox_label_externalRTC: "Externe RTC",
toolbox_label_internalRTC: "Interne RTC",
variable_NUMBER: "Zahl (int)", variable_NUMBER: "Zahl (int)",
variable_SHORT_NUMBER: "char", variable_SHORT_NUMBER: "char",
variable_LONG: "große Zahl (long)", variable_LONG: "große Zahl (long)",
variable_DECIMAL: "Kommazahl (float)", variable_DECIMAL: "Kommazahl (float)",
variables_TEXT: "Text (string)", variables_TEXT: "Text (string)",
variables_ARRAY: "Array (array)", variables_ARRAY: "Array (array)",
variables_CHARACTER: "Buchstabe (char)", variables_CHARACTER: "char (char)",
variables_BOOLEAN: "Boolean (boolean)", variables_BOOLEAN: "Boolean (boolean)",
variables_NULL: "void (void)", variables_NULL: "void (void)",
variables_UNDEF: "undefined", variables_UNDEF: "undefined",
variables_set: "Schreibe",
variables_to: "",
/** /**
* Tooltips * Tooltips
@ -58,14 +49,7 @@ export const UI = {
tooltip_project_title: "Titel des Projektes", tooltip_project_title: "Titel des Projektes",
tooltip_check_solution: "Lösung kontrollieren", tooltip_check_solution: "Lösung kontrollieren",
tooltip_copy_code: "Code in die Zwischenablage kopieren", tooltip_copy_code: "Code in die Zwischenablage kopieren",
tooltip_statistics_current: "Anzahl aktueller Blöcke",
tooltip_statistics_new: "Anzahl neuer Blöcke",
tooltip_statistics_changed: "Anzahl veränderter Blöcke",
tooltip_statistics_moved: "Anzahl bewegter Blöcke",
tooltip_statistics_deleted: "Anzahl gelöschter Blöcke",
tooltip_statistics_remaining: "Verbleibende Blöcke",
tooltip_statistics_show: "Statistiken anzeigen",
tooltip_start_tour: "Tour starten",
/** /**
* Messages * Messages
* *
@ -92,23 +76,13 @@ export const UI = {
messages_rename_success_01: "Das Projekt wurde erfolgreich in ", messages_rename_success_01: "Das Projekt wurde erfolgreich in ",
messages_rename_success_02: "umbenannt.", messages_rename_success_02: "umbenannt.",
messages_newblockly_head: messages_newblockly_head:
"Willkommen zur neuen senseBox Lern- und Programmierumgebung", "Willkommen zur neuen Version Blockly für die senseBox",
messages_newblockly_text: messages_newblockly_text:
"Nach einer Testphase kann die neue senseBox Lern- und Programmierumgebung verwendet werden. Wenn Sie weiterhin Fehler finden, melden Sie diesen bitte in unserem [Forum](https://forum.sensebox.de/t/neue-blockly-version-beta-test-und-feedback/1176). Eine Übersicht über alle neuen Funktionen finden Sie [hier](/news)", "Die neue Blockly-Version befindet sich derzeit in der Testphase. Wenn Sie einen Fehler finden, melden Sie diesen bitte in unserem [Forum](https://forum.sensebox.de/t/neue-blockly-version-beta-test-und-feedback/1176). Eine Übersicht über alle neuen Funktionen finden Sie [hier](/news)",
messages_GET_TUTORIAL_FAIL: "Zurück zur Tutorials-Übersicht", messages_GET_TUTORIAL_FAIL: "Zurück zur Tutorials-Übersicht",
messages_LOGIN_FAIL: "Der Benutzername oder das Passwort ist nicht korrekt.", messages_LOGIN_FAIL: "Der Benutzername oder das Passwort ist nicht korrekt.",
messages_copy_code: "Code wurde in die Zwischenablage kopiert", messages_copy_code: "Code wurde in die Zwischenablage kopiert",
/**
* Tablet Dialog
*/
tabletDialog_headline: "Tablet Modus ist aktiviert!",
tabletDialog_text:
"Der Tablet Modus wurde aktiviert. Du kannst nun Programmcodes über die senseBox Connect App auf deine senseBox kopieren. Der Tablet Modus kann in den Einstellungen deaktiviert werden",
tabletDialog_more:
"Weitere Informationen und den Link zum Download der App findest du unter: ",
/** /**
* Reset Dialog * Reset Dialog
*/ */
@ -148,7 +122,6 @@ export const UI = {
button_cancel: "Abbrechen", button_cancel: "Abbrechen",
button_close: "Schließen", button_close: "Schließen",
button_save: "Speichern",
button_accept: "Bestätigen", button_accept: "Bestätigen",
button_compile: "Kompilieren", button_compile: "Kompilieren",
button_create_variableCreate: "Erstelle Variable", button_create_variableCreate: "Erstelle Variable",
@ -156,7 +129,6 @@ export const UI = {
button_next: "nächster Schritt", button_next: "nächster Schritt",
button_tutorial_overview: "Tutorial Übersicht", button_tutorial_overview: "Tutorial Übersicht",
button_login: "Anmelden", button_login: "Anmelden",
button_createVariable: "Typisierte Variable erstellen",
/** /**
* *
@ -182,16 +154,7 @@ export const UI = {
"Die Anzeige von Statistiken zur Nutzung der Blöcke oberhalb der Arbeitsfläche kann ein- oder ausgeblendet werden.", "Die Anzeige von Statistiken zur Nutzung der Blöcke oberhalb der Arbeitsfläche kann ein- oder ausgeblendet werden.",
settings_statistics_on: "An", settings_statistics_on: "An",
settings_statistics_off: "Aus", settings_statistics_off: "Aus",
settings_ota_head: "Tablet Modus",
settings_ota_text:
"Der Tablet Modus deaktiviert die Code anzeige und aktiviert die Möglichkeit den Programmcode über die senseBox Connect App zu übertragen. Weitere Informationen dazu findest du unter: ",
settings_ota_on: "Aktiviert",
settings_ota_off: "Deaktiviert",
settings_sounds: "Töne",
settings_sounds_text:
"Aktiviere oder Deaktiviere Töne beim hinzufügen und löschen von Blöcken. Standardmäßig deaktiviert",
settings_board: "Board",
settings_board_text: "Wähle dein verwendetes Board aus",
/** /**
* 404 * 404
*/ */
@ -212,7 +175,7 @@ export const UI = {
/** /**
* Tutorials * Tutorials
*/ */
tutorials_home_head: "Tutorial-Übersicht",
tutorials_assessment_task: "Aufgabe", tutorials_assessment_task: "Aufgabe",
tutorials_hardware_head: "Für die Umsetzung benötigst du folgende Hardware:", tutorials_hardware_head: "Für die Umsetzung benötigst du folgende Hardware:",
tutorials_hardware_moreInformation: tutorials_hardware_moreInformation:
@ -224,9 +187,7 @@ export const UI = {
/** /**
* Tutorial Builder * Tutorial Builder
*/ */
builder_createNew: "neues Tutorial erstellen",
builder_changeExisting: "bestehendes Tutorial ändern",
builder_deleteExisting: "bestehendes Tutorial löschen",
builder_solution: "Lösung", builder_solution: "Lösung",
builder_solution_submit: "Lösung einreichen", builder_solution_submit: "Lösung einreichen",
builder_example_submit: "Beispiel einreichen", builder_example_submit: "Beispiel einreichen",
@ -238,12 +199,6 @@ export const UI = {
builder_requirements_head: "Voraussetzungen", builder_requirements_head: "Voraussetzungen",
builder_requirements_order: builder_requirements_order:
"Beachte, dass die Reihenfolge des Anhakens maßgebend ist.", "Beachte, dass die Reihenfolge des Anhakens maßgebend ist.",
builder_difficulty: "Schwierigkeitsgrad",
builder_public_head: "Tutorial veröffentlichen",
builder_public_label: "Tutorial für alle Nutzer:innen veröffentlichen",
builder_review_head: "Tutorial veröffentlichen",
builder_review_text:
"Du kannst dein Tutorial direkt über den Link mit anderen Personen teilen. Wenn du dein Tutorial für alle Nutzer:innen in der Überischt veröffenltichen wollen kannst du es hier aktivieren. Ein Administrator wird dein Tutorial ansehen und anschließend freischalten.",
/** /**
* Login * Login
@ -257,10 +212,10 @@ export const UI = {
/** /**
* Navbar * Navbar
*/ */
navbar_blockly: "Blockly",
navbar_tutorials: "Tutorials", navbar_tutorials: "Tutorials",
navbar_tutorialbuilder: "Tutorial erstellen", navbar_tutorialbuilder: "Tutorial erstellen",
navbar_gallery: "Galerie", navbar_gallery: "Gallerie",
navbar_projects: "Projekte", navbar_projects: "Projekte",
navbar_menu: "Menü", navbar_menu: "Menü",
@ -298,36 +253,4 @@ export const UI = {
drawer_ideerror_head: "Hoppla da ist was schief gegangen.", drawer_ideerror_head: "Hoppla da ist was schief gegangen.",
drawer_ideerror_text: drawer_ideerror_text:
"Beim kompilieren ist ein Fehler aufgetreten, überprüfe deine Blöcke.", "Beim kompilieren ist ein Fehler aufgetreten, überprüfe deine Blöcke.",
/**
* Code Editor
* */
codeeditor_libraries_head: "Installierte Arduino Libraries",
codeeditor_libraries_text:
"Für die Dokumentation sehen Sie sich die installierten Bibliotheken und deren Beispiele an",
codeeditor_save_code: "Code herunterladen",
codeeditor_open_code: "Code öffnen",
codeeditor_reset_code: "Code zurücksetzen",
codeeditor_blockly_code: "Lade Blockly Code",
codeeditor_compile_progress:
"Dein Code wird nun kompiliert und anschließend auf deinen Computer heruntergeladen",
/**
* Device Selction
* */
deviceselection_head: "Welches Board benutzt du?",
deviceselection_keep_selection:
"Speichere meine Auswahl fürs nächste Mal (Du kannst das Board später in den Einstellungen wechseln)",
deviceselection_footnote: "Hier kommst du zur alten Blockly Version für den ",
deviceselection_footnote_02: "oder die",
/**
* Sensor Markdown Information
*/
sensorinfo_info: "Informationen zum Sensor",
sensorinfo_description: "Beschreibung",
sensorinfo_measurable_phenos: "Messbare Phänomene",
sensorinfo_manufacturer: "Hersteller",
sensorinfo_lifetime: "Lebensdauer",
sensorinfo_explanation: "Diese Informationen wurden aus [sensors.wiki](https://sensors.wiki) entnommen. Für weitere Informationen besuchen Sie den Abschnitt über diesen Sensor "
}; };

6
src/components/Blockly/msg/de_old.js
View File

@ -726,7 +726,7 @@ Blockly.Msg.senseBox_output_safetosd_tip = "Speichert Messwerte auf SD Karte";
Blockly.Msg.senseBox_output_serialprint = "Auf Kommandozeile ausgeben"; Blockly.Msg.senseBox_output_serialprint = "Auf Kommandozeile ausgeben";
Blockly.Msg.senseBox_serial_tip = Blockly.Msg.senseBox_serial_tip =
"Gibt Messwerte oder Daten auf dem Seriellen Monitor der Arduino IDE aus. Praktisch um ohne Display zu arbeiten"; "Gibt Messwerte oder Daten auf dem Seriellen Monitor der Arduino IDE aus. Praktisch um ohne Display zu arbeiten";
Blockly.Msg.senseBox_output_timestamp = "Zeitstempel (RFC 3339)"; Blockly.Msg.senseBox_output_timestamp = "Zeitstempel";
Blockly.Msg.senseBox_led = "LED an digitalen"; Blockly.Msg.senseBox_led = "LED an digitalen";
Blockly.Msg.senseBox_led_tip = Blockly.Msg.senseBox_led_tip =
@ -745,8 +745,8 @@ Blockly.Msg.senseBox_lux_tip = "Helligkeitssensor";
Blockly.Msg.senseBox_poti = "Potenziometer"; Blockly.Msg.senseBox_poti = "Potenziometer";
Blockly.Msg.senseBox_poti_tip = "Potenziometer"; Blockly.Msg.senseBox_poti_tip = "Potenziometer";
Blockly.Msg.senseBox_pressure_sensor = "Luftdruck-/Temperatursensor (BMP280)"; Blockly.Msg.senseBox_pressure_sensor = "Luftdruck-/Temperatursensor (BMP280)";
Blockly.Msg.senseBox_pressure = "Luftdruck in hPa"; Blockly.Msg.senseBox_pressure = "Luftdruck in Pa";
Blockly.Msg.senseBox_pressure_dimension = "Luftdruck in hPa"; Blockly.Msg.senseBox_pressure_dimension = "Luftdruck in Pa";
Blockly.Msg.senseBox_pressure_tip = "Luftdrucksensor"; Blockly.Msg.senseBox_pressure_tip = "Luftdrucksensor";
Blockly.Msg.senseBox_pressure_referencePressure = "Luftdruck auf NN"; Blockly.Msg.senseBox_pressure_referencePressure = "Luftdruck auf NN";
Blockly.Msg.senseBox_pressure_referencePressure_dim = "hPa"; Blockly.Msg.senseBox_pressure_referencePressure_dim = "hPa";

4
src/components/Blockly/msg/en.js
View File

@ -8,12 +8,10 @@ import { MATH } from "./en/math";
import { MQTT } from "./en/mqtt"; import { MQTT } from "./en/mqtt";
import { SENSEBOX } from "./en/sensebox"; import { SENSEBOX } from "./en/sensebox";
import { DISPLAY } from "./en/sensebox-display"; import { DISPLAY } from "./en/sensebox-display";
import { MOTORS } from "./en/sensebox-motors";
import { LED } from "./en/sensebox-led"; import { LED } from "./en/sensebox-led";
import { LORA } from "./en/sensebox-lora"; import { LORA } from "./en/sensebox-lora";
import { OSEM } from "./en/sensebox-osem"; import { OSEM } from "./en/sensebox-osem";
import { RTC } from "./en/sensebox-rtc"; import { RTC } from "./en/sensebox-rtc";
import { NTP } from "./en/sensebox-ntp";
import { SD } from "./en/sensebox-sd"; import { SD } from "./en/sensebox-sd";
import { SENSORS } from "./en/sensebox-sensors"; import { SENSORS } from "./en/sensebox-sensors";
import { TELEGRAM } from "./en/sensebox-telegram"; import { TELEGRAM } from "./en/sensebox-telegram";
@ -36,12 +34,10 @@ export const En = {
...MATH, ...MATH,
...MQTT, ...MQTT,
...DISPLAY, ...DISPLAY,
...MOTORS,
...LED, ...LED,
...LORA, ...LORA,
...OSEM, ...OSEM,
...RTC, ...RTC,
...NTP,
...SD, ...SD,
...SENSORS, ...SENSORS,
...SENSEBOX, ...SENSEBOX,

Some files were not shown because too many files have changed in this diff Show More