diff --git a/src/components/Blockly/blocks/index.js b/src/components/Blockly/blocks/index.js index 8913b3b..b35391f 100644 --- a/src/components/Blockly/blocks/index.js +++ b/src/components/Blockly/blocks/index.js @@ -6,6 +6,7 @@ import './sensebox-telegram'; import './sensebox-osem'; import './sensebox-web'; import './sensebox-display'; +import './sensebox-lora'; import './io'; import './math'; import './map'; diff --git a/src/components/Blockly/blocks/sensebox-lora.js b/src/components/Blockly/blocks/sensebox-lora.js new file mode 100644 index 0000000..170cc45 --- /dev/null +++ b/src/components/Blockly/blocks/sensebox-lora.js @@ -0,0 +1,253 @@ +import * as Blockly from 'blockly/core'; +import { getColour } from '../helpers/colour'; + + +/* +----------------------------------LoRa-------------------------------------------------- +*/ + +Blockly.Blocks['sensebox_lora_initialize_otaa'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_init_otaa_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendDummyInput() + .appendField("Initialize LoRa (OTAA)"); + + this.appendDummyInput() + .setAlign(Blockly.ALIGN_LEFT) + .appendField(Blockly.Msg.senseBox_LoRa_device_id) + .appendField(new Blockly.FieldTextInput("DEVICE ID"), "DEVICEID"); + this.appendDummyInput() + .setAlign(Blockly.ALIGN_LEFT) + .appendField(Blockly.Msg.senseBox_LoRa_app_id) + .appendField(new Blockly.FieldTextInput("APP ID"), "APPID"); + this.appendDummyInput() + .setAlign(Blockly.ALIGN_LEFT) + .appendField(Blockly.Msg.senseBox_LoRa_app_key) + .appendField(new Blockly.FieldTextInput("APP KEY"), "APPKEY"); + this.appendDummyInput() + .setAlign(Blockly.ALIGN_LEFT) + .appendField(Blockly.Msg.senseBox_LoRa_interval) + .appendField(new Blockly.FieldTextInput("5"), "INTERVAL"); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + }, +}; + +Blockly.Blocks['sensebox_lora_initialize_abp'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_init_abp_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendDummyInput() + .appendField("Initialize LoRa (ABP)"); + this.appendDummyInput() + .setAlign(Blockly.ALIGN_LEFT) + .appendField(Blockly.Msg.senseBox_LoRa_nwskey_id) + .appendField(new Blockly.FieldTextInput("NWSKEY"), "NWSKEY"); + this.appendDummyInput() + .setAlign(Blockly.ALIGN_LEFT) + .appendField(Blockly.Msg.senseBox_LoRa_appskey_id) + .appendField(new Blockly.FieldTextInput("APPSKEY"), "APPSKEY"); + this.appendDummyInput() + .setAlign(Blockly.ALIGN_LEFT) + .appendField(Blockly.Msg.senseBox_LoRa_devaddr_id) + .appendField(new Blockly.FieldTextInput("DEVADDR"), "DEVADDR"); + this.appendDummyInput() + .setAlign(Blockly.ALIGN_LEFT) + .appendField(Blockly.Msg.senseBox_LoRa_interval) + .appendField(new Blockly.FieldTextInput("5"), "INTERVAL"); + // this.appendStatementInput('DO') + // .appendField(Blockly.Msg.senseBox_measurements) + // .setCheck(null); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + }, +}; + +Blockly.Blocks['sensebox_lora_message_send'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_message_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendStatementInput('DO') + .appendField(Blockly.Msg.senseBox_LoRa_send_message) + .setCheck(null); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + } +}; + +Blockly.Blocks['sensebox_send_lora_sensor_value'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_sensor_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendValueInput('Value') + .appendField(Blockly.Msg.senseBox_measurement) + this.appendDummyInput() + .setAlign(Blockly.ALIGN_LEFT) + .appendField("Bytes") + .appendField(new Blockly.FieldTextInput("2"), "MESSAGE_BYTES"); + 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_lora_message_send'], +}; + +Blockly.Blocks['sensebox_lora_cayenne_send'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendStatementInput('DO') + .appendField(Blockly.Msg.senseBox_LoRa_send_cayenne) + .setCheck(null); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + } +}; +Blockly.Blocks['sensebox_lora_cayenne_temperature'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_temperature_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendValueInput('Value') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_temperature) + 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'], +}; +Blockly.Blocks['sensebox_lora_cayenne_humidity'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_humidity_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendValueInput('Value') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_humidity) + 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'], +}; +Blockly.Blocks['sensebox_lora_cayenne_pressure'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_pressure_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendValueInput('Value') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_pressure) + 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'], +}; +Blockly.Blocks['sensebox_lora_cayenne_luminosity'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_luminosity_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendValueInput('Value') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_luminosity) + 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'], +}; +Blockly.Blocks['sensebox_lora_cayenne_sensor'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_analog_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendValueInput('Value') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_analog) + 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'], +}; +Blockly.Blocks['sensebox_lora_cayenne_accelerometer'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_gyros_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendValueInput('X') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_x) + this.appendValueInput('Y') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_y) + this.appendValueInput('Z') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_z) + 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'], +}; +Blockly.Blocks['sensebox_lora_cayenne_gps'] = { + init: function () { + this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_gps_tip); + this.setHelpUrl(''); + this.setColour(getColour().sensebox); + this.appendValueInput('LAT') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_lat) + this.appendValueInput('LNG') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_lng) + this.appendValueInput('ALT') + .appendField(Blockly.Msg.senseBox_LoRa_cayenne_alt) + 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'], +}; diff --git a/src/components/Blockly/generator/generator.js b/src/components/Blockly/generator/generator.js index 8b5808b..7ff0fd4 100644 --- a/src/components/Blockly/generator/generator.js +++ b/src/components/Blockly/generator/generator.js @@ -109,6 +109,9 @@ Blockly['Arduino'].init = function (workspace) { // creates a list of code for the loop to be runned once Blockly['Arduino'].loopCodeOnce_ = Object.create(null) + // creates a list of code for the loop to be runned once + Blockly['Arduino'].codeFunctions_ = Object.create(null) + // creates a list of code variables Blockly['Arduino'].variables_ = Object.create(null) @@ -192,7 +195,8 @@ Blockly['Arduino'].init = function (workspace) { */ Blockly['Arduino'].finish = function (code) { let libraryCode = ''; - let variablesCode = '' + let variablesCode = ''; + let codeFunctions = ''; let functionsCode = ''; let definitionsCode = ''; let loopCodeOnce = ''; @@ -216,6 +220,10 @@ Blockly['Arduino'].finish = function (code) { loopCodeOnce += Blockly['Arduino'].loopCodeOnce_[key] + '\n'; } + for (const key in Blockly['Arduino'].codeFunctions_) { + codeFunctions += Blockly['Arduino'].codeFunctions_[key] + '\n'; + } + for (const key in Blockly['Arduino'].functionNames_) { functionsCode += Blockly['Arduino'].functionNames_[key] + '\n'; } @@ -240,6 +248,8 @@ Blockly['Arduino'].finish = function (code) { '\n' + definitionsCode + '\n' + + codeFunctions + + '\n' + Blockly['Arduino'].variablesInitCode_ + '\n' + functionsCode + diff --git a/src/components/Blockly/generator/index.js b/src/components/Blockly/generator/index.js index 5725e36..b86e0df 100644 --- a/src/components/Blockly/generator/index.js +++ b/src/components/Blockly/generator/index.js @@ -5,6 +5,7 @@ import './sensebox-telegram'; import './sensebox-osem'; import './sensebox-web'; import './sensebox-display'; +import './sensebox-lora'; import './logic'; import './math'; import './map'; diff --git a/src/components/Blockly/generator/sensebox-lora.js b/src/components/Blockly/generator/sensebox-lora.js new file mode 100644 index 0000000..6892210 --- /dev/null +++ b/src/components/Blockly/generator/sensebox-lora.js @@ -0,0 +1,431 @@ +import * as Blockly from 'blockly/core'; + + +Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) { + var deivceID = this.getFieldValue('DEVICEID'); + var appID = this.getFieldValue('APPID'); + var appKey = this.getFieldValue('APPKEY'); + var interval = this.getFieldValue('INTERVAL'); + Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"'; + Blockly.Arduino.libraries_['library_spi'] = '#include '; + Blockly.Arduino.libraries_['library_lmic'] = '#include '; + Blockly.Arduino.libraries_['library_hal'] = '#include '; + Blockly.Arduino.definitions_['define_LoRaVariablesOTAA'] = ` + static const u1_t PROGMEM APPEUI[8]= `+ appID + ` ; + void os_getArtEui (u1_t* buf) { memcpy_P(buf, APPEUI , 8);} + + static const u1_t PROGMEM DEVEUI[8]= `+ deivceID + `; + 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 + // number but a block of memory, endianness does not really apply). In + // practice, a key taken from ttnctl can be copied as-is. + // The key shown here is the semtech default key. + static const u1_t PROGMEM APPKEY[16] = `+ appKey + `; + void os_getDevKey (u1_t* buf) { memcpy_P(buf, APPKEY , 16);} + + static osjob_t sendjob; + + // Schedule TX every this many seconds (might become longer due to duty + // cycle limitations). + const unsigned TX_INTERVAL = ${interval * 60}; + + // Pin mapping + const lmic_pinmap lmic_pins = { + .nss = PIN_XB1_CS, + .rxtx = LMIC_UNUSED_PIN, + .rst = LMIC_UNUSED_PIN, + .dio = {PIN_XB1_INT, PIN_XB1_INT, LMIC_UNUSED_PIN}, + };`; + + Blockly.Arduino.codeFunctions_['functions_initLora'] = ` + void initLora() { + delay(2000); + // LMIC init + os_init(); + // Reset the MAC state. Session and pending data transfers will be discarded. + LMIC_reset(); + + // Start job (sending automatically starts OTAA too) + do_send(&sendjob); + }` + + Blockly.Arduino.codeFunctions_['functions_onEvent'] = ` + void onEvent (ev_t ev) { + Serial.print(os_getTime()); + Serial.print(": "); + switch(ev) { + case EV_SCAN_TIMEOUT: + Serial.println(F("EV_SCAN_TIMEOUT")); + break; + case EV_BEACON_FOUND: + Serial.println(F("EV_BEACON_FOUND")); + break; + case EV_BEACON_MISSED: + Serial.println(F("EV_BEACON_MISSED")); + break; + case EV_BEACON_TRACKED: + Serial.println(F("EV_BEACON_TRACKED")); + break; + case EV_JOINING: + Serial.println(F("EV_JOINING")); + break; + case EV_JOINED: + Serial.println(F("EV_JOINED")); + + // Disable link check validation (automatically enabled + // during join, but not supported by TTN at this time). + LMIC_setLinkCheckMode(0); + break; + case EV_RFU1: + Serial.println(F("EV_RFU1")); + break; + case EV_JOIN_FAILED: + Serial.println(F("EV_JOIN_FAILED")); + break; + case EV_REJOIN_FAILED: + Serial.println(F("EV_REJOIN_FAILED")); + break; + break; + case EV_TXCOMPLETE: + Serial.println(F("EV_TXCOMPLETE (includes waiting for RX windows)")); + if (LMIC.txrxFlags & TXRX_ACK) + Serial.println(F("Received ack")); + if (LMIC.dataLen) { + Serial.println(F("Received ")); + Serial.println(LMIC.dataLen); + Serial.println(F(" bytes of payload")); + } + // Schedule next transmission + os_setTimedCallback(&sendjob, os_getTime()+sec2osticks(TX_INTERVAL), do_send); + break; + case EV_LOST_TSYNC: + Serial.println(F("EV_LOST_TSYNC")); + break; + case EV_RESET: + Serial.println(F("EV_RESET")); + break; + case EV_RXCOMPLETE: + // data received in ping slot + Serial.println(F("EV_RXCOMPLETE")); + break; + case EV_LINK_DEAD: + Serial.println(F("EV_LINK_DEAD")); + break; + case EV_LINK_ALIVE: + Serial.println(F("EV_LINK_ALIVE")); + break; + default: + Serial.println(F("Unknown event")); + break; + } + }`; + Blockly.Arduino.setupCode_['initLora'] = 'initLora();'; + Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);'; + var code = '' + return code; +}; + +Blockly.Arduino.sensebox_lora_message_send = function (block) { + Blockly.Arduino.libraries_['library_lora_message'] = '#include '; + var lora_sensor_values = Blockly.Arduino.statementToCode(block, 'DO'); + Blockly.Arduino.functionNames_['functions_do_send'] = ` + void do_send(osjob_t* j){ + // Check if there is not a current TX/RX job running + if (LMIC.opmode & OP_TXRXPEND) { + Serial.println(F("OP_TXRXPEND, not sending")); + } else { + LoraMessage message; + ${lora_sensor_values} + + // Prepare upstream data transmission at the next possible time. + LMIC_setTxData2(1, message.getBytes(), message.getLength(), 0); + Serial.println(F("Packet queued")); + } + // Next TX is scheduled after TX_COMPLETE event. + }`; + Blockly.Arduino.loopCodeOnce_['os_runloop'] = 'os_runloop_once();' + return '' +} + +/** + * Block send Data to TTN + */ +Blockly.Arduino.sensebox_send_lora_sensor_value = function (block) { + const reading = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || '"Keine Eingabe"'; + var messageBytes = this.getFieldValue('MESSAGE_BYTES'); + var code = '' + switch (Number(messageBytes)) { + case 1: + code = `message.addUint8(${reading});\n` + break; + case 2: + code = `message.addUint16(${reading});\n` + break; + case 3: + code = `message.addUint8(${reading}); + message.addUint16(${reading} >> 8);\n` + break; + default: + code = `message.addUint16(${reading});\n` + } + return code; +}; + +Blockly.Arduino.sensebox_lora_cayenne_send = function (block) { + Blockly.Arduino.libraries_['library_cayene'] = '#include '; + Blockly.Arduino.variables_['variable_cayenne'] = 'CayenneLPP lpp(51);' + var lora_sensor_values = Blockly.Arduino.statementToCode(block, 'DO'); + Blockly.Arduino.functionNames_['functions_do_send'] = ` + void do_send(osjob_t* j){ + // Check if there is not a current TX/RX job running + if (LMIC.opmode & OP_TXRXPEND) { + Serial.println(F("OP_TXRXPEND, not sending")); + } else { + lpp.reset(); + ${lora_sensor_values} + + // Prepare upstream data transmission at the next possible time. + LMIC_setTxData2(1, lpp.getBuffer(), lpp.getSize(), 0); + Serial.println(F("Packet queued")); + } + // Next TX is scheduled after TX_COMPLETE event. + }`; + Blockly.Arduino.loopCodeOnce_['os_runloop'] = 'os_runloop_once();' + return ''; +} + +Blockly.Arduino.sensebox_lora_initialize_abp = function (block) { + var nwskey = this.getFieldValue('NWSKEY'); + var appskey = this.getFieldValue('APPSKEY'); + var devaddr = this.getFieldValue('DEVADDR'); + var interval = this.getFieldValue('INTERVAL'); + Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"'; + Blockly.Arduino.libraries_['library_spi'] = '#include '; + Blockly.Arduino.libraries_['library_lmic'] = '#include '; + Blockly.Arduino.libraries_['library_hal'] = '#include '; + Blockly.Arduino.definitions_['define_LoRaVariablesABP'] = ` + // LoRaWAN NwkSKey, network session key + // This is the default Semtech key, which is used by the early prototype TTN + // network. + static const PROGMEM u1_t NWKSKEY[16] = ${nwskey}; + + // LoRaWAN AppSKey, application session key + // This is the default Semtech key, which is used by the early prototype TTN + // network. + static const u1_t PROGMEM APPSKEY[16] = ${appskey}; + + // LoRaWAN end-device address (DevAddr) + static const u4_t DEVADDR = 0x${devaddr}; + + // These callbacks are only used in over-the-air activation, so they are + // left empty here (we cannot leave them out completely unless + // DISABLE_JOIN is set in config.h, otherwise the linker will complain). + void os_getArtEui (u1_t* buf) { } + void os_getDevEui (u1_t* buf) { } + void os_getDevKey (u1_t* buf) { } + + static osjob_t sendjob; + + // Schedule TX every this many seconds (might become longer due to duty + // cycle limitations). + const unsigned TX_INTERVAL = ${interval * 60}; + + // Pin mapping + const lmic_pinmap lmic_pins = { + .nss = PIN_XB1_CS, + .rxtx = LMIC_UNUSED_PIN, + .rst = LMIC_UNUSED_PIN, + .dio = {PIN_XB1_INT, PIN_XB1_INT, LMIC_UNUSED_PIN}, + };`; + + Blockly.Arduino.codeFunctions_['functions_initLora'] = ` + void initLora() { + delay(2000); + // LMIC init + os_init(); + // Reset the MAC state. Session and pending data transfers will be discarded. + LMIC_reset(); + + // Set static session parameters. Instead of dynamically establishing a session + // by joining the network, precomputed session parameters are be provided. + #ifdef PROGMEM + // On AVR, these values are stored in flash and only copied to RAM + // once. Copy them to a temporary buffer here, LMIC_setSession will + // copy them into a buffer of its own again. + uint8_t appskey[sizeof(APPSKEY)]; + uint8_t nwkskey[sizeof(NWKSKEY)]; + memcpy_P(appskey, APPSKEY, sizeof(APPSKEY)); + memcpy_P(nwkskey, NWKSKEY, sizeof(NWKSKEY)); + LMIC_setSession (0x1, DEVADDR, nwkskey, appskey); + #else + // If not running an AVR with PROGMEM, just use the arrays directly + LMIC_setSession (0x1, DEVADDR, NWKSKEY, APPSKEY); + #endif + + #if defined(CFG_eu868) + // Set up the channels used by the Things Network, which corresponds + // to the defaults of most gateways. Without this, only three base + // channels from the LoRaWAN specification are used, which certainly + // works, so it is good for debugging, but can overload those + // frequencies, so be sure to configure the full frequency range of + // your network here (unless your network autoconfigures them). + // Setting up channels should happen after LMIC_setSession, as that + // configures the minimal channel set. + // NA-US channels 0-71 are configured automatically + LMIC_setupChannel(0, 868100000, DR_RANGE_MAP(DR_SF12, DR_SF7), BAND_CENTI); // g-band + LMIC_setupChannel(1, 868300000, DR_RANGE_MAP(DR_SF12, DR_SF7B), BAND_CENTI); // g-band + LMIC_setupChannel(2, 868500000, DR_RANGE_MAP(DR_SF12, DR_SF7), BAND_CENTI); // g-band + LMIC_setupChannel(3, 867100000, DR_RANGE_MAP(DR_SF12, DR_SF7), BAND_CENTI); // g-band + LMIC_setupChannel(4, 867300000, DR_RANGE_MAP(DR_SF12, DR_SF7), BAND_CENTI); // g-band + LMIC_setupChannel(5, 867500000, DR_RANGE_MAP(DR_SF12, DR_SF7), BAND_CENTI); // g-band + LMIC_setupChannel(6, 867700000, DR_RANGE_MAP(DR_SF12, DR_SF7), BAND_CENTI); // g-band + LMIC_setupChannel(7, 867900000, DR_RANGE_MAP(DR_SF12, DR_SF7), BAND_CENTI); // g-band + LMIC_setupChannel(8, 868800000, DR_RANGE_MAP(DR_FSK, DR_FSK), BAND_MILLI); // g2-band + // TTN defines an additional channel at 869.525Mhz using SF9 for class B + // devices' ping slots. LMIC does not have an easy way to define set this + // frequency and support for class B is spotty and untested, so this + // frequency is not configured here. + #elif defined(CFG_us915) + // NA-US channels 0-71 are configured automatically + // but only one group of 8 should (a subband) should be active + // TTN recommends the second sub band, 1 in a zero based count. + // https://github.com/TheThingsNetwork/gateway-conf/blob/master/US-global_conf.json + LMIC_selectSubBand(1); + #endif + + // Disable link check validation + LMIC_setLinkCheckMode(0); + + // TTN uses SF9 for its RX2 window. + LMIC.dn2Dr = DR_SF9; + + // Set data rate and transmit power for uplink (note: txpow seems to be ignored by the library) + LMIC_setDrTxpow(DR_SF7,14); + + // Start job + do_send(&sendjob); + }` + + Blockly.Arduino.codeFunctions_['functions_onEvent'] = ` + void onEvent (ev_t ev) { + Serial.print(os_getTime()); + Serial.print(": "); + switch(ev) { + case EV_SCAN_TIMEOUT: + Serial.println(F("EV_SCAN_TIMEOUT")); + break; + case EV_BEACON_FOUND: + Serial.println(F("EV_BEACON_FOUND")); + break; + case EV_BEACON_MISSED: + Serial.println(F("EV_BEACON_MISSED")); + break; + case EV_BEACON_TRACKED: + Serial.println(F("EV_BEACON_TRACKED")); + break; + case EV_JOINING: + Serial.println(F("EV_JOINING")); + break; + case EV_JOINED: + Serial.println(F("EV_JOINED")); + break; + case EV_RFU1: + Serial.println(F("EV_RFU1")); + break; + case EV_JOIN_FAILED: + Serial.println(F("EV_JOIN_FAILED")); + break; + case EV_REJOIN_FAILED: + Serial.println(F("EV_REJOIN_FAILED")); + break; + case EV_TXCOMPLETE: + Serial.println(F("EV_TXCOMPLETE (includes waiting for RX windows)")); + if (LMIC.txrxFlags & TXRX_ACK) + Serial.println(F("Received ack")); + if (LMIC.dataLen) { + Serial.println(F("Received ")); + Serial.println(LMIC.dataLen); + Serial.println(F(" bytes of payload")); + } + // Schedule next transmission + os_setTimedCallback(&sendjob, os_getTime()+sec2osticks(TX_INTERVAL), do_send); + break; + case EV_LOST_TSYNC: + Serial.println(F("EV_LOST_TSYNC")); + break; + case EV_RESET: + Serial.println(F("EV_RESET")); + break; + case EV_RXCOMPLETE: + // data received in ping slot + Serial.println(F("EV_RXCOMPLETE")); + break; + case EV_LINK_DEAD: + Serial.println(F("EV_LINK_DEAD")); + break; + case EV_LINK_ALIVE: + Serial.println(F("EV_LINK_ALIVE")); + break; + default: + Serial.println(F("Unknown event")); + break; + } + }`; + Blockly.Arduino.setupCode_['initLora'] = 'initLora();'; + Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);'; + return ''; +} + +Blockly.Arduino.sensebox_lora_cayenne_temperature = function (block) { + var temperature = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 + var channel = this.getFieldValue('CHANNEL'); + var code = `lpp.addTemperature(${channel}, ${temperature});\n`; + return code; +} + +Blockly.Arduino.sensebox_lora_cayenne_humidity = function (block) { + var humidity = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 + var channel = this.getFieldValue('CHANNEL'); + var code = `lpp.addRelativeHumidity(${channel}, ${humidity});\n`; + return code; +} + +Blockly.Arduino.sensebox_lora_cayenne_pressure = function (block) { + var pressure = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 + var channel = this.getFieldValue('CHANNEL'); + var code = `lpp.addBarometricPressure(${channel}, ${pressure});\n`; + return code; +} + +Blockly.Arduino.sensebox_lora_cayenne_luminosity = function (block) { + var luminosity = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 + var channel = this.getFieldValue('CHANNEL'); + var code = `lpp.addLuminosity(${channel}, ${luminosity});\n`; + return code; +} + +Blockly.Arduino.sensebox_lora_cayenne_sensor = function (block) { + var sensorValue = Blockly.Arduino.valueToCode(this, 'Value', Blockly.Arduino.ORDER_ATOMIC) || 0 + var channel = this.getFieldValue('CHANNEL'); + var code = `lpp.addAnalogInput(${channel}, ${sensorValue});\n`; + return code; +} + +Blockly.Arduino.sensebox_lora_cayenne_accelerometer = function (block) { + var x = Blockly.Arduino.valueToCode(this, 'X', Blockly.Arduino.ORDER_ATOMIC) || 0 + var y = 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`; + return code; +} + +Blockly.Arduino.sensebox_lora_cayenne_gps = function (block) { + var lat = Blockly.Arduino.valueToCode(this, 'LAT', Blockly.Arduino.ORDER_ATOMIC) || 0 + var lng = Blockly.Arduino.valueToCode(this, 'LNG', Blockly.Arduino.ORDER_ATOMIC) || 0 + 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; +} \ No newline at end of file diff --git a/src/components/Blockly/toolbox/Toolbox.js b/src/components/Blockly/toolbox/Toolbox.js index 943ff0e..9cadec6 100644 --- a/src/components/Blockly/toolbox/Toolbox.js +++ b/src/components/Blockly/toolbox/Toolbox.js @@ -142,6 +142,26 @@ class Toolbox extends React.Component { + + + + + + + + + + + + + + + + + + + +