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

Development #1

Open
wants to merge 34 commits into
base: Stable
Choose a base branch
from
Open

Development #1

wants to merge 34 commits into from

Commits on Dec 29, 2014

  1. Add Filament menu and add Filament/Retract settings to config store.

    @wgm4321
    wgm4321 committed Dec 29, 2014
    Configuration menu
    Copy the full SHA
    cb12161 View commit details
    Browse the repository at this point in the history

  2. Fix syntax error caused by previous changes.

    @wgm4321
    wgm4321 committed Dec 29, 2014
    Configuration menu
    Copy the full SHA
    d60efc3 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2014

  1. Due to the fix for MarlinFirmware#1248, X and Y probe offsets must no… 

    …t be floats.

The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
    @vandarin
    vandarin committed Dec 31, 2014
    Configuration menu
    Copy the full SHA
    2701dd8 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2015

  1. Merge pull request MarlinFirmware#1261 from wgm4321/Development 

    Add Filament menu and add Filament/Retract settings to config store.
    @boelle
    boelle committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    a18b625 View commit details
    Browse the repository at this point in the history

  2. Merge pull request MarlinFirmware#1282 from vandarin/Development 

    Due to the fix for MarlinFirmware#1248, X and Y probe offsets must not be floats.
    @boelle
    boelle committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    63da690 View commit details
    Browse the repository at this point in the history

  3. temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.

    @drf5n @alhirzel
    drf5n authored and alhirzel committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    1d5d853 View commit details
    Browse the repository at this point in the history

  4. temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.

    @drf5n @alhirzel
    drf5n authored and alhirzel committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    f3e503e View commit details
    Browse the repository at this point in the history

  5. Fix typo, PID_BED_POWER -> MAX_BED_POWER

    @alhirzel
    alhirzel committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    ecda6cd View commit details
    Browse the repository at this point in the history

  6. Add Filament menu and add Filament/Retract settings to config store.

    @wgm4321 @alhirzel
    wgm4321 authored and alhirzel committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    edac64e View commit details
    Browse the repository at this point in the history

  7. Fix syntax error caused by previous changes.

    @wgm4321 @alhirzel
    wgm4321 authored and alhirzel committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    b32be2d View commit details
    Browse the repository at this point in the history

  8. Due to the fix for MarlinFirmware#1248, X and Y probe offsets must no… 

    …t be floats.

The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
    @vandarin @alhirzel
    vandarin authored and alhirzel committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    1f520a5 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'Development' of https://github.com/alhirzel/Marlin into… 

    … Development
    @alhirzel
    alhirzel committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    f3209bb View commit details
    Browse the repository at this point in the history

  10. rework analogInputToDigitalPin definition

    @alhirzel
    alhirzel committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    eed451e View commit details
    Browse the repository at this point in the history

  11. Move scripts and documentation to subfolders

    @thinkyhead
    thinkyhead committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    b5e50cd View commit details
    Browse the repository at this point in the history

  12. Merge pull request MarlinFirmware#1292 from thinkyhead/docs_and_scripts 

    Move scripts and documentation to subfolders
    @alexborro
    alexborro committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    912ed15 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'Development' of https://github.com/ErikZalm/Marlin into… 

    … Development
    @alhirzel
    alhirzel committed Jan 2, 2015
    Configuration menu
    Copy the full SHA
    f36fd3d View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2015

  1. Added .gitignore back into repo

    @monkeydave
    monkeydave committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    3f9707a View commit details
    Browse the repository at this point in the history

  2. Readd .travis.yml, change build enviroment to use ino instead of gcc

    @monkeydave
    monkeydave committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    86cc22d View commit details
    Browse the repository at this point in the history

  3. Updated .travis.yml for ErikZalm branch pull request

    @monkeydave
    monkeydave committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    21cc188 View commit details
    Browse the repository at this point in the history

  4. Merge pull request MarlinFirmware#1295 from monkeydave/Re-add_gitignore 

    Added .gitignore back into repo
    @boelle
    boelle committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    9d9a2d7 View commit details
    Browse the repository at this point in the history

  5. Update .gitignore

    @boelle
    boelle committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    206b7f4 View commit details
    Browse the repository at this point in the history

  6. Merge pull request MarlinFirmware#1297 from monkeydave/Readd-Travis-CI 

    Readd .travis.yml
    @boelle
    boelle committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    b5c6f11 View commit details
    Browse the repository at this point in the history

  7. Updated .travis.yml so others forks will also compile

    @monkeydave
    monkeydave committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    be81dfa View commit details
    Browse the repository at this point in the history

  8. Added compile checks for lots of defines in Configuration.h

    @monkeydave
    monkeydave committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    07b85f8 View commit details
    Browse the repository at this point in the history

  9. Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLL… 

    …ER defined
    @wgm4321
    wgm4321 committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    f8aa5ff View commit details
    Browse the repository at this point in the history

  10. Add English defines for filament menu to non-English to prevent compi… 

    …le errors until translated
    @wgm4321
    wgm4321 committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    04fb34c View commit details
    Browse the repository at this point in the history

  11. Commented out configs that are failing with no easy fixes for the moment

    @monkeydave
    monkeydave committed Jan 3, 2015
    Configuration menu
    Copy the full SHA
    9d57c37 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2015

  1. Merge pull request MarlinFirmware#1303 from wgm4321/Development 

    Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
    @boelle
    boelle committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    3d9f4ac View commit details
    Browse the repository at this point in the history

  2. Merge pull request MarlinFirmware#1304 from monkeydave/Travis-CI 

    Added further tests to Travis CI config
    @boelle
    boelle committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    efca4af View commit details
    Browse the repository at this point in the history

  3. Merge pull request MarlinFirmware#1291 from alhirzel/Development 

    Define analogInputToDigitalPin only if needed
    @boelle
    boelle committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    c5f138e View commit details
    Browse the repository at this point in the history

  4. temp runaway: proper cast to prevent any overflow.

    Philippe L committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    3024821 View commit details
    Browse the repository at this point in the history

  5. Merge pull request MarlinFirmware#1309 from philfifi/fix_temp_runaway 

    temp runaway: proper cast to prevent any overflow.
    @alexborro
    alexborro committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    d2b6e62 View commit details
    Browse the repository at this point in the history

  6. issue 968 for dev branch 

    try, try again.

If 'OK' is garbled on sending PC won't receive it.  Both machines will
wait on each other forever.  This resends OK if nothing is heard from PC
for a while to avoid this bad case.
    @i-make-robots
    i-make-robots committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    9472bbe View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2015

  1. issue 1318 

    - added DEFINE In configuration.h with default ok timeout ms (at end of
file)
- changed manage_inactivity() to use the new define
    @i-make-robots
    i-make-robots committed Jan 6, 2015
    Configuration menu
    Copy the full SHA
    0978619 View commit details
    Browse the repository at this point in the history