[Mois Labs] Format code with CLion

Author: amotl

moislabs/beescale-yun/beescale-yun.ino

@@ -57,9 +57,9 @@
 **********************************************************************************************************/
 
 // define individual values for used load cell type
-  //   loadCellZeroOffset: write down the sensor value of the scale with no load and adjust it
-  //   loadCellKgDivider: add a load with known weight in kg to the cell, note the sensor value, calculate
-  //   the value for the load and adjust it
+//   loadCellZeroOffset: write down the sensor value of the scale with no load and adjust it
+//   loadCellKgDivider: add a load with known weight in kg to the cell, note the sensor value, calculate
+//   the value for the load and adjust it
 // Vertauschte Anschlüsse der Wägezellen:
 long loadCellZeroOffset = 6100000;    //die mit den NICHT-versenkten schrauben (erhöhen um den offset zu senken und vice versa)
 long loadCellKgDivider = 5810000;
@@ -96,9 +96,12 @@ int switchPin = 11;   // switch is connected to pin 11
 uint16_t lux = 0;
 
 #include <ADS1231.h>
+
 ADS1231 loadCell;  // create ADS1231 object
 ADS1231 loadCell01;
+
 #include <RunningMedian.h>
+
 // RunningMedian sample size is 11
 RunningMedian weightSamples = RunningMedian(11);  // create RunningMedian object
 RunningMedian weightSamples01 = RunningMedian(11);
@@ -108,12 +111,14 @@ RunningMedian weightSamples01 = RunningMedian(11);
 
 #include <OneWire.h>
 #include <DallasTemperature.h>
+
 #define ONE_WIRE_BUS 4
 OneWire OneWire(ONE_WIRE_BUS);
 // Pass our OneWire reference to Dallas Temperature.
 DallasTemperature sensors(&OneWire);
 
 #include "DHT.h"
+
 #define DHT1PIN 2
 #define DHT2PIN 3
 #define DHT1TYPE DHT22
@@ -124,69 +129,68 @@ DHT dht2(DHT2PIN, DHT2TYPE);
 #include <Wire.h>
 #include <Adafruit_Sensor.h>
 #include "Adafruit_TSL2591.h"
