Merge branch 'master' into ui-updates

2021-06-02 14:49:58 +02:00
parent 4522760e9c 5ecc776db2
commit 8c3a86b667
13 changed files with 988 additions and 549 deletions
@@ -1,22 +1,20 @@
-
 const colours = {
-    sensebox: 120,
-    logic: 210,
-    loops: 10,
-    math: 230,
-    io: 60,
-    procedures: 290,
-    time: 140,
-    text: 160,
-    variables: 330,
-    audio: 250,
-    arrays: 33,
-    mqtt: 90,
-    webserver: 40
-}
-
-
-export const getColour = () => {
-    return colours;
+  sensebox: 120,
+  logic: 210,
+  loops: 10,
+  math: 230,
+  io: 60,
+  procedures: 290,
+  time: 140,
+  text: 160,
+  variables: 330,
+  audio: 250,
+  arrays: 33,
+  mqtt: 90,
+  webserver: 40,
+  phyphox: 25,
 };

+export const getColour = () => {
+  return colours;
+};