From ea1374fca06ab5fcdb5ffde995157c983e774ddb Mon Sep 17 00:00:00 2001
From: zzzz <alessioklesen@gmail.com>
Date: Thu, 2 May 2024 22:10:16 +0200
Subject: [PATCH] moved includes to headerfile, general cleanup

---
 src/main.cpp | 86 +++++++++++++++++-----------------------------------
 src/main.hpp | 23 +++++++++++++-
 2 files changed, 50 insertions(+), 59 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index eed09e3..7a4b4d1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,17 +1,4 @@
-#include <Arduino.h>
-#include <SPI.h>
-#include <Wire.h>
-#include <Adafruit_GFX.h>
-#include <Adafruit_SSD1306.h>
-#include <MFRC522.h>
-#include <FS.h>
-#include <LittleFS.h>
-#include <time.h>
-
-#include "TeaTimer.hpp"
-#include "ContinuousServo.hpp"
-#include "SmartDial.hpp"
-#include "SmartDisplay.hpp"
+#include "main.hpp"
 
 #define WIRE Wire
 
@@ -43,11 +30,6 @@ enum State
 };
 State state = State::DISPLAY_SCANNED_TEA_CONFIG;
 
-void serial_dump_byte_array(byte *buffer, byte bufferSize);
-void oled_dump_byte_array(byte *buffer, byte bufferSize);
-void printMsg(const String &s);
-void printMsg(unsigned long l);
-
 void setup()
 {
   Serial.begin(9600);
@@ -57,9 +39,6 @@ void setup()
 
   Serial.println("Initializing RFID...");
   mfrc522.PCD_Init();
-  /*Serial.print(F("Ver: 0x"));
-  byte readReg = mfrc522.PCD_ReadRegister(mfrc522.VersionReg);
-  Serial.println(readReg, HEX);*/
   mfrc522.PICC_HaltA();
 
   Serial.println("Initializing OLED...");
@@ -74,41 +53,10 @@ void setup()
     key.keyByte[i] = 0xFF;
   }
 
-  Serial.println(F("Scan a MIFARE Classic PICC to demonstrate basic recognition."));
-  Serial.print(F("Using key (for A and B):"));
-  serial_dump_byte_array(key.keyByte, MFRC522::MF_KEY_SIZE);
-  Serial.println();
-
-  // teaTimer.init(&contServo);
-
   pinMode(LED_BUILTIN, OUTPUT);
   pinMode(TOUCH_BTN_PIN, INPUT);
 }
 
-void printMsg(const String &s)
-{
-  display.clearDisplay();
-  display.setTextColor(WHITE);
-  display.setTextSize(1);
-  display.setCursor(0, 10);
-  display.println(s);
-  display.display();
-}
-void printMsg(unsigned long l)
-{
-  display.clearDisplay();
-  display.setTextColor(WHITE);
-  display.setTextSize(1);
-  display.setCursor(0, 10);
-  display.println(l);
-  display.display();
-}
-
-bool isBtnPressed()
-{
-  return digitalRead(TOUCH_BTN_PIN) == HIGH;
-}
-
 int steepingSeconds = 60;
 void loop()
 {
@@ -136,11 +84,6 @@ void loop()
     display.display();
     delay(1000);
 
-    // PICC type, e.g. "MIFARE 1K0"
-    // Serial.print(F("PICC type: "));
-    // MFRC522::PICC_Type piccType = mfrc522.PICC_GetType(mfrc522.uid.sak);
-    // Serial.println(mfrc522.PICC_GetTypeName(piccType));
-
     // Halt PICC
     mfrc522.PICC_HaltA();
 
@@ -195,6 +138,11 @@ void toggle_led()
   digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
 }
 
+bool isBtnPressed()
+{
+  return digitalRead(TOUCH_BTN_PIN) == HIGH;
+}
+
 /**
  * Helper routine to dump a byte array as hex values to Serial.
  */
@@ -206,6 +154,9 @@ void serial_dump_byte_array(byte *buffer, byte bufferSize)
     Serial.print(buffer[i], HEX);
   }
 }
+/**
+ * Helper routine to dump a byte array as hex values to OLED.
+ */
 void oled_dump_byte_array(byte *buffer, byte bufferSize)
 {
   for (byte i = 0; i < bufferSize; i++)
@@ -213,4 +164,23 @@ void oled_dump_byte_array(byte *buffer, byte bufferSize)
     display.print(buffer[i] < 0x10 ? " 0" : " ");
     display.print(buffer[i], HEX);
   }
+}
+
+void printMsg(const String &s)
+{
+  display.clearDisplay();
+  display.setTextColor(WHITE);
+  display.setTextSize(1);
+  display.setCursor(0, 10);
+  display.println(s);
+  display.display();
+}
+void printMsg(unsigned long l)
+{
+  display.clearDisplay();
+  display.setTextColor(WHITE);
+  display.setTextSize(1);
+  display.setCursor(0, 10);
+  display.println(l);
+  display.display();
 }
\ No newline at end of file
diff --git a/src/main.hpp b/src/main.hpp
index 43659e5..5425e6f 100644
--- a/src/main.hpp
+++ b/src/main.hpp
@@ -1 +1,22 @@
-bool toggle_led(void *);
\ No newline at end of file
+#include <Arduino.h>
+#include <SPI.h>
+#include <Wire.h>
+#include <Adafruit_GFX.h>
+#include <Adafruit_SSD1306.h>
+#include <MFRC522.h>
+#include <FS.h>
+#include <LittleFS.h>
+#include <time.h>
+
+#include "TeaTimer.hpp"
+#include "ContinuousServo.hpp"
+#include "SmartDial.hpp"
+#include "SmartDisplay.hpp"
+
+bool toggle_led(void *);
+void printMsg(const String &s);
+void printMsg(unsigned long l);
+bool isBtnPressed();
+
+void serial_dump_byte_array(byte *buffer, byte bufferSize);
+void oled_dump_byte_array(byte *buffer, byte bufferSize);
\ No newline at end of file