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.

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

Merge upstream #1

Merged
merged 948 commits into from
May 1, 2015
Merged
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Apr 5, 2015

  1. Configuration menu
    Copy the full SHA
    0e6514e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2f0081b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    61de6ec View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d24ea7c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    53eb662 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1819 from thinkyhead/fixup_probing

    Have the configurator read from MarlinFirmware repo
    thinkyhead committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    f5dad8a View commit details
    Browse the repository at this point in the history
  7. Disable splash-screen when done once

    Splash screen was shown with every display init.
    That means every time the menus where entered.
    
    Note the 2 in the initialisation.
    The buffer is already written in two steps a 512 byte.
    Without the 2 only the upper half is shown.
    AnHardt committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    9865318 View commit details
    Browse the repository at this point in the history
  8. Draw content in display loop only when needed

    Example for splash screen.
    AnHardt committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    bf04a92 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5360158 View commit details
    Browse the repository at this point in the history
  10. Prevents MINTEMP / MAXTEMP when no heaters present

    This commit checks whether or not HEATER_0 is in use, and if not, skips
    the MIN / MAX temperature checks.
    r89m committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    1a5293c View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2015

  1. Configuration menu
    Copy the full SHA
    cf66cb8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    46474cf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d867c18 View commit details
    Browse the repository at this point in the history
  4. Azteeg X3 Pro Pin fix ups

    Natealus committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    b6f2bff View commit details
    Browse the repository at this point in the history
  5. Revert "Draw content in display loop only when needed"

    This reverts commit bf04a92.
    AnHardt committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    d521693 View commit details
    Browse the repository at this point in the history
  6. Now the simplycistic solution.

    Just and only display splashscreen only once.
    AnHardt committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    6ae7148 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9a093b2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d27c82a View commit details
    Browse the repository at this point in the history
  9. Merge pull request #1827 from thinkyhead/fixup_dualz

    Fix compile error with Z_DUAL_ENDSTOPS
    thinkyhead committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    ed7a2f9 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2015

  1. Fix typo in FWRETRACT handler

    Should be `retracting` and not `retract`
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    6d084c0 View commit details
    Browse the repository at this point in the history
  2. Fix lcd_status_message

    Because we now can use utf8 with up to 3 bytes per symbol,
    lcd_status_message[] must be 3*LCD_WIDTH wide.
    Filling up the message, or cutting to length, are fixed to.
    
    Fix for #1832 about at the end.
    AnHardt committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    ac843fb View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1828 from Wackerbarth/Configurator

    Update Configurator Files
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    6a860b9 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1829 from Natealus/Development

    Azteeg X3 Pro Pin fix ups
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    56aea5f View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1823 from AnHardt/splashscreen

    Disable splash-screen when done once
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    d70a4a3 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1839 from AnHardt/fix-statusmessage

    Fix lcd_status_message
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    5c2bb05 View commit details
    Browse the repository at this point in the history
  7. Don't stow the probe until the last grid point!

    - Address Issue #1682 at hash #issuecomment-89756858
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    d20f42c View commit details
    Browse the repository at this point in the history
  8. Merge pull request #1825 from shaggythesheep/bugfix_no_heaters

    Bugfix: Temperature checks when no heaters in use
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    d05efa0 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e502144 View commit details
    Browse the repository at this point in the history
  10. Latest upstream commits

    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    967db18 View commit details
    Browse the repository at this point in the history
  11. Updates for the configurator

    - Sections in all `Configuration_adv.h`
    - Recognize JAPANESE/WESTERN/CYRILLIC options
    - Better capturing of comments for tooltips
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    7d2c2f1 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    c379f17 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #1842 from thinkyhead/more_configurator

    Configurator updates
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    3db4e0f View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    002340f View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    a9ed39b View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    f7c4e7e View commit details
    Browse the repository at this point in the history
  17. Merge pull request #1847 from thinkyhead/more_configurator

    Fix G29 not deploying probe in some instances
    thinkyhead committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    5b2c67f View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2015

  1. Merge pull request #1774 from epatel/Development

    Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
    thinkyhead committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    e03da48 View commit details
    Browse the repository at this point in the history
  2. Fix de after PREVENT_DANGEROUS_EXTRUDE

    - Set `de` to 0 when `position[E] = target[E]`
    - Address regression mention in #1846
    thinkyhead committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    1d291be View commit details
    Browse the repository at this point in the history
  3. Minimum delay in menu click feedback

    Squished #1849
    thinkyhead committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    cf9b584 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    eb6e388 View commit details
    Browse the repository at this point in the history
  5. Fix typo in readme

    OpCode1300 committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    ff429cd View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1850 from OpCode1300/docs

    Fix typo in readme
    thinkyhead committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    419f3eb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    43773ff View commit details
    Browse the repository at this point in the history
  8. Merge branch 'Development' into dev_version

    Latest upstream commits
    thinkyhead committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    7431ef7 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    756bb5e View commit details
    Browse the repository at this point in the history
  10. Update language_ru.h

    lcfm1 committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    07fc2b5 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    27cb90d View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    3162971 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #1863 from lcfm1/patch-3

    Update language_ru.h
    thinkyhead committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    c82da64 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #1864 from thinkyhead/is_running

    IsStopped / IsRunning inline
    thinkyhead committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    caa7734 View commit details
    Browse the repository at this point in the history
  15. Merge pull request #1853 from thinkyhead/dev_version

    Set version to "1.0.3 dev"
    thinkyhead committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    bb917ec View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    4788b59 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #1865 from thinkyhead/configurator_values

    Thermistor values for configurator
    thinkyhead committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    98f3130 View commit details
    Browse the repository at this point in the history
  18. Remove Contrast Menu for U8GLIB_ST7920

    The other two devices we use in u8glib have more than only dummy code.
    Checked this in the library code.
    AnHardt committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    bcc0419 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    a76fb42 View commit details
    Browse the repository at this point in the history
  20. Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp

    and cleaned typo.
    AnHardt committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    6a514f3 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    7dc64ef View commit details
    Browse the repository at this point in the history
  22. Moved the definitions of the LCD_STR_* to Conditionals.h

    to avoid errors in Marlin_main.cpp. #1860
    
    In the include tree of Marlin_main.cpp the decision between the display types is not made.
    To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
    A 'dogm_lcd_implementation.h.h' would be a curiosity.
    So i moved both of the definition blocks to conditionals.h
    
    On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
    AnHardt committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    ea89765 View commit details
    Browse the repository at this point in the history
  23. Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed")

    Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
    AnHardt committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    14d4419 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    540dbb3 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2015

  1. Z Probe inverting not present in example configs, causes error

    The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
    invert the logic of the endstop is in the main configuration.h but
    wasn't present in the example configuration.h's. Causes a compiling
    error with Z Probe enabled. Just added it to all the configs. :)
    Natealus committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    585eee6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1866 from AnHardt/contrast

    Remove Contrast Menu for device U8GLIB_ST7920
    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    4abd23a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1269c44 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7f22464 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1868 from AnHardt/LCD_STR

    Moved the definitions of the LCD_STR_* to Conditionals.h
    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    a00ebf0 View commit details
    Browse the repository at this point in the history
  6. Spell adjustment

    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    a95544f View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1867 from epatel/Development

    Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    837ceb9 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #1876 from thinkyhead/cold_extrude

    Catch dangerous extrude before trying several
    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    2ca099d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    dcde09f View commit details
    Browse the repository at this point in the history
  10. Made encoderPosition and quick_feedback dependant on NEWPANEL

    where the hardware is available.
    Fix for #1873
    AnHardt committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    df50523 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #1875 from Natealus/Development

    Z Probe inverting not present in example configs, causes error
    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    b1950a7 View commit details
    Browse the repository at this point in the history
  12. Fix spelling of "too"

    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    a488445 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #1878 from thinkyhead/cold_extrude

    Cold extrude
    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    6096164 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #1877 from AnHardt/display-only

    Made encoderPosition and quick_feedback dependant on NEWPANEL
    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    7a1aef1 View commit details
    Browse the repository at this point in the history
  15. Fix moves for DELTA for MANUAL_BED_LEVELING

    - Use `line_to_current` in place of `plan_buffer_line`
    thinkyhead committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    9189cc6 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2015

  1. Configuration menu
    Copy the full SHA
    fb4cefc View commit details
    Browse the repository at this point in the history
  2. Shuffling declarations.

    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    b328c6e View commit details
    Browse the repository at this point in the history
  3. Shuffling declarations..

    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    5914d9d View commit details
    Browse the repository at this point in the history
  4. Merge branch 'Development' into cold_extrude

    Latest upstream commits
    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    740152e View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1879 from thinkyhead/cold_extrude

    Fix moves for DELTA for MANUAL_BED_LEVELING
    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    67c0e83 View commit details
    Browse the repository at this point in the history
  6. Break out prevent_dangerous_extrude feature

    - It’s inline here, but could be a macro and duplicated for
    `planner.cpp`
    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    8b16ebe View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    907e8e9 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    01654bd View commit details
    Browse the repository at this point in the history
  9. Restore M928, M999

    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    3105ebc View commit details
    Browse the repository at this point in the history
  10. Organize M Codes by Category

    - In GCodes.md
    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    a3b13eb View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    93eb632 View commit details
    Browse the repository at this point in the history
  12. Smaller headings

    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    fe912f4 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    652d59c View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    a327d87 View commit details
    Browse the repository at this point in the history
  15. Clean up M85 in GCodes.md

    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    8f164f4 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    5fe3829 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #1887 from thinkyhead/cold_extrude

    Break out prevent_dangerous_extrude feature
    thinkyhead committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    f1a03c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2015

  1. Merge branch 'Development' into cold_extrude

    Latest upstream commits
    thinkyhead committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    71adb1e View commit details
    Browse the repository at this point in the history
  2. Apply CUSTOM_MACHINE_NAME to configurations

    - Replace “Mendel” with “RepRap”
    thinkyhead committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    ccbe2c4 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1890 from thinkyhead/cold_extrude

    Apply CUSTOM_MACHINE_NAME to configs
    thinkyhead committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    79a5b14 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c6bb98a View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1891 from thinkyhead/cold_extrude

    machine name for hephestos too
    thinkyhead committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    f8b4ee0 View commit details
    Browse the repository at this point in the history
  6. Fix doubled lcd_quick_feedback

    - MENU_ITEM causes lcd_quick_feedback to be called, so only those calls
    to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the
    `feedback` flag when calling `lcd_goto_menu`.
    thinkyhead committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    388dd0c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    055b118 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #1893 from thinkyhead/cold_extrude

    Fix doubled lcd_quick_feedback
    thinkyhead committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    b089eb4 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2015

  1. Homing fixes

    - Prevent `Z_SAFE_HOMING` from homing Z twice in some cases
    - Allow `G28` with XYZ values of 0 to explicitly set the position
    - Don’t add `home_offset` when setting XYZ explicitly in `G28`
    - Add `code_has_value` function to check for the presence of a numeric
    value (could just test for space or nul to allow other types of values)
    thinkyhead committed Apr 12, 2015
    Configuration menu
    Copy the full SHA
    ac2b23f View commit details
    Browse the repository at this point in the history
  2. Manual bed leveling menu fixes.

    lcdDrawUpdate = 2 helped a lot!
    epatel committed Apr 12, 2015
    Configuration menu
    Copy the full SHA
    a37c7ff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8857b9e View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2015

  1. Configuration menu
    Copy the full SHA
    74e4b42 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1896 from thinkyhead/cold_extrude

    Homing fixes
    thinkyhead committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    e7aae31 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1897 from epatel/Development

    Manual bed leveling menu fixes.
    thinkyhead committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    666f9cd View commit details
    Browse the repository at this point in the history
  4. Apply three more commits

    thinkyhead committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    ccddc28 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'Development' into squash_fixups

    Conflicts:
    	Marlin/ultralcd.cpp
    thinkyhead committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    cfa60bd View commit details
    Browse the repository at this point in the history
  6. next_ vars faster than previous_

    - Change some `previous_` time vars to `next_` so an add only happens
    at intervals
    - Fix `HEATER_0_USES_MAX6675` polling too frequently, or not at all
    thinkyhead committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    e4b1e86 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    257a907 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #1899 from thinkyhead/squash_fixups

    Several fixups
    thinkyhead committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    0908c41 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5a9e45c View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1902 from msutas/Development

    Fix Syntax Error Filament Runout Statement
    thinkyhead committed Apr 13, 2015
    Configuration menu
    Copy the full SHA
    c05b347 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2015

  1. Naming and code comments

    thinkyhead committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    09d60e0 View commit details
    Browse the repository at this point in the history
  2. Spacing in XYZ_CONSTS

    thinkyhead committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    17ad80c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1906 from thinkyhead/some_fixes

    Naming and code comments
    thinkyhead committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    6b51305 View commit details
    Browse the repository at this point in the history
  4. fix type of code_has_value

    thinkyhead committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    642f6a9 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1907 from thinkyhead/some_fixes

    Fix type of code_has_value
    thinkyhead committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    dee6840 View commit details
    Browse the repository at this point in the history
  6. Add pin configuration for Brainwave Pro

    Copied from jcrocholl's contributions to the OpenBeamUSA Marlin fork
    ex-nerd committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    ffaf1b4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e0e68c5 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    3f02da6 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #1910 from thinkyhead/some_fixes

    Rename servos[] array in Marlin to servo[]
    thinkyhead committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    639ffc3 View commit details
    Browse the repository at this point in the history
  10. Enable all old_z_*_endstop vars for Z_DUAL_ENDSTOPS

    - Potentially addressing #1911
    thinkyhead committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    5dd87d2 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    7336e6d View commit details
    Browse the repository at this point in the history
  12. Merge pull request #1912 from thinkyhead/some_fixes

    Enable all old_z_*_endstop vars for Z_DUAL_ENDSTOPS
    thinkyhead committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    d57b23b View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    b447a4f View commit details
    Browse the repository at this point in the history
  14. Example Configuration for K8200 back in sync

    example_configurations\K8200\Configuration.h:
    * merge upstream changes from default Configuration.h manually
    * add some machine specific comments
    CONSULitAS committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    3851ac6 View commit details
    Browse the repository at this point in the history
  15. Some minor translations to spanish

    elgambitero authored and elgambitero committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    cb9ac49 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2015

  1. Merge pull request #1913 from CONSULitAS/Development_Update_K8200_Config

    Example Configuration for K8200 back in sync
    thinkyhead committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    71f183a View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1915 from elgambitero/Development

    Some minor translations to spanish
    thinkyhead committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    637babb View commit details
    Browse the repository at this point in the history
  3. Example Configuration for K8200: comments/URL/readme

    Example Configuration for K8200 : comments/URL/readme
    
    example_configurations\K8200\Configuration.h:
    * add machine specific header
    * change STRING_URL to K8200 fork (@thinkyhead: What do you think?)
    
    example_configurations\K8200\readme.md:
    * updated documentation
    * added URLs and links
    CONSULitAS committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    0af5e3a View commit details
    Browse the repository at this point in the history
  4. Example Configuration for K8200: comments/URL/readme

    Example Configuration for K8200 : comments/URL/readme
    
    example_configurations\K8200\Configuration.h:
    * add machine specific header
    * change STRING_URL to K8200 fork (@thinkyhead: What do you think?)
    
    example_configurations\K8200\readme.md:
    * updated documentation
    * added URLs and links
    CONSULitAS committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    1de9b56 View commit details
    Browse the repository at this point in the history
  5. Example Configuration for K8200 back in sync

    example_configurations\K8200\Configuration.h:
    * merge upstream changes from default Configuration.h manually
    * add some machine specific comments
    CONSULitAS committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    a40c274 View commit details
    Browse the repository at this point in the history
  6. Some minor translations to spanish

    elgambitero authored and CONSULitAS committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    60f4627 View commit details
    Browse the repository at this point in the history
  7. Update README.md

    boelle committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    f8389b1 View commit details
    Browse the repository at this point in the history
  8. Update Compilation.md

    boelle committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    d0b1f70 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e1b69db View commit details
    Browse the repository at this point in the history
  10. Removed unnecessary comments

    paclema committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    cde5eee View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2015

  1. Merge pull request #1919 from paclema/M48_mismatch

    Fixed M48 mismatch between n and P parameter on documentation
    thinkyhead committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    f49a73d View commit details
    Browse the repository at this point in the history
  2. Babystep delay 2us

    thinkyhead committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    53be0f3 View commit details
    Browse the repository at this point in the history
  3. Raise Z for M401 and M402

    thinkyhead committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    63b98b8 View commit details
    Browse the repository at this point in the history
  4. Apply zprobe_zoffset in axis_is_at_home

    Ensure the probe offset will always be included when homing Z.
    thinkyhead committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    58d128b View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1923 from thinkyhead/babystep_delay_2us

    Babystep delay 2us
    thinkyhead committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    d0b65ff View commit details
    Browse the repository at this point in the history
  6. Fixed jump in speed when using high accelerations on axes with lots o…

    …f steps.
    
    I.e., when acceleration * steps per mm > 2,000,000.
    This was done by changing MultiU24X24toH16 to take a 32b bit operand.
    Removed the claim that stepper.cpp uses the Leib algorithm.
    nophead committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    e4595fa View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2015

  1. Fixed some comment spellings.

    nophead committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    cc6b7cf View commit details
    Browse the repository at this point in the history
  2. Fixed faulty comment merge

    nophead committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    483384a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    581685a View commit details
    Browse the repository at this point in the history
  4. Update README.md

    boelle committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    2d1e730 View commit details
    Browse the repository at this point in the history
  5. Fixed compilation error "error: stray ‘\357’ in program" in several c…

    …onfiguration files.
    
    Introduced in commit 697ee2d and later spread to other files.
    ivan-galvez committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    b99e63a View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2015

  1. Merge pull request #1926 from nophead/acceleration_fix

    Fixed jump in speed at high accelerations on axes with lots of steps
    thinkyhead committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    67a4471 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1931 from paclema/M303_echo

    Added new PID autotune info, to make easy copy & paste results to marlin
    thinkyhead committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    5e3bb4b View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1933 from bq/Fix_stray_in_configuration

    Fixed compilation error "error: stray ‘\357’ in program"
    thinkyhead committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    a4ca87b View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2015

  1. Add M410 QuickStop command

    thinkyhead committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    4784776 View commit details
    Browse the repository at this point in the history
  2. Tweak comments

    thinkyhead committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    d931220 View commit details
    Browse the repository at this point in the history
  3. Minor fix for M300

    Corrected wrong order of parameters.
    AnHardt committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    671aaf2 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2015

  1. More Beeper clean up.

    Centralised beep code to lcd_buzz().
    From gcode_M300() and lcd_quick_feedback().
    
    Enforced max. duration for M300 to 5 seconds.
    
    Corrected description in 'Configuration.h'
    
    LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
    LCD_FEEDBACK_FREQUENCY_DURATION_MS.
    AnHardt committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    064f2b3 View commit details
    Browse the repository at this point in the history
  2. Commented REPRAP_DISCOUNT_SMART_CONTROLLER again

    and removed some tabs.
    AnHardt committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    3a27a78 View commit details
    Browse the repository at this point in the history
  3. max endstopp

    no user will home to 0 with a max endstopp
    Wurstnase committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    da0d91a View commit details
    Browse the repository at this point in the history
  4. v <-> code_value

    Wurstnase committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    61ae43f View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2015

  1. Fix for #1946

    Syntax error.
    AnHardt committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    b59e92a View commit details
    Browse the repository at this point in the history
  2. Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h

    and add some documentation - how to integrate a new font.
    AnHardt committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    c5e0e29 View commit details
    Browse the repository at this point in the history
  3. tone will end automaticly

    AnHardt committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    f2c94b3 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2015

  1. filter any 0

    unknown authored and unknown committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    c26d816 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2015

  1. fix typo

    c'n'p ftw :/
    Wurstnase committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    be9e4ce View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2015

  1. Merge pull request #1941 from thinkyhead/gcode_M410

    Add M410 QuickStop command
    thinkyhead committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    461aaf2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1944 from AnHardt/beep2

    More Beeper clean up
    thinkyhead committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    3b97a7d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8534bc3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    996d0a9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    64268f3 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1955 from AnHardt/langlang

    Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
    thinkyhead committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    0094481 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a0a5ff6 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c3560e0 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #1958 from thinkyhead/redo_1937

    Fix homing of YZ with DUAL_X_CARRIAGE
    thinkyhead committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    c2e11da View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3193291 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    2558c10 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #1959 from thinkyhead/lcd_move_rate

    Include axis parameter to ultralcd's line_to_current
    thinkyhead committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    075386e View commit details
    Browse the repository at this point in the history
  13. Apply zprobe_zoffset in axis_is_at_home

    Ensure the probe offset will always be included when homing Z.
    thinkyhead committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    0165560 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    7fb8d9f View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    588ed70 View commit details
    Browse the repository at this point in the history
  16. stepper.cpp macros rework

    delete some tabs
    Wurstnase committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    79a44a9 View commit details
    Browse the repository at this point in the history
  17. Add variant for MAX6675 in M104

    Else will throw error:
    @:0 B@:0
    Error:No thermistors - no temperature
    [ERROR] Error:No thermistors - no temperature
    
    when no bed is defined
    AnHardt committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    0fed463 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2015

  1. Merge pull request #1960 from Wurstnase/macro_steppercpp

    Macro steppercpp
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    2606d1d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1945 from Wurstnase/max_endstopp

    Max endstopp
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    3a74bb5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    35e79d5 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1965 from thinkyhead/g28_xyz_are_flags

    Remove set-coordinate extension of G28
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    c5a1b22 View commit details
    Browse the repository at this point in the history
  5. G4 shows status message only if no message is set already

    - Address issue raised in #1961
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    ce142af View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    56ff46e View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1964 from AnHardt/Max6675again

    Add variant for MAX6675 in M104
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    3c9e94e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    3a6fd91 View commit details
    Browse the repository at this point in the history
  9. Minor cleanup of M48

    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    182f2cd View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1925 from thinkyhead/move_zoffset

    Apply zprobe_zoffset in axis_is_at_home
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    777ca11 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    0d8c00d View commit details
    Browse the repository at this point in the history
  12. Remove extraneous ;

    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    7295640 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    97dfa03 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #1966 from thinkyhead/g4_dwell_message

    G4 shows status message only if no message is set already
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    b275946 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    c92b599 View commit details
    Browse the repository at this point in the history
  16. Merge pull request #1967 from thinkyhead/g4_dwell_message

    Use millis_t for progress_bar_ms and expire_status_ms
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    a640cad View commit details
    Browse the repository at this point in the history
  17. Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402

    Raise Z for M401 and M402
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    0438f0d View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    5c29fda View commit details
    Browse the repository at this point in the history
  19. Merge pull request #1968 from thinkyhead/more_disable_warning

    Add a warning for DISABLE_[XYZ] options
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    b3436c8 View commit details
    Browse the repository at this point in the history
  20. Fix BEEPER duration

    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    9c5d14e View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    a932e74 View commit details
    Browse the repository at this point in the history
  22. Merge pull request #1969 from thinkyhead/buzz_duration

    Fix BEEPER duration
    thinkyhead committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    ac9ca64 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2015

  1. Configuration menu
    Copy the full SHA
    a22a228 View commit details
    Browse the repository at this point in the history
  2. Rename blinkm files

    thinkyhead committed Apr 26, 2015
    Configuration menu
    Copy the full SHA
    0ec4447 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1970 from thinkyhead/rename_files

    Rename files to move them in the IDE
    thinkyhead committed Apr 26, 2015
    Configuration menu
    Copy the full SHA
    1f530be View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2015

  1. M111 - Debug Level

    - Add `M111` as a standard option to set the debug level
    - Implement `DEBUG_ECHO` in `process_commands`
    - Other debug levels (e.g., `DEBUG_DRYRUN`) need more work
    thinkyhead committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    d43cc2d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1973 from thinkyhead/m111_debug_level

    M111 - Debug Level
    thinkyhead committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    01bedd1 View commit details
    Browse the repository at this point in the history
  3. Make EEPROM reproducible in GCode

    With these changes the output of `M503 S0` is all you need to restore
    the EEPROM. Building on this it is straightforward to save and restore
    the EEPROM state using the SD card or external GCode file.
    
    - Added `M145` to set “heatup states” for the LCD menu
    - Added `M420` to toggle Mesh Bed Leveling
    - Added `M421` to set a single Mesh coordinate
    - Extended `Config_PrintSettings` with added M codes
    - Cleaned up some comments here and there
    thinkyhead committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    0fca084 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fb37938 View commit details
    Browse the repository at this point in the history
  5. Intit. commit for Chinese

    Edited the European part of 'ISO10646_CN.fon' to match the existing fonts.
    Added Chinese font to make_fonts.bat
    Created 'dogm_font_data_ISO10646_CN.h'
    Added Chinese to 'language.h'
    Added 'language_cn.h' with some minor edits.
    Added Chinese font in 'language_en.h' to not fall back to European font.
    Added cn to 'Configuration.h'
    Changed WIDTH to LCD_PIXEL_WIDTH and HEIGHT to LCD_PIXEL_HEIGHT to have more descriptive names.
    
    In 'dogm_lcd_implementation.h'
    Added Chinese Font
    Made 1 pixel more room for the larger Chinese font on the status line.
    Changed geometry of the 'select bar' by one pixel.
    Changed the way the position for values and postcars are set.
    AnHardt committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    6b1b718 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    76b12ed View commit details
    Browse the repository at this point in the history
  7. Add some doku

    AnHardt committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    1d9699b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6cba6bc View commit details
    Browse the repository at this point in the history
  9. Allow Y to home before X with option in Configuration_adv.h.

    This addresses comments in #1956 and #1079. In particular, this is useful
    when both endstops are stationary on a CoreXY system, and the Y axis needs
    to be homed before the X so the flags are aligned.
    sjkelly committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    98ca460 View commit details
    Browse the repository at this point in the history
  10. Merge remote-tracking branch 'upstream/Development' into K8200_2015-0…

    …4-23_TEST
    
    Conflicts:
    	Marlin/example_configurations/K8200/Configuration.h
    CONSULitAS committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    d1c1f76 View commit details
    Browse the repository at this point in the history
  11. K8200 example Configuration.h: STRING_URL removed

    K8200 example Configuration.h:
    * STRING_URL removed: like proposed by thinkyhead in #1917
    CONSULitAS committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    6af40e9 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    8f8824e View commit details
    Browse the repository at this point in the history
  13. language_de.h: updated translation and minor typos

    language_de.h: updated translation and minor typos
    CONSULitAS committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    c5dfb35 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2015

  1. Level Bed in Prepare submenu

    - Add “Level Bed” menu item for auto bed leveling
    - Hide the option if homing has not been done yet
    - Arrange the Prepare submenu more logically (?)
    - Add documentation comments, some white-space
    - Apply some coding standards here and there
    - Move old encoder multiplier debug option to `ultralcd.cpp`
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    5b24875 View commit details
    Browse the repository at this point in the history
  2. Update Marlin_main.cpp

    Corrected "servo.h" to "Servo.h" because of the updated filename.
    Bernardo committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    ff67ee7 View commit details
    Browse the repository at this point in the history
  3. Update Servo.cpp

    Updated "servo.h" to "Servo.h"
    Bernardo committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    e449659 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1984 from thinkyhead/leveling_menu_items

    Level Bed in Prepare submenu
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    ed988e3 View commit details
    Browse the repository at this point in the history
  5. Change M421 to take coordinates

    This makes `M421` more amenable for irregular matrices
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    ff178d8 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1977 from AnHardt/Cinese2

    We mark this historic day, when Marlin went to China.
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    2bc1d70 View commit details
    Browse the repository at this point in the history
  7. Fix homing Z position

    Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the
    planner position in sync when homing.
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    c36226c View commit details
    Browse the repository at this point in the history
  8. Merge pull request #1986 from thinkyhead/fix_homing_zpos

    Fix homing Z position
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    8c28e36 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    71a0b1a View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1987 from thinkyhead/fix_homing_zpos

    Disable endstops between homing bumps
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    c1dd9bd View commit details
    Browse the repository at this point in the history
  11. Merge pull request #1957 from Voxel8/sjk/home_y_before_x

    Allow Y to home before X with option in Configuration_adv.h.
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    28aef68 View commit details
    Browse the repository at this point in the history
  12. Merge branch 'Development' into eeprom_in_gcode

    Latest upstream commits
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    0f687b5 View commit details
    Browse the repository at this point in the history
  13. Remove obsolete STRING_URL

    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    0970102 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #1917 from CONSULitAS/Development_Update_K8200_Config

    Example Configuration for K8200: comments/URL/readme
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    185f8a0 View commit details
    Browse the repository at this point in the history
  15. Merge pull request #1985 from Arengorn/Development

    Update of servo.h
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    31516e2 View commit details
    Browse the repository at this point in the history
  16. Merge pull request #1988 from thinkyhead/bye_string_url

    Remove obsolete STRING_URL
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    c1fbef1 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    ae53b3c View commit details
    Browse the repository at this point in the history
  18. Merge pull request #1974 from thinkyhead/eeprom_in_gcode

    Make EEPROM reproducible in GCode
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    3688256 View commit details
    Browse the repository at this point in the history
  19. Latest upstream commits

    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    a120bf3 View commit details
    Browse the repository at this point in the history
  20. Merge pull request #1989 from thinkyhead/pid_tuning_report

    Fix the M303 S-1 report text
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    a9a4f0e View commit details
    Browse the repository at this point in the history
  21. Merge pull request #1983 from CONSULitAS/Development_Update_language_…

    …de.h
    
    language_de.h: updated translation and minor typos
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    02acf06 View commit details
    Browse the repository at this point in the history
  22. Merge pull request #1886 from ex-nerd/pins_BRAINWAVE_PRO

    Add pin configuration for Brainwave Pro
    thinkyhead committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    7548a56 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2015

  1. Configuration menu
    Copy the full SHA
    2610b8d View commit details
    Browse the repository at this point in the history
  2. Enable TRP for the bed

    in all Configurations.
    AnHardt committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    514d8ac View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4dcc0fd View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1991 from thinkyhead/thermal_protection_on

    Enable thermal runaway protection by default
    thinkyhead committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    e47e888 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2015

  1. Configuration menu
    Copy the full SHA
    d065d37 View commit details
    Browse the repository at this point in the history
  2. Don't apply M428 if an error occurs

    - Also move audio feedback into the command
    - Added shorthand for `lcd_buzz` availability
    thinkyhead committed Apr 30, 2015
    Configuration menu
    Copy the full SHA
    d4c74b8 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2001 from thinkyhead/thermal_protection_on

    Add M428 to set home_offset logically
    thinkyhead committed Apr 30, 2015
    Configuration menu
    Copy the full SHA
    b12bcd0 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1993 from AnHardt/TRP-bed

    Enable TRP for the bed
    thinkyhead committed Apr 30, 2015
    Configuration menu
    Copy the full SHA
    425cd46 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1998 from paclema/Filament_runout_fix

    Fixed sintaxis error of filament runout
    thinkyhead committed Apr 30, 2015
    Configuration menu
    Copy the full SHA
    ca8cec8 View commit details
    Browse the repository at this point in the history