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

add some delay and fix type limit

Browse Source
This commit is contained in:
felixerdy 2020-11-05 20:57:17 +01:00
parent b4a59d3875
commit 5621fdc620
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,11 @@ Blockly.Blocks['sensebox_send_lora_sensor_value'] = {
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()
.setAlign(Blockly.ALIGN_RIGHT)
.appendField("Fix Type Limit")
.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
this.appendDummyInput() this.appendDummyInput()
.appendField("TTN Mapper") .appendField("TTN Mapper")
this.appendValueInput('Latitude') this.appendValueInput('Latitude')

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

@ -121,7 +121,7 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
} }
}`; }`;
Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n'; Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n';
Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\n'; Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\ndelay(1000);\n';
var code = ''; var code = '';
return code; return code;
}; };
@ -201,6 +201,7 @@ Blockly.Arduino.sensebox_lora_ttn_mapper = function (block) {
var altitude = Blockly.Arduino.valueToCode(this, 'Altitude', 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 pDOP = Blockly.Arduino.valueToCode(this, 'pDOP', Blockly.Arduino.ORDER_ATOMIC)
var fixType = Blockly.Arduino.valueToCode(this, 'Fix Type', 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'] = ` 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
@ -209,7 +210,7 @@ Blockly.Arduino.sensebox_lora_ttn_mapper = function (block) {
} else { } else {
int fixType = ${fixType}; int fixType = ${fixType};
if (fixType >= 3) { // we have a 3D fix if (fixType >= ${fixTypeLimit}) { // we have a 3D fix
int32_t latitude = ${latitude}; // in degrees * 10^-7 int32_t latitude = ${latitude}; // in degrees * 10^-7
int32_t longitude = ${longitude}; // in degrees * 10^-7 int32_t longitude = ${longitude}; // in degrees * 10^-7
int32_t altitude = ${altitude} / 100; // in dm above mean sea level int32_t altitude = ${altitude} / 100; // in dm above mean sea level
@ -426,7 +427,7 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
} }
}`; }`;
Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n'; Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n';
Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\n'; Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\ndelay(1000);\n';
return ''; return '';
} }