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

add curly brackets

Browse Source 
closes #93
This commit is contained in:
Mario Pesch 2021-06-22 12:15:39 +02:00
parent f6947f8c6b
commit 1e979f948c
2 changed files with 440 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,30 +1,34 @@
import * as Blockly from 'blockly/core'; import * as Blockly from "blockly/core";
import { getColour } from '../helpers/colour'; import { getColour } from "../helpers/colour";
/* /*
----------------------------------LoRa-------------------------------------------------- ----------------------------------LoRa--------------------------------------------------
*/ */
Blockly.Blocks['sensebox_lora_initialize_otaa'] = { Blockly.Blocks["sensebox_lora_initialize_otaa"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_init_otaa_tooltip); this.setTooltip(Blockly.Msg.senseBox_LoRa_init_otaa_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_LoRa_init_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_LoRa_init_helpurl);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput() this.appendDummyInput().appendField("Initialize LoRa (OTAA)");
.appendField("Initialize LoRa (OTAA)");
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_device_id) .appendField(Blockly.Msg.senseBox_LoRa_device_id)
.appendField(new Blockly.FieldTextInput("DEVICE ID"), "DEVICEID"); .appendField("{")
.appendField(new Blockly.FieldTextInput("DEVICE ID"), "DEVICEID")
.appendField("}");
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_app_id) .appendField(Blockly.Msg.senseBox_LoRa_app_id)
.appendField(new Blockly.FieldTextInput("APP ID"), "APPID"); .appendField("{")
.appendField(new Blockly.FieldTextInput("APP ID"), "APPID")
.appendField("}");
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_app_key) .appendField(Blockly.Msg.senseBox_LoRa_app_key)
.appendField(new Blockly.FieldTextInput("APP KEY"), "APPKEY"); .appendField("{")
.appendField(new Blockly.FieldTextInput("APP KEY"), "APPKEY")
.appendField("}");
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_interval) .appendField(Blockly.Msg.senseBox_LoRa_interval)
@ -34,21 +38,24 @@ Blockly.Blocks['sensebox_lora_initialize_otaa'] = {
}, },
}; };
Blockly.Blocks['sensebox_lora_initialize_abp'] = { Blockly.Blocks["sensebox_lora_initialize_abp"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_init_abp_tooltip); this.setTooltip(Blockly.Msg.senseBox_LoRa_init_abp_tooltip);
this.setHelpUrl(Blockly.Msg.senseBox_LoRa_init_helpurl); this.setHelpUrl(Blockly.Msg.senseBox_LoRa_init_helpurl);
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput() this.appendDummyInput().appendField("Initialize LoRa (ABP)");
.appendField("Initialize LoRa (ABP)");
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_nwskey_id) .appendField(Blockly.Msg.senseBox_LoRa_nwskey_id)
.appendField(new Blockly.FieldTextInput("NWSKEY"), "NWSKEY"); .appendField("{")
.appendField(new Blockly.FieldTextInput("NWSKEY"), "NWSKEY")
.appendField("}");
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_appskey_id) .appendField(Blockly.Msg.senseBox_LoRa_appskey_id)
.appendField(new Blockly.FieldTextInput("APPSKEY"), "APPSKEY"); .appendField("{")
.appendField(new Blockly.FieldTextInput("APPSKEY"), "APPSKEY")
.appendField("}");
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_devaddr_id) .appendField(Blockly.Msg.senseBox_LoRa_devaddr_id)
@ -65,26 +72,27 @@ Blockly.Blocks['sensebox_lora_initialize_abp'] = {
}, },
}; };
Blockly.Blocks['sensebox_lora_message_send'] = { Blockly.Blocks["sensebox_lora_message_send"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_message_tooltip); this.setTooltip(Blockly.Msg.senseBox_LoRa_message_tooltip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendStatementInput('DO') this.appendStatementInput("DO")
.appendField(Blockly.Msg.senseBox_LoRa_send_message) .appendField(Blockly.Msg.senseBox_LoRa_send_message)
.setCheck(null); .setCheck(null);
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
} },
}; };
Blockly.Blocks['sensebox_send_lora_sensor_value'] = { Blockly.Blocks["sensebox_send_lora_sensor_value"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_sensor_tip); this.setTooltip(Blockly.Msg.senseBox_LoRa_sensor_tip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendValueInput('Value') this.appendValueInput("Value").appendField(
.appendField(Blockly.Msg.senseBox_measurement) Blockly.Msg.senseBox_measurement
);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField("Bytes") .appendField("Bytes")
@ -115,60 +123,65 @@ Blockly.Blocks['sensebox_send_lora_sensor_value'] = {
this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING); this.setWarningText(Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING);
} }
}, },
LOOP_TYPES: ['sensebox_lora_message_send'], LOOP_TYPES: ["sensebox_lora_message_send"],
}; };
Blockly.Blocks['sensebox_lora_ttn_mapper'] = { Blockly.Blocks["sensebox_lora_ttn_mapper"] = {
init: function (block) { init: function (block) {
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendDummyInput() this.appendDummyInput().appendField("TTN Mapper");
.appendField("TTN Mapper");
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_RIGHT) .setAlign(Blockly.ALIGN_RIGHT)
.appendField("Fix Type Limit") .appendField("Fix Type Limit")
.appendField(new Blockly.FieldDropdown([["0", "0"], ["1", "1"], ["2", "2"], ["3", "3"]].reverse()), "dropdown"); .appendField(
new Blockly.FieldDropdown(
[
["0", "0"],
["1", "1"],
["2", "2"],
["3", "3"],
].reverse()
),
"dropdown"
);
// reverse() because i want 3 be be at first and i'm to lazy to write the array again // reverse() because i want 3 be be at first and i'm to lazy to write the array again
this.appendValueInput('Latitude') this.appendValueInput("Latitude")
.appendField(Blockly.Msg.senseBox_gps_lat) .appendField(Blockly.Msg.senseBox_gps_lat)
.setCheck(null); .setCheck(null);
this.appendValueInput('Longitude') this.appendValueInput("Longitude")
.appendField(Blockly.Msg.senseBox_gps_lng) .appendField(Blockly.Msg.senseBox_gps_lng)
.setCheck(null); .setCheck(null);
this.appendValueInput('Altitude') this.appendValueInput("Altitude")
.appendField(Blockly.Msg.senseBox_gps_alt) .appendField(Blockly.Msg.senseBox_gps_alt)
.setCheck(null); .setCheck(null);
this.appendValueInput('pDOP') this.appendValueInput("pDOP").appendField("pDOP").setCheck(null);
.appendField('pDOP') this.appendValueInput("Fix Type").appendField("Fix Type").setCheck(null);
.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_display_printDisplay_tip); this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tip);
},
}
}; };
Blockly.Blocks['sensebox_lora_cayenne_send'] = { Blockly.Blocks["sensebox_lora_cayenne_send"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_tip); this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_tip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendStatementInput('DO') this.appendStatementInput("DO")
.appendField(Blockly.Msg.senseBox_LoRa_send_cayenne) .appendField(Blockly.Msg.senseBox_LoRa_send_cayenne)
.setCheck(null); .setCheck(null);
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
} },
}; };
Blockly.Blocks['sensebox_lora_cayenne_temperature'] = { Blockly.Blocks["sensebox_lora_cayenne_temperature"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_temperature_tip); this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_temperature_tip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendValueInput('Value') this.appendValueInput("Value").appendField(
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_temperature) Blockly.Msg.senseBox_LoRa_cayenne_temperature
);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel) .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@ -176,15 +189,16 @@ Blockly.Blocks['sensebox_lora_cayenne_temperature'] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
}, },
LOOP_TYPES: ['sensebox_lora_cayenne_send'], LOOP_TYPES: ["sensebox_lora_cayenne_send"],
}; };
Blockly.Blocks['sensebox_lora_cayenne_humidity'] = { Blockly.Blocks["sensebox_lora_cayenne_humidity"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_humidity_tip); this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_humidity_tip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendValueInput('Value') this.appendValueInput("Value").appendField(
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_humidity) Blockly.Msg.senseBox_LoRa_cayenne_humidity
);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel) .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@ -192,15 +206,16 @@ Blockly.Blocks['sensebox_lora_cayenne_humidity'] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
}, },
LOOP_TYPES: ['sensebox_lora_cayenne_send'], LOOP_TYPES: ["sensebox_lora_cayenne_send"],
}; };
Blockly.Blocks['sensebox_lora_cayenne_pressure'] = { Blockly.Blocks["sensebox_lora_cayenne_pressure"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_pressure_tip); this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_pressure_tip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendValueInput('Value') this.appendValueInput("Value").appendField(
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_pressure) Blockly.Msg.senseBox_LoRa_cayenne_pressure
);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel) .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@ -208,15 +223,16 @@ Blockly.Blocks['sensebox_lora_cayenne_pressure'] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
}, },
LOOP_TYPES: ['sensebox_lora_cayenne_send'], LOOP_TYPES: ["sensebox_lora_cayenne_send"],
}; };
Blockly.Blocks['sensebox_lora_cayenne_luminosity'] = { Blockly.Blocks["sensebox_lora_cayenne_luminosity"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_luminosity_tip); this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_luminosity_tip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendValueInput('Value') this.appendValueInput("Value").appendField(
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_luminosity) Blockly.Msg.senseBox_LoRa_cayenne_luminosity
);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel) .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@ -224,15 +240,16 @@ Blockly.Blocks['sensebox_lora_cayenne_luminosity'] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
}, },
LOOP_TYPES: ['sensebox_lora_cayenne_send'], LOOP_TYPES: ["sensebox_lora_cayenne_send"],
}; };
Blockly.Blocks['sensebox_lora_cayenne_sensor'] = { Blockly.Blocks["sensebox_lora_cayenne_sensor"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_analog_tip); this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_analog_tip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendValueInput('Value') this.appendValueInput("Value").appendField(
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_analog) Blockly.Msg.senseBox_LoRa_cayenne_analog
);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel) .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@ -240,19 +257,16 @@ Blockly.Blocks['sensebox_lora_cayenne_sensor'] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
}, },
LOOP_TYPES: ['sensebox_lora_cayenne_send'], LOOP_TYPES: ["sensebox_lora_cayenne_send"],
}; };
Blockly.Blocks['sensebox_lora_cayenne_accelerometer'] = { Blockly.Blocks["sensebox_lora_cayenne_accelerometer"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_gyros_tip); this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_gyros_tip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendValueInput('X') this.appendValueInput("X").appendField(Blockly.Msg.senseBox_LoRa_cayenne_x);
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_x) this.appendValueInput("Y").appendField(Blockly.Msg.senseBox_LoRa_cayenne_y);
this.appendValueInput('Y') this.appendValueInput("Z").appendField(Blockly.Msg.senseBox_LoRa_cayenne_z);
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_y)
this.appendValueInput('Z')
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_z)
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel) .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@ -260,19 +274,22 @@ Blockly.Blocks['sensebox_lora_cayenne_accelerometer'] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
}, },
LOOP_TYPES: ['sensebox_lora_cayenne_send'], LOOP_TYPES: ["sensebox_lora_cayenne_send"],
}; };
Blockly.Blocks['sensebox_lora_cayenne_gps'] = { Blockly.Blocks["sensebox_lora_cayenne_gps"] = {
init: function () { init: function () {
this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_gps_tip); this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_gps_tip);
this.setHelpUrl(''); this.setHelpUrl("");
this.setColour(getColour().sensebox); this.setColour(getColour().sensebox);
this.appendValueInput('LAT') this.appendValueInput("LAT").appendField(
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_lat) Blockly.Msg.senseBox_LoRa_cayenne_lat
this.appendValueInput('LNG') );
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_lng) this.appendValueInput("LNG").appendField(
this.appendValueInput('ALT') Blockly.Msg.senseBox_LoRa_cayenne_lng
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_alt) );
this.appendValueInput("ALT").appendField(
Blockly.Msg.senseBox_LoRa_cayenne_alt
);
this.appendDummyInput() this.appendDummyInput()
.setAlign(Blockly.ALIGN_LEFT) .setAlign(Blockly.ALIGN_LEFT)
.appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel) .appendField(Blockly.Msg.senseBox_LoRa_cayenne_channel)
@ -280,5 +297,5 @@ Blockly.Blocks['sensebox_lora_cayenne_gps'] = {
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
this.setNextStatement(true, null); this.setNextStatement(true, null);
}, },
LOOP_TYPES: ['sensebox_lora_cayenne_send'], LOOP_TYPES: ["sensebox_lora_cayenne_send"],
}; };

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

