v2.5

Author: s60sc

ESP32_SpecificGravity.ino

@@ -3,12 +3,13 @@
 // where tilt angle varies with wort density.
 // Tilt Angle is calculated assuming device only has rotational (not linear) motion
 // Specific Gravity is calculated from the tilt angle with reference to a nth order polynomial 
-// - for this implementation only a first order is used with 2 data points
+// - for this implementation, only a first order is used with 2 data points
 // See README.md for more info.
 //
 // Connections:
 // MPU6050  ESP32
-// ADO      GND
+// INT      n/c // interrupt
+// ADO      3V3 // address select
 // SDA      GPIO 21 (green)
 // SCL      GPIO 22 (yellow)
 // GND      GND (brown)
@@ -39,7 +40,7 @@ void setup() {
 
   // connect wifi or start config AP if router details not available
   startWifi(); 
-  
+
   startWebServer();
   if (strlen(startupFailure)) LOG_WRN("%s", startupFailure);
   else {
@@ -50,5 +51,5 @@ void setup() {
 }
 
 void loop() {
-  if (startedUp) SGloop();
+  startedUp ? SGloop() : delay(1000);
 }

appGlobals.h

@@ -14,7 +14,6 @@
 /*********************** Fixed defines leave as is ***********************/ 
 /** Do not change anything below here unless you know what you are doing **/
 
-//#define DEV_ONLY // leave commented out
 #define STATIC_IP_OCTAL "123" // dev only
 #define DEBUG_MEM false // leave as false
 #define FLUSH_DELAY 0 // for debugging crashes
@@ -24,7 +23,7 @@
 #define USE_IP6 false
 
 #define APP_NAME "ESP32_SG" // max 15 chars
-#define APP_VER "2.4"
+#define APP_VER "2.5"
 
 #define HTTP_CLIENTS 2 // http, ws
 #define MAX_STREAMS 0
@@ -45,18 +44,21 @@
 #define WARN_ALLOC (16 * 1024) // low free max allocatable free heap block
 #define MAX_ALERT 1024
 
-#define INCLUDE_FTP_HFS false // ftp.cpp (file upload)
-#define INCLUDE_SMTP false    // smtp.cpp (email)
-#define INCLUDE_MQTT false    // mqtt.cpp
-#define INCLUDE_TGRAM false   // telegram.cpp
-#define INCLUDE_CERTS false   // certificates.cpp (https and server certificate checking)
 #define INCLUDE_WEBDAV true   // webDav.cpp (WebDAV protocol)
+#define INCLUDE_PERIPH true   // peripherals.cpp
+#define INCLUDE_I2C true      // periphsI2C.cpp
 
-#define IS_IO_EXTENDER false // must be false except for IO_Extender
-#define EXTPIN 100
+// I2C devices 
+#define USE_SSD1306 false
+#define USE_BMP280 false
+#define USE_MPU6050 true
+#define USE_MPU9250 false
+#define USE DS3231 false
+#define USE_LCD1602 false
+#define USE_DS18B20 false
 
 // to determine if newer data files need to be loaded
-#define CFG_VER 3
+#define CFG_VER 4
 
 #ifdef CONFIG_IDF_TARGET_ESP32S3 
 #define SERVER_STACK_SIZE (1024 * 8)
@@ -89,33 +91,18 @@
 #define SERVO_PRI 1
 #define UART_PRI 1
 #define BATT_PRI 1
-#define IDLEMON_PRI 5
-
-// devices requiring separate libraries
-#define USE_BMP280 false
-#define USE DS3231 false
-#define USE_SSD1306 false
-#define USE_DS18B20 false
-
-// devices not requiring separate libraries
-#define USE_LCD1602 false
-#define USE_PCF8591 false
-#define USE_MPU6050 true
 
 #define FILE_EXT ""
 
+enum stepperModel {BYJ_48, BIPOLAR_8mm};
 
 /******************** Function declarations *******************/
 
 // global app specific functions
 bool SGsetup();
 void SGloop();
-bool checkMPU6050();
-float* readMPU6050();
+float* getMPU6050();
 bool sleepMPU6050(bool doSleep = true);
-float* getBMP280();
-bool checkI2Cdevices(bool showWarn = false);
-bool startI2C();
 void setLamp(uint8_t lampVal);
 void stepperDone();
 
@@ -130,6 +117,3 @@ extern bool voltUse; // true to report on ADC pin eg for for battery
 extern int voltDivider;
 extern float voltLow;
 extern int voltInterval;
-
-extern int I2C_SDA;
-extern int I2C_SCL;

appSpecific.cpp

@@ -37,7 +37,7 @@ char SGdata[150];
 
 static void calculateSG() {
   // get data from MPU6050
-  float* mpuData = readMPU6050();
+  float* mpuData = getMPU6050();
   // axis used for pitch is whichever is linear to PETling length
   // generally this will be the X axis
   // get tilt angle (pitch) wrt to horizontal in degrees
@@ -126,7 +126,7 @@ bool SGsetup() {
     updateStatus("save", "1");
   }
   prepPeripherals();
-  if (startI2C()) {
+  if (prepI2C()) {
     // setup battery monitoring 
     float voltage = readVoltage();
     LOG_INF("Battery voltage: %0.1f", voltage);
@@ -199,8 +199,8 @@ bool updateAppStatus(const char* variable, const char* value, bool fromUser) {
   else if (!strcmp(variable, "voltInterval")) voltInterval = intVal;
   else if (!strcmp(variable, "hostInterval")) hostInterval = intVal;
   else if (!strcmp(variable, "wsServerHost")) strcpy(wsServerHost, value);
-  else if (!strcmp(variable, "I2C_SDA")) I2C_SDA = intVal;
-  else if (!strcmp(variable, "I2C_SCL")) I2C_SCL = intVal;
+  else if (!strcmp(variable, "I2Csda")) I2Csda = intVal;
+  else if (!strcmp(variable, "I2Cscl")) I2Cscl = intVal;
   else if (!strcmp(variable, "timeAwake")) timeAwake = intVal;
   else if (!strcmp(variable, "timeAsleep")) timeAsleep = intVal;
   else if (!strcmp(variable, "LED_PIN")) LED_PIN = intVal;
@@ -250,7 +250,7 @@ void buildAppJsonString(bool filter) {
 }
 
 esp_err_t appSpecificWebHandler(httpd_req_t *req, const char* variable, const char* value) {
-  return ESP_OK;
+  return ESP_FAIL;
 }
 
 esp_err_t appSpecificSustainHandler(httpd_req_t* req) {
@@ -307,8 +307,8 @@ voltLow~3~1~N~Warning level for low voltage
 voltInterval~5~1~N~Voltage check interval (mins)
 voltPin~34~1~N~ADC Pin used for battery voltage
 voltUse~1~1~C~Use Voltage check
-I2C_SDA~21~1~N~I2C SDA pin
-I2C_SCL~22~1~N~I2C SCL pin
+I2Csda~21~1~N~I2C SDA pin
+I2Cscl~22~1~N~I2C SCL pin
 wsServerHost~192.168.1.122~0~T~IP address of remote client
 hostInterval~10~0~N~Remote client update interval (secs)
 LED_PIN~5~1~N~Pin for awake blink led

globals.h

@@ -3,18 +3,26 @@
 // s60sc 2021, 2022
 
 #include "esp_arduino_version.h"
+
+#if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 1, 1)
+#error Must be compiled with arduino-esp32 core v3.1.1 or higher
+#endif
+
 #pragma once
+
+//#define DEV_ONLY // leave commented out
+#ifdef DEV_ONLY
 // to compile with -Wall -Werror=all -Wextra
+#pragma GCC diagnostic error "-Wformat=2"
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#pragma GCC diagnostic ignored "-Wformat-y2k"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 //#pragma GCC diagnostic ignored "-Wunused-variable"
 //#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 //#pragma GCC diagnostic ignored "-Wignored-qualifiers"
 //#pragma GCC diagnostic ignored "-Wclass-memaccess"
-#if (ESP_ARDUINO_VERSION_MAJOR >= 3)
 #pragma GCC diagnostic ignored "-Wvolatile"
-#else
-#pragma GCC diagnostic ignored "-Wformat"
 #endif
 
 /******************** Libraries *******************/
@@ -26,18 +34,16 @@
 #include "ping/ping_sock.h"
 #include <Preferences.h>
 #include <regex>
-#if !CONFIG_IDF_TARGET_ESP32C3
+#if (!CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32S2)
 #include <SD_MMC.h>
 #endif
 #include <LittleFS.h>
 #include <sstream>
 #include <Update.h>
 #include <WiFi.h>
 #include <HTTPClient.h>
-////#include <NetworkClient.h> // v3.x only
-////#include <NetworkClientSecure.h> // v3.x only
-#include <WiFiClient.h>
-#include <WiFiClientSecure.h>
+#include <NetworkClient.h> 
+#include <NetworkClientSecure.h> 
 #include <esp_http_server.h>
 #include <esp_https_server.h>
 
@@ -81,7 +87,7 @@
 #define RAM_LOG_LEN (1024 * 7) // size of system message log in bytes stored in slow RTC ram (max 8KB - vars)
 #define MIN_STACK_FREE 512
 #define STARTUP_FAIL "Startup Failure: "
-#define MAX_PAYLOAD_LEN 256 // set bigger than any websocket payload
+#define MAX_PAYLOAD_LEN 672 // set bigger than any incoming websocket payload (20ms audio)
 #define NULL_TEMP -127
 #define OneMHz 1000000
 #define USECS 1000000
@@ -103,8 +109,10 @@ void buildJsonString(uint8_t filter);
 bool calcProgress(int progressVal, int totalVal, int percentReport, uint8_t &pcProgress);
 bool changeExtension(char* fileName, const char* newExt);
 bool checkAlarm();
+bool checkAuth(httpd_req_t* req);
 bool checkDataFiles();
 bool checkFreeStorage();
+bool checkI2Cdevice(const char* devName);
 void checkMemory(const char* source = "");
 uint32_t checkStackUse(TaskHandle_t thisTask, int taskIdx);
 void debugMemory(const char* caller);
@@ -128,11 +136,13 @@ char* fmtSize (uint64_t sizeVal);
 void forceCrash();
 void formatElapsedTime(char* timeStr, uint32_t timeVal, bool noDays = false);
 void formatHex(const char* inData, size_t inLen);
+bool formatSDcard();
 bool fsStartTransfer(const char* fileFolder);
 const char* getEncType(int ssidIndex);
 void getExtIP();
 time_t getEpoch();
 size_t getFreeStorage();
+uint32_t getFrequency();
 bool getLocalNTP();
 float getNTCcelsius(uint16_t resistance, float oldTemp);
 void goToSleep(int wakeupPin, bool deepSleep);
@@ -147,24 +157,27 @@ void logPrint(const char *fmtStr, ...);
 void logSetup();
 void OTAprereq();
 bool parseJson(int rxSize);
+bool prepFreq(int maxFreq, int sampleInterval);
+bool prepI2C();
 void prepPeripherals();
 void prepSMTP();
 bool prepTelegram();
 void prepTemperature();
-void prepUart();
 void prepUpload();
 void reloadConfigs();
+float readInternalTemp();
 float readTemperature(bool isCelsius, bool onlyDS18 = false);
 float readVoltage();
 void remote_log_init();
-void remoteServerClose(WiFiClientSecure& sclient);
-bool remoteServerConnect(WiFiClientSecure& sclient, const char* serverName, uint16_t serverPort, const char* serverCert, uint8_t connIdx);
+void remoteServerClose(NetworkClientSecure& sclient);
+bool remoteServerConnect(NetworkClientSecure& sclient, const char* serverName, uint16_t serverPort, const char* serverCert, uint8_t connIdx);
 void remoteServerReset();
 void removeChar(char* s, char c);
 void replaceChar(char* s, char c, char r);
 void reset_log();
 void resetWatchDog();
 bool retrieveConfigVal(const char* variable, char* value);
+void runTaskStats();
 esp_err_t sendChunks(File df, httpd_req_t *req, bool endChunking = true);
 void setFolderName(const char* fname, char* fileName);
 void setPeripheralResponse(const byte pinNum, const uint32_t responseData);
@@ -187,12 +200,13 @@ void urlDecode(char* inVal);
 bool urlEncode(const char* inVal, char* encoded, size_t maxSize);
 uint32_t usePeripheral(const byte pinNum, const uint32_t receivedData);
 esp_sleep_wakeup_cause_t wakeupResetReason();
-void wsAsyncSend(const char* wsData);
+void wsAsyncSendBinary(uint8_t* data, size_t len);
+bool wsAsyncSendText(const char* wsData);
 // mqtt.cpp
 void startMqttClient();  
 void stopMqttClient();  
 void mqttPublish(const char* payload);
-void mqttPublishPath(const char* suffix, const char* payload);
+void mqttPublishPath(const char* suffix, const char* payload, const char *device = "sensor");
 // telegram.cpp
 bool getTgramUpdate(char* response);
 bool sendTgramMessage(const char* info, const char* item, const char* parseMode);
@@ -238,6 +252,8 @@ extern bool doGetExtIP;
 extern bool usePing; // set to false if problems related to this issue occur: https://github.com/s60sc/ESP32-CAM_MJPEG2SD/issues/221
 extern bool wsLog;
 extern uint16_t sustainId;
+extern bool heartBeatDone;
+extern TaskHandle_t heartBeatHandle;
 
 // remote file server
 extern char fsServer[];
@@ -300,11 +316,14 @@ extern char messageLog[];
 extern uint16_t mlogEnd;
 extern bool timeSynchronized;
 extern bool monitorOpen; 
-extern const char* setupPage_html;
+extern const uint8_t setupPage_html_gz[];
+extern const size_t setupPage_html_gz_len;
 extern const char* otaPage_html;
-extern SemaphoreHandle_t wsSendMutex;
+extern const char* failPageS_html;
+extern const char* failPageE_html;
 extern char startupFailure[];
 extern time_t currEpoch;
+extern bool RCactive;
 
 extern UBaseType_t uxHighWaterMarkArr[];
 
@@ -313,6 +332,10 @@ extern int sdMinCardFreeSpace; // Minimum amount of card free Megabytes before f
 extern int sdFreeSpaceMode; // 0 - No Check, 1 - Delete oldest dir, 2 - Upload to ftp and then delete folder on SD 
 extern bool formatIfMountFailed ; // Auto format the file system if mount failed. Set to false to not auto format.
 
+// I2C pins
+extern int I2Csda;
+extern int I2Cscl;
+
 #define HTTP_METHOD_STRING(method) \
   (method == HTTP_DELETE) ? "DELETE" : \
   (method == HTTP_GET) ? "GET" : \
@@ -354,15 +377,18 @@ enum RemoteFail {SETASSIST, GETEXTIP, TGRAMCONN, FSFTP, EMAILCONN, EXTERNALHB, B
 /*********************** Log formatting ************************/
 
 //#define USE_LOG_COLORS  // uncomment to colorise log messages (eg if using idf.py, but not arduino)
-#ifdef USE_LOG_COLORS
+#ifdef USE_LOG_COLORS 
+// ANSI color codes
 #define LOG_COLOR_ERR  "\033[0;31m" // red
 #define LOG_COLOR_WRN  "\033[0;33m" // yellow
 #define LOG_COLOR_VRB  "\033[0;36m" // cyan
-#define LOG_NO_COLOR   "\033[0m"
+#define LOG_COLOR_DBG  "\033[0;34m" // blue
+#define LOG_NO_COLOR   
 #else
 #define LOG_COLOR_ERR
 #define LOG_COLOR_WRN
 #define LOG_COLOR_VRB
+#define LOG_COLOR_DBG
 #define LOG_NO_COLOR
 #endif 
 
@@ -375,6 +401,6 @@ enum RemoteFail {SETASSIST, GETEXTIP, TGRAMCONN, FSFTP, EMAILCONN, EXTERNALHB, B
 #define LOG_ERR(format, ...) logPrint(ERR_FORMAT(format "~"), ##__VA_ARGS__)
 #define VRB_FORMAT(format) LOG_COLOR_VRB "[%s VERBOSE @ %s:%u] " format LOG_NO_COLOR "\n", esp_log_system_timestamp(), pathToFileName(__FILE__), __LINE__
 #define LOG_VRB(format, ...) if (dbgVerbose) logPrint(VRB_FORMAT(format), ##__VA_ARGS__)
-#define DBG_FORMAT(format) LOG_COLOR_ERR "[###### DBG @ %s:%u] " format LOG_NO_COLOR "\n", pathToFileName(__FILE__), __LINE__
+#define DBG_FORMAT(format) LOG_COLOR_DBG "[%s ### DEBUG @ %s:%u] " format LOG_NO_COLOR "\n", esp_log_system_timestamp(), pathToFileName(__FILE__), __LINE__
 #define LOG_DBG(format, ...) do { logPrint(DBG_FORMAT(format), ##__VA_ARGS__); delay(FLUSH_DELAY); } while (0)
 #define LOG_PRT(buff, bufflen) log_print_buf((const uint8_t*)buff, bufflen)