Put droneVariableArray in header file

e5e39b54 · Thomas Gambier · Léo-Paul Géneau · f0906899 · e5e39b54 · e5e39b54
Commit e5e39b54 authored May 28, 2022 by Thomas Gambier 🚴🏼 Committed by Léo-Paul Géneau Jul 13, 2022
Show whitespace changes
Inline Side-by-side

Showing with 44 additions and 37 deletions

include/dronedge.h include/dronedge.h +41 -0

include/pubsub.h include/pubsub.h +1 -1

pubsub.c pubsub.c +1 -1

qjs_wrapper.c qjs_wrapper.c +1 -35

No files found.
--- a/include/dronedge.h
+++ b/include/dronedge.h
+#ifndef __DRONEDGE_H__
+#define __DRONEDGE_H__
+
+#include <open62541/server.h>
+#include "pubsub.h"
+UA_Float defaultFloat = 0;
+UA_Double defaultDouble = 0;
+
+const VariableData droneVariableArray[] = {
+    {
+        .name = "latitude",
+        .description = "Latitude",
+        .pdefaultValue = &defaultDouble,
+        .type = UA_TYPES_DOUBLE,
+        .builtInType = UA_NS0ID_DOUBLE,
+    },
+    {
+        .name = "longitude",
+        .description = "Longitude",
+        .pdefaultValue = &defaultDouble,
+        .type = UA_TYPES_DOUBLE,
+        .builtInType = UA_NS0ID_DOUBLE,
+    },
+    {
+        .name = "altitude_abs",
+        .description = "Absolute Altitude (AMSL)",
+        .pdefaultValue = &defaultFloat,
+        .type = UA_TYPES_FLOAT,
+        .builtInType = UA_NS0ID_FLOAT,
+    },
+    {
+        .name = "altitude_rel",
+        .description = "Relative Altitude",
+        .pdefaultValue = &defaultFloat,
+        .type = UA_TYPES_FLOAT,
+        .builtInType = UA_NS0ID_FLOAT,
+    },
+};
+
+
+#endif /* __DRONEDGE_H__ */
--- a/include/pubsub.h
+++ b/include/pubsub.h
--- a/pubsub.c
+++ b/pubsub.c
--- a/qjs_wrapper.c
+++ b/qjs_wrapper.c
 #include <quickjs/quickjs.h>

 #include "mavsdk_wrapper.h"
-#include "pubsub.h"
+#include "dronedge.h"

 static JSClassID js_drone_class_id;

-UA_Float defaultFloat = 0;
-UA_Double defaultDouble = 0;
-
-const VariableData droneVariableArray[] = {
-    {
-        .name = "latitude",
-        .description = "Latitude",
-        .pdefaultValue = &defaultDouble,
-        .type = UA_TYPES_DOUBLE,
-        .builtInType = UA_NS0ID_DOUBLE,
-    },
-    {
-        .name = "longitude",
-        .description = "Longitude",
-        .pdefaultValue = &defaultDouble,
-        .type = UA_TYPES_DOUBLE,
-        .builtInType = UA_NS0ID_DOUBLE,
-    },
-    {
-        .name = "altitude_abs",
-        .description = "Absolute Altitude (AMSL)",
-        .pdefaultValue = &defaultFloat,
-        .type = UA_TYPES_FLOAT,
-        .builtInType = UA_NS0ID_FLOAT,
-    },
-    {
-        .name = "altitude_rel",
-        .description = "Relative Altitude",
-        .pdefaultValue = &defaultFloat,
-        .type = UA_TYPES_FLOAT,
-        .builtInType = UA_NS0ID_FLOAT,
-    },
-};
-
 static UA_Boolean pubsub_running = true;

 int nbDrone;