Merge pull request #22 from sensebox/gps-ttn-mapper

[WIP] initial gps ttn mapper code
2020-11-06 11:56:19 +01:00 · 2020-11-06 11:56:19 +01:00 · 3df66cd425
commit 3df66cd425
parent 4601439ae3 3dfcffc2ad
7 changed files with 243 additions and 22 deletions
--- a/src/components/Blockly/blocks/sensebox-lora.js
+++ b/src/components/Blockly/blocks/sensebox-lora.js
@ -119,6 +119,38 @@ Blockly.Blocks['sensebox_send_lora_sensor_value'] = {
    LOOP_TYPES: ['sensebox_lora_message_send'],
 };

+Blockly.Blocks['sensebox_lora_ttn_mapper'] = {
+    init: function (block) {
+        this.setColour(getColour().sensebox);
+        this.appendDummyInput()
+            .appendField("TTN Mapper");
+        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.appendValueInput('Latitude')
+            .appendField(Blockly.Msg.senseBox_gps_lat)
+            .setCheck(null);
+        this.appendValueInput('Longitude')
+            .appendField(Blockly.Msg.senseBox_gps_lng)
+            .setCheck(null);
+        this.appendValueInput('Altitude')
+            .appendField(Blockly.Msg.senseBox_gps_alt)
+            .setCheck(null);
+        this.appendValueInput('pDOP')
+            .appendField('pDOP')
+            .setCheck(null);
+        this.appendValueInput('Fix Type')
+            .appendField('Fix Type')
+            .setCheck(null);
+        this.setPreviousStatement(true, null);
+        this.setNextStatement(true, null);
+        this.setTooltip(Blockly.Msg.senseBox_display_printDisplay_tip);
+
+    }
+};
+
 Blockly.Blocks['sensebox_lora_cayenne_send'] = {
    init: function () {
        this.setTooltip(Blockly.Msg.senseBox_LoRa_cayenne_tip);
--- a/src/components/Blockly/blocks/sensebox-sensors.js
+++ b/src/components/Blockly/blocks/sensebox-sensors.js
@ -321,3 +321,25 @@ Blockly.Blocks['sensebox_scd30'] = {
    this.setTooltip(Blockly.Msg.senseBox_bme_tip);
  }
 };
+
+
+/**
+ * GPS Module
+ * 
+ */
+
+
+Blockly.Blocks['sensebox_gps'] = {
+  init: function () {
+    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"]];
+    this.appendDummyInput()
+      .appendField("GPS Modul");
+    this.appendDummyInput()
+      .setAlign(Blockly.ALIGN_RIGHT)
+      .appendField(Blockly.Msg.senseBox_value)
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "dropdown")
+    this.setOutput(true, Types.NUMBER.typeName);
+    this.setColour(getColour().sensebox);
+    this.setTooltip(Blockly.Msg.senseBox_bme_tip);
+  }
+};
--- a/src/components/Blockly/generator/generator.js
+++ b/src/components/Blockly/generator/generator.js
@ -106,6 +106,9 @@ Blockly['Arduino'].init = function (workspace) {
    // creates a list of code to be setup before the setup block
    Blockly['Arduino'].setupCode_ = Object.create(null);

+    // creates a list of code to be setup before the setup block
+    Blockly['Arduino'].loraSetupCode_ = Object.create(null);
+
    // creates a list of code for the loop to be runned once
    Blockly['Arduino'].loopCodeOnce_ = Object.create(null)

@ -202,6 +205,7 @@ Blockly['Arduino'].finish = function (code) {
    let loopCodeOnce = '';
    let setupCode = '';
    let preSetupCode = '';
+    let loraSetupCode = '';
    let devVariables = '\n';

    for (const key in Blockly['Arduino'].libraries_) {
@ -233,7 +237,13 @@ Blockly['Arduino'].finish = function (code) {
    for (const key in Blockly['Arduino'].setupCode_) {
        preSetupCode += Blockly['Arduino'].setupCode_[key] || '';
    }
-    setupCode = '\nvoid setup() { \n' + preSetupCode + '\n}\n';
+
+    for (const key in Blockly['Arduino'].loraSetupCode_) {
+        loraSetupCode += Blockly['Arduino'].loraSetupCode_[key] || '';
+    }
+
+
+    setupCode = '\nvoid setup() { \n' + preSetupCode + '\n' + loraSetupCode + '\n}\n';

    let loopCode = '\nvoid loop() { \n' + loopCodeOnce + code + '\n}\n';

--- a/src/components/Blockly/generator/sensebox-lora.js
+++ b/src/components/Blockly/generator/sensebox-lora.js
@ -120,9 +120,9 @@ Blockly.Arduino.sensebox_lora_initialize_otaa = function (block) {
              break;
      }
  }`;
-    Blockly.Arduino.setupCode_['initLora'] = 'initLora();';
-    Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);';
-    var code = ''
+    Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n';
+    Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\ndelay(1000);\n';
+    var code = '';
    return code;
 };

@ -195,6 +195,60 @@ Blockly.Arduino.sensebox_lora_cayenne_send = function (block) {
    return '';
 }

+Blockly.Arduino.sensebox_lora_ttn_mapper = function (block) {
+    var latitude = Blockly.Arduino.valueToCode(this, 'Latitude', Blockly.Arduino.ORDER_ATOMIC)
+    var longitude = Blockly.Arduino.valueToCode(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){
+      // Check if there is not a current TX/RX job running
+      if (LMIC.opmode & OP_TXRXPEND) {
+          Serial.println(F("OP_TXRXPEND, not sending"));
+      } else {
+          
+        int fixType = ${fixType};
+        if (fixType >= ${fixTypeLimit}) { // we have a 3D fix
+          int32_t latitude = ${latitude};       // in degrees * 10^-7
+          int32_t longitude = ${longitude};     // in degrees * 10^-7
+          int32_t altitude = ${altitude} / 100;      // in dm above mean sea level
+          uint16_t pDOP = ${pDOP};                 //  positional dillution of precision
+    
+          uint8_t data[12];
+    
+          data[0] = latitude;
+          data[1] = latitude >> 8;
+          data[2] = latitude >> 16;
+          data[3] = latitude >> 24;
+    
+          data[4] = longitude;
+          data[5] = longitude >> 8;
+          data[6] = longitude >> 16;
+          data[7] = longitude >> 24;
+    
+          data[8] = altitude;
+          data[9] = altitude >> 8;
+    
+          data[10] = pDOP;
+          data[11] = pDOP >> 8;
+    
+    
+          // Prepare upstream data transmission at the next possible time.
+          LMIC_setTxData2(1, data, sizeof(data), 0);
+          Serial.println(F("Packet queued"));
+        } else {
+          // wait for better fix type
+          os_setTimedCallback(&sendjob, os_getTime() + sec2osticks(TX_INTERVAL), do_send);
+        }
+      }
+      // 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');
@ -372,8 +426,8 @@ Blockly.Arduino.sensebox_lora_initialize_abp = function (block) {
              break;
      }
  }`;
-    Blockly.Arduino.setupCode_['initLora'] = 'initLora();';
-    Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);';
+    Blockly.Arduino.loraSetupCode_['initLora'] = 'initLora();\n';
+    Blockly.Arduino.setupCode_['serial.begin'] = 'Serial.begin(9600);\ndelay(1000);\n';
    return '';
 }

--- a/src/components/Blockly/generator/sensebox-sensors.js
+++ b/src/components/Blockly/generator/sensebox-sensors.js
@ -295,4 +295,50 @@ Blockly.Arduino.sensebox_scd30 = function () {
  }
  return [code, Blockly.Arduino.ORDER_ATOMIC];

+}
+
+
+/**
+ * GPS Module
+ * 
+ */
+
+Blockly.Arduino.sensebox_gps = function () {
+  var dropdown = this.getFieldValue('dropdown');
+  Blockly.Arduino.libraries_['gps_library'] = '#include "SparkFun_Ublox_Arduino_Library.h"'
+  Blockly.Arduino.libraries_['wire'] = '#include <Wire.h>'
+  Blockly.Arduino.libraries_['library_senseBoxMCU'] = '#include "SenseBoxMCU.h"';
+  Blockly.Arduino.definitions_['GPS'] = 'SFE_UBLOX_GPS myGPS;';
+  Blockly.Arduino.setupCode_['init_gps'] = ` Wire.begin();
+
+  if (myGPS.begin() == false) //Connect to the Ublox module using Wire port
+  {
+    Serial.println(F("Ublox GPS not detected at default I2C address. Please check wiring. Freezing."));
+    while (1);
+  }
+
+  myGPS.setI2COutput(COM_TYPE_UBX); //Set the I2C port to output UBX only (turn off NMEA noise)
+  myGPS.saveConfiguration(); //Save the current settings to flash and BBR`;
+  var code = '';
+  switch (dropdown) {
+    case 'latitude':
+      code = 'myGPS.getLatitude()';
+      break;
+    case 'longitude':
+      code = 'myGPS.getLongitude()';
+      break;
+    case 'altitude':
+      code = 'myGPS.getAltitudeMSL()';
+      break;
+    case 'pDOP':
+      code = 'myGPS.getPDOP()';
+      break;
+    case 'fixType':
+      code = 'myGPS.getFixType()';
+      break;
+    default:
+      code = ''
+  }
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+
 }
