From 2d1317af0d8b45efea26e5c3d549efeebe20d092 Mon Sep 17 00:00:00 2001 From: Magnus Persson Date: Thu, 10 Mar 2022 11:11:39 +0100 Subject: [PATCH] Migrated to littlefs on esp32 + fix A0 pin --- src/helper.cpp | 4 ++-- src/main.hpp | 8 +++++--- src/wifi.cpp | 5 ----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/helper.cpp b/src/helper.cpp index afe15e8..fe2c425 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -92,7 +92,7 @@ void ErrorFileLog::addEntry(String err) { _errors[i] = _errors[i - 1]; } _errors[0] = err; - Log.errorln(err.c_str()); + Log.error(err.c_str()); save(); } @@ -232,7 +232,7 @@ void BatteryVoltage::read() { // The analog pin can only handle 3.3V maximum voltage so we need to reduce // the voltage (from max 5V) float factor = myConfig.getVoltageFactor(); // Default value is 1.63 - int v = analogRead(A0); + int v = analogRead(PIN_A0); // An ESP8266 has a ADC range of 0-1023 and a maximum voltage of 3.3V // An ESP32 has an ADC range of 0-4095 and a maximum voltage of 3.3V diff --git a/src/main.hpp b/src/main.hpp index 813b929..fde4dcf 100644 --- a/src/main.hpp +++ b/src/main.hpp @@ -28,22 +28,24 @@ SOFTWARE. #include #include #include +#include #if defined (ESP8266) -#include #define ESP_RESET ESP.reset #define PIN_SDA D3 #define PIN_SCL D4 #define PIN_DS D6 +#define PIN_A0 A0 #else // defined (ESP32) -#define LittleFS SPIFFS +#include +#define LittleFS LITTLEFS #define ESPhttpUpdate httpUpdate #define ESP_RESET ESP.restart #define ESP8266WebServer WebServer -#include #define PIN_SDA 17 #define PIN_SCL 16 #define PIN_DS 19 +#define PIN_A0 36 #endif #define PIN_LED 2 diff --git a/src/wifi.cpp b/src/wifi.cpp index 1daa30e..34368ee 100644 --- a/src/wifi.cpp +++ b/src/wifi.cpp @@ -39,13 +39,8 @@ SOFTWARE. #include // Settings for DRD -#if defined(ESP8266) #define ESP_DRD_USE_LITTLEFS true #define ESP_DRD_USE_SPIFFS false -#else // defined (ESP32) -#define ESP_DRD_USE_LITTLEFS false -#define ESP_DRD_USE_SPIFFS true -#endif #define ESP_DRD_USE_EEPROM false #include #define DRD_TIMEOUT 3