update phyphox blocks

src/components/Blockly/generator/generator.js

@@ -100,6 +100,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"].phyphoxSetupCode_ = Object.create(null);
+
   // creates a list of code to be setup before the setup block
   Blockly["Arduino"].loraSetupCode_ = Object.create(null);
 
@@ -196,6 +199,7 @@ Blockly["Arduino"].finish = function (code) {
   let codeFunctions = "";
   let functionsCode = "";
   let definitionsCode = "";
+  let phyphoxSetupCode = "";
   let loopCodeOnce = "";
   let setupCode = "";
   let preSetupCode = "";
@@ -234,8 +238,18 @@ Blockly["Arduino"].finish = function (code) {
     loraSetupCode += Blockly["Arduino"].loraSetupCode_[key] + "\n" || "";
   }
 
+  for (const key in Blockly["Arduino"].phyphoxSetupCode_) {
+    phyphoxSetupCode += Blockly["Arduino"].phyphoxSetupCode_[key] + "\n" || "";
+  }
+
   setupCode =
-    "\nvoid setup() { \n" + preSetupCode + "\n" + loraSetupCode + "\n}\n";
+    "\nvoid setup() { \n" +
+    preSetupCode +
+    "\n" +
+    phyphoxSetupCode +
+    "\n" +
+    loraSetupCode +
+    "\n}\n";
 
   let loopCode = "\nvoid loop() { \n" + loopCodeOnce + code + "\n}\n";
 

src/components/Blockly/generator/sensebox-ble.js

@@ -5,35 +5,132 @@ Blockly.Arduino.sensebox_phyphox_init = function () {
   Blockly.Arduino.libraries_["phyphox_library"] = `#include <phyphoxBle.h>`;
   Blockly.Arduino.libraries_["library_senseBoxMCU"] =
     '#include "SenseBoxMCU.h"';
-  Blockly.Arduino.setupCode_["phyphox_start"] = `PhyphoxBLE::start("${name}");`;
+  Blockly.Arduino.phyphoxSetupCode_[
+    "phyphox_start"
+  ] = `PhyphoxBLE::start("${name}");`;
   var code = ``;
   return code;
 };
 
 Blockly.Arduino.sensebox_phyphox_experiment = function () {
-  var experimentname = this.getFieldValue("exeperimentname");
-  var title = this.getFieldValue("title");
+  var experimentname = this.getFieldValue("exeperimentname").replace(
+    /\s+/g,
+    ""
+  );
+  var title = this.getFieldValue("title").replace(/[^a-zA-Z0-9]/g, "");
   var category = this.getFieldValue("category");
   var description = this.getFieldValue("description");
-  Blockly.Arduino.setupCode_[
+  var branch = Blockly.Arduino.statementToCode(this, "view");
+  Blockly.Arduino.phyphoxSetupCode_[
     `PhyphoxBleExperiment_${experimentname}`
   ] = `PhyphoxBleExperiment ${experimentname};`;
-  Blockly.Arduino.setupCode_[
+  Blockly.Arduino.phyphoxSetupCode_[
     `setTitle_${title}`
-  ] = `${experimentname}.setTitle("${title}")`;
-  Blockly.Arduino.setupCode_[
+  ] = `${experimentname}.setTitle("${title}");`;
+  Blockly.Arduino.phyphoxSetupCode_[
     `setCategory_${category}`
-  ] = `${experimentname}.setCategory("${category}")`;
-  Blockly.Arduino.setupCode_[
+  ] = `${experimentname}.setCategory("${category}");`;
+  Blockly.Arduino.phyphoxSetupCode_[
     `setDescription_${description}`
-  ] = `${experimentname}.setDescription("${description}")`;
+  ] = `${experimentname}.setDescription("${description}");`;
+  Blockly.Arduino.phyphoxSetupCode_[
+    `addView_${experimentname}`
+  ] = `PhyphoxBleExperiment::View firstView;\nfirstView.setLabel("Messwerte"); //Create a "view"`;
+  Blockly.Arduino.phyphoxSetupCode_[`addGraph`] = `${branch}`;
+  Blockly.Arduino.phyphoxSetupCode_[
+    `addView_firstview`
+  ] = `${experimentname}.addView(firstView);`; //Attach view to experiment
+  Blockly.Arduino.phyphoxSetupCode_[
+    `addExperiment_${experimentname}`
+  ] = `PhyphoxBLE::addExperiment(${experimentname});`; //Attach experiment to server
+
   var code = ``;
   return code;
 };
 
+Blockly.Arduino["sensebox_phyphox_timestamp"] = function () {
+  var code = 0;
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+Blockly.Arduino["sensebox_phyphox_channel"] = function () {
+  var channel = parseFloat(this.getFieldValue("channel"));
+  var code = channel;
+  return [code, Blockly.Arduino.ORDER_ATOMIC];
+};
+
+Blockly.Arduino.sensebox_phyphox_view = function () {
+  //var code = `${branch}`;
+  //return code;
+};
+
+Blockly.Arduino.sensebox_phyphox_sendchannel = function (block) {
+  var channel = this.getFieldValue("channel");
+  var value =
+    Blockly.Arduino.valueToCode(this, "value", Blockly.Arduino.ORDER_ATOMIC) ||
+    "1";
+
+  var code = `float channel${channel} = ${value};\n`;
+  return code;
+};
+
+Blockly.Arduino.sensebox_phyphox_graph = function () {
+  var label = this.getFieldValue("label").replace(/[^a-zA-Z0-9]/g, "");
+  var unitx = this.getFieldValue("unitx");
+  var unity = this.getFieldValue("unity");
+  var labelx = this.getFieldValue("labelx");
+  var labely = this.getFieldValue("labely");
+  var style = this.getFieldValue("style");
+  var channelX =
+    Blockly.Arduino.valueToCode(
+      this,
+      "channel0",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || 0;
+  var channelY =
+    Blockly.Arduino.valueToCode(
+      this,
+      "channel1",
+      Blockly.Arduino.ORDER_ATOMIC
+    ) || 1;
+
+  var code = `PhyphoxBleExperiment::Graph ${label};\n`; //Create graph which will plot random numbers over time
+  code += `${label}.setLabel("${label}");\n`;
+  code += `${label}.setUnitX("${unitx}");\n`;
+  code += `${label}.setUnitY("${unity}");\n`;
+  code += `${label}.setLabelX("${labelx}");\n`;
+  code += `${label}.setLabelY("${labely}");\n`;
+  code += `${label}.setStyle("${style}");\n`;
+  code += `${label}.setChannel(${channelX}, ${channelY});\n`;
+  code += `firstView.addElement(${label});\n`;
+  return code;
+};
+
 Blockly.Arduino.sensebox_phyphox_experiment_send = function () {
-  var data = "";
-  Blockly.Arduino.loopCodeOnce_["phyphox_poll"] = `PhyphoxBLE::poll()`;
-  var code = `PhyphoxBLE::write()`;
+  var branch = Blockly.Arduino.statementToCode(this, "sendValues");
+  var blocks = this.getDescendants();
+  console.log(blocks);
+  var count = 0;
+  if (blocks !== undefined) {
+    for (var i = 0; i < blocks.length; i++) {
+      if (blocks[i].type === "sensebox_phyphox_sendchannel") {
+        count++;
+      }
+    }
+  }
+  if (count === 5) {
+  }
+  var string = "";
+
+  for (var j = 1; j <= count; j++) {
+    console.log("append");
+    if (string === "") {
+      string += `channel${j}`;
+    } else if (string !== "") {
+      string += `, channel${j}`;
+    }
+  }
+  Blockly.Arduino.loopCodeOnce_["phyphox_poll"] = `PhyphoxBLE::poll();`;
+  var code = `${branch}\nPhyphoxBLE::write(${string});`;
   return code;
 };