Merge commit 'ae46e00' into dev-Rene
# Conflicts: # config/exampleArray.js # dependencies/monster/monster_class.js # monster.html # monster.js # src/nodeClass.js # src/specificClass.js
This commit is contained in:
@@ -10,6 +10,8 @@
|
||||
|
||||
// Define default properties
|
||||
name: { value: "" },
|
||||
processOutputFormat: { value: "process" },
|
||||
dbaseOutputFormat: { value: "influxdb" },
|
||||
|
||||
// Define specific properties
|
||||
samplingtime: { value: 0 },
|
||||
@@ -64,7 +66,7 @@
|
||||
};
|
||||
waitForMenuData();
|
||||
|
||||
// your existing project‐settings & asset dropdown logic can remain here
|
||||
// your existing project-settings & asset dropdown logic can remain here
|
||||
document.getElementById("node-input-samplingtime");
|
||||
document.getElementById("node-input-minvolume");
|
||||
document.getElementById("node-input-maxweight");
|
||||
|
||||
Reference in New Issue
Block a user