--- a/src/components/Blockly/toolbox/Toolbox.js
+++ b/src/components/Blockly/toolbox/Toolbox.js
@ -46,6 +46,7 @@ class Toolbox extends React.Component {
                    <Block type="sensebox_sensor_pressure" />
                    <Block type="sensebox_sensor_bme680_bsec" />
                    <Block type="sensebox_scd30" />
+                    <Block type="sensebox_gps" />
                    <Block type="sensebox_sensor_ultrasonic_ranger" />
                    <Block type="sensebox_sensor_sound" />
                    <Block type="sensebox_button" />
@ -241,6 +242,35 @@ class Toolbox extends React.Component {
                        <Block type="sensebox_lora_message_send" />
                        <Block type="sensebox_send_lora_sensor_value" />
                    </Category>
+                    <Category id="catSenseBoxOutput_Map" name="    TTN Mapper" colour={getColour().sensebox}>
+                        <Block type="sensebox_lora_ttn_mapper">
+                            <Value name="Latitude">
+                                <Block type="sensebox_gps">
+                                    <Field name="dropdown">latitude</Field>
+                                </Block>
+                            </Value>
+                            <Value name="Longitude">
+                                <Block type="sensebox_gps">
+                                    <Field name="dropdown">longitude</Field>
+                                </Block>
+                            </Value>
+                            <Value name="Altitude">
+                                <Block type="sensebox_gps">
+                                    <Field name="dropdown">altitude</Field>
+                                </Block>
+                            </Value>
+                            <Value name="pDOP">
+                                <Block type="sensebox_gps">
+                                    <Field name="dropdown">pDOP</Field>
+                                </Block>
+                            </Value>
+                            <Value name="Fix Type">
+                                <Block type="sensebox_gps">
+                                    <Field name="dropdown">fixType</Field>
+                                </Block>
+                            </Value>
+                        </Block>
+                    </Category>
                    <Category id="catSenseBoxOutput_LoRa_cayenne" name="    Cayenne LPP" colour={getColour().sensebox}>
                        <Block type="sensebox_lora_cayenne_send" />
                        <Block type="sensebox_lora_cayenne_temperature" />
--- a/yarn.lock
+++ b/yarn.lock
@ -1148,25 +1148,25 @@
    lodash "^4.17.19"
    to-fast-properties "^2.0.0"

-"@blockly/block-plus-minus@^2.0.8":
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/@blockly/block-plus-minus/-/block-plus-minus-2.0.9.tgz#d012225057e83ed85d08a35085da21501b899413"
-  integrity sha512-mIeqj+KBtzIcmObe2G/06lhDpOrCT32JCBqE2u51BMb0ywAFh+lsC7kl4mANLclp/+zgxVqJWUD0Q4xdNU048g==
+"@blockly/block-plus-minus@^2.0.10":
+  version "2.0.15"
+  resolved "https://registry.yarnpkg.com/@blockly/block-plus-minus/-/block-plus-minus-2.0.15.tgz#5c51cbaea7a581e0a8fb0651e69c134afa60c655"
+  integrity sha512-9wLleGlMmEW4Gt94ynBxb6JzTFhznAEk8TlC7ZQlwEnpCv3tB+yZsq4iDlQd+tbqRTIRCbsVdQE1x/I1snio9g==

-"@blockly/field-slider@^2.0.7":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@blockly/field-slider/-/field-slider-2.1.0.tgz#433c77848166d16eb536becf672e3a20efd81cd6"
-  integrity sha512-LLi83oKCfdP39PYMltFpp221QTkLCSY3mFitBa0oyc+zZM6QKF8BU90eVKRb5m2ZIT52JCF/ywNV3mttHNh33Q==
+"@blockly/field-slider@^2.1.1":
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@blockly/field-slider/-/field-slider-2.1.6.tgz#64616b72509e6754b569b9d563420b53629a5a58"
+  integrity sha512-5HAqfpMWvvB0mzDYfMcChD+orrhwsrLMurdGeRLnA4NcyCjF3++PMvO/l9L/eqdjHkwNZ+cSiuwnjWLz5i1G/w==

 "@blockly/plugin-modal@^1.20200427.4":
  version "1.20200427.4"
  resolved "https://registry.yarnpkg.com/@blockly/plugin-modal/-/plugin-modal-1.20200427.4.tgz#220d6c0bf7ad89ee5de02b5be680aa622a686782"
  integrity sha512-eA9p+W3mtcWLJQZ23D0Le/Uw3JdxFxwJqTUYtAiRlVON4qnuDXrHQLlvxEiWctNXJZGUTh57zqbvO6ZxNRQPrA==

-"@blockly/plugin-typed-variable-modal@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@blockly/plugin-typed-variable-modal/-/plugin-typed-variable-modal-3.1.0.tgz#3810bb2a4930a34c0668c4af2e35cd628035a1e9"
-  integrity sha512-1gamu/6bS/OTSwh2d0s3fI3QMVAXW0u0sSTbZcOdF8biDTfbGU/O36w0rOrtOb0OtHw8Euo9OkffEVomBIfkNg==
+"@blockly/plugin-typed-variable-modal@^3.1.1":
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/@blockly/plugin-typed-variable-modal/-/plugin-typed-variable-modal-3.1.5.tgz#1e143036d84b779e15ee3588d5d7fc3abbbfae4c"
+  integrity sha512-0VNRYQud4SoGATG2EEuDugvXWGwgyHWGi/K0QfJM0l0EDgP+dZ5mYsHGfFchxu1Woxr3KQiiBb4p85p05Aim2Q==
  dependencies:
    "@blockly/plugin-modal" "^1.20200427.4"

@ -2635,10 +2635,10 @@ bindings@^1.5.0:
  dependencies:
    file-uri-to-path "1.0.0"

-blockly@^3.20200625.2:
-  version "3.20200625.2"
-  resolved "https://registry.yarnpkg.com/blockly/-/blockly-3.20200625.2.tgz#266b6c3078aad460afc7e831e6e8f7616073d314"
-  integrity sha512-+0aUynP4kAFjg+m9uSyctWB+KwT3/BDmqy4Fm7vwWq7cuMtgIsqqA8VGb6INVpFx9WZUXSZ5enFAco6CM85bpA==
+blockly@^3.20200924.0:
+  version "3.20200924.3"
+  resolved "https://registry.yarnpkg.com/blockly/-/blockly-3.20200924.3.tgz#c87122adfd15be62c9e9ef36eadfe87a21f7aa0c"
+  integrity sha512-jhWcAmJ2MG5LdTDLEFDVpy+wAgYqorVa67TOszmlekzkCok/hklNTtir4cDg+jbTvQzE0/MT+KGk0YYsU8LQhw==
  dependencies:
    jsdom "^15.2.1"

@ -6532,6 +6532,11 @@ jest@24.9.0:
    import-local "^2.0.0"
    jest-cli "^24.9.0"

+js-cookie@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
+  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@ -7348,6 +7353,16 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
  dependencies:
    minimist "^1.2.5"

+mnemonic-id@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/mnemonic-id/-/mnemonic-id-3.2.7.tgz#f7d77d8b39e009ad068117cbafc458a6c6f8cddf"
+  integrity sha512-kysx9gAGbvrzuFYxKkcRjnsg/NK61ovJOV4F1cHTRl9T5leg+bo6WI0pWIvOFh1Z/yDL0cjA5R3EEGPPLDv/XA==
+
+moment@^2.28.0:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
 move-concurrently@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@ -9089,6 +9104,13 @@ react-app-polyfill@^1.0.6:
    regenerator-runtime "^0.13.3"
    whatwg-fetch "^3.0.0"

+react-cookie-consent@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/react-cookie-consent/-/react-cookie-consent-5.2.0.tgz#c2c62e4fd77ec96d18c8dbb772e4281f0c12e131"
+  integrity sha512-iRIDynmivejZgLICcpfGbQl94qLn6cjdEHZP0e+ibxzQ7t3zXzdDhsGDSYax8Qu6nGJnlv0bCBd8K0UJUQ5zwQ==
+  dependencies:
+    js-cookie "^2.2.1"
+
 react-dev-utils@^10.2.1:
  version "10.2.1"
  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19"
@ -10960,6 +10982,11 @@ uuid@^3.0.1, uuid@^3.3.2:
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==

+uuid@^8.3.1:
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
+  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
+
 v8-compile-cache@^2.0.3:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"