@ -1,27 +1,27 @@
import * as Blockly from 'blockly/core'; import * as Blockly from "blockly/core";
Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) { Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
var deivceID = this.getFieldValue('DEVICEID'); var deivceID = this.getFieldValue("DEVICEID");
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_senseBoxMCU'] = '#include "SenseBoxMCU.h"'; Blockly.Arduino.libraries_["library_senseBoxMCU"] =
Blockly.Arduino.libraries_['library_spi'] = '#include <SPI.h>'; '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_['library_lmic'] = '#include <lmic.h>'; Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>";
Blockly.Arduino.libraries_['library_hal'] = '#include <hal/hal.h>'; Blockly.Arduino.libraries_["library_lmic"] = "#include <lmic.h>";
Blockly.Arduino.definitions_['define_LoRaVariablesOTAA'] = ` Blockly.Arduino.libraries_["library_hal"] = "#include <hal/hal.h>";
static const u1_t PROGMEM APPEUI[8]= `+ appID + ` ; Blockly.Arduino.definitions_["define_LoRaVariablesOTAA"] = `
static const u1_t PROGMEM APPEUI[8]= {${appID}};
void os_getArtEui (u1_t* buf) { memcpy_P(buf, APPEUI , 8);} void os_getArtEui (u1_t* buf) { memcpy_P(buf, APPEUI , 8);}
static const u1_t PROGMEM DEVEUI[8]= `+ deivceID + `; static const u1_t PROGMEM DEVEUI[8]= {${deivceID}};
void os_getDevEui (u1_t* buf) { memcpy_P(buf, DEVEUI , 8);} void os_getDevEui (u1_t* buf) { memcpy_P(buf, DEVEUI , 8);}
// This key should be in big endian format (or, since it is not really a // This key should be in big endian format (or, since it is not really a
// number but a block of memory, endianness does not really apply). In // number but a block of memory, endianness does not really apply). In
// practice, a key taken from ttnctl can be copied as-is. // practice, a key taken from ttnctl can be copied as-is.
// The key shown here is the semtech default key. // The key shown here is the semtech default key.
static const u1_t PROGMEM APPKEY[16] = `+ appKey + `; static const u1_t PROGMEM APPKEY[16] = {${appKey}};
void os_getDevKey (u1_t* buf) { memcpy_P(buf, APPKEY , 16);} void os_getDevKey (u1_t* buf) { memcpy_P(buf, APPKEY , 16);}
static osjob_t sendjob; static osjob_t sendjob;
@ -38,7 +38,7 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
.dio = {PIN_XB1_INT, PIN_XB1_INT, LMIC_UNUSED_PIN}, .dio = {PIN_XB1_INT, PIN_XB1_INT, LMIC_UNUSED_PIN},
};`; };`;
Blockly.Arduino.codeFunctions_['functions_initLora'] = ` Blockly.Arduino.codeFunctions_["functions_initLora"] = `
void initLora() { void initLora() {
delay(2000); delay(2000);
// LMIC init // LMIC init
@ -48,9 +48,9 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
// Start job (sending automatically starts OTAA too) // Start job (sending automatically starts OTAA too)
do_send(&sendjob); do_send(&sendjob);
}` }`;
Blockly.Arduino.codeFunctions_['functions_onEvent'] = ` Blockly.Arduino.codeFunctions_["functions_onEvent"] = `
void onEvent (ev_t ev) { void onEvent (ev_t ev) {
Serial.print(os_getTime()); Serial.print(os_getTime());
Serial.print(": "); Serial.print(": ");
@ -120,16 +120,18 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
break; break;
} }
}`; }`;
Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n'; Blockly.Arduino.loraSetupCode_["initLora"] = "initLora();\n";
Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\ndelay(1000);\n'; Blockly.Arduino.setupCode_["serial.begin"] =
var code = ''; "Serial.begin(9600);\ndelay(1000);\n";
var code = "";
return code; return code;
}; };
Blockly.Arduino.sensebox_lora_message_send = function (block) { Blockly.Arduino.sensebox_lora_message_send = function (block) {
Blockly.Arduino.libraries_['library_lora_message'] = '#include <LoraMessage.h>'; Blockly.Arduino.libraries_["library_lora_message"] =
var lora_sensor_values = Blockly.Arduino.statementToCode(block, 'DO'); "#include <LoraMessage.h>";
Blockly.Arduino.functionNames_['functions_do_send'] = ` var lora_sensor_values = Blockly.Arduino.statementToCode(block, "DO");
Blockly.Arduino.functionNames_["functions_do_send"] = `
void do_send(osjob_t* j){ void do_send(osjob_t* j){
// Check if there is not a current TX/RX job running // Check if there is not a current TX/RX job running
if (LMIC.opmode & OP_TXRXPEND) { if (LMIC.opmode & OP_TXRXPEND) {
@ -144,39 +146,41 @@ Blockly.Arduino.sensebox_lora_message_send = function (block) {
} }
// Next TX is scheduled after TX_COMPLETE event. // Next TX is scheduled after TX_COMPLETE event.
}`; }`;
Blockly.Arduino.loopCodeOnce_['os_runloop'] = 'os_runloop_once();' Blockly.Arduino.loopCodeOnce_["os_runloop"] = "os_runloop_once();";
return '' return "";
} };
/** /**
* Block send Data to TTN * Block send Data to TTN
*/ */
Blockly.Arduino.sensebox_send_lora_sensor_value = function (block) { Blockly.Arduino.sensebox_send_lora_sensor_value = function (block) {
const reading = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"'; const reading =
var messageBytes = this.getFieldValue('MESSAGE_BYTES'); Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
var code = '' '"Keine Eingabe"';
var messageBytes = this.getFieldValue("MESSAGE_BYTES");
var code = "";
switch (Number(messageBytes)) { switch (Number(messageBytes)) {
case 1: case 1:
code = `message.addUint8(${reading});\n` code = `message.addUint8(${reading});\n`;
break; break;
case 2: case 2:
code = `message.addUint16(${reading});\n` code = `message.addUint16(${reading});\n`;
break; break;
case 3: case 3:
code = `message.addUint8(${reading}); code = `message.addUint8(${reading});
message.addUint16(${reading} >> 8);\n` message.addUint16(${reading} >> 8);\n`;
break; break;
default: default:
code = `message.addUint16(${reading});\n` code = `message.addUint16(${reading});\n`;
} }
return code; return code;
}; };
Blockly.Arduino.sensebox_lora_cayenne_send = function (block) { Blockly.Arduino.sensebox_lora_cayenne_send = function (block) {
Blockly.Arduino.libraries_['library_cayene'] = '#include <CayenneLPP.h>'; Blockly.Arduino.libraries_["library_cayene"] = "#include <CayenneLPP.h>";
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"] = `
void do_send(osjob_t* j){ void do_send(osjob_t* j){
// Check if there is not a current TX/RX job running // Check if there is not a current TX/RX job running
if (LMIC.opmode & OP_TXRXPEND) { if (LMIC.opmode & OP_TXRXPEND) {
@ -191,18 +195,38 @@ Blockly.Arduino.sensebox_lora_cayenne_send = function (block) {
} }
// Next TX is scheduled after TX_COMPLETE event. // Next TX is scheduled after TX_COMPLETE event.
}`; }`;
Blockly.Arduino.loopCodeOnce_['os_runloop'] = 'os_runloop_once();' Blockly.Arduino.loopCodeOnce_["os_runloop"] = "os_runloop_once();";
return ''; return "";
} };
Blockly.Arduino.sensebox_lora_ttn_mapper = function (block) { Blockly.Arduino.sensebox_lora_ttn_mapper = function (block) {
var latitude = Blockly.Arduino.valueToCode(this, 'Latitude', Blockly.Arduino.ORDER_ATOMIC) var latitude = Blockly.Arduino.valueToCode(
var longitude = Blockly.Arduino.valueToCode(this, 'Longitude', Blockly.Arduino.ORDER_ATOMIC) this,
var altitude = Blockly.Arduino.valueToCode(this, 'Altitude', Blockly.Arduino.ORDER_ATOMIC) "Latitude",
var pDOP = Blockly.Arduino.valueToCode(this, 'pDOP', Blockly.Arduino.ORDER_ATOMIC) Blockly.Arduino.ORDER_ATOMIC
var fixType = Blockly.Arduino.valueToCode(this, 'Fix Type', Blockly.Arduino.ORDER_ATOMIC) );
var fixTypeLimit = this.getFieldValue('dropdown'); var longitude = Blockly.Arduino.valueToCode(
Blockly.Arduino.functionNames_['functions_do_send'] = ` this,
"Longitude",
Blockly.Arduino.ORDER_ATOMIC
);
var altitude = Blockly.Arduino.valueToCode(
this,
"Altitude",
Blockly.Arduino.ORDER_ATOMIC
);
var pDOP = Blockly.Arduino.valueToCode(
this,
"pDOP",
Blockly.Arduino.ORDER_ATOMIC
);
var fixType = Blockly.Arduino.valueToCode(
this,
"Fix Type",
Blockly.Arduino.ORDER_ATOMIC
);
var fixTypeLimit = this.getFieldValue("dropdown");
Blockly.Arduino.functionNames_["functions_do_send"] = `
void do_send(osjob_t* j){ void do_send(osjob_t* j){
// Check if there is not a current TX/RX job running // Check if there is not a current TX/RX job running
if (LMIC.opmode & OP_TXRXPEND) { if (LMIC.opmode & OP_TXRXPEND) {
@ -245,29 +269,30 @@ Blockly.Arduino.sensebox_lora_ttn_mapper = function (block) {
} }
// Next TX is scheduled after TX_COMPLETE event. // Next TX is scheduled after TX_COMPLETE event.
}`; }`;
Blockly.Arduino.loopCodeOnce_['os_runloop'] = 'os_runloop_once();' Blockly.Arduino.loopCodeOnce_["os_runloop"] = "os_runloop_once();";
return ''; return "";
} };
Blockly.Arduino.sensebox_lora_initialize_abp = function (block) { Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
var nwskey = this.getFieldValue('NWSKEY'); var nwskey = this.getFieldValue("NWSKEY");
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_senseBoxMCU'] = '#include "SenseBoxMCU.h"'; Blockly.Arduino.libraries_["library_senseBoxMCU"] =
Blockly.Arduino.libraries_['library_spi'] = '#include <SPI.h>'; '#include "SenseBoxMCU.h"';
Blockly.Arduino.libraries_['library_lmic'] = '#include <lmic.h>'; Blockly.Arduino.libraries_["library_spi"] = "#include <SPI.h>";
Blockly.Arduino.libraries_['library_hal'] = '#include <hal/hal.h>'; Blockly.Arduino.libraries_["library_lmic"] = "#include <lmic.h>";
Blockly.Arduino.definitions_['define_LoRaVariablesABP'] = ` Blockly.Arduino.libraries_["library_hal"] = "#include <hal/hal.h>";
Blockly.Arduino.definitions_["define_LoRaVariablesABP"] = `
// LoRaWAN NwkSKey, network session key // LoRaWAN NwkSKey, network session key
// This is the default Semtech key, which is used by the early prototype TTN // This is the default Semtech key, which is used by the early prototype TTN
// network. // network.
static const PROGMEM u1_t NWKSKEY[16] = ${nwskey}; static const PROGMEM u1_t NWKSKEY[16] = { ${nwskey} };
// LoRaWAN AppSKey, application session key // LoRaWAN AppSKey, application session key
// This is the default Semtech key, which is used by the early prototype TTN // This is the default Semtech key, which is used by the early prototype TTN
// network. // network.
static const u1_t PROGMEM APPSKEY[16] = ${appskey}; static const u1_t PROGMEM APPSKEY[16] = { ${appskey} };
// LoRaWAN end-device address (DevAddr) // LoRaWAN end-device address (DevAddr)
static const u4_t DEVADDR = 0x${devaddr}; static const u4_t DEVADDR = 0x${devaddr};
@ -293,7 +318,7 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
.dio = {PIN_XB1_INT, PIN_XB1_INT, LMIC_UNUSED_PIN}, .dio = {PIN_XB1_INT, PIN_XB1_INT, LMIC_UNUSED_PIN},
};`; };`;
Blockly.Arduino.codeFunctions_['functions_initLora'] = ` Blockly.Arduino.codeFunctions_["functions_initLora"] = `
void initLora() { void initLora() {
delay(2000); delay(2000);
// LMIC init // LMIC init
@ -359,9 +384,9 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
// Start job // Start job
do_send(&sendjob); do_send(&sendjob);
}` }`;
Blockly.Arduino.codeFunctions_['functions_onEvent'] = ` Blockly.Arduino.codeFunctions_["functions_onEvent"] = `
void onEvent (ev_t ev) { void onEvent (ev_t ev) {
Serial.print(os_getTime()); Serial.print(os_getTime());
Serial.print(": "); Serial.print(": ");
@ -426,60 +451,77 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
break; break;
} }
}`; }`;
Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n'; Blockly.Arduino.loraSetupCode_["initLora"] = "initLora();\n";
Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\ndelay(1000);\n'; Blockly.Arduino.setupCode_["serial.begin"] =
return ''; "Serial.begin(9600);\ndelay(1000);\n";
} return "";
};
Blockly.Arduino.sensebox_lora_cayenne_temperature = function (block) { Blockly.Arduino.sensebox_lora_cayenne_temperature = function (block) {
var temperature = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 var temperature =
var channel = this.getFieldValue('CHANNEL'); Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
0;
var channel = this.getFieldValue("CHANNEL");
var code = `lpp.addTemperature(${channel}, ${temperature});\n`; var code = `lpp.addTemperature(${channel}, ${temperature});\n`;
return code; return code;
} };
Blockly.Arduino.sensebox_lora_cayenne_humidity = function (block) { Blockly.Arduino.sensebox_lora_cayenne_humidity = function (block) {
var humidity = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 var humidity =
var channel = this.getFieldValue('CHANNEL'); Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
0;
var channel = this.getFieldValue("CHANNEL");
var code = `lpp.addRelativeHumidity(${channel}, ${humidity});\n`; var code = `lpp.addRelativeHumidity(${channel}, ${humidity});\n`;
return code; return code;
} };
Blockly.Arduino.sensebox_lora_cayenne_pressure = function (block) { Blockly.Arduino.sensebox_lora_cayenne_pressure = function (block) {
var pressure = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 var pressure =
var channel = this.getFieldValue('CHANNEL'); Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
0;
var channel = this.getFieldValue("CHANNEL");
var code = `lpp.addBarometricPressure(${channel}, ${pressure});\n`; var code = `lpp.addBarometricPressure(${channel}, ${pressure});\n`;
return code; return code;
} };
Blockly.Arduino.sensebox_lora_cayenne_luminosity = function (block) { Blockly.Arduino.sensebox_lora_cayenne_luminosity = function (block) {
var luminosity = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 var luminosity =
var channel = this.getFieldValue('CHANNEL'); Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
0;
var channel = this.getFieldValue("CHANNEL");
var code = `lpp.addLuminosity(${channel}, ${luminosity});\n`; var code = `lpp.addLuminosity(${channel}, ${luminosity});\n`;
return code; return code;
} };
Blockly.Arduino.sensebox_lora_cayenne_sensor = function (block) { Blockly.Arduino.sensebox_lora_cayenne_sensor = function (block) {
var sensorValue = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 var sensorValue =
var channel = this.getFieldValue('CHANNEL'); Blockly.Arduino.valueToCode(this, "Value", Blockly.Arduino.ORDER_ATOMIC) ||
0;
var channel = this.getFieldValue("CHANNEL");
var code = `lpp.addAnalogInput(${channel}, ${sensorValue});\n`; var code = `lpp.addAnalogInput(${channel}, ${sensorValue});\n`;
return code; return code;
} };
Blockly.Arduino.sensebox_lora_cayenne_accelerometer = function (block) { Blockly.Arduino.sensebox_lora_cayenne_accelerometer = function (block) {
var x = Blockly.Arduino.valueToCode(this, 'X', Blockly.Arduino.ORDER_ATOMIC) || 0 var x =
var y = Blockly.Arduino.valueToCode(this, 'Y', Blockly.Arduino.ORDER_ATOMIC) || 0 Blockly.Arduino.valueToCode(this, "X", Blockly.Arduino.ORDER_ATOMIC) || 0;
var z = Blockly.Arduino.valueToCode(this, 'Z', Blockly.Arduino.ORDER_ATOMIC) || 0 var y =
var channel = this.getFieldValue('CHANNEL'); Blockly.Arduino.valueToCode(this, "Y", Blockly.Arduino.ORDER_ATOMIC) || 0;
var z =
Blockly.Arduino.valueToCode(this, "Z", Blockly.Arduino.ORDER_ATOMIC) || 0;
var channel = this.getFieldValue("CHANNEL");
var code = `lpp.addAccelerometer(${channel}, ${x}, ${y}, ${z});\n`; var code = `lpp.addAccelerometer(${channel}, ${x}, ${y}, ${z});\n`;
return code; return code;
} };
Blockly.Arduino.sensebox_lora_cayenne_gps = function (block) { Blockly.Arduino.sensebox_lora_cayenne_gps = function (block) {
var lat = Blockly.Arduino.valueToCode(this, 'LAT', Blockly.Arduino.ORDER_ATOMIC) || 0 var lat =
var lng = Blockly.Arduino.valueToCode(this, 'LNG', Blockly.Arduino.ORDER_ATOMIC) || 0 Blockly.Arduino.valueToCode(this, "LAT", Blockly.Arduino.ORDER_ATOMIC) || 0;
var alt = Blockly.Arduino.valueToCode(this, 'ALT', Blockly.Arduino.ORDER_ATOMIC) || 0 var lng =
var channel = this.getFieldValue('CHANNEL'); Blockly.Arduino.valueToCode(this, "LNG", Blockly.Arduino.ORDER_ATOMIC) || 0;
var code = `lpp.addGPS(${channel}, ${lat}, ${lng}, ${alt});\n` var alt =
Blockly.Arduino.valueToCode(this, "ALT", Blockly.Arduino.ORDER_ATOMIC) || 0;
var channel = this.getFieldValue("CHANNEL");
var code = `lpp.addGPS(${channel}, ${lat}, ${lng}, ${alt});\n`;
return code; return code;
} };