From 2eddecb7d626b59118555c759fb0ae1d3f73b120 Mon Sep 17 00:00:00 2001
From: Hayodea Hakol <hayodea@protonmail.com>
Date: Sat, 4 Jan 2025 14:34:54 -0400
Subject: [PATCH] Extrospector and Interoceptor both inherit from Sensor now

---
 hcore/include/sensors/extrospector.h | 14 +++++++++-----
 hcore/include/sensors/interoceptor.h |  8 ++++++++
 hcore/include/sensors/sensor.h       | 12 +++++++-----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/hcore/include/sensors/extrospector.h b/hcore/include/sensors/extrospector.h
index 4f1e218..087038d 100644
--- a/hcore/include/sensors/extrospector.h
+++ b/hcore/include/sensors/extrospector.h
@@ -2,18 +2,22 @@
 #define _EXTROSPECTOR_H
 
 #include <cstdint>
+#include <sensors/sensor.h>
+
+namespace hk {
+namespace sensors {
 
 class Extrospector
+: public Sensor
 {
 public:
-    Extrospector(uint32_t _id, uint32_t _value = 0)
-    : id(_id), value(_value)
-    {}
+    Extrospector(void) = default;
     ~Extrospector() = default;
 
 public:
-    uint32_t id;
-    uint64_t value;
 };
 
+} // namespace sensors
+} // namespace hk
+
 #endif // _EXTROSPECTOR_H
diff --git a/hcore/include/sensors/interoceptor.h b/hcore/include/sensors/interoceptor.h
index 84e9b47..99ccb37 100644
--- a/hcore/include/sensors/interoceptor.h
+++ b/hcore/include/sensors/interoceptor.h
@@ -2,8 +2,13 @@
 #define _INTEROCEPTOR_H
 
 #include <cstdint>
+#include <sensors/sensor.h>
+
+namespace hk {
+namespace sensors {
 
 class Interoceptor
+: public Sensor
 {
 public:
     Interoceptor(uint32_t _id, uint32_t _value = 0)
@@ -98,4 +103,7 @@ public:
     {}
 };
 
+} // namespace sensors
+} // namespace hk
+
 #endif // _INTEROCEPTOR_H
diff --git a/hcore/include/sensors/sensor.h b/hcore/include/sensors/sensor.h
index 6e9386e..6dce337 100644
--- a/hcore/include/sensors/sensor.h
+++ b/hcore/include/sensors/sensor.h
@@ -3,17 +3,19 @@
 
 #include <cstdint>
 
+namespace hk {
+namespace sensors {
+
 class Sensor
 {
 public:
-    Sensor(uint32_t _id, uint32_t _value = 0)
-    : id(_id), value(_value)
-    {}
+    Sensor() = default;
     ~Sensor() = default;
 
 public:
-    uint32_t id;
-    uint64_t value;
 };
 
+} // namespace sensors
+} // namespace hk
+
 #endif // _SENSOR_H