From 10eee1218930c84e7e5089ad285adfc046c5c83f Mon Sep 17 00:00:00 2001
From: Dano van den Bosch <boschds@hva.nl>
Date: Wed, 13 Mar 2024 16:06:10 +0100
Subject: [PATCH] Arduino oop adding functions from the original aduino code

---
 .../node-code/node-code-final/headerFile.h    |  3 ++-
 .../node-code-final/nodeCodeFinal.ino         | 17 ++++++++++-------
 .../node-code-final/nodeCodeHeader.cpp        | 19 ++++++++++++++-----
 .../node-code-final/nodeCodeHeader.h          |  6 ++++--
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/arduino/node-code/node-code-final/headerFile.h b/arduino/node-code/node-code-final/headerFile.h
index b7e72e4..1ef0ea7 100644
--- a/arduino/node-code/node-code-final/headerFile.h
+++ b/arduino/node-code/node-code-final/headerFile.h
@@ -17,10 +17,11 @@
 #define SCREEN_WIDTH 128
 #define SCREEN_HEIGHT 64
 #define i2c_adress 0x3c
+#define OLED_RESET -1   //   QT-PY / XIAO
 #define USE_SERIAL Serial
 
 // make new objects
-Adafruit_SH1106G display = Adafruit_SH1106G(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire);
+Adafruit_SH1106G display = Adafruit_SH1106G(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
 DHT dht(DHTPIN, DHTTYPE);
 WiFiMulti WiFiMulti;
 Adafruit_SGP30 sgp;
diff --git a/arduino/node-code/node-code-final/nodeCodeFinal.ino b/arduino/node-code/node-code-final/nodeCodeFinal.ino
index 261048e..eb3c086 100644
--- a/arduino/node-code/node-code-final/nodeCodeFinal.ino
+++ b/arduino/node-code/node-code-final/nodeCodeFinal.ino
@@ -2,13 +2,16 @@
 
 nodeReadings esp32Node();
 
-
-void setup() {
-  // put your setup code here, to run once:
-  esp32Node.setup();
+void setup()
+{
+    // put your setup code here, to run once:
+    esp32Node.setup();
+    esp32Node.websocketSetup();
+    esp32Node.resetValues();
 }
 
-void loop() {
-  // put your main code here, to run repeatedly:
-  esp32Node.loop();
+void loop()
+{
+    // put your main code here, to run repeatedly:
+    esp32Node.loop();
 }
diff --git a/arduino/node-code/node-code-final/nodeCodeHeader.cpp b/arduino/node-code/node-code-final/nodeCodeHeader.cpp
index 54a3008..d2a2ec5 100644
--- a/arduino/node-code/node-code-final/nodeCodeHeader.cpp
+++ b/arduino/node-code/node-code-final/nodeCodeHeader.cpp
@@ -18,9 +18,6 @@ void nodeReadings::setup(){
 
     pinMode(MICPIN, INPUT);
     pinMode(DHTPIN, INPUT);
-    
-    websocketSetup();
-    resetValues();
 
 }
 
@@ -38,8 +35,6 @@ void nodeReadings::loop() {
     currentMillis = millis();
 }
 
-
-
 void nodeReadings::resetValues() {
     counter = 0;
     eCO2 = 0;
@@ -51,4 +46,18 @@ void nodeReadings::resetValues() {
     errorSGP30 = false;
     errorDHT11 = false;
     noise = false;
+}
+
+// hexdump function for websockets binary handler
+void hexdump(const void *mem, uint32_t len, uint8_t cols = 16) {
+	const uint8_t* src = (const uint8_t*) mem;
+	USE_SERIAL.printf("\n[HEXDUMP] Address: 0x%08X len: 0x%X (%d)", (ptrdiff_t)src, len, len);
+	for(uint32_t i = 0; i < len; i++) {
+		if(i % cols == 0) {
+			USE_SERIAL.printf("\n[0x%08X] 0x%08X: ", (ptrdiff_t)src, i);
+		}
+		USE_SERIAL.printf("%02X ", *src);
+		src++;
+	}
+	USE_SERIAL.printf("\n");
 }
\ No newline at end of file
diff --git a/arduino/node-code/node-code-final/nodeCodeHeader.h b/arduino/node-code/node-code-final/nodeCodeHeader.h
index 82644cf..20ed3e4 100644
--- a/arduino/node-code/node-code-final/nodeCodeHeader.h
+++ b/arduino/node-code/node-code-final/nodeCodeHeader.h
@@ -2,13 +2,15 @@
 #define nodeReading_h
 
 #include "Arduino.h"
-#
+#include "headerFile.h"
 
-class nodeReadings() {
+
+class nodeReadings {
 
     public:
         nodeReadings();
         void setup();
+        void loop();
         void resetValues();
     private:
 };