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
+11
-18
@@ -30,40 +30,33 @@
|
||||
|
||||
#ifdef ZsensorADC
|
||||
|
||||
#if defined(ESP8266)
|
||||
# if defined(ESP8266)
|
||||
ADC_MODE(ADC_TOUT);
|
||||
#endif
|
||||
# endif
|
||||
|
||||
//Time used to wait for an interval before resending adc value
|
||||
unsigned long timeadc = 0;
|
||||
|
||||
void setupADC()
|
||||
{
|
||||
void setupADC() {
|
||||
Log.notice(F("Reading ADC on pin: %d" CR), ADC_PIN);
|
||||
}
|
||||
|
||||
void MeasureADC()
|
||||
{
|
||||
if (millis() > (timeadc + TimeBetweenReadingADC))
|
||||
{ //retrieving value of temperature and humidity of the box from DHT every xUL
|
||||
#if defined(ESP8266)
|
||||
void MeasureADC() {
|
||||
if (millis() > (timeadc + TimeBetweenReadingADC)) { //retrieving value of temperature and humidity of the box from DHT every xUL
|
||||
# if defined(ESP8266)
|
||||
yield();
|
||||
#endif
|
||||
# endif
|
||||
timeadc = millis();
|
||||
static int persistedadc;
|
||||
int val = analogRead(ADC_PIN);
|
||||
if (isnan(val))
|
||||
{
|
||||
if (isnan(val)) {
|
||||
Log.error(F("Failed to read from ADC !" CR));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (val >= persistedadc + ThresholdReadingADC || val <= persistedadc - ThresholdReadingADC)
|
||||
{
|
||||
} else {
|
||||
if (val >= persistedadc + ThresholdReadingADC || val <= persistedadc - ThresholdReadingADC) {
|
||||
Log.trace(F("Creating ADC buffer" CR));
|
||||
const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(1);
|
||||
StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer;
|
||||
JsonObject &ADCdata = jsonBuffer.createObject();
|
||||
JsonObject& ADCdata = jsonBuffer.createObject();
|
||||
ADCdata.set("adc", (int)val);
|
||||
pub(ADCTOPIC, ADCdata);
|
||||
persistedadc = val;
|
||||
|
||||
Reference in new issue
Block a user