From 5c2968eead4b937818ed7f08cec68ff3386f212e Mon Sep 17 00:00:00 2001 From: StrangeD0s <47105931+StrangeD0s@users.noreply.github.com> Date: Wed, 24 Jul 2024 00:37:00 +0200 Subject: [PATCH] move wifi and sd init functions to cpp file --- arduino-sony-minidisc-ir-remote.ino | 14 +++---- initfunctions.cpp | 63 +++++++++++++++++++++++++++++ initfunctions.h | 17 ++++++++ 3 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 initfunctions.cpp create mode 100644 initfunctions.h diff --git a/arduino-sony-minidisc-ir-remote.ino b/arduino-sony-minidisc-ir-remote.ino index dc77f84..7600be6 100644 --- a/arduino-sony-minidisc-ir-remote.ino +++ b/arduino-sony-minidisc-ir-remote.ino @@ -46,6 +46,7 @@ #include #include "secrets.h" #include "defines.h" +#include "initfunctions.h" //------------------------------------------------ @@ -144,7 +145,6 @@ bool wasNumber = false; // Create AsyncWebServer object on port 80 AsyncWebServer server(80); -// WiFiServer server(80); const char *PARAM_MESSAGE = "message"; @@ -155,7 +155,7 @@ void notFound(AsyncWebServerRequest *request) //------------------------------------------------ //-------------- SD-Card Functions --------------- -void initSDCard() +/* void initSDCard() { if (!SD.begin()) { @@ -188,9 +188,9 @@ void initSDCard() } uint64_t cardSize = SD.cardSize() / (1024 * 1024); Serial.printf("SD Card Size: %lluMB\n", cardSize); -} +} */ -void listDir(fs::FS &fs, const char *dirname, uint8_t levels) +/* void listDir(fs::FS &fs, const char *dirname, uint8_t levels) { Serial.printf("Listing directory: %s\n", dirname); @@ -227,7 +227,7 @@ void listDir(fs::FS &fs, const char *dirname, uint8_t levels) } file = root.openNextFile(); } -} +} */ //------------------------------------------------ //--------------- IR Functions ------------------- @@ -342,7 +342,7 @@ void nameAllTracks(String message) //------------------------------------------------ //------------- Webserver Functions -------------- -void initWiFi() +/* void initWiFi() { WiFi.mode(WIFI_STA); WiFi.begin(SSID, PASSWORD); @@ -353,7 +353,7 @@ void initWiFi() delay(1000); } Serial.println(WiFi.localIP()); -} +} */ //------------------------------------------------ //-------------------- Setup --------------------- diff --git a/initfunctions.cpp b/initfunctions.cpp new file mode 100644 index 0000000..72526d0 --- /dev/null +++ b/initfunctions.cpp @@ -0,0 +1,63 @@ +#include "initfunctions.h" + +//------------------------------------------------ +//-------------- SD-Card Functions --------------- +void initSDCard() +{ + if (!SD.begin()) + { + Serial.println("Card Mount Failed"); + return; + } + uint8_t cardType = SD.cardType(); + + if (cardType == CARD_NONE) + { + Serial.println("No SD card attached"); + return; + } + Serial.print("SD Card Type: "); + if (cardType == CARD_MMC) + { + Serial.println("MMC"); + } + else if (cardType == CARD_SD) + { + Serial.println("SDSC"); + } + else if (cardType == CARD_SDHC) + { + Serial.println("SDHC"); + } + else + { + Serial.println("UNKNOWN"); + } + uint64_t cardSize = SD.cardSize() / (1024 * 1024); + Serial.printf("SD Card Size: %lluMB\n", cardSize); +} + +//------------------------------------------------ +//--------------- IR Functions ------------------- +/* void initIR() +{ + IrSender.begin(IR_SEND_PIN, ENABLE_LED_FEEDBACK, USE_DEFAULT_FEEDBACK_LED_PIN); // Specify send pin and enable feedback LED at default feedback LED pin + Serial.println(); + Serial.print(F("Send IR signals at pin ")); + Serial.println(IR_SEND_PIN); +} */ + +//------------------------------------------------ +//------------- Webserver Functions -------------- +void initWiFi() +{ + WiFi.mode(WIFI_STA); + WiFi.begin(SSID, PASSWORD); + Serial.print("Connecting to WiFi .."); + while (WiFi.status() != WL_CONNECTED) + { + Serial.print('.'); + delay(1000); + } + Serial.println(WiFi.localIP()); +} \ No newline at end of file diff --git a/initfunctions.h b/initfunctions.h new file mode 100644 index 0000000..4ec791f --- /dev/null +++ b/initfunctions.h @@ -0,0 +1,17 @@ +#ifndef INITFUNCTIONS_H +#define INITFUNCTIONS_H + +#include +#include +#include "FS.h" +#include "SD.h" +#include "SPI.h" +//#include +#include "defines.h" +#include "secrets.h" + +void initSDCard(); +//void initIR(); +void initWiFi(); + +#endif