Applied pre-commit on v1.0 source

src/calc.cpp

@@ -35,7 +35,8 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
   int noAngles = 0;
   RawFormulaData fd2;
 
-  // Check how many valid values we have got and make sure we have a full series.
+  // Check how many valid values we have got and make sure we have a full
+  // series.
   for (int i = 0; i < FORMULA_DATA_SIZE; i++) {
     if (fd.a[i]) {
       fd2.a[noAngles] = fd.a[i];
@@ -50,7 +51,7 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
       order, noAngles);
 #endif
 
-  if (noAngles <3) {
+  if (noAngles < 3) {
     ErrorFileLog errLog;
     errLog.addEntry(F("CALC: Not enough values for deriving formula"));
     return ERR_FORMULA_NOTENOUGHVALUES;
@@ -62,7 +63,8 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
     // Returned value is 0 if no error
     if (ret == 0) {
 #if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
-      Log.verbose(F("CALC: Finshied processing data points, order = %d." CR), order);
+      Log.verbose(F("CALC: Finshied processing data points, order = %d." CR),
+                  order);
 #endif
 
       // Print the formula based on 'order'

src/config.cpp

@@ -479,7 +479,8 @@ bool AdvancedConfig::loadFile() {
   if (!doc[PARAM_HW_PUSH_INTERVAL_MQTT].isNull())
     this->setPushIntervalMqtt(doc[PARAM_HW_PUSH_INTERVAL_MQTT].as<int>());
   if (!doc[PARAM_HW_TEMPSENSOR_RESOLUTION].isNull())
-    this->setTempSensorResolution(doc[PARAM_HW_TEMPSENSOR_RESOLUTION].as<int>());
+    this->setTempSensorResolution(
+        doc[PARAM_HW_TEMPSENSOR_RESOLUTION].as<int>());
   if (!doc[PARAM_HW_IGNORE_LOW_ANGLES].isNull())
     setIgnoreLowAnges(doc[PARAM_HW_IGNORE_LOW_ANGLES].as<bool>());
 

src/config.hpp

@@ -88,8 +88,7 @@ class AdvancedConfig {
 
   int getTempSensorResolution() { return _tempSensorResolution; }
   void setTempSensorResolution(int t) {
-    if (t>=9 && t<=12)
+    if (t >= 9 && t <= 12) _tempSensorResolution = t;
-      _tempSensorResolution = t; 
   }
 
   float getDefaultCalibrationTemp() { return _defaultCalibrationTemp; }
@@ -130,9 +129,7 @@ class AdvancedConfig {
   }
 
   const bool isIgnoreLowAnges() { return _IgnoreLowAnges; }
-  void setIgnoreLowAnges(bool b) {
+  void setIgnoreLowAnges(bool b) { _IgnoreLowAnges = b; }
-    _IgnoreLowAnges = b;
-  }
 
   bool saveFile();
   bool loadFile();

src/helper.cpp

@@ -318,7 +318,9 @@ void PerfLogging::pushInflux() {
   if (!myConfig.isInfluxDb2Active()) return;
 
   if (myConfig.isInfluxSSL()) {
-    Log.warning(F("PERF: InfluxDB2 with SSL is not supported when pushing performance data, skipping" CR));
+    Log.warning(
+        F("PERF: InfluxDB2 with SSL is not supported when pushing performance "
+          "data, skipping" CR));
     return;
   }
 

src/main.cpp

@@ -32,7 +32,7 @@ SOFTWARE.
 #include <webserver.hpp>
 #include <wifi.hpp>
 
-//#define FORCE_GRAVITY_MODE
+// #define FORCE_GRAVITY_MODE
 
 // Define constats for this program
 #ifdef DEACTIVATE_SLEEPMODE
@@ -275,8 +275,11 @@ bool loopReadGravity() {
     bool pushExpired = (abs((int32_t)(millis() - pushMillis)) >
                         (myConfig.getSleepInterval() * 1000));
 
-    if (myAdvancedConfig.isIgnoreLowAnges() && (angle < myConfig.getFormulaData().a[0]) ) {
+    if (myAdvancedConfig.isIgnoreLowAnges() &&
-      Log.warning(F("Main: Angle is lower than water, so we regard this as faulty and dont send any data." CR));
+        (angle < myConfig.getFormulaData().a[0])) {
+      Log.warning(
+          F("Main: Angle is lower than water, so we regard this as faulty and "
+            "dont send any data." CR));
       pushExpired = false;
     }
 

src/pushtarget.cpp

@@ -204,9 +204,11 @@ void PushTarget::sendInfluxDb2(TemplatingEngine& engine, bool isSecure) {
   String auth = "Token " + String(myConfig.getInfluxDb2PushToken());
 
   if (isSecure) {
-#if defined( ESP8266 )
+#if defined(ESP8266)
     if (runMode == RunMode::configurationMode) {
-      Log.notice(F("PUSH: Skipping InfluxDB since SSL is enabled and we are in config mode." CR));
+      Log.notice(
+          F("PUSH: Skipping InfluxDB since SSL is enabled and we are in config "
+            "mode." CR));
       _lastCode = -100;
       return;
     }
@@ -293,9 +295,11 @@ void PushTarget::sendHttpPost(TemplatingEngine& engine, bool isSecure,
 #endif
 
   if (isSecure) {
-#if defined( ESP8266 )
+#if defined(ESP8266)
     if (runMode == RunMode::configurationMode) {
-      Log.notice(F("PUSH: Skipping HTTP since SSL is enabled and we are in config mode." CR));
+      Log.notice(
+          F("PUSH: Skipping HTTP since SSL is enabled and we are in config "
+            "mode." CR));
       _lastCode = -100;
       return;
     }
@@ -370,9 +374,11 @@ void PushTarget::sendHttpGet(TemplatingEngine& engine, bool isSecure) {
 #endif
 
   if (isSecure) {
-#if defined( ESP8266 )
+#if defined(ESP8266)
     if (runMode == RunMode::configurationMode) {
-      Log.notice(F("PUSH: Skipping HTTP since SSL is enabled and we are in config mode." CR));
+      Log.notice(
+          F("PUSH: Skipping HTTP since SSL is enabled and we are in config "
+            "mode." CR));
       _lastCode = -100;
       return;
     }
@@ -424,9 +430,11 @@ void PushTarget::sendMqtt(TemplatingEngine& engine, bool isSecure) {
   int port = myConfig.getMqttPort();
 
   if (myConfig.isMqttSSL()) {
-#if defined( ESP8266 )
+#if defined(ESP8266)
     if (runMode == RunMode::configurationMode) {
-      Log.notice(F("PUSH: Skipping MQTT since SSL is enabled and we are in config mode." CR));
+      Log.notice(
+          F("PUSH: Skipping MQTT since SSL is enabled and we are in config "
+            "mode." CR));
       _lastCode = -100;
       return;
     }

src/pushtarget.hpp

@@ -45,7 +45,7 @@ class PushTarget {
   void sendHttpPost(TemplatingEngine& engine, bool isSecure, int index);
   void sendHttpGet(TemplatingEngine& engine, bool isSecure);
   void addHttpHeader(HTTPClient& http, String header);
-  void probeMaxFragement( String& serverPath );
+  void probeMaxFragement(String& serverPath);
 
  public:
   void sendAll(float angle, float gravitySG, float corrGravitySG, float tempC,
@@ -68,7 +68,7 @@ class PushTarget {
 
 class PushIntervalTracker {
  private:
-  int _counters[5] = { 0, 0, 0, 0, 0 };
+  int _counters[5] = {0, 0, 0, 0, 0};
   void update(const int index, const int defaultValue);
 
  public:

src/tempsensor.cpp

@@ -51,7 +51,8 @@ void TempSensor::setup() {
 
   if (mySensors.getDS18Count()) {
 #if !defined(TSEN_DISABLE_LOGGING)
-    Log.notice(F("TSEN: Found %d temperature sensor(s). Using %d resolution" CR),
+    Log.notice(
+        F("TSEN: Found %d temperature sensor(s). Using %d resolution" CR),
         mySensors.getDS18Count(), myAdvancedConfig.getTempSensorResolution());
 #endif
   }

src/webserver.cpp

@@ -695,7 +695,9 @@ void WebServerHandler::webHandleConfigAdvancedWrite() {
         _server->arg(PARAM_HW_TEMPSENSOR_RESOLUTION).toInt());
   if (_server->hasArg(PARAM_HW_IGNORE_LOW_ANGLES))
     myAdvancedConfig.setIgnoreLowAnges(
-        _server->arg(PARAM_HW_IGNORE_LOW_ANGLES).equalsIgnoreCase("on") ? true : false);
+        _server->arg(PARAM_HW_IGNORE_LOW_ANGLES).equalsIgnoreCase("on")
+            ? true
+            : false);
   else
     myAdvancedConfig.setIgnoreLowAnges(false);
 
@@ -1195,7 +1197,7 @@ bool WebServerHandler::setupWebServer() {
   MDNS.addService("http", "tcp", 80);
 
   // Show files in the filessytem at startup
-#if defined( ESP8266 )
+#if defined(ESP8266)
   FSInfo fs;
   LittleFS.info(fs);
   Log.notice(F("WEB : File system Total=%d, Used=%d." CR), fs.totalBytes,
@@ -1213,8 +1215,7 @@ bool WebServerHandler::setupWebServer() {
   File root = LittleFS.open("/");
   File f = root.openNextFile();
   while (f) {
-    Log.notice(F("WEB : File=%s, %d bytes" CR), f.name(),
+    Log.notice(F("WEB : File=%s, %d bytes" CR), f.name(), f.size());
-               f.size());
     if (!f.size()) {
       Log.notice(F("WEB : Empty file detected, removing file." CR));
       LittleFS.remove(f.name());

src/webserver.hpp

@@ -31,9 +31,9 @@ SOFTWARE.
 #define MAX_SKETCH_SPACE 1044464
 #else  // defined (ESP32)
 #include <ESPmDNS.h>
+#include <Update.h>
 #include <WebServer.h>
 #include <WiFi.h>
-#include <Update.h>
 #define MAX_SKETCH_SPACE 1835008
 #endif
 #include <incbin.h>

src/wifi.cpp

@@ -285,8 +285,8 @@ bool WifiConnection::connect() {
       connectAsync(1);
 
       if (waitForConnection(timeout)) {
-        Log.notice(
+        Log.notice(F("WIFI: Connected to second SSID %s, making secondary "
-            F("WIFI: Connected to second SSID %s, making secondary default." CR),
+                     "default." CR),
                    myConfig.getWifiSSID(1));
 
         myConfig.swapPrimaryWifi();