Browse Source

Merge remote-tracking branch 'origin/dev' into rfb/refactoring

mcspr-patch-1
Maxim Prokhorov 4 years ago
parent
commit
9b3ef89dab
3 changed files with 2 additions and 5 deletions
  1. +1
    -0
      .travis.yml
  2. +1
    -1
      code/espurna/migrate.cpp
  3. +0
    -4
      code/platformio.ini

+ 1
- 0
.travis.yml View File

@ -5,6 +5,7 @@ python:
cache: cache:
directories: directories:
- ~/.npm - ~/.npm
- ~/.platformio
env: env:
global: global:
- BUILDER_TOTAL_THREADS=4 - BUILDER_TOTAL_THREADS=4


+ 1
- 1
code/espurna/migrate.cpp View File

@ -46,7 +46,7 @@ void migrate() {
if (!version) return; if (!version) return;
switch (migrateVersion()) {
switch (version) {
// migrate old version with 1-based indices // migrate old version with 1-based indices
case 2: case 2:
_cmpMoveIndexDown("ledGPIO"); _cmpMoveIndexDown("ledGPIO");


+ 0
- 4
code/platformio.ini View File

@ -34,10 +34,6 @@ extra_configs =
# arduino core 2.7.1 = espressif8266@2.5.3 (platform) # arduino core 2.7.1 = espressif8266@2.5.3 (platform)
# arduino core 2.7.4 = espressif8266@2.6.2 (platform_latest) # arduino core 2.7.4 = espressif8266@2.6.2 (platform_latest)
# #
# Arduino Core 2.3.0:
# "Error: Development platform 'espressif8266' is not compatible with PlatformIO Core v4.4.0-b.1 and depends on PlatformIO Core ^3.0.0"
# ref. https://docs.platformio.org/en/latest/core/history.html
#
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
platform = espressif8266@2.5.3 platform = espressif8266@2.5.3


Loading…
Cancel
Save