8000 Merge pull request #9 from espressif/master · mkoch/arduino-esp32@ccfcaf2 · GitHub
[go: up one dir, main page]
Skip to content

Commit ccfcaf2

Browse files
stickbreakerstickbreaker
authored
Merge pull request espressif#9 from espressif/master
catch up 27NOV17
2 parents fedd9d9 + dac7ae7 commit ccfcaf2
  • lib
  • sdkconfig

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    130 files changed

    +1252
    -491
    lines changed

    ‎.gitignore

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -4,3 +4,4 @@ tools/esptool
    44
    tools/esptool.exe
    55
    tools/mkspiffs/mkspiffs
    66
    tools/mkspiffs/mkspiffs.exe
    7+
    .DS_Store

    ‎.travis.yml

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -39,7 +39,7 @@ script:
    3939
    - echo -e "travis_fold:start:platformio_test_env_prepare"
    4040
    - pip install -U https://github.com/platformio/platformio/archive/develop.zip
    4141
    - platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage
    42-
    - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32_stage/platform.json
    42+
    - sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' ~/.platformio/platforms/espressif32/platform.json
    4343
    - ln -s $TRAVIS_BUILD_DIR ~/.platformio/packages/framework-arduinoespressif32
    4444
    - echo -e "travis_fold:end:platformio_test_env_prepare"
    4545
    - echo -e "travis_fold:start:platformio_test"

    ‎boards.txt

    Lines changed: 44 additions & 37 deletions
    Original file line numberDiff line numberDiff line change
    @@ -23,20 +23,23 @@ esp32.build.board=ESP32_DEV
    2323

    2424
    esp32.build.f_cpu=240000000L
    2525
    esp32.build.flash_size=4MB
    26+
    esp32.build.flash_freq=40m
    2627
    esp32.build.flash_mode=dio
    27-
    esp32.build.boot=bootloader
    28+
    esp32.build.boot=dio
    2829
    esp32.build.partitions=default
    2930

    3031
    esp32.menu.FlashMode.qio=QIO
    3132
    esp32.menu.FlashMode.qio.build.flash_mode=dio
    32-
    esp32.menu.FlashMode.qio.build.boot=bootloader_qio
    33+
    esp32.menu.FlashMode.qio.build.boot=qio
    3334
    esp32.menu.FlashMode.dio=DIO
    3435
    esp32.menu.FlashMode.dio.build.flash_mode=dio
    36+
    esp32.menu.FlashMode.dio.build.boot=dio
    3537
    esp32.menu.FlashMode.qout=QOUT
    3638
    esp32.menu.FlashMode.qout.build.flash_mode=dout
    37-
    esp32.menu.FlashMode.qout.build.boot=bootloader_qio
    39+
    esp32.menu.FlashMode.qout.build.boot=qout
    3840
    esp32.menu.FlashMode.dout=DOUT
    3941
    esp32.menu.FlashMode.dout.build.flash_mode=dout
    42+
    esp32.menu.FlashMode.dout.build.boot=dout
    4043

    4144
    esp32.menu.FlashFreq.80=80MHz
    4245
    esp32.menu.FlashFreq.80.build.flash_freq=80m
    @@ -97,7 +100,7 @@ esp32thing.build.board=ESP32_THING
    97100
    esp32thing.build.f_cpu=240000000L
    98101
    esp32thing.build.flash_mode=dio
    99102
    esp32thing.build.flash_size=4MB
    100-
    esp32thing.build.boot=bootloader
    103+
    esp32thing.build.boot=dio
    101104
    esp32thing.build.partitions=default
    102105

    103106
    esp32thing.menu.FlashFreq.80=80MHz
    @@ -137,7 +140,7 @@ nina_w10.build.core=esp32
    137140
    nina_w10.build.variant=nina_w10
    138141
    nina_w10.build.board=UBLOX_NINA_W10
    139142
    nina_w10.build.f_cpu=240000000L
    140-
    nina_w10.build.boot=bootloader
    143+
    nina_w10.build.boot=dio
    141144
    nina_w10.build.partitions=minimal
    142145
    nina_w10.build.flash_mode=dio
    143146
    nina_w10.build.flash_size=2MB
    @@ -178,7 +181,7 @@ widora-air.build.board=WIDORA_AIR
    178181
    widora-air.build.f_cpu=240000000L
    179182
    widora-air.build.flash_mode=dio
    180183
    widora-air.build.flash_size=16MB
    181-
    widora-air.build.boot=bootloader
    184+
    widora-air.build.boot=dio
    182185
    widora-air.build.partitions=default
    183186

    184187
    widora-air.menu.FlashFreq.80=80MHz
    @@ -221,7 +224,7 @@ esp320.build.board=ESP320
    221224
    esp320.build.f_cpu=240000000L
    222225
    esp320.build.flash_mode=qio
    223226
    esp320.build.flash_size=4MB
    224-
    esp320.build.boot=bootloader
    227+
    esp320.build.boot=dio
    225228
    esp320.build.partitions=default
    226229

    227230
    esp320.menu.FlashFreq.80=80MHz
    @@ -264,7 +267,7 @@ nano32.build.board=NANO32
    264267
    nano32.build.f_cpu=240000000L
    265268
    nano32.build.flash_mode=dio
    266269
    nano32.build.flash_size=4MB
    267-
    nano32.build.boot=bootloader
    270+
    nano32.build.boot=dio
    268271
    nano32.build.partitions=default
    269272

    270273
    nano32.menu.FlashFreq.80=80MHz
    @@ -307,7 +310,7 @@ lolin32.build.board=LOLIN32
    307310
    lolin32.build.f_cpu=240000000L
    308311
    lolin32.build.flash_mode=dio
    309312
    lolin32.build.flash_size=4MB
    310-
    lolin32.build.boot=bootloader
    313+
    lolin32.build.boot=dio
    311314
    lolin32.build.partitions=default
    312315

    313316
    lolin32.menu.FlashFreq.80=80MHz
    @@ -350,7 +353,7 @@ pocket_32.build.board=Pocket32
    350353
    pocket_32.build.f_cpu=240000000L
    351354
    pocket_32.build.flash_mode=dio
    352355
    pocket_32.build.flash_size=4MB
    353-
    pocket_32.build.boot=bootloader
    356+
    pocket_32.build.boot=dio
    354357
    pocket_32.build.partitions=default
    355358

    356359
    pocket_32.menu.FlashFreq.80=80MHz
    @@ -393,7 +396,7 @@ WeMosBat.build.board=Pocket32
    393396
    WeMosBat.build.f_cpu=240000000L
    394397
    WeMosBat.build.flash_mode=dio
    395398
    WeMosBat.build.flash_size=4MB
    396-
    WeMosBat.build.boot=bootloader
    399+
    WeMosBat.build.boot=dio
    397400
    WeMosBat.build.partitions=default
    398401

    399402
    WeMosBat.menu.FlashFreq.80=80MHz
    @@ -436,7 +439,7 @@ espea32.build.board=ESPea32
    436439
    espea32.build.f_cpu=240000000L
    437440
    espea32.build.flash_mode=dio
    438441
    espea32.build.flash_size=4MB
    439-
    espea32.build.boot=bootloader
    442+
    espea32.build.boot=dio
    440443
    espea32.build.partitions=default
    441444

    442445
    espea32.menu.FlashFreq.80=80MHz
    @@ -479,7 +482,7 @@ quantum.build.board=QUANTUM
    479482
    quantum.build.f_cpu=240000000L
    480483
    quantum.build.flash_mode=qio
    481484
    quantum.build.flash_size=16MB
    482-
    quantum.build.boot=bootloader
    485+
    quantum.build.boot=dio
    483486
    quantum.build.partitions=default
    484487

    485488
    quantum.menu.FlashFreq.80=80MHz
    @@ -522,7 +525,7 @@ node32s.build.board=Node32s
    522525
    node32s.build.f_cpu=240000000L
    523526
    node32s.build.flash_mode=dio
    524527
    node32s.build.flash_size=4MB
    525-
    node32s.build.boot=bootloader
    528+
    node32s.build.boot=dio
    526529
    node32s.build.partitions=default
    527530

    528531
    node32s.menu.FlashFreq.80=80MHz
    @@ -565,7 +568,7 @@ hornbill32dev.build.board=HORNBILL_ESP32_DEV
    565568
    hornbill32dev.build.f_cpu=240000000L
    566569
    hornbill32dev.build.flash_mode=dio
    567570
    hornbill32dev.build.flash_size=4MB
    568-
    hornbill32dev.build.boot=bootloader
    571+
    hornbill32dev.build.boot=dio
    569572
    hornbill32dev.build.partitions=default
    570573

    571574
    hornbill32dev.menu.FlashFreq.80=80MHz
    @@ -607,7 +610,7 @@ hornbill32minima.build.board=HORNBILL_ESP32_MINIMA
    607610
    hornbill32minima.build.f_cpu=240000000L
    608611
    hornbill32minima.build.flash_mode=dio
    609612
    hornbill32minima.build.flash_size=4MB
    610-
    hornbill32minima.build.boot=bootloader
    613+
    hornbill32minima.build.boot=dio
    611614
    hornbill32minima.build.partitions=default
    612615

    613616
    hornbill32minima.menu.FlashFreq.80=80MHz
    @@ -650,7 +653,7 @@ firebeetle32.build.board=ESP32_DEV
    650653
    firebeetle32.build.f_cpu=240000000L
    651654
    firebeetle32.build.flash_mode=dio
    652655
    firebeetle32.build.flash_size=4MB
    653-
    firebeetle32.build.boot=bootloader
    656+
    firebeetle32.build.boot=dio
    654657
    firebeetle32.build.partitions=default
    655658

    656659
    firebeetle32.menu.FlashFreq.80=80MHz
    @@ -693,7 +696,7 @@ intorobot-fig.build.board=INTOROBOT_ESP32_DEV
    693696
    intorobot-fig.build.f_cpu=240000000L
    694697
    intorobot-fig.build.flash_mode=dio
    695698
    intorobot-fig.build.flash_size=4MB
    696-
    intorobot-fig.build.boot=bootloader
    699+
    intorobot-fig.build.boot=dio
    697700
    intorobot-fig.build.partitions=default
    698701

    699702
    intorobot-fig.menu.FlashFreq.80=80MHz
    @@ -736,7 +739,7 @@ onehorse32dev.build.board=ONEHORSE_ESP32_DEV
    736739
    onehorse32dev.build.f_cpu=240000000L
    737740
    onehorse32dev.build.flash_mode=dout
    738741
    onehorse32dev.build.flash_size=4MB
    739-
    onehorse32dev.build.boot=bootloader
    742+
    onehorse32dev.build.boot=dio
    740743
    onehorse32dev.build.partitions=default
    741744

    742745
    onehorse32dev.menu.FlashFreq.80=80MHz
    @@ -779,7 +782,7 @@ featheresp32.build.board=FEATHER_ESP32
    779782
    featheresp32.build.f_cpu=240000000L
    780783
    featheresp32.build.flash_mode=dio
    781784
    featheresp32.build.flash_size=4MB
    782-
    featheresp32.build.boot=bootloader
    785+
    featheresp32.build.boot=dio
    783786
    featheresp32.build.partitions=default
    784787

    785788
    featheresp32.menu.FlashFreq.80=80MHz
    @@ -835,7 +838,7 @@ nodemcu-32s.build.board=NodeMCU_32S
    835838
    nodemcu-32s.build.f_cpu=240000000L
    836839
    nodemcu-32s.build.flash_mode=dio
    837840
    nodemcu-32s.build.flash_size=4MB
    838-
    nodemcu-32s.build.boot=bootloader
    841+
    nodemcu-32s.build.boot=dio
    839842
    nodemcu-32s.build.partitions=default
    840843

    841844
    nodemcu-32s.menu.FlashFreq.80=80MHz
    @@ -878,7 +881,7 @@ mhetesp32devkit.build.board=MH_ET_LIVE_ESP32DEVKIT
    878881
    mhetesp32devkit.build.f_cpu=240000000L
    879882
    mhetesp32devkit.build.flash_mode=dio
    880883
    mhetesp32devkit.build.flash_size=4MB
    881-
    mhetesp32devkit.build.boot=bootloader
    884+
    mhetesp32devkit.build.boot=dio
    882885
    mhetesp32devkit.build.partitions=default
    883886

    884887
    mhetesp32devkit.menu.FlashFreq.80=80MHz
    @@ -921,7 +924,7 @@ mhetesp32minikit.build.board=MH_ET_LIVE_ESP32MINIKIT
    921924
    mhetesp32minikit.build.f_cpu=240000000L
    922925
    mhetesp32minikit.build.flash_mode=dio
    923926
    mhetesp32minikit.build.flash_size=4MB
    924-
    mhetesp32minikit.build.boot=bootloader
    927+
    mhetesp32minikit.build.boot=dio
    925928
    mhetesp32minikit.build.partitions=default
    926929

    927930
    mhetesp32minikit.menu.FlashFreq.80=80MHz
    @@ -964,7 +967,7 @@ esp32vn-iot-uno.build.board=esp32vn-iot-uno
    964967
    esp32vn-iot-uno.build.f_cpu=240000000L
    965968
    esp32vn-iot-uno.build.flash_mode=dio
    966969
    esp32vn-iot-uno.build.flash_size=4MB
    967-
    esp32vn-iot-uno.build.boot=bootloader
    970+
    esp32vn-iot-uno.build.boot=dio
    968971
    esp32vn-iot-uno.build.partitions=default
    969972

    970973
    esp32vn-iot-uno.menu.FlashFreq.80=80MHz
    @@ -1007,7 +1010,7 @@ esp32doit-devkit-v1.build.board=ESP32_DEV
    10071010
    esp32doit-devkit-v1.build.f_cpu=240000000L
    10081011
    esp32doit-devkit-v1.build.flash_mode=dio
    10091012
    esp32doit-devkit-v1.build.flash_size=4MB
    1010-
    esp32doit-devkit-v1.build.boot=bootloader
    1013+
    esp32doit-devkit-v1.build.boot=dio
    10111014
    esp32doit-devkit-v1.build.partitions=default
    10121015

    10131016
    esp32doit-devkit-v1.menu.FlashFreq.80=80MHz
    @@ -1061,7 +1064,7 @@ esp32-evb.build.board=ESP32-EVB
    10611064
    esp32-evb.build.f_cpu=240000000L
    10621065
    esp32-evb.build.flash_mode=dio
    10631066
    esp32-evb.build.flash_size=4MB
    1064-
    esp32-evb.build.boot=bootloader
    1067+
    esp32-evb.build.boot=dio
    10651068
    esp32-evb.build.partitions=default
    10661069

    10671070
    esp32-evb.menu.FlashFreq.80=80MHz
    @@ -1093,7 +1096,7 @@ esp32-gateway.build.board=ESP32-GATEWAY
    10931096
    esp32-gateway.build.f_cpu=240000000L
    10941097
    esp32-gateway.build.flash_mode=dio
    10951098
    esp32-gateway.build.flash_size=4MB
    1096-
    esp32-gateway.build.boot=bootloader
    1099+
    esp32-gateway.build.boot=dio
    10971100
    esp32-gateway.build.partitions=default
    10981101

    10991102
    esp32-gateway.menu.FlashFreq.80=80MHz
    @@ -1125,7 +1128,7 @@ espino32.build.board=ESPino32
    11251128
    espino32.build.f_cpu=240000000L
    11261129
    espino32.build.flash_mode=dio
    11271130
    espino32.build.flash_size=4MB
    1128-
    espino32.build.boot=bootloader
    1131+
    espino32.build.boot=dio
    11291132
    espino32.build.partitions=default
    11301133

    11311134
    espino32.menu.FlashFreq.80=80MHz
    @@ -1168,19 +1171,21 @@ m5stack-core-esp32.build.board=M5Stack-Core-ESP32
    11681171
    m5stack-core-esp32.build.f_cpu=240000000L
    11691172
    m5stack-core-esp32.build.flash_size=4MB
    11701173
    m5stack-core-esp32.build.flash_mode=dio
    1171-
    m5stack-core-esp32.build.boot=bootloader
    1174+
    m5stack-core-esp32.build.boot=dio
    11721175
    m5stack-core-esp32.build.partitions=default
    11731176

    11741177
    m5stack-core-esp32.menu.FlashMode.qio=QIO
    11751178
    m5stack-core-esp32.menu.FlashMode.qio.build.flash_mode=dio
    1176-
    m5stack-core-esp32.menu.FlashMode.qio.build.boot=bootloader_qio
    1179+
    m5stack-core-esp32.menu.FlashMode.qio.build.boot=qio
    11771180
    m5stack-core-esp32.menu.FlashMode.dio=DIO
    11781181
    m5stack-core-esp32.menu.FlashMode.dio.build.flash_mode=dio
    1182+
    m5stack-core-esp32.menu.FlashMode.dio.build.boot=dio
    11791183
    m5stack-core-esp32.menu.FlashMode.qout=QOUT
    11801184
    m5stack-core-esp32.menu.FlashMode.qout.build.flash_mode=dout
    1181-
    m5stack-core-esp32.menu.FlashMode.qout.build.boot=bootloader_qio
    1185+
    m5stack-core-esp32.menu.FlashMode.qout.build.boot=qout
    11821186
    m5stack-core-esp32.menu.FlashMode.dout=DOUT
    11831187
    m5stack-core-esp32.menu.FlashMode.dout.build.flash_mode=dout
    1188+
    m5stack-core-esp32.menu.FlashMode.dout.build.boot=dout
    11841189

    11851190
    m5stack-core-esp32.menu.FlashFreq.80=80MHz
    11861191
    m5stack-core-esp32.menu.FlashFreq.80.build.flash_freq=80m
    @@ -1235,7 +1240,7 @@ heltec_wifi_kit_32.build.board=Heltec_WIFI_Kit_32
    12351240
    heltec_wifi_kit_32.build.f_cpu=240000000L
    12361241
    heltec_wifi_kit_32.build.flash_mode=dio
    12371242
    heltec_wifi_kit_32.build.flash_size=4MB
    1238-
    heltec_wifi_kit_32.build.boot=bootloader
    1243+
    heltec_wifi_kit_32.build.boot=dio
    12391244
    heltec_wifi_kit_32.build.partitions=default
    12401245

    12411246
    heltec_wifi_kit_32.menu.FlashFreq.80=80MHz
    @@ -1278,7 +1283,7 @@ heltec_wifi_lora_32.build.board=Heltec_WIFI_LoRa_32
    12781283
    heltec_wifi_lora_32.build.f_cpu=240000000L
    12791284
    heltec_wifi_lora_32.build.flash_mode=dio
    12801285
    heltec_wifi_lora_32.build.flash_size=4MB
    1281-
    heltec_wifi_lora_32.build.boot=bootloader
    1286+
    heltec_wifi_lora_32.build.boot=dio
    12821287
    heltec_wifi_lora_32.build.partitions=default
    12831288

    12841289
    heltec_wifi_lora_32.menu.FlashFreq.80=80MHz
    @@ -1321,19 +1326,21 @@ espectro32.build.board=ESPECTRO32
    13211326
    espectro32.build.f_cpu=240000000L
    13221327
    espectro32.build.flash_size=4MB
    13231328
    espectro32.build.flash_mode=dio
    1324-
    espectro32.build.boot=bootloader
    1329+
    espectro32.build.boot=dio
    13251330
    espectro32.build.partitions=default
    13261331

    13271332
    espectro32.menu.FlashMode.qio=QIO
    13281333
    espectro32.menu.FlashMode.qio.build.flash_mode=dio
    1329-
    espectro32.menu.FlashMode.qio.build.boot=bootloader_qio
    1334+
    espectro32.menu.FlashMode.qio.build.boot=qio
    13301335
    espectro32.menu.FlashMode.dio=DIO
    13311336
    espectro32.menu.FlashMode.dio.build.flash_mode=dio
    1337+
    espectro32.menu.FlashMode.dio.build.boot=dio
    13321338
    espectro32.menu.FlashMode.qout=QOUT
    13331339
    espectro32.menu.FlashMode.qout.build.flash_mode=dout
    1334-
    espectro32.menu.FlashMode.qout.build.boot=bootloader_qio
    1340+
    espectro32.menu.FlashMode.qout.build.boot=qout
    13351341
    espectro32.menu.FlashMode.dout=DOUT
    13361342
    espectro32.menu.FlashMode.dout.build.flash_mode=dout
    1343+
    espectro32.menu.FlashMode.dout.build.boot=dout
    13371344

    13381345
    espectro32.menu.FlashFreq.80=80MHz
    13391346
    espectro32.menu.FlashFreq.80.build.flash_freq=80m
    @@ -1394,7 +1401,7 @@ CoreESP32.build.board=CoreESP32
    13941401
    CoreESP32.build.f_cpu=240000000L
    13951402
    CoreESP32.build.flash_mode=dio
    13961403
    CoreESP32.build.flash_size=4MB
    1397-
    CoreESP32.build.boot=bootloader
    1404+
    CoreESP32.build.boot=dio
    13981405
    CoreESP32.build.partitions=default
    13991406

    14001407
    CoreESP32.menu.FlashFreq.80=80MHz

    ‎libraries/BLE

    0 commit comments

    Comments
     (0)
    0