mirror of
https://github.com/lumapu/ahoy.git
synced 2025-06-07 05:01:39 +02:00
Merge branch 'development03-bugfix-minimalhistory' of https://github.com/fsck-block/ahoy into fsck-block-development03-bugfix-minimalhistory
This commit is contained in:
commit
0f55841ace
2 changed files with 16 additions and 0 deletions
|
@ -94,6 +94,18 @@ build_flags = ${env.build_flags}
|
||||||
monitor_filters =
|
monitor_filters =
|
||||||
esp8266_exception_decoder
|
esp8266_exception_decoder
|
||||||
|
|
||||||
|
[env:esp8266-minimal]
|
||||||
|
platform = espressif8266
|
||||||
|
board = esp12e
|
||||||
|
board_build.f_cpu = 80000000L
|
||||||
|
build_flags = ${env.build_flags}
|
||||||
|
-DEMC_MIN_FREE_MEMORY=4096
|
||||||
|
;-Wl,-Map,output.map
|
||||||
|
monitor_filters =
|
||||||
|
esp8266_exception_decoder
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[env:esp8285]
|
[env:esp8285]
|
||||||
platform = espressif8266
|
platform = espressif8266
|
||||||
board = esp8285
|
board = esp8285
|
||||||
|
|
|
@ -805,6 +805,8 @@ class RestApi {
|
||||||
}
|
}
|
||||||
obj[F("max")] = max;
|
obj[F("max")] = max;
|
||||||
obj[F("maxDay")] = mApp->getHistoryMaxDay();
|
obj[F("maxDay")] = mApp->getHistoryMaxDay();
|
||||||
|
#else
|
||||||
|
obj[F("refresh")] = 86400; // 1 day;
|
||||||
#endif /*ENABLE_HISTORY*/
|
#endif /*ENABLE_HISTORY*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -820,6 +822,8 @@ class RestApi {
|
||||||
max = value;
|
max = value;
|
||||||
}
|
}
|
||||||
obj[F("max")] = max;
|
obj[F("max")] = max;
|
||||||
|
#else
|
||||||
|
obj[F("refresh")] = 86400; // 1 day
|
||||||
#endif /*ENABLE_HISTORY*/
|
#endif /*ENABLE_HISTORY*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue