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 forward prototype thijstriemstra #114

Closed
wants to merge 37 commits into from
Closed

merge forward prototype thijstriemstra #114

wants to merge 37 commits into from

Commits on Dec 20, 2021

  1. adjustments for prototype

    @corrados
    corrados committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    07bf51c View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2021

  1. update settings based on corrados#21 (reply in thread)

    @corrados
    corrados committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    d3badc8 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2021

  1. update comments for config

    @thijstriemstra
    thijstriemstra authored Dec 29, 2021
    Configuration menu
    Copy the full SHA
    973dc96 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2021

  1. Merge pull request corrados#27 from thijstriemstra/patch-1 

    update comments for config
    @corrados
    corrados authored Dec 30, 2021
    Configuration menu
    Copy the full SHA
    877ac65 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2022

  1. merge forward

    @thijstriemstra
    thijstriemstra committed Jan 3, 2022
    Configuration menu
    Copy the full SHA
    d51bf88 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2022

  1. fix pad type for 4 

    as suggested in see corrados#29 (reply in thread)
    @thijstriemstra
    thijstriemstra authored Jan 4, 2022
    Configuration menu
    Copy the full SHA
    f3b9744 View commit details
    Browse the repository at this point in the history

  2. Merge pull request corrados#32 from thijstriemstra/thijstriemstra_pro… 

    …totype

update to latest main
    @corrados
    corrados authored Jan 4, 2022
    Configuration menu
    Copy the full SHA
    409e76e View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2022

  1. define board led pin elsewhere

    @thijstriemstra
    thijstriemstra committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    21120f2 View commit details
    Browse the repository at this point in the history

  2. update parameters

    @thijstriemstra
    thijstriemstra committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    efd7cc7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request corrados#34 from thijstriemstra/thijstriemstra_pro… 

    …totype

prototype: update params
    @corrados
    corrados authored Jan 6, 2022
    Configuration menu
    Copy the full SHA
    780c26a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    fa71e45 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2022

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    57e1309 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2022

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 8, 2022
    Configuration menu
    Copy the full SHA
    9758509 View commit details
    Browse the repository at this point in the history

  2. Merge pull request corrados#37 from thijstriemstra/thijstriemstra_pro… 

    …totype

prototype: merge forward
    @corrados
    corrados authored Jan 8, 2022
    Configuration menu
    Copy the full SHA
    1b37424 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2022

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    ba8b2d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    966f816 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    7aa57d2 View commit details
    Browse the repository at this point in the history

  4. update pad settings

    @thijstriemstra
    thijstriemstra committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    172ada2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request corrados#42 from thijstriemstra/thijstriemstra_pro… 

    …totype

prototype: update pad settings
    @corrados
    corrados authored Jan 9, 2022
    Configuration menu
    Copy the full SHA
    9029398 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    f95914e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    0382e85 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2022

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    32ebb92 View commit details
    Browse the repository at this point in the history

  2. update pad params

    @thijstriemstra
    thijstriemstra committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    3730158 View commit details
    Browse the repository at this point in the history

  3. Merge pull request corrados#43 from thijstriemstra/thijstriemstra_pro… 

    …totype

prototype: update pad settings
    @corrados
    corrados authored Jan 12, 2022
    Configuration menu
    Copy the full SHA
    e008ecc View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    b1cc22b View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2022

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    83ed415 View commit details
    Browse the repository at this point in the history

  2. Merge pull request corrados#45 from thijstriemstra/thijstriemstra_pro… 

    …totype

prototype: merge forward
    @corrados
    corrados authored Jan 17, 2022
    Configuration menu
    Copy the full SHA
    955d4d5 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2022

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    3159408 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    b1ebda1 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2022

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    7fecd64 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    49229d1 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    cd5c2ca View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. merge forward

    @thijstriemstra
    thijstriemstra committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    aa02d1d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    582f005 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    d33f19a View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. Merge branch 'main' into thijstriemstra_prototype

    @thijstriemstra
    thijstriemstra committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    19a2a56 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into thijstriemstra_prot… 

    …otype
    @thijstriemstra
    thijstriemstra committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    c7596e3 View commit details
    Browse the repository at this point in the history