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: leaflabs/maple-bootloader
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: leaflabs/maple-bootloader
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: native-boot
Choose a head ref
  • 12 commits
  • 9 files changed
  • 3 contributors

Commits on Jun 15, 2010

  1. Maple Native Changes 

    added the usb disc pin at GPIOB-8, added some macro definitions to reduce
magic-number-plaque
    AJM committed Jun 15, 2010
    Configuration menu
    Copy the full SHA
    cb9f3b5 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2010

  1. maple mini bootloader seems to work

    Marti Bolivar committed Oct 20, 2010
    Configuration menu
    Copy the full SHA
    e14fabd View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2010

  1. fixed dfu bug preventing program upload in mini-boot

    Marti Bolivar committed Oct 23, 2010
    Configuration menu
    Copy the full SHA
    7ffb033 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2010

  1. Merge branch 'mini-boot' of [email protected]:leaflabs/maple-bootloader … 

    …into mini-boot
    AJM committed Oct 27, 2010
    Configuration menu
    Copy the full SHA
    6ed2e8f View commit details
    Browse the repository at this point in the history

  2. Untested fix for usb teardown before jumpToUSer

    AJM committed Oct 27, 2010
    Configuration menu
    Copy the full SHA
    5f5c0e3 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2011

  1. made changes for maple native bootloader

    AJM committed Jan 30, 2011
    Configuration menu
    Copy the full SHA
    0b131cb View commit details
    Browse the repository at this point in the history

  2. modded the flash page size issues for high density ZET6 chip on native

    AJM committed Jan 30, 2011
    Configuration menu
    Copy the full SHA
    29ba486 View commit details
    Browse the repository at this point in the history

  3. changed the linker script approproiately

    AJM committed Jan 30, 2011
    Configuration menu
    Copy the full SHA
    d0d1fee View commit details
    Browse the repository at this point in the history

  4. fixed the led pin setting to the correct pin

    AJM committed Jan 30, 2011
    Configuration menu
    Copy the full SHA
    a28bfc2 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2011

  1. Native fixes; seems to work

    Marti Bolivar committed Feb 9, 2011
    Configuration menu
    Copy the full SHA
    a718e08 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2012

  1. Correct bcdDFUVersion and wDetachTimeOut in DFU functional descriptor 

    The firmware matches pretty much the DFU 1.1 specification.

This is a follow up of 95e1150
which only changed the separately defined u8_usbFunctionalDescriptor
but not the one included in the configuration descriptor. And which
also got it wrong (0.1).

(Ideally the code should be cleaned up to only specify this in one place)

Also fix the detach timeout which was set to 64 seconds. I believe
the intended value was 255 ms like stated in the comment. Since the
Maple devices are not detached (transition between run-time mode and
DFU mode, issued over the DFU interface), this is not used anyway.

Signed-off-by: Tormod Volden <[email protected]>
Acked-by: Marti Bolivar <[email protected]>
    Marti Bolivar committed May 15, 2012
    Configuration menu
    Copy the full SHA
    ff66123 View commit details
    Browse the repository at this point in the history

  2. Bump the bcdDevice to 2.01 now that the DFU descriptor is fixed 

    To let DFU programmers such as dfu-util know that they can trust
the DFU functional descriptor on this device.

Signed-off-by: Tormod Volden <[email protected]>
Acked-by: Marti Bolivar <[email protected]>
Signed-off-by: Marti Bolivar <[email protected]>
    Marti Bolivar committed May 15, 2012
    Configuration menu
    Copy the full SHA
    70dc66e View commit details
    Browse the repository at this point in the history
Loading