 Scott Lahteine
|
3db4e0fb5d
|
Merge pull request #1842 from thinkyhead/more_configurator
Configurator updates
|
2015-04-06 23:38:20 -07:00 |
|
|
Scott Lahteine
|
e502144eda
|
Fixup formatting of last commit
|
2015-04-06 21:28:14 -07:00 |
|
|
Scott Lahteine
|
d05efa008d
|
Merge pull request #1825 from shaggythesheep/bugfix_no_heaters
Bugfix: Temperature checks when no heaters in use
|
2015-04-06 21:25:22 -07:00 |
|
|
Scott Lahteine
|
d20f42c883
|
Don't stow the probe until the last grid point!
- Address Issue #1682 at hash #issuecomment-89756858
|
2015-04-06 20:58:09 -07:00 |
|
|
Scott Lahteine
|
5c2bb05af3
|
Merge pull request #1839 from AnHardt/fix-statusmessage
Fix lcd_status_message
|
2015-04-06 19:08:25 -07:00 |
|
|
Scott Lahteine
|
d70a4a3847
|
Merge pull request #1823 from AnHardt/splashscreen
Disable splash-screen when done once
|
2015-04-06 18:48:48 -07:00 |
|
|
Scott Lahteine
|
56aea5f8e5
|
Merge pull request #1829 from Natealus/Development
Azteeg X3 Pro Pin fix ups
|
2015-04-06 18:19:33 -07:00 |
|
|
Scott Lahteine
|
6a860b99dc
|
Merge pull request #1828 from Wackerbarth/Configurator
Update Configurator Files
|
2015-04-06 18:09:26 -07:00 |
|
|
Scott Lahteine
|
6d084c017f
|
Fix typo in FWRETRACT handler
Should be `retracting` and not `retract`
|
2015-04-06 17:04:22 -07:00 |
|
|
Scott Lahteine
|
ed7a2f9fac
|
Merge pull request #1827 from thinkyhead/fixup_dualz
Fix compile error with Z_DUAL_ENDSTOPS
|
2015-04-06 16:34:04 -07:00 |
|
|
Scott Lahteine
|
f5dad8ade2
|
Merge pull request #1819 from thinkyhead/fixup_probing
Have the configurator read from MarlinFirmware repo
|
2015-04-04 20:19:44 -07:00 |
|
|
Scott Lahteine
|
cb02bc6db4
|
Merge pull request #1817 from AnHardt/dogm_looptest
Execute DOGM display-loop less often
|
2015-04-04 17:29:56 -07:00 |
|
|
Scott Lahteine
|
f3597cf55a
|
Merge pull request #1818 from quillford/patch-1
Fixed scara directions
|
2015-04-04 16:27:33 -07:00 |
|
|
Scott Lahteine
|
6c5f07c5cb
|
Merge pull request #1813 from thinkyhead/fixup_probing
Fix bad thermal runaway trigger
|
2015-04-04 14:41:43 -07:00 |
|
|
Scott Lahteine
|
c83faa9c5e
|
Merge pull request #1811 from thinkyhead/fixup_probing
Compare indices instead of floats for probe actions
|
2015-04-04 05:14:59 -07:00 |
|
|
Scott Lahteine
|
a98183b463
|
Merge pull request #1809 from Wackerbarth/LanguageCleanup
Deferring default definition made #undef unnecessary
|
2015-04-04 04:37:20 -07:00 |
|
|
Scott Lahteine
|
41ded7e996
|
Merge pull request #1805 from thinkyhead/fixup_probing
Optimize coordinate copying, fix EXTRUDER_RUNOUT_PREVENT
|
2015-04-04 03:49:54 -07:00 |
|
|
Scott Lahteine
|
0f9b29e6c5
|
Merge pull request #1803 from Natealus/Development
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
|
2015-04-03 23:45:05 -07:00 |
|
|
Scott Lahteine
|
a3e129e091
|
Merge pull request #1801 from thinkyhead/fixup_probing
Minor optimizations
|
2015-04-03 22:30:01 -07:00 |
|
|
Scott Lahteine
|
e8a711994a
|
Merge pull request #1802 from Natealus/Development
Compiling error temperature.cpp with multiple extruders defined
|
2015-04-03 22:14:12 -07:00 |
|
|
Scott Lahteine
|
4c7af484f8
|
Merge pull request #1787 from thinkyhead/fixup_tr
Fix: thermal_runaway_protection triggered by target temperature increase
|
2015-04-03 20:06:56 -07:00 |
|
|
Scott Lahteine
|
c747becec1
|
Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom
Add PIDTEMPBED to EEPROM
|
2015-04-03 20:03:38 -07:00 |
|
|
Scott Lahteine
|
369a497300
|
Merge pull request #1797 from quillford/Development
Fixed README typos
|
2015-04-03 19:58:09 -07:00 |
|
|
Scott Lahteine
|
8f893eb8df
|
Merge pull request #1798 from thinkyhead/fixup_probing
Fix probe height at G28 start
|
2015-04-03 19:03:00 -07:00 |
|
|
Scott Lahteine
|
610c8c5471
|
Merge pull request #1795 from thinkyhead/fixup_probing
Finish pin tests
|
2015-04-03 18:44:44 -07:00 |
|
|
Scott Lahteine
|
e4934164e4
|
Merge pull request #1790 from Wurstnase/fix_home_z
fix feedrate for homing z
|
2015-04-03 18:35:09 -07:00 |
|
|
Scott Lahteine
|
5c1f08a35f
|
Merge pull request #1772 from croadfeldt/Merge_cleanup
Z_PROBE_ENDSTOP
|
2015-04-03 18:04:31 -07:00 |
|
|
Scott Lahteine
|
db7b0ea0cf
|
Merge pull request #1569 from Wackerbarth/Development
Incorporating Build Numbers
|
2015-04-03 16:56:31 -07:00 |
|
|
Scott Lahteine
|
e8700bd1e2
|
Merge pull request #1788 from AnHardt/iss1786
Fix typo in Marlin_main.cpp
|
2015-04-03 15:14:58 -07:00 |
|
|
Scott Lahteine
|
66b3b53e76
|
Merge pull request #1762 from AnHardt/MiMa
Fix MIN&MAX temperatures again
|
2015-04-01 16:52:07 -07:00 |
|
|
Scott Lahteine
|
443468df8d
|
Merge pull request #1771 from AnHardt/iss1770
Added new - changed entries from Fix up LCD_PROGRESS_BAR
|
2015-04-01 02:13:30 -07:00 |
|
|
Scott Lahteine
|
9593f09b99
|
Merge pull request #1764 from thinkyhead/probe_leveling
Fix homing and leveling
|
2015-04-01 02:00:39 -07:00 |
|
|
Scott Lahteine
|
7bf31cc8a1
|
Merge pull request #1768 from atfield90/atfield90-patch-1
Added support for Atmega 1281 chip
|
2015-04-01 01:59:39 -07:00 |
|
|
Scott Lahteine
|
8231fb166d
|
Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
|
2015-03-31 19:29:48 -07:00 |
|
|
Scott Lahteine
|
0b57a2ab8b
|
Merge pull request #1757 from bq/Translation-strings
Added new trasnslatable labels.
|
2015-03-31 18:56:25 -07:00 |
|
|
Scott Lahteine
|
be593b600b
|
Merge pull request #1756 from thinkyhead/fixup_config
Correct XYZ after obtaining plan_bed_level_matrix
|
2015-03-31 05:08:41 -07:00 |
|
|
Scott Lahteine
|
5f6962dd90
|
Merge pull request #1755 from thinkyhead/fixup_config
Raise when not retracting
|
2015-03-31 03:47:01 -07:00 |
|
|
Scott Lahteine
|
6ff1620fcb
|
Merge pull request #1753 from thinkyhead/fix_extruder_offset
Fix EXTRUDER_OFFSET compiler error
|
2015-03-31 03:21:45 -07:00 |
|
|
Scott Lahteine
|
8a4ed3c241
|
Merge pull request #1754 from thinkyhead/fixup_config
Correct the comment about M206
|
2015-03-31 03:20:57 -07:00 |
|
|
Scott Lahteine
|
db4d8e835c
|
Merge pull request #1752 from thinkyhead/fix_lcd_click
Fix LCD click
|
2015-03-31 02:52:17 -07:00 |
|
|
Scott Lahteine
|
21ab44cfa7
|
Merge pull request #1750 from thinkyhead/fixup_config
Bring all configs up to date
|
2015-03-30 23:49:04 -07:00 |
|
|
Scott Lahteine
|
50145266cd
|
Merge pull request #1748 from thinkyhead/raise_before_homing
Apply Z_RAISE_BEFORE_HOMING before homing XY
|
2015-03-30 23:37:41 -07:00 |
|
|
Scott Lahteine
|
a117b6bff6
|
Merge pull request #1747 from thinkyhead/progress_bar_tweak
Fix up LCD_PROGRESS_BAR
|
2015-03-30 23:37:28 -07:00 |
|
|
Scott Lahteine
|
2e7a4bd7db
|
Merge pull request #1749 from thinkyhead/fixup_config
Restore ENDSTOPPULLUPS in Configuration.h
|
2015-03-30 21:15:44 -07:00 |
|
|
Scott Lahteine
|
b8973051c3
|
Merge pull request #1746 from thinkyhead/power_supply
Allow POWER_SUPPLY to be 0
|
2015-03-30 21:00:40 -07:00 |
|
|
Scott Lahteine
|
baa6787393
|
Merge pull request #1740 from thinkyhead/fixup_homing
Apply leveling for DELTA
|
2015-03-30 15:45:33 -07:00 |
|
|
Scott Lahteine
|
346c07cc1a
|
Merge pull request #1743 from AnHardt/extrudemultiply
Replace extrudemultiply by extruder_multiply[active_extruder]
|
2015-03-30 15:45:10 -07:00 |
|
|
Scott Lahteine
|
e63076504d
|
Merge pull request #1733 from AnHardt/c20
Get back folder symbols on Hitachi displays
|
2015-03-30 01:57:00 -07:00 |
|
|
Scott Lahteine
|
b47fa8c064
|
Merge pull request #1735 from AnHardt/compilerCandy
Remove some further warnings
|
2015-03-29 23:55:19 -07:00 |
|
|
Scott Lahteine
|
85b67e5223
|
Merge pull request #1738 from thinkyhead/fixup_homing
Fix G29 E and M48 n
|
2015-03-29 20:08:19 -07:00 |
|
|
Scott Lahteine
|
1e9999711c
|
Merge pull request #1736 from thinkyhead/fixup_homing
Fix G28 homing Y with X
|
2015-03-29 18:27:17 -07:00 |
|
|
Scott Lahteine
|
d738b7acdd
|
Merge pull request #1724 from Natealus/Development
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
|
2015-03-29 18:26:32 -07:00 |
|
|
Scott Lahteine
|
a22efc5f11
|
Merge pull request #1597 from Wurstnase/g29_auto_script
G29 auto script
|
2015-03-28 20:54:17 -07:00 |
|
|
Scott Lahteine
|
62a3da9618
|
Merge pull request #1723 from thinkyhead/tweak_g92
Tweak G92
|
2015-03-28 20:53:37 -07:00 |
|
|
Scott Lahteine
|
cc7a081cae
|
Merge pull request #1722 from Natealus/Development
Azteeg X3 Pro Pin Revisions
|
2015-03-28 20:45:55 -07:00 |
|
|
Scott Lahteine
|
93dc0d0518
|
Merge pull request #1718 from AnHardt/blink
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
|
2015-03-28 16:20:33 -07:00 |
|
|
Scott Lahteine
|
4f399bf1fb
|
Merge pull request #1721 from thinkyhead/fixup_1699
Patch generic delta config
|
2015-03-28 16:15:09 -07:00 |
|
|
Scott Lahteine
|
f47fc879fe
|
Merge pull request #1717 from thinkyhead/fixup_warnings
Fixup warnings
|
2015-03-27 22:59:49 -07:00 |
|
|
Scott Lahteine
|
b14be7235e
|
Merge pull request #1585 from galexander1/strtod_e_fix
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
|
2015-03-27 20:49:03 -07:00 |
|
|
Scott Lahteine
|
bc2f249cc6
|
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
The big Language Pack
|
2015-03-27 18:24:19 -07:00 |
|
|
Scott Lahteine
|
abfcbd793f
|
Merge pull request #1693 from chris-bo/rework_lcd_beeper
use only one implementation for beeper feedback
|
2015-03-27 17:03:38 -07:00 |
|
|
Scott Lahteine
|
72510b75d2
|
Merge pull request #1716 from thinkyhead/fixup_leveling
Fix Z_APPLY_STEP for dual Z
|
2015-03-27 17:02:54 -07:00 |
|
|
Scott Lahteine
|
1aec2f437c
|
Merge pull request #1700 from thinkyhead/fixup_leveling
Fixup leveling and other issues
|
2015-03-27 16:37:47 -07:00 |
|
|
Scott Lahteine
|
7d472367e2
|
Merge pull request #1713 from epatel/Development
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
|
2015-03-27 16:14:55 -07:00 |
|
|
Scott Lahteine
|
d841028805
|
Merge pull request #1714 from thinkyhead/fixup_temperature
Give all temp arrays 4 indices
|
2015-03-27 16:11:57 -07:00 |
|
|
Scott Lahteine
|
4385ac4f9d
|
Merge pull request #1707 from thinkyhead/fixup_temperature
Always 4 temp sensors
|
2015-03-26 17:02:11 -07:00 |
|
|
Scott Lahteine
|
d2e73545ba
|
Merge pull request #1705 from AnHardt/ddt
Avoid warnings in SanitiCheck.h
|
2015-03-26 15:16:37 -07:00 |
|
|
Scott Lahteine
|
81aec66d21
|
Merge pull request #1704 from AnHardt/firstAid1703
First aid for #1703
|
2015-03-26 15:12:40 -07:00 |
|
|
Scott Lahteine
|
9e8427f253
|
Merge pull request #1698 from zeuseye/Development
Clean "fromsd" array if not SDSUPPORT
|
2015-03-25 22:21:57 -07:00 |
|
|
Scott Lahteine
|
46601b1c65
|
Merge pull request #1696 from epatel/mesh-docs
Instructions for Mesh Bed Leveling
|
2015-03-25 21:57:32 -07:00 |
|
|
Scott Lahteine
|
7667023817
|
Merge pull request #1694 from Wurstnase/fix_z_config
comment #define Z_DUAL_STEPPER_DRIVERS
|
2015-03-25 21:28:17 -07:00 |
|
|
Scott Lahteine
|
ad05a726c1
|
Merge pull request #1691 from AnHardt/PID_dt
Move definition of PIDdT back to temperature.h
|
2015-03-25 21:22:39 -07:00 |
|
|
Scott Lahteine
|
02b4f5f9cd
|
Merge pull request #1689 from AnHardt/MAXand161
Fix MAX6675 again and introduce set_current_temp_raw()
|
2015-03-25 20:23:51 -07:00 |
|
|
Scott Lahteine
|
80ae160c26
|
Merge pull request #1688 from AnHardt/ultra-menu-fix
Add the missed {} to END_MENU in ultralcd.cpp
|
2015-03-25 01:50:48 -07:00 |
|
|
Scott Lahteine
|
512a0056a9
|
Merge pull request #1658 from thinkyhead/planner_oh_planner
Cleanup of planner code
|
2015-03-23 22:21:27 -07:00 |
|
|
Scott Lahteine
|
c6df5f4d85
|
small text correction
|
2015-03-23 21:55:03 -07:00 |
|
|
Scott Lahteine
|
8dd94ccf58
|
Initial list from perusing the commit logs
|
2015-03-23 21:54:06 -07:00 |
|
|
Scott Lahteine
|
4afe50b920
|
Merge pull request #1651 from thinkyhead/config_testing
Configuration sanity-checking
|
2015-03-23 21:23:13 -07:00 |
|
|
Scott Lahteine
|
e2576b1ac5
|
Merge pull request #1674 from thinkyhead/fix_temperature_minmax
Cleanup temperature code
|
2015-03-23 21:10:03 -07:00 |
|
|
Scott Lahteine
|
8b004d26c1
|
Merge pull request #1681 from thinkyhead/marlin_configurator
A logo for the Marlin wiki
|
2015-03-23 21:02:38 -07:00 |
|
|
Scott Lahteine
|
2606da9e81
|
Merge pull request #1678 from Nutz95/Development
Report changes from previous PR (#1670) from old code base including :
|
2015-03-23 15:29:51 -07:00 |
|
|
Scott Lahteine
|
b26a3ea02c
|
Merge pull request #1662 from josla972/refactor_scara
Refactor SCARA calibration. Save some lines of code and possibly ROM.
|
2015-03-23 00:51:18 -07:00 |
|
|
Scott Lahteine
|
36474be8eb
|
Merge pull request #1675 from Wurstnase/Development
fix bad insertion config again
|
2015-03-23 00:33:56 -07:00 |
|
|
Scott Lahteine
|
f65f61fa72
|
Merge pull request #1672 from thinkyhead/fix_probeaction
Fix mangled probe_pt calls
|
2015-03-22 22:40:52 -07:00 |
|
|
Scott Lahteine
|
e0a42d3f9a
|
Merge pull request #1666 from maverikou/fix_1507
Fix 1507
|
2015-03-22 21:25:05 -07:00 |
|
|
Scott Lahteine
|
8bd6e37b21
|
Merge pull request #1661 from thinkyhead/G92_no_offset
Don't add home offsets in G29
|
2015-03-21 16:49:06 -07:00 |
|
|
Scott Lahteine
|
88ed5268d2
|
Merge pull request #1663 from thinkyhead/fix_dual_z_1659
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
|
2015-03-21 16:48:08 -07:00 |
|
|
Scott Lahteine
|
9b639b4135
|
Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level
Manual bed leveling + mesh bed leveling
|
2015-03-21 15:39:42 -07:00 |
|
|
Scott Lahteine
|
a96bfee76a
|
Merge pull request #1660 from thinkyhead/fix_temperature_minmax
Fix temperature min/max test
|
2015-03-21 15:04:42 -07:00 |
|
|
Scott Lahteine
|
b5970492e2
|
Merge pull request #1656 from AnHardt/menufix
Fix for menus failing to scroll
|
2015-03-20 21:09:26 -07:00 |
|
|
Scott Lahteine
|
0d869703ca
|
Merge pull request #1655 from thinkyhead/fix_count_direction_init
Fix count_direction initializer
|
2015-03-20 05:45:33 -07:00 |
|
|
Scott Lahteine
|
e3f04c876a
|
Merge pull request #1653 from thinkyhead/lcd_menu_hilite
Fix hiliting of edit items in LCD menus
|
2015-03-20 04:37:20 -07:00 |
|
|
Scott Lahteine
|
526a755a66
|
Merge pull request #1652 from AnHardt/PIDdebug
PID debug
|
2015-03-20 04:14:08 -07:00 |
|
|
Scott Lahteine
|
199151a4ed
|
Merge pull request #1650 from AnHardt/beautify
Beautivy statusscreen
|
2015-03-20 03:38:02 -07:00 |
|
|
Scott Lahteine
|
2424713a8f
|
Merge pull request #1640 from AnHardt/warning6
codepos not used in gcode_M28()
|
2015-03-20 02:58:00 -07:00 |
|
|
Scott Lahteine
|
0858fba192
|
Merge pull request #1620 from thinkyhead/optimize_menu_code
Reduce size of menu code
|
2015-03-19 14:35:26 -07:00 |
|
|
Scott Lahteine
|
a534ac197a
|
Merge pull request #1621 from AnHardt/remove--6x9-font
Remove 6x9 font
|
2015-03-18 23:10:42 -07:00 |
|
|
Scott Lahteine
|
80e0ee10ca
|
Merge pull request #1631 from AnHardt/iss1593
Decrease KILL_DELAY
|
2015-03-18 19:10:38 -07:00 |
|
|
Scott Lahteine
|
4ce79920e5
|
Merge pull request #1635 from AnHardt/warnings1
Negative times are unlikly
|
2015-03-18 19:10:12 -07:00 |
|
|
Scott Lahteine
|
76127b8a55
|
Merge pull request #1630 from Wurstnase/fix_g29
optional parameters must be named when ignoring order
|
2015-03-18 19:09:40 -07:00 |
|