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

fixes after merging

Browse Source
This commit is contained in:
Mario Pesch 2022-01-31 15:56:03 +01:00
parent df9abdc826
commit 787d4058fc
4 changed files with 87 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
Blockly.Arduino.definitions_["SenseBoxID"] = Blockly.Arduino.definitions_["SenseBoxID"] =
'const char SENSEBOX_ID [] PROGMEM = "' + box_id + '";'; 'const char SENSEBOX_ID [] PROGMEM = "' + box_id + '";';
Blockly.Arduino.definitions_["host"] = Blockly.Arduino.definitions_["host"] =
"const char server [] PROGMEM =" + host + ";"; 'const char server [] PROGMEM ="ingress.opensensemap.org";';
if (wifi === true) { if (wifi === true) {
if (ssl === "TRUE") { if (ssl === "TRUE") {
Blockly.Arduino.definitions_["WiFiSSLClient"] = "WiFiSSLClient client;"; Blockly.Arduino.definitions_["WiFiSSLClient"] = "WiFiSSLClient client;";
@ -68,7 +68,7 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
Blockly.Arduino.definitions_["EthernetClient"] = "EthernetClient client;"; Blockly.Arduino.definitions_["EthernetClient"] = "EthernetClient client;";
port = 80; port = 80;
} }
'const char server [] PROGMEM ="ingress.opensensemap.org";';
if (ssl === "TRUE") { if (ssl === "TRUE") {
Blockly.Arduino.libraries_["library_bearSSL"] = Blockly.Arduino.libraries_["library_bearSSL"] =
"#include <ArduinoBearSSL.h>"; "#include <ArduinoBearSSL.h>";
@ -254,4 +254,5 @@ Blockly.Arduino.sensebox_osem_connection = function (Block) {
");\n"; ");\n";
} }
return code; return code;
}
}; };

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

@ -11,6 +11,7 @@ export const UI = {
toolbox_functions: "Funktionen", toolbox_functions: "Funktionen",
toolbox_variables: "Variablen", toolbox_variables: "Variablen",
toolbox_serial: "Seriell", toolbox_serial: "Seriell",
toolbox_advanced: "Erweitert",
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)",

1
src/components/Blockly/msg/en/ui.js
View File

@ -11,6 +11,7 @@ export const UI = {
toolbox_functions: "Functions", toolbox_functions: "Functions",
toolbox_variables: "Variables", toolbox_variables: "Variables",
toolbox_serial: "Serial", toolbox_serial: "Serial",
toolbox_advanced: "Erweitert",
variable_NUMBER: "Number (int)", variable_NUMBER: "Number (int)",
variable_SHORT_NUMBER: "char", variable_SHORT_NUMBER: "char",
variable_LONG: " Zahl (long)", variable_LONG: " Zahl (long)",

13
src/components/Blockly/toolbox/Toolbox.js
View File

@ -405,10 +405,6 @@ class Toolbox extends React.Component {
<Block type="sensebox_phyphox_channel"></Block> <Block type="sensebox_phyphox_channel"></Block>
<Block type="sensebox_phyphox_sendchannel"></Block> <Block type="sensebox_phyphox_sendchannel"></Block>
</Category> </Category>
<Category name={Blockly.Msg.toolbox_serial} colour={getColour().serial}>
<Block type="init_serial_monitor"></Block>
<Block type="print_serial_monitor"></Block>
</Category>
<Category <Category
id="webserver" id="webserver"
name="Webserver" name="Webserver"
@ -617,7 +613,14 @@ class Toolbox extends React.Component {
custom="PROCEDURE" custom="PROCEDURE"
></Category> ></Category>
<sep></sep> <sep></sep>
<Category name="Advanced" colour={getColour().io}> <Category name={Blockly.Msg.toolbox_advanced} colour={getColour().io}>
<Category
name={Blockly.Msg.toolbox_serial}
colour={getColour().serial}
>
<Block type="init_serial_monitor"></Block>
<Block type="print_serial_monitor"></Block>
</Category>
<Category name={Blockly.Msg.toolbox_io} colour={getColour().io}> <Category name={Blockly.Msg.toolbox_io} colour={getColour().io}>
<Block type="io_digitalwrite"></Block> <Block type="io_digitalwrite"></Block>
<Block type="io_digitalread"></Block> <Block type="io_digitalread"></Block>