Added clang-format (#623)
* added .clang-format * added names to travis jobs removed deprecated travis option * check github action * added .gitignore
This commit is contained in:
1 parent
661ef9c55e
commit
10a9d00aaf
59 files changed
+2892
-3640
No files matched your search
+12
-24
@@ -30,23 +30,20 @@
|
||||
#include "User_config.h"
|
||||
|
||||
#ifdef ZsensorDHT
|
||||
#include <DHT.h>
|
||||
#include <DHT_U.h>
|
||||
# include <DHT.h>
|
||||
# include <DHT_U.h>
|
||||
|
||||
DHT dht(DHT_RECEIVER_PIN, DHT_SENSOR_TYPE);
|
||||
|
||||
//Time used to wait for an interval before resending temp and hum
|
||||
unsigned long timedht = 0;
|
||||
|
||||
void setupDHT()
|
||||
{
|
||||
void setupDHT() {
|
||||
Log.notice(F("Reading DHT on pin: %d" CR), DHT_RECEIVER_PIN);
|
||||
}
|
||||
|
||||
void MeasureTempAndHum()
|
||||
{
|
||||
if (millis() > (timedht + TimeBetweenReadingDHT))
|
||||
{ //retrieving value of temperature and humidity of the box from DHT every xUL
|
||||
void MeasureTempAndHum() {
|
||||
if (millis() > (timedht + TimeBetweenReadingDHT)) { //retrieving value of temperature and humidity of the box from DHT every xUL
|
||||
timedht = millis();
|
||||
static float persistedh;
|
||||
static float persistedt;
|
||||
@@ -54,29 +51,20 @@ void MeasureTempAndHum()
|
||||
// Read temperature as Celsius (the default)
|
||||
float t = dht.readTemperature();
|
||||
// Check if any reads failed and exit early (to try again).
|
||||
if (isnan(h) || isnan(t))
|
||||
{
|
||||
if (isnan(h) || isnan(t)) {
|
||||
Log.error(F("Failed to read from DHT sensor!" CR));
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
Log.trace(F("Creating DHT buffer" CR));
|
||||
StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer;
|
||||
JsonObject &DHTdata = jsonBuffer.createObject();
|
||||
if (h != persistedh || dht_always)
|
||||
{
|
||||
JsonObject& DHTdata = jsonBuffer.createObject();
|
||||
if (h != persistedh || dht_always) {
|
||||
DHTdata.set("hum", (float)h);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
Log.trace(F("Same hum don't send it" CR));
|
||||
}
|
||||
if (t != persistedt || dht_always)
|
||||
{
|
||||
if (t != persistedt || dht_always) {
|
||||
DHTdata.set("temp", (float)t);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
Log.trace(F("Same temp don't send it" CR));
|
||||
}
|
||||
if (DHTdata.size() > 0)
|
||||
|
||||
Reference in new issue
Block a user