+
 Adafruit_TSL2591 tsl = Adafruit_TSL2591(2591); // pass in a number for the sensor identifier
 
 // Forward declarations
 String getTimeStamp();
 
 // Function to read out weight cell.
 void getWeight(void) {
-  // ADS1231 ready?
-  if (loadCell.check())
-  {
-    for (int i = 0; i < 10; i++) {
-      delay(200);
-      // read input of ADS1231:
-      weightSensorValue = loadCell.readData();
-      weightSensorValue01 = loadCell01.readData();
-      // calculate weight in kg
-      weightKg = ((float)weightSensorValue - loadCellZeroOffset) / loadCellKgDivider;
-      weightKg01 = ((float)weightSensorValue01 - loadCellZeroOffset01) / loadCellKgDivider01;
-      // add data to runnig median sample
-      weightSamples.add(weightKg);
-      weightSamples01.add(weightKg01);
-    }
+    // ADS1231 ready?
+    if (loadCell.check()) {
+        for (int i = 0; i < 10; i++) {
+            delay(200);
+            // read input of ADS1231:
+            weightSensorValue = loadCell.readData();
+            weightSensorValue01 = loadCell01.readData();
+            // calculate weight in kg
+            weightKg = ((float) weightSensorValue - loadCellZeroOffset) / loadCellKgDivider;
+            weightKg01 = ((float) weightSensorValue01 - loadCellZeroOffset01) / loadCellKgDivider01;
+            // add data to runnig median sample
+            weightSamples.add(weightKg);
+            weightSamples01.add(weightKg01);
+        }
 //    weightKg = weightSamples.getAverage();
-    weightKg = weightSamples.getMedian();     // Besser, weil durch Ausreißer nicht beeinflusst. Der Median ist der Wert in der Mitte einer nach ihrer Größe geordneten Rangreihe.
-    weightKg01 = weightSamples01.getMedian();
-    //convert the sensor data from float to string
-    dtostrf(weightKg, 6, 3, cKg00);     // Achtung: String ist exakt 6 Zeichen lang, inkl. Punkt. Funktioniert nur für Gewichte von 10.000 bis 99.999kg!
-    dtostrf(weightKg01, 6, 3, cKg01);
-  }
+        weightKg = weightSamples.getMedian();     // Besser, weil durch Ausreißer nicht beeinflusst. Der Median ist der Wert in der Mitte einer nach ihrer Größe geordneten Rangreihe.
+        weightKg01 = weightSamples01.getMedian();
+        //convert the sensor data from float to string
+        dtostrf(weightKg, 6, 3,
+                cKg00);     // Achtung: String ist exakt 6 Zeichen lang, inkl. Punkt. Funktioniert nur für Gewichte von 10.000 bis 99.999kg!
+        dtostrf(weightKg01, 6, 3, cKg01);
+    }
 }
 
 void configureSensor(void)    // Configures the gain and integration time for the TSL2591
 {
-  tsl.setGain(TSL2591_GAIN_LOW);    // 1x gain (bright light)
-  // tsl.setGain(TSL2591_GAIN_MED);    // 25x gain
-  // tsl.setGain(TSL2591_GAIN_HIGH);   // 428x gain
-  // tsl.setTiming(TSL2591_INTEGRATIONTIME_100MS);  // shortest integration time (bright light)
-  // tsl.setTiming(TSL2591_INTEGRATIONTIME_200MS);
-  tsl.setTiming(TSL2591_INTEGRATIONTIME_300MS);
-  // tsl.setTiming(TSL2591_INTEGRATIONTIME_400MS);
-  // tsl.setTiming(TSL2591_INTEGRATIONTIME_500MS);
-  // tsl.setTiming(TSL2591_INTEGRATIONTIME_600MS);  // longest integration time (dim light)
-  //
-  // 25 gain/200ms ok for winter indoor. spring sun too bright.
-  //  1 gain/300ms ok for sunny spring morning
+    tsl.setGain(TSL2591_GAIN_LOW);    // 1x gain (bright light)
+    // tsl.setGain(TSL2591_GAIN_MED);    // 25x gain
+    // tsl.setGain(TSL2591_GAIN_HIGH);   // 428x gain
+    // tsl.setTiming(TSL2591_INTEGRATIONTIME_100MS);  // shortest integration time (bright light)
+    // tsl.setTiming(TSL2591_INTEGRATIONTIME_200MS);
+    tsl.setTiming(TSL2591_INTEGRATIONTIME_300MS);
+    // tsl.setTiming(TSL2591_INTEGRATIONTIME_400MS);
+    // tsl.setTiming(TSL2591_INTEGRATIONTIME_500MS);
+    // tsl.setTiming(TSL2591_INTEGRATIONTIME_600MS);  // longest integration time (dim light)
+    //
+    // 25 gain/200ms ok for winter indoor. spring sun too bright.
+    //  1 gain/300ms ok for sunny spring morning
 }
 
