 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 |
|
|
Scott Lahteine
|
be3f2dc1d9
|
Merge pull request #1636 from AnHardt/warning2
lcd_control_retract_menu() is conditional.
|
2015-03-18 19:09:05 -07:00 |
|
|
Scott Lahteine
|
8d396584bf
|
Merge pull request #1637 from AnHardt/warning3
lcd_autostart_sd() has two conditions.
|
2015-03-18 19:08:33 -07:00 |
|
|
Scott Lahteine
|
8664c6d465
|
Merge pull request #1638 from AnHardt/warning4
delta[3] not used when DELTA not defined.
|
2015-03-18 19:07:55 -07:00 |
|
|
Scott Lahteine
|
10711ccc6a
|
Merge pull request #1639 from AnHardt/warning5
G4 could wait for an undefined time
|
2015-03-18 19:07:14 -07:00 |
|
|
Scott Lahteine
|
89fe77468d
|
Merge pull request #1586 from maverikou/delta_auto_bed_level
Delta auto bed level (Updated PR)
|
2015-03-16 18:17:11 -07:00 |
|
|
Scott Lahteine
|
cbe4496123
|
Merge pull request #1616 from thinkyhead/topo_map_origin
Move TOPO_ORIGIN define to Configuration.h
|
2015-03-15 22:55:54 -07:00 |
|
|
Scott Lahteine
|
d0d12962e0
|
Merge pull request #1615 from AnHardt/fix-1611
Fix #1611
|
2015-03-15 15:19:02 -07:00 |
|
|
Scott Lahteine
|
3f34d9d44e
|
Merge pull request #1614 from AnHardt/fix-1612
Fix for #1612
|
2015-03-15 15:18:24 -07:00 |
|
|
Scott Lahteine
|
5efc798642
|
Merge pull request #1546 from apollo-ng/pr-felix
Added support for Felix 2.0/3.0 printers
|
2015-03-15 07:52:22 -07:00 |
|
|
Scott Lahteine
|
b83e52e50f
|
Merge pull request #1467 from thinkyhead/marlin_configurator
Configurator utility
|
2015-03-15 07:49:19 -07:00 |
|
|
Scott Lahteine
|
7bc77dc134
|
Merge pull request #1583 from galexander1/m404fix
M404 should not use 'N' address as parameter because 'N' is reserved
|
2015-03-15 07:47:30 -07:00 |
|
|
Scott Lahteine
|
3aadaa7677
|
Merge pull request #1609 from thinkyhead/fix_fan_pin_issue
Fix controllerFan() code
|
2015-03-15 07:33:34 -07:00 |
|
|
Scott Lahteine
|
bb4cb1b15a
|
Merge pull request #1606 from thinkyhead/cleanup_stepper
Cleanup of stepper.cpp
|
2015-03-15 06:05:08 -07:00 |
|
|
Scott Lahteine
|
63f41f56f8
|
Merge pull request #1607 from chris-bo/Development
Update ultralcd_st7920_u8glib_rrd.h
|
2015-03-15 01:04:40 -07:00 |
|
|
Scott Lahteine
|
901c3c5392
|
Merge pull request #1603 from thinkyhead/issue_1523_compiler_error
Simplify manage_heater
|
2015-03-14 05:20:18 -07:00 |
|
|
Scott Lahteine
|
196db5720e
|
Merge pull request #1598 from thinkyhead/temp_errors
Fix missing temp_error declarations
|
2015-03-11 22:18:49 -07:00 |
|
|
Scott Lahteine
|
e4d77a6313
|
Merge pull request #1554 from 2PrintBeta/Development
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
|
2015-03-11 15:31:57 -07:00 |
|
|
Scott Lahteine
|
c321c97f35
|
Merge pull request #1584 from galexander1/stringcleanup
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
|
2015-03-10 01:48:30 -07:00 |
|
|
Scott Lahteine
|
0eae9c24bc
|
Merge pull request #1582 from galexander1/deltaconftypo
fix typo in delta example config introduced in commit 697ee2d
|
2015-03-08 21:13:14 -07:00 |
|
|
Scott Lahteine
|
624f23f550
|
Merge pull request #1575 from Wurstnase/fix-controllerFan
Fix controller fan
|
2015-03-08 20:36:38 -07:00 |
|
|
Scott Lahteine
|
9dccd3a94f
|
Merge pull request #1579 from thinkyhead/fix_abl_issues
More sanity-checking for ABL
|
2015-03-06 22:50:03 -08:00 |
|
|
Scott Lahteine
|
ca4b36deda
|
Merge pull request #1578 from thinkyhead/require_lcd_style
Make sure a ROM is selected for ULTRA_LCD
|
2015-03-06 15:38:24 -08:00 |
|
|
Scott Lahteine
|
254970c92a
|
Merge pull request #1570 from C-o-r-E/escape_fix
Fixes gCode handling of comments and escaped characters
|
2015-03-06 15:09:35 -08:00 |
|
|
Scott Lahteine
|
d3660d22ae
|
Merge pull request #1577 from thinkyhead/fix_gcode_g29
Fix compile error in gcode_G29
|
2015-03-06 14:55:05 -08:00 |
|
|
Scott Lahteine
|
bbeb1117d4
|
Merge pull request #1572 from Wackerbarth/Issue1572
Minor typos in the README
|
2015-03-06 10:10:40 -08:00 |
|
|
Scott Lahteine
|
344a12bd10
|
Merge pull request #1571 from AnHardt/Undubble
Undubble MSG_MIN & MSG MAX
|
2015-03-06 10:08:19 -08:00 |
|
|
Scott Lahteine
|
273d00353f
|
Merge pull request #1565 from thinkyhead/gcode_handler_functions
Gcode handlers to inline functions
|
2015-03-05 04:55:46 -08:00 |
|
|
Scott Lahteine
|
94fd8c7555
|
Merge pull request #1556 from thinkyhead/enhanced_g29
Enhanced G29
|
2015-03-05 03:54:53 -08:00 |
|
|
Scott Lahteine
|
0e074d4050
|
Merge pull request #1561 from OhmEye/Development
Fix autoretract
|
2015-03-05 02:14:34 -08:00 |
|
|
Scott Lahteine
|
08b722b635
|
Merge pull request #1555 from C-o-r-E/solenoids
Add support for solenoid articulated extruders
|
2015-03-04 21:36:29 -08:00 |
|
|
Scott Lahteine
|
d052a3c6aa
|
Merge pull request #1551 from thinkyhead/redundant_encrot
Cleanup rotary encoder encrot* defines
|
2015-03-04 03:22:24 -08:00 |
|
|
Scott Lahteine
|
e428e8da75
|
Merge pull request #1552 from thinkyhead/cleanup_cardreader
Cleanup of cardreader.*
|
2015-03-02 07:57:26 -08:00 |
|
|
Scott Lahteine
|
49f471a5fc
|
Merge pull request #1541 from thinkyhead/fixup_temperature
Cleanup of temperature code
|
2015-03-02 05:38:10 -08:00 |
|
|
Scott Lahteine
|
9377089c43
|
Merge pull request #1548 from thinkyhead/issue_1547_bed_leveling
Fix undefined *_PROBE_BED_POSITION error
|
2015-03-01 20:01:38 -08:00 |
|
|
Scott Lahteine
|
b869476e99
|
Merge pull request #1545 from maverikou/panel_one_encoder
Panel One encoder pins
|
2015-02-28 05:32:56 -08:00 |
|
|
Scott Lahteine
|
a99470fbb0
|
Merge pull request #1527 from maverikou/panel_one
Added support for PanelOne from T3P3.
|
2015-02-26 16:01:13 -08:00 |
|
|
Scott Lahteine
|
a5bbd402bf
|
Merge pull request #1539 from AnHardt/dummysensor
Extend the idea of dummy temperature sensors.
|
2015-02-26 01:29:14 -08:00 |
|
|
Scott Lahteine
|
e6af82ba2f
|
Merge pull request #1526 from thinkyhead/cleanup_ultralcd
Cleanup and fix ultralcd.cpp
|
2015-02-23 21:22:54 -08:00 |
|
|
Scott Lahteine
|
adbb839b16
|
Merge pull request #1535 from gege2b/Development
Corrected a typo in ArduinoAddons/Arduino_1.5.x/(...)/boards.txt
|
2015-02-23 19:51:44 -08:00 |
|
|
Scott Lahteine
|
c3c50528e6
|
Merge pull request #1521 from thinkyhead/fixup_encoder_code
Encoder multiplier - revised code
|
2015-02-21 19:44:53 -08:00 |
|
|
Scott Lahteine
|
6d5c13df74
|
Merge pull request #1520 from thinkyhead/fixup_temperature
Fix typos in checkExtruderAutoFans
|
2015-02-21 17:53:26 -08:00 |
|
|
Scott Lahteine
|
5b9e341222
|
Merge pull request #1516 from thinkyhead/fixup_ramps
Cleanup ramps boards
|
2015-02-21 17:51:57 -08:00 |
|
|
Scott Lahteine
|
4fcd4b444e
|
Merge pull request #1519 from thinkyhead/fix_recent_issues
Fix implementation of PID menu items
|
2015-02-21 16:43:11 -08:00 |
|
|
Scott Lahteine
|
9c35ed149d
|
Merge pull request #1508 from AnHardt/iss1492
Fix iss#1492
|
2015-02-21 16:26:37 -08:00 |
|
|
Scott Lahteine
|
b12cd1f841
|
Merge pull request #1514 from 2PrintBeta/Development
Initial definitions for the Boards BAM&DICE + BAM&DICE Due
|
2015-02-19 17:17:34 -08:00 |
|
|
Scott Lahteine
|
08c236059e
|
Merge pull request #1505 from thinkyhead/issue_1499
Bed leveling probe behavior issue?
|
2015-02-19 01:24:17 -08:00 |
|
|
Scott Lahteine
|
ab419795b3
|
Merge pull request #1511 from MagoKimbra/Reset_Alert_message_M600
Reset Alert message when finish M600 command
|
2015-02-19 01:19:56 -08:00 |
|
|
Scott Lahteine
|
63a5ff7ab9
|
Merge pull request #1489 from tommil/Development
Updated Finnish language file
|
2015-02-15 23:02:11 -08:00 |
|
|
Scott Lahteine
|
961998cf91
|
Merge pull request #1496 from thinkyhead/issue_1493
Megatronics 3 servo pins
|
2015-02-15 22:00:14 -08:00 |
|
|
Scott Lahteine
|
59e92a2db4
|
Merge pull request #1506 from thinkyhead/issue_1504
Issue #1504 – K8200 Z_ENABLE_PIN
|
2015-02-15 21:59:30 -08:00 |
|
|
Scott Lahteine
|
7866fa161f
|
Merge pull request #1476 from Natealus/Development
Compiling errors with 4 Extruders defined and Viki 2 Implementation
|
2015-02-12 16:56:55 -08:00 |
|
|
Scott Lahteine
|
8cfdd3e8a4
|
Merge pull request #1423 from MoonCactus/Development
Multi-line G-code commands
|
2015-02-12 16:29:30 -08:00 |
|
|
Scott Lahteine
|
d75cd69de4
|
Merge pull request #1488 from Wurstnase/Development
Bedleveling: X and Y must be Integers not Float!
|
2015-02-10 16:02:55 -08:00 |
|
|
Scott Lahteine
|
eb5889b3da
|
Merge pull request #1479 from AnHardt/en_first
#include "language_en.h" before the national language in language.h
|
2015-02-10 15:33:45 -08:00 |
|
|
Scott Lahteine
|
32d4dd073f
|
Merge pull request #1487 from AnHardt/iss1485
Fix for #1485
|
2015-02-09 21:41:07 -08:00 |
|
|
Scott Lahteine
|
f92b0dc6c7
|
Merge pull request #1486 from Souko/patch-1
Update ultralcd_st7920_u8glib_rrd.h
|
2015-02-09 21:32:54 -08:00 |
|
|
Scott Lahteine
|
8be25389f2
|
Merge pull request #1477 from AnHardt/languagetoconfig
Make display language configurable in Configuration.h
|
2015-02-09 05:36:57 -08:00 |
|
|
Scott Lahteine
|
c093ea36e6
|
Merge pull request #1472 from thinkyhead/issue_1471_fix
Fan speed and 4th extruder on graphical LCD
|
2015-02-07 03:03:04 -08:00 |
|
|
Scott Lahteine
|
1a3c7d91f1
|
Merge pull request #1470 from thinkyhead/fix_eeprom_typo
Fix bad typo in ConfigurationStore.cpp
|
2015-02-06 14:44:28 -08:00 |
|
|
Scott Lahteine
|
3490a19103
|
Merge pull request #1466 from CONSULitAS/Development_K8200_de
K8200: Example Configuration.h fixed
|
2015-02-04 17:28:04 -08:00 |
|
|
Scott Lahteine
|
b65c5d8ec6
|
Merge pull request #1464 from AnHardt/iss1448-Menu
Unified menu selection - by hilighting - made first column avilable
|
2015-02-03 22:43:29 -08:00 |
|
|
Scott Lahteine
|
6250cc9a8d
|
Merge pull request #1465 from CONSULitAS/Development_K8200_de
K8200: Example Configurations back in sync and readme update
|
2015-02-03 22:38:57 -08:00 |
|
|
Scott Lahteine
|
b6ca50a2cc
|
Merge pull request #1463 from thinkyhead/cleanup_recent_merge
Apply some cleanup for recent merge
|
2015-02-03 12:06:47 -08:00 |
|
|
Scott Lahteine
|
cc56f36870
|
Merge pull request #1461 from thinkyhead/issue_1453_redo
Apply fix for M600 filament change
|
2015-02-03 11:52:09 -08:00 |
|
|
Scott Lahteine
|
fed931afda
|
Merge pull request #1462 from AnHardt/iss1447-Edit
Fixes issue #1447 - Overlapping of long descriptions with values.
|
2015-02-03 11:36:04 -08:00 |
|