Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: espressif/arduino-esp32
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: wanming2008/arduino-esp32
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 36 files changed
  • 2 contributors

Commits on Oct 19, 2016

  1. add min/max & stdlib_noniso to Arduino.h

    @toddtreece
    toddtreece committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    a01d01b View commit details
    Browse the repository at this point in the history

  2. remove flash string macro from pgmspace

    @toddtreece
    toddtreece committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    24eb28e View commit details
    Browse the repository at this point in the history

  3. add forward def for flash string helper in wstring

    @toddtreece
    toddtreece committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    fb01625 View commit details
    Browse the repository at this point in the history

  4. uncomment the flash string methods in print class

    @toddtreece
    toddtreece committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    5684d79 View commit details
    Browse the repository at this point in the history

  5. fix compile issue in wifiscan

    @toddtreece
    toddtreece committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    27315db View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2016

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

    Conflicts:
	libraries/WiFi/src/WiFiScan.cpp
    @ladyada
    ladyada committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    9c53d73 View commit details
    Browse the repository at this point in the history

  2. SD library

    @ladyada
    ladyada committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    15bace7 View commit details
    Browse the repository at this point in the history

  3. shiftin/shiftout

    @ladyada
    ladyada committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    5decd2c View commit details
    Browse the repository at this point in the history

  4. 'fixed' shiftin/shiftout but getting compiler complaints about two ra… 

    …ndom() prototypes so commented one out
    @ladyada
    ladyada committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    871f28e View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2016

  1. add default pins for UARTs #1 and #2 so you can just Serial1.begin(baud)

    @ladyada
    ladyada committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    1bf6318 View commit details
    Browse the repository at this point in the history

  2. make the SDA/SCL assignment in the variants file actually work. tested

    @ladyada
    ladyada committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    3b56ee9 View commit details
    Browse the repository at this point in the history

  3. make resetting work on win7 w/CP210x chip, add post-write reset to au… 

    …tomatically run code
    @ladyada
    ladyada committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    7de8975 View commit details
    Browse the repository at this point in the history

  4. simpler fix

    @ladyada
    ladyada committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    ce54087 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2016

  1. add feather esp32 rev C variant

    @ladyada
    ladyada committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    f5e6cad View commit details
    Browse the repository at this point in the history

  2. make variant SPI pins work

    @ladyada
    ladyada committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    d602169 View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	boards.txt
	cores/esp32/Arduino.h
	cores/esp32/wiring_private.h
	cores/esp32/wiring_shift.c
    @ladyada
    ladyada committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    a07e1ae View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2017

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

    Conflicts:
	tools/esptool.py
    @ladyada
    ladyada committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    11ff1ef View commit details
    Browse the repository at this point in the history
Loading