-void simpleRead(void)
-{
-  // Simple data read example. Just read the infrared, fullspecrtrum diode
-  // or 'visible' (difference between the two) channels.
-  // This can take 100-600 milliseconds! Uncomment whichever of the following you want to read
-  lux = tsl.getLuminosity(TSL2591_VISIBLE);
-  //uint16_t x = tsl.getLuminosity(TSL2591_FULLSPECTRUM);
-  //uint16_t x = tsl.getLuminosity(TSL2591_INFRARED);
+void simpleRead(void) {
+    // Simple data read example. Just read the infrared, fullspecrtrum diode
+    // or 'visible' (difference between the two) channels.
+    // This can take 100-600 milliseconds! Uncomment whichever of the following you want to read
+    lux = tsl.getLuminosity(TSL2591_VISIBLE);
+    //uint16_t x = tsl.getLuminosity(TSL2591_FULLSPECTRUM);
+    //uint16_t x = tsl.getLuminosity(TSL2591_INFRARED);
 }
 
 // Function to send values via GET request.
-void add_line()
-{
-  HttpClient client;
-  // convert the readings to a String to send it:
-    dataURL="http://www.euse.de/honig/beescale/add_line2.php?weight1=";
+void add_line() {
+    HttpClient client;
+    // convert the readings to a String to send it:
+    dataURL = "http://www.euse.de/honig/beescale/add_line2.php?weight1=";
     dataURL += cKg00;
     dataURL += "&weight2=";
     dataURL += cKg01;
@@ -204,8 +208,10 @@ void add_line()
     dataURL += t2;
     dataURL += "&lux=";
     dataURL += lux;
-  //log to console, view with ssh root@[yun-ip] 'telnet localhost 6571'
-    Console.print("Messwerte "); Console.print(getTimeStamp()); Console.println(":");
+    //log to console, view with ssh root@[yun-ip] 'telnet localhost 6571'
+    Console.print("Messwerte ");
+    Console.print(getTimeStamp());
+    Console.println(":");
     Console.print("Kiste1 kg: ");
     Console.print(weightKg, 3);
     Console.print(", Hum: ");
@@ -222,77 +228,75 @@ void add_line()
     Console.print(temp1);
     Console.print(", inside: ");
     Console.print(temp2);
-    Console.print(", Lux: "); Console.println(lux, DEC);
+    Console.print(", Lux: ");
+    Console.println(lux, DEC);
     Console.print("GET request: ");
     Console.println(dataURL);
-  //send data
+    //send data
     client.get(dataURL);
     Console.println("sending data...");
-  //if there's incoming data from the net connection send it out the console.
-    while (client.available())
-      {
-      char c = client.read();
-      Console.print(c);
-      }
+    //if there's incoming data from the net connection send it out the console.
+    while (client.available()) {
+        char c = client.read();
+        Console.print(c);
+    }
     Console.flush();
 }
 
-void add_line_sd()
-{
-  // make a string that starts with a timestamp for assembling the data to log:
-  String dataString;
-  dataString += getTimeStamp();
-  dataString += ",";
-  dataString += cKg00;
-  dataString += ",";
-  dataString += temp1;
-  dataString += ",0,";
-  dataString += lux;
-  dataString += ",";
-  dataString += cKg01;
-  dataString += ",";
-  dataString += temp2;
-  dataString += ",";
-  dataString += h1;
-  dataString += ",";
-  dataString += t1;
-  dataString += ",";
-  dataString += h2;
-  dataString += ",";
-  dataString += t2;
-  File  dataFile = FileSystem.open("/mnt/sda1/arduino/www/datalog.txt", FILE_APPEND);
-  // if the file is available, write to it:
-  if (dataFile) {
-    Console.print("Writing to Yun SD... ");
-    dataFile.println(dataString);
-    dataFile.close();
-    // print to the serial port too:
-    Console.println("OK.");
+void add_line_sd() {
+    // make a string that starts with a timestamp for assembling the data to log:
+    String dataString;
+    dataString += getTimeStamp();
+    dataString += ",";
+    dataString += cKg00;
+    dataString += ",";
+    dataString += temp1;
+    dataString += ",0,";
+    dataString += lux;
+    dataString += ",";
+    dataString += cKg01;
+    dataString += ",";
+    dataString += temp2;
+    dataString += ",";
+    dataString += h1;
+    dataString += ",";
+    dataString += t1;
+    dataString += ",";
+    dataString += h2;
+    dataString += ",";
+    dataString += t2;
+    File dataFile = FileSystem.open("/mnt/sda1/arduino/www/datalog.txt", FILE_APPEND);
+    // if the file is available, write to it:
+    if (dataFile) {
+        Console.print("Writing to Yun SD... ");
+        dataFile.println(dataString);
+        dataFile.close();
+        // print to the serial port too:
+        Console.println("OK.");
 //    Console.print("OK. File Size: "); Console.println(getLogSize());
-  }
-  // if the file isn't open, pop up an error:
-  else {
-    Console.println("error opening /mnt/sda1/arduino/www/datalog.txt");
-  }
+    }
+        // if the file isn't open, pop up an error:
+    else {
+        Console.println("error opening /mnt/sda1/arduino/www/datalog.txt");
+    }
 }
 
-String getTimeStamp()
-{
-  String result;
-  Process time;
-  // date is a command line utility to get the date and the time
-  // in different formats depending on the additional parameter
-  time.begin("date");
-  time.addParameter("+%Y/%m/%d %T");
-  time.run();  // run the command
-  // read the output of the command
-  while (time.available() > 0) {
-    char c = time.read();
-    if (c != '\n') {
-      result += c;
+String getTimeStamp() {
+    String result;
+    Process time;
+    // date is a command line utility to get the date and the time
+    // in different formats depending on the additional parameter
+    time.begin("date");
+    time.addParameter("+%Y/%m/%d %T");
+    time.run();  // run the command
+    // read the output of the command
+    while (time.available() > 0) {
+        char c = time.read();
+        if (c != '\n') {
+            result += c;
+        }
     }
-  }
-  return result;
+    return result;
 }
 
 /*
@@ -312,52 +316,49 @@ String getLogSize()
 }
 */
 
-void setup()
-{
+void setup() {
 //  delay(1000);
-  Serial.begin(9600); //init serial port and set baudrate
-  Bridge.begin();
-  Console.begin();
-  FileSystem.begin();
-  // a second to initialize:
-  delay(1000);
-  // load cell / ADS1231 pin definition: SCL 7, Data 6, PowerDown 10
-  loadCell.attach(7,6,10);
-  // second load cell / ADS1231 pin definition: SCL 8, Data 5, PowerDown 9
-  loadCell01.attach(8,5,9);
-  sensors.begin();    // start DallasTemperature Lib
-  // Switch LED: initialize digital pin LED_BUILTIN as an output.
-  pinMode(LED_BUILTIN, OUTPUT);
-  pinMode(switchPin, INPUT);    // Switch: Set the switch pin as input
-  dht1.begin();
-  dht2.begin();
-  tsl.begin();
-  configureSensor();    // digital light sensor
+    Serial.begin(9600); //init serial port and set baudrate
+    Bridge.begin();
+    Console.begin();
+    FileSystem.begin();
+    // a second to initialize:
+    delay(1000);
+    // load cell / ADS1231 pin definition: SCL 7, Data 6, PowerDown 10
+    loadCell.attach(7, 6, 10);
+    // second load cell / ADS1231 pin definition: SCL 8, Data 5, PowerDown 9
+    loadCell01.attach(8, 5, 9);
+    sensors.begin();    // start DallasTemperature Lib
+    // Switch LED: initialize digital pin LED_BUILTIN as an output.
+    pinMode(LED_BUILTIN, OUTPUT);
+    pinMode(switchPin, INPUT);    // Switch: Set the switch pin as input
+    dht1.begin();
+    dht2.begin();
+    tsl.begin();
+    configureSensor();    // digital light sensor
 }
 
-void loop()
-{
-  while (digitalRead(switchPin) == HIGH)
-    {
-      digitalWrite(LED_BUILTIN, HIGH);    // turn the LED on (HIGH is the voltage level)
-      Console.println("paused by switch...");
-      delay(5000);
+void loop() {
+    while (digitalRead(switchPin) == HIGH) {
+        digitalWrite(LED_BUILTIN, HIGH);    // turn the LED on (HIGH is the voltage level)
+        Console.println("paused by switch...");
+        delay(5000);
     }
-  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off (LOW is the voltage level)
+    digitalWrite(LED_BUILTIN, LOW);    // turn the LED off (LOW is the voltage level)
 //  delay(1000);
-  //read and prepare sensor data
-  sensors.requestTemperatures();      // get temperatures
-  temp2 = sensors.getTempCByIndex(0); // Temp in box
-  temp1 = sensors.getTempCByIndex(1); // Temp outside box
-  simpleRead();                       // Luminosity by TSL2591
-  h1 = dht1.readHumidity();
-  t1 = dht1.readTemperature();
-  h2 = dht2.readHumidity();
-  t2 = dht2.readTemperature();
-  getWeight();
-  add_line();     //transmit data
-  add_line_sd();  // backup to Yun's MicroSD
-  Console.println();
+    //read and prepare sensor data
+    sensors.requestTemperatures();      // get temperatures
+    temp2 = sensors.getTempCByIndex(0); // Temp in box
+    temp1 = sensors.getTempCByIndex(1); // Temp outside box
+    simpleRead();                       // Luminosity by TSL2591
+    h1 = dht1.readHumidity();
+    t1 = dht1.readTemperature();
+    h2 = dht2.readHumidity();
+    t2 = dht2.readTemperature();
+    getWeight();
+    add_line();     //transmit data
+    add_line_sd();  // backup to Yun's MicroSD
+    Console.println();
 //  delay(21000); //run every 30 seconds (runtime without delay: 9 seconds)
-  delay(111000); //run every two minutes (runtime without delay: 9 seconds)
+    delay(111000); //run every two minutes (runtime without delay: 9 seconds)
 }