Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge eboot changes from davisonja #6533

Closed
wants to merge 13 commits into from
Closed

Merge eboot changes from davisonja #6533

wants to merge 13 commits into from

Commits on Jan 4, 2017

  1. WIP: Flash-stored OTA commands

    @davisonja
    davisonja committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    448e2f3 View commit details
    Browse the repository at this point in the history

  2. Test

    @davisonja
    davisonja committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    535bc78 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2017

  1. Merge remote-tracking branch 'remotes/upstream/master'

    @davisonja
    davisonja committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    d3238f9 View commit details
    Browse the repository at this point in the history

  2. Sync with upstream, reimport changes.

    @davisonja
    davisonja committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    3a33377 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2017

  1. Tweak of platform.txt to specify SPIFFS start based on settings from … 

    …boards.txt
    @davisonja
    davisonja committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    2762d25 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Merge branch 'master' of https://github.com/esp8266/Arduino 

    # Conflicts:
#	platform.txt
    @davisonja
    davisonja committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    678e332 View commit details
    Browse the repository at this point in the history

  2. Comment out my modified compiler.c.elf.flags line in platform.txt aft… 

    …er merge-from-upstream
    @davisonja
    davisonja committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    c752acc View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2017

  1. Merge branch 'master' of https://github.com/esp8266/Arduino

    @davisonja
    davisonja committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    60fd114 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2017

  1. commit of draft parseBoards.py

    @davisonja
    davisonja committed Oct 12, 2017
    Configuration menu
    Copy the full SHA
    b97eec3 View commit details
    Browse the repository at this point in the history

  2. Quick tidy up of parseBoards.py discarding unused parts

    @davisonja
    davisonja committed Oct 12, 2017
    Configuration menu
    Copy the full SHA
    421ba90 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @davisonja
    davisonja committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    c8adea7 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Merge branch 'master' of github.com:esp8266/Arduino

    @davisonja
    davisonja committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    eaca0c7 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2019

  1. Merge eboot changes from davisonja

    @Androbin
    Androbin committed Sep 18, 2019
    Configuration menu
    Copy the full SHA
    f3a6111 View commit details
    Browse the repository at this point in the history