From 1ab4931d97caf720060f688c52d4a0d43ebfa7e2 Mon Sep 17 00:00:00 2001
From: Daniel Mohns <dmohns@users.noreply.github.com>
Date: Wed, 20 Dec 2023 11:51:53 +0100
Subject: [PATCH] Revert "Reorder imports (#117)"

This reverts commit 67e2c34736f4fb316f7ca69ac215391d00c420df.
---
 firmware/src/credit.hpp           |  1 -
 firmware/src/main.cpp             |  4 +++-
 firmware/src/opaygo_functions.hpp | 13 ++++++-------
 firmware/src/remote.hpp           |  1 -
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/firmware/src/credit.hpp b/firmware/src/credit.hpp
index 921843f5..a7eaa452 100644
--- a/firmware/src/credit.hpp
+++ b/firmware/src/credit.hpp
@@ -1,5 +1,4 @@
 #pragma once
-
 // defines
 
 // Arduino base libraries
diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp
index a037266f..24b57a5d 100644
--- a/firmware/src/main.cpp
+++ b/firmware/src/main.cpp
@@ -1,9 +1,11 @@
 // defines
 
 // Arduino base libraries
-#include <Arduino.h>
+// #include <Arduino.h>
 
 // third party libraries
+// #include <ArduinoHttpClient.h>
+// #include <Wire.h>
 
 // OpenSmartMeter libraries
 #include "credit.hpp"
diff --git a/firmware/src/opaygo_functions.hpp b/firmware/src/opaygo_functions.hpp
index c9983133..92caf57f 100644
--- a/firmware/src/opaygo_functions.hpp
+++ b/firmware/src/opaygo_functions.hpp
@@ -1,17 +1,16 @@
 #pragma once
 
-// defines
-
-// Arduino base libraries
-#include "Arduino.h"
-
-// third party libraries
-
 // OpenSmartMeter libraries
 #include "global_defines.hpp"
 #include "helpers.hpp"
 #include "mem_init.hpp"
 #include "time_management.hpp"
+
+// Arduino base libraries
+#include <inttypes.h>
+#include "Arduino.h"
+// #include <time.h>
+
 extern "C" {
 #include "opaygo_decoder.h"
 }
diff --git a/firmware/src/remote.hpp b/firmware/src/remote.hpp
index bd69a69c..6bc947ae 100644
--- a/firmware/src/remote.hpp
+++ b/firmware/src/remote.hpp
@@ -8,7 +8,6 @@
 #include "Arduino.h"
 
 // third party libraries
-#include <ArduinoHttpClient.h>
 #include <TinyGsmClient.h>
 
 // OpenSmartMeter libraries